diff --git a/Resources/Locale/ru-RU/_strings/_sunrise/serverhub/serverhub.ftl b/Resources/Locale/ru-RU/_strings/_sunrise/serverhub/serverhub.ftl
index 3c9f8afa38..dabcf7edde 100644
--- a/Resources/Locale/ru-RU/_strings/_sunrise/serverhub/serverhub.ftl
+++ b/Resources/Locale/ru-RU/_strings/_sunrise/serverhub/serverhub.ftl
@@ -1,5 +1,5 @@
-server-hub-title = Хаб серверов
+servers-hub-title = Хаб серверов
 serverhub-info = Режим: { $mode } | Станция: { $station }
 serverhub-connect = Подключиться
 serverhub-here = Вы уже здесь
-serverhub-playingnow = Сейчас играет: { $total }/{ $max }
+serverhub-playingnow = Сейчас играет: { $total }/{ $max }
\ No newline at end of file
diff --git a/Resources/Locale/ru-RU/_strings/shuttles/console.ftl b/Resources/Locale/ru-RU/_strings/shuttles/console.ftl
index d958e0ce3c..929d9ff960 100644
--- a/Resources/Locale/ru-RU/_strings/shuttles/console.ftl
+++ b/Resources/Locale/ru-RU/_strings/shuttles/console.ftl
@@ -26,6 +26,7 @@ shuttle-console-ftl-state-Starting = Запуск
 shuttle-console-ftl-state-Travelling = В пути
 shuttle-console-ftl-state-Arriving = Прибытие
 shuttle-console-ftl-state-Cooldown = Перезарядка
+shuttle-console-ftl-state-Invalid = Не удалось
 shuttle-console-map-settings = Настройки
 shuttle-console-ftl-button = БСС
 shuttle-console-map-rebuild =
diff --git a/Resources/Prototypes/Entities/Stations/base.yml b/Resources/Prototypes/Entities/Stations/base.yml
index bc0909444d..87e36dc84e 100644
--- a/Resources/Prototypes/Entities/Stations/base.yml
+++ b/Resources/Prototypes/Entities/Stations/base.yml
@@ -43,11 +43,12 @@
   id: BaseStationShuttles
   abstract: true
   components:
-  - type: StationCargoShuttle
-    path: /Maps/Shuttles/cargo.yml
+# Sunrise-Edit: Карго не нужен шаттл без трейдпоста.
+#  - type: StationCargoShuttle
+#    path: /Maps/Shuttles/cargo.yml
   - type: GridSpawn
     groups:
-# Sunrise-Edit: Карго не нужен шаттл без трейдпоста.
+# Sunrise-Edit: Рефактор карго
 #      trade: !type:GridSpawnGroup
 #        addComponents:
 #        - type: ProtectedGrid
@@ -71,6 +72,14 @@
 #        - /Maps/Ruins/syndicate_dropship.yml
 #        - /Maps/Ruins/whiteship_ancient.yml
 #        - /Maps/Ruins/whiteship_bluespacejumper.yml
+
+#Sunrise-start Security shuttle
+      security: !type:GridSpawnGroup
+        paths:
+        - /Maps/_Sunrise/Shuttles/security.yml
+        nameGrid: false
+#Sunrise-end
+
       vgroid: !type:DungeonSpawnGroup
         minimumDistance: 300
         maximumDistance: 350
diff --git a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/nanopaste.yml b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/nanopaste.yml
index 1502d87454..2e19839f50 100644
--- a/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/nanopaste.yml
+++ b/Resources/Prototypes/_Sunrise/Entities/Objects/Specific/nanopaste.yml
@@ -40,7 +40,7 @@
   suffix: Single
   components:
   - type: Stack
-    stackType: Brutepack
+    stackType: Nanopaste
     count: 1
 
 - type: entity
@@ -49,5 +49,5 @@
   suffix: Full
   components:
   - type: Stack
-    stackType: Brutepack
+    stackType: Nanopaste
     count: 10
diff --git a/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/adidas-black.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/adidas-black.rsi/equipped-INNERCLOTHING.png
index 912c8a360e..e8a5cb5d90 100644
Binary files a/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/adidas-black.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/adidas-black.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/adidas-black.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/adidas-black.rsi/inhand-left.png
index cede8a2d71..a1fe3af6b2 100644
Binary files a/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/adidas-black.rsi/inhand-left.png and b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/adidas-black.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/adidas-black.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/adidas-black.rsi/inhand-right.png
index ad07e9b05f..2b2bf03698 100644
Binary files a/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/adidas-black.rsi/inhand-right.png and b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/adidas-black.rsi/inhand-right.png differ
diff --git a/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/adidas-white.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/adidas-white.rsi/equipped-INNERCLOTHING.png
index a8501b5755..2db0259de4 100644
Binary files a/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/adidas-white.rsi/equipped-INNERCLOTHING.png and b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/adidas-white.rsi/equipped-INNERCLOTHING.png differ
diff --git a/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/adidas-white.rsi/inhand-left.png b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/adidas-white.rsi/inhand-left.png
index ce786b73ce..55d63625bf 100644
Binary files a/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/adidas-white.rsi/inhand-left.png and b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/adidas-white.rsi/inhand-left.png differ
diff --git a/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/adidas-white.rsi/inhand-right.png b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/adidas-white.rsi/inhand-right.png
index f6f3599779..145401fa62 100644
Binary files a/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/adidas-white.rsi/inhand-right.png and b/Resources/Textures/_Sunrise/Clothing/Uniforms/Jumpsuit/adidas-white.rsi/inhand-right.png differ