diff --git a/res/ACTION.HGR.UNCOMPRESSED/CRYSTAL.CASTLE2 b/res/ACTION.HGR.UNCOMPRESSED/CRYSTAL.CASTLE2
new file mode 100644
index 000000000..c8174dfdf
Binary files /dev/null and b/res/ACTION.HGR.UNCOMPRESSED/CRYSTAL.CASTLE2 differ
diff --git a/res/ACTION.HGR.UNCOMPRESSED/CRYSTAL.CASTLE3 b/res/ACTION.HGR.UNCOMPRESSED/CRYSTAL.CASTLE3
new file mode 100644
index 000000000..e19274173
Binary files /dev/null and b/res/ACTION.HGR.UNCOMPRESSED/CRYSTAL.CASTLE3 differ
diff --git a/res/ACTION.HGR.UNCOMPRESSED/CRYSTAL.CASTLE4 b/res/ACTION.HGR.UNCOMPRESSED/CRYSTAL.CASTLE4
new file mode 100644
index 000000000..53424d6c7
Binary files /dev/null and b/res/ACTION.HGR.UNCOMPRESSED/CRYSTAL.CASTLE4 differ
diff --git a/res/ACTION.HGR.UNCOMPRESSED/CRYSTAL.CASTLES b/res/ACTION.HGR.UNCOMPRESSED/CRYSTAL.CASTLES
new file mode 100644
index 000000000..c2b13729e
Binary files /dev/null and b/res/ACTION.HGR.UNCOMPRESSED/CRYSTAL.CASTLES differ
diff --git a/res/ACTION.HGR/CRYSTAL.CASTLE2 b/res/ACTION.HGR/CRYSTAL.CASTLE2
new file mode 100644
index 000000000..3e9631e43
Binary files /dev/null and b/res/ACTION.HGR/CRYSTAL.CASTLE2 differ
diff --git a/res/ACTION.HGR/CRYSTAL.CASTLE3 b/res/ACTION.HGR/CRYSTAL.CASTLE3
new file mode 100644
index 000000000..1ab85c4d3
Binary files /dev/null and b/res/ACTION.HGR/CRYSTAL.CASTLE3 differ
diff --git a/res/ACTION.HGR/CRYSTAL.CASTLE4 b/res/ACTION.HGR/CRYSTAL.CASTLE4
new file mode 100644
index 000000000..0f93cfacf
Binary files /dev/null and b/res/ACTION.HGR/CRYSTAL.CASTLE4 differ
diff --git a/res/ACTION.HGR/CRYSTAL.CASTLES b/res/ACTION.HGR/CRYSTAL.CASTLES
new file mode 100644
index 000000000..9b2a0b8c5
Binary files /dev/null and b/res/ACTION.HGR/CRYSTAL.CASTLES differ
diff --git a/res/ACTION.HGR/_FileInformation.txt b/res/ACTION.HGR/_FileInformation.txt
index 1cb85df63..aa24b016d 100644
--- a/res/ACTION.HGR/_FileInformation.txt
+++ b/res/ACTION.HGR/_FileInformation.txt
@@ -128,6 +128,10 @@ CRAZY.MAZEY=Type(06),AuxType(3FF8),Access(C3)
 CRIME.WAVE=Type(06),AuxType(3FF8),Access(C3)
 CRISIS.MOUNTAIN=Type(06),AuxType(3FF8),Access(C3)
 CROSSFIRE=Type(06),AuxType(3FF8),Access(C3)
+CRYSTAL.CASTLE2=Type(06),AuxType(3FF8),Access(C3)
+CRYSTAL.CASTLE3=Type(06),AuxType(3FF8),Access(C3)
+CRYSTAL.CASTLE4=Type(06),AuxType(3FF8),Access(C3)
+CRYSTAL.CASTLES=Type(06),AuxType(3FF8),Access(C3)
 CUBIT=Type(06),AuxType(3FF8),Access(C3)
 CUBIT2=Type(06),AuxType(3FF8),Access(C3)
 CYBER.STRIKE=Type(06),AuxType(3FF8),Access(C3)
diff --git a/res/ARTWORK.SHR.UNCOMPRESSED/CRYSTAL.CASTLES b/res/ARTWORK.SHR.UNCOMPRESSED/CRYSTAL.CASTLES
new file mode 100644
index 000000000..6b8be53fa
Binary files /dev/null and b/res/ARTWORK.SHR.UNCOMPRESSED/CRYSTAL.CASTLES differ
diff --git a/res/ARTWORK.SHR/CRYSTAL.CASTLES b/res/ARTWORK.SHR/CRYSTAL.CASTLES
new file mode 100644
index 000000000..c3e65a549
Binary files /dev/null and b/res/ARTWORK.SHR/CRYSTAL.CASTLES differ
diff --git a/res/ARTWORK.SHR/_FileInformation.txt b/res/ARTWORK.SHR/_FileInformation.txt
index c23896225..3686f6ebe 100644
--- a/res/ARTWORK.SHR/_FileInformation.txt
+++ b/res/ARTWORK.SHR/_FileInformation.txt
@@ -24,6 +24,7 @@ CONAN=Type(06),AuxType(1FF8),Access(C3)
 CONGO.BONGO=Type(06),AuxType(1FF8),Access(C3)
 CRISIS.MOUNTAIN=Type(06),AuxType(1FF8),Access(C3)
 CROSSFIRE=Type(06),AuxType(1FF8),Access(C3)
+CRYSTAL.CASTLES=Type(06),AuxType(1FF8),Access(C3)
 CYBER.STRIKE=Type(06),AuxType(1FF8),Access(C3)
 CYCLOD=Type(06),AuxType(1FF8),Access(C3)
 D.GENERATION=Type(06),AuxType(1FF8),Access(C3)
