diff --git a/TFT_Drivers/ILI9163_Defines.h b/TFT_Drivers/ILI9163_Defines.h
index a6fee9a..4abaa1d 100644
--- a/TFT_Drivers/ILI9163_Defines.h
+++ b/TFT_Drivers/ILI9163_Defines.h
@@ -60,9 +60,3 @@
 
 #define TFT_INVOFF  0x20
 #define TFT_INVON   0x21
-
-
-// All ILI9163 specific commands some are used by setRotation()
-#define ILI9163_RDID1   0xDA
-#define ILI9163_RDID2   0xDB
-#define ILI9163_RDID3   0xDC
diff --git a/TFT_Drivers/ILI9163_Init.h b/TFT_Drivers/ILI9163_Init.h
index 6ca5de1..cc3bb56 100644
--- a/TFT_Drivers/ILI9163_Init.h
+++ b/TFT_Drivers/ILI9163_Init.h
@@ -1,5 +1,5 @@
 
-// This is the command sequence that initialises the ST7735 driver
+// This is the command sequence that initialises the ILI9163 driver
 //
 // This setup information is in a format accecpted by the commandList() function
 // which reduces FLASH space, but on an ESP8266 there is plenty available!
diff --git a/TFT_Drivers/ILI9163_Rotation.h b/TFT_Drivers/ILI9163_Rotation.h
index 29eb86f..2423635 100644
--- a/TFT_Drivers/ILI9163_Rotation.h
+++ b/TFT_Drivers/ILI9163_Rotation.h
@@ -1,5 +1,5 @@
 
-// This is the command sequence that rotates the ILI9341 driver coordinate frame
+// This is the command sequence that rotates the ILI9163 driver coordinate frame
 
   rotation = m % 4;
 
diff --git a/TFT_Drivers/RPI_ILI9486_Init.h b/TFT_Drivers/RPI_ILI9486_Init.h
index db6bd80..9464cf7 100644
--- a/TFT_Drivers/RPI_ILI9486_Init.h
+++ b/TFT_Drivers/RPI_ILI9486_Init.h
@@ -1,5 +1,5 @@
 
-// This is the command sequence that initialises the ILI9481 driver
+// This is the command sequence that initialises the ILI9486 driver
 //
 // This setup information uses simple 8 bit SPI writecommand() and writedata() functions
 //
@@ -67,4 +67,4 @@
 
     writecommand(0x29);                     // display on
     delay(150);
-}
\ No newline at end of file
+}
diff --git a/TFT_Drivers/S6D02A1_Defines.h b/TFT_Drivers/S6D02A1_Defines.h
index 9165c0e..96aea85 100644
--- a/TFT_Drivers/S6D02A1_Defines.h
+++ b/TFT_Drivers/S6D02A1_Defines.h
@@ -53,9 +53,3 @@
 
 #define TFT_INVOFF  0x20
 #define TFT_INVON   0x21
-
-
-// All S6D02A1 specific commands some are used by setRotation()
-#define S6D02A1_RDID1   0xDA
-#define S6D02A1_RDID2   0xDB
-#define S6D02A1_RDID3   0xDC
diff --git a/TFT_Drivers/S6D02A1_Init.h b/TFT_Drivers/S6D02A1_Init.h
index 2632d77..1986c3e 100644
--- a/TFT_Drivers/S6D02A1_Init.h
+++ b/TFT_Drivers/S6D02A1_Init.h
@@ -4,7 +4,7 @@
 // This setup information is in a format accecpted by the commandList() function
 // which reduces FLASH space, but on an ESP8266 there is plenty available!
 //
-// See S6D02A1_Setup.h file for an alternative simpler format
+// See ILI9341_Setup.h file for an alternative simpler format
 
 {
 	// Initialization commands for S6D02A1 screens
@@ -44,4 +44,4 @@
 
 	commandList(S6D02A1_cmds);
 
-}
\ No newline at end of file
+}
diff --git a/TFT_Drivers/ST7735_Defines.h b/TFT_Drivers/ST7735_Defines.h
index 6b17e72..fc52d24 100644
--- a/TFT_Drivers/ST7735_Defines.h
+++ b/TFT_Drivers/ST7735_Defines.h
@@ -98,51 +98,3 @@
 
 #define TFT_INVOFF  0x20
 #define TFT_INVON   0x21
