From 0bccb4d73bfab63c925df48bc48dd6e475632138 Mon Sep 17 00:00:00 2001
From: Dorako <dirako@gmail.com>
Date: Tue, 26 Apr 2022 23:25:49 +0200
Subject: [PATCH] 1.3.15

---
 CHANGELOG.md          |   6 +-
 module.json           |   4 +-
 scripts/dorako-ui.js  |  36 +-
 styles/app-ui.css     | 782 ++++++++++++++++++++++--------------------
 styles/chat.css       |   2 +-
 styles/dorako-ui.css  |   7 +-
 styles/hotbar.css     |  10 +
 styles/sheet-dark.css | 503 ++++++++++++++++++++-------
 8 files changed, 834 insertions(+), 516 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ff5553c..7dd3c1e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
+# 1.3.15
+
+Dark-themed sheets are back, courtesy of @Vesselchuck. Disabling macrobar styling is better at its job. Fixed issue with centered macro bar being broken when app-ui styling was disabled.
+
 # 1.3.14
 
-Comaptible with Combat Carousel using Actor images. Small fix for Monk's TokenBar.
+Compatible with Combat Carousel using Actor images. Small fix for Monk's TokenBar.
 
 # 1.3.13
 
diff --git a/module.json b/module.json
index c29ac37..86fbd3d 100644
--- a/module.json
+++ b/module.json
@@ -4,12 +4,12 @@
   "description": "Overhauls the Foundry UI and several modules.",
   "url": "https://github.com/Dorako/pf2e-dorako-ui",
   "author": "Dorako",
-  "version": "1.3.14",
+  "version": "1.3.15",
   "minimumCoreVersion": "9",
   "compatibleCoreVersion": "9",
   "system": ["pf2e"],
   "scripts": ["scripts/dorako-ui.js"],
   "templates": ["templates/*"],
-  "download": "https://github.com/Dorako/pf2e-dorako-ui/archive/refs/tags/v1.3.14.zip",
+  "download": "https://github.com/Dorako/pf2e-dorako-ui/archive/refs/tags/v1.3.15.zip",
   "manifest": "https://github.com/Dorako/pf2e-dorako-ui/raw/main/module.json"
 }
diff --git a/scripts/dorako-ui.js b/scripts/dorako-ui.js
index 4e5ebf2..32647dd 100644
--- a/scripts/dorako-ui.js
+++ b/scripts/dorako-ui.js
@@ -160,6 +160,7 @@ Hooks.once("init", async function () {
       if (speaker.token) {
         const token = game.scenes.get(speaker.scene).tokens?.get(speaker.token);
         if (token) {
+          // return Actors.instance.get(speaker.actor).data.img;
           return token.data.img;
         }
       }
@@ -472,22 +473,21 @@ Hooks.once("init", async function () {
     },
   });
 
-  // game.settings.register('pf2e-dorako-ui', 'sheet', {
-  //     name: "Theme used for PC sheets",
-  //     hint: "",
-  //     scope: "world",
-  //     config: true,
-  //     default: "red",
-  //     type: String,
-  //     choices: {
-  //         "red": "Red (default)",
-  // 		"dark": "Dark",
-  //         "plain": "Plain"
-  //     },
-  // 	onChange: () => {
-  // 		debouncedReload();
-  // 	}
-  // });
+  game.settings.register("pf2e-dorako-ui", "sheet", {
+    name: "Theme used for PC sheets",
+    hint: "",
+    scope: "world",
+    config: true,
+    default: "red",
+    type: String,
+    choices: {
+      red: "Default",
+      dark: "Dark (@Vesselchuck)",
+    },
+    onChange: () => {
+      debouncedReload();
+    },
+  });
 
   game.settings.register("pf2e-dorako-ui", "backdrop-filter", {
     name: "Frosted glass?",
@@ -811,8 +811,8 @@ Hooks.once("init", async function () {
     if (game.settings.get("pf2e-dorako-ui", "compact-ui"))
       injectCSS("compact-ui");
     if (game.settings.get("pf2e-dorako-ui", "no-logo")) injectCSS("no-logo");
-    // setting = game.settings.get("pf2e-dorako-ui", "sheet");
-    // if (setting == "dark") injectCSS("sheet-dark");
+    setting = game.settings.get("pf2e-dorako-ui", "sheet");
+    if (setting == "dark") injectCSS("sheet-dark");
     // if (setting == "plain") injectCSS("sheet-plain");
   }
 });
diff --git a/styles/app-ui.css b/styles/app-ui.css
index d73ee4f..4c7b042 100644
--- a/styles/app-ui.css
+++ b/styles/app-ui.css
@@ -1,373 +1,425 @@
  /* App UI */
 
-/* Glass - Remove prior styling */
-
-#players,
-.app,
-.window-app .window-header,
-.window-app.minimized .window-header
-{
-    border: none;
-    border-radius: 0px;
-    box-shadow: none;
-    backdrop-filter: none;
-    background: none;
-    background-image: none;
-}
-
-
-
-/* Glass - Add new styling */
-
-#players,
-.window-app .window-header,
-.window-app.minimized .window-header
-{
-    border: none;
-    border-radius: var(--dorako-radius);
-    background-color: var(--dorako-bg-current);
-    backdrop-filter: var(--dorako-vibrancy);
-    /*will-change: backdrop-filter;*/
-    transform: translate3d(0px, 0px, 0px);
-    box-shadow: var(--glassy);
-}
-
-#ui-top.offset {
-    margin-left: -100px;
-    margin-left: unset;
-    left: -90px;
-    position: relative;
-}
-
-
-#ui-top {
-    margin: 0 var(--edge-margin) 0 var(--edge-margin);
-}
-
-/* Hotbar */
-#ui-bottom {
-    /* margin-left: 9px; */
-    margin-left: var(--hotbar-margin-left);
-}
-
-
-#players {
-    margin: 0px 0px var(--edge-margin) var(--edge-margin);
-}
-
-#players h3 {
-    border: none;
-}
-
-.window-app .window-header {
-    border-radius: var(--dorako-radius) var(--dorako-radius) 0px 0px;
-    box-shadow: var(--glassy);
-}
-
-.window-app .window-content {
-    /* box-shadow: 0px 0px 10px black; */
-    box-shadow: var(--glassy);
-    background: none;
-    background-color: var(--bg);
-    background-image: var(--pf2e-sheets-bg);
-    background-size: cover;
-}
-
-#players,
-.window-app .window-header a,
-.window-app .window-header .window-title {
-    text-shadow: var(--dorako-text-shadow);
-}
-
-.editable .crb-style {
-    text-rendering: geometricPrecision;
-}
-
-#compendium-browser>section.window-content>.content-box>nav, #license-viewer>section.window-content>.content-box>nav {
-    box-shadow: none;
-}
-
-#compendium-browser>section.window-content>.content-box>section.content, #license-viewer>section.window-content>.content-box>section.content {
-    /* height: calc(100% - 40px); */
-    margin-top: 5px;
-}
-
-.window-app .window-content {
-    padding: 5px;
-    border-radius: 0px 0px 5px 5px;
-}
-
-.window-app .window-header {
-    margin-bottom: 0px;
-}
-
-.app {
-    color: var(--color-text-light-1);
-}
-
-.window-app .window-resizable-handle {
-    position: absolute;
-    bottom: -5px;
-    right: -5px;
-    background: none;
-    padding: 2px;
-    border: none;
-    text-shadow: var(--dorako-text-shadow);
-}
-
-.app.sidebar-popout {
-    border: none;
-    border-radius: var(--dorako-radius);
-    min-width: 300px;
-    overflow:hidden;
-    /* background-color: var(--dorako-bg-current); */
-}
-
-/* .window-content * {
+ /* Glass - Remove prior styling */
+
+ #players,
+ .app,
+ .window-app .window-header,
+ .window-app.minimized .window-header {
+     border: none;
+     border-radius: 0px;
+     box-shadow: none;
+     backdrop-filter: none;
+     background: none;
+     background-image: none;
+ }
+
+
+
+ /* Glass - Add new styling */
+
+ #players,
+ .window-app .window-header,
+ .window-app.minimized .window-header {
+     border: none;
+     border-radius: var(--dorako-radius);
+     background-color: var(--dorako-bg-current);
+     backdrop-filter: var(--dorako-vibrancy);
+     /*will-change: backdrop-filter;*/
+     transform: translate3d(0px, 0px, 0px);
+     box-shadow: var(--glassy);
+ }
+
+ #ui-top.offset {
+     margin-left: -100px;
+     margin-left: unset;
+     left: -90px;
+     position: relative;
+ }
+
+
+ #ui-top {
+     margin: 0 var(--edge-margin) 0 var(--edge-margin);
+ }
+
+
+
+ #players {
+     margin: 0px 0px var(--edge-margin) var(--edge-margin);
+ }
+
+ #players h3 {
+     border: none;
+ }
+
+ .window-app .window-header {
+     border-radius: var(--dorako-radius) var(--dorako-radius) 0px 0px;
+     box-shadow: var(--glassy);
+ }
+
+ .window-app .window-content {
+     /* box-shadow: 0px 0px 10px black; */
+     box-shadow: var(--glassy);
+     background: none;
+     background-color: var(--bg);
+     background-image: var(--pf2e-sheets-bg);
+     background-size: cover;
+ }
+
+ #players,
+ .window-app .window-header a,
+ .window-app .window-header .window-title {
+     text-shadow: var(--dorako-text-shadow);
+ }
+
+ .editable .crb-style {
+     text-rendering: geometricPrecision;
+ }
+
+ #compendium-browser>section.window-content>.content-box>nav, #license-viewer>section.window-content>.content-box>nav {
+     box-shadow: none;
+ }
+
+ #compendium-browser>section.window-content>.content-box>section.content, #license-viewer>section.window-content>.content-box>section.content {
+     /* height: calc(100% - 40px); */
+     margin-top: 5px;
+ }
+
+ .window-app .window-content {
+     padding: 5px;
+     border-radius: 0px 0px 5px 5px;
+ }
+
+ .window-app .window-header {
+     margin-bottom: 0px;
+ }
+
+ .app {
+     color: var(--color-text-light-1);
+ }
+
+ .window-app .window-resizable-handle {
+     position: absolute;
+     bottom: -5px;
+     right: -5px;
+     background: none;
+     padding: 2px;
+     border: none;
+     text-shadow: var(--dorako-text-shadow);
+ }
+
+ .app.sidebar-popout {
+     border: none;
+     border-radius: var(--dorako-radius);
+     min-width: 300px;
+     overflow: hidden;
+     /* background-color: var(--dorako-bg-current); */
+ }
+
+ /* .window-content * {
     text-shadow: 0px 1px rgb(255 255 255 / 50%);
 } */
 
