From 62d40f86399a8c30bd163c4c8d2ffba1fb177234 Mon Sep 17 00:00:00 2001
From: Carlos Fernandez <cfern1990@gmail.com>
Date: Thu, 12 Mar 2026 19:06:29 -0400
Subject: [PATCH] Move general tab to top

---
 lang/en.json                                  |  3 +-
 .../settings/appearanceSettings.mjs           |  1 -
 .../appearance-settings/diceSoNice.less       |  2 ++
 .../appearance-settings/diceSoNice.hbs        | 36 ++++++++-----------
 4 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/lang/en.json b/lang/en.json
index c11d926c..13227c71 100755
--- a/lang/en.json
+++ b/lang/en.json
@@ -2769,7 +2769,8 @@
                         "colorset": "Theme",
                         "material": "Material",
                         "system": "Dice Preset",
-                        "font": "Font"
+                        "font": "Font",
+                        "critical": "Duality Critical Animation"
                     }
                 },
                 "variantRules": {
diff --git a/module/applications/settings/appearanceSettings.mjs b/module/applications/settings/appearanceSettings.mjs
index 9827ad48..8150817a 100644
--- a/module/applications/settings/appearanceSettings.mjs
+++ b/module/applications/settings/appearanceSettings.mjs
@@ -51,7 +51,6 @@ export default class DHAppearanceSettings extends HandlebarsApplicationMixin(App
                 { id: 'fear', label: 'DAGGERHEART.GENERAL.fear' },
                 { id: 'advantage', label: 'DAGGERHEART.GENERAL.Advantage.full' },
                 { id: 'disadvantage', label: 'DAGGERHEART.GENERAL.Disadvantage.full' },
-                { id: 'general', label: 'DAGGERHEART.GENERAL.general' }
             ],
             initial: 'hope'
         }
diff --git a/styles/less/ui/settings/appearance-settings/diceSoNice.less b/styles/less/ui/settings/appearance-settings/diceSoNice.less
index 13388703..079bebc5 100644
--- a/styles/less/ui/settings/appearance-settings/diceSoNice.less
+++ b/styles/less/ui/settings/appearance-settings/diceSoNice.less
@@ -46,6 +46,8 @@
         flex-direction: column;
         gap: 10px;
         margin-bottom: 4px;
+        width: 100%;
+        padding: 0 8px;
     }
 
     .label-container {
diff --git a/templates/settings/appearance-settings/diceSoNice.hbs b/templates/settings/appearance-settings/diceSoNice.hbs
index 877c6c0e..ca464dda 100644
--- a/templates/settings/appearance-settings/diceSoNice.hbs
+++ b/templates/settings/appearance-settings/diceSoNice.hbs
@@ -1,6 +1,19 @@
 <section class="tab {{#if tab.active}} active{{/if}}" data-group="{{tab.group}}" data-tab="{{tab.id}}">
     <div class="title-hint">{{localize "DAGGERHEART.SETTINGS.Menu.appearance.diceSoNice.hint"}}</div>
-
+    <div class="field-section form-fields">
+        {{#if isGM}}
+            <div class="form-group">
+                <label for="dsn-overrideEnabled">{{localize "DAGGERHEART.SETTINGS.Menu.appearance.defaultAnimations"}}</label>
+                <input id="dsn-overrideEnabled" type="checkbox" class="default-animations-input" {{checked globalOverrides.diceSoNice.sfx.overrideEnabled}} />
+            </div>
+        {{/if}}
+        <div class="form-group"> 
+            <label>{{localize "DAGGERHEART.SETTINGS.Menu.appearance.diceSoNice.critical"}}</label>
+            <div class="form-fields">
+                {{formInput fields.diceSoNice.fields.sfx.fields.critical.fields.class value=setting.diceSoNice.sfx.critical.class blank="" localize=true}}
+            </div>       
+        </div>
+    </div>
     <section class='tab-navigation'>
         <div class='navigation-container'>
             <div class="navigation-inner-container">
@@ -18,26 +31,7 @@
     </section>
     {{#each dsnTabs as |dsnTab|}}
         <section class="tab {{#if dsnTab.active}} active{{/if}}" data-group="{{dsnTab.group}}" data-tab="{{dsnTab.id}}">
-            {{#if dsnTab.diceTab}}
-                {{> "systems/daggerheart/templates/settings/appearance-settings/diceSoNiceTab.hbs" dsnTab }}
-            {{else}}
-                <div class="field-section">
-                    {{#if ../isGM}}
-                        <h3>{{localize "DAGGERHEART.SETTINGS.Menu.appearance.globalSettings"}}</h3>  
-                        <div class="form-group">
-                            <label for="dsn-overrideEnabled">{{localize "DAGGERHEART.SETTINGS.Menu.appearance.defaultAnimations"}}</label>
-                            <input id="dsn-overrideEnabled" type="checkbox" class="default-animations-input" {{checked ../globalOverrides.diceSoNice.sfx.overrideEnabled}} />
-                        </div>
-                    {{/if}}
-                    <h3>{{localize "DAGGERHEART.SETTINGS.Menu.appearance.globalAnimations"}}</h3>  
-                    <div class="form-group"> 
-                        <label>{{localize "DAGGERHEART.CONFIG.DaggerheartDiceAnimationEvents.critical.name"}}</label>
-                        <div class="form-fields">
-                            {{formInput ../fields.diceSoNice.fields.sfx.fields.critical.fields.class value=../setting.diceSoNice.sfx.critical.class blank="" localize=true}}
-                        </div>       
-                    </div>
-                </div>
-            {{/if}}
+            {{> "systems/daggerheart/templates/settings/appearance-settings/diceSoNiceTab.hbs" dsnTab }}
         </section>
     {{/each}}
 </section>
\ No newline at end of file