diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 27d3df8..9c9792c 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -1,5 +1,4 @@
 name: build
-
 on:
   push:
     paths:
@@ -9,20 +8,34 @@ on:
     paths:
       - '**.kicad_sch'
       - '**.kicad_pcb'
-
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    # Use current kicad repo
+    - uses: actions/checkout@master
+    
+    # Run bash command to get kicad file name. 
+    - name: Get Kicad Project Name
+      run: echo "PROJECT_NAME=$(basename *.kicad_pro .kicad_pro)" >> $GITHUB_ENV
+    # Checkout kibot config repo
+    - name: Get Kibot Config
+      uses: actions/checkout@master
+      with:
+        repository: Cimos/kibot-config
+        path: ./kibot-config
+
+    
+    # Use kibot build.
     - uses: INTI-CMNB/KiBot@v1.7.0
       with:
-        # Required - kibot config file
-        config: config.kibot.yaml
+        config: kibot-config/build.kibot.yaml
         dir: output
-        schema: 'Mad_RP2040.kicad_sch'
-        board: 'Mad_RP2040.kicad_pcb'
-    - name: upload results
+        schema: '${{ env.PROJECT_NAME }}.kicad_sch'
+        board: '${{ env.PROJECT_NAME }}.kicad_pcb'
+    
+    # Update artifacts
+    - name: Upload Results
       uses: actions/upload-artifact@v2
       with:
         name: output
diff --git a/Mad_RP2040.kicad_pro b/Mad_RP2040.kicad_pro
index 78fb715..7881016 100644
--- a/Mad_RP2040.kicad_pro
+++ b/Mad_RP2040.kicad_pro
@@ -510,7 +510,9 @@
       "Net-(U1-D+_in)": "USB",
       "Net-(U1-D-_in)": "USB",
       "Net-(U5-D+)": "USB",
-      "Net-(U5-D-)": "USB"
+      "Net-(U5-D-)": "USB",
+      "unconnected-(U1-D+_out-Pad6)": "USB",
+      "unconnected-(U1-D-_out-Pad5)": "USB"
     },
     "netclass_patterns": []
   },
diff --git a/Mad_RP2040.kicad_sch b/Mad_RP2040.kicad_sch
index b8531a5..cbbbdbb 100644
--- a/Mad_RP2040.kicad_sch
+++ b/Mad_RP2040.kicad_sch
@@ -3995,7 +3995,7 @@
 	(netclass_flag ""
 		(length 2.54)
 		(shape round)
-		(at 93.98 67.945 0)
+		(at 94.615 67.945 0)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -4005,7 +4005,7 @@
 		)
 		(uuid "012db034-6035-432b-a7bd-93ff5e9e8834")
 		(property "Netclass" "USB"
-			(at 94.6785 65.405 0)
+			(at 95.3135 65.405 0)
 			(effects
 				(font
 					(size 1.27 1.27)
@@ -4041,7 +4041,7 @@
 	(netclass_flag ""
 		(length 2.54)
 		(shape round)
-		(at 93.98 70.485 180)
+		(at 94.615 70.485 180)
 		(fields_autoplaced yes)
 		(effects
 			(font
@@ -4051,7 +4051,7 @@
 		)
 		(uuid "24c67776-e61d-4eee-ae06-01298139550f")
 		(property "Netclass" "USB"
-			(at 94.6785 73.025 0)
+			(at 95.3135 73.025 0)
 			(effects
 				(font
 					(size 1.27 1.27)
diff --git a/config.kibot.yaml b/config.kibot.yaml
deleted file mode 100644
index c79a1db..0000000
--- a/config.kibot.yaml
+++ /dev/null
@@ -1,133 +0,0 @@
-# Gerber and drill files for JLCPCB, without stencil
-# URL: https://jlcpcb.com/
-# Based on setting used by Gerber Zipper (https://github.com/g200kg/kicad-gerberzipper)
-kibot:
-  version: 1
-
-filters:
-  - name: only_jlc_parts
-    comment: 'Only parts with JLC (LCSC) code'
-    type: generic
-    include_only:
-      - column: 'LCSC#'
-        regex: '^C\d+'
-
-variants:
-  - name: rotated
-    comment: 'Just a place holder for the rotation filter'
-    type: kibom
-    variant: rotated
-    pre_transform: _rot_footprint
-
-outputs:
-  - name: JLCPCB_gerbers
-    comment: Gerbers compatible with JLCPCB
-    type: gerber
-    dir: JLCPCB
-    options: &gerber_options
-      exclude_edge_layer: true
-      exclude_pads_from_silkscreen: true
-      plot_sheet_reference: false
-      plot_footprint_refs: true
-      plot_footprint_values: false
-      force_plot_invisible_refs_vals: false
-      tent_vias: true
-      use_protel_extensions: true
-      create_gerber_job_file: false
-      disable_aperture_macros: true
-      gerber_precision: 4.6
-      use_gerber_x2_attributes: false
-      use_gerber_net_attributes: false
-      line_width: 0.1
-      subtract_mask_from_silk: true
-      inner_extension_pattern: '.g%n'
-    layers:
-      # Note: a more generic approach is to use 'copper' but then the filenames
-      # are slightly different.
-      - F.Cu
-      - B.Cu
-      - In1.Cu
-      - In2.Cu
-      - In3.Cu
-      - In4.Cu
-      - In5.Cu
-      - In6.Cu
-      - F.SilkS
-      - B.SilkS
-      - F.Mask
-      - B.Mask
-      - Edge.Cuts
-
-  - name: JLCPCB_drill
-    comment: Drill files compatible with JLCPCB
-    type: excellon
-    dir: JLCPCB
-    options:
-      pth_and_npth_single_file: false
-      pth_id: '-PTH'
-      npth_id: '-NPTH'
-      metric_units: true
-      map: gerber
-      route_mode_for_oval_holes: false
-      output: "%f%i.%x"
-
-  - name: 'JLCPCB_position'
-    comment: "Pick and place file, JLCPCB style"
-    type: position
-    dir: JLCPCB
-    options:
-      variant: rotated
-      output: '%f_cpl_jlc.%x'
-      format: CSV
-      units: millimeters
-      separate_files_for_front_and_back: false
-      only_smd: true
-      columns:
-        - id: Ref
-          name: Designator
-        - Val
-        - Package
-        - id: PosX
-          name: "Mid X"
-        - id: PosY
-          name: "Mid Y"
-        - id: Rot
-          name: Rotation
-        - id: Side
-          name: Layer
-
-  - name: 'JLCPCB_bom'
-    comment: "BoM for JLCPCB"
-    type: bom
-    dir: JLCPCB
-    options:
-      output: '%f_%i_jlc.%x'
-      exclude_filter: 'only_jlc_parts'
-      ref_separator: ','
-      columns:
-        - field: Value
-          name: Comment
-        - field: References
-          name: Designator
-        - Footprint
-        - field: 'LCSC#'
-          name: 'LCSC Part #'
-      csv:
-        hide_pcb_info: true
-        hide_stats_info: true
-        quote_all: true
-
-  - name: JLCPCB
-    comment: ZIP file for JLCPCB
-    type: compress
-    dir: JLCPCB
-    options:
-      files:
-        - from_output: JLCPCB_gerbers
-          dest: /
-        - from_output: JLCPCB_drill
-          dest: /
-        - from_output: JLCPCB_position
-          dest: /
-        - from_output: JLCPCB_bom
-          dest: /