diff --git a/.DS_Store b/.DS_Store
index 3f78d83..952916f 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/gspaint/ANIMATION.E.S b/gspaint/ANIMATION.E.S
deleted file mode 100644
index 0a06022..0000000
--- a/gspaint/ANIMATION.E.S
+++ /dev/null
@@ -1,6 +0,0 @@
-
-* TFBD generated equates
-*    (c) PHC 1992,93
-
-
-GSOS EQU $E100A8
diff --git a/gspaint/ANIMATION.S b/gspaint/ANIMATION.S
index 5132025..b6c7101 100644
--- a/gspaint/ANIMATION.S
+++ b/gspaint/ANIMATION.S
@@ -14,6 +14,8 @@
 	 
 *-------------------------------
 
+GSOS EQU $E100A8
+
 	use	4/Ctl.Macs
 	use	4/Desk.Macs
 	use	4/Dialog.Macs
diff --git a/gspaint/EDITBRUSH.E.S b/gspaint/EDITBRUSH.E.S
deleted file mode 100644
index 6bcf864..0000000
--- a/gspaint/EDITBRUSH.E.S
+++ /dev/null
@@ -1,5 +0,0 @@
-
-* TFBD generated equates
-*    (c) PHC 1992,93
-
-
diff --git a/gspaint/EDITBRUSH.S b/gspaint/EDITBRUSH.S
index c222567..1da00ec 100644
--- a/gspaint/EDITBRUSH.S
+++ b/gspaint/EDITBRUSH.S
@@ -8,7 +8,6 @@
 
 	 mx	%00
          rel
-	 use	EDITBRUSH.E
 	 use	EDITBRUSH.X
 	 lst	off
 	 
diff --git a/gspaint/EDITCOLOR.E.S b/gspaint/EDITCOLOR.E.S
deleted file mode 100644
index 6bcf864..0000000
--- a/gspaint/EDITCOLOR.E.S
+++ /dev/null
@@ -1,5 +0,0 @@
-
-* TFBD generated equates
-*    (c) PHC 1992,93
-
-
diff --git a/gspaint/EDITCOLOR.S b/gspaint/EDITCOLOR.S
index a70b868..555e418 100644
--- a/gspaint/EDITCOLOR.S
+++ b/gspaint/EDITCOLOR.S
@@ -8,7 +8,6 @@
 
 	 mx	%00
          rel
-	 use	EDITCOLOR.E
 	 use	EDITCOLOR.X
 	 lst	off
 	 
diff --git a/gspaint/EDITMIROR.E.S b/gspaint/EDITMIROR.E.S
deleted file mode 100644
index 6bcf864..0000000
--- a/gspaint/EDITMIROR.E.S
+++ /dev/null
@@ -1,5 +0,0 @@
-
-* TFBD generated equates
-*    (c) PHC 1992,93
-
-
diff --git a/gspaint/EDITMIROR.S b/gspaint/EDITMIROR.S
index 0af14f9..fcf5815 100644
--- a/gspaint/EDITMIROR.S
+++ b/gspaint/EDITMIROR.S
@@ -8,7 +8,6 @@
 
 	 mx	%00
          rel
-	 use	EDITMIROR.E
 	 use	EDITMIROR.X
 	 lst	off
 	 
diff --git a/gspaint/EDITPAT.E.S b/gspaint/EDITPAT.E.S
deleted file mode 100644
index 6bcf864..0000000
--- a/gspaint/EDITPAT.E.S
+++ /dev/null
@@ -1,5 +0,0 @@
-
-* TFBD generated equates
-*    (c) PHC 1992,93
-
-
diff --git a/gspaint/EDITPAT.S b/gspaint/EDITPAT.S
index b9ae808..f4ddedf 100644
--- a/gspaint/EDITPAT.S
+++ b/gspaint/EDITPAT.S
@@ -8,7 +8,6 @@
 
 	 mx	%00
          rel
-	 use	EDITPAT.E
 	 use	EDITPAT.X
 	 lst	off
 	 
diff --git a/gspaint/INIT.E.S b/gspaint/INIT.E.S
deleted file mode 100644
index 8eec272..0000000
--- a/gspaint/INIT.E.S
+++ /dev/null
@@ -1,8 +0,0 @@
-
-* TFBD generated equates
-*    (c) PHC 1992,93
-
-
-BUTN0 EQU $C061
-CLRROM EQU $CFFF
-GSOS EQU $E100A8
diff --git a/gspaint/INIT.S b/gspaint/INIT.S
index cadcd8f..bea8fc9 100644
--- a/gspaint/INIT.S
+++ b/gspaint/INIT.S
@@ -14,6 +14,10 @@
 	 
 *-------------------------------
 
+BUTN0 EQU $C061
+CLRROM EQU $CFFF
+GSOS EQU $E100A8
+
 	use	4/Ctl.Macs
 	use	4/Desk.Macs
 	use	4/Dialog.Macs
diff --git a/gspaint/MAIN.E.S b/gspaint/MAIN.E.S
deleted file mode 100644
index 3ce9dfd..0000000
--- a/gspaint/MAIN.E.S
+++ /dev/null
@@ -1,10 +0,0 @@
-
-* TFBD generated equates
-*    (c) PHC 1992,93
-
-
-MSLOT EQU $07F8
-KEYMODREG EQU $C025
-BUTN1 EQU $C062
-CLRROM EQU $CFFF
-GSOS EQU $E100A8
diff --git a/gspaint/MAIN.S b/gspaint/MAIN.S
index 777f3f0..a1e7fec 100644
--- a/gspaint/MAIN.S
+++ b/gspaint/MAIN.S
@@ -13,6 +13,12 @@
 	 
 *-------------------------------
 
+MSLOT EQU $07F8
+KEYMODREG EQU $C025
+BUTN1 EQU $C062
+CLRROM EQU $CFFF
+GSOS EQU $E100A8
+
 LANGUAGE	=	2	; 1 for FR, 2 for US, ...
 
 *-------------------------------
diff --git a/gspaint/PALETTE.E.S b/gspaint/PALETTE.E.S
deleted file mode 100644
index 0a06022..0000000
--- a/gspaint/PALETTE.E.S
+++ /dev/null
@@ -1,6 +0,0 @@
-
-* TFBD generated equates
-*    (c) PHC 1992,93
-
-
-GSOS EQU $E100A8
diff --git a/gspaint/PALETTE.S b/gspaint/PALETTE.S
index 1428407..d734c60 100644
--- a/gspaint/PALETTE.S
+++ b/gspaint/PALETTE.S
@@ -14,6 +14,8 @@
 	 
 *-------------------------------
 
+GSOS EQU $E100A8
+
 	use	4/Ctl.Macs
 	use	4/Desk.Macs
 	use	4/Dialog.Macs