diff --git a/package.json b/package.json
index 66616b66..c8cfaf6d 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
     "prebuild": "rm -rf dist",
     "build": "tsc",
     "postbuild": "rsync -av --exclude='js' src/ dist",
-    "eslint": "eslint 'js/**/*.js'",
+    "eslint": "eslint 'src/js/**/*.ts'",
     "stylelint": "stylelint --allow-empty-input 'src/**/*.css'",
     "lint": "npm run eslint && npm run stylelint",
     "prerelease": "npm run test && npm run build",
diff --git a/src/css/style.css b/src/css/style.css
index 9305bb8a..a230c720 100644
--- a/src/css/style.css
+++ b/src/css/style.css
@@ -1,8 +1,8 @@
 /* General styling */
 body {
   background: #ededed;
-  font-size: 13px;
   font: message-box;
+  font-size: 13px;
 }
 
 a {
@@ -13,26 +13,6 @@ a:visited {
   color: #0921ea;
 }
 
-input[type='text']:invalid {
-  border: 1px solid #ff0000;
-  box-shadow:
-    inset 0 1px 1px rgba(0, 0, 0, 0.075),
-    0 0 8px rgba(255, 0, 0, 0.6);
-}
-
-input[type='button'] {
-  min-width: 100px;
-  width: auto;
-}
-
-input[type='button']:disabled,
-input[type='button']:disabled:hover,
-input[type='button']:disabled:focus {
-  background-color: grey;
-  border-color: grey;
-  cursor: not-allowed;
-}
-
 input[type='text'],
 select {
   background-color: #fff;
@@ -42,12 +22,16 @@ select {
   min-height: 2em;
 }
 
-input[type='text']:focus,
-select:focus {
-  border-color: #66afe9;
+input[type='text']:invalid {
+  border: 1px solid #ff0000;
   box-shadow:
     inset 0 1px 1px rgba(0, 0, 0, 0.075),
-    0 0 8px rgba(102, 175, 233, 0.6);
+    0 0 8px rgba(255, 0, 0, 0.6);
+}
+
+input[type='button'] {
+  min-width: 100px;
+  width: auto;
 }
 
 input[type='button'],
@@ -73,6 +57,22 @@ input[type='submit']:focus {
   border-color: #285e8e;
 }
 
+input[type='button']:disabled,
+input[type='button']:disabled:hover,
+input[type='button']:disabled:focus {
+  background-color: grey;
+  border-color: grey;
+  cursor: not-allowed;
+}
+
+input[type='text']:focus,
+select:focus {
+  border-color: #66afe9;
+  box-shadow:
+    inset 0 1px 1px rgba(0, 0, 0, 0.075),
+    0 0 8px rgba(102, 175, 233, 0.6);
+}
+
 label {
   font-size: 16px;
   line-height: 25px;