diff --git a/resources/[inventory]/cs_shops/config/config.lua b/resources/[inventory]/cs_shops/config/config.lua
index e316a1b94..b0514e40a 100644
--- a/resources/[inventory]/cs_shops/config/config.lua
+++ b/resources/[inventory]/cs_shops/config/config.lua
@@ -1500,7 +1500,7 @@ CodeStudio.Products = {
                 itemInfo = "",
             },
             ['weapon_klog19fde'] = {
-                itemName = "Klog 19 FDE",
+                itemName = "Klog 19 FD",
                 itemStock = 50,
                 itemPrice = 0,
                 itemInfo = "",
@@ -3036,17 +3036,15 @@ CodeStudio.Shops = {
         },
             },
     [4] = {
-        ShopName = 'Admin Shop',
+        ShopName = 'Crime Waffen',
         Category = {
             [1] = 'weapons',
-            [2] = 'police_weapons',
-            [3] = 'ammo',
-            [4] = 'attachtments',
+            [2] = 'ammo',
 
 
         },
         requiredJob = {
-            ['admin'] = {0}
+            ['sud'] = {0}
         },
         Locations = {
             vector4(4435.1216, -4470.0146, 4.3284, 3)
@@ -3330,6 +3328,30 @@ CodeStudio.Shops = {
         },               
 
     },
+    [17] = {
+        ShopName = 'Legale Waffen',
+        Category = {
+            [1] = 'police_weapons',
+            [2] = 'ammo',
+
+        },
+        requiredJob = {
+            ['sud'] = {0}
+        },
+        Locations = {
+            vector4(150.3828, 288.1915, 109.9736, 3)
+        },
+        Interaction = {
+            targetIcon = 'fas fa-gun',
+            targetLabel = 'Admin Shop öffnen',
+            spawnPed = false,  -- Put false if you dont need ped
+            scenario = 'WORLD_HUMAN_STAND_MOBILE',  --Ped Scenario Animation put false if you dont need
+            radius = 2.5,
+        },
+         },
+
+
+
 
 }
     
