diff --git a/styles/less/dialog/character-creation/selections-container.less b/styles/less/dialog/character-creation/selections-container.less
index 5ca2eb0b..fc26a8a0 100644
--- a/styles/less/dialog/character-creation/selections-container.less
+++ b/styles/less/dialog/character-creation/selections-container.less
@@ -1,18 +1,29 @@
 @import '../../utils/colors.less';
 
-.theme-light .daggerheart.dh-style.dialog.character-creation {
-    .setup-tabs button {
-        background-image: url(../assets/parchments/dh-parchment-dark.png);
-    }
+.appTheme({}, {
+    &.daggerheart.dh-style.dialog.character-creation {
+        .setup-tabs button {
+            background-image: url(../assets/parchments/dh-parchment-dark.png);
+        }
 
-    .main-selections-container
-        .selections-container
-        .ancestry-preview-info-container
-        .ancestry-preview-features
-        .ancestry-preview-feature {
-        background-image: url(../assets/parchments/dh-parchment-light.png);
+        nav a .descriptor {
+            background-image: url(../assets/parchments/dh-parchment-dark.png);
+        }
+
+        .main-selections-container {
+            .ancestry-mixed-controller label {
+                background-image: url(../assets/parchments/dh-parchment-dark.png);
+            }
+
+            .selections-container
+            .ancestry-preview-info-container
+            .ancestry-preview-features
+            .ancestry-preview-feature {
+                background-image: url(../assets/parchments/dh-parchment-light.png);
+            }
+        }  
     }
-}
+});
 
 .daggerheart.dh-style.dialog.character-creation {
     .setup-tabs {
diff --git a/templates/characterCreation/tabs/setup.hbs b/templates/characterCreation/tabs/setup.hbs
index 2f42cc60..1504898d 100644
--- a/templates/characterCreation/tabs/setup.hbs
+++ b/templates/characterCreation/tabs/setup.hbs
@@ -10,107 +10,4 @@
             </button>
         {{/each}}
     </nav>
-    {{!-- <div class="main-selections-container">
-        <div class="secondary-selections-container {{#unless (gte visibility 1)}}inactive{{/unless}}">
-            <fieldset class="section-container">
-                <legend>{{localize "TYPES.Item.ancestry"}}</legend>
-                <div class="selections-outer-container">
-                    <div class="selections-container ancestry-card">
-                        {{#> "systems/daggerheart/templates/components/card-preview.hbs" ancestry }}
-                            {{localize "DAGGERHEART.APPLICATIONS.CharacterCreation.selectAncestry"}}
-                        {{/"systems/daggerheart/templates/components/card-preview.hbs"}}
-                    </div>
-
-                    <div class="selections-container community-card">
-                        {{#> "systems/daggerheart/templates/components/card-preview.hbs" ancestry }}
-                            {{localize "DAGGERHEART.APPLICATIONS.CharacterCreation.selectAncestry"}}
-                        {{/"systems/daggerheart/templates/components/card-preview.hbs"}}
-                    </div>
-                </div>
-            </fieldset>
-
-            <fieldset class="section-container">
-                <legend>{{localize "TYPES.Item.community"}}</legend>
-                <div class="selections-outer-container">
-                    <div class="selections-container community-card">
-                        {{#> "systems/daggerheart/templates/components/card-preview.hbs" community }}
-                            {{localize "DAGGERHEART.APPLICATIONS.CharacterCreation.selectCommunity"}}
-                        {{/"systems/daggerheart/templates/components/card-preview.hbs"}}
-                    </div>
-                </div>
-            </fieldset>
-        </div>
-
-        <div class="secondary-selections-container {{#unless (gte visibility 2)}}inactive{{/unless}}">
-            <fieldset class="section-container">
-                <legend>{{localize "TYPES.Item.class"}}</legend>
-                <div class="selections-outer-container">
-                    <div class="selections-container class-card">
-                        {{#> "systems/daggerheart/templates/components/card-preview.hbs" class }}
-                            {{localize "DAGGERHEART.APPLICATIONS.CharacterCreation.selectClass"}}
-                        {{/"systems/daggerheart/templates/components/card-preview.hbs"}}
-                    </div>
-
-                    <div class="selections-container subclass-card">
-                        {{#> "systems/daggerheart/templates/components/card-preview.hbs" subclass disabled=(not class.img) }}
-                            {{localize "DAGGERHEART.APPLICATIONS.CharacterCreation.selectSubclass"}}
-                        {{/"systems/daggerheart/templates/components/card-preview.hbs"}}
-                    </div>
-                </div>
-            </fieldset>
-
-            <fieldset class="section-container">
-                <legend>{{localize "DAGGERHEART.APPLICATIONS.CharacterCreation.initialExperiences"}} {{experience.nrSelected}}/{{experience.nrTotal}}</legend>
-                <div class="experiences-inner-container">
-                    {{#each experience.values as |experience id|}}
-                        <div class="experience-container">
-                            <input class="experience-description" type="text" name="{{concat "experiences." id ".description" }}" value="{{experience.description}}" placeholder="{{localize "DAGGERHEART.APPLICATIONS.CharacterCreation.newExperience"}}" />
-                            <div class="experience-value">{{numberFormat this.value sign=true}}</div>
-                        </div>
-                    {{/each}}
-                </div>
-            </fieldset>
-        </div>
-
-
-        <fieldset class="section-container {{#unless (gte visibility 3)}}inactive{{/unless}}">
-            <legend>{{localize "DAGGERHEART.APPLICATIONS.CharacterCreation.traitIncreases"}} {{traits.nrSelected}}/{{traits.nrTotal}}</legend>
-            <div class="traits-container">
-                <fieldset class="section-inner-container">
-                    <legend>{{localize "DAGGERHEART.APPLICATIONS.CharacterCreation.suggestedTraits"}}</legend>
-                    <div class="suggested-traits-container">
-                        {{#each suggestedTraits}}
-                            <div class="suggested-trait-container">{{this}}</div>
-                        {{/each}}
-                    </div>
-                    <button class="action-button" data-action="useSuggestedTraits">{{localize "Use"}}</button>
-                </fieldset>
-                <div class="traits-inner-container">
-                    {{#each traits.values}}
-                        <div class="trait-container">
-                            <div>{{this.name}}</div>
-                            <select name="{{concat "traits." this.key ".value"}}" data-dtype="Number">
-                                {{selectOptions this.options selected=this.value valueAttr="key" labelAttr="value" blank=""}}
-                            </select>
-                        </div>
-                    {{/each}}
-                </div>
-            </div>
-        </fieldset>
-
-        <fieldset class="section-container {{#unless (gte visibility 4)}}inactive{{/unless}}">
-            <legend>{{localize "TYPES.Item.domainCard"}}</legend>
-            <div class="selections-outer-container">
-                {{#each domainCards as |domainCard id|}}
-                    <div class="selections-container domain-card" data-card="{{id}}"> 
-                        {{#> "systems/daggerheart/templates/components/card-preview.hbs" domainCard }}
-                            {{#each @root.class.system.domains }}
-                                <div>{{localize (concat "DAGGERHEART.GENERAL.Domain." this ".label")}}</div>
-                            {{/each}}
-                        {{/"systems/daggerheart/templates/components/card-preview.hbs"}}
-                    </div>
-                {{/each}}
-            </div>
-        </fieldset>
-    </div> --}}
 </section>
\ No newline at end of file