diff --git a/build_list.json b/build_list.json
index e5deb882..6c472f29 100644
--- a/build_list.json
+++ b/build_list.json
@@ -16,17 +16,17 @@
     "paks": [
         "sdk_depot/common_sdk.json",
         "map_depot/mp_lobby.json",
-        "map_depot/mp_rr_canyonlands_mu2_mv.json",
-        "map_depot/mp_rr_canyonlands_mu2_ufo.json",
-        "map_depot/mp_rr_canyonlands_mu2_tt.json",
-        "map_depot/mp_rr_canyonlands_mu2.json",
         "map_depot/mp_rr_desertlands_64k_x_64k_tt.json",
         "map_depot/mp_rr_desertlands_64k_x_64k_nx.json",
         "map_depot/mp_rr_desertlands_holiday.json",
         "map_depot/mp_rr_desertlands_mu1.json",
         "map_depot/mp_rr_desertlands_mu1_tt.json",
-        "map_depot/mp_rr_desertlands_mu2.json",
-        "map_depot/mp_rr_olympus.json",
-        "map_depot/mp_rr_olympus_tt.json"
+        /*"map_depot/mp_rr_canyonlands_mu2_mv.json",
+        "map_depot/mp_rr_canyonlands_mu2_ufo.json",
+        "map_depot/mp_rr_canyonlands_mu2_tt.json",
+        "map_depot/mp_rr_canyonlands_mu2.json",
+        "map_depot/mp_rr_desertlands_mu2.json",*/
+        "map_depot/mp_rr_olympus.json"/*,
+        "map_depot/mp_rr_olympus_tt.json"*/
     ]
 }
