diff --git a/Marlin/src/pins/stm32f1/pins_CHITU3D.h b/Marlin/src/pins/stm32f1/pins_CHITU3D.h
index 2411500fb2b93e5029afd7564e47d9c08e8d231e..2db6b1bc0b92c97248c29340d1759e2266858631 100644
--- a/Marlin/src/pins/stm32f1/pins_CHITU3D.h
+++ b/Marlin/src/pins/stm32f1/pins_CHITU3D.h
@@ -86,7 +86,7 @@
 //
 #define SDSS               -1
 #define LED_PIN            -1
-#define CASE_LIGHT_PIN      8
+#define CASE_LIGHT_PIN     PA8   // 8
 
 #define PS_ON_PIN          -1
 #define KILL_PIN           PD6      // LED strip 24v
@@ -111,8 +111,8 @@
 //
 // Temperature Sensors
 //
-#define TEMP_BED_PIN       PA0   // Analog Input
-#define TEMP_0_PIN         PA1   // Analog Input
+#define TEMP_BED_PIN       PA0  // Analog Input
+#define TEMP_0_PIN         PA1  // Analog Input
 #define TEMP_1_PIN         -1   // Analog Input
 #define TEMP_2_PIN         -1   // Analog Input
 
@@ -122,9 +122,9 @@
 #if HAS_SPI_LCD
 
   #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
-    #define LCD_PINS_RS         49   // CS chip select /SS chip slave select
-    #define LCD_PINS_ENABLE     51   // SID (MOSI)
-    #define LCD_PINS_D4         52   // SCK (CLK) clock
+    #define LCD_PINS_RS         PD1   // 49  // CS chip select /SS chip slave select
+    #define LCD_PINS_ENABLE     PD3   // 51  // SID (MOSI)
+    #define LCD_PINS_D4         PD4   // 52  // SCK (CLK) clock
   #elif BOTH(NEWPANEL, PANEL_ONE)
     #define LCD_PINS_RS         PB8
     #define LCD_PINS_ENABLE     PD2
@@ -140,13 +140,13 @@
     #define LCD_PINS_D6         PB14
     #define LCD_PINS_D7         PB15
     #if DISABLED(NEWPANEL)
-      #define BEEPER_PIN        33
+      #define BEEPER_PIN        PC1   // 33
       // Buttons attached to a shift register
       // Not wired yet
-      //#define SHIFT_CLK       38
-      //#define SHIFT_LD        42
-      //#define SHIFT_OUT       40
-      //#define SHIFT_EN        17
+      //#define SHIFT_CLK       PC6   // 38
+      //#define SHIFT_LD        PC10  // 42
+      //#define SHIFT_OUT       PC8   // 40
+      //#define SHIFT_EN        PA1   // 17
     #endif
   #endif
 
@@ -154,125 +154,125 @@
 
     #if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
 
-      #define BEEPER_PIN        37
+      #define BEEPER_PIN        PC5
 
-      #define BTN_EN1           31
-      #define BTN_EN2           33
-      #define BTN_ENC           35
+      #define BTN_EN1           PB15  // 31
+      #define BTN_EN2           PC1   // 33
+      #define BTN_ENC           PC3   // 35
 
-      #define SD_DETECT_PIN     49
-      #define KILL_PIN          41
+      #define SD_DETECT_PIN     PD1   // 49
+      #define KILL_PIN          PC9   // 41
 
       #if ENABLED(BQ_LCD_SMART_CONTROLLER)
-        #define LCD_BACKLIGHT_PIN 39
+        #define LCD_BACKLIGHT_PIN PC7   // 39
       #endif
 
     #elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
 
-      #define BTN_EN1           64
-      #define BTN_EN2           59
-      #define BTN_ENC           63
-      #define SD_DETECT_PIN     42
+      #define BTN_EN1           PE0   // 64
+      #define BTN_EN2           PD11  // 59
+      #define BTN_ENC           PD15  // 63
+      #define SD_DETECT_PIN     PC10  // 42
 
     #elif ENABLED(LCD_I2C_PANELOLU2)
 
-      #define BTN_EN1           47
-      #define BTN_EN2           43
-      #define BTN_ENC           32
-      #define LCD_SDSS          53
+      #define BTN_EN1           PC15  // 47
+      #define BTN_EN2           PC11  // 43
+      #define BTN_ENC           PC0   // 32
+      #define LCD_SDSS          PD5   // 53
       #define SD_DETECT_PIN     -1
-      #define KILL_PIN          41
+      #define KILL_PIN          PC9   // 41
 
     #elif ENABLED(LCD_I2C_VIKI)
 
-      #define BTN_EN1           22   // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
-      #define BTN_EN2            7   // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
+      #define BTN_EN1           PB6   // 22   // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
+      #define BTN_EN2           PA7   //  7   // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
 
       #define BTN_ENC           -1
-      #define LCD_SDSS          53
-      #define SD_DETECT_PIN     49
+      #define LCD_SDSS          PD5   // 53
+      #define SD_DETECT_PIN     PD1   // 49
 
     #elif ANY(VIKI2, miniVIKI)
 
-      #define BEEPER_PIN        33
+      #define BEEPER_PIN        PC1   // 33
 
       // Pins for DOGM SPI LCD Support