-.window-content .sidebar-tap * {
-    text-shadow: 0px 1px rgb(0 0 0 / 50%);
-}
+ .window-content .sidebar-tap * {
+     text-shadow: 0px 1px rgb(0 0 0 / 50%);
+ }
 
-#context-menu {
-    border: none;
-    background: var(--pf2e-color-mono-dark);
-    box-shadow: var(--glassy);
-}
+ #context-menu {
+     border: none;
+     background: var(--pf2e-color-mono-dark);
+     box-shadow: var(--glassy);
+ }
 
-#context-menu ol.context-items {
-    /* background: var(--pf2e-color-mono-dark);
+ #context-menu ol.context-items {
+     /* background: var(--pf2e-color-mono-dark);
     box-shadow: var(--glassy); */
-    border-radius: 3px;
-    position: static;
-    z-index: -1;
-}
-
-#context-menu li.context-item {
-    cursor: pointer;
-    text-shadow: var(--pf2e-shadow-is-dark);
-}
-
-#context-menu li.context-item:hover {
-    color:wheat;
-}
-
-#hotbar .macro .tooltip {
-    display: block;
-    min-width: 148px;
-    height: 26px;
-    padding: 2px 4px;
-    position: absolute;
-    top: -40px;
-    left: -50px;
-    background: var(--pf2e-color-mono-dark);
-    box-shadow: var(--glassy);
-    border: none;
-    border-radius: 3px;
-    color: white;
-    line-height: 22px;
-    text-align: center;
-    white-space: nowrap;
-    word-break: break-all;
-}
-
-#fps {
-    /* width: 85px; */
-    margin: 0px;
-    align-self: space-evenly;
-    display: none;
-    font-family: var(--font-mono);
-    background: var(--dorako-bg-current);
-    line-height: 24px;
-    color: white;
-    border: none;
-    border-radius: 5px;
-    box-shadow: var(--glassy);
-    justify-content: space-between;
-    display: flex !important;
-    flex-direction: row;
-    margin-bottom: var(--edge-margin);
-    margin-right: 10px;
-    padding-left: 5px;
-    padding-right: 5px;
-    text-shadow: var(--dorako-text-shadow);
-    font-weight: 900;
-    position:absolute;
-    right:0px;
-    backdrop-filter: var(--dorako-vibrancy);
-    width: 55px;
-    justify-content: center;
-}
-
-#fps label {
-    display: none;
-}
-
-
-
-.window-app.image-popout .window-content {
-    background: var(--dorako-bg-current);
-    padding: 0px;
-}
-
-.window-app.image-popout .lightbox-image {
-    background-size: contain;
-    background-position: 50% 50%;
-    background-repeat: no-repeat;
-    flex: auto;
-}
-
-.app.sidebar-popout .window-content{
-    background-color: var(--dorako-bg-current);
-    backdrop-filter: var(--dorako-vibrancy);
-    overflow: hidden;
-}
-
-.sidebar-popout {
-    overflow: auto;
-    resize: both;
-    box-shadow: var(--glassy);
-}
-
-#players {
-    bottom: unset;
-    left: unset;
-    font-size: var(--playerfsize);
-    visibility: var(--playervis);
-    opacity: var(--opacity);
-    box-shadow: var(--glassy);
-    position: unset;
-    border: none;
-}
-
-
-
-
-/* Monarch */
-.window-app.monarch .window-content {
-    background-color: transparent;
-    box-shadow: none;
-    transition: box-shadow 0.25s ease-in-out, background-color 0.25s ease-in-out;
-}
-
-
-.window-app.monarch-deck .window-content,
-.window-app.monarch-hand:not(.minimized):hover .window-content,
-.window-app.monarch .window-content:hover {
-    background-color: var(--dorako-bg-current);
-    box-shadow: var(--glassy);
-    transition: box-shadow 0.25s ease-in-out, background-color 0.25s ease-in-out;
-}
-
-.app.window-app.monarch.monarch-hand.sheet.hand .window-content {
-    border-radius: 5px;
-
-}
-
-
-.window-app.monarch.pile .window-content {
-    background-color: var(--dorako-bg-current);
-    box-shadow: var(--glassy);
-}
-
-
-.window-app.monarch-deck,
-.window-app.monarch-deck:hover,
-.window-app.monarch-pile:hover {
-    background-color: transparent;
-    box-shadow: none;
-}
-
-.monarch button {
-    border-radius: 3px;
-    background-color: hsla(0,0%,20%,50%);
-    box-shadow: var(--glassy);
-}
-
-.window-app.monarch-pile {
-    background-color: transparent;
-    box-shadow: none;
-}
-
-.monarch-hand footer.sheet-footer {
-
-    background: none;
-    padding: 0.5em;
-    margin: 0 8px;
-    border-radius: 8px;
-    box-shadow: var(--glassy);
-    display: flex;
-    flex-direction: row;
-    align-items: stretch;
-    gap: 4px;
-    margin-bottom: 5px;
-    background-color: var(--dorako-bg-current);
-    line-height: unset;
-}
-
-.window-app.monarch-hand:not(.minimized):hover {
-    background-color: transparent;
-    box-shadow: none;
-}
-
-.monarch-deck .cards, 
-.monarch-pile .cards {
-    margin: 0px;
-    gap: 10px;
-}
-
-.window-app.monarch-hand .window-header,
-.monarch-hand .tooltip,
-.monarch .card-hud .badge,
-.monarch .card-hud .card-controls {
-    background: none;
-    background-color: var(--dorako-bg-current);
-    border: none;
-    border-radius: 5px;
-    box-shadow: var(--glassy);
-}
-
-.window-app.monarch-hand:not(.minimized) .window-header {
-    margin-top: 0px;
-    margin-left: 5px;
-}
-
-.monarch-deck .card,
-.monarch-pile .card {
-    box-shadow: 0px 0px 10px black;
-    transition: transform 0.25s ease-in-out, box-shadow 0.25s ease-in-out;
-}
-
-.monarch-deck .card:hover,
-.monarch-pile .card:hover {
-    box-shadow: 0px 0px 20px black;
-    transform:scale(1.0);
-    transition: transform 0.25s ease-in-out, box-shadow 0.25s ease-in-out;
-}
-
-#notifications .notification {
-    border: none;
-    box-shadow: var(--glassy);
-    text-shadow: var(--pf2e-shadow-is-dark);
-    background: none;
-}
-
-#notifications .notification.info {
-    background-color: var(--paizo-blue-bright);
-    background-color: #222C8CDD;
-}
-
-#notifications .notification.error {
-    background-color: var(--paizo-red-bright);
-    background-color: #83180FDD;
-    /* background: hsla(var(--primary-hue), var(--primary-sat), calc(var(--primary-lvl) + 10%), 80%); */
-}
-
-#notifications .notification.warning,
-#notifications .notification.alert {
-background-color: #ECBF41DD;
-    color: black;
-    text-shadow: var(--pf2e-shadow-is-light);
-}
\ No newline at end of file
+     border-radius: 3px;
+     position: static;
+     z-index: -1;
+ }
+
+ #context-menu li.context-item {
+     cursor: pointer;
+     text-shadow: var(--pf2e-shadow-is-dark);
+ }
+
+ #context-menu li.context-item:hover {
+     color: wheat;
+ }
+
+ #hotbar .macro .tooltip {
+     display: block;
+     min-width: 148px;
+     height: 26px;
+     padding: 2px 4px;
+     position: absolute;
+     top: -40px;
+     left: -50px;
+     background: var(--pf2e-color-mono-dark);
+     box-shadow: var(--glassy);
+     border: none;
+     border-radius: 3px;
+     color: white;
+     line-height: 22px;
+     text-align: center;
+     white-space: nowrap;
+     word-break: break-all;
+ }
+
+ #fps {
+     /* width: 85px; */
+     margin: 0px;
+     align-self: space-evenly;
+     display: none;
+     font-family: var(--font-mono);
+     background: var(--dorako-bg-current);
+     line-height: 24px;
+     color: white;
+     border: none;
+     border-radius: 5px;
+     box-shadow: var(--glassy);
+     justify-content: space-between;
+     display: flex !important;
+     flex-direction: row;
+     margin-bottom: var(--edge-margin);
+     margin-right: 10px;
+     padding-left: 5px;
+     padding-right: 5px;
+     text-shadow: var(--dorako-text-shadow);
+     font-weight: 900;
+     position: absolute;
+     right: 0px;
+     backdrop-filter: var(--dorako-vibrancy);
+     width: 55px;
+     justify-content: center;
+ }
+
+ #fps label {
+     display: none;
+ }
+
+
+
+ .window-app.image-popout .window-content {
+     background: var(--dorako-bg-current);
+     padding: 0px;
+ }
+
+ .window-app.image-popout .lightbox-image {
+     background-size: contain;
+     background-position: 50% 50%;
+     background-repeat: no-repeat;
+     flex: auto;
+ }
+
+ .app.sidebar-popout .window-content {
+     background-color: var(--dorako-bg-current);
+     backdrop-filter: var(--dorako-vibrancy);
+     overflow: hidden;
+ }
+
+ .sidebar-popout {
+     overflow: auto;
+     resize: both;
+     box-shadow: var(--glassy);
+ }
+
+ #players {
+     bottom: unset;
+     left: unset;
+     font-size: var(--playerfsize);
+     visibility: var(--playervis);
+     opacity: var(--opacity);
+     box-shadow: var(--glassy);
+     position: unset;
+     border: none;
+ }
+
+
+
+
+ /* Monarch */
+ .window-app.monarch .window-content {
+     background-color: transparent;
+     box-shadow: none;
+     transition: box-shadow 0.25s ease-in-out, background-color 0.25s ease-in-out;
+ }
+
+
+ .window-app.monarch-deck .window-content,
+ .window-app.monarch-hand:not(.minimized):hover .window-content,
+ .window-app.monarch .window-content:hover {
+     background-color: var(--dorako-bg-current);
+     box-shadow: var(--glassy);
+     transition: box-shadow 0.25s ease-in-out, background-color 0.25s ease-in-out;
+ }
+
+ .app.window-app.monarch.monarch-hand.sheet.hand .window-content {
+     border-radius: 5px;
+
+ }
+
+
+ .window-app.monarch.pile .window-content {
+     background-color: var(--dorako-bg-current);
+     box-shadow: var(--glassy);
+ }
+
+
+ .window-app.monarch-deck,
+ .window-app.monarch-deck:hover,
+ .window-app.monarch-pile:hover {
+     background-color: transparent;
+     box-shadow: none;
+ }
+
+ .monarch button {
+     border-radius: 3px;
+     background-color: hsla(0, 0%, 20%, 50%);
+     box-shadow: var(--glassy);
+ }
+
+ .window-app.monarch-pile {
+     background-color: transparent;
+     box-shadow: none;
+ }
+
+ .monarch-hand footer.sheet-footer {
+
+     background: none;
+     padding: 0.5em;
+     margin: 0 8px;
+     border-radius: 8px;
+     box-shadow: var(--glassy);
+     display: flex;
+     flex-direction: row;
+     align-items: stretch;
+     gap: 4px;
+     margin-bottom: 5px;
+     background-color: var(--dorako-bg-current);
+     line-height: unset;
+ }
+
+ .window-app.monarch-hand:not(.minimized):hover {
+     background-color: transparent;
+     box-shadow: none;
+ }
+
+ .monarch-deck .cards,
+ .monarch-pile .cards {
+     margin: 0px;
+     gap: 10px;
+ }
+
+ .window-app.monarch-hand .window-header,
+ .monarch-hand .tooltip,
+ .monarch .card-hud .badge,
+ .monarch .card-hud .card-controls {
+     background: none;
+     background-color: var(--dorako-bg-current);
+     border: none;
+     border-radius: 5px;
+     box-shadow: var(--glassy);
+ }
+
+ .window-app.monarch-hand:not(.minimized) .window-header {
+     margin-top: 0px;
+     margin-left: 5px;
+ }
+
+ .monarch-deck .card,
+ .monarch-pile .card {
+     box-shadow: 0px 0px 10px black;
+     transition: transform 0.25s ease-in-out, box-shadow 0.25s ease-in-out;
+ }
+
+ .monarch-deck .card:hover,
+ .monarch-pile .card:hover {
+     box-shadow: 0px 0px 20px black;
+     transform: scale(1.0);
+     transition: transform 0.25s ease-in-out, box-shadow 0.25s ease-in-out;
+ }
+
+ #notifications .notification {
+     border: none;
+     box-shadow: var(--glassy);
+     text-shadow: var(--pf2e-shadow-is-dark);
+     background: none;
+ }
+
+ #notifications .notification.info {
+     background-color: var(--paizo-blue-bright);
+     background-color: #222C8CDD;
+ }
+
+ #notifications .notification.error {
+     background-color: var(--paizo-red-bright);
+     background-color: #83180FDD;
+     /* background: hsla(var(--primary-hue), var(--primary-sat), calc(var(--primary-lvl) + 10%), 80%); */
+ }
+
+ #notifications .notification.warning,
+ #notifications .notification.alert {
+     background-color: #ECBF41DD;
+     color: black;
+     text-shadow: var(--pf2e-shadow-is-light);
+ }
+
+ #tokenbar .bar-controls,
+ #tokenbar .token {
+     background: none;
+     background-color: var(--dorako-bg-current);
+     border-radius: var(--dorako-radius);
+     box-shadow: var(--glassy);
+     border: none;
+ }
+
+ #tokenbar .bar-controls div#tokenbar-move-handle {
+     background: none;
+     box-shadow: var(--glassy);
+     border-radius: 3px 0px 0px 3px;
+     cursor: grab;
+ }
+
+ #tokenbar .token-list {
+     border: none;
+     gap: 3px;
+ }
+
+ #tokenbar .token .token-stats {
+     background: none;
+     justify-content: center;
+ }
+
+ #tokenbar .token:hover .token-icon {
+     box-shadow: var(--gold-and-glow);
+     border-radius: 50%;
+ }
+
+ #tokenbar .token .tooltip {
+     background: none;
+     background-color: var(--pf2e-color-mono-dark);
+     border: none;
+
+ }
+
+ #tokenbar .token .token-icon {
+     box-shadow: none;
+ }
+
+ #tokenbar .bar-controls {
+     margin: 0px;
+     margin-right: 1px;
+ }
+
+ #tokenbar .bar-controls .tokenbar-buttons div.active:not(.disabled) i,
+ #tokenbar[movement="free"] #movement-free:not(.disabled) i,
+ #tokenbar[movement="none"] #movement-none:not(.disabled) i,
+ #tokenbar[movement="combat"] #movement-combat:not(.disabled) i {
+     color: white;
+     border: none;
+     background-color: var(--paizo-red-bright);
+     margin: 1px;
+     transition: background-color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
+     box-shadow: var(--gold-and-glow);
+ }
\ No newline at end of file
diff --git a/styles/chat.css b/styles/chat.css
index 9daee64..1e327e0 100644
--- a/styles/chat.css
+++ b/styles/chat.css
@@ -1521,7 +1521,7 @@ div#scrollToBottom:hover {
 .header-meta,
 .message-header.dark-header-text .header-meta {
     color: hsla(0, 0%, 20%, 100%);
-    background-color: hsla(0, 0%, 80%, 40%);
+    background-color: hsla(0, 0%, 90%, 50%);
     border: 1px solid hsla(0, 0%, 30%, 40%);
 }
 