-
-
-// All ST7735 specific commands some are used by setRotation()
-#define ST7735_NOP     0x00
-#define ST7735_SWRESET 0x01
-#define ST7735_RDDID   0x04
-#define ST7735_RDDST   0x09
-
-#define ST7735_SLPIN   0x10
-#define ST7735_SLPOUT  0x11
-#define ST7735_PTLON   0x12
-#define ST7735_NORON   0x13
-
-#define ST7735_INVOFF  0x20
-#define ST7735_INVON   0x21
-#define ST7735_DISPOFF 0x28
-#define ST7735_DISPON  0x29
-#define ST7735_CASET   0x2A
-#define ST7735_RASET   0x2B // PASET
-#define ST7735_RAMWR   0x2C
-#define ST7735_RAMRD   0x2E
-
-#define ST7735_PTLAR   0x30
-#define ST7735_COLMOD  0x3A
-#define ST7735_MADCTL  0x36
-
-#define ST7735_FRMCTR1 0xB1
-#define ST7735_FRMCTR2 0xB2
-#define ST7735_FRMCTR3 0xB3
-#define ST7735_INVCTR  0xB4
-#define ST7735_DISSET5 0xB6
-
-#define ST7735_PWCTR1  0xC0
-#define ST7735_PWCTR2  0xC1
-#define ST7735_PWCTR3  0xC2
-#define ST7735_PWCTR4  0xC3
-#define ST7735_PWCTR5  0xC4
-#define ST7735_VMCTR1  0xC5
-
-#define ST7735_RDID1   0xDA
-#define ST7735_RDID2   0xDB
-#define ST7735_RDID3   0xDC
-#define ST7735_RDID4   0xDD
-
-#define ST7735_PWCTR6  0xFC
-
-#define ST7735_GMCTRP1 0xE0
-#define ST7735_GMCTRN1 0xE1
diff --git a/TFT_Drivers/ST7735_Init.h b/TFT_Drivers/ST7735_Init.h
index 549ea31..27b3253 100644
--- a/TFT_Drivers/ST7735_Init.h
+++ b/TFT_Drivers/ST7735_Init.h
@@ -1,7 +1,7 @@
 
 // This is the command sequence that initialises the ST7735 driver
 //
-// This setup information is in a format accecpted by the commandList() function
+// This setup information is in a format accepted by the commandList() function
 // which reduces FLASH space, but on an ESP8266 there is plenty available!
 //
 // See ILI9341_Setup.h file for an alternative simpler format
@@ -186,4 +186,4 @@
        }
        commandList(Rcmd3);
      }
-}
\ No newline at end of file
+}
diff --git a/TFT_Drivers/ST7735_Rotation.h b/TFT_Drivers/ST7735_Rotation.h
index 36a1066..6b38560 100644
--- a/TFT_Drivers/ST7735_Rotation.h
+++ b/TFT_Drivers/ST7735_Rotation.h
@@ -1,5 +1,5 @@
 
-// This is the command sequence that rotates the ILI9341 driver coordinate frame
+// This is the command sequence that rotates the ST7735 driver coordinate frame
 
   rotation = m % 4; // Limit the range of values to 0-3
 
diff --git a/TFT_Drivers/XXXXXXX_init.h b/TFT_Drivers/XXXXXXX_init.h
index f547e1e..4873eff 100644
--- a/TFT_Drivers/XXXXXXX_init.h
+++ b/TFT_Drivers/XXXXXXX_init.h
@@ -1,9 +1,9 @@
+// These are various test setups and are not used by the library!
 
-// This is the command sequence that initialises the ILI9481 driver
+// This is the command sequence that initialises the ????? driver
 //
 // This setup information uses simple 8 bit SPI writecommand() and writedata() functions
