diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2e44203..370b7f6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# 1.9.5
+
+(Refinement) Updated styling for token hud, and extended it to also affect tile hud
+(New) Compact controls setting is back
+(New) Added styling for status-effect messages for both light and dark mode
+(New) The glassy background can now be adjusted via the --glass-bg css variable 
+
 # 1.9.4
 
 (Fix) Option for removing redundant information from damage rolls now functional again
diff --git a/module.json b/module.json
index e8b2c3d..2610b02 100644
--- a/module.json
+++ b/module.json
@@ -12,7 +12,7 @@
       "flags": {}
     }
   ],
-  "version": "1.9.4",
+  "version": "1.9.5",
   "compatibility": {
     "minimum": "10",
     "verified": "10"
@@ -59,6 +59,6 @@
   ],
   "styles": ["styles/fonts.css"],
   "scripts": ["scripts/dorako-ui.js"],
-  "download": "https://github.com/Dorako/pf2e-dorako-ui/archive/refs/tags/v1.9.4.zip",
+  "download": "https://github.com/Dorako/pf2e-dorako-ui/archive/refs/tags/v1.9.5.zip",
   "manifest": "https://github.com/Dorako/pf2e-dorako-ui/releases/latest/download/module.json"
 }
diff --git a/sass/_colors.scss b/sass/_colors.scss
index ba8cf08..6bbd220 100644
--- a/sass/_colors.scss
+++ b/sass/_colors.scss
@@ -69,7 +69,7 @@ $adjusted-lower: #cc3311 !default;
   /* Global */
   --primary: #{$primary-color};
   --primary-light: #{color.scale($primary-color, $lightness: +20%)};
-  --primary-dark: #{color.scale($primary-color, $lightness: -20%)};
+  --primary-dark: #{color.scale($primary-color, $lightness: -40%)};
   --secondary: #{$secondary-color};
   --secondary-light: #{color.scale($secondary-color, $lightness: +20%)};
   --secondary-dark: #{color.scale($secondary-color, $lightness: -40%)};
@@ -113,4 +113,7 @@ $adjusted-lower: #cc3311 !default;
   /* Sidebar */
   --sidebar-label: var(--tertiary-dark);
   --sidebar-title: var(--tertiary);
+
+  /* App UI */
+  --glass-bg: rgba(20, 20, 20, 0.60);
 }
diff --git a/sass/_hotbar.scss b/sass/_hotbar.scss
index f5c41e1..04f6ea5 100644
--- a/sass/_hotbar.scss
+++ b/sass/_hotbar.scss
@@ -6,8 +6,7 @@
     .macro {
         height: calc(var(--macro-size) + 2px);
         width: calc(var(--macro-size) + 2px);
-        border: none;
-        border-radius: 3px;
+        @include glass;
         @include quick-transition;
 
         &.inactive::before,
diff --git a/sass/_mixins.scss b/sass/_mixins.scss
index 5df072b..f204a05 100644
--- a/sass/_mixins.scss
+++ b/sass/_mixins.scss
@@ -2,7 +2,7 @@
     border: none;
     border-radius: 3px;
     background: none;
-    background-color: rgba(20, 20, 20, 0.60);
+    background-color: var(--glass-bg);
     box-shadow: var(--glassy);
     color: var(--color-text-light-heading);
 }
diff --git a/sass/_navigation.scss b/sass/_navigation.scss
index 94e961e..30a6cc1 100644
--- a/sass/_navigation.scss
+++ b/sass/_navigation.scss
@@ -17,13 +17,14 @@ nav#navigation {
         li.nav-item {
             @include glass;
             transition: 0.25s;
+            text-shadow: 0px 0px 3px black;
 
             &:hover {
                 background-color: rgb(177 177 177 / 50%);
                 color: black;
 
                 a, a:hover {
-                    text-shadow: 0 0 4px var(--color-text-light-highlight);
+                    text-shadow: 0 0 3px var(--color-text-light-highlight);
                 }
             }
 
@@ -36,7 +37,7 @@ nav#navigation {
                     color: white;
                     background-color: var(--primary-light);
                     a, a:hover {
-                        text-shadow: 0 0 4px black;
+                        text-shadow: 0px 0px 3px black;
                     }
                 }
             }
@@ -50,7 +51,7 @@ nav#navigation {
                     color: var(--color-text-light-highlight);
                     background-color: var(--secondary-light);
                     a, a:hover {
-                        text-shadow: 0 0 4px black;
+                        text-shadow: 0px 0px 3px black;
                     }
                 }
             }
diff --git a/sass/_notifications.scss b/sass/_notifications.scss
index 612dd62..53765bb 100644
--- a/sass/_notifications.scss
+++ b/sass/_notifications.scss
@@ -6,7 +6,8 @@
 
 #notifications .notification {
     @include glass;
-    text-shadow: 0 0 4px black;
+    text-shadow: 0px 0px 3px black;
+    color: var(--color-text-light-highlight);
 
     &.info {
         background-color: var(--secondary);
diff --git a/sass/_sidebar.scss b/sass/_sidebar.scss
index aee2ca9..eb2ad6c 100644
--- a/sass/_sidebar.scss
+++ b/sass/_sidebar.scss
@@ -53,7 +53,7 @@
             &.active {
                 @include gold-border;
                 border-radius: 3px;
-                text-shadow: 0px 0px 3px rgb(0 0 0 / 50%);
+                text-shadow: 0px 0px 3px black;
                 color: white;
                 background-color: var(--primary-light);
             }
diff --git a/sass/_token-hud.scss b/sass/_token-hud.scss
index 2f85efb..214b1e6 100644
--- a/sass/_token-hud.scss
+++ b/sass/_token-hud.scss
@@ -1,96 +1,6 @@
 @import "mixins";
 
-#token-hud .effect-control {
-    border: none;
-    margin: 0px;
-    padding: 0px;
-
-    &::before {
-        content: '';
-        position: absolute;
-        top: 0;
-        left: 0;
-        width: 100%;
-        height: 100%;
-        box-shadow: var(--glassy);
-        border-radius: 3px;
-        overflow: hidden;
-        pointer-events: none;
-    }
-
-    &.active::before {
-        content: '';
-        position: absolute;
-        top: 0;
-        left: 0;
-        width: 100%;
-        height: 100%;
-        box-shadow: var(--gold-and-glow), var(--glassy);
-        border-radius: 3px;
-        overflow: hidden;
-        pointer-events: none;
-    }
-
-    &:hover::before {
-        content: '';
-        position: absolute;
-        top: 0;
-        left: 0;
-        width: 100%;
-        height: 100%;
-        box-shadow: 0px 0px 10px rgba(220, 200, 100, 0.5) inset, var(--glassy);
-        border-radius: 3px;
-        overflow: hidden;
-        pointer-events: none;
-    }
-
-    &.active:hover::before {
-        content: '';
-        position: absolute;
-        top: 0;
-        left: 0;
-        width: 100%;
-        height: 100%;
-        box-shadow: var(--gold-and-glow), var(--glassy);
-        border-radius: 3px;
-        overflow: hidden;
-        pointer-events: none;
-    }
-}
-
-
 #token-hud {
-    input[type="text"] {
-        @include glass;
-    }
-    .control-icon {
-        @include glass;
-        @include quick-transition;
-
-        &:hover {
-            background-color: var(--secondary-light);
-        }
-
-        &.active {
-            color: var(--color-text-light-highlight);
-            background-color: var(--secondary-light);
-            &:hover {
-                background-color: var(--secondary-dark);
-                > img {
-                    filter: sepia() grayscale(0.95) brightness(1) drop-shadow(0px 0px 3px black);
-                }
-            }
-
-            > img {
-                filter: sepia() grayscale(0.95) brightness(1) drop-shadow(0px 0px 3px black);
-            }
-        }
-
-        > img {
-            opacity: 1;
-            filter: sepia() brightness(0.8) drop-shadow(0px 0px 3px black);
-        }
-    }
     .status-effects {
         background: none;
         box-shadow: none;
@@ -101,15 +11,65 @@
         gap: 8px;
 
         .effect-control {
-            color: var(--color-text-dark-1);
-            cursor: pointer;
-            height: 40px;
-            opacity: 1;
-            position: relative;
-            width: 40px;
-            background-color: rgba(black, 0.5);
-            filter: brightness(0.75) saturate(0.75);
+            border: none;
+            margin: 0px;
+            padding: 0px;
+            background-color: var(--glass-bg);
+        
+                &::before {
+                    content: '';
+                    position: absolute;
+                    top: 0;
+                    left: 0;
+                    width: 100%;
+                    height: 100%;
+                    box-shadow: var(--glassy);
+                    border-radius: 3px;
+                    overflow: hidden;
+                    pointer-events: none;
+                }
+        
+                &.active::before {
+                    content: '';
+                    position: absolute;
+                    top: 0;
+                    left: 0;
+                    width: 100%;
+                    height: 100%;
+                    box-shadow: var(--gold-and-glow), var(--glassy);
+                    border-radius: 3px;
+                    overflow: hidden;
+                    pointer-events: none;
+                }
+        
+                &:hover::before {
+                    content: '';
+                    position: absolute;
+                    top: 0;
+                    left: 0;
+                    width: 100%;
+                    height: 100%;
+                    box-shadow: 0px 0px 10px rgba(220, 200, 100, 0.5) inset, var(--glassy);
+                    border-radius: 3px;
+                    overflow: hidden;
+                    pointer-events: none;
+                }
+        
+                &.active:hover::before {
+                    content: '';
+                    position: absolute;
+                    top: 0;
+                    left: 0;
+                    width: 100%;
+                    height: 100%;
+                    box-shadow: var(--gold-and-glow), var(--glassy);
+                    border-radius: 3px;
+                    overflow: hidden;
+                    pointer-events: none;
+                }
+            }
 
+        .effect-control {
             &:hover, &.active {
                 filter: none;
                 opacity: 1;
@@ -138,32 +98,6 @@
                 border-radius: 3px;
             }
 
-            .badge {
-                background: rgba(255, 255, 255, 90%);
-                border-radius: 50%;
-                border: 0.1em solid darkred;
-                font-size: var(--font-size-8);
-                height: 0.8rem;
-                line-height: var(--font-size-10);
-                pointer-events: none;
-                position: absolute;
-                right: -3px;
-                text-align: center;
-                top: -3px;
-                width: 0.8rem;
-                z-index: 1;
-            }
-
-            &.overridden > * {
-                filter: saturate(0);
-            }
-
-            &.valued .badge {
-                font-size: var(--font-size-12);
-                font-style: unset;
-                font-weight: 500;
-                line-height: var(--font-size-12);
-            }
         }
 
         .title-bar {
@@ -186,4 +120,87 @@
             }
         }
     }
