diff --git a/src/mame/drivers/junofrst.cpp b/src/mame/drivers/junofrst.cpp
index de889c12050..4ba5a7f36fe 100644
--- a/src/mame/drivers/junofrst.cpp
+++ b/src/mame/drivers/junofrst.cpp
@@ -428,16 +428,14 @@ void junofrst_state::junofrst(machine_config &config)
 
 	WATCHDOG_TIMER(config, "watchdog");
 
-	PALETTE(config, m_palette).set_format(palette_device::BGR_233, 16);
-
 	/* video hardware */
-	screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
-	screen.set_refresh_hz(60);
-	screen.set_vblank_time(ATTOSECONDS_IN_USEC(0));
-	screen.set_size(32*8, 32*8);
-	screen.set_visarea(0*8, 32*8-1, 2*8, 30*8-1);  /* not sure about the visible area */
-	screen.set_screen_update(FUNC(junofrst_state::screen_update_tutankhm));
-	screen.screen_vblank().set(FUNC(junofrst_state::_30hz_irq));
+	SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
+	m_screen->set_raw(GALAXIAN_PIXEL_CLOCK, GALAXIAN_HTOTAL, GALAXIAN_HBEND, GALAXIAN_HBSTART, GALAXIAN_VTOTAL, GALAXIAN_VBEND, GALAXIAN_VBSTART);
+	PALETTE(config, m_palette).set_format(1, tutankhm_state::raw_to_rgb_func, 16);
+
+	m_screen->set_screen_update(FUNC(junofrst_state::screen_update_tutankhm_scramble));
+	m_screen->screen_vblank().set(FUNC(junofrst_state::_30hz_irq));
+
 
 	/* sound hardware */
 	SPEAKER(config, "speaker").front_center();
diff --git a/src/mame/drivers/tutankhm.cpp b/src/mame/drivers/tutankhm.cpp
index f0cc24a3384..fd82c75d523 100644
--- a/src/mame/drivers/tutankhm.cpp
+++ b/src/mame/drivers/tutankhm.cpp
@@ -301,7 +301,6 @@ void tutankhm_state::tutankhm(machine_config &config)
 	WATCHDOG_TIMER(config, "watchdog");
 
 	/* video hardware */
-	//screen_device &screen(SCREEN(config, "screen", SCREEN_TYPE_RASTER));
 	SCREEN(config, m_screen, SCREEN_TYPE_RASTER);
 	m_screen->set_raw(GALAXIAN_PIXEL_CLOCK, GALAXIAN_HTOTAL, GALAXIAN_HBEND, GALAXIAN_HBSTART, GALAXIAN_VTOTAL, GALAXIAN_VBEND, GALAXIAN_VBSTART);
 	PALETTE(config, m_palette).set_format(1, tutankhm_state::raw_to_rgb_func, 16);
@@ -309,7 +308,6 @@ void tutankhm_state::tutankhm(machine_config &config)
 	m_screen->set_screen_update(FUNC(tutankhm_state::screen_update_tutankhm));
 	m_screen->screen_vblank().set(FUNC(tutankhm_state::vblank_irq));
 
-
 	/* sound hardware */
 	TIMEPLT_AUDIO(config, "timeplt_audio");