diff --git a/baystation12.dme b/baystation12.dme
index f38365a4684..0fc4bbd8136 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -845,10 +845,10 @@
 #include "code\modules\customitems\item_spawning.dm"
 #include "code\modules\customitems\definitions\base.dm"
 #include "code\modules\destilery\main.dm"
-#include "code\modules\DetectiveWork\detective_work.dm"
-#include "code\modules\DetectiveWork\evidence.dm"
-#include "code\modules\DetectiveWork\footprints_and_rag.dm"
-#include "code\modules\DetectiveWork\scanner.dm"
+#include "code\modules\detectivework\detective_work.dm"
+#include "code\modules\detectivework\evidence.dm"
+#include "code\modules\detectivework\footprints_and_rag.dm"
+#include "code\modules\detectivework\scanner.dm"
 #include "code\modules\economy\Accounts.dm"
 #include "code\modules\economy\Accounts_DB.dm"
 #include "code\modules\economy\ATM.dm"
diff --git a/code/WorkInProgress/ZomgPonies/mobs/pony.dm b/code/WorkInProgress/ZomgPonies/mobs/pony.dm
index c57f841a63f..219eca248ed 100644
--- a/code/WorkInProgress/ZomgPonies/mobs/pony.dm
+++ b/code/WorkInProgress/ZomgPonies/mobs/pony.dm
@@ -87,3 +87,21 @@ mob/living/simple_animal/pony/applejack
 	icon_state = "applejack"
 	icon_living = "applejack"
 
+mob/living/simple_animal/pony/luna
+	name = "Luna"
+	real_name = name
+	icon_state = "luna"
+	icon_living = "luna"
+
+mob/living/simple_animal/pony/clownie
+	name = "Clownie"
+	real_name = name
+	icon_state = "clownie"
+	icon_living = "clownie"
+
+mob/living/simple_animal/pony/tia
+	name = "Tia"
+	real_name = name
+	icon_state = "tia"
+	icon_living = "tia"
+
diff --git a/icons/misc/fullscreen.dmi b/icons/misc/fullscreen.dmi
index 0850c49f62b..cbe6bb19f90 100644
Binary files a/icons/misc/fullscreen.dmi and b/icons/misc/fullscreen.dmi differ
diff --git a/icons/misc/fullscreen_old.dmi b/icons/misc/fullscreen_old.dmi
new file mode 100644
index 00000000000..0850c49f62b
Binary files /dev/null and b/icons/misc/fullscreen_old.dmi differ
diff --git a/icons/mob/pony.dmi b/icons/mob/pony.dmi
index e9a7829116a..392baaac8b1 100644
Binary files a/icons/mob/pony.dmi and b/icons/mob/pony.dmi differ