+    
+}
+
+
+.placeable-hud {
+    input[type="text"] {
+        @include glass;
+    }
+    .control-icon {
+        @include glass;
+        @include quick-transition;
+        text-shadow: 0px 0px 3px black;
+
+        // These can become toggled on with a click, but not toggled off with a click
+        &[data-action=overhead], &[data-action=underfoot] {
+            background-color: var(--primary-dark);
+
+            &:hover, &.active {
+                background-color: var(--primary-light);
+                > img {
+                    filter: sepia() grayscale(0.95) brightness(1) drop-shadow(0px 0px 3px black);
+                }
+
+                &:hover {
+                    background-color: var(--primary-light);
+                }
+            }
+        }
+
+        // These can be clicked, but do not become active
+        // 'trigger' is from Monk's Active Tiles
+        &[data-action=sort-up], &[data-action=sort-down], &[data-action=config], &[data-action=trigger]  {
+            &:hover {
+                background-color: var(--primary);
+                > img {
+                    filter: sepia() brightness(0.8) drop-shadow(0px 0px 3px black);
+                }
+            }
+        }
+
+        // These are toggles, inactive -> active -> inactive
+        // 'active' is from Monk's Active Tiles
+        &[data-action=visibility], &[data-action=effects], &[data-action=combat], &[data-action=locked], &[data-action=target], &[data-action=active] {
+            background-color: var(--secondary-dark);
+
+            &:hover, &.active {
+                background-color: var(--secondary-light);
+                > img {
+                    filter: sepia() grayscale(0.95) brightness(1) drop-shadow(0px 0px 3px black);
+                }
+            }
+        }
+
+        // Unknown HUD elements from modules etc. are treated as if they potentially could become active
+        // Since it is unknown whether they can de-activate via a click, active buttons should not darken on hover 
+        &:hover {
+            background-color: var(--secondary);
+            color: var(--color-text-light-highlight);
+        }
+
+        &.active {
+            color: var(--color-text-light-highlight);
+            background-color: var(--secondary-light);
+            border: none;
+
+            // &:hover {
+            //     background-color: var(--secondary-dark);
+            //     color: white;
+            //     > img {
+            //         filter: sepia() grayscale(0.95) brightness(1) drop-shadow(0px 0px 3px black);
+            //     }
+            // }
+
+            > img {
+                filter: sepia() grayscale(0.95) brightness(1) drop-shadow(0px 0px 3px black);
+            }
+        }
+
+        > img {
+            opacity: 1;
+            filter: sepia() brightness(0.8) drop-shadow(0px 0px 3px black);
+        }
+    }
 }
diff --git a/sass/module-support.scss b/sass/module-support.scss
index 1d47e32..1cd6bc7 100644
--- a/sass/module-support.scss
+++ b/sass/module-support.scss
@@ -101,7 +101,7 @@ div#scrollToBottom {
         }
 
         &.active i {
-            text-shadow: 0 0 4px black;
+            text-shadow: 0px 0px 3px black;
             color: var(--color-text-light-highlight);
         }
     }
@@ -122,6 +122,15 @@ div#scrollToBottom {
     }
 }
 
+/* ----------------------------------------- */
+/* Combat Carouse                            */
+/* ----------------------------------------- */
+
+// Needs to be marked as relative for the small caret to be positioned correctly when compact UI is enabled.
+#controls ol li.scene-control[data-control="combat-carousel"] {
+    position: relative;
+}
+
 /* ----------------------------------------- */
 /* Speaking As                               */
 /* ----------------------------------------- */
@@ -261,7 +270,7 @@ nav.damage-log-nav.tabs {
                 &:hover {
                     border-radius: 3px;
                     color: black;
-                    text-shadow: 0 0 4px var(--color-text-light-highlight);
+                    text-shadow: 0 0 3px var(--color-text-light-highlight);
                     box-shadow: none;
                 }
             }
diff --git a/sass/new-chat.scss b/sass/new-chat.scss
index a62004b..6a69551 100644
--- a/sass/new-chat.scss
+++ b/sass/new-chat.scss
@@ -217,6 +217,29 @@
                 // margin-top: 5px;
             }
         }
+
+        .dice-roll .dice-result {
+            .statuseffect-message {
+                background-color: unset;
+                box-shadow: none;
+                border: none;
+    
+                li:not(:last-child) {
+                    margin-bottom: 5px;
+                }
+        
+                img {
+                    @include gold-border;
+                    border-radius: 50%;
+                    margin-right: 6px;
+                }
+            }
+    
+            .statuseffect-rules {
+                @include sheet;
+                @include gold-border-shadow;
+            }
+        }
     }
 
     [data-visibility]:not([data-visibility=all])[data-visibility=gm] {
diff --git a/sass/new-dark-chat.scss b/sass/new-dark-chat.scss
index d81a3dc..55c2296 100644
--- a/sass/new-dark-chat.scss
+++ b/sass/new-dark-chat.scss
@@ -5,12 +5,19 @@
 /* ----------------------------------------- */
 /* Glassy Buttons                            */
 /* ----------------------------------------- */
-.dark-theme.message {
+.dark-theme.message.chat-message {
     .dice-roll .dice-formula, 
     .dice-roll .dice-total {
         @include glass;
     }
 
+    .dice-roll .dice-result {
+        .statuseffect-rules {
+            background: var(--sheet-dark);
+            background-size: cover;
+        }
+    }
+
     .pf2e.chat-card .card-buttons {
         margin: 0px;
         margin-top: 5px;
diff --git a/scripts/dorako-ui.js b/scripts/dorako-ui.js
index 6cda6a6..46cfbbf 100644
--- a/scripts/dorako-ui.js
+++ b/scripts/dorako-ui.js
@@ -1343,15 +1343,15 @@ Hooks.once("init", async () => {
     requiresReload: true
   });
 
-  // game.settings.register("pf2e-dorako-ui", "compact-ui", {
-  //   name: i18n("dorako-ui.settings.compact-ui.name"),
-  //   hint: i18n("dorako-ui.settings.compact-ui.hint"),
-  //   scope: "client",
-  //   config: true,
-  //   default: false,
-  //   type: Boolean,
-  //   requiresReload: true
-  // });
+  game.settings.register("pf2e-dorako-ui", "compact-ui", {
+    name: i18n("dorako-ui.settings.compact-ui.name"),
+    hint: i18n("dorako-ui.settings.compact-ui.hint"),
+    scope: "client",
+    config: true,
+    default: false,
+    type: Boolean,
+    requiresReload: true
+  });
 
   game.settings.register("pf2e-dorako-ui", "no-logo", {
     name: i18n("dorako-ui.settings.no-logo.name"),
@@ -1606,7 +1606,7 @@ Hooks.once("init", async () => {
   // setting = game.settings.get("pf2e-dorako-ui", "rolltype-indication");
   // if (setting == "both" || setting == "bg-color") injectCSS("chat-blind-whisper");
   // if (game.settings.get("pf2e-dorako-ui", "avatar-border")) injectCSS("chat-portrait-border");
-  // if (game.settings.get("pf2e-dorako-ui", "compact-ui")) injectCSS("compact-ui");
+  if (game.settings.get("pf2e-dorako-ui", "compact-ui")) injectCSS("compact-ui");
   if (game.settings.get("pf2e-dorako-ui", "no-logo")) injectCSS("no-logo");
   if (game.settings.get("pf2e-dorako-ui", "no-chat-control-icon")) injectCSS("no-chat-control-icon");
   setting = game.settings.get("pf2e-dorako-ui", "pc-sheet-theme");
diff --git a/styles/legacy/compact-ui.css b/styles/compact-ui.css
similarity index 88%
rename from styles/legacy/compact-ui.css
rename to styles/compact-ui.css
index 12375d4..1738923 100644
--- a/styles/legacy/compact-ui.css
+++ b/styles/compact-ui.css
@@ -1,4 +1,4 @@
-#controls .main-controls .scene-control:not(.active),
+#controls .main-controls .scene-control:not(.active, .toggle),
 #controls .sub-controls .control-tool:not(.active, .toggle) {
   display: none;
 }
@@ -7,7 +7,7 @@
   pointer-events: all;
   /* gap: 5px; */
   flex-wrap: nowrap;
-  width: 75px;
+  /* width: 75px; */
   flex-direction: row;
 }
 
@@ -21,14 +21,14 @@
   display: block;
 }
 
-#controls ol .scene-control,
+/* #controls ol .scene-control,
 #controls ol .control-tool {
   width: 28px;
   height: 28px;
   font-size: 18px;
   line-height: 28px;
   margin-bottom: 4px;
-}
+} */
 
 #controls ol.main-controls.app.control-tools {
   width: unset;
diff --git a/styles/custom-hotbar.css b/styles/legacy/custom-hotbar.css
similarity index 100%
rename from styles/custom-hotbar.css
rename to styles/legacy/custom-hotbar.css
diff --git a/styles/main.css b/styles/main.css
index 5266ba6..2762323 100644
--- a/styles/main.css
+++ b/styles/main.css
@@ -15,7 +15,7 @@
   border: none;
   border-radius: 3px;
   background: none;
-  background-color: rgba(20, 20, 20, 0.6);
+  background-color: var(--glass-bg);
   box-shadow: var(--glassy);
   color: var(--color-text-light-heading);
 }
@@ -27,7 +27,7 @@
   border: none;
   border-radius: 3px;
   background: none;
-  background-color: rgba(20, 20, 20, 0.6);
+  background-color: var(--glass-bg);
   box-shadow: var(--glassy);
   color: var(--color-text-light-heading);
   border-radius: 5px;
@@ -98,7 +98,7 @@
   border: none;
   border-radius: 3px;
   background: none;
-  background-color: rgba(20, 20, 20, 0.6);
+  background-color: var(--glass-bg);
   box-shadow: var(--glassy);
   color: var(--color-text-light-heading);
   background-color: rgba(0, 0, 0, 0.8);
@@ -122,7 +122,7 @@
   border: none;
   border-radius: 3px;
   background: none;
-  background-color: rgba(20, 20, 20, 0.6);
+  background-color: var(--glass-bg);
   box-shadow: var(--glassy);
   color: var(--color-text-light-heading);
   background-color: rgba(0, 0, 0, 0.8);
@@ -136,7 +136,7 @@
   border: none;
   border-radius: 3px;
   background: none;
-  background-color: rgba(20, 20, 20, 0.6);
+  background-color: var(--glass-bg);
   box-shadow: var(--glassy);
   color: var(--color-text-light-heading);
 }
@@ -165,7 +165,7 @@
   /* Global */
   --primary: #5e0000;
   --primary-light: #b10000;
-  --primary-dark: #4b0000;
+  --primary-dark: #380000;
   --secondary: #171f69;
   --secondary-light: #2532a8;
   --secondary-dark: #0e133f;
@@ -201,6 +201,8 @@
   /* Sidebar */
   --sidebar-label: var(--tertiary-dark);
   --sidebar-title: var(--tertiary);
+  /* App UI */
+  --glass-bg: rgba(20, 20, 20, 0.60);
 }
 
 .combat-sidebar .drag-gap {
@@ -230,7 +232,7 @@ nav#controls ol.control-tools li.scene-control {
   border: none;
   border-radius: 3px;
   background: none;
-  background-color: rgba(20, 20, 20, 0.6);
+  background-color: var(--glass-bg);
   box-shadow: var(--glassy);
   color: var(--color-text-light-heading);
   transition: text-shadow 0.15s ease-in-out, background-color 0.15s ease-in-out, border 0.15s ease-in-out, color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
@@ -248,7 +250,7 @@ nav#controls ol.control-tools li.scene-control:hover {
   border: none;
   border-radius: 3px;
   background: none;
-  background-color: rgba(20, 20, 20, 0.6);
+  background-color: var(--glass-bg);
   box-shadow: var(--glassy);
   color: var(--color-text-light-heading);
   color: var(--color-text-light-highlight);
@@ -264,7 +266,7 @@ nav#controls ol.control-tools li.scene-control.toggle {
   border: none;
   border-radius: 3px;
   background: none;
-  background-color: rgba(20, 20, 20, 0.6);
+  background-color: var(--glass-bg);
   box-shadow: var(--glassy);
   color: var(--color-text-light-heading);
   background-color: var(--secondary-dark);
@@ -275,7 +277,7 @@ nav#controls ol.control-tools li.scene-control.toggle:hover {
   border: none;
   border-radius: 3px;
   background: none;
-  background-color: rgba(20, 20, 20, 0.6);
+  background-color: var(--glass-bg);
   box-shadow: var(--glassy);
   color: var(--color-text-light-heading);
   color: white;
@@ -305,7 +307,7 @@ nav#controls ol.control-tools li.scene-control.toggle:hover {
   border: none;
   border-radius: 3px;
   background: none;
-  background-color: rgba(20, 20, 20, 0.6);
+  background-color: var(--glass-bg);
   box-shadow: var(--glassy);
   color: var(--color-text-light-heading);
   display: none;
@@ -394,6 +396,10 @@ nav#controls ol.control-tools li.scene-control.toggle:hover {
   width: calc(var(--macro-size) + 2px);
   border: none;
   border-radius: 3px;
+  background: none;
+  background-color: var(--glass-bg);
+  box-shadow: var(--glassy);
+  color: var(--color-text-light-heading);
   transition: text-shadow 0.15s ease-in-out, background-color 0.15s ease-in-out, border 0.15s ease-in-out, color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
 }
 #hotbar .macro.inactive::before, #hotbar .macro.active::before {
@@ -456,7 +462,7 @@ nav#controls ol.control-tools li.scene-control.toggle:hover {
   border: none;
   border-radius: 3px;
   background: none;
-  background-color: rgba(20, 20, 20, 0.6);
+  background-color: var(--glass-bg);
   box-shadow: var(--glassy);
   color: var(--color-text-light-heading);
 }
@@ -480,7 +486,7 @@ nav#navigation #nav-toggle {
   border: none;
   border-radius: 3px;
   background: none;
-  background-color: rgba(20, 20, 20, 0.6);
+  background-color: var(--glass-bg);
   box-shadow: var(--glassy);
   color: var(--color-text-light-heading);
   transition: 0.25s;
@@ -491,23 +497,24 @@ nav#navigation ol#scene-list li.nav-item {
   border: none;
   border-radius: 3px;
   background: none;
-  background-color: rgba(20, 20, 20, 0.6);
+  background-color: var(--glass-bg);
   box-shadow: var(--glassy);
   color: var(--color-text-light-heading);
   transition: 0.25s;
+  text-shadow: 0px 0px 3px black;
 }
 nav#navigation ol#scene-list li.nav-item:hover {
   background-color: rgba(177, 177, 177, 0.5);
   color: black;
 }
 nav#navigation ol#scene-list li.nav-item:hover a, nav#navigation ol#scene-list li.nav-item:hover a:hover {
