diff --git a/dark-mode-switch.js b/dark-mode-switch.js
index aa34359..73796ce 100644
--- a/dark-mode-switch.js
+++ b/dark-mode-switch.js
@@ -21,12 +21,22 @@ window.addEventListener('load', () => {
  * @return {void}
  */
 function initTheme() {
+  const systemPrefersDarkMode = window.matchMedia("(prefers-color-scheme: dark)").matches;
   const darkThemeSelected =
     localStorage.getItem('darkSwitch') !== null &&
     localStorage.getItem('darkSwitch') === 'dark';
-  darkSwitch.checked = darkThemeSelected;
-  darkThemeSelected ? document.body.setAttribute('data-theme', 'dark') :
+  if (darkThemeSelected) {
+    darkSwitch.checked = true;
+    document.body.setAttribute('data-theme', 'dark');
+  }
+  else if (systemPrefersDarkMode) {
+    darkSwitch.checked = true;
+    document.body.setAttribute('data-theme', 'dark');
+  }
+  else {
+    darkSwitch.checked = false;
     document.body.removeAttribute('data-theme');
+  }
 }
 
 
diff --git a/index.html b/index.html
index b7c6c3e..a9973c3 100644
--- a/index.html
+++ b/index.html
@@ -34,7 +34,7 @@ <h3 class="float-left">Dark Mode Switch</h3>
             <label class="custom-control-label" for="darkSwitch">Dark Mode</label>
           </div>
 
-          <script src="dark-mode-switch.min.js"></script>
+          <script src="dark-mode-switch.js"></script>
 
         </div>
       </nav>