\ No newline at end of file
diff --git a/resources/[jobs]/[weapons]/Klog19FDE/cl_weaponNames.lua b/resources/[jobs]/[weapons]/Klog19FDE/cl_weaponNames.lua
index 51b02f1c7..23c721af5 100644
--- a/resources/[jobs]/[weapons]/Klog19FDE/cl_weaponNames.lua
+++ b/resources/[jobs]/[weapons]/Klog19FDE/cl_weaponNames.lua
@@ -1 +1 @@
-AddTextEntry("WEAPON_KLOG19FDE", "Klog 19 FDE")
+AddTextEntry("weapon_klog19fde", "Klog 19 FDE")
diff --git a/resources/[jobs]/[weapons]/Klog19FDE/meta/components/COMPONENT_AT_PI_FLSH_02/weaponcomponents.meta b/resources/[jobs]/[weapons]/Klog19FDE/meta/components/COMPONENT_AT_PI_FLSH_02/weaponcomponents.meta
new file mode 100644
index 000000000..26ef5de0d
--- /dev/null
+++ b/resources/[jobs]/[weapons]/Klog19FDE/meta/components/COMPONENT_AT_PI_FLSH_02/weaponcomponents.meta
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF - 8"?>
+
+<CWeaponComponentInfoBlob>
+	<Infos>
+		<Item type="CWeaponComponentFlashLightInfo">
+			<Name>COMPONENT_AT_PI_FLSH_02</Name>
+			<Model>w_at_pi_flsh_2</Model>
+			<LocName>WCT_FLASH</LocName>
+			<LocDesc>WCD_FLASH</LocDesc>
+			<AttachBone>AAPFlsh</AttachBone>
+			<WeaponAttachBone>WAPFlshLasr</WeaponAttachBone>
+			<AccuracyModifier type="NULL"/>
+			<DamageModifier type="NULL"/>
+			<bShownOnWheel value="true"/>
+			<CreateObject value="true"/>
+			<HudDamage value="0"/>
+			<HudSpeed value="0"/>
+			<HudCapacity value="0"/>
+			<HudAccuracy value="0"/>
+			<HudRange value="0"/>
+			<MainLightIntensity value="6.000000"/>
+			<MainLightColor value="0xFFC9C9FF"/>
+			<MainLightRange value="30.000000"/>
+			<MainLightFalloffExponent value="32.000000"/>
+			<MainLightInnerAngle value="0.000000"/>
+			<MainLightOuterAngle value="20.000000"/>
+			<MainLightCoronaIntensity value="3.000000"/>
+			<MainLightCoronaSize value="0.200000"/>
+			<MainLightVolumeIntensity value="0.300000"/>
+			<MainLightVolumeSize value="0.100000"/>
+			<MainLightVolumeExponent value="70.000000"/>
+			<MainLightVolumeOuterColor value="0xFF050E3B"/>
+			<MainLightShadowFadeDistance value="10.000000"/>
+			<MainLightSpecularFadeDistance value="10.000000"/>
+			<SecondaryLightIntensity value="4.000000"/>
+			<SecondaryLightColor value="0xFFFFFFFF"/>
+			<SecondaryLightRange value="6.000000"/>
+			<SecondaryLightFalloffExponent value="64.000000"/>
+			<SecondaryLightInnerAngle value="0.000000"/>
+			<SecondaryLightOuterAngle value="40.000000"/>
+			<SecondaryLightVolumeIntensity value="0.300000"/>
+			<SecondaryLightVolumeSize value="0.400000"/>
+			<SecondaryLightVolumeExponent value="24.000000"/>
+			<SecondaryLightVolumeOuterColor value="0xFF000F85"/>
+			<SecondaryLightFadeDistance value="10.000000"/>
+			<fTargetDistalongAimCamera value="8.000000"/>
+			<FlashLightBone>Gun_FLMuzzle</FlashLightBone>
+			<FlashLightBoneBulbOn>Bulb_On</FlashLightBoneBulbOn>
+			<FlashLightBoneBulbOff>Bulb_Off</FlashLightBoneBulbOff>
+		</Item>
+	</Infos>
+	<InfoBlobName/>
+</CWeaponComponentInfoBlob>
+
diff --git a/resources/[jobs]/[weapons]/Klog19FDE/meta/components/COMPONENT_AT_PI_RAIL/weaponcomponents.meta b/resources/[jobs]/[weapons]/Klog19FDE/meta/components/COMPONENT_AT_PI_RAIL/weaponcomponents.meta
new file mode 100644
index 000000000..124bd0585
--- /dev/null
+++ b/resources/[jobs]/[weapons]/Klog19FDE/meta/components/COMPONENT_AT_PI_RAIL/weaponcomponents.meta
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF - 8"?>
+
+<CWeaponComponentInfoBlob>
+	<Infos>
+		<Item type="CWeaponComponentScopeInfo">
+			<Name>COMPONENT_AT_PI_RAIL</Name>
+			<Model>w_at_pi_rail_1</Model>
+			<LocName>WCT_SCOPE_MAC</LocName>
+			<LocDesc>WCD_SCOPE_MAC</LocDesc>
+			<AttachBone>AAPScop</AttachBone>
+			<WeaponAttachBone>WAPScop</WeaponAttachBone>
+			<AccuracyModifier type="NULL"/>
+			<DamageModifier type="NULL"/>
+			<bShownOnWheel value="true"/>
+			<CreateObject value="true"/>
+			<HudDamage value="0"/>
+			<HudSpeed value="0"/>
+			<HudCapacity value="0"/>
+			<HudAccuracy value="5"/>
+			<HudRange value="0"/>
+			<CameraHash/>
+			<RecoilShakeAmplitude value="0.280000"/>
+			<ExtraZoomFactorForAccurateMode value="1.200000"/>
+			<Reticule value="0"/>
+			<ReticuleHash/>
+		</Item>
+	</Infos>
+	<InfoBlobName/>
+</CWeaponComponentInfoBlob>
+
diff --git a/resources/[jobs]/[weapons]/Klog19FDE/meta/components/COMPONENT_AT_SCOPE_MACRO/weaponcomponents.meta b/resources/[jobs]/[weapons]/Klog19FDE/meta/components/COMPONENT_AT_SCOPE_MACRO/weaponcomponents.meta
new file mode 100644
index 000000000..befc01418
--- /dev/null
+++ b/resources/[jobs]/[weapons]/Klog19FDE/meta/components/COMPONENT_AT_SCOPE_MACRO/weaponcomponents.meta
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF - 8"?>
+
+<CWeaponComponentInfoBlob>
+	<Infos>
+		<Item type="CWeaponComponentScopeInfo">
+			<Name>COMPONENT_AT_SCOPE_MACRO</Name>
+			<Model>w_at_pi_rail_1</Model>
+			<LocName>WCT_SCOPE_MAC</LocName>
+			<LocDesc>WCD_SCOPE_MAC</LocDesc>
+			<AttachBone>AAPScop</AttachBone>
+			<WeaponAttachBone>WAPScop</WeaponAttachBone>
+			<AccuracyModifier type="NULL"/>
+			<DamageModifier type="NULL"/>
+			<bShownOnWheel value="true"/>
+			<CreateObject value="true"/>
+			<HudDamage value="0"/>
+			<HudSpeed value="0"/>
+			<HudCapacity value="0"/>
+			<HudAccuracy value="5"/>
+			<HudRange value="0"/>
+			<CameraHash/>
+			<RecoilShakeAmplitude value="0.280000"/>
+			<ExtraZoomFactorForAccurateMode value="1.200000"/>
+			<Reticule value="0"/>
+			<ReticuleHash/>
+		</Item>
+	</Infos>
+	<InfoBlobName/>
+</CWeaponComponentInfoBlob>
+
diff --git a/resources/[jobs]/[weapons]/Klog19FDE/meta/components/COMPONENT_PISTOL_MK2_CLIP_01/weaponcomponents.meta b/resources/[jobs]/[weapons]/Klog19FDE/meta/components/COMPONENT_PISTOL_MK2_CLIP_01/weaponcomponents.meta
new file mode 100644
index 000000000..dcf03be52
--- /dev/null
+++ b/resources/[jobs]/[weapons]/Klog19FDE/meta/components/COMPONENT_PISTOL_MK2_CLIP_01/weaponcomponents.meta
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF - 8"?>
+
+<CWeaponComponentInfoBlob>
+	<Infos>
+		<Item type="CWeaponComponentClipInfo">
+			<Name>COMPONENT_PISTOL_MK2_CLIP_01</Name>
+			<Model>w_pi_pistolmk2_mag2</Model>
+			<LocName>WCT_CLIP1</LocName>
+			<LocDesc>WCD_P_CLIP1</LocDesc>
+			<AttachBone>AAPClip</AttachBone>
+			<WeaponAttachBone>WAPClip</WeaponAttachBone>
+			<AccuracyModifier type="NULL"/>
+			<DamageModifier type="NULL"/>
+			<bShownOnWheel value="false"/>
+			<CreateObject value="true"/>
+			<HudDamage value="0"/>
+			<HudSpeed value="0"/>
+			<HudCapacity value="0"/>
+			<HudAccuracy value="0"/>
+			<HudRange value="0"/>
+			<ClipSize value="12"/>
+			<AmmoInfo/>
+			<ReloadData ref="RELOAD_DEFAULT_WITH_EMPTIES"/>
+		</Item>
+	</Infos>
+	<InfoBlobName/>
+</CWeaponComponentInfoBlob>
+
diff --git a/resources/[jobs]/[weapons]/Klog19FDE/meta/pedpersonality.meta b/resources/[jobs]/[weapons]/Klog19FDE/meta/pedpersonality.meta
index 214d6266e..9ad8606af 100644
--- a/resources/[jobs]/[weapons]/Klog19FDE/meta/pedpersonality.meta
+++ b/resources/[jobs]/[weapons]/Klog19FDE/meta/pedpersonality.meta
@@ -7,7 +7,7 @@
 			<UnholsterClips>
 				<Item>
 					<Weapons>
