diff --git a/FuturePlans.md b/FuturePlans.md
index 88d5e6267..ede32279f 100644
--- a/FuturePlans.md
+++ b/FuturePlans.md
@@ -16,9 +16,9 @@ This is just a bit of *"future planning"* for stuff that I ***might*** add after
   - [Doom] AA-12 *("Ibuki's favorite shotgun. It's just a collectible model, so it doesn't actually shoot")*
   - [Doom] Hege Cactus *(Appears to absorb all water, causing intense thirst)*
   - [Doom] Hoagie *(Can't eat it, but looks delicious)*
-  - [Eviternity] Manarock *("A delicacy for gods, but instantly deadly for mortals")*
+  - [Heretic] Manarock *("A delicacy for gods, but instantly deadly for mortals")*
   - [Heretic] Lithium - Volume One *(A work of art, one of the finest graphic novels)*
-  - [Heretic] Rubber Duck *("Is this some kind of convoluted joke from those two?")*
+  - [Hexen] Rubber Duck *("Is this some kind of convoluted joke from those two?")*
 * ***(Maybe)* Fake livestream chat overlay, with dynamic reactions to all sorts of stuff**
 * **Replace all hitscan with *"light projectiles"***
 * **Leaning and a lot of other stuff involving ViewAngles and ViewPos**
@@ -31,10 +31,8 @@ This is just a bit of *"future planning"* for stuff that I ***might*** add after
   - Airhorn (unlimited range A_AlertMonsters, to unbreak vanilla teleport closets)
   - Clap
   - The Finger
-  - A Magic Trick (yes, it's THAT one)
   - Thumbs Down
   - Horns
-  - Picture Perfect (takes a screenshot with hud disabled and a cute frame around it)
   - Giggle
 * **DLC Gameset:**
   - Tetris
@@ -54,6 +52,7 @@ This is just a bit of *"future planning"* for stuff that I ***might*** add after
   - Kirin
 * **Japanese localization???**
 * **Monster/decoration replacements add-on**
+* **Photo Mode**
 * **Hardcore Mode side mod**
   - Featuring Demolitionist on Maidbot frame
   - More complex game mechanics
diff --git a/language.version b/language.version
index bb67feb3c..49b4f4cad 100644
--- a/language.version
+++ b/language.version
@@ -1,3 +1,3 @@
 [default]
-SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r402 \cu(Wed 24 Mar 18:10:17 CET 2021)\c-";
-SWWM_SHORTVER="\cw0.9.11b-pre r402 \cu(2021-03-24 18:10:17)\c-";
+SWWM_MODVER="\chSWWM \czGZ\c- \cw0.9.11b-pre r404 \cu(Wed 24 Mar 19:00:07 CET 2021)\c-";
+SWWM_SHORTVER="\cw0.9.11b-pre r404 \cu(2021-03-24 19:00:07)\c-";
diff --git a/modeldef.collectibles b/modeldef.collectibles
new file mode 100644
index 000000000..b778cf26e
--- /dev/null
+++ b/modeldef.collectibles
@@ -0,0 +1,236 @@
+Model "GenericCube"
+{
+	Path "models"
+
+	Model 0 "extra/BaseCube_d.3d"
+	Skin 0 "PerfectlyGeneric.png"
+	Scale 0.04 0.04 0.04
+	ZOffset 16
+	PitchOffset 30
+	ROTATING
+
+	FrameIndex XZW1 A 0 0
+}
+Model "AkariProject"
+{
+	Path "models"
+
+	Model 0 "Book_d.3d"
+	Skin 0 "AkariProject.png"
+	Scale 0.02 0.02 0.02
+	ZOffset 16
+	PitchOffset 30
+	ROTATING
+
+	FrameIndex XZW1 A 0 0
+}
+Model "LoveSignalsCD"
+{
+	Path "models"
+
+	Model 0 "CD_d.3d"
+	Skin 0 "LoveSignals.png"
+	Scale 0.013 0.013 0.013
+	ZOffset 16
+	RollOffset 30
+	ROTATING
+
+	FrameIndex XZW1 A 0 0
+}
+Model "NutatcoBar"
+{
+	Path "models"
+
+	Model 0 "Nutatco_d.3d"
+	Skin 0 "Nutatco.png"
+	Scale 0.018 0.018 0.018
+	ZOffset 16
+	PitchOffset -60
+	RollOffset 90
+	ROTATING
+
+	FrameIndex XZW1 A 0 0
+}
+Model "FrispyCorn"
+{
+	Path "models"
+
+	Model 0 "FrispyCorn_d.3d"
+	Skin 0 "FrispyCorn.png"
+	Scale 0.025 0.025 0.025
+	ZOffset 16
+	RollOffset 30
+	ROTATING
+
+	FrameIndex XZW1 A 0 0
+}
+Model "SayaBean"
+{
+	Path "models"
+
+	Model 0 "SayaBean_d.3d"
+	Skin 0 "SayaBean.png"
+	Scale 0.025 0.025 0.025
+	ZOffset 16
+	RollOffset 30
+	ROTATING
+
+	FrameIndex XZW1 A 0 0
+}
+Model "MothPlushy"
+{
+	Path "models/extra"
+
+	Model 0 "BaseCube_d.3d"
+	Skin 0 "CHIPTILE"
+	Scale 0.04 0.04 0.04
+	ZOffset 16
+	PitchOffset 30
+	ROTATING
+
+	FrameIndex XZW1 A 0 0
+}
+Model "AA12Model"
+{
+	Path "models/extra"
+
+	Model 0 "BaseCube_d.3d"
+	Skin 0 "CHIPTILE"
+	Scale 0.04 0.04 0.04
+	ZOffset 16
+	PitchOffset 30
+	ROTATING
+
+	FrameIndex XZW1 A 0 0
+}
+Model "CactusHege"
+{
+	Path "models/extra"
+
+	Model 0 "BaseCube_d.3d"
+	Skin 0 "CHIPTILE"
+	Scale 0.04 0.04 0.04
+	ZOffset 16
+	PitchOffset 30
+	ROTATING
+
+	FrameIndex XZW1 A 0 0
+}
+Model "TastyHoagie"
+{
+	Path "models/extra"
+
+	Model 0 "BaseCube_d.3d"
+	Skin 0 "CHIPTILE"
+	Scale 0.04 0.04 0.04
+	ZOffset 16
+	PitchOffset 30
+	ROTATING
+
+	FrameIndex XZW1 A 0 0
+}
+Model "DemoPlush"
+{
+	Path "models"
+
+	Model 0 "DemoPlush_d.3d"
+	SurfaceSkin 0 0 "DemoPlush.png"
+	SurfaceSkin 0 1 "DemoPlush2.png"
+	Scale 0.075 0.075 0.075
+	ZOffset 20
+	RollOffset 30
+	ROTATING
+
+	FrameIndex XZW1 A 0 0
+}
+Model "Manarokou"
+{
+	Path "models/extra"
+
+	Model 0 "BaseCube_d.3d"
+	Skin 0 "CHIPTILE"
+	Scale 0.04 0.04 0.04
+	ZOffset 16
+	PitchOffset 30
+	ROTATING
+
+	FrameIndex XZW1 A 0 0
+}
+Model "LithiumNovel"
+{
+	Path "models/extra"
+
+	Model 0 "BaseCube_d.3d"
+	Skin 0 "CHIPTILE"
+	Scale 0.04 0.04 0.04
+	ZOffset 16
+	PitchOffset 30
+	ROTATING
+
+	FrameIndex XZW1 A 0 0
+}
+Model "KirinCummies"
+{
+	Path "models"
+
+	Model 0 "TootFroot_d.3d"
+	SurfaceSkin 0 0 "TootFroot.png"
+	SurfaceSkin 0 1 "matcap/silvermap.png"
+	Scale 0.015 0.015 0.015
+	ZOffset 16
+	PitchOffset 30
+	ROTATING
+
+	FrameIndex XZW1 A 0 0
+}
+Model "MilkBreads"
+{
+	Path "models"
+
+	Model 0 "MilkBreads_d.3d"
+	Skin 0 "MilkBreads.png"
+	Scale 0.016 0.016 0.016
+	ZOffset 16
+	ROTATING
+
+	FrameIndex XZW1 A 0 0
+}
+Model "KirinManga"
+{
+	Path "models"
+
+	Model 0 "Book_d.3d"
+	Skin 0 "KirinManga.png"
+	Scale 0.018 0.018 0.018
+	ZOffset 16
+	PitchOffset 30
+	ROTATING
+
+	FrameIndex XZW1 A 0 0
+}
+Model "KirinPlush"
+{
+	Path "models"
+
+	Model 0 "KirinPlush_d.3d"
+	Skin 0 "KirinPlush.png"
+	Scale 0.08 0.08 0.08
+	ZOffset 20
+	RollOffset 30
+	ROTATING
+
+	FrameIndex XZW1 A 0 0
+}
+Model "RubberDuck"
+{
+	Path "models/extra"
+
+	Model 0 "BaseCube_d.3d"
+	Skin 0 "CHIPTILE"
+	Scale 0.04 0.04 0.04
+	ZOffset 16
+	PitchOffset 30
+	ROTATING
+
+	FrameIndex XZW1 A 0 0
+}
diff --git a/modeldef.funstuff b/modeldef.funstuff
index ee2bfe61d..957a8e029 100644
--- a/modeldef.funstuff
+++ b/modeldef.funstuff
@@ -9,153 +9,6 @@ Model "FroggyChair"
 
 	FrameIndex XZW1 A 0 0
 }
-// collectibles
-Model "GenericCube"
-{
-	Path "models"
-
-	Model 0 "extra/BaseCube_d.3d"
-	Skin 0 "PerfectlyGeneric.png"
-	Scale 0.04 0.04 0.04
-	ZOffset 16
-	PitchOffset 30
-	ROTATING
-
-	FrameIndex XZW1 A 0 0
-}
-Model "AkariProject"
-{
-	Path "models"
-
-	Model 0 "Book_d.3d"
-	Skin 0 "AkariProject.png"
-	Scale 0.02 0.02 0.02
-	ZOffset 16
-	PitchOffset 30
-	ROTATING
-
-	FrameIndex XZW1 A 0 0
-}
-Model "LoveSignalsCD"
-{
-	Path "models"
-
-	Model 0 "CD_d.3d"
-	Skin 0 "LoveSignals.png"
-	Scale 0.013 0.013 0.013
-	ZOffset 16
-	RollOffset 30
-	ROTATING
-
-	FrameIndex XZW1 A 0 0
-}
-Model "NutatcoBar"
-{
-	Path "models"
-
-	Model 0 "Nutatco_d.3d"
-	Skin 0 "Nutatco.png"
-	Scale 0.018 0.018 0.018
-	ZOffset 16
-	PitchOffset -60
-	RollOffset 90
-	ROTATING
-
-	FrameIndex XZW1 A 0 0
-}
-Model "FrispyCorn"
-{
-	Path "models"
-
-	Model 0 "FrispyCorn_d.3d"
-	Skin 0 "FrispyCorn.png"
-	Scale 0.025 0.025 0.025
-	ZOffset 16
-	RollOffset 30
-	ROTATING
-
-	FrameIndex XZW1 A 0 0
-}
-Model "SayaBean"
-{
-	Path "models"
-
-	Model 0 "SayaBean_d.3d"
-	Skin 0 "SayaBean.png"
-	Scale 0.025 0.025 0.025
-	ZOffset 16
-	RollOffset 30
-	ROTATING
-
-	FrameIndex XZW1 A 0 0
-}
-Model "DemoPlush"
-{
-	Path "models"
-
-	Model 0 "DemoPlush_d.3d"
-	SurfaceSkin 0 0 "DemoPlush.png"
-	SurfaceSkin 0 1 "DemoPlush2.png"
-	Scale 0.075 0.075 0.075
-	ZOffset 20
-	RollOffset 30
-	ROTATING
-
-	FrameIndex XZW1 A 0 0
-}
-Model "KirinCummies"
-{
-	Path "models"
-
-	Model 0 "TootFroot_d.3d"
-	SurfaceSkin 0 0 "TootFroot.png"
-	SurfaceSkin 0 1 "matcap/silvermap.png"
-	Scale 0.015 0.015 0.015
-	ZOffset 16
-	PitchOffset 30
-	ROTATING
-
-	FrameIndex XZW1 A 0 0
-}
-Model "MilkBreads"
-{
-	Path "models"
-
-	Model 0 "MilkBreads_d.3d"
-	Skin 0 "MilkBreads.png"
-	Scale 0.016 0.016 0.016
-	ZOffset 16
-	ROTATING
-
-	FrameIndex XZW1 A 0 0
-}
-Model "KirinManga"
-{
-	Path "models"
-
-	Model 0 "Book_d.3d"
-	Skin 0 "KirinManga.png"
-	Scale 0.018 0.018 0.018
-	ZOffset 16
-	PitchOffset 30
-	ROTATING
-
-	FrameIndex XZW1 A 0 0
-}
-Model "KirinPlush"
-{
-	Path "models"
-
-	Model 0 "KirinPlush_d.3d"
-	Skin 0 "KirinPlush.png"
-	Scale 0.08 0.08 0.08
-	ZOffset 20
-	RollOffset 30
-	ROTATING
-
-	FrameIndex XZW1 A 0 0
-}
-// misc
 Model "Chancebox"
 {
 	Path "models"
diff --git a/zmapinfo.txt b/zmapinfo.txt
index 4e2ea86b0..af07f39e4 100644
--- a/zmapinfo.txt
+++ b/zmapinfo.txt
@@ -170,13 +170,20 @@ DoomEdNums
 	4206903 = NutatcoBar
 	4206904 = FrispyCorn
 	4206905 = SayaBean
+	4206906 = MothPlushy
+	4206907 = AA12Model
+	4206908 = CactusHege
+	4206909 = TastyHoagie
 	// Heretic
-	4206906 = DemoPlush
+	4206910 = DemoPlush
+	4206911 = Manarokou
+	4206912 = LithiumNovel
 	// Hexen
-	4206907 = KirinCummies
-	4206908 = MilkBreads
-	4206909 = KirinManga
-	4206910 = KirinPlush
+	4206913 = KirinCummies
+	4206914 = MilkBreads
+	4206915 = KirinManga
+	4206916 = KirinPlush
+	4206917 = RubberDuck
 }
 
 // edited Doom 2 cast to show the Demolitionist at the end
diff --git a/zscript/compat/swwm_compat.zsc b/zscript/compat/swwm_compat.zsc
index b4eb91785..c640db40f 100644
--- a/zscript/compat/swwm_compat.zsc
+++ b/zscript/compat/swwm_compat.zsc
@@ -20,7 +20,6 @@ Class SWWMLevelCompatibility : LevelPostProcessor
 
 	protected void Apply( Name checksum, String mapname )
 	{
-		int numcol = SWWMUtility.IsEviternity()?7:6;
 		int ncellsa = 0, ncellsb = 0;
 		int nbackpack = 0;
 		switch ( checksum )
@@ -198,15 +197,12 @@ Class SWWMLevelCompatibility : LevelPostProcessor
 				nbackpack++;
 			}
 			break;
-		// Kinsie's Test Map (HERETIC)
+		// Kinsie's Test Map
 		case '0EADB2F82732A968B8513E4DC6138439':
-			numcol = 7;
-		// Kinsie's Test Map (HEXEN)
 		case 'D70250F93C6B6072DA39D9672B37F236':
-			numcol = 11;
-		// Kinsie's Test Map (DOOM)
 		case '959A613006CC3AA912C4A22908B7566A':
-			for ( int i=0; i<numcol; i++ )
+			// add collectibles
+			for ( int i=0; i<18; i++ )
 				AddThing(4206900+i,(1472+64*i,640,0));
 			break;
 		}
