diff --git a/CREDITS b/CREDITS
index 5e1d7c54..14b01ce5 100644
--- a/CREDITS
+++ b/CREDITS
@@ -667,3 +667,7 @@ D: levels
 F: mithran_denizen
 S: Mithran Denizen
 D: sprites
+
+F: z86
+S: Z86
+D: sprites
diff --git a/buildcfg.txt b/buildcfg.txt
index 55c2a0b2..91610b3a 100644
--- a/buildcfg.txt
+++ b/buildcfg.txt
@@ -2107,9 +2107,9 @@ IFOGB0 25 44
 IFOGC0 25 44
 IFOGD0 25 44
 IFOGE0 25 44
-LAUNA0 31	18
+LAUNA0	31	16
 MEDIA0	13	19
-MGUNA0	25	25
+MGUNA0	30	24
 MISGA0	-58	-111
 MISGB0	-58	-115
 MISFA0	-59	-110
@@ -2208,7 +2208,7 @@ SAWGB0	-176	-59
 SAWGC0	-156	-81
 SAWGD0	-159	-81
 SBOXA0	8	13
-SHELA0	7	9
+SHELA0	7	10
 SHOTA0	28	12
 SHTGB0	-155	-74
 SHTGC0	-151	-34
@@ -2268,7 +2268,7 @@ SHT2G0	-126	-119
 SHT2H0	-100	-115
 SHT2I0	-122	-103
 SHT2J0	-122	-89
-SGN2A0  20      9
+SGN2A0	21	14
 TLMPA0	11	77
 TLMPB0	11	77
 TLMPC0	11	77
@@ -2296,7 +2296,7 @@ BAL2D0	25	21
 BAL2E0	26	23
 BFS1A0	28	33
 BFS1B0	29	33
-BFUGA0	41	11
+BFUGA0	34	20
 BFGGA0  -63     -69
 BFGGB0  -63     -69
 BFGFA0  -63     -69
@@ -2342,7 +2342,7 @@ PINVA0	11	23
 PINVB0	11	23
 PINVC0	11	23
 PINVD0	11	23
-PLASA0	27	19
+PLASA0	29	16
 PLSEA0	11	11
 PLSEB0	15	14
 PLSEC0	16	17
diff --git a/sprites/bfuga0.gif b/sprites/bfuga0.gif
index d3875783..30cfc6fa 120000
--- a/sprites/bfuga0.gif
+++ b/sprites/bfuga0.gif
@@ -1 +1 @@
-railgunner/bfuga0.gif
\ No newline at end of file
+z86/bfuga0.gif
\ No newline at end of file
diff --git a/sprites/fraggle/mguna0.gif b/sprites/fraggle/mguna0.gif
deleted file mode 100644
index ad34d7ca..00000000
Binary files a/sprites/fraggle/mguna0.gif and /dev/null differ
diff --git a/sprites/launa0.gif b/sprites/launa0.gif
index 05ef78d5..0e4126f6 120000
--- a/sprites/launa0.gif
+++ b/sprites/launa0.gif
@@ -1 +1 @@
-fredrik/launa0.gif
\ No newline at end of file
+z86/launa0.gif
\ No newline at end of file
diff --git a/sprites/mguna0.gif b/sprites/mguna0.gif
index b23728e8..690c40d7 120000
--- a/sprites/mguna0.gif
+++ b/sprites/mguna0.gif
@@ -1 +1 @@
-fraggle/mguna0.gif
\ No newline at end of file
+z86/mguna0.gif
\ No newline at end of file
diff --git a/sprites/plasa0.gif b/sprites/plasa0.gif
index 157a41c0..15084707 120000
--- a/sprites/plasa0.gif
+++ b/sprites/plasa0.gif
@@ -1 +1 @@
-mithran_denizen/plasa0.gif
\ No newline at end of file
+z86/plasa0.gif
\ No newline at end of file
diff --git a/sprites/railgunner/bfuga0.gif b/sprites/railgunner/bfuga0.gif
deleted file mode 100644
index 3bc2578a..00000000
Binary files a/sprites/railgunner/bfuga0.gif and /dev/null differ
diff --git a/sprites/sgn2a0.gif b/sprites/sgn2a0.gif
index d4ef1d1d..d7091c2b 120000
--- a/sprites/sgn2a0.gif
+++ b/sprites/sgn2a0.gif
@@ -1 +1 @@
-scubasteve/sgn2a0.gif
\ No newline at end of file
+z86/sgn2a0.gif
\ No newline at end of file
diff --git a/sprites/z86/bfuga0.gif b/sprites/z86/bfuga0.gif
new file mode 100644
index 00000000..b92305b5
Binary files /dev/null and b/sprites/z86/bfuga0.gif differ
diff --git a/sprites/fredrik/launa0.gif b/sprites/z86/launa0.gif
similarity index 60%
rename from sprites/fredrik/launa0.gif
rename to sprites/z86/launa0.gif
index 75b90a8d..7a3d8a07 100644
Binary files a/sprites/fredrik/launa0.gif and b/sprites/z86/launa0.gif differ
diff --git a/sprites/z86/mguna0.gif b/sprites/z86/mguna0.gif
new file mode 100644
index 00000000..01c7b26a
Binary files /dev/null and b/sprites/z86/mguna0.gif differ
diff --git a/sprites/mithran_denizen/plasa0.gif b/sprites/z86/plasa0.gif
similarity index 55%
rename from sprites/mithran_denizen/plasa0.gif
rename to sprites/z86/plasa0.gif
index f3c5e992..a7b392ce 100644
Binary files a/sprites/mithran_denizen/plasa0.gif and b/sprites/z86/plasa0.gif differ
diff --git a/sprites/scubasteve/sgn2a0.gif b/sprites/z86/sgn2a0.gif
similarity index 58%
rename from sprites/scubasteve/sgn2a0.gif
rename to sprites/z86/sgn2a0.gif
index c7476814..7beae12f 100644
Binary files a/sprites/scubasteve/sgn2a0.gif and b/sprites/z86/sgn2a0.gif differ