diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
index 5ae4944725..a8c13094d6 100644
--- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml
+++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -1131,6 +1131,13 @@
   - type: Tag #  Ignore Chameleon tags
     tags:
     - DoorBumpOpener
+  # sunrise-start
+  - type: Instrument
+    allowPercussion: true
+    allowProgramChange: true
+    respectMidiLimits: false
+    handheld: true
+  # sunrise-end
 
 - type: entity
   parent: CentcomPDA
diff --git a/Resources/Prototypes/InventoryTemplates/aghost_inventory_template.yml b/Resources/Prototypes/InventoryTemplates/aghost_inventory_template.yml
index 70651af649..1ffee22bd4 100644
--- a/Resources/Prototypes/InventoryTemplates/aghost_inventory_template.yml
+++ b/Resources/Prototypes/InventoryTemplates/aghost_inventory_template.yml
@@ -1,48 +1,147 @@
+# - type: inventoryTemplate
+#   id: aghost
+#   slots:
+#     - name: back
+#       slotTexture: back
+#       slotFlags: BACK
+#       slotGroup: SecondHotbar
+#       stripTime: 6
+#       uiWindowPos: 2,1
+#       strippingWindowPos: 2,4
+#       displayName: ID
+#     - name: id
+#       slotTexture: id
+#       fullTextureName: template_small
+#       slotFlags: IDCARD
+#       slotGroup: SecondHotbar
+#       stripTime: 6
+#       uiWindowPos: 2,2
+#       strippingWindowPos: 2,3
+#       displayName: ID
+
+#     # For drip reasons.
+#     - name: head
+#       slotTexture: head
+#       slotFlags: HEAD
+#       uiWindowPos: 0,3
+#       strippingWindowPos: 0,0
+#       displayName: Head
+#     - name: mask
+#       slotTexture: mask
+#       slotFlags: MASK
+#       uiWindowPos: 0,2 # Sunrise-edit
+#       strippingWindowPos: 0,1 # Sunrise-edt
+#       displayName: Mask
+
+# Sunsise-start
 - type: inventoryTemplate
   id: aghost
-  slots:
-    - name: back
-      slotTexture: back
-      slotFlags: BACK
-      slotGroup: SecondHotbar
+  slots:   #starlight change, gave aghost diona template bc grape said no shoes for aghost
+    - name: jumpsuit
+      slotTexture: uniform
+      slotFlags: INNERCLOTHING
       stripTime: 6
+      uiWindowPos: 0,1
+      strippingWindowPos: 0,2
+      displayName: Jumpsuit
+    - name: outerClothing
+      slotTexture: suit
+      slotFlags: OUTERCLOTHING
+      stripTime: 6
+      uiWindowPos: 1,1
+      strippingWindowPos: 1,2
+      displayName: Suit
+    - name: gloves
+      slotTexture: gloves
+      slotFlags: GLOVES
       uiWindowPos: 2,1