-  text-shadow: 0 0 4px var(--color-text-light-highlight);
+  text-shadow: 0 0 3px var(--color-text-light-highlight);
 }
 nav#navigation ol#scene-list li.nav-item.view {
   border: none;
   border-radius: 3px;
   background: none;
-  background-color: rgba(20, 20, 20, 0.6);
+  background-color: var(--glass-bg);
   box-shadow: var(--glassy);
   color: var(--color-text-light-heading);
   background-color: var(--primary);
@@ -518,13 +525,13 @@ nav#navigation ol#scene-list li.nav-item.view:hover {
   background-color: var(--primary-light);
 }
 nav#navigation ol#scene-list li.nav-item.view:hover a, nav#navigation ol#scene-list li.nav-item.view:hover a:hover {
-  text-shadow: 0 0 4px black;
+  text-shadow: 0px 0px 3px black;
 }
 nav#navigation ol#scene-list li.nav-item.gm {
   border: none;
   border-radius: 3px;
   background: none;
-  background-color: rgba(20, 20, 20, 0.6);
+  background-color: var(--glass-bg);
   box-shadow: var(--glassy);
   color: var(--color-text-light-heading);
   background-color: var(--secondary-dark);
@@ -534,7 +541,7 @@ nav#navigation ol#scene-list li.nav-item.gm:hover, nav#navigation ol#scene-list
   background-color: var(--secondary-light);
 }
 nav#navigation ol#scene-list li.nav-item.gm:hover a, nav#navigation ol#scene-list li.nav-item.gm:hover a:hover, nav#navigation ol#scene-list li.nav-item.gm.view a, nav#navigation ol#scene-list li.nav-item.gm.view a:hover {
-  text-shadow: 0 0 4px black;
+  text-shadow: 0px 0px 3px black;
 }
 nav#navigation ol#scene-list li.nav-item.active {
   color: var(--color-text-light-highlight);
@@ -547,10 +554,11 @@ nav#navigation ol#scene-list li.nav-item.active {
   border: none;
   border-radius: 3px;
   background: none;
-  background-color: rgba(20, 20, 20, 0.6);
+  background-color: var(--glass-bg);
   box-shadow: var(--glassy);
   color: var(--color-text-light-heading);
-  text-shadow: 0 0 4px black;
+  text-shadow: 0px 0px 3px black;
+  color: var(--color-text-light-highlight);
 }
 #notifications .notification.info {
   background-color: var(--secondary);
@@ -617,7 +625,7 @@ nav#navigation ol#scene-list li.nav-item.active {
   margin: 2px;
   box-shadow: 0 0 0 1px var(--tertiary), 0 0 0 2px var(--gold-brown);
   border-radius: 3px;
-  text-shadow: 0px 0px 3px rgba(0, 0, 0, 0.5);
+  text-shadow: 0px 0px 3px black;
   color: white;
   background-color: var(--primary-light);
 }
@@ -625,12 +633,22 @@ nav#navigation ol#scene-list li.nav-item.active {
   line-height: 24px;
 }
 
-#token-hud .effect-control {
+#token-hud .status-effects {
+  background: none;
+  box-shadow: none;
+  border: none;
+  padding: 0px;
+  grid-template-columns: repeat(5, 1fr);
+  width: auto;
+  gap: 8px;
+}
+#token-hud .status-effects .effect-control {
   border: none;
   margin: 0px;
   padding: 0px;
+  background-color: var(--glass-bg);
 }
-#token-hud .effect-control::before {
+#token-hud .status-effects .effect-control::before {
   content: "";
   position: absolute;
   top: 0;
@@ -642,7 +660,7 @@ nav#navigation ol#scene-list li.nav-item.active {
   overflow: hidden;
   pointer-events: none;
 }
-#token-hud .effect-control.active::before {
+#token-hud .status-effects .effect-control.active::before {
   content: "";
   position: absolute;
   top: 0;
@@ -654,7 +672,7 @@ nav#navigation ol#scene-list li.nav-item.active {
   overflow: hidden;
   pointer-events: none;
 }
-#token-hud .effect-control:hover::before {
+#token-hud .status-effects .effect-control:hover::before {
   content: "";
   position: absolute;
   top: 0;
@@ -666,7 +684,7 @@ nav#navigation ol#scene-list li.nav-item.active {
   overflow: hidden;
   pointer-events: none;
 }
-#token-hud .effect-control.active:hover::before {
+#token-hud .status-effects .effect-control.active:hover::before {
   content: "";
   position: absolute;
   top: 0;
@@ -678,63 +696,6 @@ nav#navigation ol#scene-list li.nav-item.active {
   overflow: hidden;
   pointer-events: none;
 }
-
-#token-hud input[type=text] {
-  border: none;
-  border-radius: 3px;
-  background: none;
-  background-color: rgba(20, 20, 20, 0.6);
-  box-shadow: var(--glassy);
-  color: var(--color-text-light-heading);
-}
-#token-hud .control-icon {
-  border: none;
-  border-radius: 3px;
-  background: none;
-  background-color: rgba(20, 20, 20, 0.6);
-  box-shadow: var(--glassy);
-  color: var(--color-text-light-heading);
-  transition: text-shadow 0.15s ease-in-out, background-color 0.15s ease-in-out, border 0.15s ease-in-out, color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
-}
-#token-hud .control-icon:hover {
-  background-color: var(--secondary-light);
-}
-#token-hud .control-icon.active {
-  color: var(--color-text-light-highlight);
-  background-color: var(--secondary-light);
-}
-#token-hud .control-icon.active:hover {
-  background-color: var(--secondary-dark);
-}
-#token-hud .control-icon.active:hover > img {
-  filter: sepia() grayscale(0.95) brightness(1) drop-shadow(0px 0px 3px black);
-}
-#token-hud .control-icon.active > img {
-  filter: sepia() grayscale(0.95) brightness(1) drop-shadow(0px 0px 3px black);
-}
-#token-hud .control-icon > img {
-  opacity: 1;
-  filter: sepia() brightness(0.8) drop-shadow(0px 0px 3px black);
-}
-#token-hud .status-effects {
-  background: none;
-  box-shadow: none;
-  border: none;
-  padding: 0px;
-  grid-template-columns: repeat(5, 1fr);
-  width: auto;
-  gap: 8px;
-}
-#token-hud .status-effects .effect-control {
-  color: var(--color-text-dark-1);
-  cursor: pointer;
-  height: 40px;
-  opacity: 1;
-  position: relative;
-  width: 40px;
-  background-color: rgba(0, 0, 0, 0.5);
-  filter: brightness(0.75) saturate(0.75);
-}
 #token-hud .status-effects .effect-control:hover, #token-hud .status-effects .effect-control.active {
   filter: none;
   opacity: 1;
@@ -759,35 +720,11 @@ nav#navigation ol#scene-list li.nav-item.active {
   width: auto;
   border-radius: 3px;
 }
-#token-hud .status-effects .effect-control .badge {
-  background: rgba(255, 255, 255, 0.9);
-  border-radius: 50%;
-  border: 0.1em solid darkred;
-  font-size: var(--font-size-8);
-  height: 0.8rem;
-  line-height: var(--font-size-10);
-  pointer-events: none;
-  position: absolute;
-  right: -3px;
-  text-align: center;
-  top: -3px;
-  width: 0.8rem;
-  z-index: 1;
-}
-#token-hud .status-effects .effect-control.overridden > * {
-  filter: saturate(0);
-}
-#token-hud .status-effects .effect-control.valued .badge {
-  font-size: var(--font-size-12);
-  font-style: unset;
-  font-weight: 500;
-  line-height: var(--font-size-12);
-}
 #token-hud .status-effects .title-bar {
   border: none;
   border-radius: 3px;
   background: none;
-  background-color: rgba(20, 20, 20, 0.6);
+  background-color: var(--glass-bg);
   box-shadow: var(--glassy);
   color: var(--color-text-light-heading);
   box-sizing: content-box;
@@ -807,4 +744,66 @@ nav#navigation ol#scene-list li.nav-item.active {
   visibility: visible;
 }
 
