diff --git a/TFT_Drivers/HX8357D_Rotation.h b/TFT_Drivers/HX8357D_Rotation.h
index 9df230b..e5e97e9 100644
--- a/TFT_Drivers/HX8357D_Rotation.h
+++ b/TFT_Drivers/HX8357D_Rotation.h
@@ -5,22 +5,22 @@
   switch (rotation) {
    case 0: // Portrait
      writedata(TFT_MAD_MX | TFT_MAD_MY | TFT_MAD_RGB);
-      _width  = TFT_WIDTH;
-      _height = TFT_HEIGHT;
+      _width  = _init_width;
+      _height = _init_height;
      break;
    case 1: // Landscape (Portrait + 90)
      writedata(TFT_MAD_MV | TFT_MAD_MY | TFT_MAD_RGB);
-      _width  = TFT_HEIGHT;
-      _height = TFT_WIDTH;
+      _width  = _init_height;
+      _height = _init_width;
      break;
    case 2: // Inverter portrait
      writedata(TFT_MAD_RGB);
-      _width  = TFT_WIDTH;
-      _height = TFT_HEIGHT;
+      _width  = _init_width;
+      _height = _init_height;
      break;
    case 3: // Inverted landscape
      writedata(TFT_MAD_MX | TFT_MAD_MV | TFT_MAD_RGB);
-      _width  = TFT_HEIGHT;
-      _height = TFT_WIDTH;
+      _width  = _init_height;
+      _height = _init_width;
      break;
   }
diff --git a/TFT_Drivers/ILI9481_Rotation.h b/TFT_Drivers/ILI9481_Rotation.h
index e80d08e..bfaaa78 100644
--- a/TFT_Drivers/ILI9481_Rotation.h
+++ b/TFT_Drivers/ILI9481_Rotation.h
@@ -5,23 +5,23 @@
   switch (rotation) {
    case 0: // Portrait
      writedata(TFT_MAD_BGR | TFT_MAD_SS);
-      _width  = TFT_WIDTH;
-      _height = TFT_HEIGHT;
+      _width  = _init_width;
+      _height = _init_height;
      break;
    case 1: // Landscape (Portrait + 90)
      writedata(TFT_MAD_MV | TFT_MAD_BGR);
-      _width  = TFT_HEIGHT;
-      _height = TFT_WIDTH;
+      _width  = _init_height;
+      _height = _init_width;
      break;
    case 2: // Inverter portrait
      writedata(TFT_MAD_BGR | TFT_MAD_GS);
-      _width  = TFT_WIDTH;
-      _height = TFT_HEIGHT;
+      _width  = _init_width;
+      _height = _init_height;
      break;
    case 3: // Inverted landscape
      writedata(TFT_MAD_MV | TFT_MAD_BGR | TFT_MAD_SS | TFT_MAD_GS);
-      _width  = TFT_HEIGHT;
-      _height = TFT_WIDTH;
+      _width  = _init_height;
+      _height = _init_width;
      break;
   }
    
\ No newline at end of file
diff --git a/TFT_Drivers/ILI9488_Rotation.h b/TFT_Drivers/ILI9488_Rotation.h
index 6ab17bd..380f8fe 100644
--- a/TFT_Drivers/ILI9488_Rotation.h
+++ b/TFT_Drivers/ILI9488_Rotation.h
@@ -5,23 +5,23 @@
   switch (rotation) {
    case 0: // Portrait
      writedata(TFT_MAD_MX | TFT_MAD_BGR);
-      _width  = TFT_WIDTH;
-      _height = TFT_HEIGHT;
+      _width  = _init_width;
+      _height = _init_height;
      break;
    case 1: // Landscape (Portrait + 90)
      writedata(TFT_MAD_MV | TFT_MAD_BGR);
-      _width  = TFT_HEIGHT;
-      _height = TFT_WIDTH;
+      _width  = _init_height;
+      _height = _init_width;
      break;
    case 2: // Inverter portrait
      writedata(TFT_MAD_MY | TFT_MAD_BGR);
-      _width  = TFT_WIDTH;
-      _height = TFT_HEIGHT;
+      _width  = _init_width;
+      _height = _init_height;
      break;
    case 3: // Inverted landscape
      writedata(TFT_MAD_MX | TFT_MAD_MY | TFT_MAD_MV | TFT_MAD_BGR);
-      _width  = TFT_HEIGHT;
-      _height = TFT_WIDTH;
+      _width  = _init_height;
+      _height = _init_width;
      break;
   }
    
\ No newline at end of file
diff --git a/TFT_Drivers/R61581_Rotation.h b/TFT_Drivers/R61581_Rotation.h
index 4d7dc61..515a556 100644
--- a/TFT_Drivers/R61581_Rotation.h
+++ b/TFT_Drivers/R61581_Rotation.h
@@ -5,23 +5,23 @@
   switch (rotation) {
    case 0: // Portrait
      writedata(TFT_MAD_BGR | TFT_MAD_MX);
-      _width  = TFT_WIDTH;
-      _height = TFT_HEIGHT;
+      _width  = _init_width;
+      _height = _init_height;
      break;
    case 1: // Landscape (Portrait + 90)
      writedata(TFT_MAD_MV | TFT_MAD_BGR);
-      _width  = TFT_HEIGHT;
-      _height = TFT_WIDTH;
+      _width  = _init_height;
+      _height = _init_width;
      break;
    case 2: // Inverter portrait
      writedata(TFT_MAD_BGR | TFT_MAD_GS);
-      _width  = TFT_WIDTH;
-      _height = TFT_HEIGHT;
+      _width  = _init_width;
+      _height = _init_height;
      break;
    case 3: // Inverted landscape
      writedata(TFT_MAD_MV | TFT_MAD_BGR | TFT_MAD_MX | TFT_MAD_GS);
-      _width  = TFT_HEIGHT;
-      _height = TFT_WIDTH;
+      _width  = _init_height;
+      _height = _init_width;
      break;
   }
    
\ No newline at end of file
diff --git a/TFT_Drivers/RM68140_Rotation.h b/TFT_Drivers/RM68140_Rotation.h
index 2f83d61..aebfc95 100644
--- a/TFT_Drivers/RM68140_Rotation.h
+++ b/TFT_Drivers/RM68140_Rotation.h
@@ -10,8 +10,8 @@
      writedata(0);
      writedata(0x22);
      writedata(0x3B);
-      _width  = TFT_WIDTH;
-      _height = TFT_HEIGHT;
+      _width  = _init_width;
+      _height = _init_height;
      break;
    case 1: // Landscape (Portrait + 90)
      writedata(TFT_MAD_MV | TFT_MAD_BGR);
@@ -19,8 +19,8 @@
      writedata(0);
      writedata(0x02);
      writedata(0x3B);
-      _width  = TFT_HEIGHT;
-      _height = TFT_WIDTH;
+      _width  = _init_height;
+      _height = _init_width;
      break;
    case 2: // Inverter portrait
      writedata(TFT_MAD_BGR);
@@ -28,8 +28,8 @@
      writedata(0);
      writedata(0x42);
      writedata(0x3B);
-      _width  = TFT_WIDTH;
-      _height = TFT_HEIGHT;
+      _width  = _init_width;
+      _height = _init_height;
      break;
    case 3: // Inverted landscape
      writedata(TFT_MAD_MV | TFT_MAD_BGR);
@@ -37,8 +37,8 @@
      writedata(0);
      writedata(0x62);
      writedata(0x3B);
-      _width  = TFT_HEIGHT;
-      _height = TFT_WIDTH;
+      _width  = _init_height;
+      _height = _init_width;
      break;
   }