\ No newline at end of file
diff --git a/sdk_depot/assets_sdk/material/particle/Energy/energy_burn_loop_blend_noz_nodof_ptcu.json b/sdk_depot/assets_sdk/material/particle/Energy/energy_burn_loop_blend_noz_nodof_ptcu.json
new file mode 100644
index 00000000..0e7dff81
--- /dev/null
+++ b/sdk_depot/assets_sdk/material/particle/Energy/energy_burn_loop_blend_noz_nodof_ptcu.json
@@ -0,0 +1,37 @@
+{
+	"name": "particle/Energy/energy_burn_loop_blend_noz_nodof",
+	"width": 512,
+	"height": 512,
+	"depth": 0,
+	"glueFlags": "0x8082",
+	"glueFlags2": "0x0",
+	"blendStates": [
+		"0xF0138286",
+		"0xF0138286",
+		"0xF0008286",
+		"0xF0000000",
+		"0xF0138286",
+		"0x0",
+		"0x80500002",
+		"0x0"
+	],
+	"blendStateMask": "0x7",
+	"depthStencilFlags": "0x0",
+	"rasterizerFlags": "0x2",
+	"uberBufferFlags": "0x4",
+	"features": "0x75C8DF6F",
+	"samplers": "0x1D02",
+	"surfaceProp": "default",
+	"surfaceProp2": "",
+	"shaderType": "ptcu",
+	"shaderSet": "0x817504D4CA9EFBBB",
+	"$textures": {
+		"0": "0xB85850245AABB932"
+	},
+	"$depthShadowMaterial": "0x0",
+	"$depthPrepassMaterial": "0x0",
+	"$depthVSMMaterial": "0x0",
+	"$depthShadowTightMaterial": "0x0",
+	"$colpassMaterial": "0x0",
+	"$textureAnimation": "0x9C62AF61F7F38494"
+}
diff --git a/sdk_depot/assets_sdk/material/particle/Energy/energy_burn_loop_blend_noz_nodof_ptcu.uber b/sdk_depot/assets_sdk/material/particle/Energy/energy_burn_loop_blend_noz_nodof_ptcu.uber
new file mode 100644
index 00000000..7e00e9e0
Binary files /dev/null and b/sdk_depot/assets_sdk/material/particle/Energy/energy_burn_loop_blend_noz_nodof_ptcu.uber differ
diff --git a/sdk_depot/assets_sdk/material/particle/graphic/vignette_blend_noz_nodoftsaa_ptcu.json b/sdk_depot/assets_sdk/material/particle/graphic/vignette_blend_noz_nodoftsaa_ptcu.json
new file mode 100644
index 00000000..6f9e4ef9
--- /dev/null
+++ b/sdk_depot/assets_sdk/material/particle/graphic/vignette_blend_noz_nodoftsaa_ptcu.json
@@ -0,0 +1,37 @@
+{
+	"name": "particle/graphic/vignette_blend_noz_nodoftsaa",
+	"width": 720,
+	"height": 720,
+	"depth": 0,
+	"glueFlags": "0x8082",
+	"glueFlags2": "0x0",
+	"blendStates": [
+		"0xF0138286",
+		"0xF0138286",
+		"0xF0008286",
+		"0xF0000000",
+		"0xF0138286",
+		"0x0",
+		"0x80500002",
+		"0x0"
+	],
+	"blendStateMask": "0x7",
+	"depthStencilFlags": "0x0",
+	"rasterizerFlags": "0x2",
+	"uberBufferFlags": "0x4",
+	"features": "0x75C8DF6F",
+	"samplers": "0x1D02",
+	"surfaceProp": "default",
+	"surfaceProp2": "",
+	"shaderType": "ptcu",
+	"shaderSet": "0x1D6C3F1118FA6881",
+	"$textures": {
+		"0": "0x4E0B8AE47BFC2F3B"
+	},
+	"$depthShadowMaterial": "0x0",
+	"$depthPrepassMaterial": "0x0",
+	"$depthVSMMaterial": "0x0",
+	"$depthShadowTightMaterial": "0x0",
+	"$colpassMaterial": "0x0",
+	"$textureAnimation": "0x0"
+}
diff --git a/sdk_depot/assets_sdk/material/particle/graphic/vignette_blend_noz_nodoftsaa_ptcu.uber b/sdk_depot/assets_sdk/material/particle/graphic/vignette_blend_noz_nodoftsaa_ptcu.uber
new file mode 100644
index 00000000..8fa65ca3
Binary files /dev/null and b/sdk_depot/assets_sdk/material/particle/graphic/vignette_blend_noz_nodoftsaa_ptcu.uber differ
diff --git a/sdk_depot/assets_sdk/shader/0x11EC1D77D05055E0.msw b/sdk_depot/assets_sdk/shader/0x11EC1D77D05055E0.msw
new file mode 100644
index 00000000..39be9e17
Binary files /dev/null and b/sdk_depot/assets_sdk/shader/0x11EC1D77D05055E0.msw differ
diff --git a/sdk_depot/assets_sdk/shader/0xF5F6F60C3FA4E29E.msw b/sdk_depot/assets_sdk/shader/0xF5F6F60C3FA4E29E.msw
new file mode 100644
index 00000000..37e8b789
Binary files /dev/null and b/sdk_depot/assets_sdk/shader/0xF5F6F60C3FA4E29E.msw differ
diff --git a/sdk_depot/assets_sdk/shaderset/0x1D6C3F1118FA6881.msw b/sdk_depot/assets_sdk/shaderset/0x1D6C3F1118FA6881.msw
new file mode 100644
index 00000000..53ace99b
Binary files /dev/null and b/sdk_depot/assets_sdk/shaderset/0x1D6C3F1118FA6881.msw differ
diff --git a/sdk_depot/assets_sdk/shaderset/0x817504D4CA9EFBBB.msw b/sdk_depot/assets_sdk/shaderset/0x817504D4CA9EFBBB.msw
new file mode 100644
index 00000000..72e116a9
Binary files /dev/null and b/sdk_depot/assets_sdk/shaderset/0x817504D4CA9EFBBB.msw differ
diff --git a/sdk_depot/assets_sdk/texture/ui_atlas/rui/menu/maps/maps.dds b/sdk_depot/assets_sdk/texture/ui_atlas/rui/menu/maps/maps.dds
index 510886de..6c7bcc3a 100644
Binary files a/sdk_depot/assets_sdk/texture/ui_atlas/rui/menu/maps/maps.dds and b/sdk_depot/assets_sdk/texture/ui_atlas/rui/menu/maps/maps.dds differ
diff --git a/sdk_depot/assets_sdk/texture/ui_atlas/rui/menu/maps/mp_rr_olympus_mu1_widescreen.png b/sdk_depot/assets_sdk/texture/ui_atlas/rui/menu/maps/mp_rr_olympus_mu1_widescreen.png
deleted file mode 100644
index 17553f63..00000000
Binary files a/sdk_depot/assets_sdk/texture/ui_atlas/rui/menu/maps/mp_rr_olympus_mu1_widescreen.png and /dev/null differ
diff --git a/sdk_depot/assets_sdk/texture/ui_atlas/rui/menu/maps/mp_rr_olympus_widescreen.png b/sdk_depot/assets_sdk/texture/ui_atlas/rui/menu/maps/mp_rr_olympus_widescreen.png
new file mode 100644
index 00000000..ad1b16e5
Binary files /dev/null and b/sdk_depot/assets_sdk/texture/ui_atlas/rui/menu/maps/mp_rr_olympus_widescreen.png differ
diff --git a/sdk_depot/common_sdk.json b/sdk_depot/common_sdk.json
index 2cb993a8..46e6b131 100644
--- a/sdk_depot/common_sdk.json
+++ b/sdk_depot/common_sdk.json
@@ -299,6 +299,26 @@
       "_path": "shader/0xFB10BE177AAC4ADF.rpak",
       "$guid": "0xFB10BE177AAC4ADF"
     },
