diff --git a/mist/common_defines.inc b/mist/common_defines.inc
index 472632b9..b3ba1be4 100644
--- a/mist/common_defines.inc
+++ b/mist/common_defines.inc
@@ -216,6 +216,12 @@ SELENA_CHASM		=	16
 SELENA_CLOCK_PATH	=	17
 SELENA_CLOCK		=	18
 SELENA_CLOCK_CLOSE	=	19
+SELENA_CLOCK_BEFORE	=	20
+SELENA_CRYSTAL_TURN	=	21
+SELENA_CRYSTAL_STEPS	=	22
+SELENA_CRYSTAL_PATH	=	23
+SELENA_CRYSTALS		=	24
+SELENA_CRYSTAL_CLOSE	=	25
 
 ; Viewer Room
 
diff --git a/mist/graphics_selena/Makefile b/mist/graphics_selena/Makefile
index 110ad834..19db1a17 100644
--- a/mist/graphics_selena/Makefile
+++ b/mist/graphics_selena/Makefile
@@ -29,7 +29,13 @@ selena_graphics.inc:	\
 	chasm_e.lzsa chasm_s.lzsa chasm_n.lzsa \
 	clock_path_e.lzsa clock_path_w.lzsa \
 	clock_n.lzsa clock_s.lzsa clock_e.lzsa clock_w.lzsa \
-	clock_note_s.lzsa
+	clock_note_s.lzsa \
+	clock_before_e.lzsa clock_before_w.lzsa \
+	crystal_turn_n.lzsa crystal_turn_s.lzsa crystal_turn_e.lzsa crystal_turn_w.lzsa \
+	crystal_steps_s.lzsa \
+	crystal_path_n.lzsa \
+	crystals_s.lzsa crystals_n.lzsa \
+	crystals_note_e.lzsa
 	echo "controls_e_lzsa: .incbin \"controls_e.lzsa\"" > selena_graphics.inc
 	echo "organ_w_lzsa: .incbin \"organ_w.lzsa\"" >> selena_graphics.inc
 	echo "spaceship_inside_w_lzsa: .incbin \"spaceship_inside_w.lzsa\"" >> selena_graphics.inc
@@ -72,6 +78,19 @@ selena_graphics.inc:	\
 	echo "clock_e_lzsa: .incbin \"clock_e.lzsa\"" >> selena_graphics.inc
 	echo "clock_w_lzsa: .incbin \"clock_w.lzsa\"" >> selena_graphics.inc
 	echo "clock_note_s_lzsa: .incbin \"clock_note_s.lzsa\"" >> selena_graphics.inc
+	echo "clock_before_e_lzsa: .incbin \"clock_before_e.lzsa\"" >> selena_graphics.inc
+	echo "clock_before_w_lzsa: .incbin \"clock_before_w.lzsa\"" >> selena_graphics.inc
+	echo "crystal_turn_n_lzsa: .incbin \"crystal_turn_n.lzsa\"" >> selena_graphics.inc
+	echo "crystal_turn_s_lzsa: .incbin \"crystal_turn_s.lzsa\"" >> selena_graphics.inc
+	echo "crystal_turn_e_lzsa: .incbin \"crystal_turn_e.lzsa\"" >> selena_graphics.inc
+	echo "crystal_turn_w_lzsa: .incbin \"crystal_turn_w.lzsa\"" >> selena_graphics.inc
+	echo "crystal_steps_s_lzsa: .incbin \"crystal_steps_s.lzsa\"" >> selena_graphics.inc
+	echo "crystal_path_n_lzsa: .incbin \"crystal_path_n.lzsa\"" >> selena_graphics.inc
+	echo "crystals_s_lzsa: .incbin \"crystals_s.lzsa\"" >> selena_graphics.inc
+	echo "crystals_n_lzsa: .incbin \"crystals_n.lzsa\"" >> selena_graphics.inc
+	echo "crystals_note_e_lzsa: .incbin \"crystals_note_e.lzsa\"" >> selena_graphics.inc
+
+
 
 
 %.gr: %.png
