diff --git a/EoE/css/swffg.css b/EoE/css/swffg.css
index 41fd32b..5708f77 100644
--- a/EoE/css/swffg.css
+++ b/EoE/css/swffg.css
@@ -548,7 +548,7 @@ div.swffgui-settings {
     flex: 0;
     text-align: center;
     background:url(../ui/game-settings-background.png);
-    margin : 0 60px 0 60px;
+    margin : 0 53px 0 48px;
 }
 
 h3.auberesh {
@@ -4588,9 +4588,10 @@ border-image-outset: 0px !important;
       border-image-width: 162px 81px 67px 80px;
       border-image-outset: 0px;
       background: none;
-      height: 802px !important;
-      width: 800px !important;
+      /*height: 802px !important;
+      width: 800px !important;*/
       box-shadow: none !important;
+      max-width:1100px;
     }
     #client-settings .window-header {
       border: none;
@@ -4600,6 +4601,10 @@ border-image-outset: 0px !important;
       position: relative;
       /* top: 38px; */
 	  margin: 0px;
+    }
+    #client-settings  .window-resizable-handle {
+        right: 32px;
+        bottom: 5px;
     }
       #client-settings .window-header h4 {
         display: none;
@@ -4614,7 +4619,7 @@ border-image-outset: 0px !important;
     padding: 0px;
     border: none;
     background: url(../ui/game-settings-background.png);
-    background-size: 199%;
+    background-size: contain;
     background-position-x: center;
 	border-radius: 6px;
     opacity: 0.95;
@@ -8794,15 +8799,18 @@ img {
     position: absolute;
     width: 120px;
     z-index: 40;
-    bottom: 70px;
+    bottom: 90px;
     padding-top: 5px;
 	--notchSize: 6px;
 	-webkit-clip-path: polygon(0% var(--notchSize), var(--notchSize) 0%, calc(100% - var(--notchSize)) 0%, 100% var(--notchSize), 100% calc(100% - var(--notchSize)), calc(100% - var(--notchSize)) 100%, var(--notchSize) 100%, 0% calc(100% - var(--notchSize)));
     clip-path: polygon(0% var(--notchSize), var(--notchSize) 0%, calc(100% - var(--notchSize)) 0%, 100% var(--notchSize), 100% calc(100% - var(--notchSize)), calc(100% - var(--notchSize)) 100%, var(--notchSize) 100%, 0% calc(100% - var(--notchSize)));
 	background-color: #84725e;
-	max-height: 36px;
-	max-width:120px;
+	/*max-height: 36px;*/
+	max-width:124px;
 	/* top:102px; */
+    opacity : 0;
+    transform: translateX(-100%);
+    transition: transform 0.3s, opacity 0.8s;
 }
 
 .starwarsffg.sheet.actor .character .header-fields .profile-block .auberesh-name {
@@ -8822,6 +8830,9 @@ img {
     clip-path: polygon(0% var(--notchSize), var(--notchSize) 0%, calc(100% - var(--notchSize)) 0%, 100% var(--notchSize), 100% calc(100% - var(--notchSize)), calc(100% - var(--notchSize)) 100%, var(--notchSize) 100%, 0% calc(100% - var(--notchSize)));
 	background-color: #771113;
 	max-height: 36px;
+    opacity : 0;
+    transform: translateX(-100%);
+    transition: transform 0.3s, opacity 0.8s;
 }
 
 .starwarsffg.sheet.actor .vehicle .header-fields .profile-block .auberesh-name {
@@ -8842,14 +8853,41 @@ img {
 	-webkit-clip-path: polygon(0% var(--notchSize), var(--notchSize) 0%, calc(100% - var(--notchSize)) 0%, 100% var(--notchSize), 100% calc(100% - var(--notchSize)), calc(100% - var(--notchSize)) 100%, var(--notchSize) 100%, 0% calc(100% - var(--notchSize)));
     clip-path: polygon(0% var(--notchSize), var(--notchSize) 0%, calc(100% - var(--notchSize)) 0%, 100% var(--notchSize), 100% calc(100% - var(--notchSize)), calc(100% - var(--notchSize)) 100%, var(--notchSize) 100%, 0% calc(100% - var(--notchSize)));
 	background-color: #00304f;
+    opacity : 0;
+    transform: translateX(-100%);
+    transition: transform 0.3s, opacity 0.8s;
+}
+
+.starwarsffg.sheet.actor .character .header-fields .profile-block:hover .auberesh-name {
+    opacity: 0.75;
+    transform: translateX(0);
+}
+.starwarsffg.sheet.actor .character .header-fields .profile-block .auberesh-name:hover {
+    opacity: 0.75;
+    transform: translateX(0);
+}
+.starwarsffg.sheet.actor .vehicle .header-fields .profile-block:hover .auberesh-name  {
+  opacity: 0.75;
+  transform: translateX(0);
+}
+.starwarsffg.sheet.actor .vehicle .header-fields .profile-block .auberesh-name:hover  {
+  opacity: 0.75;
+  transform: translateX(0);
 }
 
+.starwarsffg.sheet.actor .minion .header-fields .profile-block:hover .auberesh-name {
+    opacity: 0.75;
+    transform: translateX(0);
+}
+.starwarsffg.sheet.actor .minion .header-fields .profile-block .auberesh-name:hover {
+    opacity: 0.75;
+    transform: translateX(0);    
+}
 .starwarsffg .item-display {
     border: 2px solid #782e22 !important;
     background: rgb(102 20 26 / 20%) !important;
     border-radius: 10px;
 }
-}
 
 .destiny-flip .destiny-left {
     background: rgb(102 20 26 / 30%);
diff --git a/blackEmpire/css/swffg.css b/blackEmpire/css/swffg.css
index 5de31d0..cc59246 100644
--- a/blackEmpire/css/swffg.css
+++ b/blackEmpire/css/swffg.css
@@ -650,10 +650,11 @@ select:focus {
 	  /*border-image-slice: 190 110 85 110;*/
       border-image-outset: 0px;
       background: none;
-      height: 850px !important;
-      width: 850px !important;
+      /*height: 850px !important;
+      width: 850px !important;*/
       box-shadow: none !important;
 	  min-height: 500px !important;
+      max-width: 1068px;
     }
     #client-settings .window-header {
       border: none;
@@ -672,14 +673,17 @@ select:focus {
 		top: 58px;
 		left: -60px;
 	}
-	
+	#client-settings  .window-resizable-handle {
+        right: 32px;
+        bottom: 5px;
+    }
       #client-settings .window-header h4 {
         display: none;
       }
       #client-settings .window-header .close {
         position: relative;
