diff --git a/client/src/css/Modal.css b/client/src/css/Modal.css
index 486940b0..814d4fbb 100644
--- a/client/src/css/Modal.css
+++ b/client/src/css/Modal.css
@@ -70,9 +70,9 @@ input[type='file'] {
 .modal input[type='submit'],
 .modal button,
 .modal .file-upload-button {
-  border: none;
   color: var(--vscode-button-foreground);
   background: var(--vscode-button-background);
+  border: 1px solid var(--vscode-button-border);
   cursor: pointer;
   padding: 0.5rem 1rem;
   border-radius: 0.2rem;
@@ -84,6 +84,33 @@ input[type='file'] {
   margin: 1rem auto;
 }
 
+.modal input[type='text'],
+.modal select {
+  padding: 10px 12px;
+
+  border: 1px solid var(--vscode-dropdown-border);
+  border-radius: 6px;
+  background-color: var(--vscode-input-background);
+  color: var(--vscode-input-foreground);
+
+  /* outline: none;
+  transition: all 0.2s ease-in-out;
+  box-sizing: border-box; */
+}
+
+.modal input[type='text'] {
+  font-family: 'JuliaMono';
+}
+
+.modal #abbreviationCharacter {
+  width: 15px;
+  margin-left: 4px;
+}
+
+.modal .MuiSwitch-track {
+  background-color: var(--vscode-input-foreground);
+}
+
 .modal .flex {
   display: flex;
   justify-content: space-between;
diff --git a/client/src/css/Navigation.css b/client/src/css/Navigation.css
index 17caeeb3..d0925652 100644
--- a/client/src/css/Navigation.css
+++ b/client/src/css/Navigation.css
@@ -100,8 +100,9 @@ nav select {
 .tooltip .tooltiptext {
   visibility: hidden;
   min-width: 300px;
-  background-color: var(--vscode-input-foreground);
-  color: var(--vscode-input-background);
+  background-color: var(--vscode-editorHoverWidget-background);
+  color: var(--vscode-editorHoverWidget-foreground);
+  border: 1px solid var(--vscode-editorHoverWidget-border);
   text-align: left;
   border-radius: 5px;
   padding: 10px;
@@ -139,14 +140,14 @@ nav select {
 
 .tooltip .tooltiptext .commit-author {
   font-style: italic;
-  color: #bbb;
+  opacity: 0.6;
 }
 
 .tooltip .tooltiptext .commit-date {
-  color: #bbb;
+  opacity: 0.6;
 }
 
 .tooltip .tooltiptext .commit-sha {
   font-style: italic;
-  color: #5cb6de;
+  color: var(--vscode-textLink-foreground);
 }
diff --git a/client/src/settings/SettingsPopup.tsx b/client/src/settings/SettingsPopup.tsx
index c367b6e5..51997010 100644
--- a/client/src/settings/SettingsPopup.tsx
+++ b/client/src/settings/SettingsPopup.tsx
@@ -57,7 +57,7 @@ export function SettingsPopup({
         <h2>Editor settings</h2>
         <p>
           <label htmlFor="abbreviationCharacter">
-            Lead character to trigger unicode input mode
+            Lead character to trigger unicode input mode:
           </label>
           <input
             id="abbreviationCharacter"