diff --git a/less/update/_variables-light.less b/less/update/_variables-light.less
index 8a9e849d..12f86a38 100644
--- a/less/update/_variables-light.less
+++ b/less/update/_variables-light.less
@@ -13,7 +13,7 @@
 @blockquoteShadow: 0 0 20px rgba(@colorBlue, 0.8);
 
 //forms
-@inputBackgroundColor: white;
+@inputBackgroundColor: @colorGray;
 @inputBorderNormal: @colorLightGray;
 @inputBorderHover: @colorGray;
 @inputBorderFocus: @colorRed;
diff --git a/less/update/components/sidebar-themes.less b/less/update/components/sidebar-themes.less
index 4a3f57c4..02ab20fe 100644
--- a/less/update/components/sidebar-themes.less
+++ b/less/update/components/sidebar-themes.less
@@ -95,7 +95,8 @@
 }
 #chat-controls {
   .roll-type-select {
-    background: @inputBackgroundColor;
+    background: #4f4f4f;
+	color: #FFFFFF;
   }
   label {
     color: @bodyFontColor;
@@ -103,7 +104,7 @@
  
 }
 #chat-form  textarea {
-  background: @inputBackgroundColor;
+  background: #4f4f4f;
 
 }
 
diff --git a/less/update/components/sidebar.less b/less/update/components/sidebar.less
index 5f0ae311..67dc2b9b 100644
--- a/less/update/components/sidebar.less
+++ b/less/update/components/sidebar.less
@@ -169,6 +169,10 @@
 }
 }
 #chat-controls {
+  &.roll-type-select {
+    background: #4f4f4f;
+	color: #FFFFFF;
+  }
   padding-top: 4px;
   label {
     color: @colorBlack;
@@ -176,7 +180,7 @@
  
 }
 #chat-form  textarea {
-  background: white;
+  background: #4f4f4f;
   &:focus {
     box-shadow: none;
     outline: none;
diff --git a/sw5e-dark.css b/sw5e-dark.css
index ea2714f0..dfc9cdf7 100644
--- a/sw5e-dark.css
+++ b/sw5e-dark.css
@@ -234,13 +234,14 @@ body.dark-theme .dice-roll .dice-total.fumble {
   box-shadow: 0 0 12px rgba(232, 17, 17, 0.5);
 }
 body.dark-theme #chat-controls .roll-type-select {
-  background: #363636;
+  background: #4f4f4f;
+  color: #FFFFFF;
 }
 body.dark-theme #chat-controls label {
   color: white;
 }
 body.dark-theme #chat-form textarea {
-  background: #363636;
+  background: #4f4f4f;
 }
 body.dark-theme #combat #combat-round {
   color: #E81111;
diff --git a/sw5e-light.css b/sw5e-light.css
index e2b5803d..eefaf31b 100644
--- a/sw5e-light.css
+++ b/sw5e-light.css
@@ -234,13 +234,14 @@ body.light-theme .dice-roll .dice-total.fumble {
   box-shadow: 0 0 12px rgba(196, 15, 15, 0.5);
 }
 body.light-theme #chat-controls .roll-type-select {
-  background: white;
+  background: #4f4f4f;
+  color: #FFFFFF;
 }
 body.light-theme #chat-controls label {
   color: #1C1C1C;
 }
 body.light-theme #chat-form textarea {
-  background: white;
+  background: #4f4f4f;
 }
 body.light-theme #combat #combat-round {
   color: #c40f0f;
@@ -297,7 +298,7 @@ body.light-theme .sidebar-tab .directory-header .header-search i.fa-search {
   color: #0d99cc;
 }
 body.light-theme .sidebar-tab .directory-header .header-search input {
-  background: white;
+  background: #4f4f4f;
 }
 body.light-theme .sidebar-tab .subdirectory {
   background: white;
diff --git a/system.json b/system.json
index dd9d6803..e8d690cd 100644
--- a/system.json
+++ b/system.json
@@ -2,7 +2,7 @@
   "name": "sw5e",
   "title": "SW 5th Edition",
   "description": "A comprehensive game system for running games of SW 5th Edition in the Foundry VTT environment.",
-  "version": "1.2.3",
+  "version": "R1-A2",
   "author": "Dev Team",
   "scripts": [],
   "esmodules": ["sw5e.js"],
@@ -135,8 +135,8 @@
   "gridUnits": "ft",
   "primaryTokenAttribute": "attributes.hp",
   "secondaryTokenAttribute": null,
-  "minimumCoreVersion": "0.7.6",
-  "compatibleCoreVersion": "0.7.7",
+  "minimumCoreVersion": "0.7.7",
+  "compatibleCoreVersion": "0.7.9",
   "url": "https://github.com/unrealkakeman89/sw5e",
   "manifest": "https://raw.githubusercontent.com/unrealkakeman89/sw5e/master/system.json",
   "download": "https://github.com/unrealkakeman89/sw5e/archive/master.zip"
diff --git a/templates/actors/newActor/parts/swalt-traits.html b/templates/actors/newActor/parts/swalt-traits.html
index f988aef6..e8a0170b 100644
--- a/templates/actors/newActor/parts/swalt-traits.html
+++ b/templates/actors/newActor/parts/swalt-traits.html
@@ -80,16 +80,6 @@
         </ul>
         {{/unless}}
     </label>
-	<div>
-        <label>{{localize "SW5E.MovementConfig"}}</label>
-        <a class="configure-movement" title="{{localize 'SW5E.MovementConfig'}}"><i class="fas fa-cog"></i></a>
-	</div>
-	<div>
-    {{#unless isVehicle}}
-        <label>{{localize "SW5E.SpecialTraits"}}</label>
-        <a class="configure-flags"><i class="fas fa-cog"></i></a>
-    {{/unless}}
-    </div>
     <div class="languages">
         <label data-options="share-languages" class="languages">{{localize "SW5E.Languages"}}</label>
         <a class="trait-selector" data-options="languages" data-target="data.traits.languages">
@@ -101,6 +91,13 @@
             {{/each}}
         </ul>
     </div>	
+    {{#unless isVehicle}}
+    <div class="form-group ">
+        <label>{{localize "SW5E.SpecialTraits"}}</label>
+        <a class="config-button" data-action="flags" title="{{localize 'SW5E.SpecialTraits'}}"><i class="fas fa-cog"></i></a>
+    </div>
+    {{/unless}}
+
     <div>
         <label>{{localize "SW5E.TraitArmorProf"}}</label>
         <a class="trait-selector" data-options="armorProficiencies" data-target="data.traits.armorProf">