-        top: 58px;
-		left:-60px;
+        top: 117px;
+		left:-50px;
       }
     #client-settings .window-content {
     margin: 0px 53px 24px 48px;
@@ -1044,6 +1048,9 @@ select:focus {
     clip-path: polygon(0% var(--notchSize), var(--notchSize) 0%, calc(100% - var(--notchSize)) 0%, 100% var(--notchSize), 100% calc(100% - var(--notchSize)), calc(100% - var(--notchSize)) 100%, var(--notchSize) 100%, 0% calc(100% - var(--notchSize)));
 	background-color: #white;
 	animation: textShadow 1.6s infinite;
+    opacity : 0;
+    transform: translateX(-100%);
+    transition: transform 0.3s, opacity 0.8s;
 }
 
 .starwarsffg.sheet.actor .vehicle .header-fields .profile-block .auberesh-name {
@@ -1065,6 +1072,9 @@ select:focus {
     clip-path: polygon(0% var(--notchSize), var(--notchSize) 0%, calc(100% - var(--notchSize)) 0%, 100% var(--notchSize), 100% calc(100% - var(--notchSize)), calc(100% - var(--notchSize)) 100%, var(--notchSize) 100%, 0% calc(100% - var(--notchSize)));
 	background-color: #00304f;
 	animation: textShadow 1.6s infinite;
+    opacity : 0;
+    transform: translateX(-100%);
+    transition: transform 0.3s, opacity 0.8s;
 }
 
 .starwarsffg.sheet.actor .minion .header-fields .profile-block .auberesh-name {
@@ -1086,6 +1096,35 @@ select:focus {
 	max-width:130px;
 	/* top:102px; */
 	animation: textShadow 1.6s infinite;
+    opacity : 0;
+    transform: translateX(-100%);
+    transition: transform 0.3s, opacity 0.8s;
+}
+
+.starwarsffg.sheet.actor .character .header-fields .profile-block:hover .auberesh-name {
+    opacity: 0.75;
+    transform: translateX(0);
+}
+.starwarsffg.sheet.actor .character .header-fields .profile-block .auberesh-name:hover {
+    opacity: 0.75;
+    transform: translateX(0);
+}
+.starwarsffg.sheet.actor .vehicle .header-fields .profile-block:hover .auberesh-name  {
+  opacity: 0.75;
+  transform: translateX(0);
+}
+.starwarsffg.sheet.actor .vehicle .header-fields .profile-block .auberesh-name:hover  {
+  opacity: 0.75;
+  transform: translateX(0);
+}
+
+.starwarsffg.sheet.actor .minion .header-fields .profile-block:hover .auberesh-name {
+    opacity: 0.75;
+    transform: translateX(0);
+}
+.starwarsffg.sheet.actor .minion .header-fields .profile-block .auberesh-name:hover {
+    opacity: 0.75;
+    transform: translateX(0);    
 }
 
 .starwarsffg.sheet.actor .character .header-fields .profile-block {
diff --git a/changelog.md b/changelog.md
index 4a714a3..afd739f 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,4 +1,13 @@
 ## Release Notes:
+
+**Version [2.4.0]**
+* Compatiblity verified FVTT 11.315
+* Auberesh name for minion, vehicle and actor retractable
+* Settings windows border (theme Rebel and Galatic Empire) re-designed
+* Settings windows resizing fixed
+* Add option to deactivate auberesh name
+* Some color adaptation 
+
 **Version [2.3.2]**
 * Compatiblity verified FVTT 11.313
 * Retro compatibility version 10
diff --git a/css/swffg.css b/css/swffg.css
index e86eeca..568eccf 100644
--- a/css/swffg.css
+++ b/css/swffg.css
@@ -487,6 +487,10 @@ body.vtt.game.screen-door::before {
 	display:none;
 }
 
+.sheet nav.sheet-tabs {
+    color: whitesmoke;
+}
+
 section.swffgui {
     display: flex;
     flex-wrap: wrap;
@@ -522,6 +526,7 @@ h3.auberesh {
     position: relative;
     max-height: 100%;
     word-break: break-word;
+    background: whitesmoke;
   }
   .app.window-app .editor-content {
     /*height: calc(100% - 60px);*/
@@ -1778,6 +1783,50 @@ input::placeholder, placeholder, *placeholder {
     }
 
   /* ================== 2. CHAT CONTROLS ====================== */
+    #keybindings .binding .binding-controls .control {
+      color: whitesmoke;
+    }
+    #keybindings .binding .key.uneditable {
+        background: rgb(245 245 75 / 50%);
+    }
+    #keybindings .binding .key {
+        flex: none;
+        padding: 0 4px;
+        min-width: 24px;
+        background: rgba(245, 245, 75, 0.8);
+        border: 1px solid var(--color-border-light-2);
+        border-radius: 5px;
+        box-shadow: 1px 1px #444;
+        text-align: center;
+        color: black;
+    }
+    
+    #keybindings .scrollable h2 {
+      color: whitesmoke;
+    }
+    
+    #support-details .sheet-tab  h2 {
+      color: whitesmoke;
+    }
+    #support-details .tab.active  h2,
+    #support-details .tab.active  pre    {
+      color: whitesmoke;
+    }
+    #support-details .window-content { 
+        background-position: 0px 0px !important;
+        background-size: contain;
+    }
+    
+    #documentation .window-content { 
+        background-position: 0px 0px !important;
+        background-size: contain;
+    }
+    
+    #keybindings .window-content { 
+        background-position: 0px 0px !important;
+        background-size: contain;
+    }
+    
     #sidebar .sidebar-tab #chat-controls {
       position: relative;
       flex: 0 0 45px;
