diff --git a/less/update/components/actor-global.less b/less/update/components/actor-global.less
index ea952caa..878877bd 100644
--- a/less/update/components/actor-global.less
+++ b/less/update/components/actor-global.less
@@ -34,10 +34,14 @@
 }
 
 .sw5e.sheet.actor {
-
+    input, select, textarea {
+        border-color: transparent;
+        background: none;
+        
+    }
     .swalt-sheet {
         display: grid;
-        grid-template-rows: 182px 40px auto;
+        grid-template-rows: 182px 36px auto;
         
         section>h1 {
             .russoOne(17px);
@@ -51,7 +55,7 @@
             grid-template-columns: 128px 1fr;
             column-gap: 8px;
             row-gap: 8px;
-
+            
             img {
                 grid-column-start: 1;
                 grid-row-start: 1;
@@ -74,7 +78,8 @@
                     .russoOne(32px);
                     text-transform: uppercase;
                     height: auto;
-
+                    border: none;
+                    background: none;
                     &:focus {
                         text-transform: none;
                     }
@@ -189,7 +194,7 @@
                 }
 
                 footer {
-
+                    
 
                     button {
                         background: none;
@@ -253,8 +258,8 @@
                 border-bottom: 3px solid transparent;
                 border-radius: 0;
                 margin: 0;
-                padding: 0 0 8px;
-                line-height: 1.6;
+                padding: 3px 0 0;
+                line-height: 1;
                 .russoOne(16px);
             }
         }
@@ -794,6 +799,7 @@
                             }
 
                             .attribute-footer {
+                                margin: 0;
                                 display: grid;
                                 grid-template-columns: 1fr 1fr;
 
@@ -818,7 +824,7 @@
 
                             h4 {
                                 font-size: 13px;
-
+                                margin: 0;
                                 //display: inline;
                                 &.rollable {
                                     &:hover {
diff --git a/less/update/components/actor-themes.less b/less/update/components/actor-themes.less
index 2110214e..aa1ed4d5 100644
--- a/less/update/components/actor-themes.less
+++ b/less/update/components/actor-themes.less
@@ -28,13 +28,21 @@
 
 .sw5e.sheet.actor {
     color: @colorBlack;
+    input, select, textarea {
+        &:hover {
+            border-color: @inputBorderFocus;
+        }
+        &:focus {
+            border-color: @inputBorderFocus;
+        }
+    }
     .swalt-sheet {
         section>h1 {
             border-bottom: 2px solid @colorBlue;
         }
 
         header {
-
+            
             h1.character-name {
                 color: @actorNameColor;
 
@@ -247,7 +255,9 @@
                         &:nth-child(even) {
                             background-color: @actorSkillsAltRowColor;
                         }
-
+                        .proficiency-toggle {
+                            color: @colorBlack;
+                        }
 
                         .skill-name {
                             &:hover {
diff --git a/less/update/components/foundry-app-window-themes.less b/less/update/components/foundry-app-window-themes.less
index 873feb1a..df745c7e 100644
--- a/less/update/components/foundry-app-window-themes.less
+++ b/less/update/components/foundry-app-window-themes.less
@@ -46,4 +46,31 @@
     border: none;
     margin-top: 4px;
   }
+}
+
+.dialog-buttons {
+  margin-top: 8px;
+  button:last-child {
+      margin-right: 0;
+    }
+  button:not(.default) {
+    border: 1px solid @buttonBackground;
+    margin-right: 4px;
+    background: @buttonSecondaryBackground;
+    color: @buttonSecondaryTextColor;
+    &:hover {
+      background: @buttonSecondaryHoverBackground;
+    }
+    
+  }
+  button.normal.default {
+    border: none;
+    background: @buttonBackground;
+    color: @buttonTextColor;
+    &:hover {
+      background: @buttonHoverBackground;
+    }
+  }
+
+
 }
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 9122d71a..588658f8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -89,6 +89,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
       "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+      "dev": true,
       "requires": {
         "micromatch": "^3.1.4",
         "normalize-path": "^2.1.1"
@@ -98,6 +99,7 @@
           "version": "2.1.1",
           "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
           "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+          "dev": true,
           "requires": {
             "remove-trailing-separator": "^1.0.1"
           }
@@ -270,6 +272,7 @@
       "version": "0.11.2",
       "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
       "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+      "dev": true,
       "requires": {
         "cache-base": "^1.0.1",
         "class-utils": "^0.3.5",
@@ -284,6 +287,7 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
           "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "dev": true,
           "requires": {
             "is-descriptor": "^1.0.0"
           }
@@ -292,6 +296,7 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
           "requires": {
             "kind-of": "^6.0.0"
           }
@@ -300,6 +305,7 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
           "requires": {
             "kind-of": "^6.0.0"
           }
@@ -308,6 +314,7 @@
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
           "requires": {
             "is-accessor-descriptor": "^1.0.0",
             "is-data-descriptor": "^1.0.0",
@@ -342,6 +349,7 @@
       "version": "2.3.2",
       "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
       "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "dev": true,
       "requires": {
         "arr-flatten": "^1.1.0",
         "array-unique": "^0.3.2",
@@ -359,6 +367,7 @@
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
           "requires": {
             "is-extendable": "^0.1.0"
           }
@@ -379,6 +388,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
       "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+      "dev": true,
       "requires": {
         "collection-visit": "^1.0.0",
         "component-emitter": "^1.2.1",
@@ -409,6 +419,7 @@
       "version": "2.1.8",
       "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.8.tgz",
       "integrity": "sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==",
+      "dev": true,
       "requires": {
         "anymatch": "^2.0.0",
         "async-each": "^1.0.1",
@@ -686,7 +697,6 @@
       "version": "0.1.7",
       "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz",
       "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==",
-      "optional": true,
       "requires": {
         "prr": "~1.0.1"
       }
@@ -772,6 +782,7 @@
       "version": "2.1.4",
       "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
       "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
+      "dev": true,
       "requires": {
         "debug": "^2.3.3",
         "define-property": "^0.2.5",
@@ -786,6 +797,7 @@
           "version": "0.2.5",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
           "requires": {
             "is-descriptor": "^0.1.0"
           }
@@ -794,6 +806,7 @@
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
           "requires": {
             "is-extendable": "^0.1.0"
           }
@@ -851,6 +864,7 @@
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
       "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+      "dev": true,
       "requires": {
         "array-unique": "^0.3.2",
         "define-property": "^1.0.0",
@@ -866,6 +880,7 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
           "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
+          "dev": true,
           "requires": {
             "is-descriptor": "^1.0.0"
           }
@@ -874,6 +889,7 @@
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
           "requires": {
             "is-extendable": "^0.1.0"
           }
@@ -882,6 +898,7 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
+          "dev": true,
           "requires": {
             "kind-of": "^6.0.0"
           }
@@ -890,6 +907,7 @@
           "version": "1.0.0",
           "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
+          "dev": true,
           "requires": {
             "kind-of": "^6.0.0"
           }
@@ -898,6 +916,7 @@
           "version": "1.0.2",
           "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
+          "dev": true,
           "requires": {
             "is-accessor-descriptor": "^1.0.0",
             "is-data-descriptor": "^1.0.0",
@@ -931,6 +950,7 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
       "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
+      "dev": true,
       "requires": {
         "extend-shallow": "^2.0.1",
         "is-number": "^3.0.0",
@@ -942,6 +962,7 @@
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
           "requires": {
             "is-extendable": "^0.1.0"
           }
@@ -961,6 +982,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-3.0.0.tgz",
       "integrity": "sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==",
+      "dev": true,
       "requires": {
         "detect-file": "^1.0.0",
         "is-glob": "^4.0.0",
@@ -1033,6 +1055,7 @@
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.13.tgz",
       "integrity": "sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==",
+      "dev": true,
       "optional": true,
       "requires": {
         "bindings": "^1.5.0",
@@ -1107,6 +1130,7 @@
       "version": "5.0.5",
       "resolved": "https://registry.npmjs.org/glob-watcher/-/glob-watcher-5.0.5.tgz",
       "integrity": "sha512-zOZgGGEHPklZNjZQaZ9f41i7F2YwE+tS5ZHrDhbBCk3stwahn5vQxnFmBJZHoYdusR6R1bLSXeGUy/BhctwKzw==",
+      "dev": true,
       "requires": {
         "anymatch": "^2.0.0",
         "async-done": "^1.2.0",
@@ -1156,6 +1180,7 @@
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/gulp/-/gulp-4.0.2.tgz",
       "integrity": "sha512-dvEs27SCZt2ibF29xYgmnwwCYZxdxhQ/+LFWlbAW8y7jt68L/65402Lz3+CKy0Ov4rOs+NERmDq7YlZaDqUIfA==",
+      "dev": true,
       "requires": {
         "glob-watcher": "^5.0.3",
         "gulp-cli": "^2.2.0",
@@ -1167,6 +1192,7 @@
           "version": "2.3.0",
           "resolved": "https://registry.npmjs.org/gulp-cli/-/gulp-cli-2.3.0.tgz",
           "integrity": "sha512-zzGBl5fHo0EKSXsHzjspp3y5CONegCm8ErO5Qh0UzFzk2y4tMvzLWhoDokADbarfZRL2pGpRp7yt6gfJX4ph7A==",
+          "dev": true,
           "requires": {
             "ansi-colors": "^1.0.1",
             "archy": "^1.0.0",
@@ -1194,6 +1220,7 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/gulp-less/-/gulp-less-4.0.1.tgz",
       "integrity": "sha512-hmM2k0FfQp7Ptm3ZaqO2CkMX3hqpiIOn4OHtuSsCeFym63F7oWlEua5v6u1cIjVUKYsVIs9zPg9vbqTEb/udpA==",
+      "dev": true,
       "requires": {
         "accord": "^0.29.0",
         "less": "2.6.x || ^3.7.1",
@@ -1229,6 +1256,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
       "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
+      "dev": true,
       "requires": {
         "get-value": "^2.0.6",
         "has-values": "^1.0.0",
@@ -1239,6 +1267,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
       "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
+      "dev": true,
       "requires": {
         "is-number": "^3.0.0",
         "kind-of": "^4.0.0"
@@ -1248,6 +1277,7 @@
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
           "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
+          "dev": true,
           "requires": {
             "is-buffer": "^1.1.5"
           }
@@ -1270,8 +1300,7 @@
     "image-size": {
       "version": "0.5.5",
       "resolved": "https://registry.npmjs.org/image-size/-/image-size-0.5.5.tgz",
-      "integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=",
-      "optional": true
+      "integrity": "sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w="
     },
     "indx": {
       "version": "0.2.3",
@@ -1445,6 +1474,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
       "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
+      "dev": true,
       "requires": {
         "kind-of": "^3.0.2"
       },
@@ -1453,6 +1483,7 @@
           "version": "3.2.2",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+          "dev": true,
           "requires": {
             "is-buffer": "^1.1.5"
           }
@@ -1609,6 +1640,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/liftoff/-/liftoff-3.1.0.tgz",
       "integrity": "sha512-DlIPlJUkCV0Ips2zf2pJP0unEoT1kwYhiiPUGF3s/jtxTCjziNLoiVVh+jqWOWeFi6mmwQ5fNxvAUyPad4Dfog==",
+      "dev": true,
       "requires": {
         "extend": "^3.0.0",
         "findup-sync": "^3.0.0",
@@ -1676,7 +1708,6 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
       "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
-      "optional": true,
       "requires": {
         "pify": "^4.0.1",
         "semver": "^5.6.0"
@@ -1685,8 +1716,7 @@
         "pify": {
           "version": "4.0.1",
           "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
-          "optional": true
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="
         }
       }
     },
@@ -1715,6 +1745,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/matchdep/-/matchdep-2.0.0.tgz",
       "integrity": "sha1-xvNINKDY28OzfCfui7yyfHd1WC4=",
+      "dev": true,
       "requires": {
         "findup-sync": "^2.0.0",
         "micromatch": "^3.0.4",
@@ -1726,6 +1757,7 @@
           "version": "2.0.0",
           "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-2.0.0.tgz",
           "integrity": "sha1-kyaxSIwi0aYIhlCoaQGy2akKLLw=",
+          "dev": true,
           "requires": {
             "detect-file": "^1.0.0",
             "is-glob": "^3.1.0",
@@ -1737,6 +1769,7 @@
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz",
           "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=",
+          "dev": true,
           "requires": {
             "is-extglob": "^2.1.0"
           }
@@ -1747,6 +1780,7 @@
       "version": "3.1.10",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
       "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "dev": true,
       "requires": {
         "arr-diff": "^4.0.0",
         "array-unique": "^0.3.2",
@@ -1766,8 +1800,7 @@
     "mime": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-      "optional": true
+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="
     },
     "minimatch": {
       "version": "3.0.4",
@@ -1815,6 +1848,7 @@
       "version": "1.2.13",
       "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
       "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+      "dev": true,
       "requires": {
         "arr-diff": "^4.0.0",
         "array-unique": "^0.3.2",
@@ -2153,8 +2187,7 @@
     "prr": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
-      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=",
-      "optional": true
+      "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY="
     },
     "pump": {
       "version": "2.0.1",
@@ -2212,6 +2245,7 @@
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.2.1.tgz",
       "integrity": "sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==",
+      "dev": true,
       "requires": {
         "graceful-fs": "^4.1.11",
         "micromatch": "^3.1.10",
@@ -2394,6 +2428,7 @@
       "version": "0.8.2",
       "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
       "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+      "dev": true,
       "requires": {
         "base": "^0.11.1",
         "debug": "^2.2.0",
@@ -2409,6 +2444,7 @@
           "version": "0.2.5",
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
+          "dev": true,
           "requires": {
             "is-descriptor": "^0.1.0"
           }
@@ -2417,6 +2453,7 @@
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
+          "dev": true,
           "requires": {
             "is-extendable": "^0.1.0"
           }
@@ -2750,6 +2787,7 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
       "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
+      "dev": true,
       "requires": {
         "is-number": "^3.0.0",
         "repeat-string": "^1.6.1"
@@ -2819,8 +2857,7 @@
     "uglify-to-browserify": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz",
-      "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=",
-      "optional": true
+      "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc="
     },
     "unc-path-regex": {
       "version": "0.1.2",
diff --git a/sw5e-dark.css b/sw5e-dark.css
index 629a0178..1f896724 100644
--- a/sw5e-dark.css
+++ b/sw5e-dark.css
@@ -516,6 +516,29 @@ body.dark-theme #client-settings section.content {
   border: none;
   margin-top: 4px;
 }
+body.dark-theme .dialog-buttons {
+  margin-top: 8px;
+}
+body.dark-theme .dialog-buttons button:last-child {
+  margin-right: 0;
+}
+body.dark-theme .dialog-buttons button:not(.default) {
+  border: 1px solid #E81111;
+  margin-right: 4px;
+  background: #828282;
+  color: white;
+}
+body.dark-theme .dialog-buttons button:not(.default):hover {
+  background: #8f8f8f;
+}
+body.dark-theme .dialog-buttons button.normal.default {
+  border: none;
+  background: #E81111;
+  color: white;
+}
+body.dark-theme .dialog-buttons button.normal.default:hover {
+  background: #ef2424;
+}
 body.dark-theme .panel {
   background: white;
 }
@@ -542,6 +565,16 @@ body.dark-theme .sw5e.sheet .window-content button:focus {
 body.dark-theme .sw5e.sheet.actor {
   color: #1C1C1C;
 }
+body.dark-theme .sw5e.sheet.actor input:hover,
+body.dark-theme .sw5e.sheet.actor select:hover,
+body.dark-theme .sw5e.sheet.actor textarea:hover {
+  border-color: #E81111;
+}
+body.dark-theme .sw5e.sheet.actor input:focus,
+body.dark-theme .sw5e.sheet.actor select:focus,
+body.dark-theme .sw5e.sheet.actor textarea:focus {
+  border-color: #E81111;
+}
 body.dark-theme .sw5e.sheet.actor .swalt-sheet section > h1 {
   border-bottom: 2px solid #0d99cc;
 }
@@ -663,6 +696,9 @@ body.dark-theme .sw5e.sheet.actor .swalt-sheet .tab.attributes .abilities .score
 body.dark-theme .sw5e.sheet.actor .swalt-sheet .tab.attributes .abilities .skills li:nth-child(even) {
   background-color: #f0f0f0;
 }
+body.dark-theme .sw5e.sheet.actor .swalt-sheet .tab.attributes .abilities .skills li .proficiency-toggle {
+  color: #1C1C1C;
+}
 body.dark-theme .sw5e.sheet.actor .swalt-sheet .tab.attributes .abilities .skills li .skill-name:hover {
   color: #E81111;
 }
diff --git a/sw5e-global.css b/sw5e-global.css
index a3dc9f67..32f78c35 100644
--- a/sw5e-global.css
+++ b/sw5e-global.css
@@ -716,9 +716,15 @@ input[type="reset"]:disabled {
 .sw5e.sheet .window-content button:focus {
   box-shadow: none;
 }
+.sw5e.sheet.actor input,
+.sw5e.sheet.actor select,
+.sw5e.sheet.actor textarea {
+  border-color: transparent;
+  background: none;
+}
 .sw5e.sheet.actor .swalt-sheet {
   display: grid;
-  grid-template-rows: 182px 40px auto;
+  grid-template-rows: 182px 36px auto;
 }
 .sw5e.sheet.actor .swalt-sheet section > h1 {
   font-family: 'Russo One';
@@ -760,6 +766,8 @@ input[type="reset"]:disabled {
   letter-spacing: 0.5px;
   text-transform: uppercase;
   height: auto;
+  border: none;
+  background: none;
 }
 .sw5e.sheet.actor .swalt-sheet header h1.character-name input[type="text"]:focus {
   text-transform: none;
@@ -919,8 +927,8 @@ input[type="reset"]:disabled {
   border-bottom: 3px solid transparent;
   border-radius: 0;
   margin: 0;
-  padding: 0 0 8px;
-  line-height: 1.6;
+  padding: 3px 0 0;
+  line-height: 1;
   font-family: 'Russo One';
   font-size: 16px;
   font-weight: 400;
@@ -1395,6 +1403,7 @@ input[type="reset"]:disabled {
   padding: 1px 4px;
 }
 .sw5e.sheet.actor .swalt-sheet .tab.attributes .traits-resources section.resources .resource-items .resource .attribute-footer {
+  margin: 0;
   display: grid;
   grid-template-columns: 1fr 1fr;
 }
@@ -1414,6 +1423,7 @@ input[type="reset"]:disabled {
 }
 .sw5e.sheet.actor .swalt-sheet .tab.attributes .traits-resources section.resources .counters .counter h4 {
   font-size: 13px;
+  margin: 0;
 }
 .sw5e.sheet.actor .swalt-sheet .tab.attributes .traits-resources section.resources .counters .counter h4.rollable:hover {
   text-shadow: none;
diff --git a/sw5e-light.css b/sw5e-light.css
index 1f01207d..3c53971b 100644
--- a/sw5e-light.css
+++ b/sw5e-light.css
@@ -516,6 +516,29 @@ body.light-theme #client-settings section.content {
   border: none;
   margin-top: 4px;
 }
+body.light-theme .dialog-buttons {
+  margin-top: 8px;
+}
+body.light-theme .dialog-buttons button:last-child {
+  margin-right: 0;
+}
+body.light-theme .dialog-buttons button:not(.default) {
+  border: 1px solid #c40f0f;
+  margin-right: 4px;
+  background: #D6D6D6;
+  color: #1C1C1C;
+}
+body.light-theme .dialog-buttons button:not(.default):hover {
+  background: #e3e3e3;
+}
+body.light-theme .dialog-buttons button.normal.default {
+  border: none;
+  background: #c40f0f;
+  color: white;
+}
+body.light-theme .dialog-buttons button.normal.default:hover {
+  background: #dc1111;
+}
 body.light-theme .panel {
   background: white;
 }
@@ -542,6 +565,16 @@ body.light-theme .sw5e.sheet .window-content button:focus {
 body.light-theme .sw5e.sheet.actor {
   color: #1C1C1C;
 }
+body.light-theme .sw5e.sheet.actor input:hover,
+body.light-theme .sw5e.sheet.actor select:hover,
+body.light-theme .sw5e.sheet.actor textarea:hover {
+  border-color: #c40f0f;
+}
+body.light-theme .sw5e.sheet.actor input:focus,
+body.light-theme .sw5e.sheet.actor select:focus,
+body.light-theme .sw5e.sheet.actor textarea:focus {
+  border-color: #c40f0f;
+}
 body.light-theme .sw5e.sheet.actor .swalt-sheet section > h1 {
   border-bottom: 2px solid #0d99cc;
 }
@@ -663,6 +696,9 @@ body.light-theme .sw5e.sheet.actor .swalt-sheet .tab.attributes .abilities .scor
 body.light-theme .sw5e.sheet.actor .swalt-sheet .tab.attributes .abilities .skills li:nth-child(even) {
   background-color: #f0f0f0;
 }
+body.light-theme .sw5e.sheet.actor .swalt-sheet .tab.attributes .abilities .skills li .proficiency-toggle {
+  color: #1C1C1C;
+}
 body.light-theme .sw5e.sheet.actor .swalt-sheet .tab.attributes .abilities .skills li .skill-name:hover {
   color: #c40f0f;
 }