-						<Item>WEAPON_KLOG19FDE</Item>
+						<Item>weapon_klog19fde</Item>
 					</Weapons>
 					<Clip>unarmed_holster_1h</Clip>
 				</Item>
@@ -18,7 +18,7 @@
 			<UnholsterClips>
 				<Item>
 					<Weapons>
-						<Item>WEAPON_KLOG19FDE</Item>
+						<Item>weapon_klog19fde</Item>
 					</Weapons>
 					<Clip>2h_melee_holster_1h</Clip>
 				</Item>
@@ -29,7 +29,7 @@
 			<UnholsterClips>
 				<Item>
 					<Weapons>
-						<Item>WEAPON_KLOG19FDE</Item>
+						<Item>weapon_klog19fde</Item>
 					</Weapons>
 					<Clip>1h_holster_1h</Clip>
 				</Item>
@@ -40,7 +40,7 @@
 			<UnholsterClips>
 				<Item>
 					<Weapons>
-						<Item>WEAPON_KLOG19FDE</Item>
+						<Item>weapon_klog19fde</Item>
 					</Weapons>
 					<Clip>2h_holster_1h</Clip>
 				</Item>
@@ -51,7 +51,7 @@
 			<UnholsterClips>
 				<Item>
 					<Weapons>
-						<Item>WEAPON_KLOG19FDE</Item>
+						<Item>weapon_klog19fde</Item>
 					</Weapons>
 					<Clip>mini_holster_1h</Clip>
 				</Item>