@@ -1885,10 +1934,10 @@ input::placeholder, placeholder, *placeholder {
 }
 #pause > img {
   content: url(../art/ui/Blacksun-centered-256-redshadow.png);
-  height: 256px;
-  width: 256px;
-  top: -75px;
-  left: calc(50% - 132px);
+  height: 128px;
+  width: 128px;
+  top: -38px;
+  left: calc(50% - 66px);
 }
 #pause > h3 span
 {
@@ -4353,9 +4402,10 @@ border-image-outset: 0px !important;
       border-image-width: 162px 81px 67px 80px;
       border-image-outset: 0px;
       background: none;
-      height: 802px !important;
-      width: 800px !important;
+      /*height: 802px !important;
+      width: 800px !important;*/
       box-shadow: none !important;
+      max-width : 1095px;
     }
     #client-settings .window-header {
       border: none;
@@ -4374,12 +4424,16 @@ border-image-outset: 0px !important;
         top: 58px;
 		left:-35px;
       }
+    #client-settings  .window-resizable-handle {
+        right: 32px;
+        bottom: 5px;
+    }
     #client-settings .window-content {
-    margin: 0px 70px 57px 70px;
+    margin: 0px 54px 28px 52px;
     padding: 0px;
     border: none;
     background: url(../ui/game-settings-background.png);