diff --git a/res/ATTRACT/CRYSTAL.CASTLES b/res/ATTRACT/CRYSTAL.CASTLES
new file mode 100644
index 000000000..51689fd69
--- /dev/null
+++ b/res/ATTRACT/CRYSTAL.CASTLES
@@ -0,0 +1,11 @@
+#
+# Attract mode for 
+#
+
+ARTWORK.SHR/CRYSTAL.CASTLES=C
+ACTION.HGR/CRYSTAL.CASTLE2=A
+ACTION.HGR/CRYSTAL.CASTLE3=A
+ACTION.HGR/CRYSTAL.CASTLE4=A
+ACTION.HGR/CRYSTAL.CASTLES=A
+
+[eof]
diff --git a/res/ATTRACT/_FileInformation.txt b/res/ATTRACT/_FileInformation.txt
index d104ac8cb..bbf3a8b76 100644
--- a/res/ATTRACT/_FileInformation.txt
+++ b/res/ATTRACT/_FileInformation.txt
@@ -53,6 +53,7 @@ CRAZY.MAZEY=Type(04),AuxType(8000),Access(C3)
 CRIME.WAVE=Type(04),AuxType(8000),Access(C3)
 CRISIS.MOUNTAIN=Type(04),AuxType(8000),Access(C3)
 CROSSFIRE=Type(04),AuxType(8000),Access(C3)
+CRYSTAL.CASTLES=Type(04),AuxType(8000),Access(C3)
 CUBIT=Type(04),AuxType(8000),Access(C3)
 CYBER.STRIKE=Type(04),AuxType(8000),Access(C3)
 CYCLOD=Type(04),AuxType(8000),Access(C3)
diff --git a/res/SS/ACTIONCD1.CONF b/res/SS/ACTIONCD1.CONF
index 1e1443e11..d691a42cf 100644
--- a/res/SS/ACTIONCD1.CONF
+++ b/res/SS/ACTIONCD1.CONF
@@ -6,7 +6,7 @@ DROL
 CROSSFIRE
 DONKEY.KONG2=DONKEY.KONG
 DUNG.BEETLES2=DUNG.BEETLES
-CEILING.ZERO
+CRYSTAL.CASTLES
 CIDER.SPIDER
 DIAMOND.MINE
 COMMANDO
diff --git a/res/SS/ACTIONCD2.CONF b/res/SS/ACTIONCD2.CONF
index a1ac388a4..0f6535198 100644
--- a/res/SS/ACTIONCD2.CONF
+++ b/res/SS/ACTIONCD2.CONF
@@ -6,7 +6,7 @@ DROL3=DROL
 CANNONBALL.BLTZ
 CANYON.CLIMBER
 DUNG.BEETLES3=DUNG.BEETLES
-DAVIDS.MAGIC
+CRYSTAL.CASTLE2=CRYSTAL.CASTLES
 DIAMOND.MINE2=DIAMOND.MINE
 DEFENDER
 WOLFEN842=WOLFEN84
diff --git a/res/SS/ACTIONCD3.CONF b/res/SS/ACTIONCD3.CONF
index 1961155c1..1fb9a4b38 100644
--- a/res/SS/ACTIONCD3.CONF
+++ b/res/SS/ACTIONCD3.CONF
@@ -8,7 +8,7 @@ DIAMOND.MINE3=DIAMOND.MINE
 CHAMP.LODERUN
 DINO.EGGS
 CYBER.STRIKE
-DIG.DUG
+CRYSTAL.CASTLE3=CRYSTAL.CASTLES
 CAPTN.GOODNIGHT
 CYCLOD
 WOLFEN84
diff --git a/res/SS/ACTIONCD4.CONF b/res/SS/ACTIONCD4.CONF
index 276ef07c2..0588050d9 100644
--- a/res/SS/ACTIONCD4.CONF
+++ b/res/SS/ACTIONCD4.CONF
@@ -3,10 +3,14 @@
 #
 
 CONGO.BONGO
+CRYSTAL.CASTLE4=CRYSTAL.CASTLES
 DONKEY.KONG
 CRIME.WAVE
 CENTIPEDE
 CUBIT
 CONAN
+DIG.DUG
+DAVIDS.MAGIC
+CEILING.ZERO
 
 [eof]
diff --git a/res/SS/ATARI2.CONF b/res/SS/ATARI2.CONF
index e9fd43f7c..242ec6dc1 100644
--- a/res/SS/ATARI2.CONF
+++ b/res/SS/ATARI2.CONF
@@ -9,5 +9,6 @@ PAC.MAN
 ROBOTRON
 JUNGLE.HUNT
 MARIO.BROS
+CRYSTAL.CASTLES
 
 [eof]
diff --git a/res/SS/CD3.CONF b/res/SS/CD3.CONF
index 7e31c9a05..938ee723e 100644
--- a/res/SS/CD3.CONF
+++ b/res/SS/CD3.CONF
@@ -5,6 +5,7 @@
 CONGO.BONGO
 DUNG.BEETLES
 DRELBS
+CRYSTAL.CASTLES
 WOLFEN84
 CUBIT
 CYCLOD
diff --git a/res/SS/SHR22.CONF b/res/SS/SHR22.CONF
index a070b973e..d8be2aac1 100644
--- a/res/SS/SHR22.CONF
+++ b/res/SS/SHR22.CONF
@@ -9,5 +9,6 @@ TECHNOCOP
 SUPER.ZAXXON
 LAST.NINJA
 MATTERHORN
+CRYSTAL.CASTLES
 
 [eof]