diff --git a/styles/dorako-ui.css b/styles/dorako-ui.css
index 03697b6..67c853e 100644
--- a/styles/dorako-ui.css
+++ b/styles/dorako-ui.css
@@ -45,9 +45,9 @@
     --paizo-red: hsl(var(--primary-hue), var(--primary-sat), var(--primary-lvl));
     --paizo-red-bright: hsl(var(--primary-hue), var(--primary-sat), calc(var(--primary-lvl) + 10%));
 
-    --paizo-blue-dark: hsl(var(--secondary-hue), var(--secondary-sat), calc(var(--secondary-lvl) - 10%));
+    --paizo-blue-dark: hsl(var(--secondary-hue), var(--secondary-sat), calc(var(--secondary-lvl) - 15%));
     --paizo-blue: hsl(var(--secondary-hue), var(--secondary-sat), var(--secondary-lvl));
-    --paizo-blue-bright: hsl(var(--secondary-hue), var(--secondary-sat), calc(var(--secondary-lvl) + 10%));
+    --paizo-blue-bright: hsl(var(--secondary-hue), var(--secondary-sat), calc(var(--secondary-lvl) + 15%));
 
     --color-shadow-highlight: var(--paizo-red);
     --color-shadow-primary: var(--paizo-blue);
@@ -196,9 +196,6 @@ button>i {
     border-radius: 5px !important;
 }
 