-    background-size: 199%;
+    background-size: contain;
     background-position-x: center;
     }
       #client-settings .window-content form {
@@ -4771,14 +4825,15 @@ font-family: var(--actor-input-font-family);
 
 /* ==================== (A) DEFAULT WINDOWS =================== */
   .app.window-app {
-    display: flex;
-    flex-direction: column;
-    flex-wrap: nowrap;
-    position: absolute;
-    box-shadow: 2px 2px 8px #000000;
-    padding: 0;
-    margin: 0px;
-	background: #d8cbc0 url(../ui/frames/parchment-texture.png) no-repeat;
+      display: flex;
+      flex-direction: column;
+      flex-wrap: nowrap;
+      position: absolute;
+      box-shadow: none;
+      padding: 0;
+      margin: 0px;
+      background: transparent;
+      border: none;
   }
   .app.window-app .window-header {
     flex: 0 0 45px;
@@ -4791,7 +4846,7 @@ font-family: var(--actor-input-font-family);
     align-items: center;
     justify-content: flex-end;
     display: inline-flex;
-	margin: var(--window-header-margin);
+	/*margin: var(--window-header-margin);*/
   }
     .app.window-app .window-header .window-title {
       flex: 1;
@@ -8384,6 +8439,29 @@ img {
 	background-color: #771113;
 	min-width:130px;
 	max-height:36px;
+    opacity : 0;
+    transform: translateX(-100%);
+    transition: transform 0.3s, opacity 0.8s;
+}
+
+.starwarsffg.sheet.actor .character .header-fields .profile-block:hover .auberesh-name {
+    opacity: 0.75;
+    transform: translateX(0);
+}
+
+.starwarsffg.sheet.actor .character .header-fields .profile-block .auberesh-name:hover {
+    opacity: 0.75;
+    transform: translateX(0);
+}
+
+.starwarsffg.sheet.actor .vehicle .header-fields .profile-block:hover .auberesh-name  {
+  opacity: 0.75;
+  transform: translateX(0);
+}
+
+.starwarsffg.sheet.actor .vehicle .header-fields .profile-block .auberesh-name:hover  {
+  opacity: 0.75;
+  transform: translateX(0);
 }
 
 .starwarsffg.sheet.actor .vehicle .header-fields .profile-block .profile-img {
@@ -8414,6 +8492,18 @@ img {
     max-height: 59px;
     /* width: 220px; */
     left: 2%;
+    opacity : 0;
+    transform: translateX(-100%);
+    transition: transform 0.3s, opacity 0.8s;
+}
+
+.starwarsffg.sheet.actor .minion .header-fields .profile-block:hover .auberesh-name {
+    opacity: 0.75;
+    transform: translateX(0);
+}
+.starwarsffg.sheet.actor .minion .header-fields .profile-block .auberesh-name:hover {
+    opacity: 0.75;
+    transform: translateX(0);    
 }
 
 .starwarsffg.sheet.actor .minion .header-fields .profile-block .auberesh-name {
@@ -8425,15 +8515,18 @@ img {
     position: absolute;
     width: 120px;
     z-index: 40;
-    bottom: 70px;
+    bottom: 90px;
     padding-top: 5px;
 	--notchSize: 6px;
 	-webkit-clip-path: polygon(0% var(--notchSize), var(--notchSize) 0%, calc(100% - var(--notchSize)) 0%, 100% var(--notchSize), 100% calc(100% - var(--notchSize)), calc(100% - var(--notchSize)) 100%, var(--notchSize) 100%, 0% calc(100% - var(--notchSize)));
     clip-path: polygon(0% var(--notchSize), var(--notchSize) 0%, calc(100% - var(--notchSize)) 0%, 100% var(--notchSize), 100% calc(100% - var(--notchSize)), calc(100% - var(--notchSize)) 100%, var(--notchSize) 100%, 0% calc(100% - var(--notchSize)));
 	background-color: #84725e;
-	max-height: 36px;
-	max-width:120px;
+	/*max-height: 36px;*/
+	max-width:124px;
 	/* top:102px; */
+    opacity : 0;
+    transform: translateX(-100%);
+    transition: transform 0.3s, opacity 0.8s;
 }
 .starwarsffg .item-sheet-species .characteristics .characteristic-item .characteristic-label {
     position: relative;
diff --git a/darkside/css/swffg.css b/darkside/css/swffg.css
index 9ccffb4..918d5bb 100644
--- a/darkside/css/swffg.css
+++ b/darkside/css/swffg.css
@@ -485,6 +485,10 @@ body.vtt.game.screen-door::before {
 	display:none;
 }
 
+.sheet nav.sheet-tabs {
+    color: whitesmoke;
+}
+
 section.swffgui {
     display: flex;
     flex-wrap: wrap;
@@ -1770,6 +1774,49 @@ input::placeholder, placeholder, *placeholder {
     }										  
 
   /* ================== 2. CHAT CONTROLS ====================== */
+  #keybindings .binding .binding-controls .control {
+      color: whitesmoke;
+    }
+    #keybindings .binding .key.uneditable {
+        background: rgb(245 245 75 / 50%);
+    }
+    #keybindings .binding .key {
+        flex: none;
+        padding: 0 4px;
+        min-width: 24px;
+        background: rgba(245, 245, 75, 0.8);
+        border: 1px solid var(--color-border-light-2);
+        border-radius: 5px;
+        box-shadow: 1px 1px #444;
+        text-align: center;
+        color: black;
+    }
+    
+    #keybindings .scrollable h2 {
+      color: whitesmoke;
+    }
+    
+    #support-details .sheet-tab  h2 {
+      color: whitesmoke;
+    }
+    #support-details .tab.active  h2,
+    #support-details .tab.active  pre    {
+      color: whitesmoke;
+    }
+    #support-details .window-content { 
+        background-position: 0px 0px !important;
+        background-size: contain;
+    }
+    
+    #documentation .window-content { 
+        background-position: 0px 0px !important;
+        background-size: contain;
+    }
+    
+    #keybindings .window-content { 
+        background-position: 0px 0px !important;
+        background-size: contain;
+    }
     #sidebar .sidebar-tab #chat-controls {
       position: relative;
       flex: 0 0 45px;