diff --git a/zscript/items/swwm_collectibles.zsc b/zscript/items/swwm_collectibles.zsc
index 89e072b15..bc23ab67d 100644
--- a/zscript/items/swwm_collectibles.zsc
+++ b/zscript/items/swwm_collectibles.zsc
@@ -14,10 +14,10 @@ Class SWWMCollectible : Inventory abstract
 	// minimum gametype requirements
 	enum EAvailability
 	{
-		AVAIL_Hexen,
+		AVAIL_None,
+		AVAIL_All,
 		AVAIL_Heretic,
-		AVAIL_Eviternity,
-		AVAIL_All
+		AVAIL_Hexen
 	};
 
 	Default
@@ -39,8 +39,8 @@ Class SWWMCollectible : Inventory abstract
 	}
 	bool ValidGame() const
 	{
+		if ( avail == AVAIL_None ) return false;
 		if ( avail == AVAIL_All ) return true;
-		if ( (avail == AVAIL_Eviternity) && ((gameinfo.gametype&GAME_Raven) || SWWMUtility.IsEviternity()) ) return true;
 		if ( (avail == AVAIL_Heretic) && (gameinfo.gametype&GAME_Raven) ) return true;
 		if ( (avail == AVAIL_Hexen) && (gameinfo.gametype&GAME_Hexen) ) return true;
 		return false;
@@ -198,20 +198,86 @@ Class SayaBean : SWWMCollectible
 		Height 23;
 	}
 }