diff --git a/mist/graphics_selena/clock_before_e.png b/mist/graphics_selena/clock_before_e.png
new file mode 100644
index 00000000..b27f97e5
Binary files /dev/null and b/mist/graphics_selena/clock_before_e.png differ
diff --git a/mist/graphics_selena/clock_before_w.png b/mist/graphics_selena/clock_before_w.png
new file mode 100644
index 00000000..c754ac7b
Binary files /dev/null and b/mist/graphics_selena/clock_before_w.png differ
diff --git a/mist/graphics_selena/crystal_path_n.png b/mist/graphics_selena/crystal_path_n.png
new file mode 100644
index 00000000..833552cb
Binary files /dev/null and b/mist/graphics_selena/crystal_path_n.png differ
diff --git a/mist/graphics_selena/crystal_steps_s.png b/mist/graphics_selena/crystal_steps_s.png
new file mode 100644
index 00000000..6c59302c
Binary files /dev/null and b/mist/graphics_selena/crystal_steps_s.png differ
diff --git a/mist/graphics_selena/crystal_turn_e.png b/mist/graphics_selena/crystal_turn_e.png
new file mode 100644
index 00000000..19dbb21d
Binary files /dev/null and b/mist/graphics_selena/crystal_turn_e.png differ
diff --git a/mist/graphics_selena/crystal_turn_n.png b/mist/graphics_selena/crystal_turn_n.png
new file mode 100644
index 00000000..0c365384
Binary files /dev/null and b/mist/graphics_selena/crystal_turn_n.png differ
diff --git a/mist/graphics_selena/crystal_turn_s.png b/mist/graphics_selena/crystal_turn_s.png
new file mode 100644
index 00000000..8cac7fae
Binary files /dev/null and b/mist/graphics_selena/crystal_turn_s.png differ
diff --git a/mist/graphics_selena/crystal_turn_w.png b/mist/graphics_selena/crystal_turn_w.png
new file mode 100644
index 00000000..ca6bd288
Binary files /dev/null and b/mist/graphics_selena/crystal_turn_w.png differ
diff --git a/mist/graphics_selena/crystals_n.png b/mist/graphics_selena/crystals_n.png
new file mode 100644
index 00000000..317b6690
Binary files /dev/null and b/mist/graphics_selena/crystals_n.png differ
diff --git a/mist/graphics_selena/crystals_note_e.png b/mist/graphics_selena/crystals_note_e.png
new file mode 100644
index 00000000..3f813e19
Binary files /dev/null and b/mist/graphics_selena/crystals_note_e.png differ
diff --git a/mist/graphics_selena/crystals_s.png b/mist/graphics_selena/crystals_s.png
new file mode 100644
index 00000000..844ecb46
Binary files /dev/null and b/mist/graphics_selena/crystals_s.png differ
diff --git a/mist/leveldata_selena.inc b/mist/leveldata_selena.inc
index 62351acd..315a5f15 100644
--- a/mist/leveldata_selena.inc
+++ b/mist/leveldata_selena.inc
@@ -9,6 +9,9 @@ locations:
 	.word location8, location9, location10,location11
 	.word location12,location13,location14,location15
 	.word location16,location17,location18,location19
+	.word location20,location21,location22,location23
+	.word location24,location25
+
 
 ; SELENA_INSIDE_SHIP		-- Inside Ship
 location0:
@@ -337,11 +340,11 @@ location17:
 location18:
 	.byte	$ff			; north exit
 	.byte	SELENA_CLOCK_CLOSE	; south exit
-	.byte	$ff			; east exit
+	.byte	SELENA_CLOCK_BEFORE	; east exit
 	.byte	SELENA_CLOCK_PATH	; west exit
 	.byte	$ff		; north exit_dir
 	.byte	DIRECTION_S	; south exit_dir
-	.byte	$ff		; east exit_dir
+	.byte	DIRECTION_E	; east exit_dir
 	.byte	DIRECTION_W	; west exit_dir
 	.word	clock_n_lzsa			; north bg
 	.word	clock_s_lzsa			; south bg
@@ -367,3 +370,105 @@ location19:
 	.byte	BG_SOUTH
 	.byte	$ff
 