-#hotbar {
-    height: unset;
-}
 
 
 img {
diff --git a/styles/hotbar.css b/styles/hotbar.css
index 7f5b672..a85f7e6 100644
--- a/styles/hotbar.css
+++ b/styles/hotbar.css
@@ -238,6 +238,16 @@
     border-radius: 3px;
 }
 
+#hotbar {
+    height: unset;
+}
+
+/* Hotbar */
+#ui-bottom {
+    /* margin-left: 9px; */
+    margin-left: var(--hotbar-margin-left);
+}
+
 /* Minimal UI */
 #hotbar:hover {
     bottom: 0px;
diff --git a/styles/sheet-dark.css b/styles/sheet-dark.css
index dc93ee5..45c619b 100644
--- a/styles/sheet-dark.css
+++ b/styles/sheet-dark.css
@@ -1,187 +1,442 @@
 .actor.sheet .crb-style {
     background: url(/systems/pf2e/assets/sheet/header.webp), var(--sheet-dark);
-    background-attachment: local;
     background-repeat: repeat-x, no-repeat;
-    background-size: auto 89px, cover;
+    background-size: auto, cover;
 }
 
-.crb-style .sheet-body .sheet-content,
-.crb-style .inventory .item-controls .item-control {
-    color: white;
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.character .character-details .alignment {
+    background-color: var(--primary);
+    background-image: none;
+    height: 22px;
+    margin: 13px -13px 0 3px;
+    padding-top: 1px;
+    box-shadow: 0 0 0 1px #918c88,
+        0 0 0 2px #e1d8cf,
+        0 0 0 3px #a98f39,
+        inset 0 0 8px rgba(0, 0, 0, .5),
+        0 0 8px #000;
 }
 
-/* Neccesary important */
-.crb-style .proficiencies .proficiencies-pane .lores-list .skill .skill-name input {
-    color: white !important;
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.character .character-details .alignment:after {
+    display: none;
+}
+
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.character .character-details .alignment select,
+.crb-style .tab.actions .actions-panels,
+.crb-style .tab.crafting .crafting-option label,
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.crafting .known-formulas .formula-list .formula-level-header.formula-level-header,
+.crb-style .tab.crafting .formula-quantity input,
+.crb-style .tab.crafting .formula-list,
+.crb-style .tab.inventory .item-list,
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.inventory .item-controls .item-control.item-carry-type,
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.inventory .item-controls .item-control,
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.inventory .encumbrance .encumbrance-light-bulk-overflow,
+.crb-style .skill-name,
+.crb-style .item-name h4,
+.crb-style .item-controls,
+.crb-style .tab.actions .action-name h4,
+.crb-style .item-summary,
+.crb-style .editor-content,
+.actor.sheet .crb-style .tab.spellcasting .spell-list .item.spell-level-header,
+.crb-style .tab.spellcasting .spell-components .tag,
+.crb-style .tab.spellcasting .spell-range,
+.crb-style .tab.spellcasting .spell-tradition,
+.actor.sheet.character .crb-style .sheet-body .sheet-content .inventory .item .item-controls .item-control.item-toggle-invest,
+.crb-style .tab.pfs .reputations {
+    color: var(--text-light);
 }
 
-.crb-style .proficiencies .proficiencies-pane h1,
-.crb-style .directory-list .action-header .item-controls,
 .crb-style .details-label,
-.crb-style .biography h3,
-.crb-style .character h3,
-.crb-style .character .ability-scores .ability .ability-id {
-    color: var(--paizo-red-bright);
-    color: wheat;
-    color: #E5CF99;
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.feats .item.feat-item .item-name .feat-slot-title,
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.spellcasting .spellcasting-entry .skills-list .skill-grid .skill-score,
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.proficiencies .proficiencies-pane h1,
+.crb-style .tab.character .pc h3 .fas,
+.actor.sheet .crb-style .sheet-body .sheet-content ol.directory-list .action-header .item-controls,
+.crb-style .tab.actions .item.action .action-options {
+    color: var(--sidebar-label);
 }
 
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.inventory .item-controls .item-control.item-toggle-invest.active,
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.inventory .item-controls .item-control.item-carry-type.active,
+.actor.sheet .crb-style .sheet-body .sheet-content .tab.actions .actions-container .actions-tabs-wrapper .actions-panels ol.actions-list li.action.expanded h4 {
+    color: var(--sidebar-title);
+}
 
-.crb-style .inventory .item-name h3:hover,
-.crb-style .inventory .item-name h4:hover,
-.crb-style .actions .actions-list li.item .item-name .actions-title .action-name h4:hover,
-.crb-style .actions .actions-list li.item .item-name .actions-title .action-name h4:hover .activity-icon {
-    color: wheat;
+.crb-style .tab.character hr {
+    border-top: 1px solid var(--sidebar-label);
+    border-bottom: 1px solid var(--sidebar-label);
 }
 
-.crb-style .actions .actions-list.item-list.directory-list:not(.skill-action-list, .strikes-list) .item-image {
-    mix-blend-mode: lighten;
-    filter: var(--filter-dark);
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.character h3,
+.actor.sheet .crb-style .sheet-body .sheet-content .tab.biography h3 {
+    border-bottom: 1px solid var(--sidebar-label);
+    color: var(--sidebar-label);
 }
 
+.actor.sheet.character .crb-style .sheet-body .sheet-content .details-input,
+.actor.sheet .crb-style .sheet-body .sheet-content .tab.biography .biography-content .editor,
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.character .pc h3 {
+    color: var(--text-light);
+    box-shadow: var(--glassy);
+    border: none;
+    border-radius: .25em;
+    padding-left: 4px;
+    padding-right: 4px;
+    font-size: 14px;
+}
 
-.crb-style .inventory .item-controls .item-control.item-toggle-equip,
-.crb-style .inventory .item-controls .item-control.item-toggle-invest {
-    color: rgba(255, 255, 255, .4);
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.character.active .character-background .pc_gender .details-input,
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.character.active .character-background .pc_age .details-input,
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.character.active .character-background .pc_height .details-input,
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.character.active .character-background .pc_weight .details-input,
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.character.active .character-traits .pc_bonus-bulk .details-input {
+    padding-top: 3px;
 }
 
-crb-style .inventory .encumbrance .encumbrance-light-bulk-overflow {
-    color: white;
-    text-shadow: var(--pf2e-shadow-is-dark);
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.character.active .character-background .pc_ethnicity .details-input,
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.character.active .character-background .pc_nationality .details-input {
+    padding-top: 4px;
 }
 
-.crb-style .sheet-body .sheet-content .spell-list .item.spell-level-header {
-    background: rgba(96, 88, 86, .25);
-    border: 1px solid var(--sub);
-    color: white;
+.actor.sheet.character .crb-style .sheet-body .sheet-content .character-abilities .ability-scores .ability .details-input {
+    border-radius: 0px;
+    box-shadow: var(--gold-and-glow);
 }
 
-.actor.sheet.character .tab.character h3,
-.actor.sheet.character .tab.biography h3 {
-    border-bottom: 1px solid wheat;
+.actor.sheet.character .crb-style .sheet-body .sheet-content .pc_gender .details-label,
+.actor.sheet.character .crb-style .sheet-body .sheet-content .pc_age .details-label,
+.actor.sheet.character .crb-style .sheet-body .sheet-content .pc_height .details-label,
+.actor.sheet.character .crb-style .sheet-body .sheet-content .pc_weight .details-label {
+    margin-bottom: 2px;
 }
 
-.crb-style .tags .tag_transparent.tag {
-    background-color: transparent;
-    box-shadow: inset 0 0 0 1px rgb(255 255 255 / 30%);
-    color: white;
+.actor.sheet.character .crb-style .sheet-body .sheet-content .pc_deity .details-label,
+.actor.sheet.character .crb-style .sheet-body .sheet-content .pc_ethnicity .details-label,
+.actor.sheet.character .crb-style .sheet-body .sheet-content .pc_nationality .details-label,
+.actor.sheet.character .crb-style .sheet-body .sheet-content .character-abilities .ability-scores .ability .details-label.ability-name {
+    margin-bottom: 3px;
 }
 
-.crb-style .sheet-body .sheet-content .spell-list .item[data-expended-state=true] h4 {
-    color: rgba(220, 220, 220, .5);
+.actor.sheet.character .crb-style .sheet-body .sheet-content .pc_land-speed .details-label,
+.actor.sheet.character .crb-style .sheet-body .sheet-content .pc_size .details-label,
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.character.active .character-traits .pc.pc_key-ability.dropdown .details-label {
+    margin-bottom: -1px;
 }
 
-.crb-style .spellcasting .spellcasting-entry .skills-list .skill-grid .skill-score,
-.crb-style .feats .item.feat-item .item-name .feat-slot-title {
-    text-rendering: optimizeLegibility;
-    background-color: var(--paizo-blue-bright);
-    border-radius: 2px;
-    box-shadow: inset 0 0 0 1px rgb(0 0 0 / 50%);
-    color: white;
-    font-family: var(--sans-serif);
-    font-size: 10px;
-    font-weight: 500;
-    letter-spacing: .05em;
-    line-height: 1;
-    padding: 3px 4px;
-    text-transform: uppercase;
+.actor.sheet .crb-style .sheet-body .sheet-content .tab.character .character-traits .pc.pc_bonus-bulk .details-label,
+.crb-style .pc_speed-types .details-label,
+.crb-style .pc_senses .details-label,
+.crb-style .pc_languages .details-label,
+.crb-style .pc_traits .details-label {
+    margin-bottom: -2px;
 }
 
-.actor.sheet.character .tab.proficiencies .proficiencies-pane .combat-list .skill,
-.actor.sheet.character .tab.proficiencies .proficiencies-pane .lores-list .skill,
-.actor.sheet.character .tab.proficiencies .proficiencies-pane .skills-list .skill,
-.actor.sheet.character .tab.crafting .crafting-options,
-.actor.sheet.character .tab.actions .actions-container .actions-tabs-wrapper .actions-panels .actions-options,
-.crb-style .actions .actions-container .actions-tabs-wrapper .actions-panels .actions-options,
-.crb-style .crafting .crafting-options,
-.crb-style .proficiencies .proficiencies-pane .combat-list .skill,
-.crb-style .proficiencies .proficiencies-pane .lores-list .skill,
-.crb-style .proficiencies .proficiencies-pane .skills-list .skill {
-    border-image-source: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='33' height='33' overflow='scroll'%3E%3Cstyle%3E.st1{stroke:wheat;stroke-miterlimit:10}.st1,.st2{fill:none}%3C/style%3E%3Cg opacity='1'%3E%3Cpath class='st1' d='M.5 20v-7'/%3E%3Cpath class='st2' d='M13 20v-7'/%3E%3Cpath class='st1' d='M13 .5h7'/%3E%3Cpath class='st2' d='M13 13h7'/%3E%3Cpath class='st1' d='M32.5 13v7'/%3E%3Cpath class='st2' d='M20 13v7'/%3E%3Cpath class='st1' d='M20 32.5h-7'/%3E%3Cpath class='st2' d='M20 20h-7'/%3E%3Cpath class='st1' d='M.5.5h3.1v3.1H.5zm3.1 3.1h3.1v3.1H3.6zm3.2 0h3.1v3.1H6.8zM3.6 6.8h3.1v3.1H3.6zm0 0H.5V13M13 .5H6.8v3.1M29.4.5h3.1v3.1h-3.1zm-3.1 3.1h3.1v3.1h-3.1zm0 3.2h3.1v3.1h-3.1zm-3.2-3.2h3.1v3.1h-3.1zm3.2 0V.5H20M32.5 13V6.8h-3.1M29.4 29.4h3.1v3.1h-3.1z'/%3E%3Cpath class='st1' d='M26.3 26.3h3.1v3.1h-3.1zm-3.2 0h3.1v3.1h-3.1zm3.2-3.2h3.1v3.1h-3.1z'/%3E%3Cpath class='st1' d='M29.4 26.3h3.1V20M20 32.5h6.3v-3.1'/%3E%3Cg%3E%3Cpath class='st1' d='M.5 29.4h3.1v3.1H.5zm3.1-3.1h3.1v3.1H3.6zm0-3.2h3.1v3.1H3.6zm3.2 3.2h3.1v3.1H6.8zM6.8 29.4v3.1H13M.5 20v6.3h3.1'/%3E%3C/g%3E%3C/g%3E%3C/svg%3E");
+.crb-style .sheet-body .sheet-content .tag_alt,
+.crb-style .item-properties .tag {
+    border: 1px solid rgba(255, 255, 255, 0.5);
 }
 
-.actor.sheet.character .tab.inventory .inventory-list .item-list .item.temporary-item {
-    background-color: #F1DFB830;
+.actor.sheet.character .crb-style .tab.character .character-traits .pc_key-ability select,
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.pfs.active .faction select {
+    box-shadow: var(--glassy);
+    border: none;
+    background-color: unset;
+    height: 26px;
+    font-family: var(--body-serif);
+    font-weight: 700;
+    padding-top: 7px;
 }
 
-.crb-style .actions .actions-list li.item .item-name .action-options .item-toggle-equip {
-    color: rgba(255, 255, 255, .4);
+.crb-style .character-abilities {
+    padding-top: 1px;
 }
 
-.actor.sheet.character .tab.inventory .item-controls .item-control.item-carry-type.active,
-.actor.sheet.character .tab.inventory .item-controls .item-control.item-toggle-equip.active,
-.actor.sheet.character .tab.inventory .item-controls .item-control.item-toggle-invest.active,
-.actor.sheet.character .tab.actions .actions-list li.item .item-name .action-options .item-toggle-equip.active,
-.actor.sheet.character .directory-list .action-header .item-controls {
-    color: rgb(255, 242, 219);
+.crb-style .character-traits .edit-btn {
+    background-color: #fff;
+    color: var(--primary);
 }
 
-.actor.sheet.character .tab.inventory .item-controls .item-control.item-toggle-equip,
-.actor.sheet.character .tab.inventory .item-controls .item-control.item-toggle-invest,
-.actor.sheet.character .tab.actions .actions-list li.item .item-name .action-options .item-toggle-equip,
-.actor.sheet.character .directory-list .action-header .item-controls {
-    color: #F1DFB890;
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.character .ability-scores .ability .ability-mod {
+    box-shadow: var(--glassy);
+    border-radius: .25em;
+    font-size: 1.5em;
+    color: var(--sidebar-label);
 }
 
-.actor.sheet.character .tab.spellcasting .spellcasting-entry .skills-list .skill-grid .skill-score,
-.actor.sheet .crb-style .sheet-body .sheet-content .spell-list .item .item-name h4:hover,
-.actor.sheet.character .tab.inventory .item-controls .item-control,
-.actor.sheet.character .tab.proficiencies .proficiencies-pane h1,
-.actor.sheet.character .tab.biography h3 {
-    color: wheat;
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.proficiencies .proficiencies-pane .lores-list .skill .skill-name input,
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.proficiencies .proficiencies-pane .lores-list .skill .skill-name input:hover {
+    color: var(--text-light) !important;
+    box-shadow: var(--glassy);
+    border-radius: .25em;
+    border: none;
+    background-color: unset;
+    padding-left: 4px;
+    padding-right: 4px;
 }
 
-.actor.sheet.character .tab.proficiencies .proficiencies-pane .skills-list .skill .rollable:hover {
-    text-shadow: 0px 0px 3px black;
-    color: white;
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.feats .item.feat-item:nth-child(odd),
+.actor.sheet .crb-style .sheet-body .sheet-content .tab.inventory ol.inventory-list li:nth-of-type(2n),
+.actor.sheet .crb-style .sheet-body .sheet-content .tab.inventory ol.item-list li:nth-of-type(2n),
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.inventory .inventory-list ol.item-list .container-held-items li:nth-of-type(2n),
+.actor.sheet .crb-style .sheet-body .sheet-content ol.spell-list li:nth-child(odd),
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.crafting .known-formulas .formula-list .formula-item:nth-child(odd),
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.crafting .known-formulas .formula-list .formula-level-header:nth-child(odd) {
+    background-color: rgba(120, 100, 82, .3);
 }
 
-/* Neccesary */
-.item-control.toggle-hidden-actions .fa-tshirt {
-    opacity: 50%;
-    color: wheat !important;
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.biography input {
+    color: var(--text-light);
+    box-shadow: var(--glassy);
+    border-radius: .25em;
+    border: none;
+    background-color: unset;
 }
 
-.crb-style .directory-list .action-header {
-    filter: brightness(1.2);
+.actor.sheet .crb-style .sheet-body .sheet-content .spell-list .item .item-summary,
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.crafting .known-formulas .formula-list .formula-item .item-summary {
+    background: url(/systems/pf2e/assets/sheet/header.webp), var(--sheet-dark);
+    background-size: cover;
+    background-image: var(--bg-current);
+    background-color: var(--blind-bg);
+    background-blend-mode: luminosity;
+}
+
+.actor.sheet .crb-style .sheet-body .sheet-content .spell-list .item .item-summary .item-buttons button {
+    border-bottom: none;
+    border-top: none;
+    box-shadow: var(--glassy);
+    border-radius: .25em;
 }
 
-.actor.sheet .crb-style .sheet-body .sheet-content .spell-list .item.spell-level-header,
-.actor.sheet.character .tab.character h3,
-.actor.sheet.character .tab.character .ability-scores .ability .ability-id,
-.actor.sheet .crb-style .sheet-body .sheet-content,
-.actor.sheet.character .tab.character .pc h3,
-.actor.sheet.character .tab.proficiencies .proficiencies-pane .combat-list .skill .skill-name input, .actor.sheet.character .tab.proficiencies .proficiencies-pane .lores-list .skill .skill-name input,
-.crb-style .character .pc h3,
-.actor.sheet.character .tab.feats .item.feat-item .item-name .feat-slot-title,
-.crb-style input[type="text"], 
-.crb-style input[type="number"], 
-.crb-style input[type="password"], 
-.crb-style input[type="date"], 
-.crb-style input[type="time"] {
-    color: white;
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.inventory .item-summary {
+    background: url(/systems/pf2e/assets/sheet/header.webp), var(--sheet-dark);
+    background-size: cover;
+    background-image: var(--bg-current);
+    background-color: var(--blind-bg);
+    background-blend-mode: luminosity;
+}
+
+.actor.sheet.character .crb-style .perception-prof .pf-rank,
+.actor.sheet.character .crb-style .save-prof .pf-rank,
+.actor.sheet.character .crb-style .skill-prof .pf-rank,
+.actor.sheet.character .crb-style .spellcasting-prof .pf-rank,
+.actor.sheet .crb-style aside .sidebar .armor-class .shield-stats ol li .data-value,
+.actor.sheet .crb-style aside .sidebar .initiative-select select {
+    border: none;
+    padding-top: 3px;
+    padding-bottom: 2px;
+    border-radius: .25em;
+    box-shadow: var(--glassy);
+}
+
+.actor.sheet.character .crb-style .sheet-body .sheet-content .inventory.item-container .encumbrance .encumbrance-light-bulk-overflow {
+    text-shadow: var(--pf2e-shadow-is-dark);
 }
 
-.actor.sheet .crb-style .sheet-body .sheet-content .content-link {
+.actor.sheet.character .crb-style .actions .actions-tabs-wrapper .actions-panels .actions-panel.active .actions-options.item-list,
+.actor.sheet.character .actions .actions-tabs-wrapper .actions-panels .actions-panel.active .actions-list.item-list.directory-list .item.action.expanded .item-summary,
+.actor.sheet.character .crb-style .crafting.crafting-pane.active .crafting-options.item-list,
+.actor.sheet.character .crb-style .proficiencies.active .overflow-list.proficiencies-pane.stroke-header .skills-list .skill,
+.actor.sheet.character .crb-style .proficiencies.active .overflow-list.proficiencies-pane.stroke-header .lores-list .skill,
+.actor.sheet.character .crb-style .proficiencies.active .overflow-list.proficiencies-pane.stroke-header .combat-list .skill {
+    border-image-source: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='33' height='33' overflow='scroll'%3E%3Cstyle%3E.st1{stroke:wheat;stroke-miterlimit:10}.st1,.st2{fill:none}%3C/style%3E%3Cg opacity='1'%3E%3Cpath class='st1' d='M.5 20v-7'/%3E%3Cpath class='st2' d='M13 20v-7'/%3E%3Cpath class='st1' d='M13 .5h7'/%3E%3Cpath class='st2' d='M13 13h7'/%3E%3Cpath class='st1' d='M32.5 13v7'/%3E%3Cpath class='st2' d='M20 13v7'/%3E%3Cpath class='st1' d='M20 32.5h-7'/%3E%3Cpath class='st2' d='M20 20h-7'/%3E%3Cpath class='st1' d='M.5.5h3.1v3.1H.5zm3.1 3.1h3.1v3.1H3.6zm3.2 0h3.1v3.1H6.8zM3.6 6.8h3.1v3.1H3.6zm0 0H.5V13M13 .5H6.8v3.1M29.4.5h3.1v3.1h-3.1zm-3.1 3.1h3.1v3.1h-3.1zm0 3.2h3.1v3.1h-3.1zm-3.2-3.2h3.1v3.1h-3.1zm3.2 0V.5H20M32.5 13V6.8h-3.1M29.4 29.4h3.1v3.1h-3.1z'/%3E%3Cpath class='st1' d='M26.3 26.3h3.1v3.1h-3.1zm-3.2 0h3.1v3.1h-3.1zm3.2-3.2h3.1v3.1h-3.1z'/%3E%3Cpath class='st1' d='M29.4 26.3h3.1V20M20 32.5h6.3v-3.1'/%3E%3Cg%3E%3Cpath class='st1' d='M.5 29.4h3.1v3.1H.5zm3.1-3.1h3.1v3.1H3.6zm0-3.2h3.1v3.1H3.6zm3.2 3.2h3.1v3.1H6.8zM6.8 29.4v3.1H13M.5 20v6.3h3.1'/%3E%3C/g%3E%3C/g%3E%3C/svg%3E");
+}
+
+.actor.sheet.character .crb-style .sheet-content .spell-list .item .item-name h4:hover,
+.actor.sheet.character .crb-style .sheet-body .sheet-content .actions .actions-container .actions-tabs-wrapper .actions-panels .actions-list.item-list .action .item-name .actions-title .action-name h4:hover,
+.actor.sheet .crb-style .sheet-body .sheet-content .tab.actions .actions-container .actions-tabs-wrapper .actions-panels ol.actions-list li.action .item-name .actions-title .action-name h4:hover .activity-icon,
+.actor.sheet.character .item-list.directory-list.strikes-list .item.action.strike.expandable .item-name.rollable .item-image.variant-strike:hover,
+.actor.sheet.character .crb-style .actions-panel.active .actions-list.actions-list.item-list.directory-list .item.action .item-name.rollable .item-image:hover,
+.actor.sheet.character .crb-style .actions-panel.active .actions-list.actions-list.item-list.directory-list .item.action .item-name.rollable h4:hover,
+.actor.sheet.character .actions-panel.active .actions-list.actions-list.item-list.directory-list .item.action.expanded .item-name.rollable h4,
+.actor.sheet.character .item-list .item.list-row .item-name.rollable h4:hover,
+.actor.sheet.character .list-row.expanded .item-name.rollable h4,
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.proficiencies .proficiencies-pane .skills-list .skill .skill-name:hover,
+.actor.sheet.character .list-row .item-quantity a:hover,
+.actor.sheet.character .item-controls a:hover,
+.actor.sheet.character .item.spell .item-controls a i:hover,
+.actor.sheet .crb-style .sheet-body .sheet-content .tab.inventory .item-controls .item-control:hover,
+.actor.sheet.character .crb-style .tab.spellcasting.spellbook-pane.active .spellcastingEntry-list.directory-list.item-list .item.item-container.spellcasting-entry .action-header .skill-name:hover,
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.inventory.item-container.active .wealth .wealth-label.inventory-header .item-name .item-edit .fas.fa-question-circle:hover,
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.crafting .known-formulas .formula-list .formula-item .item-name h4:hover,
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.crafting .known-formulas .formula-list .formula-item .formula-quantity .formula-decrease-quantity:hover,
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.crafting .known-formulas .formula-list .formula-item .formula-quantity .formula-increase-quantity:hover,
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.feats .item.feat-item .item-name h4:hover,
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.effects .effects-list .item .item-name .item-image:hover,
+.actor.sheet.character .crb-style .sheet-body .sheet-content .directory-list h4:hover,
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.effects .effects-list .item.expanded h4,
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.character .ability-scores .ability .ability-id,
+.crb-style .tab.spellcasting .directory-list .item.item-container.spellcasting-entry .action-header .skill-name.prepared-toggle .fas:hover {
+    color: var(--sidebar-title);
+    mix-blend-mode: unset;
+    filter: none;
+    text-shadow: var(--pf2e-shadow-is-dark);
+}
+
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.character .pc h3 i:hover,
+.actor.sheet.character .item-controls .toggle-unready-strikes:hover,
+.actor.sheet.character .item-controls .item-create:hover,
+.actor.sheet.character .item-controls .action-browse:hover,
+.actor.sheet .crb-style .sheet-body .sheet-content ol.directory-list .action-header .item-controls .item-control.toggle-unready-strikes:hover,
+.actor.sheet.character .crb-style .sheet-body .sheet-content .actions .actions-container .actions-tabs-wrapper .actions-panels .actions-list.item-list.directory-list.skill-action-list .action-header.stroke-header .item-controls .item-control.toggle-hidden-actions:hover,
+.crb-style .tab.actions .item.action .action-options:hover {
+    color: var(--paizo-red-bright);
+    mix-blend-mode: unset;
+    filter: none;
+    text-shadow: var(--pf2e-shadow-is-dark);
+}
+
+.actor.sheet.character .sheet-content .tab.proficiencies.active .overflow-list.proficiencies-pane.stroke-header .skills-list .skill h1:hover,
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.proficiencies .proficiencies-pane h1:hover,
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.proficiencies .proficiencies-pane .lores-list .skill .skill-score:hover {
+    color: var(--sidebar-label);
+    mix-blend-mode: none;
+    filter: none;
+    text-shadow: var(--pf2e-shadow-is-dark);
+}
+
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.actions.actions-pane.active .actions-container .actions-tabs-wrapper .actions-nav .tab {
+    box-shadow: var(--glassy);
+}
+
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.actions .actions-container .actions-tabs-wrapper .actions-panels ol.actions-list.strikes-list li.strike button:not(:disabled),
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.inventory .item-summary .item-buttons button,
+.actor.sheet .crb-style .sheet-body .sheet-content ol.spell-list li button.cast-spell,
+.actor.sheet.character .crb-style .tags .tag_transparent.tag {
+    box-shadow: var(--glassy);
+    border-radius: .25em;
+    border: none;
+}
+
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.actions .actions-container .actions-tabs-wrapper .actions-panels ol.actions-list.strikes-list li.strike .auxiliary-actions button:not(:disabled) {
+    color: var(--text-light);
+    box-shadow: var(--glassy);
+    border-radius: .25em;
+    border: none;
+    height: 20.5px;
+    background-color: var(--alt)
+}
+
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.actions .actions-container .actions-tabs-wrapper .actions-panels ol.actions-list.strikes-list li.strike .auxiliary-actions.weapon-drawn {
+    padding: 6px 0px 0px 5px;
+}
+
+.actor.sheet.character .crb-style .actions .actions-container .actions-tabs-wrapper .actions-panels .actions-list.item-list.directory-list.strikes-list .item.action.strike.expandable .auxiliary-actions button:hover,
+.actor.sheet .crb-style .sheet-body .sheet-content ol.spell-list li button.cast-spell:hover {
+    text-shadow: var(--pf2e-shadow-is-light);
+    box-shadow: none;
+}
+
+[data-pf2-check],
+a.entity-link,
+a.inline-roll {
     color: black;
 }
 
-.actor.sheet .crb-style .sheet-body .sheet-content .spell-list .item .item-summary,
-.crb-style .sheet-body .sheet-content .spell-list .item .item-summary {
-    background:none;
-    background-color: transparent;
+.actor.sheet .crb-style .sheet-body .sheet-content .tab.actions .actions-container .actions-tabs-wrapper .actions-panels ol.actions-list .item.action.strike.expandable.ready {
+    padding-bottom: 12px;
+}
+
+.actor.sheet .crb-style .sheet-body .sheet-content .tab.actions .actions-container .actions-tabs-wrapper .actions-panels ol.actions-list .item.action.strike.expandable.ready .item-summary {
+    margin-bottom: 0px;
+}
+
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.inventory .encumbrance {
+    padding-top: 8px;
+    padding-left: 2px;
+}
+
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.biography.active .biography-personality .bio .details-label {
+    padding-bottom: 4px;
+}
+
+.actor.sheet .crb-style .sheet-body .sheet-content ol.spell-list li .item-name .item-image {
+    height: 1.75rem;
+    margin: 2px -1px;
+    width: 1.75rem;
+}
+
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.actions.actions-pane.active .actions-container .actions-tabs-wrapper .actions-panel .actions-list.item-list.directory-list.skill-action-list .item.action.expandable.ready .item-name .item-image.variant-strike[style*="background-image: url(systems/pf2e/icons/actions/FreeAction.webp)"],
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.actions.actions-pane.active .actions-container .actions-tabs-wrapper .actions-panel .actions-list.item-list.directory-list.skill-action-list .item.action.expandable.ready .item-name .item-image.variant-strike[style*="background-image: url(systems/pf2e/icons/actions/OneAction.webp)"],
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.actions.actions-pane.active .actions-container .actions-tabs-wrapper .actions-panel .actions-list.item-list.directory-list.skill-action-list .item.action.expandable.ready .item-name .item-image.variant-strike[style*="background-image: url(systems/pf2e/icons/actions/OneThreeActions.webp)"],
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.actions.actions-pane.active .actions-container .actions-tabs-wrapper .actions-panel .actions-list.item-list.directory-list.skill-action-list .item.action.expandable.ready .item-name .item-image.variant-strike[style*="background-image: url(systems/pf2e/icons/actions/OneTwoActions.webp)"],
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.actions.actions-pane.active .actions-container .actions-tabs-wrapper .actions-panel .actions-list.item-list.directory-list.skill-action-list .item.action.expandable.ready .item-name .item-image.variant-strike[style*="background-image: url(systems/pf2e/icons/actions/Passive.webp)"],
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.actions.actions-pane.active .actions-container .actions-tabs-wrapper .actions-panel .actions-list.item-list.directory-list.skill-action-list .item.action.expandable.ready .item-name .item-image.variant-strike[style*="background-image: url(systems/pf2e/icons/actions/Reaction.webp)"],
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.actions.actions-pane.active .actions-container .actions-tabs-wrapper .actions-panel .actions-list.item-list.directory-list.skill-action-list .item.action.expandable.ready .item-name .item-image.variant-strike[style*="background-image: url(systems/pf2e/icons/actions/ThreeActions.webp)"],
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.actions.actions-pane.active .actions-container .actions-tabs-wrapper .actions-panel .actions-list.item-list.directory-list.skill-action-list .item.action.expandable.ready .item-name .item-image.variant-strike[style*="background-image: url(systems/pf2e/icons/actions/TwoActions.webp)"],
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.actions.actions-pane.active .actions-container .actions-tabs-wrapper .actions-panel .actions-list.item-list.directory-list.skill-action-list .item.action.expandable.ready .item-name .item-image.variant-strike[style*="background-image: url(systems/pf2e/icons/actions/TwoThreeActions.webp)"] {
+    mix-blend-mode: lighten;
+    filter: var(--filter-dark);
+    border: 1px solid #00000000 !important;
+    box-shadow: 0 0 0 1px #00000000, 0 0 0 2px #00000000, inset 0 0 4px #00000000 !important;
 }
 
-.actor.sheet.character .tab.actions .actions-list li.item .auxiliary-actions button {
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.actions.actions-pane.active .actions-container .actions-tabs-wrapper .actions-panel .actions-list.item-list.directory-list.skill-action-list .item.action.expandable.ready .item-name .actions-title .button-group.tags .skill-action.tag.variant-strike {
+    border: 1px solid rgba(255, 255, 255, 0.5) !important;
+}
+
+.actor.sheet.character .crb-style .sheet-body .sheet-content .actions .actions-container .actions-tabs-wrapper .actions-panels .actions-list.item-list.directory-list.skill-action-list .action-header.stroke-header .item-controls .item-control input {
+    color: var(--text-light);
+    box-shadow: var(--glassy);
+    border-radius: .25em;
+    background-color: unset;
+    margin-left: -10px;
+    margin-right: -25px;
+    padding-left: 4px;
+    padding-right: 4px;
+    font-size: 14px;
+    font-weight: 700;
+    padding-top: 4px;
+}
+
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.spellcasting .spellcasting-entry .action-header,
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.spellcasting .pf-add-item-row a,
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.crafting .known-formulas .action-header {
+    border-radius: .25em;
+    box-shadow: var(--glassy);
+}
+
+.actor.sheet.character .crb-style .sheet-body .sheet-content .actions .actions-container .actions-tabs-wrapper .actions-panels .actions-list.item-list.directory-list.skill-action-list .action-header.stroke-header .item-controls .item-control.toggle-hidden-actions {
+    margin-right: 4px;
+}
+
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.actions.actions-pane.active .actions-container .actions-tabs-wrapper .actions-panel .actions-list.item-list.directory-list.skill-action-list .item.action.expandable.ready .item-summary .item-description [data-pf2-action] {
     color: black;
 }
 
-.actor.sheet.character .tab.crafting .known-formulas .formula-list .formula-level-header.formula-level-header,
-.actor.sheet.character .tab.crafting .crafting-entry .formula-list .formula-level-header.formula-level-header {
-    color: white;
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.actions.actions-pane.active .actions-container .actions-tabs-wrapper .actions-panel .actions-list.item-list.directory-list.skill-action-list .item.action.expandable.ready .item-summary .item-description h2 {
+    color: var(--sidebar-label);
+    border-bottom: 1px solid var(--sidebar-label);
+}
+
+.actor.sheet .crb-style .sheet-body .sheet-content .tab.actions .actions-container .actions-tabs-wrapper .actions-panels ol.actions-list li.action,
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.effects .effects-list .item {
+    border-image: linear-gradient(90deg, var(--sidebar-label), var(--sidebar-label)) 1 repeat;
+}
+
+.actor.sheet .crb-style .sheet-body .sheet-content .tab.actions .actions-container .actions-tabs-wrapper .actions-panels ol.actions-list li.action .item-name .item-image:hover {
+    color: var(--sidebar-title);
+    filter: unset !important;
+}
+
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.actions.actions-pane.active .actions-container .actions-tabs-wrapper .actions-panel .actions-list.item-list.directory-list.skill-action-list .item.action.expandable.ready .item-name .item-image.variant-strike {
+    border: 1px solid var(--body);
+    box-shadow: 0 0 0 1px var(--tertiary), 0 0 0 2px #9f725b, inset 0 0 4px rgba(0, 0, 0, .5);
+    height: 32px;
+    width: 32px;
+}
+
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.actions.actions-pane.active .actions-container .actions-tabs-wrapper .actions-panel .actions-list.item-list.directory-list:not(.skill-action-list, .strikes-list) .item.action .item-name.rollable .item-image {
+    mix-blend-mode: lighten;
+    filter: var(--filter-dark);
+    border: 1px solid #00000000 !important;
+    box-shadow: 0 0 0 1px #00000000, 0 0 0 2px #00000000, inset 0 0 4px #00000000 !important;
+    height: 32px;
+    width: 32px;
 }
 
-.actor.sheet.character .tab.inventory .inventory-list .item-list .container-capacity {
-    background-color: rgba(0,0,0,.35);
-    box-shadow: inset 0 0 3px #000;
+.actor.sheet.character .crb-style .sheet-body .sheet-content .tab.pfs section.level-bump .toggle:after {
+    color: var(--text-light);
+    content: "OFF";
+    right: 2px;
 }
\ No newline at end of file