+    {
+      "_type": "shdr",
+      "_path": "shader/0x11EC1D77D05055E0.rpak",
+      "$guid": "0x11EC1D77D05055E0"
+    },
+    {
+      "_type": "shdr",
+      "_path": "shader/0xF5F6F60C3FA4E29E.rpak",
+      "$guid": "0xF5F6F60C3FA4E29E"
+    },
+    {
+      "_type": "shds",
+      "_path": "shaderset/0x1D6C3F1118FA6881.rpak",
+      "$guid": "0x1D6C3F1118FA6881"
+    },
+    {
+      "_type": "shds",
+      "_path": "shaderset/0x817504D4CA9EFBBB.rpak",
+      "$guid": "0x817504D4CA9EFBBB"
+    },
     {
       "_type": "shds",
       "_path": "shaderset/0x154EEC81714924CF.rpak",
@@ -3539,6 +3559,14 @@
       "_path": "texture/0xFF29111E80A6836E.rpak",
       "$guid": "0xFF29111E80A6836E"
     },
+    {
+      "_type": "matl",
+      "_path": "material/particle/Energy/energy_burn_loop_blend_noz_nodof_ptcu.rpak"
+    },
+    {
+      "_type": "matl",
+      "_path": "material/particle/graphic/vignette_blend_noz_nodoftsaa_ptcu.rpak"
+    },
     {
       "_type": "matl",
       "_path": "material/depth/models/humans_r5/pilots_r5/pilot_revenant/skins/bloody_valentine/revenant_body_bloody_valentine_shadow_sknp.rpak"
@@ -12148,10 +12176,10 @@
       "_type": "mdl_",
       "_path": "mdl/Weapons/empty_hands/ptpov_empty_hands.rmdl"
     },
-    /*{
+    {
       "_type": "mdl_",
-      "_path": "mdl/hud/grenade_indicator/grenade_indicator_shuriken.rmdl" //Replace the model when season 6 rmdls fixed
-    },*/
+      "_path": "mdl/hud/grenade_indicator/grenade_indicator_shuriken.rmdl"
+    },
     {
       "_type": "mdl_",
       "_path": "mdl/weapons/ported/ptpov_lmg_flamethrower.rmdl",
diff --git a/sdk_depot/ui_sdk.json b/sdk_depot/ui_sdk.json
index 4e59d7ba..9c9edef8 100644
--- a/sdk_depot/ui_sdk.json
+++ b/sdk_depot/ui_sdk.json
@@ -653,7 +653,7 @@
           "height": 1080
         },
         {
-          "path": "rui/menu/maps/mp_rr_olympus_mu1",
+          "path": "rui/menu/maps/mp_rr_olympus",
           "posX": 5760,
           "posY": 5400,
           "width": 1920,