diff --git a/index/index.xml b/index/index.xml
index 98fd9c38a..00db9f32d 100644
--- a/index/index.xml
+++ b/index/index.xml
@@ -1,36 +1,42 @@
 <index>
 
-	<index name="Radio streams">
-		<pkg path="@DEPOT_USER@/pkg/ifm1/@DEPOT_VERSION@" info="CYBERNETIC BROADCASTING SYSTEM (underrun)"/>
-		<pkg path="@DEPOT_USER@/pkg/ifm2/@DEPOT_VERSION@" info="DISCO FETISH (underrun)"/>
-		<pkg path="@DEPOT_USER@/pkg/ifm3/@DEPOT_VERSION@" info="DREAM MACHINE (underrun)"/>
-	</index>
-
 	<index name="Emulators">
 		<pkg path="@DEPOT_USER@/pkg/fceumm/@DEPOT_VERSION@" info="NES"/>
 		<pkg path="@DEPOT_USER@/pkg/mgba/@DEPOT_VERSION@" info="GBA"/>
 		<pkg path="@DEPOT_USER@/pkg/snes9x/@DEPOT_VERSION@" info="SNES"/>
-		<index name="Experimental">
-			<pkg path="@DEPOT_USER@/pkg/4do/@DEPOT_VERSION@" info="3DO"/>
-			<pkg path="@DEPOT_USER@/pkg/dosbox/@DEPOT_VERSION@" info="DOS"/>
-			<pkg path="@DEPOT_USER@/pkg/oberon/@DEPOT_VERSION@" info="Oberon RISC (requires three-button mouse)"/>
-		</index>
 	</index>
 
 	<index name="Games">
 		<pkg path="@DEPOT_USER@/pkg/2048/@DEPOT_VERSION@" info="Threes! clone"/>
+		<pkg path="@UPSTREAM_USER@/pkg/numptyphysics/@UPSTREAM_VERSION@"/>
+		<pkg path="@UPSTREAM_USER@/pkg/tyrian/@UPSTREAM_VERSION@"/>
 		<pkg path="@DEPOT_USER@/pkg/tyrquake/@DEPOT_VERSION@" info="Tyrquake"/>
 	</index>
 
-	<index name="Utilities">
-		<pkg path="@DEPOT_USER@/pkg/button_test/@DEPOT_VERSION@" info="Libretro joypad button test"/>
-		<pkg path="@DEPOT_USER@/pkg/flif_capture/@DEPOT_VERSION@" info="Screen capture utility"/>
-		<index name="Experimental">
-			<pkg path="@DEPOT_USER@/pkg/monero_vanity/@DEPOT_VERSION@" info="Monero vanity address generator"/>
+	<index name="Operating system demos">
+		<pkg path="@DEPOT_USER@/pkg/oberon/@DEPOT_VERSION@" info="Oberon RISC emulator (requires three-button mouse)"/>
+	</index>
 
-			<pkg path="@DEPOT_USER@/pkg/ninep/@DEPOT_VERSION@" info="9P server"/>
-			<pkg path="@DEPOT_USER@/pkg/musicbrainz_playlist_generator/@DEPOT_VERSION@" info="MusicBrainz playlist generator"/>
-		</index>
+	<index name="Utilities">
+		<pkg path="@UPSTREAM_USER@/pkg/grafx2/@UPSTREAM_VERSION@"/>
+		<pkg path="@DEPOT_USER@/pkg/button_test/@DEPOT_VERSION@" info="Libretro joypad button test"/>
+	</index>
+
+	<index name="Experimental">
+		<pkg path="@DEPOT_USER@/pkg/4do/@DEPOT_VERSION@/"/>
+		<pkg path="@DEPOT_USER@/pkg/depot-local/@DEPOT_VERSION@/"/>
+		<pkg path="@DEPOT_USER@/pkg/dosbox/@DEPOT_VERSION@/"/>
+		<pkg path="@DEPOT_USER@/pkg/fceumm/@DEPOT_VERSION@/"/>
+		<pkg path="@DEPOT_USER@/pkg/flif_capture/@DEPOT_VERSION@/"/>
+		<pkg path="@DEPOT_USER@/pkg/flif_view/@DEPOT_VERSION@/"/>
+		<pkg path="@DEPOT_USER@/pkg/ifm1/@DEPOT_VERSION@/"/>
+		<pkg path="@DEPOT_USER@/pkg/ifm2/@DEPOT_VERSION@/"/>
+		<pkg path="@DEPOT_USER@/pkg/ifm3/@DEPOT_VERSION@/"/>
+		<pkg path="@DEPOT_USER@/pkg/mgba/@DEPOT_VERSION@/"/>
+		<pkg path="@DEPOT_USER@/pkg/monero_vanity/@DEPOT_VERSION@/"/>
+		<pkg path="@DEPOT_USER@/pkg/musicbrainz_playlist_generator/@DEPOT_VERSION@/"/>
+		<pkg path="@DEPOT_USER@/pkg/ninep/@DEPOT_VERSION@/"/>
+		<pkg path="@DEPOT_USER@/pkg/nxengine/@DEPOT_VERSION@/"/>
 	</index>
 
 </index>