diff --git a/src/renderer/less/macos.less b/src/renderer/less/macos.less
index 4819a263..61912371 100644
--- a/src/renderer/less/macos.less
+++ b/src/renderer/less/macos.less
@@ -76,4 +76,4 @@ body[platform="darwin"] {
         margin-top: 18px;
         left: 70px;
     }
-}
\ No newline at end of file
+}
diff --git a/src/renderer/style.css b/src/renderer/style.css
index 988a27d9..1b2e42da 100644
--- a/src/renderer/style.css
+++ b/src/renderer/style.css
@@ -13012,7 +13012,7 @@ input[type=checkbox][switch]:checked:active::before {
   width: 320px;
   font-size: 14px;
   position: absolute;
-  overflow: auto;
+  overflow: overlay;
   padding-bottom: 16px;
 }
 .github-themes-page .repos-list > .list-group {
@@ -13033,7 +13033,6 @@ input[type=checkbox][switch]:checked:active::before {
   padding: 16px 32px;
   overflow: auto;
   position: fixed;
-  width: calc(100% - 574px);
   margin-left: 320px;
   padding-bottom: 16px;
 }
@@ -13060,6 +13059,12 @@ input[type=checkbox][switch]:checked:active::before {
 .github-themes-page .installed-themes-page .style-editor-container .list-group-item {
   border-radius: 0px;
 }
+.installed-themes-page {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  overflow: hidden;
+}
 .installed-themes-page .themeContextMenu {
   background: transparent;
   color: var(--keyColor);
@@ -13092,23 +13097,28 @@ input[type=checkbox][switch]:checked:active::before {
 }
 .installed-themes-page .gh-header {
   z-index: 5;
+  padding: 16px;
+  flex: 0 0 auto;
+  height: 64px;
+  display: grid;
+  align-content: center;
 }
 .installed-themes-page .gh-header .header-text {
   position: initial !important;
   justify-content: left !important;
 }
 .installed-themes-page .gh-content {
-  display: contents;
-  flex-direction: column;
+  display: flex;
+  flex-direction: row;
   padding: 0px;
+  height: 100%;
+  flex: 0 0 auto;
 }
 .installed-themes-page .gh-content .repos-list {
   width: 320px;
-  position: fixed;
-  overflow: auto;
+  overflow: overlay;
   height: 90%;
   font-size: 14px;
-  margin: 0 auto;
   white-space: nowrap;
 }
 .installed-themes-page .gh-content .repos-list > .list-group {
@@ -13125,13 +13135,11 @@ input[type=checkbox][switch]:checked:active::before {
   filter: brightness(0.8);
 }
 .installed-themes-page .gh-content .style-editor-container {
-  height: 90%;
+  height: 100%;
   flex: 1;
   padding: 0px;
-  margin-left: 320px;
-  position: fixed;
-  overflow: auto;
-  width: calc(100% - 574px);
+  width: 100%;
+  overflow: hidden;
 }
 .installed-themes-page .gh-content .style-editor-container .stylestack-editor {
   padding-bottom: 16px;
@@ -14681,7 +14689,7 @@ input[type=checkbox][switch]:checked:active::before {
 }
 .settings-panel .settings-window {
   background: var(--baseColorMix);
-  max-width: 80%;
+  max-width: 90%;
   max-height: 90%;
   width: 100%;
   height: 100%;
@@ -14765,6 +14773,10 @@ input[type=checkbox][switch]:checked:active::before {
 .settings-panel .settings-window .close-btn:hover {
   background-color: #c42b1c;
 }
+.settings-panel .settings-window .close-btn.back-btn {
+  left: 10px;
+  right: unset;
+}
 .settings-panel .settings-window .close-btn.minmax-btn {
   right: 52px;
 }
@@ -14785,6 +14797,9 @@ input[type=checkbox][switch]:checked:active::before {
 }
 .settings-panel .settings-window .tabs > .col-auto {
   width: 230px;
+  overflow-x: hidden;
+  overflow-y: overlay;
+  transition: width 0.25s ease-in-out;
 }
 .settings-panel .settings-window .tabs .tab-content {
   margin: 0 !important;
@@ -14793,9 +14808,32 @@ input[type=checkbox][switch]:checked:active::before {
   overflow-y: overlay;
   height: 100%;
   background-color: var(--panelColor2);
+  padding: 0px;
   padding-top: 48px;
   border-left: 1px solid var(--borderColor);
 }
+.settings-panel .settings-window .github-themes-page .header-text,
+.settings-panel .settings-window .installed-themes-page .header-text {
+  font-size: 1.25em;
+}
+.settings-panel .settings-window .tab-pane {
+  height: 100%;
+}
+.settings-panel .settings-window .settings-tab-content {
+  height: 100%;
+}
+.settings-panel .settings-window.no-sidebar .gh-header > .row:last-child {
+  padding-right: 90px;
+}
+.settings-panel .settings-window.no-sidebar .tab-content {
+  padding-top: 0px;
+}
+.settings-panel .settings-window.no-sidebar .tabs .nav-pills .nav-link :nth-child(2) {
+  display: none;
+}
+.settings-panel .settings-window.no-sidebar .tabs > .col-auto {
+  width: 80px;
+}
 #hid___BV_tab_button__ {
   display: none;
 }
@@ -18030,7 +18068,7 @@ body[platform='darwin'] .app-chrome .app-chrome-item > .app-mainmenu {
   padding: 15px;
 }
 body[platform="darwin"] html {
-  background: transparent!important;
+  background: transparent !important;
 }
 body[platform="darwin"].notransparency::before {
   display: none;
@@ -18057,6 +18095,18 @@ body[platform="darwin"] #app.twopanel .app-chrome .app-mainmenu {
 body[platform="darwin"] #app.twopanel .app-chrome.chrome-bottom {
   background-color: var(--macOSChromeColor);
 }
+body[platform="darwin"] #app[window-state="normal"]::after {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  box-shadow: inset 0px 0px 0.5px 1px rgba(200, 200, 200, 0.4);
+  border-radius: 10px;
+  content: " ";
+  z-index: 999999;
+  pointer-events: none;
+}
 body[platform="darwin"] #app-main {
   background-color: transparent;
 }
@@ -18066,6 +18116,10 @@ body[platform="darwin"] #app-main .app-navigation {
 body[platform="darwin"] #app-main #app-content {
   background-color: #1e1e1e6b;
 }
+body[platform="darwin"] .settings-window.maxed .tabs > .col-auto {
+  transition: padding-top 0.3s linear;
+  padding-top: var(--chromeHeight1);
+}
 body[platform="darwin"] #apple-music-video-player-controls #player-exit {
   margin-top: 18px;
   left: 70px;
diff --git a/src/renderer/views/components/settings-window.ejs b/src/renderer/views/components/settings-window.ejs
index 876fad04..6c1e574b 100644
--- a/src/renderer/views/components/settings-window.ejs
+++ b/src/renderer/views/components/settings-window.ejs
@@ -1667,4 +1667,4 @@
       }
     }
   })
-</script>
\ No newline at end of file
+</script>