diff --git a/src/app/app.less b/src/app/app.less
index d4319aa7..ad0242d0 100644
--- a/src/app/app.less
+++ b/src/app/app.less
@@ -174,6 +174,7 @@ a.a-block {
             &.is-hidden {
                 display: none;
             }
+            overflow: auto;
         }
     }
 }
diff --git a/src/app/bookmarks/bookmarks.less b/src/app/bookmarks/bookmarks.less
index abbf71c9..462a94b3 100644
--- a/src/app/bookmarks/bookmarks.less
+++ b/src/app/bookmarks/bookmarks.less
@@ -1,4 +1,4 @@
-@import "../../app/app.less";
+@import "../../app/common/themes/themes.less";
 
 .bookmarks-view {
     background-color: @background-session;
@@ -18,6 +18,16 @@
         }
     }
 
+    .header {
+        margin: 1.5em 1.5em 0.5em;
+
+        .bookmarks-title {
+            margin-bottom: 0.5em;
+            font-weight: bold;
+            font-size: 1.5em;
+        }
+    }
+
     .icon {
         width: 1em;
         height: 1em;
@@ -79,9 +89,10 @@
         .bookmark-id-div {
             display: none;
             position: absolute;
-            color: #666;
+            color: @disabled-color;
             right: 5px;
             bottom: 2px;
+            font-size: 0.8em;
         }
 
         &:hover .bookmark-id-div {
@@ -114,4 +125,7 @@
             visibility: visible;
         }
     }
+    .help-entry {
+        margin: 1em 2em;
+    }
 }
