diff --git a/Content.Client/Stylesheets/StyleNano.cs b/Content.Client/Stylesheets/StyleNano.cs
index a589abb83a..0ed1d0f488 100644
--- a/Content.Client/Stylesheets/StyleNano.cs
+++ b/Content.Client/Stylesheets/StyleNano.cs
@@ -93,12 +93,12 @@ namespace Content.Client.Stylesheets
         public static readonly Color DangerousRedFore = Color.FromHex("#BB3232");
         public static readonly Color DisabledFore = Color.FromHex("#5A5A5A");
 
-        public static readonly Color ButtonColorDefault = Color.FromHex("#464966");
+        public static readonly Color ButtonColorDefault = Color.FromHex("#664e46");
         public static readonly Color ButtonColorDefaultRed = Color.FromHex("#D43B3B");
-        public static readonly Color ButtonColorHovered = Color.FromHex("#575b7f");
+        public static readonly Color ButtonColorHovered = Color.FromHex("#7f6357");
         public static readonly Color ButtonColorHoveredRed = Color.FromHex("#DF6B6B");
-        public static readonly Color ButtonColorPressed = Color.FromHex("#3e6c45");
-        public static readonly Color ButtonColorDisabled = Color.FromHex("#30313c");
+        public static readonly Color ButtonColorPressed = Color.FromHex("#6c4a3e");
+        public static readonly Color ButtonColorDisabled = Color.FromHex("#3c3330");
 
         public static readonly Color ButtonColorCautionDefault = Color.FromHex("#ab3232");
         public static readonly Color ButtonColorCautionHovered = Color.FromHex("#cf2f2f");
diff --git a/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml b/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml
index c6cb9a0fc1..d0515d0aaa 100644
--- a/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml
+++ b/Resources/Prototypes/_CP14/Entities/Mobs/Species/tiefling.yml
@@ -1,5 +1,5 @@
 - type: entity
-  parent: BaseMobSpeciesOrganic
+  parent: CPBaseMobSpeciesOrganic
   id: CPBaseMobTiefling
   name: Mr. Tiefling
   abstract: true
@@ -14,7 +14,9 @@
       sprite: CrystallPunk/Mobs/Species/Tiefling/parts.rsi
       state: full
     - type: Thirst
-    - type: Wagging
+    - type: Wagging  
+    - type: Inventory
+      templateId: CPHuman
 
 - type: entity
   parent: BaseSpeciesDummy
diff --git a/Resources/Textures/Interface/Nano/button.svg.96dpi.png b/Resources/Textures/Interface/Nano/button.svg.96dpi.png
index b391378bb0..8bcd6c739f 100644
Binary files a/Resources/Textures/Interface/Nano/button.svg.96dpi.png and b/Resources/Textures/Interface/Nano/button.svg.96dpi.png differ
diff --git a/Resources/Textures/Interface/Nano/button_small.svg.96dpi.png b/Resources/Textures/Interface/Nano/button_small.svg.96dpi.png
index bded8df6ec..bb1a8ee6d8 100644
Binary files a/Resources/Textures/Interface/Nano/button_small.svg.96dpi.png and b/Resources/Textures/Interface/Nano/button_small.svg.96dpi.png differ
diff --git a/Resources/Textures/Interface/Nano/item_status_left.svg.96dpi.png b/Resources/Textures/Interface/Nano/item_status_left.svg.96dpi.png
index 5169343ea4..ec56480811 100644
Binary files a/Resources/Textures/Interface/Nano/item_status_left.svg.96dpi.png and b/Resources/Textures/Interface/Nano/item_status_left.svg.96dpi.png differ
diff --git a/Resources/Textures/Interface/Nano/item_status_middle.svg.96dpi.png b/Resources/Textures/Interface/Nano/item_status_middle.svg.96dpi.png
index dc1f84cea8..821a7cf1e2 100644
Binary files a/Resources/Textures/Interface/Nano/item_status_middle.svg.96dpi.png and b/Resources/Textures/Interface/Nano/item_status_middle.svg.96dpi.png differ
diff --git a/Resources/Textures/Interface/Nano/item_status_right.svg.96dpi.png b/Resources/Textures/Interface/Nano/item_status_right.svg.96dpi.png
index 72f7e6de6b..5c11992a30 100644
Binary files a/Resources/Textures/Interface/Nano/item_status_right.svg.96dpi.png and b/Resources/Textures/Interface/Nano/item_status_right.svg.96dpi.png differ
diff --git a/Resources/Textures/Interface/Nano/slider_fill.svg.96dpi.png b/Resources/Textures/Interface/Nano/slider_fill.svg.96dpi.png
index 05a780078f..bb23c626c5 100644
Binary files a/Resources/Textures/Interface/Nano/slider_fill.svg.96dpi.png and b/Resources/Textures/Interface/Nano/slider_fill.svg.96dpi.png differ
diff --git a/Resources/Textures/Interface/Nano/slider_grabber.svg.96dpi.png b/Resources/Textures/Interface/Nano/slider_grabber.svg.96dpi.png
index 557d1ca819..99bb10f5f5 100644
Binary files a/Resources/Textures/Interface/Nano/slider_grabber.svg.96dpi.png and b/Resources/Textures/Interface/Nano/slider_grabber.svg.96dpi.png differ
diff --git a/Resources/Textures/Interface/Nano/slider_outline.svg.96dpi.png b/Resources/Textures/Interface/Nano/slider_outline.svg.96dpi.png
index de74c2dee0..8a05464b5c 100644
Binary files a/Resources/Textures/Interface/Nano/slider_outline.svg.96dpi.png and b/Resources/Textures/Interface/Nano/slider_outline.svg.96dpi.png differ
diff --git a/Resources/Textures/Interface/Nano/stripeback.svg.96dpi.png b/Resources/Textures/Interface/Nano/stripeback.svg.96dpi.png
index fb35a5634e..cb283d04f4 100644
Binary files a/Resources/Textures/Interface/Nano/stripeback.svg.96dpi.png and b/Resources/Textures/Interface/Nano/stripeback.svg.96dpi.png differ