+; SELENA_CLOCK_BEFORE	-- path before clocks, when coming from crystals
+location20:
+	.byte	$ff			; north exit
+	.byte	$ff			; south exit
+	.byte	SELENA_CRYSTAL_TURN	; east exit
+	.byte	SELENA_CLOCK		; west exit
+	.byte	$ff		; north exit_dir
+	.byte	$ff		; south exit_dir
+	.byte	DIRECTION_E	; east exit_dir
+	.byte	DIRECTION_W	; west exit_dir
+	.word	$0000				; north bg
+	.word	$0000				; south bg
+	.word	clock_before_e_lzsa		; east bg
+	.word	clock_before_w_lzsa		; west bg
+	.byte	BG_EAST|BG_WEST
+	.byte	$ff
+
+; SELENA_CRYSTAL_TURN	-- crystal turnoff
+location21:
+	.byte	$ff			; north exit
+	.byte	SELENA_CRYSTAL_STEPS	; south exit
+	.byte	$ff			; east exit
+	.byte	SELENA_CLOCK_BEFORE	; west exit
+	.byte	$ff		; north exit_dir
+	.byte	DIRECTION_S	; south exit_dir
+	.byte	DIRECTION_E	; east exit_dir
+	.byte	DIRECTION_W	; west exit_dir
+	.word	crystal_turn_n_lzsa		; north bg
+	.word	crystal_turn_s_lzsa		; south bg
+	.word	crystal_turn_e_lzsa		; east bg
+	.word	crystal_turn_w_lzsa		; west bg
+	.byte	BG_NORTH|BG_SOUTH|BG_EAST|BG_WEST
+	.byte	$ff
+
+; SELENA_CRYSTAL_STEPS	-- top of steps
+location22:
+	.byte	$ff			; north exit
+	.byte	SELENA_CRYSTALS		; south exit
+	.byte	$ff			; east exit
+	.byte	$ff			; west exit
+	.byte	$ff		; north exit_dir
+	.byte	DIRECTION_S	; south exit_dir
+	.byte	$ff		; east exit_dir
+	.byte	$ff		; west exit_dir
+	.word	$0000				; north bg
+	.word	crystal_steps_s_lzsa		; south bg
+	.word	$0000				; east bg
+	.word	$0000				; west bg
+	.byte	BG_SOUTH
+	.byte	$ff
+
+; SELENA_CRYSTAL_PATH	-- bottom of steps
+location23:
+	.byte	SELENA_CRYSTAL_TURN	; north exit
+	.byte	$ff			; south exit
+	.byte	$ff			; east exit
+	.byte	$ff		; west exit
+	.byte	DIRECTION_N	; north exit_dir
+	.byte	$ff		; south exit_dir
+	.byte	$ff		; east exit_dir
+	.byte	$ff		; west exit_dir
+	.word	crystal_path_n_lzsa		; north bg
+	.word	$0000				; south bg
+	.word	$0000				; east bg
+	.word	$0000				; west bg
+	.byte	BG_NORTH
+	.byte	$ff
+
+; SELENA_CRYSTALS		-- down by the crystals
+location24:
+	.byte	SELENA_CRYSTAL_PATH	; north exit
+	.byte	SELENA_CRYSTAL_CLOSE	; south exit
+	.byte	$ff			; east exit
+	.byte	$ff			; west exit
+	.byte	DIRECTION_N	; north exit_dir
+	.byte	DIRECTION_E	; south exit_dir
+	.byte	$ff		; east exit_dir
+	.byte	$ff		; west exit_dir
+	.word	crystals_n_lzsa			; north bg
+	.word	crystals_s_lzsa			; south bg
+	.word	$0000				; east bg
+	.word	$0000				; west bg
+	.byte	BG_NORTH|BG_SOUTH
+	.byte	$ff
+
+; SELENA_CRYSTAL_CLOSE		-- at the crystal device
+location25:
+	.byte	$ff			; north exit
+	.byte	$ff			; south exit
+	.byte	SELENA_CRYSTALS		; east exit
+	.byte	$ff			; west exit
+	.byte	$ff		; north exit_dir
+	.byte	$ff		; south exit_dir
+	.byte	DIRECTION_S	; east exit_dir
+	.byte	$ff		; west exit_dir
+	.word	$0000				; north bg
+	.word	$0000				; south bg
+	.word	crystals_note_e_lzsa		; east bg
+	.word	$0000				; west bg
+	.byte	BG_EAST
+	.byte	$ff
+