diff --git a/browser/main/Main.js b/browser/main/Main.js
index 230dddd7..9669e105 100644
--- a/browser/main/Main.js
+++ b/browser/main/Main.js
@@ -190,6 +190,7 @@ class Main extends React.Component {
       'menubar:togglemenubar',
       this.toggleMenuBarVisible.bind(this)
     )
+    clearInterval(this.refreshTheme)
   }
 
   toggleMenuBarVisible() {
diff --git a/browser/main/lib/ThemeManager.js b/browser/main/lib/ThemeManager.js
index fa90def2..fcb8a055 100644
--- a/browser/main/lib/ThemeManager.js
+++ b/browser/main/lib/ThemeManager.js
@@ -10,8 +10,8 @@ const chooseTheme = ui => {
   const minutes = now.getHours() * 60 + now.getMinutes()
 
   const isEndAfterStart = end > start
-  const isBetweenStartAndEnd = minutes >= start && minutes <= end
-  const isBetweenEndAndStart = minutes >= start || minutes <= end
+  const isBetweenStartAndEnd = minutes >= start && minutes < end
+  const isBetweenEndAndStart = minutes >= start || minutes < end
 
   if (
     (isEndAfterStart && isBetweenStartAndEnd) ||
diff --git a/browser/main/modals/PreferencesModal/UiTab.js b/browser/main/modals/PreferencesModal/UiTab.js
index c556dc87..f3a092f8 100644
--- a/browser/main/modals/PreferencesModal/UiTab.js
+++ b/browser/main/modals/PreferencesModal/UiTab.js
@@ -335,7 +335,7 @@ class UiTab extends React.Component {
           </div>
           <div styleName='group-section'>
             <div styleName='container'>
-              <div styleName='range-slider' id='firstRow'>
+              <div id='firstRow'>
                 <span
                   id='rs-bullet-1'
                   styleName='rs-label'
@@ -353,7 +353,7 @@ class UiTab extends React.Component {
                   onChange={e => this.handleUIChange(e)}
                 />
               </div>
-              <div styleName='range-slider' id='secondRow'>
+              <div id='secondRow'>
                 <span
                   id='rs-bullet-2'
                   styleName='rs-label'