@@ -4349,9 +4396,10 @@ border-image-outset: 0px !important;
       border-image-width: 162px 81px 67px 80px;
       border-image-outset: 0px;
       background: none;
-      height: 802px !important;
-      width: 800px !important;
+      /*height: 802px !important;
+      width: 800px !important;*/
       box-shadow: none !important;
+      max-width: 1100px;
     }
     #client-settings .window-header {
     border: none;
@@ -4361,6 +4409,10 @@ border-image-outset: 0px !important;
     position: relative;
     /* top: 38px; */
 	margin:0px;
+    }
+    #client-settings  .window-resizable-handle {
+        right: 32px;
+        bottom: 5px;
     }
       #client-settings .window-header h4 {
         display: none;
@@ -4772,14 +4824,15 @@ font-family: var(--actor-input-font-family);
     flex-direction: column;
     flex-wrap: nowrap;
     position: absolute;
-    box-shadow: 2px 2px 8px #000000;
+    /*box-shadow: 2px 2px 8px #000000;*/
+    box-shadow:none;
     padding: 0;
     margin: 0px;
-	background: #d8cbc0 url(../ui/frames/parchment-texture.png) no-repeat;
+	/*background: #d8cbc0 url(../ui/frames/parchment-texture.png) no-repeat;*/
+    background:transparent;
   }
   .app.window-app .window-header {
     flex: 0 0 45px;
-    margin: var(--window-header-margin);
     border: 1px solid blue;
     border-image: url(../ui/frames/window-app-header-blank.png) 5 repeat;
     border-image-slice: 19 21 19 21 fill;
@@ -4788,7 +4841,7 @@ font-family: var(--actor-input-font-family);
     align-items: center;
     justify-content: flex-end;
     display: inline-flex;
-	margin: var(--window-header-margin);				  
+			  
   }
     .app.window-app .window-header .window-title {
       flex: 1;
diff --git a/darkside/ui/game-settings-border.png b/darkside/ui/game-settings-border.png
index 0598e21..af0062c 100644
Binary files a/darkside/ui/game-settings-border.png and b/darkside/ui/game-settings-border.png differ
diff --git a/module.json b/module.json
index 27a4a40..0b2f7a9 100644
--- a/module.json
+++ b/module.json
@@ -1,7 +1,7 @@
 {
   "title": "Star Wars - User Interface Creative Common",
-  "description": "Starwars unofficial design-2.3.2",
-  "version": "2.3.1",
+  "description": "Starwars unofficial design-2.4.0",
+  "version": "2.4.0",
   "authors": [
     {
       "name": "Prolice",
@@ -37,7 +37,7 @@
   "readme": "https://github.com/prolice/swffgUI-cc/blob/swffgUI-cc/README.md",
   "changelog": "https://github.com/prolice/swffgUI-cc/blob/swffgUI-cc/changelog.md",
   "manifest": "https://github.com/prolice/swffgUI-cc/raw/swffgUI-cc/module.json",
-  "download": "https://github.com/prolice/swffgUI-cc/releases/download/v2.3.2/module.zip",
+  "download": "https://github.com/prolice/swffgUI-cc/releases/download/v2.4.0/module.zip",
   "id": "swffgUI-cc",
   "relationships": {
     "systems": [
diff --git a/swffg-default.css b/swffg-default.css
index 6df02fb..8427942 100644
--- a/swffg-default.css
+++ b/swffg-default.css
@@ -556,8 +556,30 @@ button {
 	-webkit-clip-path: polygon(0% var(--notchSize), var(--notchSize) 0%, calc(100% - var(--notchSize)) 0%, 100% var(--notchSize), 100% calc(100% - var(--notchSize)), calc(100% - var(--notchSize)) 100%, var(--notchSize) 100%, 0% calc(100% - var(--notchSize)));
     clip-path: polygon(0% var(--notchSize), var(--notchSize) 0%, calc(100% - var(--notchSize)) 0%, 100% var(--notchSize), 100% calc(100% - var(--notchSize)), calc(100% - var(--notchSize)) 100%, var(--notchSize) 100%, 0% calc(100% - var(--notchSize)));
 	background-color: #771113;
+    opacity : 0;
+    transform: translateX(-100%);
+    transition: transform 0.3s, opacity 0.8s;
 }
 
+.starwarsffg.sheet.actor .character .header-fields .profile-block:hover .auberesh-name {
+    opacity: 0.75;
+    transform: translateX(0);
+}
+
+.starwarsffg.sheet.actor .character .header-fields .profile-block .auberesh-name:hover {
+    opacity: 0.75;
+    transform: translateX(0);
+}
+
+.starwarsffg.sheet.actor .vehicle .header-fields .profile-block:hover .auberesh-name  {
+  opacity: 0.75;
+  transform: translateX(0);
+}
+
+.starwarsffg.sheet.actor .vehicle .header-fields .profile-block .auberesh-name:hover  {
+  opacity: 0.75;
+  transform: translateX(0);
+}
 .starwarsffg.sheet.actor .vehicle .header-fields .profile-block .auberesh-name {
 	font-family: var(--character-sheet-name-auberesh);
     text-shadow: 0px 1px 10px #ffffff;
@@ -576,6 +598,18 @@ button {
 	-webkit-clip-path: polygon(0% var(--notchSize), var(--notchSize) 0%, calc(100% - var(--notchSize)) 0%, 100% var(--notchSize), 100% calc(100% - var(--notchSize)), calc(100% - var(--notchSize)) 100%, var(--notchSize) 100%, 0% calc(100% - var(--notchSize)));
     clip-path: polygon(0% var(--notchSize), var(--notchSize) 0%, calc(100% - var(--notchSize)) 0%, 100% var(--notchSize), 100% calc(100% - var(--notchSize)), calc(100% - var(--notchSize)) 100%, var(--notchSize) 100%, 0% calc(100% - var(--notchSize)));
 	background-color: #00304f;
+    opacity : 0;
+    transform: translateX(-100%);
+    transition: transform 0.3s, opacity 0.8s;
+}
+
+.starwarsffg.sheet.actor .minion .header-fields .profile-block:hover .auberesh-name {
+    opacity: 0.75;
+    transform: translateX(0);
+}
+.starwarsffg.sheet.actor .minion .header-fields .profile-block .auberesh-name:hover {
+    opacity: 0.75;
+    transform: translateX(0);    
 }
 
 .starwarsffg.sheet.actor .minion .header-fields .profile-block .auberesh-name {
@@ -587,15 +621,21 @@ button {
     position: absolute;
     width: 115px;
     z-index: 40;
-    top: 98px;
+    /*top: 98px;*/
     padding-top: 5px;
 	--notchSize: 6px;
 	-webkit-clip-path: polygon(0% var(--notchSize), var(--notchSize) 0%, calc(100% - var(--notchSize)) 0%, 100% var(--notchSize), 100% calc(100% - var(--notchSize)), calc(100% - var(--notchSize)) 100%, var(--notchSize) 100%, 0% calc(100% - var(--notchSize)));
     clip-path: polygon(0% var(--notchSize), var(--notchSize) 0%, calc(100% - var(--notchSize)) 0%, 100% var(--notchSize), 100% calc(100% - var(--notchSize)), calc(100% - var(--notchSize)) 100%, var(--notchSize) 100%, 0% calc(100% - var(--notchSize)));
 	background-color: #84725e;
-	max-height: 36px;
-	max-width:130px;
+	/*max-height: 36px;*/
+	max-width:124px;
 	/* top:102px; */
+    /*width: 21%;*/
+    bottom: 90px;
+    width: -webkit-fill-available;
+    opacity : 0;
+    transform: translateX(-100%);
+    transition: transform 0.3s, opacity 0.8s;
 }
 
 .starwarsffg.sheet.actor .character .header-fields .profile-block {
@@ -626,6 +666,12 @@ button {
 	background-color: #ffffff00 !important;
 }
 
+.starwarsffg .minion .sheet-header .minion-name h1 input {
+	font-family: 'DistantGalaxy';
+    color: #771113 !important;
+    font-size: unset;
+}
+
 .starwarsffg.sheet.actor .character .header-fields .header-name input {
 	font-family: 'DistantGalaxy';
 	color:#771113;
diff --git a/swffg-ui.js b/swffg-ui.js
index 630c3ec..fc8a3a9 100644
--- a/swffg-ui.js
+++ b/swffg-ui.js
@@ -382,7 +382,11 @@ class swffgUIModule {
 			}
 			
 			let profileImg = $element.find('.profile-img');
-			profileImg.before('<div class="auberesh-name">' + tokenName + '</div>');
+			//let profileBlock = $element.find('.profile-block');
+			let isAubereshTitleEnabled = game.settings.get("swffgUI-cc", "enable-auberesh-title");
+			if (isAubereshTitleEnabled)
+				profileImg.before('<div class="auberesh-name">' + tokenName + '</div>');
+				//profileBlock.before('<div class="auberesh-name">' + tokenName + '</div>');
 						
 			console.log("[SWFFG-UI-CC] is rendering " + tokenName + "actor sheet with Auberesh");
 			
@@ -530,18 +534,6 @@ Hooks.once("init", async function () {
 	CONFIG.ui.pause = PauseFFG;
 	CONFIG.ui.nav = NavigationFFG;
 	CONFIG.TinyMCE.content_css.push('modules/swffgUI-cc/css/mce.css');
-	
-	// game.settings.register('swffgUI-cc', 'autoColorFolder', {
-        // name: game.i18n.localize('SWFFG.autocolorfolder'),
-        // hint: game.i18n.localize('SWFFG.autocolorfolderHint'),
-        // scope: 'client',
-        // type: Boolean,
-        // default: true,
-        // config: true,
-        // onChange: () => {
-            // location.reload();
-        // },
-    // });
 });
 
 Hooks.on("ready", () => {
@@ -581,7 +573,6 @@ Hooks.on("renderSidebarTab", async (object, html) => {
 	const dirHeader = html[0].querySelector("#settings-game").nextSibling;
 	dirHeader.parentNode.insertBefore(this.section, dirHeader);
 
-	//if (this.data !== undefined) 
 		section.insertAdjacentHTML(
 		  "afterbegin",
 		  `
@@ -649,7 +640,6 @@ Hooks.on("renderRollTableDirectory", (app, html, data) => {
 	const dirHeader = html[0].querySelector(".directory-header");
 	dirHeader.parentNode.insertBefore(this.section, dirHeader);
 
-	//if (this.data !== undefined) 
 		section.insertAdjacentHTML(
 		  "afterbegin",
 		  `<h3 class="auberesh">RollTable Directory</h3>`
@@ -663,7 +653,6 @@ Hooks.on("renderCompendiumDirectory", (app, html, data) => {
 	const dirHeader = html[0].querySelector(".directory-header");
 	dirHeader.parentNode.insertBefore(this.section, dirHeader);
 
-	//if (this.data !== undefined) 
 		section.insertAdjacentHTML(
 		  "afterbegin",
 		  `<h3 class="auberesh">Compendium Directory</h3>`
@@ -677,7 +666,6 @@ Hooks.on("renderPlaylistDirectory", (app, html, data) => {
 	const dirHeader = html[0].querySelector(".directory-header");
 	dirHeader.parentNode.insertBefore(this.section, dirHeader);
 
-	//if (this.data !== undefined) 
 		section.insertAdjacentHTML(
 		  "afterbegin",
 		  `<h3 class="auberesh">Playlists Directory</h3>`
@@ -691,7 +679,6 @@ Hooks.on("renderChatLog", (app, html, data) => {
 	const dirHeader = html[0].querySelector("#chat-log");
 	dirHeader.parentNode.insertBefore(this.section, dirHeader);
 
-	//if (this.data !== undefined) 
 		section.insertAdjacentHTML(
 		  "afterbegin",
 		  `<h3 class="auberesh">Chat Log</h3>`
@@ -705,7 +692,6 @@ Hooks.on("renderSettings", (app, html, data) => {
 	const dirHeader = html[0].querySelector("h2");
 	dirHeader.parentNode.insertBefore(this.section, dirHeader);
 
-	//if (this.data !== undefined) 
 		section.insertAdjacentHTML(
 		  "afterbegin",
 		  `<h3 class="auberesh">Settings</h3>`
@@ -717,10 +703,9 @@ Hooks.on("renderCombatTracker", (app, html, data) => {
 	this.section.classList.add("swffgui");
 	// Add menu before directory header
 	const dirHeader = html[0].querySelector("#combat-tracker");
-	//const dirHeader = html[0].querySelector("#combat-tracker");
+
 	dirHeader.parentNode.insertBefore(this.section, dirHeader);
 
-	//if (this.data !== undefined) 
 		section.insertAdjacentHTML(
 		  "afterbegin",
 		  `<h3 class="auberesh">Combat Tracker</h3>`
@@ -730,17 +715,9 @@ Hooks.on("renderCombatTracker", (app, html, data) => {
 Hooks.on("renderSettingsConfig", (app, html, data) => {
 	this.section = document.createElement("div");
 	this.section.classList.add("swffgui-settings");
-	//this.section.style.flex='0';
-	//this.section.style.textAlign = 'center';
-	//this.section.style.margin='0 50px 0 50px';
-	//this.section.style.background='url(../ui/game-settings-background.png)';
-	//this.section.style.add("flex:0;text-align:center;margin: 0px 50px 0px 50px;background: url(../ui/denim.png) repeat;");
-	// Add menu before directory header
 	const dirHeader = html[0].querySelector("section");
-	//const dirHeader = html[0].querySelector("aside.sidebar");
-	dirHeader.parentNode.insertBefore(this.section, dirHeader);
 
-	//if (this.data !== undefined) 
+	dirHeader.parentNode.insertBefore(this.section, dirHeader);
 		section.insertAdjacentHTML(
 		  "afterbegin",
 		  `
@@ -749,5 +726,4 @@ Hooks.on("renderSettingsConfig", (app, html, data) => {
 		);
 });
 
-//renderActorSheetFFG
 
diff --git a/ui/game-settings-border.png b/ui/game-settings-border.png
index 6207e10..f9dd06d 100644
Binary files a/ui/game-settings-border.png and b/ui/game-settings-border.png differ