-      strippingWindowPos: 2,4
-      displayName: ID
+      strippingWindowPos: 2,2
+      displayName: Gloves
+    - name: neck
+      slotTexture: neck
+      slotFlags: NECK
+      uiWindowPos: 0,2
+      strippingWindowPos: 0,1
+      displayName: Neck
+    - name: mask
+      slotTexture: mask
+      slotFlags: MASK
+      uiWindowPos: 1,2
+      strippingWindowPos: 1,1
+      displayName: Mask
+    - name: eyes
+      slotTexture: glasses
+      slotFlags: EYES
+      stripTime: 3
+      uiWindowPos: 0,3
+      strippingWindowPos: 0,0
+      displayName: Eyes
+    - name: ears
+      slotTexture: ears
+      slotFlags: EARS
+      stripTime: 3
+      uiWindowPos: 2,2
+      strippingWindowPos: 2,0
+      displayName: Ears
+    - name: head
+      slotTexture: head
+      slotFlags: HEAD
+      uiWindowPos: 1,3
+      strippingWindowPos: 1,0
+      displayName: Head
+    - name: pocket1
+      slotTexture: pocket
+      fullTextureName: template_small
+      slotFlags: POCKET
+      slotGroup: MainHotbar
+      stripTime: 3
+      uiWindowPos: 0,3
+      strippingWindowPos: 0,4
+      displayName: Pocket 1
+      stripHidden: true
+    - name: pocket2
+      slotTexture: pocket
+      fullTextureName: template_small
+      slotFlags: POCKET
+      slotGroup: MainHotbar
+      stripTime: 3
+      uiWindowPos: 2,3
+      strippingWindowPos: 1,4
+      displayName: Pocket 2
+      stripHidden: true
+    - name: suitstorage
+      slotTexture: suit_storage
+      slotFlags:   SUITSTORAGE
+      slotGroup: MainHotbar
+      stripTime: 3
+      uiWindowPos: 2,0
+      strippingWindowPos: 2,5
+      displayName: Suit Storage
     - name: id
       slotTexture: id
       fullTextureName: template_small
       slotFlags: IDCARD
       slotGroup: SecondHotbar
       stripTime: 6
-      uiWindowPos: 2,2
-      strippingWindowPos: 2,3
+      uiWindowPos: 2,1
+      strippingWindowPos: 2,4
       displayName: ID
-
-    # For drip reasons.
-    - name: head
-      slotTexture: head
-      slotFlags: HEAD
-      uiWindowPos: 0,3
-      strippingWindowPos: 0,0
-      displayName: Head
-    - name: mask
-      slotTexture: mask
-      slotFlags: MASK
-      uiWindowPos: 0,2 # Sunrise-edit
-      strippingWindowPos: 0,1 # Sunrise-edt
-      displayName: Mask
-# Sunsise-start
-    - name: jumpsuit
-      slotTexture: uniform
-      slotFlags: INNERCLOTHING
-      uiWindowPos: 0,1
-      strippingWindowPos: 0,2
-      displayName: Jumpsuit
-    - name: neck
-      slotTexture: neck
-      slotFlags: NECK
-      uiWindowPos: 1,2
-      strippingWindowPos: 1,1
-      displayName: Neck
+    - name: belt
+      slotTexture: belt
+      fullTextureName: template_small
+      slotFlags: BELT
+      slotGroup: SecondHotbar
+      stripTime: 6
+      uiWindowPos: 3,1
+      strippingWindowPos: 1,5
+      displayName: Belt
+    - name: back
+      slotTexture: back
+      fullTextureName: template_small
+      slotFlags: BACK
+      slotGroup: SecondHotbar
+      stripTime: 6
+      uiWindowPos: 3,0
+      strippingWindowPos: 0,5
+      displayName: Back
 # Sunrise-end
diff --git a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
index ad858d4cc4..56319e227d 100644
--- a/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
+++ b/Resources/Prototypes/Roles/Jobs/Fun/misc_startinggear.yml
@@ -135,12 +135,31 @@
   equipment:
     back: ClothingBackpackSatchelAdmin
     id: AdminPDA
+    belt: ClothingBeltChiefEngineerFilled # Sunrise-add
+    eyes: ClothingEyesHudSyndicateMedic # Sunrise-add
+    head: ClothingHeadHatCowboyWhite # Sunrise-add
   storage:
     back:
     - GasAnalyzer
     - trayScanner
     - AccessConfiguratorUniversal
     - Multitool
+    # sunrise-start
+    - AnomalyScanner
+    - RubberStampApproved
+    - RubberStampDenied
+    - RubberStampCentcom
+    - RubberStampSyndicate
+    - RubberStampMagistrat
+    - RubberStampRedo
+    - RubberStampTrader
+    - RubberStampSpecOps
+    - BoxFolderCentCom
+    - Emag
+    - AccessBreaker
+    - ClothingEyesHudOmni
+    - ClothingEyesHudDiagnosticERT
+    # sunrise-end
 
 #Gladiator with spear
 - type: startingGear