@@ -62,7 +62,7 @@
 			<UnholsterClips>
 				<Item>
 					<Weapons>
-						<Item>WEAPON_KLOG19FDE</Item>
+						<Item>weapon_klog19fde</Item>
 					</Weapons>
 					<Clip>unarmed_holster_1h</Clip>
 				</Item>
@@ -73,7 +73,7 @@
 			<UnholsterClips>
 				<Item>
 					<Weapons>
-						<Item>WEAPON_KLOG19FDE</Item>
+						<Item>weapon_klog19fde</Item>
 					</Weapons>
 					<Clip>unarmed_holster_1h</Clip>
 				</Item>
@@ -84,7 +84,7 @@
 			<UnholsterClips>
 				<Item>
 					<Weapons>
-						<Item>WEAPON_KLOG19FDE</Item>
+						<Item>weapon_klog19fde</Item>
 					</Weapons>
 					<Clip>1h_holster_1h</Clip>
 				</Item>
@@ -95,7 +95,7 @@
 			<UnholsterClips>
 				<Item>
 					<Weapons>
-						<Item>WEAPON_KLOG19FDE</Item>
+						<Item>weapon_klog19fde</Item>
 					</Weapons>
 					<Clip>2h_holster_1h</Clip>
 				</Item>
@@ -109,7 +109,7 @@
 				<Item>
 					<Item>
 						<Weapons>
-							<Item>WEAPON_KLOG19FDE</Item>
+							<Item>weapon_klog19fde</Item>
 						</Weapons>
 						<ClipSets>
 							<Item>
@@ -133,7 +133,7 @@
 				<Item>
 					<Item>
 						<Weapons>
-							<Item>WEAPON_KLOG19FDE</Item>
+							<Item>weapon_klog19fde</Item>
 						</Weapons>
 						<ClipSets>
 							<Item>
@@ -164,7 +164,7 @@
 				<Item>
 					<Item>
 						<Weapons>
-							<Item>WEAPON_KLOG19FDE</Item>
+							<Item>weapon_klog19fde</Item>
 						</Weapons>
 						<ClipSets>
 							<Item>
@@ -188,7 +188,7 @@
 				<Item>
 					<Item>
 						<Weapons>
-							<Item>WEAPON_KLOG19FDE</Item>
+							<Item>weapon_klog19fde</Item>
 						</Weapons>
 						<ClipSets>
 							<Item>
@@ -219,7 +219,7 @@
 				<Item>
 					<Item>
 						<Weapons>
-							<Item>WEAPON_KLOG19FDE</Item>
+							<Item>weapon_klog19fde</Item>
 						</Weapons>
 						<ClipSets>
 							<Item>
@@ -243,7 +243,7 @@
 				<Item>
 					<Item>
 						<Weapons>
-							<Item>WEAPON_KLOG19FDE</Item>
+							<Item>weapon_klog19fde</Item>
 						</Weapons>
 						<ClipSets>
 							<Item>
