diff --git a/public/themes/default.css b/public/themes/default.css
index 88e9288f5..d81350f8a 100644
--- a/public/themes/default.css
+++ b/public/themes/default.css
@@ -60,6 +60,7 @@
     --app-panel-bg-color-dev: rgb(21, 23, 48);
     --app-icon-color: rgb(139, 145, 138);
     --app-icon-hover-color: #fff;
+    --app-selected-mask-color: rgba(255, 255, 255, 0.06);
 
     /* icon colors */
 
diff --git a/public/themes/light.css b/public/themes/light.css
index ddc3cfb36..78f72a45d 100644
--- a/public/themes/light.css
+++ b/public/themes/light.css
@@ -17,6 +17,7 @@
     --app-panel-bg-color-dev: #e0e0e0;
     --app-icon-color: rgb(80, 80, 80);
     --app-icon-hover-color: rgb(100, 100, 100);
+    --app-selected-mask-color: rgba(0, 0, 0, 0.06);
 
     --input-bg-color: #eeeeee;
 
@@ -50,6 +51,8 @@
     --form-element-disabled-text-color: #b7b7b7;
     --form-element-placeholder-color: #b7b7b7;
 
+    --markdown-bg-color: rgb(0, 0, 0, 0.1);
+
     /* modal colors */
     --modal-header-bottom-border-color: rgba(0, 0, 0, 0.3);
 
diff --git a/src/app/common/elements/markdown.less b/src/app/common/elements/markdown.less
index e24d84b16..36b4cb5cc 100644
--- a/src/app/common/elements/markdown.less
+++ b/src/app/common/elements/markdown.less
@@ -8,19 +8,6 @@
         margin-bottom: 10px;
     }
 
-    code {
-        background-color: var(--markdown-bg-color);
-        color: var(--app-text-color);
-        font-family: var(--termfontfamily);
-        border-radius: 4px;
-    }
-
-    code.inline {
-        padding-top: 0;
-        padding-bottom: 0;
-        font-family: var(--termfontfamily);
-    }
-
     .title {
         color: var(--app-text-color);
         margin-top: 16px;
@@ -62,14 +49,29 @@
     pre {
         background-color: var(--markdown-bg-color);
         margin: 4px 10px 4px 10px;
-        padding: 6px 6px 6px 10px;
+        padding: 0.7em;
         border-radius: 4px;
+
+        code {
+            background-color: transparent;
+            padding: 0;
+            line-height: normal;
+        }
     }
 
     pre.selected {
         outline: 2px solid var(--markdown-outline-color);
     }
 
+    code {
+        color: var(--app-text-color);
+        font-family: var(--termfontfamily);
+        border-radius: 4px;
+        background-color: var(--markdown-bg-color);
+        padding: 0.15em 0.5em;
+        line-height: 1.5;
+    }
+
     .title {
         font-weight: semibold;
         padding-top: 6px;
diff --git a/src/app/common/elements/markdown.tsx b/src/app/common/elements/markdown.tsx
index 86c558973..5762b05d1 100644
--- a/src/app/common/elements/markdown.tsx
+++ b/src/app/common/elements/markdown.tsx
@@ -24,7 +24,7 @@ function HeaderRenderer(props: any, hnum: number): any {
 }
 
 function CodeRenderer(props: any): any {
-    return <code className={cn({ inline: props.inline })}>{props.children}</code>;
+    return <code>{props.children}</code>;
 }
 
 @mobxReact.observer
diff --git a/src/app/common/modals/disconnected.tsx b/src/app/common/modals/disconnected.tsx
index 623729e8b..f2fd10277 100644
--- a/src/app/common/modals/disconnected.tsx
+++ b/src/app/common/modals/disconnected.tsx
@@ -90,7 +90,7 @@ class DisconnectedModal extends React.Component<{}, {}> {
                         onClick={this.restartServer}
                         leftIcon={<i className="fa-sharp fa-solid fa-triangle-exclamation"></i>}
                     >
-                        Restart Server
+                        Restart Wave Backend
                     </Button>
                 </div>
             </Modal>
diff --git a/src/app/common/modals/tabswitcher.less b/src/app/common/modals/tabswitcher.less
index 777767d6f..6fbdcb14a 100644
--- a/src/app/common/modals/tabswitcher.less
+++ b/src/app/common/modals/tabswitcher.less
@@ -74,7 +74,7 @@
                     .focused-option {
                         border: 1px solid rgba(241, 246, 243, 0.15);
                         border-radius: 4px;
-                        background: rgba(255, 255, 255, 0.06);
+                        background: var(--app-selected-mask-color);
                     }
                 }
             }
diff --git a/src/app/workspace/cmdinput/cmdinput.tsx b/src/app/workspace/cmdinput/cmdinput.tsx
index 6cac9b5a9..067dec7c3 100644
--- a/src/app/workspace/cmdinput/cmdinput.tsx
+++ b/src/app/workspace/cmdinput/cmdinput.tsx
@@ -161,7 +161,7 @@ class CmdInput extends React.Component<{}, {}> {
                             </CenteredIcon>
                         </div>
                     </If>
-                    <div key="ai" title="Wave AI (Cmd-Space)" className="cmdinput-icon" onClick={this.clickAIAction}>
+                    <div key="ai" title="Wave AI (Ctrl-Space)" className="cmdinput-icon" onClick={this.clickAIAction}>
                         <i className="fa-sharp fa-regular fa-sparkles fa-fw" />
                     </div>
                     <div