-      #define DOGLCD_A0         44
-      #define DOGLCD_CS         45
+      #define DOGLCD_A0         PC12  // 44
+      #define DOGLCD_CS         PC13  // 45
       #define LCD_SCREEN_ROT_180
 
-      #define BTN_EN1           22
-      #define BTN_EN2            7
-      #define BTN_ENC           39
+      #define BTN_EN1           PB6   // 22
+      #define BTN_EN2           PA7   //  7
+      #define BTN_ENC           PC7   // 39
 
-      #define SDSS              53
+      #define SDSS              PD5   // 53
       #define SD_DETECT_PIN     -1   // Pin 49 for display sd interface, 72 for easy adapter board
 
-      #define KILL_PIN          31
+      #define KILL_PIN          PB15  // 31
 
-      #define STAT_LED_RED_PIN  32
-      #define STAT_LED_BLUE_PIN 35
+      #define STAT_LED_RED_PIN  PC0   // 32
+      #define STAT_LED_BLUE_PIN PC3   // 35
 
     #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
-      #define BTN_EN1           35
-      #define BTN_EN2           37
-      #define BTN_ENC           31
-      #define SD_DETECT_PIN     49
-      #define LCD_SDSS          53
-      #define KILL_PIN          41
-      #define BEEPER_PIN        23
-      #define DOGLCD_CS         29
-      #define DOGLCD_A0         27
-      #define LCD_BACKLIGHT_PIN 33
+      #define BTN_EN1           PC3   // 35
+      #define BTN_EN2           PC5   // 37
+      #define BTN_ENC           PB15  // 31
+      #define SD_DETECT_PIN     PD1   // 49
+      #define LCD_SDSS          PD5   // 53
+      #define KILL_PIN          PC9   // 41
+      #define BEEPER_PIN        PB7   // 23
+      #define DOGLCD_CS         PB13  // 29
+      #define DOGLCD_A0         PB11  // 27
+      #define LCD_BACKLIGHT_PIN PC1   // 33
 
     #elif ENABLED(MINIPANEL)
 
-      #define BEEPER_PIN        42
+      #define BEEPER_PIN        PC10  // 42
       // Pins for DOGM SPI LCD Support
-      #define DOGLCD_A0         44
-      #define DOGLCD_CS         66
-      #define LCD_BACKLIGHT_PIN 65   // backlight LED on A11/D65
-      #define SDSS              53
+      #define DOGLCD_A0         PC12  // 44
+      #define DOGLCD_CS         PE2   // 66
+      #define LCD_BACKLIGHT_PIN PE1   // 65   // backlight LED on A11/D65
+      #define SDSS              PD5   // 53
 
-      #define KILL_PIN          64
+      #define KILL_PIN          PE0   // 64
       // GLCD features
       // Uncomment screen orientation
       //#define LCD_SCREEN_ROT_90
       //#define LCD_SCREEN_ROT_180
       //#define LCD_SCREEN_ROT_270
       // The encoder and click button
-      #define BTN_EN1           40
-      #define BTN_EN2           63
-      #define BTN_ENC           59
+      #define BTN_EN1           PC8   // 40
+      #define BTN_EN2           PD15  // 63
+      #define BTN_ENC           PD11  // 59
       // not connected to a pin
-      #define SD_DETECT_PIN     49
+      #define SD_DETECT_PIN     PD1   // 49
 
     #else
 
       // Beeper on AUX-4
-      #define BEEPER_PIN        33
+      #define BEEPER_PIN        PC1   // 33
 
       // Buttons directly attached to AUX-2
       #if ENABLED(REPRAPWORLD_KEYPAD)
-        #define BTN_EN1         64
-        #define BTN_EN2         59
-        #define BTN_ENC         63
-        #define SHIFT_OUT       40
-        #define SHIFT_CLK       44
-        #define SHIFT_LD        42
+        #define BTN_EN1         PE0   // 64
+        #define BTN_EN2         PD11  // 59
+        #define BTN_ENC         PD15  // 63
+        #define SHIFT_OUT       PC8   // 40
+        #define SHIFT_CLK       PC12  // 44
+        #define SHIFT_LD        PC10  // 42
       #elif ENABLED(PANEL_ONE)
-        #define BTN_EN1         59   // AUX2 PIN 3
-        #define BTN_EN2         63   // AUX2 PIN 4
-        #define BTN_ENC         49   // AUX3 PIN 7
+        #define BTN_EN1         PD11  // 59   // AUX2 PIN 3
+        #define BTN_EN2         PD15  // 63   // AUX2 PIN 4
+        #define BTN_ENC         PD1   // 49   // AUX3 PIN 7
       #else
-        #define BTN_EN1         37
-        #define BTN_EN2         35
-        #define BTN_ENC         31
+        #define BTN_EN1         PC5   // 37
+        #define BTN_EN2         PC3   // 35
+        #define BTN_ENC         PB15  // 31
       #endif
 
       #if ENABLED(G3D_PANEL)
-        #define SD_DETECT_PIN   49
-        #define KILL_PIN        41
+        #define SD_DETECT_PIN   PD1   // 49
+        #define KILL_PIN        PC9   // 41
       #else
         //#define SD_DETECT_PIN -1   // Ramps doesn't use this
       #endif