diff --git a/Gerber/rgb_lcd_pihat-B_Cu.gbr b/Gerber/rgb_lcd_pihat-B_Cu.gbr
index 6195791..b500798 100644
--- a/Gerber/rgb_lcd_pihat-B_Cu.gbr
+++ b/Gerber/rgb_lcd_pihat-B_Cu.gbr
@@ -1,12 +1,12 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.1.9+dfsg1-1~bpo10+1*
-G04 #@! TF.CreationDate,2021-04-22T21:33:44+00:00*
+G04 #@! TF.CreationDate,2021-04-26T12:45:49+00:00*
 G04 #@! TF.ProjectId,rgb_lcd_pihat,7267625f-6c63-4645-9f70-696861742e6b,rev?*
 G04 #@! TF.SameCoordinates,Original*
 G04 #@! TF.FileFunction,Copper,L4,Bot*
 G04 #@! TF.FilePolarity,Positive*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 5.1.9+dfsg1-1~bpo10+1) date 2021-04-22 21:33:44*
+G04 Created by KiCad (PCBNEW 5.1.9+dfsg1-1~bpo10+1) date 2021-04-26 12:45:49*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/Gerber/rgb_lcd_pihat-B_Mask.gbr b/Gerber/rgb_lcd_pihat-B_Mask.gbr
index 5b7fef5..38954ce 100644
--- a/Gerber/rgb_lcd_pihat-B_Mask.gbr
+++ b/Gerber/rgb_lcd_pihat-B_Mask.gbr
@@ -1,12 +1,12 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.1.9+dfsg1-1~bpo10+1*
-G04 #@! TF.CreationDate,2021-04-22T21:33:44+00:00*
+G04 #@! TF.CreationDate,2021-04-26T12:45:50+00:00*
 G04 #@! TF.ProjectId,rgb_lcd_pihat,7267625f-6c63-4645-9f70-696861742e6b,rev?*
 G04 #@! TF.SameCoordinates,Original*
 G04 #@! TF.FileFunction,Soldermask,Bot*
 G04 #@! TF.FilePolarity,Negative*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 5.1.9+dfsg1-1~bpo10+1) date 2021-04-22 21:33:44*
+G04 Created by KiCad (PCBNEW 5.1.9+dfsg1-1~bpo10+1) date 2021-04-26 12:45:50*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/Gerber/rgb_lcd_pihat-B_SilkS.gbr b/Gerber/rgb_lcd_pihat-B_SilkS.gbr
index ce240f7..4e8f641 100644
--- a/Gerber/rgb_lcd_pihat-B_SilkS.gbr
+++ b/Gerber/rgb_lcd_pihat-B_SilkS.gbr
@@ -1,12 +1,12 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.1.9+dfsg1-1~bpo10+1*
-G04 #@! TF.CreationDate,2021-04-22T21:33:44+00:00*
+G04 #@! TF.CreationDate,2021-04-26T12:45:50+00:00*
 G04 #@! TF.ProjectId,rgb_lcd_pihat,7267625f-6c63-4645-9f70-696861742e6b,rev?*
 G04 #@! TF.SameCoordinates,Original*
 G04 #@! TF.FileFunction,Legend,Bot*
 G04 #@! TF.FilePolarity,Positive*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 5.1.9+dfsg1-1~bpo10+1) date 2021-04-22 21:33:44*
+G04 Created by KiCad (PCBNEW 5.1.9+dfsg1-1~bpo10+1) date 2021-04-26 12:45:50*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/Gerber/rgb_lcd_pihat-Edge_Cuts.gbr b/Gerber/rgb_lcd_pihat-Edge_Cuts.gbr
index c7e1bfa..5ddbfc8 100644
--- a/Gerber/rgb_lcd_pihat-Edge_Cuts.gbr
+++ b/Gerber/rgb_lcd_pihat-Edge_Cuts.gbr
@@ -1,11 +1,11 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.1.9+dfsg1-1~bpo10+1*
-G04 #@! TF.CreationDate,2021-04-22T21:33:44+00:00*
+G04 #@! TF.CreationDate,2021-04-26T12:45:50+00:00*
 G04 #@! TF.ProjectId,rgb_lcd_pihat,7267625f-6c63-4645-9f70-696861742e6b,rev?*
 G04 #@! TF.SameCoordinates,Original*
 G04 #@! TF.FileFunction,Profile,NP*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 5.1.9+dfsg1-1~bpo10+1) date 2021-04-22 21:33:44*