@@ -274,7 +274,7 @@
 				<Item>
 					<Item>
 						<Weapons>
-							<Item>WEAPON_KLOG19FDE</Item>
+							<Item>weapon_klog19fde</Item>
 						</Weapons>
 						<ClipSets>
 							<Item>
@@ -298,7 +298,7 @@
 				<Item>
 					<Item>
 						<Weapons>
-							<Item>WEAPON_KLOG19FDE</Item>
+							<Item>weapon_klog19fde</Item>
 						</Weapons>
 						<ClipSets>
 							<Item>
@@ -329,7 +329,7 @@
 				<Item>
 					<Item>
 						<Weapons>
-							<Item>WEAPON_KLOG19FDE</Item>
+							<Item>weapon_klog19fde</Item>
 						</Weapons>
 						<ClipSets>
 							<Item>
@@ -353,7 +353,7 @@
 				<Item>
 					<Item>
 						<Weapons>
-							<Item>WEAPON_KLOG19FDE</Item>
+							<Item>weapon_klog19fde</Item>
 						</Weapons>
 						<ClipSets>
 							<Item>
diff --git a/resources/[jobs]/[weapons]/Klog19FDE/meta/weaponanimations.meta b/resources/[jobs]/[weapons]/Klog19FDE/meta/weaponanimations.meta
index fae79a217..c17f7f647 100644
--- a/resources/[jobs]/[weapons]/Klog19FDE/meta/weaponanimations.meta
+++ b/resources/[jobs]/[weapons]/Klog19FDE/meta/weaponanimations.meta
@@ -4,7 +4,7 @@
 	<WeaponAnimationsSets>
 		<Item key="Default">
 			<WeaponAnimations>
-				<Item key="WEAPON_KLOG19FDE">
+				<Item key="weapon_klog19fde">
 					<CoverMovementClipSetHash/>
 					<CoverMovementExtraClipSetHash/>
 					<CoverAlternateMovementClipSetHash>cover@move@ai@base@1h</CoverAlternateMovementClipSetHash>
@@ -53,7 +53,7 @@
 		<Item key="Gang">
 			<Fallback>Default</Fallback>
 			<WeaponAnimations>
-				<Item key="WEAPON_KLOG19FDE">
+				<Item key="weapon_klog19fde">
 					<CoverMovementClipSetHash/>
 					<CoverMovementExtraClipSetHash/>
 					<CoverAlternateMovementClipSetHash/>
@@ -102,7 +102,7 @@
 		<Item key="FirstPerson">
 			<Fallback>Default</Fallback>
 			<WeaponAnimations>
-				<Item key="WEAPON_KLOG19FDE">
+				<Item key="weapon_klog19fde">
 					<MovementOverrideClipSetHash>move_m@generic</MovementOverrideClipSetHash>
 					<CoverMovementClipSetHash/>
 					<CoverMovementExtraClipSetHash/>
@@ -166,7 +166,7 @@
 		<Item key="FirstPersonAiming">
 			<Fallback>Default</Fallback>
 			<WeaponAnimations>
-				<Item key="WEAPON_KLOG19FDE">
+				<Item key="weapon_klog19fde">
 					<CoverMovementClipSetHash/>
 					<CoverMovementExtraClipSetHash/>
 					<CoverAlternateMovementClipSetHash>cover@move@ai@base@1h</CoverAlternateMovementClipSetHash>
@@ -228,7 +228,7 @@
 		<Item key="FirstPersonRNG">
 			<Fallback>Default</Fallback>
 			<WeaponAnimations>
-				<Item key="WEAPON_KLOG19FDE">
+				<Item key="weapon_klog19fde">
 					<CoverMovementClipSetHash/>
 					<CoverMovementExtraClipSetHash/>
 					<CoverAlternateMovementClipSetHash>cover@move@ai@base@1h</CoverAlternateMovementClipSetHash>
@@ -289,7 +289,7 @@
 		<Item key="FirstPersonScope">
 			<Fallback>Default</Fallback>
 			<WeaponAnimations>
