diff --git a/ulx3s.kicad_pcb b/ulx3s.kicad_pcb
index d88a769..88f069d 100644
--- a/ulx3s.kicad_pcb
+++ b/ulx3s.kicad_pcb
@@ -313,15 +313,6 @@
     (add_net /analog/AUDIO_L)
     (add_net /analog/AUDIO_R)
     (add_net /blinkey/BTNPU)
-    (add_net /flash/FLASH_MISO)
-    (add_net /flash/FLASH_MOSI)
-    (add_net /flash/FLASH_SCK)
-    (add_net /flash/FLASH_nCS)
-    (add_net /flash/FLASH_nHOLD)
-    (add_net /flash/FLASH_nWP)
-    (add_net /flash/FPGA_DONE)
-    (add_net /flash/FPGA_INITN)
-    (add_net /flash/FPGA_PROGRAMN)
     (add_net /gpdi/VREF2)
     (add_net /gpio/IN5V)
     (add_net /gpio/OUT5V)
@@ -339,21 +330,6 @@
     (add_net /power/WKUP)
     (add_net /power/WKn)
     (add_net /usb/FT3V3)
-    (add_net AUDIO_L0)
-    (add_net AUDIO_L1)
-    (add_net AUDIO_L2)
-    (add_net AUDIO_L3)
-    (add_net AUDIO_R0)
-    (add_net AUDIO_R1)
-    (add_net AUDIO_R2)
-    (add_net AUDIO_R3)
-    (add_net FTDI_RXD)
-    (add_net FTDI_TXD)
-    (add_net FTDI_nCTS)
-    (add_net FTDI_nDCD)
-    (add_net FTDI_nDTR)
-    (add_net FTDI_nRI)
-    (add_net FTDI_nRTS)
     (add_net FTDI_nSUSPEND)
     (add_net "Net-(BTN0-Pad1)")
     (add_net "Net-(D9-Pad1)")
@@ -361,20 +337,10 @@
     (add_net "Net-(L2-Pad1)")
     (add_net "Net-(L3-Pad1)")
     (add_net "Net-(Q2-Pad3)")
-    (add_net OLED_CS)
-    (add_net OLED_DC)
-    (add_net OLED_MOSI)
-    (add_net OLED_RES)
     (add_net SHUTDOWN)
     (add_net USB5V)
     (add_net USB_FTDI_DM)
     (add_net USB_FTDI_DP)
-    (add_net WIFI_EN)
-    (add_net WIFI_GPIO0)
-    (add_net WIFI_GPIO15)
-    (add_net WIFI_GPIO2)
-    (add_net WIFI_RXD)
-    (add_net WIFI_TXD)
     (add_net nRESET)
   )
 
@@ -385,6 +351,15 @@
     (via_drill 0.15)
     (uvia_dia 0.3)
     (uvia_drill 0.1)
+    (add_net /flash/FLASH_MISO)
+    (add_net /flash/FLASH_MOSI)
+    (add_net /flash/FLASH_SCK)
+    (add_net /flash/FLASH_nCS)
+    (add_net /flash/FLASH_nHOLD)
+    (add_net /flash/FLASH_nWP)
+    (add_net /flash/FPGA_DONE)
+    (add_net /flash/FPGA_INITN)
+    (add_net /flash/FPGA_PROGRAMN)
     (add_net /gpio/A10)
     (add_net /gpio/A11)
     (add_net /gpio/A12)
@@ -441,6 +416,14 @@
     (add_net /gpio/E7)
     (add_net /gpio/E8)
     (add_net /gpio/E9)
+    (add_net AUDIO_L0)
+    (add_net AUDIO_L1)
+    (add_net AUDIO_L2)
+    (add_net AUDIO_L3)
+    (add_net AUDIO_R0)
+    (add_net AUDIO_R1)
+    (add_net AUDIO_R2)
+    (add_net AUDIO_R3)
     (add_net BTN_D)
     (add_net BTN_F1)
     (add_net BTN_F2)
@@ -448,6 +431,13 @@
     (add_net BTN_PWRn)
     (add_net BTN_R)
     (add_net BTN_U)
+    (add_net FTDI_RXD)
+    (add_net FTDI_TXD)
+    (add_net FTDI_nCTS)
+    (add_net FTDI_nDCD)
+    (add_net FTDI_nDTR)
+    (add_net FTDI_nRI)
+    (add_net FTDI_nRTS)
     (add_net GND)
     (add_net GPDI_5V_SCL)
     (add_net GPDI_5V_SDA)
@@ -476,6 +466,10 @@
     (add_net LED5)
     (add_net LED6)
     (add_net LED7)
+    (add_net OLED_CS)
+    (add_net OLED_DC)
+    (add_net OLED_MOSI)
+    (add_net OLED_RES)
     (add_net SDRAM_A0)
     (add_net SDRAM_A1)
     (add_net SDRAM_A10)
@@ -519,6 +513,12 @@
     (add_net SD_CMD)
     (add_net SD_D0)
     (add_net SD_D1)
+    (add_net WIFI_EN)
+    (add_net WIFI_GPIO0)
+    (add_net WIFI_GPIO15)
+    (add_net WIFI_GPIO2)
+    (add_net WIFI_RXD)
+    (add_net WIFI_TXD)
   )
 
   (module Keystone_3000_1x12mm-CoinCell:Keystone_3000_1x12mm-CoinCell (layer B.Cu) (tedit 58D7D5B5) (tstamp 58D7ADD9)