diff --git a/style/pi-hole.css b/style/pi-hole.css
index 07c24af9..16791c5b 100644
--- a/style/pi-hole.css
+++ b/style/pi-hole.css
@@ -6,281 +6,292 @@
 *  Please see LICENSE file for your rights under this license. */
 
 .layout-boxed {
-    background: url('../img/boxed-bg.jpg') repeat fixed;
+  background: url("../img/boxed-bg.jpg") repeat fixed;
 }
 
 .small-box {
-	cursor: default;
-	-webkit-user-select: none; /* Chrome/Safari */
-	-moz-user-select: none; /* Firefox */
-	-ms-user-select: none; /* IE10+ */
-
-	/* Rules below not implemented in browsers yet */
-	-o-user-select: none;
-	user-select: none;
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
 }
+
 .small-box span {
-	-webkit-transition-duration: 500ms;
-	-o-transition-duration: 500ms;
-	transition-duration: 500ms;
+  transition-duration: 0.5s;
 }
+
 .small-box span.glow {
-	text-shadow: 0 0 5px currentColor;
+  text-shadow: 0 0 5px currentColor;
 }
 
-.list-group-item:hover {
-	background: #ddd;
+@-webkit-keyframes Pulse {
+  from {
+    color: #630030;
+    text-shadow: 0 0 2px transparent;
+  }
+
+  50% {
+    color: #e33100;
+    text-shadow: 0 0 5px #e33100;
+  }
+
+  to {
+    color: #630030;
+    text-shadow: 0 0 2px transparent;
+  }
 }
 
-@-webkit-keyframes Pulse{
-	from {color:#630030;-webkit-text-shadow:0 0 2px transparent;}
-	50% {color:#e33100;-webkit-text-shadow:0 0 5px #e33100;}
-	to {color:#630030;-webkit-text-shadow:0 0 2px transparent;}
-}
-@-o-keyframes Pulse{
-	from {color:#630030;text-shadow:0 0 2px transparent;}
-	50% {color:#e33100;text-shadow:0 0 5px #e33100;}
-	to {color:#630030;text-shadow:0 0 2px transparent;}
-}
-@keyframes Pulse{
-	from {color:#630030;text-shadow:0 0 2px transparent;}
-	50% {color:#e33100;text-shadow:0 0 5px #e33100;}
-	to {color:#630030;text-shadow:0 0 2px transparent;}
+@keyframes Pulse {
+  from {
+    color: #630030;
+    text-shadow: 0 0 2px transparent;
+  }
+
+  50% {
+    color: #e33100;
+    text-shadow: 0 0 5px #e33100;
+  }
+
+  to {
+    color: #630030;
+    text-shadow: 0 0 2px transparent;
+  }
 }
+
 .lookatme {
-	-webkit-animation-name: Pulse;
-	-o-animation-name: Pulse;
-	animation-name: Pulse;
-	-webkit-animation-duration: 2s;
-	-o-animation-duration: 2s;
-	animation-duration: 2s;
-	-webkit-animation-iteration-count: infinite;
-	-o-animation-iteration-count: infinite;
-	animation-iteration-count: infinite;
+  -webkit-animation: 2s infinite Pulse;
+  animation: 2s infinite Pulse;
 }
 
 .table-responsive {
-    -webkit-overflow-scrolling: touch;
+  -webkit-overflow-scrolling: touch;
 }
 
 /* Optimize Queries-Table for small screens */
-#all-queries td:nth-of-type(1),  /* Time column */
-#all-queries td:nth-of-type(5) { /* Status column */
-    white-space: nowrap;
+/* Time column */
+#all-queries td:nth-of-type(1),
+/* Status column */
+#all-queries td:nth-of-type(5) {
+  white-space: nowrap;
 }
-#all-queries td:nth-of-type(3) { /* Domain column */
-    min-width: 200px;
-    word-break: break-all;
-    white-space: pre-wrap;
+
+/* Domain column */
+#all-queries td:nth-of-type(3) {
+  min-width: 200px;
+  word-break: break-all;
+  white-space: pre-wrap;
 }
-#all-queries_info { /* Allow Info String to wrap (useful while filtering entries on small screen) */
-	white-space: unset;
+
+/* Allow Info String to wrap (useful while filtering entries on small screen) */
+#all-queries_info {
+  white-space: unset;
 }
-#all-queries_wrapper .pagination > li > a { /* adjust the buttons width */
-    padding-left: 6px;
-    padding-right: 6px;
-    min-width: 34px;
-    text-align: center;
+
+/* adjust the buttons width */
+#all-queries_wrapper .pagination > li > a {
+  padding-left: 6px;
+  padding-right: 6px;
+  min-width: 34px;
+  text-align: center;
 }
-@media screen and (max-width: 500px),
-       screen and (min-width: 767px) and (max-width: 1000px) {
-     /* Hide "Previous" & "Next"-Buttons in Pagination */
-    #all-queries_wrapper .pagination > li.previous,
-    #all-queries_wrapper .pagination > li.next {
-        display: none;
-    }
-    #all-queries_wrapper .pagination > li:nth-of-type(2) a {
-        border-top-left-radius: 4px;
-        border-bottom-left-radius: 4px;
-    }
-    #all-queries_wrapper .pagination > li:nth-last-of-type(2) a {
-        border-top-right-radius: 4px;
-        border-bottom-right-radius: 4px;
-    }
+
+@media screen and (max-width: 500px), screen and (min-width: 767px) and (max-width: 1000px) {
+  /* Hide "Previous" & "Next"-Buttons in Pagination */
+  #all-queries_wrapper .pagination > li.previous,
+  #all-queries_wrapper .pagination > li.next {
+    display: none;
+  }
+
+  #all-queries_wrapper .pagination > li:nth-of-type(2) a {
+    border-top-left-radius: 4px;
+    border-bottom-left-radius: 4px;
+  }
+
+  #all-queries_wrapper .pagination > li:nth-last-of-type(2) a {
+    border-top-right-radius: 4px;
+    border-bottom-right-radius: 4px;
+  }
 }
 
 #resetButton {
-	font-weight: 700;
+  font-weight: 700;
 }
 
 .vertical-alignment-helper {
-    display: table;
-    width: 100%;
-    height: 100%;
-    pointer-events: none;
+  display: table;
+  width: 100%;
+  height: 100%;
+  pointer-events: none;
 }
+
 .vertical-alignment-helper > .vertical-align-center {
-    display: table-cell;
-    vertical-align: middle;
+  display: table-cell;
+  vertical-align: middle;
 }
+
 .vertical-alignment-helper > .vertical-align-center > .modal-content {
-    width: 250px;
-    margin-left: auto;
-    margin-right: auto;
-    word-wrap: break-word;
-    pointer-events: all;
+  width: 250px;
+  margin-left: auto;
+  margin-right: auto;
+  word-wrap: break-word;
+  pointer-events: all;
 }
 
 .alSpinner {
-    top: 0.1em;
-    left: 0.1em;
-    width: 0.8em;
-    height: 0.8em;
-    border-radius: 50%;
-    border: 4px solid #c0c0c0;
-    border-right-color: transparent;
-    -webkit-animation: fa-spin 1s infinite linear;
-    -o-animation: fa-spin 1s infinite linear;
-    animation: fa-spin 1s infinite linear;
+  top: 0.1em;
+  left: 0.1em;
+  width: 0.8em;
+  height: 0.8em;
+  border-radius: 50%;
+  border: 4px solid #c0c0c0;
+  border-right-color: transparent;
+  -webkit-animation: fa-spin 1s infinite linear;
+  animation: fa-spin 1s infinite linear;
 }
 
-.extratooltipcanvas{
-    -moz-user-select: none;
-    -webkit-user-select: none;
-    -ms-user-select: none;
-    user-select: none
+.extratooltipcanvas {
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
 }
 
 .chartjs-tooltip {
-    opacity: 0;
-    position: absolute;
-    pointer-events: none;
-    color: #fff;
-    background-color: rgba(0,0,0,0.8);
-    max-width: 95%;
-    z-index: 900;
+  opacity: 0;
+  position: absolute;
+  pointer-events: none;
+  color: #fff;
+  background-color: rgba(0, 0, 0, 0.8);
+  max-width: 95%;
+  z-index: 900;
 }
 
 .chartjs-tooltip th {
-    padding-bottom: 3px;
+  padding-bottom: 3px;
 }
 
 .chartjs-tooltip,
 .chartjs-tooltip .arrow {
-    -webkit-transition: all .2s cubic-bezier(0.165, 0.84, 0.44, 1);
-    transition: all .2s cubic-bezier(0.165, 0.84, 0.44, 1);
+  transition: all 0.2s cubic-bezier(0.165, 0.84, 0.44, 1);
 }
 
 .chartjs-tooltip .arrow {
-    position: absolute;
-    width: 0;
-    height: 0;
-    border-color: transparent;
-    border-style: solid;
+  position: absolute;
+  width: 0;
+  height: 0;
+  border-color: transparent;
+  border-style: solid;
 }
 
 .chartjs-tooltip.bottom .arrow {
-    top: 100%;
-    left: 50%;
-    margin: 0 -5px -5px;
-    border-width: 5px 5px 0;
-    border-top-color: rgba(0, 0, 0, .8);
+  top: 100%;
+  left: 50%;
+  margin: 0 -5px -5px;
+  border-width: 5px 5px 0;
+  border-top-color: rgba(0, 0, 0, 0.8);
 }
 
 .chartjs-tooltip.top .arrow {
-    top: 0;
-    left: 50%;
-    border-width: 0 5px 5px;
-    margin: -5px -5px 0;
-    border-bottom-color: rgba(0, 0, 0, .8);
+  top: 0;
+  left: 50%;
+  border-width: 0 5px 5px;
+  margin: -5px -5px 0;
+  border-bottom-color: rgba(0, 0, 0, 0.8);
 }
 
 .chartjs-tooltip.right.center .arrow {
-    top: 50%;
-    left: 100%;
-    margin: -5px -5px -5px 0;
-    border-width: 5px 0 5px 5px;
-    border-left-color: rgba(0, 0, 0, .8);
+  top: 50%;
+  left: 100%;
+  margin: -5px -5px -5px 0;
+  border-width: 5px 0 5px 5px;
+  border-left-color: rgba(0, 0, 0, 0.8);
 }
 
 .chartjs-tooltip.left.center .arrow {
-    top: 50%;
-    left: 0;
-    margin: -5px 0 -5px -5px;
-    border-width: 5px 5px 5px 0;
-    border-right-color: rgba(0, 0, 0, .8);
+  top: 50%;
+  left: 0;
+  margin: -5px 0 -5px -5px;
+  border-width: 5px 5px 5px 0;
+  border-right-color: rgba(0, 0, 0, 0.8);
 }
 
 .chartjs-tooltip-key {
-    display: inline-block;
-    width: 12px;
-    height: 12px;
-    margin-right: 3px;
-    vertical-align: text-top;
+  display: inline-block;
+  width: 12px;
+  height: 12px;
+  margin-right: 3px;
+  vertical-align: text-top;
 }
 
 .chart-legend {
-    height: 250px;
-    overflow: auto;
+  height: 250px;
+  overflow: auto;
 }
 
 .chart-legend ul {
-    list-style-type: none;
+  list-style-type: none;
 }
 
 .chart-legend li {
-    cursor: pointer;
-    word-break: break-all;
+  cursor: pointer;
+  word-break: break-all;
 }
 
 .chart-legend li span {
-    display: inline-block;
-    width: 20px;
-    height: 12px;
-    margin-right: 5px;
+  display: inline-block;
+  width: 20px;
+  height: 12px;
+  margin-right: 5px;
 }
 
 .strike {
-    text-decoration: line-through !important;
+  text-decoration: line-through !important;
 }
 
 .fa-paypal-icon {
-    width: 18px;
-    margin-left: 2px;
+  width: 18px;
+  margin-left: 2px;
 }
 
 /* Utilities */
 .text-underline {
-    text-decoration: underline;
+  text-decoration: underline;
 }
 
 .breakall {
-    white-space: -moz-pre-wrap;
-    white-space: -pre-wrap;
-    white-space: -o-pre-wrap;
-    white-space: pre-wrap;
-    word-break: break-all;
-    word-wrap: break-word; /* Internet Explorer 5.5+ */
+  white-space: pre-wrap;
+  word-break: break-all;
+  word-wrap: break-word;
 }
 
 .pointer {
-    cursor: pointer;
+  cursor: pointer;
 }
 
 .bootstrap-select.bs-container.align-right {
-    left: unset !important;
-    right: 10px;
+  left: unset !important;
+  right: 10px;
 }
 
 .input-group-addon {
-	padding: 0 12px;
+  padding: 0 12px;
 }
 
 .user-panel > .info > span {
-    padding-right: 5px;
-    margin-top: 3px;
-    font-size: 11px;
+  padding-right: 5px;
+  margin-top: 3px;
+  font-size: 11px;
 }
 
 .user-panel > .info i {
-    margin-right: 3px;
+  margin-right: 3px;
 }
 
-.row-centered > div[class^=col-] {
-    display: inline-block;
-    float: none;
+.row-centered > div[class^="col-"] {
+  display: inline-block;
+  float: none;
 }
 
 .version-info {
-    margin-top: 10px;
+  margin-top: 10px;
 }
diff --git a/style/themes/default-dark.css b/style/themes/default-dark.css
index e511b2e0..8a4e4ae9 100644
--- a/style/themes/default-dark.css
+++ b/style/themes/default-dark.css
@@ -88,7 +88,7 @@ h4 {
 }
 .sidebar-menu > li.header {
   color: #556068;
-  background: #1e2225;
+  background-color: #1e2225;
 }
 .sidebar-menu > li > a {
   border-left: 3px solid transparent;
@@ -96,12 +96,12 @@ h4 {
 .sidebar-menu > li:hover > a,
 .sidebar-menu > li.active > a {
   color: #fff;
-  background: #22272a;
+  background-color: #22272a;
   border-left-color: #272c30;
 }
 .sidebar-menu > li > .treeview-menu {
   margin: 0 1px;
-  background: #32393e;
+  background-color: #32393e;
 }
 .sidebar a {
   color: #bec5cb;
@@ -175,7 +175,6 @@ h4 {
 .box-solid > .box-header,
 .box > .box-header {
   color: #bec5cb;
-  background: #272c30;
   background-color: #272c30;
 }
 .box-solid > .box-header a,
@@ -220,7 +219,7 @@ h4 {
 .main-header .navbar .nav .open > a:hover,
 .main-header .navbar .nav .open > a:focus,
 .main-header .navbar .nav > .active > a {
-  background: rgba(0, 0, 0, 0.1);
+  background-color: rgba(0, 0, 0, 0.1);
   color: #f6f6f6;
 }
 .main-header .navbar .sidebar-toggle {
@@ -228,7 +227,7 @@ h4 {
 }
 .main-header .navbar .sidebar-toggle:hover {
   color: #f6f6f6;
-  background: rgba(0, 0, 0, 0.1);
+  background-color: rgba(0, 0, 0, 0.1);
 }
 .timeline li .timeline-item {
   color: #bec5cb;
@@ -319,16 +318,16 @@ h4 {
   background: url("../../img/boxed-bg-dark.jpg") repeat fixed;
 }
 .not-used {
-  background: #eee;
+  background-color: #eee;
 }
 .not-used:hover {
-  background: #c5c5c5;
+  background-color: #c5c5c5;
 }
 .used {
-  background: #fff;
+  background-color: #fff;
 }
 .used:hover {
-  background: #ddd;
+  background-color: #ddd;
 }
 
 .graphs-grid {
@@ -503,20 +502,22 @@ fieldset[disabled] .form-control {
 .icheckbox_polaris,
 .icheckbox_futurico,
 .icheckbox_minimal-blue {
-	margin-right: 10px;
+  margin-right: 10px;
 }
 .iradio_polaris,
 .iradio_futurico,
 .iradio_minimal-blue {
-	margin-right: 8px;
+  margin-right: 8px;
 }
 
 /* Overlay box with spinners as shown during data collection for graphs */
-.box .overlay, .overlay-wrapper .overlay {
-	z-index: 50;
-  background: #353c42bb;
-	border-radius: 3px;
+.box .overlay,
+.overlay-wrapper .overlay {
+  z-index: 50;
+  background-color: #353c42bb;
+  border-radius: 3px;
 }
-.box .overlay > .fa, .overlay-wrapper .overlay > .fa {
+.box .overlay > .fa,
+.overlay-wrapper .overlay > .fa {
   color: #bec5cb;
-}
\ No newline at end of file
+}
diff --git a/style/themes/default-light.css b/style/themes/default-light.css
index 292382ec..859af1c3 100644
--- a/style/themes/default-light.css
+++ b/style/themes/default-light.css
@@ -18,7 +18,7 @@
 .main-header .navbar .nav .open > a,
 .main-header .navbar .nav .open > a:hover,
 .main-header .navbar .nav .open > a:focus {
-  background: rgba(0, 0, 0, 0.1);
+  background-color: rgba(0, 0, 0, 0.1);
   color: #f6f6f6;
 }
 .main-header .navbar .sidebar-toggle {
@@ -26,7 +26,7 @@
 }
 .main-header .navbar .sidebar-toggle:hover {
   color: #f6f6f6;
-  background: rgba(0, 0, 0, 0.1);
+  background-color: rgba(0, 0, 0, 0.1);
   background-color: #367fa9;
 }
 @media (max-width: 767px) {
@@ -37,7 +37,7 @@
     color: #fff;
   }
   .main-header .navbar .dropdown-menu li a:hover {
-    background: #367fa9;
+    background-color: #367fa9;
   }
 }
 .main-header .logo {
@@ -52,7 +52,7 @@
   background-color: #3c8dbc;
 }
 .content-header {
-  background: transparent;
+  background-color: transparent;
 }
 .wrapper,
 .main-sidebar,
@@ -65,7 +65,7 @@
 }
 .sidebar-menu > li.header {
   color: #4b646f;
-  background: #1a2226;
+  background-color: #1a2226;
 }
 .sidebar-menu > li > a {
   border-left: 3px solid transparent;
@@ -73,12 +73,12 @@
 .sidebar-menu > li:hover > a,
 .sidebar-menu > li.active > a {
   color: #fff;
-  background: #1e282c;
+  background-color: #1e282c;
   border-left-color: #3c8dbc;
 }
 .sidebar-menu > li > .treeview-menu {
   margin: 0 1px;
-  background: #2c3b41;
+  background-color: #2c3b41;
 }
 .sidebar a {
   color: #b8c7ce;
@@ -104,8 +104,6 @@
   background-color: #374850;
   border: 1px solid transparent;
   height: 35px;
-  -webkit-transition: all 0.3s ease-in-out;
-  -o-transition: all 0.3s ease-in-out;
   transition: all 0.3s ease-in-out;
 }
 .sidebar-form input[type="text"] {
@@ -140,16 +138,16 @@
 }
 
 .not-used {
-  background: #eee;
+  background-color: #eee;
 }
 .not-used:hover {
-  background: #c5c5c5;
+  background-color: #c5c5c5;
 }
 .used {
-  background: #fff;
+  background-color: #fff;
 }
 .used:hover {
-  background: #ddd;
+  background-color: #ddd;
 }
 
 .graphs-grid {
@@ -214,8 +212,8 @@ td.highlight {
 }
 
 .icheckbox_minimal-blue {
-	margin-right: 10px;
+  margin-right: 10px;
 }
 .iradio_minimal-blue {
-	margin-right: 8px;
-}
\ No newline at end of file
+  margin-right: 8px;
+}