diff --git a/src/app/components/browse/browse.component.ts b/src/app/components/browse/browse.component.ts
index 9965b01..265759d 100644
--- a/src/app/components/browse/browse.component.ts
+++ b/src/app/components/browse/browse.component.ts
@@ -19,6 +19,7 @@ export class BrowseComponent implements AfterViewInit {
 
   ngAfterViewInit() {
     const $tableColumn = $('#table-column')
+    // TODO: on new search, scroll to the top
     $tableColumn.on('scroll', () => {
       let pos = $tableColumn[0].scrollTop + $tableColumn[0].offsetHeight
       let max = $tableColumn[0].scrollHeight
diff --git a/src/app/components/settings/settings.component.html b/src/app/components/settings/settings.component.html
index 08de5da..ac0545f 100644
--- a/src/app/components/settings/settings.component.html
+++ b/src/app/components/settings/settings.component.html
@@ -7,7 +7,7 @@
         type="text" placeholder="No directory selected!">
       <button *ngIf="settingsService.libraryDirectory != undefined" (click)="openLibraryDirectory()"
         class="ui button">Open Folder</button>
-      <button (click)="getLibraryDirectory()" class="ui button teal">Choose</button>
+      <button (click)="getLibraryDirectory()" class="ui button positive">Choose</button>
     </div>
   </div>
 </div>
@@ -39,10 +39,9 @@
 <div #themeDropdown class="ui selection dropdown mr">
   <input type="hidden" name="sort" [value]="settingsService.theme">
   <i class="dropdown icon"></i>
-  <div class="default text">Default</div>
+  <div class="default text">{{settingsService.theme}}</div>
   <div class="menu">
-    <div class="item" [attr.data-value]="i" *ngFor="let theme of settingsService.builtinThemes; let i = index">{{theme}}
-    </div>
+    <div class="item" [attr.data-value]="i" *ngFor="let theme of settingsService.builtinThemes; let i = index">{{theme}}</div>
   </div>
 </div>
 
diff --git a/src/app/components/toolbar/toolbar.component.html b/src/app/components/toolbar/toolbar.component.html
index 3c393d0..50c49c3 100644
--- a/src/app/components/toolbar/toolbar.component.html
+++ b/src/app/components/toolbar/toolbar.component.html
@@ -7,6 +7,6 @@
   <div class="right menu">
     <a class="item traffic-light" (click)="minimize()"><i class="minus icon"></i></a>
     <a class="item traffic-light" (click)="toggleMaximized()"><i class="icon window" [ngClass]="isMaximized ? 'restore' : 'maximize'"></i></a>
-    <a class="item traffic-light" (click)="close()"><i class="x icon"></i></a>
+    <a class="item traffic-light close" (click)="close()"><i class="x icon"></i></a>
   </div>
 </div>
\ No newline at end of file
diff --git a/src/app/components/toolbar/toolbar.component.scss b/src/app/components/toolbar/toolbar.component.scss
index f9a3ac0..9b6ad0e 100644
--- a/src/app/components/toolbar/toolbar.component.scss
+++ b/src/app/components/toolbar/toolbar.component.scss
@@ -17,8 +17,8 @@
   i {
     margin: 0 !important;
   }
+}
 
-  &:last-child:hover {
-    background: rgba(255, 0, 0, .1) !important;
-  }
+.close:hover {
+  background: rgba(255, 0, 0, .15) !important;
 }
\ No newline at end of file
diff --git a/src/app/core/services/settings.service.ts b/src/app/core/services/settings.service.ts
index 00cbd2d..210b418 100644
--- a/src/app/core/services/settings.service.ts
+++ b/src/app/core/services/settings.service.ts
@@ -12,7 +12,11 @@ export class SettingsService {
   private currentThemeLink: HTMLLinkElement
 
   constructor(private electronService: ElectronService) {
-    this.getSettings()
+    this.getSettings().then(() => {
+      if (this.settings.theme != this.builtinThemes[0]) {
+        this.changeTheme(this.settings.theme)
+      }
+    })
   }
 
   async getSettings() {
@@ -28,7 +32,6 @@ export class SettingsService {
     }
   }
 
-  // TODO: research how to make theme changes with fomantic UI
   changeTheme(theme: string) {
     if (this.currentThemeLink != undefined) this.currentThemeLink.remove()
     if (theme == 'Default') { return }
@@ -36,7 +39,7 @@ export class SettingsService {
     const link = document.createElement('link')
     link.type = 'text/css'
     link.rel = 'stylesheet'
-    link.href = `assets/themes/${theme}.css`
+    link.href = `/assets/themes/${theme}.css`
     this.currentThemeLink = document.head.appendChild(link)
   }
 
diff --git a/src/assets/themes/dark.css b/src/assets/themes/dark.css
index 2d26dca..5faa7e9 100644
--- a/src/assets/themes/dark.css
+++ b/src/assets/themes/dark.css
@@ -1,122 +1,96 @@
-body ::-webkit-scrollbar-track {
-  background: rgba(255, 255, 255, 0.1) !important;
+body {
+  background-color: #222222;
 }
 
-body ::-webkit-scrollbar-thumb {
-  background: rgba(255, 255, 255, 0.25) !important;
-}
-
-app-browse, app-downloads, app-library, app-settings, app-about {
-  background-color: #1E1E1E;
+/* Text Color */
+.ui.menu .item,
+.ui.header,
+.ui.form .field>label,
+.ui.input input,
+.ui.button,
+div {
   color: #CCCCCC !important;
 }
 
-app-about img.logo {
-  filter: drop-shadow(0 0px 14px white);
+/* Toolbar */
+
+.ui.menu, .menu>.item.traffic-light {
+  background-color: #303030 !important;
 }
 
-.ui.dimmer {
-  background: rgba(0,0,0,0.85) !important;
-}
-
-.ui.inverted.dimmer .ui.loader, .ui.loader {
-  color: #888888 !important;
-}
-
-.ui.segment {
-  background: #3C3C3C;
-}
-
-.ui.header, .ui.form .field>label, .ui.basic.button, .ui.basic.buttons .button {
-  color: #CCCCCC !important;
-}
-
-/* Loading */
-app-app-loading {
-  background-color: #1E1E1E !important;
-}
-
-app-app-loading svg .st0 {
-  stroke: #CCCCCC !important;
-}
-
-/* Menu */
-.ui[class*="top fixed"].menu {
-  background-color: #3C3C3C; 
-}
-
-.ui.menu:not(.vertical) .item {
-  color: #CCCCCC !important;
-}
-
-.ui.link.menu .item:hover, .ui.menu .dropdown.item:hover, .ui.menu .link.item:hover, .ui.menu a.item:hover {
-  background: rgba(0,0,0,0.2) !important;
+.ui.menu .active.item:hover {
+  background-color: #222222;
 }
 
 .ui.menu .active.item {
-  color: white !important;
-  background: rgba(0,0,0,0.4) !important;
+  background-color: #222222 !important;
 }
 
-/* Display Items */
-.ui.items>.item>.content>*:not(.button) {
-  color: rgb(218, 218, 218) !important;
+.ui.menu .item:hover {
+  background: rgba(0, 0, 0, .1) !important;
 }
 
-/* Inputs */
-.ui.input>input, .ui.selection.dropdown {
-  background: #383838 !important;
-  color: #AEAEAE !important;
+.ui.menu .close:hover {
+  background: rgba(255, 0, 0, .15) !important;
 }
 
-/* Buttons */
-.ui.button {
-  box-shadow: 0 0 0 2px #fff inset !important;
-  background: transparent none;
-  color: #fff;
-  text-shadow: none !important;
+/* Settings Page */
+.ui.input input {
+  background-color: #555555 !important;
 }
 
-.ui.button:hover {
-  background: #fff;
-  box-shadow: 0 0 0 2px #fff inset!important;
-  color: rgba(0,0,0,.8);
+.ui.label, .ui.basic.label {
+  background-color: #555555;
 }
 
-.ui.teal.button, .ui.teal.buttons .button {
+.ui.button,
+.ui.basic.button {
+  background-color: #444444;
+}
+
+.ui.positive.button {
   background-color: transparent;
-  box-shadow: 0 0 0 2px #00b5ad inset !important;
-  color: #02e0d6;
-  text-shadow: none !important;
+  color: #16ab39 !important;
+  box-shadow: 0 0 0 2px #16ab39 inset !important;
 }
 
-.ui.teal.button:hover, .ui.teal.buttons .button:hover {
-  background-color: #00b5ad;
-  color: white;
+.ui.positive.button:hover {
+  color: #222222 !important;
 }
 
-.ui.teal.button:active, .ui.teal.buttons .button:active {
-  background-color: #00827c !important;
-  box-shadow: 0 0 0 2px #00827c inset !important;
-  color: #fff;
-  text-shadow: none;
+.ui.button:hover,
+.ui.basic.button:hover,
+.ui.basic.button:active,
+.ui.basic.button:focus {
+  background-color: #666666;
 }
 
-.ui.buttons .button:first-child {
-  margin-left: 0;
+.ui.selection, .menu>.item {
+  background-color: #555555 !important;
 }
 
-.ui.buttons .button {
-  margin: 0 0 0 -2px;
+.ui.selection.dropdown:focus,
+.ui.selection.dropdown:hover,
+.ui.selection.active.dropdown,
+.ui.selection.dropdown .menu,
+.ui.selection.active.dropdown .menu,
+.ui.selection.active.dropdown .menu:active,
+.ui.selection.dropdown .menu>.item,
+input:active,
+.ui[class*="right labeled"].input>input:focus {
+  border-color: #7E8388 !important;
 }
 
-.ui.green.button, .ui.green.buttons .button {
-  background-color: transparent;
-  box-shadow: 0 0 0 2px #21BA45 inset !important;
-  color: #21BA45;
-  text-shadow: none !important;
+input[type=number]::-webkit-inner-spin-button {
+  background-color: #FF0000;
 }
-.ui.green.button:hover, .ui.green.buttons .button:hover {
-  background-color: #21BA45;
-  color: white;
+
+.ui.warning.message {
+  background-color: #333333;
+  box-shadow: 0 0 0 1px #7E8388 inset,
+  0 0 0 0 transparent;
+}
+
+.ui.selection.dropdown .menu>.item.selected {
+  background-color: #222222 !important;
 }
\ No newline at end of file
diff --git a/src/electron/ipc/download/FileExtractor.ts b/src/electron/ipc/download/FileExtractor.ts
index 7f59d41..5ef1874 100644
--- a/src/electron/ipc/download/FileExtractor.ts
+++ b/src/electron/ipc/download/FileExtractor.ts
@@ -106,6 +106,7 @@ export class FileExtractor {
    * Deletes the archive at `archiveFilepath`, then transfers the extracted chart to `this.libraryFolder`.
    */
   private async transfer(archiveFilepath?: string) {
+    // TODO: this fails if the extracted chart has nested folders
     if (this.wasCanceled) { return } // CANCEL POINT
     try {
       
diff --git a/src/styles.scss b/src/styles.scss
index ed93efd..c5a249a 100644
--- a/src/styles.scss
+++ b/src/styles.scss
@@ -1,4 +1,4 @@
-// @import './assets/themes/dark.css';
+// @import './assets/themes/Dark.css';
 
 * {
   user-select: none;