-// Eviternity / Heretic
+Class MothPlushy : SWWMCollectible
+{
+	Default
+	{
+		Tag "$T_MOTHPLUSH";
+		Inventory.PickupMessage "$T_MOTHPLUSH";
+		SWWMCollectible.Availability AVAIL_None;
+		SWWMCollectible.GestureWeapon "MothPlushyGesture";
+		Stamina 7000;
+	}
+}
+Class AA12Model : SWWMCollectible
+{
+	Default
+	{
+		Tag "$T_AA12";
+		Inventory.PickupMessage "$T_AA12";
+		SWWMCollectible.Availability AVAIL_None;
+		SWWMCollectible.GestureWeapon "AA12ModelGesture";
+		Stamina 10000;
+	}
+}
+Class CactusHege : SWWMCollectible
+{
+	Default
+	{
+		Tag "$T_HEGE";
+		Inventory.PickupMessage "$T_HEGE";
+		SWWMCollectible.Availability AVAIL_None;
+		SWWMCollectible.GestureWeapon "CactusHegeGesture";
+		Stamina 3000;
+	}
+}
+Class TastyHoagie : SWWMCollectible
+{
+	Default
+	{
+		Tag "$T_HOAGIE";
+		Inventory.PickupMessage "$T_HOAGIE";
+		SWWMCollectible.Availability AVAIL_None;
+		SWWMCollectible.GestureWeapon "TastyHoagieGesture";
+		Stamina 2000;
+	}
+}
+// Heretic
 Class DemoPlush : SWWMCollectible
 {
 	Default
 	{
 		Tag "$T_DEMOPLUSH";
 		Inventory.PickupMessage "$T_DEMOPLUSH";
-		SWWMCollectible.Availability AVAIL_Eviternity;
+		SWWMCollectible.Availability AVAIL_Heretic;
 		SWWMCollectible.GestureWeapon "DemoPlushGesture";
 		Stamina 6000;
 		Radius 12;
 		Height 36;
 	}
 }
