diff --git a/src/analogtv.cpp b/src/analogtv.cpp
index 0a6aac4..495ac3a 100644
--- a/src/analogtv.cpp
+++ b/src/analogtv.cpp
@@ -234,13 +234,8 @@ void AnalogTV::drawCurrent()
 		switch (this->type)
 		{
 			case MONITOR_COLOR: drawMonitorColor(); break;
-			case MONITOR_WHITE: drawMonitorWhite(); break;
 			case MONITOR_GREEN: drawMonitorGreen(); break;
-			case MONITOR_ORANGE: drawMonitorOrange(); break;
 			case TV_OLD_COLOR: drawTVOld(); break;
-			case TV_OLD_BW: drawTVOld(); break;
-			case TV_NEW_COLOR: drawTVNew(); break;
-			case TV_NEW_BW: drawTVNew(); break;
 		}
 	}
 	else
@@ -261,7 +256,7 @@ void AnalogTV::drawMonitorColor()
 	for (int row = 0; row < 192; ++row)
 	{
 		const CB cb = get_cb(row);
-		const bool removeColor = (this->type == TV_NEW_BW || !cb.isColor());
+		const bool removeColor = !cb.isColor();
 		ntsc_to_rgb_monitor(row*AppleNTSC::H+350,AppleNTSC::H-350,rgb);
 		for (int col = 350; col < AppleNTSC::H-2; ++col)
 		{
@@ -350,7 +345,7 @@ void AnalogTV::drawTVNew()
 	for (int row = 0; row < 192; ++row)
 	{
 		const CB cb = get_cb(row);
-		const bool removeColor = (this->type == TV_NEW_BW || !cb.isColor());
+		const bool removeColor = false; //(this->type == TV_NEW_BW || !cb.isColor());
 		ntsc_to_rgb_newtv(row*AppleNTSC::H+350,AppleNTSC::H-350,rgb);
 		for (int col = 350; col < AppleNTSC::H-2; ++col)
 		{
diff --git a/src/analogtv.h b/src/analogtv.h
index 54c343a..b31c2bd 100644
--- a/src/analogtv.h
+++ b/src/analogtv.h
@@ -35,13 +35,8 @@ public:
 	enum DisplayType
 	{
 		MONITOR_COLOR,
-		MONITOR_WHITE,
 		MONITOR_GREEN,
-		MONITOR_ORANGE,
 		TV_OLD_COLOR,
-		TV_OLD_BW,
-		TV_NEW_COLOR,
-		TV_NEW_BW,
 
 		NUM_DISPLAY_TYPES
 	};
diff --git a/src/screenimage.cpp b/src/screenimage.cpp
index 60f6923..76da12c 100644
--- a/src/screenimage.cpp
+++ b/src/screenimage.cpp
@@ -133,13 +133,8 @@ void ScreenImage::drawCassette() {
 
 static const char* displays[] = {
     "COLOR MONITOR ",
-    "WHITE MONITOR ",
     "GREEN MONITOR ",
-    "ORANGE MONITOR",
-    "OLD COLOR TV  ",
-    "OLD B & W TV  ",
-    "NEW COLOR TV  ",
-    "NEW B & W TV  ",
+    "TELEVISION    ",
 };
 
 void ScreenImage::drawFnKeys() {