diff --git a/app/styles/base/_base.scss b/app/styles/base/_base.scss
index 149ff0f0..4a813d89 100644
--- a/app/styles/base/_base.scss
+++ b/app/styles/base/_base.scss
@@ -3,7 +3,6 @@
 // Copyright 2013-2015 thoughtbot, inc.
 // MIT License
 
-@import 'themes';
 @import 'colors';
 @import 'variables';
 @import 'media';
@@ -13,3 +12,5 @@
 @import 'forms';
 @import 'lists';
 @import 'typography';
+@import 'theme-vars-support';
+@import 'theme-vars';
diff --git a/app/styles/base/_themes.scss b/app/styles/base/_themes.scss
deleted file mode 100644
index 72b04ae6..00000000
--- a/app/styles/base/_themes.scss
+++ /dev/null
@@ -1,12 +0,0 @@
-@import 'theme-vars-support';
-@import 'theme-vars';
-
-@each $theme-name, $theme-vars in $themes {
-    $theme-vars: set-theme-vars($theme-vars);
-
-    .th-#{$theme-name} {
-        @each $key, $value in $theme-vars {
-            --#{$key}: #{$value};
-        }
-    }
-}
diff --git a/app/styles/main.scss b/app/styles/main.scss
index 0a9082d7..6c64b24a 100644
--- a/app/styles/main.scss
+++ b/app/styles/main.scss
@@ -5,10 +5,10 @@ $fa-font-path: '~font-awesome/fonts';
 @import '~pikaday/scss/pikaday';
 @import '~bourbon/app/assets/stylesheets/bourbon';
 
-@import 'themes/all-themes';
-
 @import 'base/base';
 
+@import 'themes/all-themes';
+
 @import 'utils/back-button';
 @import 'utils/common-dropdown';
 @import 'utils/auto-type-hint';
diff --git a/app/styles/themes/_all-themes.scss b/app/styles/themes/_all-themes.scss
index d37d432f..4b0624af 100644
--- a/app/styles/themes/_all-themes.scss
+++ b/app/styles/themes/_all-themes.scss
@@ -9,3 +9,13 @@ $themes: ();
 @import 'solarized-dark';
 @import 'solarized-light';
 @import 'macos-dark';
+
+@each $theme-name, $theme-vars in $themes {
+    $theme-vars: set-theme-vars($theme-vars);
+
+    .th-#{$theme-name} {
+        @each $key, $value in $theme-vars {
+            --#{$key}: #{$value};
+        }
+    }
+}
diff --git a/app/styles/themes/_macos-dark.scss b/app/styles/themes/_macos-dark.scss
index 6b89eefd..0bc99f02 100644
--- a/app/styles/themes/_macos-dark.scss
+++ b/app/styles/themes/_macos-dark.scss
@@ -46,10 +46,12 @@ body.th-macdark {
     .app__footer {
         background-color: var(--secondary-background-color);
     }
-    .list__item--active, .list__item--active:hover {
-        background-color: #2457C9;
-        .list__item-descr {
-            color: #8F8F91;
+    @include nomobile {
+        .list__item--active, .list__item--active:hover {
+            background-color: #2457C9;
+            .list__item-descr {
+                color: #8F8F91;
+            }
         }
     }
 }