-				<Item key="WEAPON_KLOG19FDE">
+				<Item key="weapon_klog19fde">
 					<CoverMovementClipSetHash/>
 					<CoverMovementExtraClipSetHash/>
 					<CoverAlternateMovementClipSetHash>cover@move@ai@base@1h</CoverAlternateMovementClipSetHash>
diff --git a/resources/[jobs]/[weapons]/Klog19FDE/meta/weapons.meta b/resources/[jobs]/[weapons]/Klog19FDE/meta/weapons.meta
index c8034fa60..ce9cd1da3 100644
--- a/resources/[jobs]/[weapons]/Klog19FDE/meta/weapons.meta
+++ b/resources/[jobs]/[weapons]/Klog19FDE/meta/weapons.meta
@@ -6,7 +6,7 @@
 			<WeaponSlots>
 				<Item>
 					<OrderNumber value="400"/>
-					<Entry>SLOT_WEAPON_KLOG19FDE</Entry>
+					<Entry>SLOT_weapon_klog19fde</Entry>
 				</Item>
 			</WeaponSlots>
 		</Item>
@@ -15,10 +15,10 @@
 		<Item>
 			<Infos>
 				<Item type="CWeaponInfo">
-					<Name>WEAPON_KLOG19FDE</Name>
+					<Name>weapon_klog19fde</Name>
 					<Model>w_pi_klog19fde</Model>
 					<Audio>AUDIO_ITEM_COMBATPISTOL</Audio>
-					<Slot>SLOT_WEAPON_KLOG19FDE</Slot>
+					<Slot>SLOT_weapon_klog19fde</Slot>
 					<DamageType>BULLET</DamageType>
 					<Explosion>
 						<Default>DONTCARE</Default>
@@ -245,13 +245,50 @@
 					<FirstPersonReticuleStyleHash/>
 					<PickupHash>PICKUP_WEAPON_COMBATPISTOL</PickupHash>
 					<MPPickupHash>PICKUP_AMMO_BULLET_MP</MPPickupHash>
-					<HumanNameHash>WEAPON_KLOG19FDE</HumanNameHash>
+					<HumanNameHash>weapon_klog19fde</HumanNameHash>
 					<MovementModeConditionalIdle>MMI_1Handed</MovementModeConditionalIdle>
 					<StatName>CMBTPISTOL</StatName>
 					<KnockdownCount value="3"/>
 					<KillshotImpulseScale value="1.000000"/>
 					<NmShotTuningSet>Normal</NmShotTuningSet>
-					<AttachPoints/>
+					<AttachPoints>
+						<Item>
+							<AttachBone>WAPScop</AttachBone>
+							<Components>
+								<Item>
+									<Default value="true"/>
+									<Name>COMPONENT_AT_SCOPE_MACRO</Name>
+								</Item>
+							</Components>
+						</Item>
+						<Item>
+							<AttachBone>WAPScop</AttachBone>
+							<Components>
+								<Item>
+									<Default value="true"/>
+									<Name>COMPONENT_AT_PI_RAIL</Name>
+								</Item>
+							</Components>
+						</Item>
+						<Item>
+							<AttachBone>WAPClip</AttachBone>
+							<Components>
+								<Item>
+									<Default value="true"/>
+									<Name>COMPONENT_PISTOL_MK2_CLIP_01</Name>
+								</Item>
+							</Components>
+						</Item>
+						<Item>
+							<AttachBone>WAPFlshLasr</AttachBone>
+							<Components>
+								<Item>
+									<Default value="true"/>
+									<Name>COMPONENT_AT_PI_FLSH_02</Name>
+								</Item>
+							</Components>
+						</Item>
+					</AttachPoints>
 					<GunFeedBone/>
 					<TargetSequenceGroup/>
 					<WeaponFlags>CarriedInHand Gun CanLockonOnFoot CanLockonInVehicle CanFreeAim AnimReload AnimCrouchFire UsableOnFoot UsableClimbing UsableInCover AllowCloseQuarterKills HasLowCoverReloads HasLowCoverSwaps QuitTransitionToIdleIntroOnWeaponChange DisableLeftHandIkWhenOnFoot TorsoIKForWeaponBlock UseFPSAimIK UseFPSSecondaryMotion</WeaponFlags>