diff --git a/src/app/bookmarks/bookmarks.tsx b/src/app/bookmarks/bookmarks.tsx
index 99d3980c..823c7cc9 100644
--- a/src/app/bookmarks/bookmarks.tsx
+++ b/src/app/bookmarks/bookmarks.tsx
@@ -191,12 +191,11 @@ class BookmarksView extends React.Component<{}, {}> {
         let bookmark: BookmarkType = null;
         return (
             <div className={cn("bookmarks-view", { "is-hidden": isHidden })}>
-                <div className="close-button hoverEffect" title="Close (Escape)" onClick={this.closeView}>
-                    <XmarkIcon className={"icon"} />
-                </div>
-                <div className="alt-title">
-                    <FavouritesIcon className={"icon"} style={{ marginRight: 10 }} />
-                    Favourites
+                <div className="header">
+                    <div className="bookmarks-title">Favourites</div>
+                    <div className="close-button hoverEffect" title="Close (Escape)" onClick={this.closeView}>
+                        <XmarkIcon className={"icon"} />
+                    </div>
                 </div>
                 <div className="bookmarks-list">
                     <For index="idx" each="bookmark" of={bookmarks}>
diff --git a/src/app/common/common.less b/src/app/common/common.less
index 40addae5..c7967ea5 100644
--- a/src/app/common/common.less
+++ b/src/app/common/common.less
@@ -1,4 +1,4 @@
-@import "../../app/app.less";
+@import "../../app/common/themes/themes.less";
 
 .info-message {
     position: relative;
@@ -91,6 +91,8 @@
             white-space: pre;
             padding: 2px 8px 2px 8px;
             background-color: @term-black;
+            font-size: 1em;
+            font-family: @fixed-font;
         }
     }
 
diff --git a/src/app/common/modals/modals.less b/src/app/common/modals/modals.less
index 30e7f949..15ecd6c8 100644
--- a/src/app/common/modals/modals.less
+++ b/src/app/common/modals/modals.less
@@ -1,4 +1,4 @@
-@import "../../../app/app.less";
+@import "../../../app/common/themes/themes.less";
 
 // modal css (also includes settings-field)
 
diff --git a/src/app/common/prompt/prompt.less b/src/app/common/prompt/prompt.less
index 4784ab6b..7c377590 100644
--- a/src/app/common/prompt/prompt.less
+++ b/src/app/common/prompt/prompt.less
@@ -1,4 +1,4 @@
-@import "../../../app/app.less";
+@import "../../../app/common/themes/themes.less";
 
 .term-prompt {
     font-weight: 300;
diff --git a/src/app/connections/connections.less b/src/app/connections/connections.less
index f0dc2dce..d637b238 100644
--- a/src/app/connections/connections.less
+++ b/src/app/connections/connections.less
@@ -1,4 +1,4 @@
-@import "../../app/app.less";
+@import "../../app/common/themes/themes.less";
 
 .modal.prompt-modal.remotes-modal {
     .modal-content {
diff --git a/src/app/history/history.less b/src/app/history/history.less
index e8f85d47..5b22b414 100644
--- a/src/app/history/history.less
+++ b/src/app/history/history.less
@@ -1,4 +1,4 @@
-@import "../../app/app.less";
+@import "../../app/common/themes/themes.less";
 
 .history-view {
     background-color: @background-session;
@@ -31,10 +31,10 @@
     }
 
     .header {
-        margin: 10px;
+        margin: 1.5em 1.5em 0.5em;
 
         .history-title {
-            margin-top: 0.3em;
+            margin-bottom: 0.5em;
             font-weight: bold;
             font-size: 1.5em;
         }
diff --git a/src/app/history/history.tsx b/src/app/history/history.tsx
index 1524e402..d8ba8f02 100644
--- a/src/app/history/history.tsx
+++ b/src/app/history/history.tsx
@@ -347,7 +347,7 @@ class HistoryView extends React.Component<{}, {}> {
         return (
             <div className={cn("history-view", { "is-hidden": isHidden })}>
                 <div className="header">
-                    <div className="history-title">HISTORY</div>
+                    <div className="history-title">History</div>
                     <div className="history-search">
                         <div className="main-search field">
                             <p className="control has-icons-left">
diff --git a/src/app/line/lines.less b/src/app/line/lines.less
index 8d70b4b6..70ccfccd 100644
--- a/src/app/line/lines.less
+++ b/src/app/line/lines.less
@@ -1,4 +1,4 @@
-@import "../../app/app.less";
+@import "../../app/common/themes/themes.less";
 
 .line.line-text {
     flex-direction: row;
diff --git a/src/app/sidebar/sidebar.less b/src/app/sidebar/sidebar.less
index 316d4c3f..d292f8ca 100644
--- a/src/app/sidebar/sidebar.less
+++ b/src/app/sidebar/sidebar.less
@@ -1,8 +1,9 @@
-@import "../../app/app.less";
+@import "../../app/common/themes/themes.less";
 
 .main-sidebar {
     padding: 0;
-    width: 20rem;
+    min-width: 20rem;
+    max-width: 20rem;
     display: flex;
     flex-direction: column;
     position: relative;
diff --git a/src/app/workspace/cmdinput/cmdInput.less b/src/app/workspace/cmdinput/cmdInput.less
index bae12487..b14a223a 100644
--- a/src/app/workspace/cmdinput/cmdInput.less
+++ b/src/app/workspace/cmdinput/cmdInput.less
@@ -1,4 +1,4 @@
-@import "../../../app/app.less";
+@import "../../../app/common/themes/themes.less";
 
 .cmd-input {
     border-radius: 6px;
@@ -99,7 +99,7 @@
             &.display-disabled {
                 background-color: #444;
             }
-            
+
             &:focus {
                 box-shadow: none;
                 border: none;
diff --git a/src/app/workspace/screen/screenview.less b/src/app/workspace/screen/screenview.less
index 87e9575c..08b7bcd6 100644
--- a/src/app/workspace/screen/screenview.less
+++ b/src/app/workspace/screen/screenview.less
@@ -1,4 +1,4 @@
-@import "../../../app/app.less";
+@import "../../../app/common/themes/themes.less";
 
 .main-content {
     .screen-view {
diff --git a/src/app/workspace/screen/tabs.less b/src/app/workspace/screen/tabs.less
index af3abcca..7f34016d 100644
--- a/src/app/workspace/screen/tabs.less
+++ b/src/app/workspace/screen/tabs.less
@@ -1,4 +1,4 @@
-@import "../../../app/app.less";
+@import "../../../app/common/themes/themes.less";
 
 #main .screen-tabs .screen-tab {
     border-radius: 12px 0px 0px 0px;
diff --git a/src/app/workspace/workspace.less b/src/app/workspace/workspace.less
index 370aac03..565a4639 100644
--- a/src/app/workspace/workspace.less
+++ b/src/app/workspace/workspace.less
@@ -1,4 +1,4 @@
-@import "../../app/app.less";
+@import "../../app/common/themes/themes.less";
 
 .session-view {
     flex-grow: 1;
diff --git a/src/plugins/code/code.less b/src/plugins/code/code.less
index 51dbe7ec..83aaeb5a 100644
--- a/src/plugins/code/code.less
+++ b/src/plugins/code/code.less
@@ -1,4 +1,4 @@
-@import "../../app/app.less";
+@import "../../app/common/themes/themes.less";
 
 .code-renderer {
     .monaco-editor {
diff --git a/src/plugins/csv/csv.less b/src/plugins/csv/csv.less
index 8af111de..8786c4e4 100644
--- a/src/plugins/csv/csv.less
+++ b/src/plugins/csv/csv.less
@@ -1,4 +1,4 @@
-@import "../../app/app.less";
+@import "../../app/common/themes/themes.less";
 
 .csv-renderer {
     .cursor-pointer {
diff --git a/src/plugins/image/image.less b/src/plugins/image/image.less
index f7900432..a1f19983 100644
--- a/src/plugins/image/image.less
+++ b/src/plugins/image/image.less
@@ -1,4 +1,4 @@
-@import "../../app/app.less";
+@import "../../app/common/themes/themes.less";
 
 .image-renderer {
     padding: 10px;
diff --git a/src/plugins/markdown/markdown.less b/src/plugins/markdown/markdown.less
index 9f7b28b6..14b98a27 100644
--- a/src/plugins/markdown/markdown.less
+++ b/src/plugins/markdown/markdown.less
@@ -1,4 +1,4 @@
-@import "../../app/app.less";
+@import "../../app/common/themes/themes.less";
 
 .markdown-renderer {
     color: @term-white;
diff --git a/src/plugins/mustache/mustache.less b/src/plugins/mustache/mustache.less
index 27f069c8..29404d4d 100644
--- a/src/plugins/mustache/mustache.less
+++ b/src/plugins/mustache/mustache.less
@@ -1,4 +1,4 @@
-@import "../../app/app.less";
+@import "../../app/common/themes/themes.less";
 
 .mustache-renderer {
     color: @term-white;
diff --git a/src/plugins/openai/openai.less b/src/plugins/openai/openai.less
index 422863a5..8d529642 100644
--- a/src/plugins/openai/openai.less
+++ b/src/plugins/openai/openai.less
@@ -1,4 +1,4 @@
-@import "../../app/app.less";
+@import "../../app/common/themes/themes.less";
 
 .openai-renderer {
     .openai-message {
diff --git a/src/plugins/terminal/terminal.less b/src/plugins/terminal/terminal.less
index 937953d3..b653421f 100644
--- a/src/plugins/terminal/terminal.less
+++ b/src/plugins/terminal/terminal.less
@@ -1,4 +1,4 @@
-@import "../../app/app.less";
+@import "../../app/common/themes/themes.less";
 @import "./xterm.less";
 
 .terminal-wrapper {