+Class Manarokou : SWWMCollectible
+{
+	Default
+	{
+		Tag "$T_MANAROKOU";
+		Inventory.PickupMessage "$T_MANAROKOU";
+		SWWMCollectible.Availability AVAIL_None;
+		SWWMCollectible.GestureWeapon "ManarokouGesture";
+		Stamina 9000;
+	}
+}
+Class LithiumNovel : SWWMCollectible
+{
+	Default
+	{
+		Tag "$T_LITHIUM";
+		Inventory.PickupMessage "$T_LITHIUM";
+		SWWMCollectible.Availability AVAIL_None;
+		SWWMCollectible.GestureWeapon "LithiumNovelGesture";
+		Stamina 2000;
+	}
+}
 // Hexen
 Class KirinCummies : SWWMCollectible
 {
@@ -265,3 +331,14 @@ Class KirinPlush : SWWMCollectible
 		Height 37;
 	}
 }
+Class RubberDuck : SWWMCollectible
+{
+	Default
+	{
+		Tag "$T_DUCKIE";
+		Inventory.PickupMessage "$T_DUCKIE";
+		SWWMCollectible.Availability AVAIL_None;
+		SWWMCollectible.GestureWeapon "RubberDuckGesture";
+		Stamina 700;
+	}
+}
diff --git a/zscript/items/swwm_collectibles_gesture.zsc b/zscript/items/swwm_collectibles_gesture.zsc
index 5fc81d0d6..9f4464c95 100644
--- a/zscript/items/swwm_collectibles_gesture.zsc
+++ b/zscript/items/swwm_collectibles_gesture.zsc
@@ -127,8 +127,15 @@ Class SayaBeanGesture : SWWMItemGesture
 		Stop;
 	}
 }