+.placeable-hud input[type=text] {
+  border: none;
+  border-radius: 3px;
+  background: none;
+  background-color: var(--glass-bg);
+  box-shadow: var(--glassy);
+  color: var(--color-text-light-heading);
+}
+.placeable-hud .control-icon {
+  border: none;
+  border-radius: 3px;
+  background: none;
+  background-color: var(--glass-bg);
+  box-shadow: var(--glassy);
+  color: var(--color-text-light-heading);
+  transition: text-shadow 0.15s ease-in-out, background-color 0.15s ease-in-out, border 0.15s ease-in-out, color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
+  text-shadow: 0px 0px 3px black;
+}
+.placeable-hud .control-icon[data-action=overhead], .placeable-hud .control-icon[data-action=underfoot] {
+  background-color: var(--primary-dark);
+}
+.placeable-hud .control-icon[data-action=overhead]:hover, .placeable-hud .control-icon[data-action=overhead].active, .placeable-hud .control-icon[data-action=underfoot]:hover, .placeable-hud .control-icon[data-action=underfoot].active {
+  background-color: var(--primary-light);
+}
+.placeable-hud .control-icon[data-action=overhead]:hover > img, .placeable-hud .control-icon[data-action=overhead].active > img, .placeable-hud .control-icon[data-action=underfoot]:hover > img, .placeable-hud .control-icon[data-action=underfoot].active > img {
+  filter: sepia() grayscale(0.95) brightness(1) drop-shadow(0px 0px 3px black);
+}
+.placeable-hud .control-icon[data-action=overhead]:hover:hover, .placeable-hud .control-icon[data-action=overhead].active:hover, .placeable-hud .control-icon[data-action=underfoot]:hover:hover, .placeable-hud .control-icon[data-action=underfoot].active:hover {
+  background-color: var(--primary-light);
+}
+.placeable-hud .control-icon[data-action=sort-up]:hover, .placeable-hud .control-icon[data-action=sort-down]:hover, .placeable-hud .control-icon[data-action=config]:hover, .placeable-hud .control-icon[data-action=trigger]:hover {
+  background-color: var(--primary);
+}
+.placeable-hud .control-icon[data-action=sort-up]:hover > img, .placeable-hud .control-icon[data-action=sort-down]:hover > img, .placeable-hud .control-icon[data-action=config]:hover > img, .placeable-hud .control-icon[data-action=trigger]:hover > img {
+  filter: sepia() brightness(0.8) drop-shadow(0px 0px 3px black);
+}
+.placeable-hud .control-icon[data-action=visibility], .placeable-hud .control-icon[data-action=effects], .placeable-hud .control-icon[data-action=combat], .placeable-hud .control-icon[data-action=locked], .placeable-hud .control-icon[data-action=target], .placeable-hud .control-icon[data-action=active] {
+  background-color: var(--secondary-dark);
+}
+.placeable-hud .control-icon[data-action=visibility]:hover, .placeable-hud .control-icon[data-action=visibility].active, .placeable-hud .control-icon[data-action=effects]:hover, .placeable-hud .control-icon[data-action=effects].active, .placeable-hud .control-icon[data-action=combat]:hover, .placeable-hud .control-icon[data-action=combat].active, .placeable-hud .control-icon[data-action=locked]:hover, .placeable-hud .control-icon[data-action=locked].active, .placeable-hud .control-icon[data-action=target]:hover, .placeable-hud .control-icon[data-action=target].active, .placeable-hud .control-icon[data-action=active]:hover, .placeable-hud .control-icon[data-action=active].active {
+  background-color: var(--secondary-light);
+}
+.placeable-hud .control-icon[data-action=visibility]:hover > img, .placeable-hud .control-icon[data-action=visibility].active > img, .placeable-hud .control-icon[data-action=effects]:hover > img, .placeable-hud .control-icon[data-action=effects].active > img, .placeable-hud .control-icon[data-action=combat]:hover > img, .placeable-hud .control-icon[data-action=combat].active > img, .placeable-hud .control-icon[data-action=locked]:hover > img, .placeable-hud .control-icon[data-action=locked].active > img, .placeable-hud .control-icon[data-action=target]:hover > img, .placeable-hud .control-icon[data-action=target].active > img, .placeable-hud .control-icon[data-action=active]:hover > img, .placeable-hud .control-icon[data-action=active].active > img {
+  filter: sepia() grayscale(0.95) brightness(1) drop-shadow(0px 0px 3px black);
+}
+.placeable-hud .control-icon:hover {
+  background-color: var(--secondary);
+  color: var(--color-text-light-highlight);
+}
+.placeable-hud .control-icon.active {
+  color: var(--color-text-light-highlight);
+  background-color: var(--secondary-light);
+  border: none;
+}
+.placeable-hud .control-icon.active > img {
+  filter: sepia() grayscale(0.95) brightness(1) drop-shadow(0px 0px 3px black);
+}
+.placeable-hud .control-icon > img {
+  opacity: 1;
+  filter: sepia() brightness(0.8) drop-shadow(0px 0px 3px black);
+}
+
 /*# sourceMappingURL=main.css.map */
diff --git a/styles/main.css.map b/styles/main.css.map
index 73e5d03..70e1eea 100644
--- a/styles/main.css.map
+++ b/styles/main.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["../sass/_app-ui.scss","../sass/_mixins.scss","../sass/_colors.scss","../sass/_combat.scss","../sass/_controls.scss","../sass/_effects-panel.scss","../sass/_hotbar.scss","../sass/_navigation.scss","../sass/_notifications.scss","../sass/_sidebar.scss","../sass/_token-hud.scss"],"names":[],"mappings":"AAEA;AACC;AACA;AAED;EACI;EACA;;;AAGJ;EACI;EACA;;;AAGJ;ECfI;EACA;EACA;EACA;EACA;EACA;;;ADcJ;AACA;AACA;AAEA;ECvBI;EACA;EACA;EACA;EACA;EACA;EDoBA;EACA;;AAEA;EACI;;AAEA;EACI;EACA;EACA;;AAGR;EACI;;AACA;EACI;EACA;;;AAKZ;EACI;EACA;;AACA;EChBA;EACA;EACA;AArBA;EACA;EACA;EACA,YACI;EDiCA;EACA;;;AAIR;EACI;EACA;;;AAGJ;EC5BI;EACA;EACA;AArBA;EACA;EACA;EACA,YACI;ED6CJ;;;AAGJ;EACI;;AAEA;EACI;;AAEJ;EACI;;;AAIR;AACA;AACA;AAEA;ECjFI;EACA;EACA;EACA;EACA;EACA;ED8EA;EACA;;AAEA;EACI;;AAGJ;EACI;;AAEA;EACI;EACA;;;AAKZ;AACA;AACA;AAEA;ECxGI;EACA;EACA;EACA;EACA;EACA;EDqGA;EACA;;;AAGJ;AACA;AACA;AAGA;ECnHI;EACA;EACA;EACA;EACA;EACA;;;ACJJ;AACA;AACA;AAEA;AAOA;AAEoC;AACD;AAEL;AAO9B;AAMA;AAIA;AACA;AACA;AAEA;AAOA;AAMA;AAMA;AAKA;AACA;AACA;AAEA;AACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EACA;EACA;EACA;EAGA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;AAEA;EACA;EACA;AAEA;EACA;EACA;;;AC/GE;EACI;;AAGJ;EACI;;AAIA;EACI;;AAGJ;EACI;;;AChBZ;AACA;AACA;AAEA;EACI;;AAGI;EACI;;AAEJ;AAAA;EHXJ;EACA;EACA;EACA;EACA;EACA;EAKA;EGKQ;EACA;EACA;;AAEA;AAAA;EACI;;AAGJ;AAAA;AAAA;EHvBR;EACA;EACA;EACA;EACA;EACA;EGoBY;EACA;;AAEA;AAAA;AAAA;EACI;;AAIR;AAAA;EHjCR;EACA;EACA;EACA;EACA;EACA;EG8BY;;AAEA;AAAA;AAAA;EHrCZ;EACA;EACA;EACA;EACA;EACA;EGkCgB;EACA;;;ACvCpB;EACI;;;AAGJ;EACI;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;;AAGI;EACI;;AAIR;EJvBJ;EACA;EACA;EACA;EACA;EACA;EIoBQ;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;;AAEA;EACI;;AACA;EAEI;EACA;;AAKZ;EACI;EACA;EACA;;AAIR;AJnCJ;EACA;EACA;EACA,YACI;EIiCI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACI;;AAKZ;EACI;EACA;;;AC3GR;AACA;AACA;AAEI;EACI;EACA;EACA;EACA;ELEJ;;AKCI;ELDJ;EKIQ;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGJ;ELhBJ;EKkBQ;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAGJ;EACI;;AAGJ;EACI;EACA;;AAGJ;EACI;EACA;;AAKR;EACI;EACA;EACA;EACA;;AAGJ;EL9EA;EACA;EACA;EACA;EACA;EACA;;;AK8EJ;EACI;IACI;IACA;;EAEJ;IACI;;;ACzFR;AACA;AACA;AAEA;EACI;;AAEA;ENPA;EACA;EACA;EACA;EACA;EACA;EMII;EACA;EACA;;AAIA;ENfJ;EACA;EACA;EACA;EACA;EACA;EMYQ;;AAEA;EACI;EACA;;AAEA;EACI;;AAIR;EN5BR;EACA;EACA;EACA;EACA;EACA;EMyBY;EACA;;AAEA;EACI;EACA;;AACA;EACI;;AAKZ;EN1CR;EACA;EACA;EACA;EACA;EACA;EMuCY;;AAEA;EAEI;EACA;;AACA;EACI;;AAKZ;EACI;;;ACxDhB;AACA;AACA;AAEA;EPLI;EACA;EACA;EACA;EACA;EACA;EOEA;;AAEA;EACI;;AAGJ;EACI;;AAGJ;EAEI;EACA;EACA;;;ACtBR;AACA;AACA;AAGI;EACI;;;AAIR;EACI;EACA;;;AAGJ;EACI;EACA;;AACA;EACI;EACA;;;AAIR;EACI;;;AAGJ;EACI;EACA;;AAEA;EACI;;AAEA;EACI;;AAIR;EACI;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;;AAEA;ARrCR;EACA;EACA;EACA,YACI;EQmCQ;EACA;EACA;EACA;;AAKZ;EACI;;;AC7DR;EACI;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAMJ;ET7DA;EACA;EACA;EACA;EACA;EACA;;AS2DA;EThEA;EACA;EACA;EACA;EACA;EACA;EAKA;;AS0DI;EACI;;AAGJ;EACI;EACA;;AACA;EACI;;AACA;EACI;;AAIR;EACI;;AAIR;EACI;EACA;;AAGR;EACI;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;;AACA;EACI;;AAIR;EACI;EACA;;AAGJ;EACI;EACA;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACI;;AAGJ;EACI;EACA;EACA;EACA;;AAIR;ETvKJ;EACA;EACA;EACA;EACA;EACA;ESoKQ;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI","file":"main.css"}
\ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["../sass/_app-ui.scss","../sass/_mixins.scss","../sass/_colors.scss","../sass/_combat.scss","../sass/_controls.scss","../sass/_effects-panel.scss","../sass/_hotbar.scss","../sass/_navigation.scss","../sass/_notifications.scss","../sass/_sidebar.scss","../sass/_token-hud.scss"],"names":[],"mappings":"AAEA;AACC;AACA;AAED;EACI;EACA;;;AAGJ;EACI;EACA;;;AAGJ;ECfI;EACA;EACA;EACA;EACA;EACA;;;ADcJ;AACA;AACA;AAEA;ECvBI;EACA;EACA;EACA;EACA;EACA;EDoBA;EACA;;AAEA;EACI;;AAEA;EACI;EACA;EACA;;AAGR;EACI;;AACA;EACI;EACA;;;AAKZ;EACI;EACA;;AACA;EChBA;EACA;EACA;AArBA;EACA;EACA;EACA,YACI;EDiCA;EACA;;;AAIR;EACI;EACA;;;AAGJ;EC5BI;EACA;EACA;AArBA;EACA;EACA;EACA,YACI;ED6CJ;;;AAGJ;EACI;;AAEA;EACI;;AAEJ;EACI;;;AAIR;AACA;AACA;AAEA;ECjFI;EACA;EACA;EACA;EACA;EACA;ED8EA;EACA;;AAEA;EACI;;AAGJ;EACI;;AAEA;EACI;EACA;;;AAKZ;AACA;AACA;AAEA;ECxGI;EACA;EACA;EACA;EACA;EACA;EDqGA;EACA;;;AAGJ;AACA;AACA;AAGA;ECnHI;EACA;EACA;EACA;EACA;EACA;;;ACJJ;AACA;AACA;AAEA;AAOA;AAEoC;AACD;AAEL;AAO9B;AAMA;AAIA;AACA;AACA;AAEA;AAOA;AAMA;AAMA;AAKA;AACA;AACA;AAEA;AACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EACA;EACA;EACA;EAGA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;AAEA;EACA;EACA;AAEA;EACA;EACA;AAEA;EACA;;;AClHE;EACI;;AAGJ;EACI;;AAIA;EACI;;AAGJ;EACI;;;AChBZ;AACA;AACA;AAEA;EACI;;AAGI;EACI;;AAEJ;AAAA;EHXJ;EACA;EACA;EACA;EACA;EACA;EAKA;EGKQ;EACA;EACA;;AAEA;AAAA;EACI;;AAGJ;AAAA;AAAA;EHvBR;EACA;EACA;EACA;EACA;EACA;EGoBY;EACA;;AAEA;AAAA;AAAA;EACI;;AAIR;AAAA;EHjCR;EACA;EACA;EACA;EACA;EACA;EG8BY;;AAEA;AAAA;AAAA;EHrCZ;EACA;EACA;EACA;EACA;EACA;EGkCgB;EACA;;;ACvCpB;EACI;;;AAGJ;EACI;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;;AAGI;EACI;;AAIR;EJvBJ;EACA;EACA;EACA;EACA;EACA;EIoBQ;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;;AAEA;EACI;;AACA;EAEI;EACA;;AAKZ;EACI;EACA;EACA;;AAIR;AJnCJ;EACA;EACA;EACA,YACI;EIiCI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACI;;AAKZ;EACI;EACA;;;AC3GR;AACA;AACA;AAEI;EACI;EACA;ELNJ;EACA;EACA;EACA;EACA;EACA;EAKA;;AKAI;ELAJ;EKGQ;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGJ;ELfJ;EKiBQ;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;;AAGJ;EACI;;AAGJ;EACI;EACA;;AAGJ;EACI;EACA;;AAKR;EACI;EACA;EACA;EACA;;AAGJ;EL7EA;EACA;EACA;EACA;EACA;EACA;;;AK6EJ;EACI;IACI;IACA;;EAEJ;IACI;;;ACxFR;AACA;AACA;AAEA;EACI;;AAEA;ENPA;EACA;EACA;EACA;EACA;EACA;EMII;EACA;EACA;;AAIA;ENfJ;EACA;EACA;EACA;EACA;EACA;EMYQ;EACA;;AAEA;EACI;EACA;;AAEA;EACI;;AAIR;EN7BR;EACA;EACA;EACA;EACA;EACA;EM0BY;EACA;;AAEA;EACI;EACA;;AACA;EACI;;AAKZ;EN3CR;EACA;EACA;EACA;EACA;EACA;EMwCY;;AAEA;EAEI;EACA;;AACA;EACI;;AAKZ;EACI;;;ACzDhB;AACA;AACA;AAEA;EPLI;EACA;EACA;EACA;EACA;EACA;EOEA;EACA;;AAEA;EACI;;AAGJ;EACI;;AAGJ;EAEI;EACA;EACA;;;ACvBR;AACA;AACA;AAGI;EACI;;;AAIR;EACI;EACA;;;AAGJ;EACI;EACA;;AACA;EACI;EACA;;;AAIR;EACI;;;AAGJ;EACI;EACA;;AAEA;EACI;;AAEA;EACI;;AAIR;EACI;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;;AAEA;ARrCR;EACA;EACA;EACA,YACI;EQmCQ;EACA;EACA;EACA;;AAKZ;EACI;;;AC5DJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;;AAEI;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAKR;EACI;EACA;EACA;;AACA;EACI;;AAIR;EACI;EACA;;AAGJ;EACI;EACA;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;;AAKR;ETrGJ;EACA;EACA;EACA;EACA;EACA;ESkGQ;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;;;AASZ;ET9HA;EACA;EACA;EACA;EACA;EACA;;AS4HA;ETjIA;EACA;EACA;EACA;EACA;EACA;EAKA;ES0HI;;AAGA;EACI;;AAEA;EACI;;AACA;EACI;;AAGJ;EACI;;AAQR;EACI;;AACA;EACI;;AAOZ;EACI;;AAEA;EACI;;AACA;EACI;;AAOZ;EACI;EACA;;AAGJ;EACI;EACA;EACA;;AAUA;EACI;;AAIR;EACI;EACA","file":"main.css"}
\ No newline at end of file
diff --git a/styles/module-support.css b/styles/module-support.css
index 4991248..7d19507 100644
--- a/styles/module-support.css
+++ b/styles/module-support.css
@@ -22,7 +22,7 @@
   /* Global */
   --primary: #5e0000;
   --primary-light: #b10000;
