--- a/config.h	Fri Mar 15 06:09:08 2013 +0200
+++ b/config.h	Fri Mar 15 15:47:20 2013 +0200
@@ -1,65 +1,18 @@
-/******************************o.
-
-Here are some settings you may want to fix :)
-VIDEO and AUDIO are set in the makefile.	 
-*/
-
-#define BUFW 320
-#define BUFH 200
-/*
-	The size (width&height) of the display buffer.
-	
-	320x200 is smooth on a 386.
+// Settings
+#define SET_VID_BUFW   640
+#define SET_VID_BUFH   480
 
-	Svgalib: the best-fitting 256 color mode will be searched
-	automatically.
-*/
+#define SET_AUDIO_FREQ 44100
 
-#define OUTFREQ 22050
-/*
-	Audio output frequency. 
-*/
 
-#define FRAGSIZE 10	/* size = 2^n, n=7..17 */
-#define NUMFRAGS 40	/* somewhere between 2..255, i think */
-/*
-	The number and size of the audio buffers.
+#define SET_WIN_NAME   "Ocsa (PWP) - 3x666"
 
-	If your machine has problems in keeping the mixbuffer filled, you
-	an try to increase these values. However those 10,40 are quite ok
-	for a 386dx/25 with an old soundblaster.
-	
-	Prefer increasing NUMFRAGS unless you want an action-halt-
-	action-halt style multimedia performance a la windows.
-
-	We still have problems in keeping the audio up in all
-	circumstances.. such as leaving the svgalib console or while
-	performing some window manager functions.		
-*/
-
-#define WINNAME "3x666"
-/*
-	The name for the x window.
-*/
 
-#define SLEEPY 0
-/* 
-	1 = sleep between frames if there's nothing to do
-	    originally implemented for a better cpu usage
-	    but i don't think it is of any relevant use here
-	    
-	0 = use dummyloop
+// Do not touch these
+#define SET_DEMOHZ     100
+#define SET_VID_COLORS 256
+#define SET_AUDIO_CHN  1
 
- */
-/*	All right! Now save the file and type make ("em ay kee ee")
-/ \
-
-.o*************/
-
-/* don't touch these: */
-
-#define DEMOHZ 100
-
-/* maybe these shouldn't be here */
-#define ROWTIX 6
-#define MAXROWLGT (TIKLGT*ROWTIX)
+// Maybe these shouldn't be here
+#define SET_ROWTIX     6
+#define SET_MAXROWLGT  (TIKLGT * SET_ROWTIX)