-//
-// See ST7735_Setup.h file for an alternative format
+
 
 {
 #if defined (TINYLCD)
diff --git a/User_Setups/Setup1_ILI9341.h b/User_Setups/Setup1_ILI9341.h
index b7d4628..82b0469 100644
--- a/User_Setups/Setup1_ILI9341.h
+++ b/User_Setups/Setup1_ILI9341.h
@@ -17,6 +17,11 @@
 #define ILI9341_DRIVER
 //#define ST7735_DRIVER
 
+// For ST7735 and ILI9163 ONLY, define the pixel width and height in portrait orientation
+//#define TFT_WIDTH  128
+//#define TFT_HEIGHT 160
+//#define TFT_HEIGHT 128
+
 // For ST7735 ONLY, define the type of display, originally this was based on the
 // colour of the tab on the screen protector film but this is not always true, so try
 // out the different options below if the screen does not display graphics correctly,
diff --git a/User_Setups/Setup2_ST7735.h b/User_Setups/Setup2_ST7735.h
index 19f40c5..8f1c1c2 100644
--- a/User_Setups/Setup2_ST7735.h
+++ b/User_Setups/Setup2_ST7735.h
@@ -17,6 +17,11 @@
 //#define ILI9341_DRIVER
 #define ST7735_DRIVER
 
+// For ST7735 and ILI9163 ONLY, define the pixel width and height in portrait orientation
+#define TFT_WIDTH  128
+#define TFT_HEIGHT 160
+//#define TFT_HEIGHT 128
+
 // For ST7735 ONLY, define the type of display, originally this was based on the
 // colour of the tab on the screen protector film but this is not always true, so try
 // out the different options below if the screen does not display graphics correctly,
@@ -31,11 +36,6 @@
 #define ST7735_REDTAB
 //#define ST7735_BLACKTAB
 
-// For ST7735 ONLY define the width and height in portrait orientation
-#define TFT_WIDTH  128
-#define TFT_HEIGHT 160
-//#define TFT_HEIGHT 128
-
 // ##################################################################################
 //
 // Section 1. Define the pins that are used to interface with the display here
diff --git a/User_Setups/Setup3_ILI9163.h b/User_Setups/Setup3_ILI9163.h
index 97c4132..56cfccd 100644
--- a/User_Setups/Setup3_ILI9163.h
+++ b/User_Setups/Setup3_ILI9163.h
@@ -18,6 +18,10 @@
 //#define ST7735_DRIVER
 #define ILI9163_DRIVER
 
+// For ST7735 and ILI9163 ONLY, define the pixel width and height in portrait orientation
+#define TFT_WIDTH  128
+#define TFT_HEIGHT 160
+//#define TFT_HEIGHT 128
 
 // ##################################################################################
 //
diff --git a/User_Setups/Setup6_RPi_Wr_ILI9486.h b/User_Setups/Setup6_RPi_Wr_ILI9486.h
index c515b44..665ce77 100644
--- a/User_Setups/Setup6_RPi_Wr_ILI9486.h
+++ b/User_Setups/Setup6_RPi_Wr_ILI9486.h
@@ -20,6 +20,11 @@
 //#define S6D02A1_DRIVER
 #define RPI_ILI9486_DRIVER // 20MHz maximum SPI
 
+// For ST7735 and ILI9163 ONLY, define the pixel width and height in portrait orientation
+//#define TFT_WIDTH  128
+//#define TFT_HEIGHT 160
+//#define TFT_HEIGHT 128
+
 // For ST7735 ONLY, define the type of display, originally this was based on the
 // colour of the tab on the screen protector film but this is not always true, so try
 // out the different options below if the screen does not display graphics correctly,
@@ -34,11 +39,6 @@
 //#define ST7735_REDTAB
 //#define ST7735_BLACKTAB
 
-// For ST7735 ONLY, define the pixel width and height in portrait orientation
-//#define TFT_WIDTH  128
-//#define TFT_HEIGHT 160
-//#define TFT_HEIGHT 128
-
 // ##################################################################################
 //
 // Section 1. Define the pins that are used to interface with the display here
diff --git a/User_Setups/SetupX_Template.h b/User_Setups/SetupX_Template.h
index fe4698a..cc28faa 100644
--- a/User_Setups/SetupX_Template.h
+++ b/User_Setups/SetupX_Template.h
@@ -19,6 +19,11 @@
 #define ILI9341_DRIVER
 //#define ST7735_DRIVER
 
+// For ST7735 and ILI9163 ONLY, define the pixel width and height in portrait orientation
+//#define TFT_WIDTH  128
+//#define TFT_HEIGHT 160
+//#define TFT_HEIGHT 128
+
 // For ST7735 ONLY, define the type of display, originally this was based on the
 // colour of the tab on the screen protector film but this is not always true, so try
 // out the different options below if the screen does not display graphics correctly,
@@ -32,11 +37,6 @@
 //#define ST7735_REDTAB
 //#define ST7735_BLACKTAB
 
-// For ST7735 ONLY define the width and height in portrait orientation
-//#define TFT_WIDTH  128
-//#define TFT_HEIGHT 160
-//#define TFT_HEIGHT 128
-
 // ##################################################################################
 //
 // Section 1. Define the pins that are used to interface with the display here