-  --primary-dark: #4b0000;
+  --primary-dark: #380000;
   --secondary: #171f69;
   --secondary-light: #2532a8;
   --secondary-dark: #0e133f;
@@ -58,6 +58,8 @@
   /* Sidebar */
   --sidebar-label: var(--tertiary-dark);
   --sidebar-title: var(--tertiary);
+  /* App UI */
+  --glass-bg: rgba(20, 20, 20, 0.60);
 }
 
 /* ----------------------------------------- */
@@ -124,7 +126,7 @@ div#scrollToBottom {
   border: none;
   border-radius: 3px;
   background: none;
-  background-color: rgba(20, 20, 20, 0.6);
+  background-color: var(--glass-bg);
   box-shadow: var(--glassy);
   color: var(--color-text-light-heading);
   background-color: #ECBF41;
@@ -145,7 +147,7 @@ div#scrollToBottom:hover {
   border: none;
   border-radius: 3px;
   background: none;
-  background-color: rgba(20, 20, 20, 0.6);
+  background-color: var(--glass-bg);
   box-shadow: var(--glassy);
   color: var(--color-text-light-heading);
   transition: text-shadow 0.15s ease-in-out, background-color 0.15s ease-in-out, border 0.15s ease-in-out, color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
@@ -155,7 +157,7 @@ div#scrollToBottom:hover {
   color: var(--color-text-light-highlight);
 }
 #dfcp-rt-buttons button.active i {
-  text-shadow: 0 0 4px black;
+  text-shadow: 0px 0px 3px black;
   color: var(--color-text-light-highlight);
 }
 
@@ -173,6 +175,13 @@ div#scrollToBottom:hover {
   display: none;
 }
 
+/* ----------------------------------------- */
+/* Combat Carouse                            */
+/* ----------------------------------------- */
+#controls ol li.scene-control[data-control=combat-carousel] {
+  position: relative;
+}
+
 /* ----------------------------------------- */
 /* Speaking As                               */
 /* ----------------------------------------- */
@@ -184,7 +193,7 @@ div.speaking-as--currentSpeaker + #chat-controls {
   border: none;
   border-radius: 3px;
   background: none;
-  background-color: rgba(20, 20, 20, 0.6);
+  background-color: var(--glass-bg);
   box-shadow: var(--glassy);
   color: var(--color-text-light-heading);
   padding-left: 5px;
@@ -253,7 +262,7 @@ div.speaking-as--currentSpeaker + #chat-controls {
   border: none;
   border-radius: 3px;
   background: none;
-  background-color: rgba(20, 20, 20, 0.6);
+  background-color: var(--glass-bg);
   box-shadow: var(--glassy);
   color: var(--color-text-light-heading);
   transition: text-shadow 0.15s ease-in-out, background-color 0.15s ease-in-out, border 0.15s ease-in-out, color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
@@ -308,7 +317,7 @@ nav.damage-log-nav.tabs .item.active {
   border: none;
   border-radius: 3px;
   background: none;
-  background-color: rgba(20, 20, 20, 0.6);
+  background-color: var(--glass-bg);
   box-shadow: var(--glassy);
   color: var(--color-text-light-heading);
 }
@@ -319,7 +328,7 @@ nav.damage-log-nav.tabs .item.active {
 #controls ol.control-tools#terrainlayer-tools .control-tool:not(#tl-defaultcost):hover button.control-btn:hover {
   border-radius: 3px;
   color: black;
-  text-shadow: 0 0 4px var(--color-text-light-highlight);
+  text-shadow: 0 0 3px var(--color-text-light-highlight);
   box-shadow: none;
 }
 
@@ -330,7 +339,7 @@ nav.damage-log-nav.tabs .item.active {
   border: none;
   border-radius: 3px;
   background: none;
-  background-color: rgba(20, 20, 20, 0.6);
+  background-color: var(--glass-bg);
   box-shadow: var(--glassy);
   color: var(--color-text-light-heading);
 }
