--- Frodo4/Src/Display.cpp	2003/07/01 17:09:43	1.1
+++ Frodo4/Src/Display.cpp	2005/06/27 19:55:48	1.6
@@ -1,7 +1,7 @@
 /*
  *  Display.cpp - C64 graphics display, emulator window handling
  *
- *  Frodo (C) 1994-1997,2002 Christian Bauer
+ *  Frodo (C) 1994-1997,2002-2005 Christian Bauer
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -34,32 +34,34 @@ enum {
 };
 
 
-#undef USE_THEORETICAL_COLORS
+#define USE_PEPTO_COLORS 1
 
-#ifdef USE_THEORETICAL_COLORS
+#ifdef USE_PEPTO_COLORS
 
-// C64 color palette (theoretical values)
+// C64 color palette
+// Values based on measurements by Philip "Pepto" Timmermann <pepto@pepto.de>
+// (see http://www.pepto.de/projects/colorvic/)
 const uint8 palette_red[16] = {
-	0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0xff, 0xff, 0x80, 0xff, 0x40, 0x80, 0x80, 0x80, 0xc0
+	0x00, 0xff, 0x86, 0x4c, 0x88, 0x35, 0x20, 0xcf, 0x88, 0x40, 0xcb, 0x34, 0x68, 0x8b, 0x68, 0xa1
 };
 
 const uint8 palette_green[16] = {
-	0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x80, 0x40, 0x80, 0x40, 0x80, 0xff, 0x80, 0xc0
+	0x00, 0xff, 0x19, 0xc1, 0x17, 0xac, 0x07, 0xf2, 0x3e, 0x2a, 0x55, 0x34, 0x68, 0xff, 0x4a, 0xa1
 };
 
 const uint8 palette_blue[16] = {
-	0x00, 0xff, 0x00, 0xff, 0xff, 0x00, 0xff, 0x00, 0x00, 0x00, 0x80, 0x40, 0x80, 0x80, 0xff, 0xc0
+	0x00, 0xff, 0x01, 0xe3, 0xbd, 0x0a, 0xc0, 0x2d, 0x00, 0x00, 0x37, 0x34, 0x68, 0x59, 0xff, 0xa1
 };
 
 #else
 
-// C64 color palette (more realistic looking colors)
+// C64 color palette (traditional Frodo colors)
 const uint8 palette_red[16] = {
 	0x00, 0xff, 0x99, 0x00, 0xcc, 0x44, 0x11, 0xff, 0xaa, 0x66, 0xff, 0x40, 0x80, 0x66, 0x77, 0xc0
 };
 
 const uint8 palette_green[16] = {
-	0x00, 0xff, 0x00, 0xff, 0x00, 0xcc, 0x00, 0xff, 0x55, 0x33, 0x66, 0x40, 0x80, 0xff, 0x77, 0xc0
+	0x00, 0xff, 0x00, 0xff, 0x00, 0xcc, 0x00, 0xdd, 0x55, 0x33, 0x66, 0x40, 0x80, 0xff, 0x77, 0xc0
 };
 
 const uint8 palette_blue[16] = {