+G04 Created by KiCad (PCBNEW 5.1.9+dfsg1-1~bpo10+1) date 2021-04-26 12:45:50*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/Gerber/rgb_lcd_pihat-F_Cu.gbr b/Gerber/rgb_lcd_pihat-F_Cu.gbr
index e9d7203..a34ff1f 100644
--- a/Gerber/rgb_lcd_pihat-F_Cu.gbr
+++ b/Gerber/rgb_lcd_pihat-F_Cu.gbr
@@ -1,12 +1,12 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.1.9+dfsg1-1~bpo10+1*
-G04 #@! TF.CreationDate,2021-04-22T21:33:44+00:00*
+G04 #@! TF.CreationDate,2021-04-26T12:45:49+00:00*
 G04 #@! TF.ProjectId,rgb_lcd_pihat,7267625f-6c63-4645-9f70-696861742e6b,rev?*
 G04 #@! TF.SameCoordinates,Original*
 G04 #@! TF.FileFunction,Copper,L1,Top*
 G04 #@! TF.FilePolarity,Positive*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 5.1.9+dfsg1-1~bpo10+1) date 2021-04-22 21:33:44*
+G04 Created by KiCad (PCBNEW 5.1.9+dfsg1-1~bpo10+1) date 2021-04-26 12:45:49*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/Gerber/rgb_lcd_pihat-F_Mask.gbr b/Gerber/rgb_lcd_pihat-F_Mask.gbr
index f82539b..3785d5e 100644
--- a/Gerber/rgb_lcd_pihat-F_Mask.gbr
+++ b/Gerber/rgb_lcd_pihat-F_Mask.gbr
@@ -1,12 +1,12 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.1.9+dfsg1-1~bpo10+1*
-G04 #@! TF.CreationDate,2021-04-22T21:33:44+00:00*
+G04 #@! TF.CreationDate,2021-04-26T12:45:50+00:00*
 G04 #@! TF.ProjectId,rgb_lcd_pihat,7267625f-6c63-4645-9f70-696861742e6b,rev?*
 G04 #@! TF.SameCoordinates,Original*
 G04 #@! TF.FileFunction,Soldermask,Top*
 G04 #@! TF.FilePolarity,Negative*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 5.1.9+dfsg1-1~bpo10+1) date 2021-04-22 21:33:44*
+G04 Created by KiCad (PCBNEW 5.1.9+dfsg1-1~bpo10+1) date 2021-04-26 12:45:50*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/Gerber/rgb_lcd_pihat-F_SilkS.gbr b/Gerber/rgb_lcd_pihat-F_SilkS.gbr
index 95d88be..8c45400 100644
--- a/Gerber/rgb_lcd_pihat-F_SilkS.gbr
+++ b/Gerber/rgb_lcd_pihat-F_SilkS.gbr
@@ -1,12 +1,12 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.1.9+dfsg1-1~bpo10+1*
-G04 #@! TF.CreationDate,2021-04-22T21:33:44+00:00*
+G04 #@! TF.CreationDate,2021-04-26T12:45:50+00:00*
 G04 #@! TF.ProjectId,rgb_lcd_pihat,7267625f-6c63-4645-9f70-696861742e6b,rev?*
 G04 #@! TF.SameCoordinates,Original*
 G04 #@! TF.FileFunction,Legend,Top*
 G04 #@! TF.FilePolarity,Positive*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 5.1.9+dfsg1-1~bpo10+1) date 2021-04-22 21:33:44*
+G04 Created by KiCad (PCBNEW 5.1.9+dfsg1-1~bpo10+1) date 2021-04-26 12:45:50*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/Gerber/rgb_lcd_pihat-In1_Cu.gbr b/Gerber/rgb_lcd_pihat-In1_Cu.gbr
index 628bf54..1e30d79 100644
--- a/Gerber/rgb_lcd_pihat-In1_Cu.gbr
+++ b/Gerber/rgb_lcd_pihat-In1_Cu.gbr
@@ -1,12 +1,12 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.1.9+dfsg1-1~bpo10+1*
-G04 #@! TF.CreationDate,2021-04-22T21:33:44+00:00*
+G04 #@! TF.CreationDate,2021-04-26T12:45:49+00:00*
 G04 #@! TF.ProjectId,rgb_lcd_pihat,7267625f-6c63-4645-9f70-696861742e6b,rev?*
 G04 #@! TF.SameCoordinates,Original*
 G04 #@! TF.FileFunction,Copper,L2,Inr*
 G04 #@! TF.FilePolarity,Positive*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 5.1.9+dfsg1-1~bpo10+1) date 2021-04-22 21:33:44*
+G04 Created by KiCad (PCBNEW 5.1.9+dfsg1-1~bpo10+1) date 2021-04-26 12:45:49*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/Gerber/rgb_lcd_pihat-In2_Cu.gbr b/Gerber/rgb_lcd_pihat-In2_Cu.gbr
index 48bd019..5ad1a85 100644
--- a/Gerber/rgb_lcd_pihat-In2_Cu.gbr
+++ b/Gerber/rgb_lcd_pihat-In2_Cu.gbr
@@ -1,12 +1,12 @@
 G04 #@! TF.GenerationSoftware,KiCad,Pcbnew,5.1.9+dfsg1-1~bpo10+1*