+Class MothPlushyGesture : SWWMItemGesture {}
+Class AA12ModelGesture : SWWMItemGesture {}
+Class CactusHegeGesture : SWWMItemGesture {}
+Class TastyHoagieGesture : SWWMItemGesture {}
 Class DemoPlushGesture : SWWMItemGesture {}
+Class ManarokouGesture : SWWMItemGesture {}
+Class LithiumNovelGesture : SWWMItemGesture {}
 Class KirinCummiesGesture : SWWMItemGesture {}
 Class MilkBreadsGesture : SWWMItemGesture {}
 Class KirinMangaGesture : SWWMItemGesture {}
 Class KirinPlushGesture : SWWMItemGesture {}
+Class RubberDuckGesture : SWWMItemGesture {}
diff --git a/zscript/kbase/swwm_kbase.zsc b/zscript/kbase/swwm_kbase.zsc
index 359795ece..58220bb43 100644
--- a/zscript/kbase/swwm_kbase.zsc
+++ b/zscript/kbase/swwm_kbase.zsc
@@ -510,9 +510,9 @@ Class DemolitionistMenu : GenericMenu
 			if ( tabs[curtab] == TAB_HELP )
 			{
 				String kstr;
-				if ( mkey[1] != "" ) kstr = mkey[0].."/"..mkey[1];
-				else kstr = mkey[0];
-				str = String.Format(StringTable.Localize("$SWWM_HELPTXT"),kstr);
+				if ( self.mkey[1] != "" ) kstr = self.mkey[0].."/"..self.mkey[1];
+				else kstr = self.mkey[0];
+				String str = String.Format(StringTable.Localize("$SWWM_HELPTXT"),kstr);
 				BrokenLines l = fnt.BreakLines(str,629);
 				if ( l.Count() > 28 ) l = fnt.BreakLines(str,620);
 				if ( (l.Count() > 28) && (sel0 < l.Count()-28) )
@@ -2154,7 +2154,7 @@ Class DemolitionistMenu : GenericMenu
 		double afactor = adone?1.:0., bfactor = bdone?1.:0.;
 		if ( a.progress )
 		{
-			int cur = clamp(a.progress.GetInt(),0,a.maval);
+			int cur = clamp(a.progress.GetInt(),0,a.maxval);
 			afactor = cur/double(a.maxval);
 		}
 		if ( b.progress )