@@ -338,7 +347,7 @@ nav.damage-log-nav.tabs .item.active {
   border: none;
   border-radius: 3px;
   background: none;
-  background-color: rgba(20, 20, 20, 0.6);
+  background-color: var(--glass-bg);
   box-shadow: var(--glassy);
   color: var(--color-text-light-heading);
   border-radius: 5px 0px 0px 5px;
@@ -348,7 +357,7 @@ nav.damage-log-nav.tabs .item.active {
   border: none;
   border-radius: 3px;
   background: none;
-  background-color: rgba(20, 20, 20, 0.6);
+  background-color: var(--glass-bg);
   box-shadow: var(--glassy);
   color: var(--color-text-light-heading);
   transition: text-shadow 0.15s ease-in-out, background-color 0.15s ease-in-out, border 0.15s ease-in-out, color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
@@ -474,7 +483,7 @@ nav.damage-log-nav.tabs .item.active {
   border: none;
   border-radius: 3px;
   background: none;
-  background-color: rgba(20, 20, 20, 0.6);
+  background-color: var(--glass-bg);
   box-shadow: var(--glassy);
   color: var(--color-text-light-heading);
   height: auto;
@@ -484,7 +493,7 @@ nav.damage-log-nav.tabs .item.active {
   border: none;
   border-radius: 3px;
   background: none;
-  background-color: rgba(20, 20, 20, 0.6);
+  background-color: var(--glass-bg);
   box-shadow: var(--glassy);
   color: var(--color-text-light-heading);
   transition: text-shadow 0.15s ease-in-out, background-color 0.15s ease-in-out, border 0.15s ease-in-out, color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
@@ -669,7 +678,7 @@ nav.damage-log-nav.tabs .item.active {
   border: none;
   border-radius: 3px;
   background: none;
-  background-color: rgba(20, 20, 20, 0.6);
+  background-color: var(--glass-bg);
   box-shadow: var(--glassy);
   color: var(--color-text-light-heading);
   transition: text-shadow 0.15s ease-in-out, background-color 0.15s ease-in-out, border 0.15s ease-in-out, color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
diff --git a/styles/module-support.css.map b/styles/module-support.css.map
index c389fec..f3eae03 100644
--- a/styles/module-support.css.map
+++ b/styles/module-support.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["../sass/_colors.scss","../sass/module-support.scss","../sass/_mixins.scss"],"names":[],"mappings":"AAEA;AACA;AACA;AAEA;AAOA;AAEoC;AACD;AAEL;AAO9B;AAMA;AAIA;AACA;AACA;AAEA;AAOA;AAMA;AAMA;AAKA;AACA;AACA;AAEA;AACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EACA;EACA;EACA;EAGA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;AAEA;EACA;EACA;AAEA;EACA;EACA;;;AC9GF;AACA;AACA;AAGI;EAEI;EACA;EACA;;;AAMJ;EACI;;AAGJ;EACI;EACA;EACA;;AACA;EACI;;AAIR;EAEI;EACA;EACA;;AAEA;EACI;;AAEJ;EACI;;AAGJ;AAAA;AAAA;EAEI;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;;AAEJ;EACI;;AAIR;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;;;AAIR;EClEI;EAVA;EACA;EACA;EACA;EACA;EACA;ED0EA;EACA;EACA;EACA;EACA;EACA;;AACA;EACI;;;AAIR;EACI;;AACA;EC5FA;EACA;EACA;EACA;EACA;EACA;EAKA;EDqFI;;AAEA;EACI;;AAGJ;EACI;EACA;;;AAKZ;EACI;;;AAGJ;AACA;AACA;AAEA;EACI;;AACA;EACI;;;AAIR;AACA;AACA;AAEA;EACI;;;AAGJ;ECnII;EACA;EACA;EACA;EACA;EACA;EDgIA;EACA;;;AAGJ;EACI;;AACA;EACI;;;AAIR;AACA;AACA;AAEA;EACI;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;;;AAGJ;AACA;AACA;AAEA;EACI;EACA;EACA;;AAEA;ECrMA;EACA;EACA;EACA;EACA;EACA;EAKA;;AD+LC;EACG;EACA;EACA;;AAEH;EACG;;;AAIR;AACA;AACA;AAEA;EACI;EACA;EACA;EACA;;AAEA;ECnNA;EDqNI;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;;;AAKZ;AACA;AACA;AAEA;EACI;;AAEA;EClPA;EAVA;EACA;EACA;EACA;EACA;EACA;;AD0PI;EACI;EACA;;AAEI;EACI;EACA;EACA;EACA;;;AAOpB;AACA;AACA;AAGI;ECnRA;EACA;EACA;EACA;EACA;EACA;;ADgRI;ECrRJ;EACA;EACA;EACA;EACA;EACA;EDkRQ;EACA;;AAGR;EC3RA;EACA;EACA;EACA;EACA;EACA;EAKA;;ADoRI;EACI;;AAEJ;EACI;;AAGJ;EACI;EACA;;;AAKZ;AAAA;AAAA;AAAA;EClSI;EDuSA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;AAAA;AAAA;AAAA;EAII;;;AAGJ;AACA;AACA;AAEA;EACI;EACA;;AAEA;EACI;EACA;;AAEA;EACI;EACA;;AAIR;EACI;EACA;;;AAIR;AACA;AACA;AAEA;AAAA;AAAA;EAGI;;;AAIJ;EACI;;;AAGJ;EACI;;AAEA;EACI;EACA;EACA;;AAEA;EACI;EACA;;AAGJ;EACI;;;AAKZ;AACA;AACA;AACA;EACI;;;AAIJ;EACI;EACA;EACA;;AAEA;EACI;;;AAIR;EACI;EACA;EACA;;;AAGJ;EACI;IACI;;;AAIR;EACI;;;AAGJ;EACI;EACA;;;AAGJ;EClaI;EACA;EACA;EACA;EACA;EACA;ED+ZA;;;AAGJ;ECvaI;EACA;EACA;EACA;EACA;EACA;EAKA;EDgaA;;AAEA;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACI;;AAGJ;EACI;;AAGJ;EACI;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;EACA;;;AAKR;AACA;AACA;AACA;EACI;;;AAGJ;EACI;;;AAGJ;EACI;EACA;;;AAGJ;ECtdI;EDwdA;;AACA;EACI;;;AAIR;EACI;;;AAGJ;ECleI;EDoeA;;AAEA;EACI;;AAEJ;EACI;;AAEJ;EACI;;;AAIR;AACA;AACA;AAEA;EACI;EACA;EACA;EACA;;AAEA;EACI;;;AAIR;EACI;EACA;;;AAGJ;EACI;;;AAIA;EACI;EACA;EACA;EACA;;;AAIR;EACI;;;AAGJ;EACI;;;AAKI;EACI;EACA;EACA;;AAGJ;EACI;EACA;;AAEA;EACI;EACA;EACA;;AAGJ;EACI;;AAGJ;EACI;;AACA;EACI,ODzgBM;;AC2gBV;EACI,ODzgBM;;AC8gBV;EACI,ODlhBM;;ACohBV;EACI,ODphBH;;ACshBD;EACI,ODthBH;;ACwhBD;EACI,ODxhBM;;AC8hBtB;EACI;EACA;EACA;;;AAQQ;EAGI;;AAEJ;EAGI;;AAKJ;EAGI;;AAGJ;EAGI;;AAGJ;EAGI;;AAGJ;EAGI;;AAKhB;EACI;;AAEA;EC1oBJ;EACA;EACA;EACA;EACA;EACA;EAKA;EDooBQ;;AAEA;EACI;EACA;;AAGJ;EACQ;EACA;;;AAOpB;EACI;;;AAGJ;EACI","file":"module-support.css"}
\ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["../sass/_colors.scss","../sass/module-support.scss","../sass/_mixins.scss"],"names":[],"mappings":"AAEA;AACA;AACA;AAEA;AAOA;AAEoC;AACD;AAEL;AAO9B;AAMA;AAIA;AACA;AACA;AAEA;AAOA;AAMA;AAMA;AAKA;AACA;AACA;AAEA;AACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EACA;EACA;EACA;EAGA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;AAEA;EACA;EACA;AAEA;EACA;EACA;AAEA;EACA;;;ACjHF;AACA;AACA;AAGI;EAEI;EACA;EACA;;;AAMJ;EACI;;AAGJ;EACI;EACA;EACA;;AACA;EACI;;AAIR;EAEI;EACA;EACA;;AAEA;EACI;;AAEJ;EACI;;AAGJ;AAAA;AAAA;EAEI;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;;AAEJ;EACI;;AAIR;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;;;AAIR;EClEI;EAVA;EACA;EACA;EACA;EACA;EACA;ED0EA;EACA;EACA;EACA;EACA;EACA;;AACA;EACI;;;AAIR;EACI;;AACA;EC5FA;EACA;EACA;EACA;EACA;EACA;EAKA;EDqFI;;AAEA;EACI;;AAGJ;EACI;EACA;;;AAKZ;EACI;;;AAGJ;AACA;AACA;AAEA;EACI;;AACA;EACI;;;AAIR;AACA;AACA;AAGA;EACI;;;AAGJ;AACA;AACA;AAEA;EACI;;;AAGJ;EC5II;EACA;EACA;EACA;EACA;EACA;EDyIA;EACA;;;AAGJ;EACI;;AACA;EACI;;;AAIR;AACA;AACA;AAEA;EACI;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;;;AAGJ;EACI;;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;;;AAGJ;AACA;AACA;AAEA;EACI;EACA;EACA;;AAEA;EC9MA;EACA;EACA;EACA;EACA;EACA;EAKA;;ADwMC;EACG;EACA;EACA;;AAEH;EACG;;;AAIR;AACA;AACA;AAEA;EACI;EACA;EACA;EACA;;AAEA;EC5NA;ED8NI;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;;;AAKZ;AACA;AACA;AAEA;EACI;;AAEA;EC3PA;EAVA;EACA;EACA;EACA;EACA;EACA;;ADmQI;EACI;EACA;;AAEI;EACI;EACA;EACA;EACA;;;AAOpB;AACA;AACA;AAGI;EC5RA;EACA;EACA;EACA;EACA;EACA;;ADyRI;EC9RJ;EACA;EACA;EACA;EACA;EACA;ED2RQ;EACA;;AAGR;ECpSA;EACA;EACA;EACA;EACA;EACA;EAKA;;AD6RI;EACI;;AAEJ;EACI;;AAGJ;EACI;EACA;;;AAKZ;AAAA;AAAA;AAAA;EC3SI;EDgTA;EACA;EACA;EACA;EACA;EACA;EACA;;;AAGJ;AAAA;AAAA;AAAA;EAII;;;AAGJ;AACA;AACA;AAEA;EACI;EACA;;AAEA;EACI;EACA;;AAEA;EACI;EACA;;AAIR;EACI;EACA;;;AAIR;AACA;AACA;AAEA;AAAA;AAAA;EAGI;;;AAIJ;EACI;;;AAGJ;EACI;;AAEA;EACI;EACA;EACA;;AAEA;EACI;EACA;;AAGJ;EACI;;;AAKZ;AACA;AACA;AACA;EACI;;;AAIJ;EACI;EACA;EACA;;AAEA;EACI;;;AAIR;EACI;EACA;EACA;;;AAGJ;EACI;IACI;;;AAIR;EACI;;;AAGJ;EACI;EACA;;;AAGJ;EC3aI;EACA;EACA;EACA;EACA;EACA;EDwaA;;;AAGJ;EChbI;EACA;EACA;EACA;EACA;EACA;EAKA;EDyaA;;AAEA;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACI;;AAGJ;EACI;;AAGJ;EACI;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;EACA;;;AAKR;AACA;AACA;AACA;EACI;;;AAGJ;EACI;;;AAGJ;EACI;EACA;;;AAGJ;EC/dI;EDieA;;AACA;EACI;;;AAIR;EACI;;;AAGJ;EC3eI;ED6eA;;AAEA;EACI;;AAEJ;EACI;;AAEJ;EACI;;;AAIR;AACA;AACA;AAEA;EACI;EACA;EACA;EACA;;AAEA;EACI;;;AAIR;EACI;EACA;;;AAGJ;EACI;;;AAIA;EACI;EACA;EACA;EACA;;;AAIR;EACI;;;AAGJ;EACI;;;AAKI;EACI;EACA;EACA;;AAGJ;EACI;EACA;;AAEA;EACI;EACA;EACA;;AAGJ;EACI;;AAGJ;EACI;;AACA;EACI,ODlhBM;;ACohBV;EACI,ODlhBM;;ACuhBV;EACI,OD3hBM;;AC6hBV;EACI,OD7hBH;;AC+hBD;EACI,OD/hBH;;ACiiBD;EACI,ODjiBM;;ACuiBtB;EACI;EACA;EACA;;;AAQQ;EAGI;;AAEJ;EAGI;;AAKJ;EAGI;;AAGJ;EAGI;;AAGJ;EAGI;;AAGJ;EAGI;;AAKhB;EACI;;AAEA;ECnpBJ;EACA;EACA;EACA;EACA;EACA;EAKA;ED6oBQ;;AAEA;EACI;EACA;;AAGJ;EACQ;EACA;;;AAOpB;EACI;;;AAGJ;EACI","file":"module-support.css"}
\ No newline at end of file
diff --git a/styles/new-chat.css b/styles/new-chat.css
index 0572813..bd74f45 100644
--- a/styles/new-chat.css
+++ b/styles/new-chat.css
@@ -177,6 +177,35 @@
 .message.chat-message .message-content .pf2e-pd-card .apply-condition {
   margin-top: 0px;
 }
+.message.chat-message .message-content .dice-roll .dice-result .statuseffect-message {
+  background-color: unset;
+  box-shadow: none;
+  border: none;
+}
+.message.chat-message .message-content .dice-roll .dice-result .statuseffect-message li:not(:last-child) {
+  margin-bottom: 5px;
+}
+.message.chat-message .message-content .dice-roll .dice-result .statuseffect-message img {
+  /* prettier-ignore */
+  border: none;
+  margin: 2px;
+  box-shadow: 0 0 0 1px var(--tertiary), 0 0 0 2px var(--gold-brown);
+  border-radius: 50%;
+  margin-right: 6px;
+}
+.message.chat-message .message-content .dice-roll .dice-result .statuseffect-rules {
+  border: none;
+  background-image: var(--sheet-light);
+  background-size: cover;
+  /* prettier-ignore */
+  border: none;
+  margin: 2px;
+  box-shadow: 0 0 0 1px var(--tertiary), 0 0 0 2px var(--gold-brown);
+  /* prettier-ignore */
+  border: none;
+  margin: 2px;
+  box-shadow: 0 0 0 1px var(--tertiary), 0 0 0 2px var(--gold-brown), 0 0 20px rgba(0, 0, 0, 0.8);
+}
 .message.chat-message [data-visibility]:not([data-visibility=all])[data-visibility=gm] {
   border-radius: 3px;
   background: rgba(245, 234, 245, 0.6666666667);
diff --git a/styles/new-chat.css.map b/styles/new-chat.css.map
index f7196cf..04be985 100644
--- a/styles/new-chat.css.map
+++ b/styles/new-chat.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["../sass/new-chat.scss","../sass/_mixins.scss"],"names":[],"mappings":"AAGA;AACA;AACA;AAEA;EACI;;;AAGJ;AACA;AACA;AAEA;EACI;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;;AAEA;EACI;EACA;EACA;;AAIR;EACI;EACA;EACA;;AAEA;EACI;EACA;EACA;;AAIR;EACI;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;;AAEA;EACI;;AAKZ;EACI;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;EACI;;;AAMpB;AACA;AACA;AAEA;EACI;EACA;;;AAGJ;AACA;AACA;AAIQ;EACI;;AAIQ;EACI;;AAEJ;EACI;;AAEA;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAKZ;EACI;EACA;EACA;EACA;;AACA;EACI;;AAGJ;EACI;EACA;;AAKJ;EACI;EACA;;AAEJ;EACI;;AACA;EACI;;AAMR;EACI;EACA;;AAEA;EACI;EACA;;;AAS5B;AACA;AACA;AAIA;ECxJI;EACA;EACA;AArBA;EACA;EACA;EACA,YACI;EDyKJ;;AAEA;EACI;EACA;;AAGJ;EACI;EACA;;AAIA;EACI;;AAGR;EACI;;AACA;EACI;;AAEA;EACI;;AAGJ;EACI;;AAMZ;EACI;EACA;EACA;;;AAMJ;EACI;;AAEA;EACI;;AAIR;EACI;;AAGJ;EACI;;AAEA;ACtOJ;EACA;EACA;EACA,YACI;EDoOI;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;;AAIA;EACI;;AAEJ;EACI;;AAKZ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGA;EACI;EACA;EACA;;AAGR;EACI;;AAEA;EACI","file":"new-chat.css"}
\ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["../sass/new-chat.scss","../sass/_mixins.scss"],"names":[],"mappings":"AAGA;AACA;AACA;AAEA;EACI;;;AAGJ;AACA;AACA;AAEA;EACI;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;;AAEA;EACI;EACA;EACA;;AAIR;EACI;EACA;EACA;;AAEA;EACI;EACA;EACA;;AAIR;EACI;EACA;EACA;;AAEA;EACI;EACA;EACA;EACA;EACA;;AAEA;EACI;EACA;EACA;;AAEA;EACI;;AAKZ;EACI;EACA;EACA;EACA;EACA;EACA;;AAEA;EACI;EACI;;;AAMpB;AACA;AACA;AAEA;EACI;EACA;;;AAGJ;AACA;AACA;AAIQ;EACI;;AAIQ;EACI;;AAEJ;EACI;;AAEA;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAKZ;EACI;EACA;EACA;EACA;;AACA;EACI;;AAGJ;EACI;EACA;;AAKJ;EACI;EACA;;AAEJ;EACI;;AACA;EACI;;AAMR;EACI;EACA;;AAEA;EACI;EACA;;;AAS5B;AACA;AACA;AAIA;ECxJI;EACA;EACA;AArBA;EACA;EACA;EACA,YACI;EDyKJ;;AAEA;EACI;EACA;;AAGJ;EACI;EACA;;AAIA;EACI;;AAGR;EACI;;AACA;EACI;;AAEA;EACI;;AAGJ;EACI;;AAMJ;EACI;EACA;EACA;;AAEA;EACI;;AAGJ;ACvNZ;EACA;EACA;EACA,YACI;EDqNY;EACA;;AAIR;EC3MR;EACA;EACA;AArBA;EACA;EACA;EACA,YACI;AAKJ;EACA;EACA;EACA,YACI;;ADwNJ;EACI;EACA;EACA;;;AAMJ;EACI;;AAEA;EACI;;AAIR;EACI;;AAGJ;EACI;;AAEA;AC7PJ;EACA;EACA;EACA,YACI;ED2PI;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;;AAGJ;EACI;EACA;EACA;;AAIA;EACI;;AAEJ;EACI;;AAKZ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAGA;EACI;EACA;EACA;;AAGR;EACI;;AAEA;EACI","file":"new-chat.css"}
\ No newline at end of file
diff --git a/styles/new-dark-chat.css b/styles/new-dark-chat.css
index 580fda6..d9c1b3a 100644
--- a/styles/new-dark-chat.css
+++ b/styles/new-dark-chat.css
@@ -22,7 +22,7 @@
   /* Global */
   --primary: #5e0000;
   --primary-light: #b10000;
-  --primary-dark: #4b0000;
+  --primary-dark: #380000;
   --secondary: #171f69;
   --secondary-light: #2532a8;
   --secondary-dark: #0e133f;
@@ -58,62 +58,68 @@
   /* Sidebar */
   --sidebar-label: var(--tertiary-dark);
   --sidebar-title: var(--tertiary);
+  /* App UI */
+  --glass-bg: rgba(20, 20, 20, 0.60);
 }
 
 /* ----------------------------------------- */
 /* Glassy Buttons                            */
 /* ----------------------------------------- */
-.dark-theme.message .dice-roll .dice-formula,
-.dark-theme.message .dice-roll .dice-total {
+.dark-theme.message.chat-message .dice-roll .dice-formula,
+.dark-theme.message.chat-message .dice-roll .dice-total {
   border: none;
   border-radius: 3px;
   background: none;
-  background-color: rgba(20, 20, 20, 0.6);
+  background-color: var(--glass-bg);
   box-shadow: var(--glassy);
   color: var(--color-text-light-heading);
 }
-.dark-theme.message .pf2e.chat-card .card-buttons {
+.dark-theme.message.chat-message .dice-roll .dice-result .statuseffect-rules {
+  background: var(--sheet-dark);
+  background-size: cover;
+}
+.dark-theme.message.chat-message .pf2e.chat-card .card-buttons {
   margin: 0px;
   margin-top: 5px;
 }
-.dark-theme.message .pf2e.chat-card .card-buttons .spell-button button {
+.dark-theme.message.chat-message .pf2e.chat-card .card-buttons .spell-button button {
   border: none;
   border-radius: 3px;
   background: none;
-  background-color: rgba(20, 20, 20, 0.6);
+  background-color: var(--glass-bg);
   box-shadow: var(--glassy);
   color: var(--color-text-light-heading);
   text-shadow: var(--dorako-text-shadow);
   background: var(--primary);
   color: var(--color-text-light-highlight);
 }
-.dark-theme.message .pf2e.chat-card .card-buttons .spell-button button:hover {
+.dark-theme.message.chat-message .pf2e.chat-card .card-buttons .spell-button button:hover {
   color: white;
   background: var(--primary-light);
 }
-.dark-theme.message .pf2e.chat-card .card-buttons .hidden-to-others {
+.dark-theme.message.chat-message .pf2e.chat-card .card-buttons .hidden-to-others {
   border: none;
   border-radius: 3px;
   background: none;
-  background-color: rgba(20, 20, 20, 0.6);
+  background-color: var(--glass-bg);
   box-shadow: var(--glassy);
   color: var(--color-text-light-heading);
   text-shadow: var(--dorako-text-shadow);
   background: var(--secondary);
   color: var(--color-text-light-highlight);
 }
-.dark-theme.message .pf2e.chat-card .card-buttons .hidden-to-others:hover {
+.dark-theme.message.chat-message .pf2e.chat-card .card-buttons .hidden-to-others:hover {
   color: white;
   background: var(--secondary-light);
 }
-.dark-theme.message .pf2e.chat-card .card-buttons .spell-attack-buttons {
+.dark-theme.message.chat-message .pf2e.chat-card .card-buttons .spell-attack-buttons {
   gap: 5px;
 }
-.dark-theme.message .pf2e.chat-card .card-buttons .spell-attack-buttons button {
+.dark-theme.message.chat-message .pf2e.chat-card .card-buttons .spell-attack-buttons button {
   border: none;
   border-radius: 3px;
   background: none;
-  background-color: rgba(20, 20, 20, 0.6);
+  background-color: var(--glass-bg);
   box-shadow: var(--glassy);
   color: var(--color-text-light-heading);
   transition: text-shadow 0.15s ease-in-out, background-color 0.15s ease-in-out, border 0.15s ease-in-out, color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
@@ -121,15 +127,15 @@
   background: var(--secondary-dark);
   color: var(--color-text-light-highlight);
 }
-.dark-theme.message .pf2e.chat-card .card-buttons .spell-attack-buttons button:hover {
+.dark-theme.message.chat-message .pf2e.chat-card .card-buttons .spell-attack-buttons button:hover {
   color: white;
   background: var(--secondary-light);
 }
-.dark-theme.message .pf2e.chat-card .card-buttons .spell-attack-buttons button:first-child {
+.dark-theme.message.chat-message .pf2e.chat-card .card-buttons .spell-attack-buttons button:first-child {
   background: var(--secondary);
   color: var(--color-text-light-highlight);
 }
-.dark-theme.message .pf2e.chat-card .card-buttons .spell-attack-buttons button:first-child:hover {
+.dark-theme.message.chat-message .pf2e.chat-card .card-buttons .spell-attack-buttons button:first-child:hover {
   color: white;
   background: var(--secondary-light);
 }
@@ -146,7 +152,7 @@
   border: none;
   border-radius: 3px;
   background: none;
-  background-color: rgba(20, 20, 20, 0.6);
+  background-color: var(--glass-bg);
   box-shadow: var(--glassy);
   color: var(--color-text-light-heading);
   transition: text-shadow 0.15s ease-in-out, background-color 0.15s ease-in-out, border 0.15s ease-in-out, color 0.15s ease-in-out, box-shadow 0.15s ease-in-out;
@@ -232,7 +238,7 @@
   border: none;
   border-radius: 3px;
   background: none;
-  background-color: rgba(20, 20, 20, 0.6);
+  background-color: var(--glass-bg);
   box-shadow: var(--glassy);
   color: var(--color-text-light-heading);
   text-shadow: var(--dorako-text-shadow);
diff --git a/styles/new-dark-chat.css.map b/styles/new-dark-chat.css.map
index 3c963d2..48a9f4a 100644
--- a/styles/new-dark-chat.css.map
+++ b/styles/new-dark-chat.css.map
@@ -1 +1 @@
-{"version":3,"sourceRoot":"","sources":["../sass/_colors.scss","../sass/new-dark-chat.scss","../sass/_mixins.scss"],"names":[],"mappings":"AAEA;AACA;AACA;AAEA;AAOA;AAEoC;AACD;AAEL;AAO9B;AAMA;AAIA;AACA;AACA;AAEA;AAOA;AAMA;AAMA;AAKA;AACA;AACA;AAEA;AACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EACA;EACA;EACA;EAGA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;AAEA;EACA;EACA;AAEA;EACA;EACA;;;AC9GF;AACA;AACA;AAEI;AAAA;ECPA;EACA;EACA;EACA;EACA;EACA;;ADOA;EACI;EACA;;AAEA;EChBJ;EACA;EACA;EACA;EACA;EACA;EDaQ;EACA;EACA;;AAEA;EACI;EACA;;AAGR;EC3BJ;EACA;EACA;EACA;EACA;EACA;EDwBQ;EACA;EACA;;AAEA;EACI;EACA;;AAIR;EACI;;AAEA;EC1CR;EACA;EACA;EACA;EACA;EACA;EAKA;EDmCY;EACA;EACA;;AAEA;EACI;EACA;;AAIR;EACI;EACA;;AAEA;EACI;EACA;;;AAQpB;AACA;AACA;AAIQ;EACI;EACA;EACA;;AAEA;EChFR;EACA;EACA;EACA;EACA;EACA;EAKA;EDyEY;;AAEA;EACI;;AAIJ;EACI;EACA;EACA;;AACA;EACI;;AAEJ;EACI;EACA;;AAIR;EACI;EACA;;AAIA;EACI;EACA;;AAEJ;EACI;EACA;;AACA;EACI;EACA;;AAMR;EACI;EACA;;AAGJ;EACI;EACA;;AAEA;EACI;EACA;;;AAU5B;AACA;AACA;AAEI;EACI;EACA;EACA;;AAEA;EACI;EACA;;AAGJ;EACI;EACA;;AAGJ;EACI;;AAEJ;EACI;;AAGJ;EACI;;AAIA;EAEI;;AAEA;EACI;;AAIJ;EC/KZ;EAVA;EACA;EACA;EACA;EACA;EACA;EDwLgB;;AAEA;EACI;EACA;;AAIR;EACI;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAQA;EACI;;AAEJ;EACI;;AAKZ;EACI;;AAEA;EACI;EACA;EACA;;;AAQpB;AACA;AACA;AAGI;AAAA;EAEI;;AAGJ;EACI;;AAEA;EACI;EACA;;AAMA;EAII;;AAEA;EAGI,cADQ;EAER;;AAEA;EACI;;AAGJ;EACI,OATI;;AAaZ;EAGI,cADQ;EAER;;AAEA;EACI;;AAGJ;EACI,OATI;;AAaZ;EAGI,cADQ;EAER;;AAEA;EACI;;AAGJ;EACI,OATI;;AAaZ;EAGI,cADQ;EAER;;AAEA;EACI;;AAGJ;EACI,OATI;;AAaZ;EAGI,cADQ;EAER;;AAEA;EACI;;AAGJ;EACI,OATI;;AAaZ;EAGI,cADQ;EAER;;AAEA;EACI;;AAGJ;EACI,OATI;;AAaZ;EAGI,cADQ;EAER;;AAEA;EACI;EACA;;AAGJ;EACI,OAVI;;AAcZ;EAGI,cADQ;EAER;;AAEA;EACI;;AAGJ;EACI,OATI;;AAaZ;EAGI,cADQ;EAER;;AAEA;EACI;;AAGJ;EACI,OATI;;AAaZ;EAGI,cADQ;EAER;;AAEA;EACI;;AAGJ;EACI,OATI;;AAaZ;EAGI,cADQ;EAER;;AAEA;EACI;EACA;;AAGJ;EACI,OAVI;;AAeZ;EAGI,cADQ;EAER;;AAEA;EACI;EACA;;AAGJ;EACI,OAVI;;AAcZ;EAGI,cADQ;EAER,OAFQ;;AAIR;EACI;EACA;;AAGJ;EACI,OAVI;;AAcZ;EAEI,cA9MO;EA+MP;;AAEA;EACI;;AAGJ;EACI,OAtNG;;AA0NX;EAGI,cADQ;EAER;;AAEA;EACI;;AAGJ;EACI,OATI;;AAaZ;EAGI,cADQ;EAER;;AAEA;EACI;EACA;;AAGJ;EACI,OAVI;;AAcZ;EAEI,cA3PO;EA4PP;;AAEA;EACI;;AAGJ;EACI,OAnQG;;AAuQX;EAGI,cADQ;EAER;;AAEA;EACI;;AAGJ;EACI,OATI;;AAaZ;EACI;EACA;EACA;EACA;EACA","file":"new-dark-chat.css"}
\ No newline at end of file
+{"version":3,"sourceRoot":"","sources":["../sass/_colors.scss","../sass/new-dark-chat.scss","../sass/_mixins.scss"],"names":[],"mappings":"AAEA;AACA;AACA;AAEA;AAOA;AAEoC;AACD;AAEL;AAO9B;AAMA;AAIA;AACA;AACA;AAEA;AAOA;AAMA;AAMA;AAKA;AACA;AACA;AAEA;AACE;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EACA;EACA;EACA;EAGA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;EACA;EACA;AAEA;EACA;EACA;AAEA;EACA;EACA;AAEA;EACA;EACA;AAEA;EACA;;;ACjHF;AACA;AACA;AAEI;AAAA;ECPA;EACA;EACA;EACA;EACA;EACA;;ADQI;EACI;EACA;;AAIR;EACI;EACA;;AAEA;ECvBJ;EACA;EACA;EACA;EACA;EACA;EDoBQ;EACA;EACA;;AAEA;EACI;EACA;;AAGR;EClCJ;EACA;EACA;EACA;EACA;EACA;ED+BQ;EACA;EACA;;AAEA;EACI;EACA;;AAIR;EACI;;AAEA;ECjDR;EACA;EACA;EACA;EACA;EACA;EAKA;ED0CY;EACA;EACA;;AAEA;EACI;EACA;;AAIR;EACI;EACA;;AAEA;EACI;EACA;;;AAQpB;AACA;AACA;AAIQ;EACI;EACA;EACA;;AAEA;ECvFR;EACA;EACA;EACA;EACA;EACA;EAKA;EDgFY;;AAEA;EACI;;AAIJ;EACI;EACA;EACA;;AACA;EACI;;AAEJ;EACI;EACA;;AAIR;EACI;EACA;;AAIA;EACI;EACA;;AAEJ;EACI;EACA;;AACA;EACI;EACA;;AAMR;EACI;EACA;;AAGJ;EACI;EACA;;AAEA;EACI;EACA;;;AAU5B;AACA;AACA;AAEI;EACI;EACA;EACA;;AAEA;EACI;EACA;;AAGJ;EACI;EACA;;AAGJ;EACI;;AAEJ;EACI;;AAGJ;EACI;;AAIA;EAEI;;AAEA;EACI;;AAIJ;ECtLZ;EAVA;EACA;EACA;EACA;EACA;EACA;ED+LgB;;AAEA;EACI;EACA;;AAIR;EACI;;AAGJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAEJ;EACI;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;EACA;;AAQA;EACI;;AAEJ;EACI;;AAKZ;EACI;;AAEA;EACI;EACA;EACA;;;AAQpB;AACA;AACA;AAGI;AAAA;EAEI;;AAGJ;EACI;;AAEA;EACI;EACA;;AAMA;EAII;;AAEA;EAGI,cADQ;EAER;;AAEA;EACI;;AAGJ;EACI,OATI;;AAaZ;EAGI,cADQ;EAER;;AAEA;EACI;;AAGJ;EACI,OATI;;AAaZ;EAGI,cADQ;EAER;;AAEA;EACI;;AAGJ;EACI,OATI;;AAaZ;EAGI,cADQ;EAER;;AAEA;EACI;;AAGJ;EACI,OATI;;AAaZ;EAGI,cADQ;EAER;;AAEA;EACI;;AAGJ;EACI,OATI;;AAaZ;EAGI,cADQ;EAER;;AAEA;EACI;;AAGJ;EACI,OATI;;AAaZ;EAGI,cADQ;EAER;;AAEA;EACI;EACA;;AAGJ;EACI,OAVI;;AAcZ;EAGI,cADQ;EAER;;AAEA;EACI;;AAGJ;EACI,OATI;;AAaZ;EAGI,cADQ;EAER;;AAEA;EACI;;AAGJ;EACI,OATI;;AAaZ;EAGI,cADQ;EAER;;AAEA;EACI;;AAGJ;EACI,OATI;;AAaZ;EAGI,cADQ;EAER;;AAEA;EACI;EACA;;AAGJ;EACI,OAVI;;AAeZ;EAGI,cADQ;EAER;;AAEA;EACI;EACA;;AAGJ;EACI,OAVI;;AAcZ;EAGI,cADQ;EAER,OAFQ;;AAIR;EACI;EACA;;AAGJ;EACI,OAVI;;AAcZ;EAEI,cA9MO;EA+MP;;AAEA;EACI;;AAGJ;EACI,OAtNG;;AA0NX;EAGI,cADQ;EAER;;AAEA;EACI;;AAGJ;EACI,OATI;;AAaZ;EAGI,cADQ;EAER;;AAEA;EACI;EACA;;AAGJ;EACI,OAVI;;AAcZ;EAEI,cA3PO;EA4PP;;AAEA;EACI;;AAGJ;EACI,OAnQG;;AAuQX;EAGI,cADQ;EAER;;AAEA;EACI;;AAGJ;EACI,OATI;;AAaZ;EACI;EACA;EACA;EACA;EACA","file":"new-dark-chat.css"}
\ No newline at end of file