-G04 #@! TF.CreationDate,2021-04-22T21:33:44+00:00*
+G04 #@! TF.CreationDate,2021-04-26T12:45:50+00:00*
 G04 #@! TF.ProjectId,rgb_lcd_pihat,7267625f-6c63-4645-9f70-696861742e6b,rev?*
 G04 #@! TF.SameCoordinates,Original*
 G04 #@! TF.FileFunction,Copper,L3,Inr*
 G04 #@! TF.FilePolarity,Positive*
 %FSLAX46Y46*%
 G04 Gerber Fmt 4.6, Leading zero omitted, Abs format (unit mm)*
-G04 Created by KiCad (PCBNEW 5.1.9+dfsg1-1~bpo10+1) date 2021-04-22 21:33:44*
+G04 Created by KiCad (PCBNEW 5.1.9+dfsg1-1~bpo10+1) date 2021-04-26 12:45:50*
 %MOMM*%
 %LPD*%
 G01*
diff --git a/Gerber/rgb_lcd_pihat-JLCPCB.zip b/Gerber/rgb_lcd_pihat-JLCPCB.zip
index 7c0c1c5..3a23d1f 100644
Binary files a/Gerber/rgb_lcd_pihat-JLCPCB.zip and b/Gerber/rgb_lcd_pihat-JLCPCB.zip differ
diff --git a/Gerber/rgb_lcd_pihat-NPTH.drl b/Gerber/rgb_lcd_pihat-NPTH.drl
deleted file mode 100644
index 6adc6a4..0000000
--- a/Gerber/rgb_lcd_pihat-NPTH.drl
+++ /dev/null
@@ -1,27 +0,0 @@
-M48
-; DRILL file {KiCad 5.1.9+dfsg1-1~bpo10+1} date Thu Apr 22 21:33:44 2021
-; FORMAT={-:-/ absolute / inch / decimal}
-; #@! TF.CreationDate,2021-04-22T21:33:44+00:00
-; #@! TF.GenerationSoftware,Kicad,Pcbnew,5.1.9+dfsg1-1~bpo10+1
-; #@! TF.FileFunction,NonPlated,1,4,NPTH
-FMAT,2
-INCH
-T1C0.0236
-T2C0.0354
-T3C0.1260
-%
-G90
-G05
-T1
-X2.1028Y-1.6083
-X2.3303Y-1.6083
-T2
-X2.6854Y-3.3524
-X2.6854Y-3.4705
-T3
-X1.7224Y-1.5157
-X1.7224Y-3.7992
-X2.628Y-1.5157
-X2.628Y-3.7992
-T0
-M30
diff --git a/Gerber/rgb_lcd_pihat-PTH.drl b/Gerber/rgb_lcd_pihatdrill.drl
similarity index 90%
rename from Gerber/rgb_lcd_pihat-PTH.drl
rename to Gerber/rgb_lcd_pihatdrill.drl
index 52699a0..e567d23 100644
--- a/Gerber/rgb_lcd_pihat-PTH.drl
+++ b/Gerber/rgb_lcd_pihatdrill.drl
@@ -1,14 +1,16 @@
 M48
-; DRILL file {KiCad 5.1.9+dfsg1-1~bpo10+1} date Thu Apr 22 21:33:44 2021
+; DRILL file {KiCad 5.1.9+dfsg1-1~bpo10+1} date Mon Apr 26 12:45:50 2021
 ; FORMAT={-:-/ absolute / inch / decimal}
-; #@! TF.CreationDate,2021-04-22T21:33:44+00:00
+; #@! TF.CreationDate,2021-04-26T12:45:50+00:00
 ; #@! TF.GenerationSoftware,Kicad,Pcbnew,5.1.9+dfsg1-1~bpo10+1
-; #@! TF.FileFunction,Plated,1,4,PTH
 FMAT,2
 INCH
 T1C0.0118
 T2C0.0236
 T3C0.0394
+T4C0.0236
+T5C0.0354
+T6C0.1260
 %
 G90
 G05
@@ -167,6 +169,17 @@ X1.8937Y-1.8094
 X1.8937Y-1.9094
 X2.378Y-3.8583
 X2.5039Y-3.8583
+T4
+X2.1028Y-1.6083
+X2.3303Y-1.6083
+T5
+X2.6854Y-3.3524
+X2.6854Y-3.4705
+T6
+X1.7224Y-1.5157
+X1.7224Y-3.7992
+X2.628Y-1.5157
+X2.628Y-3.7992
 T2
 G00X2.0465Y-1.4472
 M15
diff --git a/config.kibot.yaml b/config.kibot.yaml
index 93f85ba..62531df 100644
--- a/config.kibot.yaml
+++ b/config.kibot.yaml
@@ -60,9 +60,7 @@ outputs:
     type: excellon
     dir: Gerber
     options:
-      pth_and_npth_single_file: false
-      pth_id: '-PTH'
-      npth_id: '-NPTH'
+      pth_and_npth_single_file: true
       metric_units: false
       output: "%f%i.%x"