diff --git a/CHANGELOG.md b/CHANGELOG.md
index 697b909..399b6d2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,5 +9,5 @@ All notable changes to this project will be documented in this file.
     Fixed     : for any bug fixes.
     Security  : in case of vulnerabilities.
 
-## [1.0.0] - 2022-11-29
+## [1.0.0] - 2023-01-06
 First working version.
diff --git a/MQTT_energymeter.ino b/MQTT_energymeter.ino
index 06c6b2e..8896213 100644
--- a/MQTT_energymeter.ino
+++ b/MQTT_energymeter.ino
@@ -42,14 +42,14 @@
 
 /* CHANGE THESE VALUES TO CUSTOMIZE DATA LOGGER */
 #define CLIENT_ID       "MeesElectronics"          // Our MQTT client ID
-#define CLIENT_TOPIC    "energy/solar"             // Name of the topic we publish
+#define CLIENT_TOPIC    "distributioncabinet/energy/solar"             // Name of the topic we publish
 //IPAddress IP_MQTT_broker(192, 168, 89, 10);        // IP address of the MQTT broker
 //String string_ip_mqtt_broker = "192.168.88.10";
 char IP_string_MQTT_broker[20] = "192.168.88.11";
-uint16_t MQTT_port = 1884;
+uint16_t MQTT_port = 1883;
 IPAddress IP_MQTT_broker;
 
-#define PULSES_PER_KWH  500                        // 500 pulses from the energy meter is one kWh
+#define PULSES_PER_KWH  1000                        // 500 pulses from the energy meter is one kWh
 /* END USER DEFINABLE VALUES */
 
 uint8_t mac[6] = {MACADDRESS};
@@ -63,7 +63,7 @@ EthernetClient ethClient;
 PubSubClient mqttClient;
 
 #define PULSES_PER_WH   1000/PULSES_PER_KWH        // Calculates how many pulses corresponds to a Wh
-#define INTERVAL        10000                       // 10 sec delay between MQTT publishings
+#define INTERVAL        60000                       // 60 sec delay between MQTT publishings
 long previousMillis;
 
 char numberArray[20];
@@ -71,6 +71,8 @@ uint32_t PulseCount=0;                            // This variable holds the pul
 uint32_t EnergyReading=0;                         // This variable holds the number of Watt-hours
 uint32_t stored_kwh_count=0;                      // Counted whole kWh value sored in EEPROM
 
+#define LED 9
+
 void onDetectInterrupt()
 {
   // The Arduino calls this function when it detects a falling edge on pin 2.
@@ -118,6 +120,9 @@ void setup() {
   pinMode(2, INPUT_PULLUP);
   attachInterrupt(digitalPinToInterrupt(2), onDetectInterrupt, FALLING);
 
+  pinMode(LED, OUTPUT);
+  digitalWrite(LED, HIGH);
+
   // initialize the ethernet device
   //Ethernet.begin(mac,myIP,myDNS,myGW,myMASK);
   Serial.print(F("Configuring ethernet..."));
@@ -240,6 +245,11 @@ void loop() {
         else
         {
           client.write("?",1);
+          //client.write("?\n",2);
+          //client.write(": <IP> sets ip of broker.\n",26);
+          //client.write("P <port> set port op broker.\n",29);
+          //client.write("I prints ip and port of broker.\n",32);
+          //client.write("S saves settings to EEPROM.,27");
           Serial.println(F("?"));
         }
         client.write("\n",1);
@@ -258,6 +268,11 @@ void loop() {
   }
   mqttClient.loop();
   readEnergymeter();
+
+  if (digitalRead(2))
+    digitalWrite(LED, HIGH);
+  else
+    digitalWrite(LED, LOW);
 }
 
 void sendData() {
diff --git a/README.md b/README.md
index 9d7a7e7..01a4a45 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,24 @@
 # Datalogger reading kWh pulses from a utility grid meter and publising it via MQTT
 
-(C) 2022 M. Konstapel https://meezenest.nl/mees
+(C) 2023 M. Konstapel https://meezenest.nl/mees
 
 Inspired by https://www.instructables.com/A-Simple-MQTT-PubSub-Node-With-Arduino-UNO-and-ENC/
 
+![Board layout](./hardware/MQTT_energy_meter_3D_view.png "board layout")
+
+## Design
+
+Most mains energy meters have an LED which flashes 500 or 1000 pulses for every measured kWh. A photo-diode mounted in front of this LED detects the flashes. Every pulse is converted to a clean digital signal by an adjustable comparator with hysteresis followed by a 74HC14 Schmitt-trigger. The resulting pulses can be inverted by means of a jumper. A falling edge triggers an interrupt of the ATMega328. The firmware counts the interrupts and calculates the equivalent energy in Wh. Every 60 seconds the result is published to the MQTT broker on topic 'distributioncabinet/energy/solar'.
+
+![Schematic](./hardware/MQTT_energy_meter.png "schematic")
+
 ## Features
 
 - Runs on low spec microcontroller (Uno, Nano, Mini, and other ATMega328-based boards)
 - Wired ethernet via ENC28J60 Ethernet module
 - Gets ip address via DHCP
 - Stores data in EEPROM to prevent data loss
-- Easy to configure by telnet port 1000
+- Easy to configure via telnet port 1000
 
 ## Requirements
 
@@ -22,7 +30,7 @@ Inspired by https://www.instructables.com/A-Simple-MQTT-PubSub-Node-With-Arduino
 
 The Device gets its IP address via DHCP. Make sure you have a working DHCP server on the network.
 
-The ip address and port of the MQTT broker can be set  by connecting to the device via telnet on port 1000.
+The ip address and port of the MQTT broker can be set by connecting to the device via telnet on port 1000.
 
 To set the ip address of the MQTT broker use the command ": <ip address>". For example, to set the ip address to 192.168.1.10 type ": 192.168.1.10" and hit enter.
 
diff --git a/hardware/MQTT_energy_meter-B_Cu.pdf b/hardware/MQTT_energy_meter-B_Cu.pdf
index b1f1054..357c5a9 100644
Binary files a/hardware/MQTT_energy_meter-B_Cu.pdf and b/hardware/MQTT_energy_meter-B_Cu.pdf differ
diff --git a/hardware/MQTT_energy_meter-F_SilkS.pdf b/hardware/MQTT_energy_meter-F_SilkS.pdf
index 5869604..5da57a9 100644
Binary files a/hardware/MQTT_energy_meter-F_SilkS.pdf and b/hardware/MQTT_energy_meter-F_SilkS.pdf differ
diff --git a/hardware/MQTT_energy_meter.kicad_pcb b/hardware/MQTT_energy_meter.kicad_pcb
index e3a1426..87f35ba 100644
--- a/hardware/MQTT_energy_meter.kicad_pcb
+++ b/hardware/MQTT_energy_meter.kicad_pcb
@@ -2,8 +2,8 @@
 
   (general
     (thickness 1.6)
-    (drawings 15)
-    (tracks 221)
+    (drawings 16)
+    (tracks 222)
     (zones 0)
     (modules 28)
     (nets 41)
@@ -34,7 +34,7 @@
   )
 
   (setup
-    (last_trace_width 0.8)
+    (last_trace_width 1.5)
     (user_trace_width 0.4)
     (user_trace_width 0.8)
     (user_trace_width 1.5)
@@ -81,7 +81,7 @@
       (hpglpendiameter 15.000000)
       (psnegative false)
       (psa4output false)
-      (plotreference false)
+      (plotreference true)
       (plotvalue true)
       (plotinvisibletext false)
       (padsonsilk false)
@@ -391,234 +391,6 @@
     (fp_text value 10U (at 1.25 3.75 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -1.304775 -1.725) (end -1.304775 -1.225) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.554775 -1.475) (end -1.054775 -1.475) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.851 -0.284) (end 3.851 0.284) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.811 -0.518) (end 3.811 0.518) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.771 -0.677) (end 3.771 0.677) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.731 -0.805) (end 3.731 0.805) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.691 -0.915) (end 3.691 0.915) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.651 -1.011) (end 3.651 1.011) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.611 -1.098) (end 3.611 1.098) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.571 -1.178) (end 3.571 1.178) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.531 1.04) (end 3.531 1.251) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.531 -1.251) (end 3.531 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.491 1.04) (end 3.491 1.319) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.491 -1.319) (end 3.491 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.451 1.04) (end 3.451 1.383) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.451 -1.383) (end 3.451 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.411 1.04) (end 3.411 1.443) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.411 -1.443) (end 3.411 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.371 1.04) (end 3.371 1.5) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.371 -1.5) (end 3.371 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.331 1.04) (end 3.331 1.554) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.331 -1.554) (end 3.331 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.291 1.04) (end 3.291 1.605) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.291 -1.605) (end 3.291 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.251 1.04) (end 3.251 1.653) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.251 -1.653) (end 3.251 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.211 1.04) (end 3.211 1.699) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.211 -1.699) (end 3.211 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.171 1.04) (end 3.171 1.743) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.171 -1.743) (end 3.171 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.131 1.04) (end 3.131 1.785) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.131 -1.785) (end 3.131 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.091 1.04) (end 3.091 1.826) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.091 -1.826) (end 3.091 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.051 1.04) (end 3.051 1.864) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.051 -1.864) (end 3.051 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.011 1.04) (end 3.011 1.901) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.011 -1.901) (end 3.011 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.971 1.04) (end 2.971 1.937) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.971 -1.937) (end 2.971 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.931 1.04) (end 2.931 1.971) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.931 -1.971) (end 2.931 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.891 1.04) (end 2.891 2.004) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.891 -2.004) (end 2.891 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.851 1.04) (end 2.851 2.035) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.851 -2.035) (end 2.851 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.811 1.04) (end 2.811 2.065) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.811 -2.065) (end 2.811 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.771 1.04) (end 2.771 2.095) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.771 -2.095) (end 2.771 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.731 1.04) (end 2.731 2.122) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.731 -2.122) (end 2.731 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.691 1.04) (end 2.691 2.149) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.691 -2.149) (end 2.691 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.651 1.04) (end 2.651 2.175) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.651 -2.175) (end 2.651 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.611 1.04) (end 2.611 2.2) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.611 -2.2) (end 2.611 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.571 1.04) (end 2.571 2.224) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.571 -2.224) (end 2.571 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.531 1.04) (end 2.531 2.247) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.531 -2.247) (end 2.531 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.491 1.04) (end 2.491 2.268) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.491 -2.268) (end 2.491 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.451 1.04) (end 2.451 2.29) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.451 -2.29) (end 2.451 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.411 1.04) (end 2.411 2.31) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.411 -2.31) (end 2.411 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.371 1.04) (end 2.371 2.329) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.371 -2.329) (end 2.371 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.331 1.04) (end 2.331 2.348) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.331 -2.348) (end 2.331 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.291 1.04) (end 2.291 2.365) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.291 -2.365) (end 2.291 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.251 1.04) (end 2.251 2.382) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.251 -2.382) (end 2.251 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.211 1.04) (end 2.211 2.398) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.211 -2.398) (end 2.211 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.171 1.04) (end 2.171 2.414) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.171 -2.414) (end 2.171 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.131 1.04) (end 2.131 2.428) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.131 -2.428) (end 2.131 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.091 1.04) (end 2.091 2.442) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.091 -2.442) (end 2.091 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.051 1.04) (end 2.051 2.455) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.051 -2.455) (end 2.051 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.011 1.04) (end 2.011 2.468) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.011 -2.468) (end 2.011 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.971 1.04) (end 1.971 2.48) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.971 -2.48) (end 1.971 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.93 1.04) (end 1.93 2.491) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.93 -2.491) (end 1.93 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.89 1.04) (end 1.89 2.501) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.89 -2.501) (end 1.89 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.85 1.04) (end 1.85 2.511) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.85 -2.511) (end 1.85 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.81 1.04) (end 1.81 2.52) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.81 -2.52) (end 1.81 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.77 1.04) (end 1.77 2.528) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.77 -2.528) (end 1.77 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.73 1.04) (end 1.73 2.536) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.73 -2.536) (end 1.73 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.69 1.04) (end 1.69 2.543) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.69 -2.543) (end 1.69 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.65 1.04) (end 1.65 2.55) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.65 -2.55) (end 1.65 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.61 1.04) (end 1.61 2.556) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.61 -2.556) (end 1.61 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.57 1.04) (end 1.57 2.561) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.57 -2.561) (end 1.57 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.53 1.04) (end 1.53 2.565) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.53 -2.565) (end 1.53 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.49 1.04) (end 1.49 2.569) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.49 -2.569) (end 1.49 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.45 -2.573) (end 1.45 2.573) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.41 -2.576) (end 1.41 2.576) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.37 -2.578) (end 1.37 2.578) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.33 -2.579) (end 1.33 2.579) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.29 -2.58) (end 1.29 2.58) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.25 -2.58) (end 1.25 2.58) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.633605 -1.3375) (end -0.633605 -0.8375) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.883605 -1.0875) (end -0.383605 -1.0875) (layer F.Fab) (width 0.1))
-    (fp_circle (center 1.25 0) (end 4 0) (layer F.CrtYd) (width 0.05))
-    (fp_circle (center 1.25 0) (end 3.87 0) (layer F.SilkS) (width 0.12))
-    (fp_circle (center 1.25 0) (end 3.75 0) (layer F.Fab) (width 0.1))
-    (fp_text user %R (at 1.25 0 90) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (pad 1 thru_hole rect (at 0 0 270) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
-      (net 1 VCC))
-    (pad 2 thru_hole circle (at 2.5 0 270) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
-      (net 2 GND))
-    (model ${KISYS3DMOD}/Capacitor_THT.3dshapes/CP_Radial_D5.0mm_P2.50mm.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Capacitor_THT:C_Disc_D5.0mm_W2.5mm_P5.00mm (layer F.Cu) (tedit 63B2E009) (tstamp 63B331D3)
-    (at 241.5 90.4 270)
-    (descr "C, Disc series, Radial, pin pitch=5.00mm, , diameter*width=5*2.5mm^2, Capacitor, http://cdn-reichelt.de/documents/datenblatt/B300/DS_KERKO_TC.pdf")
-    (tags "C Disc series Radial pin pitch 5.00mm  diameter 5mm width 2.5mm Capacitor")
-    (path /637DF69F)
-    (fp_text reference C2 (at 4.4 2.3 90) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 100n (at 2.5 2.5 90) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 6.05 -1.5) (end -1.05 -1.5) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 6.05 1.5) (end 6.05 -1.5) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 1.5) (end 6.05 1.5) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 -1.5) (end -1.05 1.5) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 5.12 1.055) (end 5.12 1.37) (layer F.SilkS) (width 0.12))
-    (fp_line (start 5.12 -1.37) (end 5.12 -1.055) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.12 1.055) (end -0.12 1.37) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.12 -1.37) (end -0.12 -1.055) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.12 1.37) (end 5.12 1.37) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.12 -1.37) (end 5.12 -1.37) (layer F.SilkS) (width 0.12))
-    (fp_line (start 5 -1.25) (end 0 -1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 5 1.25) (end 5 -1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 0 1.25) (end 5 1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 0 -1.25) (end 0 1.25) (layer F.Fab) (width 0.1))
-    (fp_text user %R (at 2.5 0 90) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (pad 1 thru_hole circle (at 0 0 270) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
-      (net 1 VCC))
-    (pad 2 thru_hole circle (at 5 0 270) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
-      (net 2 GND))
-    (model ${KISYS3DMOD}/Capacitor_THT.3dshapes/C_Disc_D5.0mm_W2.5mm_P5.00mm.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Capacitor_THT:C_Disc_D5.0mm_W2.5mm_P5.00mm (layer F.Cu) (tedit 63B2DFF7) (tstamp 63B331E8)
-    (at 254.8 82.3 270)
-    (descr "C, Disc series, Radial, pin pitch=5.00mm, , diameter*width=5*2.5mm^2, Capacitor, http://cdn-reichelt.de/documents/datenblatt/B300/DS_KERKO_TC.pdf")
-    (tags "C Disc series Radial pin pitch 5.00mm  diameter 5mm width 2.5mm Capacitor")
-    (path /6398D053)
-    (fp_text reference C3 (at -2.4 0 90) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 100n (at 2.5 2.5 90) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 6.05 -1.5) (end -1.05 -1.5) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 6.05 1.5) (end 6.05 -1.5) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 1.5) (end 6.05 1.5) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 -1.5) (end -1.05 1.5) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 5.12 1.055) (end 5.12 1.37) (layer F.SilkS) (width 0.12))
-    (fp_line (start 5.12 -1.37) (end 5.12 -1.055) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.12 1.055) (end -0.12 1.37) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.12 -1.37) (end -0.12 -1.055) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.12 1.37) (end 5.12 1.37) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.12 -1.37) (end 5.12 -1.37) (layer F.SilkS) (width 0.12))
-    (fp_line (start 5 -1.25) (end 0 -1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 5 1.25) (end 5 -1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 0 1.25) (end 5 1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 0 -1.25) (end 0 1.25) (layer F.Fab) (width 0.1))
-    (fp_text user %R (at 2.5 0 90) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (pad 1 thru_hole circle (at 0 0 270) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
-      (net 3 "Net-(C3-Pad1)"))
-    (pad 2 thru_hole circle (at 5 0 270) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
-      (net 2 GND))
-    (model ${KISYS3DMOD}/Capacitor_THT.3dshapes/C_Disc_D5.0mm_W2.5mm_P5.00mm.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Capacitor_THT:CP_Radial_D5.0mm_P2.50mm (layer F.Cu) (tedit 63B2E030) (tstamp 63B3326C)
-    (at 237.2 76.1 90)
-    (descr "CP, Radial series, Radial, pin pitch=2.50mm, , diameter=5mm, Electrolytic Capacitor")
-    (tags "CP Radial series Radial pin pitch 2.50mm  diameter 5mm Electrolytic Capacitor")
-    (path /639134F2)
-    (fp_text reference C4 (at -2.8 0.1 90) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 10U (at 1.25 3.75 90) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
     (fp_circle (center 1.25 0) (end 3.75 0) (layer F.Fab) (width 0.1))
     (fp_circle (center 1.25 0) (end 3.87 0) (layer F.SilkS) (width 0.12))
     (fp_circle (center 1.25 0) (end 4 0) (layer F.CrtYd) (width 0.05))
@@ -747,10 +519,10 @@
     (fp_text user %R (at 1.25 0 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (pad 2 thru_hole circle (at 2.5 0 90) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 1 thru_hole rect (at 0 0 270) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
+      (net 1 VCC))
+    (pad 2 thru_hole circle (at 2.5 0 270) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
       (net 2 GND))
-    (pad 1 thru_hole rect (at 0 0 90) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
-      (net 4 "Net-(C4-Pad1)"))
     (model ${KISYS3DMOD}/Capacitor_THT.3dshapes/CP_Radial_D5.0mm_P2.50mm.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -758,37 +530,76 @@
     )
   )
 
-  (module Capacitor_THT:C_Disc_D5.0mm_W2.5mm_P5.00mm (layer F.Cu) (tedit 63B2E01B) (tstamp 63B361A4)
-    (at 232.9 78.4 90)
+  (module Capacitor_THT:C_Disc_D5.0mm_W2.5mm_P5.00mm (layer F.Cu) (tedit 63B2E009) (tstamp 63B331D3)
+    (at 241.5 90.4 270)
     (descr "C, Disc series, Radial, pin pitch=5.00mm, , diameter*width=5*2.5mm^2, Capacitor, http://cdn-reichelt.de/documents/datenblatt/B300/DS_KERKO_TC.pdf")
     (tags "C Disc series Radial pin pitch 5.00mm  diameter 5mm width 2.5mm Capacitor")
-    (path /6391A1B5)
-    (fp_text reference C5 (at -0.8 -2.3 90) (layer F.SilkS)
+    (path /637DF69F)
+    (fp_text reference C2 (at 4.4 2.3 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value 100n (at 2.5 2.5 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 6.05 -1.5) (end -1.05 -1.5) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 6.05 1.5) (end 6.05 -1.5) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 1.5) (end 6.05 1.5) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 -1.5) (end -1.05 1.5) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 5.12 1.055) (end 5.12 1.37) (layer F.SilkS) (width 0.12))
-    (fp_line (start 5.12 -1.37) (end 5.12 -1.055) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.12 1.055) (end -0.12 1.37) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.12 -1.37) (end -0.12 -1.055) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.12 1.37) (end 5.12 1.37) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.12 -1.37) (end 5.12 -1.37) (layer F.SilkS) (width 0.12))
-    (fp_line (start 5 -1.25) (end 0 -1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 5 1.25) (end 5 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 -1.25) (end 0 1.25) (layer F.Fab) (width 0.1))
     (fp_line (start 0 1.25) (end 5 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 5 1.25) (end 5 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 5 -1.25) (end 0 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.12 -1.37) (end 5.12 -1.37) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.12 1.37) (end 5.12 1.37) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.12 -1.37) (end -0.12 -1.055) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.12 1.055) (end -0.12 1.37) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.12 -1.37) (end 5.12 -1.055) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.12 1.055) (end 5.12 1.37) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.05 -1.5) (end -1.05 1.5) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 1.5) (end 6.05 1.5) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 6.05 1.5) (end 6.05 -1.5) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 6.05 -1.5) (end -1.05 -1.5) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 2.5 0 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 1 thru_hole circle (at 0 0 270) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
+      (net 1 VCC))
+    (pad 2 thru_hole circle (at 5 0 270) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
+      (net 2 GND))
+    (model ${KISYS3DMOD}/Capacitor_THT.3dshapes/C_Disc_D5.0mm_W2.5mm_P5.00mm.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Capacitor_THT:C_Disc_D5.0mm_W2.5mm_P5.00mm (layer F.Cu) (tedit 63B2DFF7) (tstamp 63B331E8)
+    (at 254.8 82.3 270)
+    (descr "C, Disc series, Radial, pin pitch=5.00mm, , diameter*width=5*2.5mm^2, Capacitor, http://cdn-reichelt.de/documents/datenblatt/B300/DS_KERKO_TC.pdf")
+    (tags "C Disc series Radial pin pitch 5.00mm  diameter 5mm width 2.5mm Capacitor")
+    (path /6398D053)
+    (fp_text reference C3 (at -2.4 0 90) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 100n (at 2.5 2.5 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
     (fp_line (start 0 -1.25) (end 0 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 1.25) (end 5 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 5 1.25) (end 5 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 5 -1.25) (end 0 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.12 -1.37) (end 5.12 -1.37) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.12 1.37) (end 5.12 1.37) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.12 -1.37) (end -0.12 -1.055) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.12 1.055) (end -0.12 1.37) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.12 -1.37) (end 5.12 -1.055) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.12 1.055) (end 5.12 1.37) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.05 -1.5) (end -1.05 1.5) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 1.5) (end 6.05 1.5) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 6.05 1.5) (end 6.05 -1.5) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 6.05 -1.5) (end -1.05 -1.5) (layer F.CrtYd) (width 0.05))
     (fp_text user %R (at 2.5 0 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (pad 1 thru_hole circle (at 0 0 90) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
-      (net 4 "Net-(C4-Pad1)"))
-    (pad 2 thru_hole circle (at 5 0 90) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 1 thru_hole circle (at 0 0 270) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
+      (net 3 "Net-(C3-Pad1)"))
+    (pad 2 thru_hole circle (at 5 0 270) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
       (net 2 GND))
     (model ${KISYS3DMOD}/Capacitor_THT.3dshapes/C_Disc_D5.0mm_W2.5mm_P5.00mm.wrl
       (at (xyz 0 0 0))
@@ -797,12 +608,162 @@
     )
   )
 
-  (module Capacitor_THT:C_Disc_D5.0mm_W2.5mm_P5.00mm (layer F.Cu) (tedit 63B2E000) (tstamp 63B33296)
-    (at 241.5 64.8 270)
+  (module Capacitor_THT:CP_Radial_D5.0mm_P2.50mm (layer F.Cu) (tedit 63B2E030) (tstamp 63B3326C)
+    (at 237.2 76.1 90)
+    (descr "CP, Radial series, Radial, pin pitch=2.50mm, , diameter=5mm, Electrolytic Capacitor")
+    (tags "CP Radial series Radial pin pitch 2.50mm  diameter 5mm Electrolytic Capacitor")
+    (path /639134F2)
+    (fp_text reference C4 (at -2.8 0.1 90) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 10U (at 1.25 3.75 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1.304775 -1.725) (end -1.304775 -1.225) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.554775 -1.475) (end -1.054775 -1.475) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.851 -0.284) (end 3.851 0.284) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.811 -0.518) (end 3.811 0.518) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.771 -0.677) (end 3.771 0.677) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.731 -0.805) (end 3.731 0.805) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.691 -0.915) (end 3.691 0.915) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.651 -1.011) (end 3.651 1.011) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.611 -1.098) (end 3.611 1.098) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.571 -1.178) (end 3.571 1.178) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.531 1.04) (end 3.531 1.251) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.531 -1.251) (end 3.531 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.491 1.04) (end 3.491 1.319) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.491 -1.319) (end 3.491 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.451 1.04) (end 3.451 1.383) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.451 -1.383) (end 3.451 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.411 1.04) (end 3.411 1.443) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.411 -1.443) (end 3.411 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.371 1.04) (end 3.371 1.5) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.371 -1.5) (end 3.371 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.331 1.04) (end 3.331 1.554) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.331 -1.554) (end 3.331 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.291 1.04) (end 3.291 1.605) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.291 -1.605) (end 3.291 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.251 1.04) (end 3.251 1.653) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.251 -1.653) (end 3.251 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.211 1.04) (end 3.211 1.699) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.211 -1.699) (end 3.211 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.171 1.04) (end 3.171 1.743) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.171 -1.743) (end 3.171 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.131 1.04) (end 3.131 1.785) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.131 -1.785) (end 3.131 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.091 1.04) (end 3.091 1.826) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.091 -1.826) (end 3.091 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.051 1.04) (end 3.051 1.864) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.051 -1.864) (end 3.051 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.011 1.04) (end 3.011 1.901) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.011 -1.901) (end 3.011 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.971 1.04) (end 2.971 1.937) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.971 -1.937) (end 2.971 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.931 1.04) (end 2.931 1.971) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.931 -1.971) (end 2.931 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.891 1.04) (end 2.891 2.004) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.891 -2.004) (end 2.891 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.851 1.04) (end 2.851 2.035) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.851 -2.035) (end 2.851 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.811 1.04) (end 2.811 2.065) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.811 -2.065) (end 2.811 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.771 1.04) (end 2.771 2.095) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.771 -2.095) (end 2.771 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.731 1.04) (end 2.731 2.122) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.731 -2.122) (end 2.731 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.691 1.04) (end 2.691 2.149) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.691 -2.149) (end 2.691 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.651 1.04) (end 2.651 2.175) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.651 -2.175) (end 2.651 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.611 1.04) (end 2.611 2.2) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.611 -2.2) (end 2.611 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.571 1.04) (end 2.571 2.224) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.571 -2.224) (end 2.571 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.531 1.04) (end 2.531 2.247) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.531 -2.247) (end 2.531 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.491 1.04) (end 2.491 2.268) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.491 -2.268) (end 2.491 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.451 1.04) (end 2.451 2.29) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.451 -2.29) (end 2.451 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.411 1.04) (end 2.411 2.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.411 -2.31) (end 2.411 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.371 1.04) (end 2.371 2.329) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.371 -2.329) (end 2.371 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.331 1.04) (end 2.331 2.348) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.331 -2.348) (end 2.331 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.291 1.04) (end 2.291 2.365) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.291 -2.365) (end 2.291 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.251 1.04) (end 2.251 2.382) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.251 -2.382) (end 2.251 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.211 1.04) (end 2.211 2.398) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.211 -2.398) (end 2.211 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.171 1.04) (end 2.171 2.414) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.171 -2.414) (end 2.171 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.131 1.04) (end 2.131 2.428) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.131 -2.428) (end 2.131 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.091 1.04) (end 2.091 2.442) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.091 -2.442) (end 2.091 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.051 1.04) (end 2.051 2.455) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.051 -2.455) (end 2.051 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.011 1.04) (end 2.011 2.468) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.011 -2.468) (end 2.011 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.971 1.04) (end 1.971 2.48) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.971 -2.48) (end 1.971 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.93 1.04) (end 1.93 2.491) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.93 -2.491) (end 1.93 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.89 1.04) (end 1.89 2.501) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.89 -2.501) (end 1.89 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.85 1.04) (end 1.85 2.511) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.85 -2.511) (end 1.85 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.81 1.04) (end 1.81 2.52) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.81 -2.52) (end 1.81 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.77 1.04) (end 1.77 2.528) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.77 -2.528) (end 1.77 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.73 1.04) (end 1.73 2.536) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.73 -2.536) (end 1.73 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.69 1.04) (end 1.69 2.543) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.69 -2.543) (end 1.69 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.65 1.04) (end 1.65 2.55) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.65 -2.55) (end 1.65 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.61 1.04) (end 1.61 2.556) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.61 -2.556) (end 1.61 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.57 1.04) (end 1.57 2.561) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.57 -2.561) (end 1.57 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.53 1.04) (end 1.53 2.565) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.53 -2.565) (end 1.53 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.49 1.04) (end 1.49 2.569) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.49 -2.569) (end 1.49 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.45 -2.573) (end 1.45 2.573) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.41 -2.576) (end 1.41 2.576) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.37 -2.578) (end 1.37 2.578) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.33 -2.579) (end 1.33 2.579) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.29 -2.58) (end 1.29 2.58) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.25 -2.58) (end 1.25 2.58) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.633605 -1.3375) (end -0.633605 -0.8375) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.883605 -1.0875) (end -0.383605 -1.0875) (layer F.Fab) (width 0.1))
+    (fp_circle (center 1.25 0) (end 4 0) (layer F.CrtYd) (width 0.05))
+    (fp_circle (center 1.25 0) (end 3.87 0) (layer F.SilkS) (width 0.12))
+    (fp_circle (center 1.25 0) (end 3.75 0) (layer F.Fab) (width 0.1))
+    (fp_text user %R (at 1.25 0 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 2 thru_hole circle (at 2.5 0 90) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
+      (net 2 GND))
+    (pad 1 thru_hole rect (at 0 0 90) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
+      (net 4 "Net-(C4-Pad1)"))
+    (model ${KISYS3DMOD}/Capacitor_THT.3dshapes/CP_Radial_D5.0mm_P2.50mm.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Capacitor_THT:C_Disc_D5.0mm_W2.5mm_P5.00mm (layer F.Cu) (tedit 63B2E01B) (tstamp 63B361A4)
+    (at 232.9 78.4 90)
     (descr "C, Disc series, Radial, pin pitch=5.00mm, , diameter*width=5*2.5mm^2, Capacitor, http://cdn-reichelt.de/documents/datenblatt/B300/DS_KERKO_TC.pdf")
     (tags "C Disc series Radial pin pitch 5.00mm  diameter 5mm width 2.5mm Capacitor")
-    (path /6382F4A6)
-    (fp_text reference C6 (at -2.7 -0.1 90) (layer F.SilkS)
+    (path /6391A1B5)
+    (fp_text reference C5 (at -0.8 -2.3 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value 100n (at 2.5 2.5 90) (layer F.Fab)
@@ -825,6 +786,45 @@
     (fp_text user %R (at 2.5 0 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
+    (pad 1 thru_hole circle (at 0 0 90) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
+      (net 4 "Net-(C4-Pad1)"))
+    (pad 2 thru_hole circle (at 5 0 90) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
+      (net 2 GND))
+    (model ${KISYS3DMOD}/Capacitor_THT.3dshapes/C_Disc_D5.0mm_W2.5mm_P5.00mm.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Capacitor_THT:C_Disc_D5.0mm_W2.5mm_P5.00mm (layer F.Cu) (tedit 63B2E000) (tstamp 63B33296)
+    (at 241.5 64.8 270)
+    (descr "C, Disc series, Radial, pin pitch=5.00mm, , diameter*width=5*2.5mm^2, Capacitor, http://cdn-reichelt.de/documents/datenblatt/B300/DS_KERKO_TC.pdf")
+    (tags "C Disc series Radial pin pitch 5.00mm  diameter 5mm width 2.5mm Capacitor")
+    (path /6382F4A6)
+    (fp_text reference C6 (at -2.7 -0.1 90) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 100n (at 2.5 2.5 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 6.05 -1.5) (end -1.05 -1.5) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 6.05 1.5) (end 6.05 -1.5) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 1.5) (end 6.05 1.5) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 -1.5) (end -1.05 1.5) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 5.12 1.055) (end 5.12 1.37) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.12 -1.37) (end 5.12 -1.055) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.12 1.055) (end -0.12 1.37) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.12 -1.37) (end -0.12 -1.055) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.12 1.37) (end 5.12 1.37) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.12 -1.37) (end 5.12 -1.37) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5 -1.25) (end 0 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 5 1.25) (end 5 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 1.25) (end 5 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 -1.25) (end 0 1.25) (layer F.Fab) (width 0.1))
+    (fp_text user %R (at 2.5 0 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
     (pad 2 thru_hole circle (at 5 0 270) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
       (net 2 GND))
     (pad 1 thru_hole circle (at 0 0 270) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
@@ -847,20 +847,20 @@
     (fp_text value 100n (at 2.5 2.5 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 0 -1.25) (end 0 1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 0 1.25) (end 5 1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 5 1.25) (end 5 -1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 5 -1.25) (end 0 -1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.12 -1.37) (end 5.12 -1.37) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.12 1.37) (end 5.12 1.37) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.12 -1.37) (end -0.12 -1.055) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.12 1.055) (end -0.12 1.37) (layer F.SilkS) (width 0.12))
-    (fp_line (start 5.12 -1.37) (end 5.12 -1.055) (layer F.SilkS) (width 0.12))
-    (fp_line (start 5.12 1.055) (end 5.12 1.37) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.05 -1.5) (end -1.05 1.5) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 1.5) (end 6.05 1.5) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 6.05 1.5) (end 6.05 -1.5) (layer F.CrtYd) (width 0.05))
     (fp_line (start 6.05 -1.5) (end -1.05 -1.5) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 6.05 1.5) (end 6.05 -1.5) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 1.5) (end 6.05 1.5) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 -1.5) (end -1.05 1.5) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 5.12 1.055) (end 5.12 1.37) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.12 -1.37) (end 5.12 -1.055) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.12 1.055) (end -0.12 1.37) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.12 -1.37) (end -0.12 -1.055) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.12 1.37) (end 5.12 1.37) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.12 -1.37) (end 5.12 -1.37) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5 -1.25) (end 0 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 5 1.25) (end 5 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 1.25) (end 5 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 -1.25) (end 0 1.25) (layer F.Fab) (width 0.1))
     (fp_text user %R (at 2.5 0 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
@@ -886,21 +886,21 @@
     (fp_text value BPW34 (at 0 4.87) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -0.635 -1.27) (end 1.27 -1.27) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.27 -1.27) (end 1.27 3.81) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.27 3.81) (end -1.27 3.81) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.27 3.81) (end -1.27 -0.635) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.27 -0.635) (end -0.635 -1.27) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.33 3.87) (end 1.33 3.87) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.33 1.27) (end -1.33 3.87) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.33 1.27) (end 1.33 3.87) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.33 1.27) (end 1.33 1.27) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.33 0) (end -1.33 -1.33) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.33 -1.33) (end 0 -1.33) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.8 -1.8) (end -1.8 4.35) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.8 4.35) (end 1.8 4.35) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.8 4.35) (end 1.8 -1.8) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.8 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.8 4.35) (end 1.8 -1.8) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.8 4.35) (end 1.8 4.35) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.8 -1.8) (end -1.8 4.35) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.33 -1.33) (end 0 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.33 0) (end -1.33 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.33 1.27) (end 1.33 1.27) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.33 1.27) (end 1.33 3.87) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.33 1.27) (end -1.33 3.87) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.33 3.87) (end 1.33 3.87) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.27 -0.635) (end -0.635 -1.27) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.27 3.81) (end -1.27 -0.635) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.27 3.81) (end -1.27 3.81) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.27 -1.27) (end 1.27 3.81) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.635 -1.27) (end 1.27 -1.27) (layer F.Fab) (width 0.1))
     (fp_text user %R (at 0 1.27 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
@@ -926,14 +926,14 @@
     (fp_text value STATUS (at 1.27 2.96 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_circle (center 1.27 0) (end 2.77 0) (layer F.Fab) (width 0.1))
-    (fp_line (start 3.7 -2.25) (end -1.15 -2.25) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 3.7 2.25) (end 3.7 -2.25) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.15 2.25) (end 3.7 2.25) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.15 -2.25) (end -1.15 2.25) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.29 1.08) (end -0.29 1.236) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.29 -1.236) (end -0.29 -1.08) (layer F.SilkS) (width 0.12))
     (fp_line (start -0.23 -1.16619) (end -0.23 1.16619) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.29 -1.236) (end -0.29 -1.08) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.29 1.08) (end -0.29 1.236) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.15 -2.25) (end -1.15 2.25) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.15 2.25) (end 3.7 2.25) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.7 2.25) (end 3.7 -2.25) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.7 -2.25) (end -1.15 -2.25) (layer F.CrtYd) (width 0.05))
+    (fp_circle (center 1.27 0) (end 2.77 0) (layer F.Fab) (width 0.1))
     (fp_text user %R (at 1.47 0 90) (layer F.Fab)
       (effects (font (size 0.8 0.8) (thickness 0.12)))
     )
@@ -954,48 +954,48 @@
   )
 
   (module TerminalBlock_Phoenix:TerminalBlock_Phoenix_MKDS-1,5-2_1x02_P5.00mm_Horizontal (layer F.Cu) (tedit 5B294EE5) (tstamp 63B33301)
-    (at 228.8 87.9 90)
+    (at 228.8 83.1 270)
     (descr "Terminal Block Phoenix MKDS-1,5-2, 2 pins, pitch 5mm, size 10x9.8mm^2, drill diamater 1.3mm, pad diameter 2.6mm, see http://www.farnell.com/datasheets/100425.pdf, script-generated using https://github.com/pointhi/kicad-footprint-generator/scripts/TerminalBlock_Phoenix")
     (tags "THT Terminal Block Phoenix MKDS-1,5-2 pitch 5mm size 10x9.8mm^2 drill 1.3mm pad 2.6mm")
     (path /6392A12E)
-    (fp_text reference J1 (at -1.7 5.8 90) (layer F.SilkS)
+    (fp_text reference J1 (at 6.5 -6.2 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value "8-24V in" (at 2.5 5.66 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 8 -5.71) (end -3 -5.71) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 8 5.1) (end 8 -5.71) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3 5.1) (end 8 5.1) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3 -5.71) (end -3 5.1) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.8 4.9) (end -2.3 4.9) (layer F.SilkS) (width 0.12))
-    (fp_line (start -2.8 4.16) (end -2.8 4.9) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.773 1.023) (end 3.726 1.069) (layer F.SilkS) (width 0.12))
-    (fp_line (start 6.07 -1.275) (end 6.035 -1.239) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.966 1.239) (end 3.931 1.274) (layer F.SilkS) (width 0.12))
-    (fp_line (start 6.275 -1.069) (end 6.228 -1.023) (layer F.SilkS) (width 0.12))
-    (fp_line (start 5.955 -1.138) (end 3.863 0.955) (layer F.Fab) (width 0.1))
-    (fp_line (start 6.138 -0.955) (end 4.046 1.138) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.955 -1.138) (end -1.138 0.955) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.138 -0.955) (end -0.955 1.138) (layer F.Fab) (width 0.1))
-    (fp_line (start 7.56 -5.261) (end 7.56 4.66) (layer F.SilkS) (width 0.12))
-    (fp_line (start -2.56 -5.261) (end -2.56 4.66) (layer F.SilkS) (width 0.12))
-    (fp_line (start -2.56 4.66) (end 7.56 4.66) (layer F.SilkS) (width 0.12))
-    (fp_line (start -2.56 -5.261) (end 7.56 -5.261) (layer F.SilkS) (width 0.12))
-    (fp_line (start -2.56 -2.301) (end 7.56 -2.301) (layer F.SilkS) (width 0.12))
-    (fp_line (start -2.5 -2.3) (end 7.5 -2.3) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.56 2.6) (end 7.56 2.6) (layer F.SilkS) (width 0.12))
-    (fp_line (start -2.5 2.6) (end 7.5 2.6) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.56 4.1) (end 7.56 4.1) (layer F.SilkS) (width 0.12))
-    (fp_line (start -2.5 4.1) (end 7.5 4.1) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.5 4.1) (end -2.5 -5.2) (layer F.Fab) (width 0.1))
-    (fp_line (start -2 4.6) (end -2.5 4.1) (layer F.Fab) (width 0.1))
-    (fp_line (start 7.5 4.6) (end -2 4.6) (layer F.Fab) (width 0.1))
-    (fp_line (start 7.5 -5.2) (end 7.5 4.6) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.5 -5.2) (end 7.5 -5.2) (layer F.Fab) (width 0.1))
-    (fp_circle (center 5 0) (end 6.68 0) (layer F.SilkS) (width 0.12))
-    (fp_circle (center 5 0) (end 6.5 0) (layer F.Fab) (width 0.1))
     (fp_circle (center 0 0) (end 1.5 0) (layer F.Fab) (width 0.1))
+    (fp_circle (center 5 0) (end 6.5 0) (layer F.Fab) (width 0.1))
+    (fp_circle (center 5 0) (end 6.68 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.5 -5.2) (end 7.5 -5.2) (layer F.Fab) (width 0.1))
+    (fp_line (start 7.5 -5.2) (end 7.5 4.6) (layer F.Fab) (width 0.1))
+    (fp_line (start 7.5 4.6) (end -2 4.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -2 4.6) (end -2.5 4.1) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.5 4.1) (end -2.5 -5.2) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.5 4.1) (end 7.5 4.1) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.56 4.1) (end 7.56 4.1) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.5 2.6) (end 7.5 2.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.56 2.6) (end 7.56 2.6) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.5 -2.3) (end 7.5 -2.3) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.56 -2.301) (end 7.56 -2.301) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.56 -5.261) (end 7.56 -5.261) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.56 4.66) (end 7.56 4.66) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.56 -5.261) (end -2.56 4.66) (layer F.SilkS) (width 0.12))
+    (fp_line (start 7.56 -5.261) (end 7.56 4.66) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.138 -0.955) (end -0.955 1.138) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.955 -1.138) (end -1.138 0.955) (layer F.Fab) (width 0.1))
+    (fp_line (start 6.138 -0.955) (end 4.046 1.138) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.955 -1.138) (end 3.863 0.955) (layer F.Fab) (width 0.1))
+    (fp_line (start 6.275 -1.069) (end 6.228 -1.023) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.966 1.239) (end 3.931 1.274) (layer F.SilkS) (width 0.12))
+    (fp_line (start 6.07 -1.275) (end 6.035 -1.239) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.773 1.023) (end 3.726 1.069) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.8 4.16) (end -2.8 4.9) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.8 4.9) (end -2.3 4.9) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3 -5.71) (end -3 5.1) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3 5.1) (end 8 5.1) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8 5.1) (end 8 -5.71) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8 -5.71) (end -3 -5.71) (layer F.CrtYd) (width 0.05))
     (fp_arc (start 0 0) (end 0 1.68) (angle -24) (layer F.SilkS) (width 0.12))
     (fp_arc (start 0 0) (end 1.535 0.684) (angle -48) (layer F.SilkS) (width 0.12))
     (fp_arc (start 0 0) (end 0.684 -1.535) (angle -48) (layer F.SilkS) (width 0.12))
@@ -1004,10 +1004,10 @@
     (fp_text user %R (at 2.5 3.2 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (pad 1 thru_hole rect (at 0 0 90) (size 2.6 2.6) (drill 1.3) (layers *.Cu *.Mask)
-      (net 4 "Net-(C4-Pad1)"))
-    (pad 2 thru_hole circle (at 5 0 90) (size 2.6 2.6) (drill 1.3) (layers *.Cu *.Mask)
+    (pad 1 thru_hole rect (at 0 0 270) (size 2.6 2.6) (drill 1.3) (layers *.Cu *.Mask)
       (net 2 GND))
+    (pad 2 thru_hole circle (at 5 0 270) (size 2.6 2.6) (drill 1.3) (layers *.Cu *.Mask)
+      (net 4 "Net-(C4-Pad1)"))
     (model ${KISYS3DMOD}/TerminalBlock_Phoenix.3dshapes/TerminalBlock_Phoenix_MKDS-1,5-2_1x02_P5.00mm_Horizontal.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1026,21 +1026,21 @@
     (fp_text value SET (at 0 4.87 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 1.8 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.8 4.35) (end 1.8 -1.8) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.8 4.35) (end 1.8 4.35) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.8 -1.8) (end -1.8 4.35) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.33 -1.33) (end 0 -1.33) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.33 0) (end -1.33 -1.33) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.33 1.27) (end 1.33 1.27) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.33 1.27) (end 1.33 3.87) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.33 1.27) (end -1.33 3.87) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.33 3.87) (end 1.33 3.87) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.27 -0.635) (end -0.635 -1.27) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.27 3.81) (end -1.27 -0.635) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.27 3.81) (end -1.27 3.81) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.27 -1.27) (end 1.27 3.81) (layer F.Fab) (width 0.1))
     (fp_line (start -0.635 -1.27) (end 1.27 -1.27) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.27 -1.27) (end 1.27 3.81) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.27 3.81) (end -1.27 3.81) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.27 3.81) (end -1.27 -0.635) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.27 -0.635) (end -0.635 -1.27) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.33 3.87) (end 1.33 3.87) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.33 1.27) (end -1.33 3.87) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.33 1.27) (end 1.33 3.87) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.33 1.27) (end 1.33 1.27) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.33 0) (end -1.33 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.33 -1.33) (end 0 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.8 -1.8) (end -1.8 4.35) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.8 4.35) (end 1.8 4.35) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.8 4.35) (end 1.8 -1.8) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.8 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05))
     (fp_text user %R (at 0 1.27) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
@@ -1060,27 +1060,27 @@
     (descr "Through hole straight pin header, 1x03, 2.54mm pitch, single row")
     (tags "Through hole pin header THT 1x03 2.54mm single row")
     (path /63B25D42)
-    (fp_text reference JP2 (at -1.2 8.5 -90) (layer F.SilkS)
+    (fp_text reference JP2 (at -1.2 8.4 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value "Invert pulse" (at 0 7.41) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 1.8 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.8 6.85) (end 1.8 -1.8) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.8 6.85) (end 1.8 6.85) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.8 -1.8) (end -1.8 6.85) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.33 -1.33) (end 0 -1.33) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.33 0) (end -1.33 -1.33) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.33 1.27) (end 1.33 1.27) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.33 1.27) (end 1.33 6.41) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.33 1.27) (end -1.33 6.41) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.33 6.41) (end 1.33 6.41) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.27 -0.635) (end -0.635 -1.27) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.27 6.35) (end -1.27 -0.635) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.27 6.35) (end -1.27 6.35) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.27 -1.27) (end 1.27 6.35) (layer F.Fab) (width 0.1))
     (fp_line (start -0.635 -1.27) (end 1.27 -1.27) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.27 -1.27) (end 1.27 6.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.27 6.35) (end -1.27 6.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.27 6.35) (end -1.27 -0.635) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.27 -0.635) (end -0.635 -1.27) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.33 6.41) (end 1.33 6.41) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.33 1.27) (end -1.33 6.41) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.33 1.27) (end 1.33 6.41) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.33 1.27) (end 1.33 1.27) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.33 0) (end -1.33 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.33 -1.33) (end 0 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.8 -1.8) (end -1.8 6.85) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.8 6.85) (end 1.8 6.85) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.8 6.85) (end 1.8 -1.8) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.8 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05))
     (fp_text user %R (at 0 2.54 -270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
@@ -1101,49 +1101,8 @@
     (at 251.5 77.2 270)
     (descr "Resistor, Axial_DIN0207 series, Axial, Horizontal, pin pitch=10.16mm, 0.25W = 1/4W, length*diameter=6.3*2.5mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
     (tags "Resistor Axial_DIN0207 series Axial Horizontal pin pitch 10.16mm 0.25W = 1/4W length 6.3mm diameter 2.5mm")
-    (path /637CBD86)
-    (fp_text reference R1 (at -1.8 -1.7 90) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 10k (at 5.08 2.37 90) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 11.21 -1.5) (end -1.05 -1.5) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 11.21 1.5) (end 11.21 -1.5) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 1.5) (end 11.21 1.5) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 -1.5) (end -1.05 1.5) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 9.12 0) (end 8.35 0) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.04 0) (end 1.81 0) (layer F.SilkS) (width 0.12))
-    (fp_line (start 8.35 -1.37) (end 1.81 -1.37) (layer F.SilkS) (width 0.12))
-    (fp_line (start 8.35 1.37) (end 8.35 -1.37) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.81 1.37) (end 8.35 1.37) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.81 -1.37) (end 1.81 1.37) (layer F.SilkS) (width 0.12))
-    (fp_line (start 10.16 0) (end 8.23 0) (layer F.Fab) (width 0.1))
-    (fp_line (start 0 0) (end 1.93 0) (layer F.Fab) (width 0.1))
-    (fp_line (start 8.23 -1.25) (end 1.93 -1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 8.23 1.25) (end 8.23 -1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.93 1.25) (end 8.23 1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.93 -1.25) (end 1.93 1.25) (layer F.Fab) (width 0.1))
-    (fp_text user %R (at 5.08 0 90) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (pad 2 thru_hole circle (at 10.16 0 270) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
-      (net 2 GND))
-    (pad 1 thru_hole circle (at 0 0 270) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
-      (net 3 "Net-(C3-Pad1)"))
-    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0207_L6.3mm_D2.5mm_P10.16mm_Horizontal.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P10.16mm_Horizontal (layer F.Cu) (tedit 61E2EAE3) (tstamp 63B3335C)
-    (at 248.2 77.2 270)
-    (descr "Resistor, Axial_DIN0207 series, Axial, Horizontal, pin pitch=10.16mm, 0.25W = 1/4W, length*diameter=6.3*2.5mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
-    (tags "Resistor Axial_DIN0207 series Axial Horizontal pin pitch 10.16mm 0.25W = 1/4W length 6.3mm diameter 2.5mm")
-    (path /637CC5CF)
-    (fp_text reference R2 (at -1.8 -1.7 90) (layer F.SilkS)
+    (path /637CBD86)
+    (fp_text reference R1 (at -1.8 -1.7 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value 10k (at 5.08 2.37 90) (layer F.Fab)
@@ -1168,10 +1127,10 @@
     (fp_text user %R (at 5.08 0 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (pad 1 thru_hole circle (at 0 0 270) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
-      (net 10 "Net-(R2-Pad1)"))
     (pad 2 thru_hole circle (at 10.16 0 270) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
       (net 2 GND))
+    (pad 1 thru_hole circle (at 0 0 270) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
+      (net 3 "Net-(C3-Pad1)"))
     (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0207_L6.3mm_D2.5mm_P10.16mm_Horizontal.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1179,15 +1138,15 @@
     )
   )
 
-  (module Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P10.16mm_Horizontal (layer F.Cu) (tedit 61E2EAE3) (tstamp 63B33373)
-    (at 244.9 87.4 90)
+  (module Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P10.16mm_Horizontal (layer F.Cu) (tedit 61E2EAE3) (tstamp 63B3335C)
+    (at 248.2 77.2 270)
     (descr "Resistor, Axial_DIN0207 series, Axial, Horizontal, pin pitch=10.16mm, 0.25W = 1/4W, length*diameter=6.3*2.5mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
     (tags "Resistor Axial_DIN0207 series Axial Horizontal pin pitch 10.16mm 0.25W = 1/4W length 6.3mm diameter 2.5mm")
-    (path /637CEB9B)
-    (fp_text reference R3 (at 12 1.8 90) (layer F.SilkS)
+    (path /637CC5CF)
+    (fp_text reference R2 (at -1.8 -1.7 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 33k (at 5.08 2.37 90) (layer F.Fab)
+    (fp_text value 10k (at 5.08 2.37 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start 11.21 -1.5) (end -1.05 -1.5) (layer F.CrtYd) (width 0.05))
@@ -1209,10 +1168,10 @@
     (fp_text user %R (at 5.08 0 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (pad 2 thru_hole circle (at 10.16 0 90) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 1 thru_hole circle (at 0 0 270) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
       (net 10 "Net-(R2-Pad1)"))
-    (pad 1 thru_hole circle (at 0 0 90) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
-      (net 11 "Net-(R3-Pad1)"))
+    (pad 2 thru_hole circle (at 10.16 0 270) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
+      (net 2 GND))
     (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0207_L6.3mm_D2.5mm_P10.16mm_Horizontal.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1220,15 +1179,15 @@
     )
   )
 
-  (module Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P10.16mm_Horizontal (layer F.Cu) (tedit 61E2EAE3) (tstamp 63B3338A)
-    (at 239.6 100.7 180)
+  (module Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P10.16mm_Horizontal (layer F.Cu) (tedit 61E2EAE3) (tstamp 63B33373)
+    (at 244.9 87.4 90)
     (descr "Resistor, Axial_DIN0207 series, Axial, Horizontal, pin pitch=10.16mm, 0.25W = 1/4W, length*diameter=6.3*2.5mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
     (tags "Resistor Axial_DIN0207 series Axial Horizontal pin pitch 10.16mm 0.25W = 1/4W length 6.3mm diameter 2.5mm")
-    (path /6385274C)
-    (fp_text reference R4 (at -0.3 2.5 270) (layer F.SilkS)
+    (path /637CEB9B)
+    (fp_text reference R3 (at 12 1.8 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 1k (at 5.08 2.37) (layer F.Fab)
+    (fp_text value 33k (at 5.08 2.37 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start 1.93 -1.25) (end 1.93 1.25) (layer F.Fab) (width 0.1))
@@ -1247,6 +1206,47 @@
     (fp_line (start -1.05 1.5) (end 11.21 1.5) (layer F.CrtYd) (width 0.05))
     (fp_line (start 11.21 1.5) (end 11.21 -1.5) (layer F.CrtYd) (width 0.05))
     (fp_line (start 11.21 -1.5) (end -1.05 -1.5) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 5.08 0 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 2 thru_hole circle (at 10.16 0 90) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
+      (net 10 "Net-(R2-Pad1)"))
+    (pad 1 thru_hole circle (at 0 0 90) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
+      (net 11 "Net-(R3-Pad1)"))
+    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0207_L6.3mm_D2.5mm_P10.16mm_Horizontal.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P10.16mm_Horizontal (layer F.Cu) (tedit 61E2EAE3) (tstamp 63B3338A)
+    (at 239.6 100.7 180)
+    (descr "Resistor, Axial_DIN0207 series, Axial, Horizontal, pin pitch=10.16mm, 0.25W = 1/4W, length*diameter=6.3*2.5mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
+    (tags "Resistor Axial_DIN0207 series Axial Horizontal pin pitch 10.16mm 0.25W = 1/4W length 6.3mm diameter 2.5mm")
+    (path /6385274C)
+    (fp_text reference R4 (at -0.3 2.5 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 1k (at 5.08 2.37) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 11.21 -1.5) (end -1.05 -1.5) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 11.21 1.5) (end 11.21 -1.5) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 1.5) (end 11.21 1.5) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 -1.5) (end -1.05 1.5) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 9.12 0) (end 8.35 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.04 0) (end 1.81 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 8.35 -1.37) (end 1.81 -1.37) (layer F.SilkS) (width 0.12))
+    (fp_line (start 8.35 1.37) (end 8.35 -1.37) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.81 1.37) (end 8.35 1.37) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.81 -1.37) (end 1.81 1.37) (layer F.SilkS) (width 0.12))
+    (fp_line (start 10.16 0) (end 8.23 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 0) (end 1.93 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 8.23 -1.25) (end 1.93 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 8.23 1.25) (end 8.23 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.93 1.25) (end 8.23 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.93 -1.25) (end 1.93 1.25) (layer F.Fab) (width 0.1))
     (fp_text user %R (at 5.08 0) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
@@ -1266,36 +1266,36 @@
     (descr "Potentiometer, horizontal, ACP CA9-H5, http://www.acptechnologies.com/wp-content/uploads/2017/05/02-ACP-CA9-CE9.pdf")
     (tags "Potentiometer horizontal ACP CA9-H5")
     (path /637CCCD9)
-    (fp_text reference RV1 (at 0.9 -4.3 -90) (layer F.SilkS)
+    (fp_text reference RV1 (at 0.8 -4.3 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_text value 500k (at 0 8.65) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 6.45 -2.7) (end -1.45 -2.7) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 6.45 7.65) (end 6.45 -2.7) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.45 7.65) (end 6.45 7.65) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.45 -2.7) (end -1.45 7.65) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 4.92 3.925) (end 4.92 4.12) (layer F.SilkS) (width 0.12))
-    (fp_line (start 4.92 0.88) (end 4.92 1.075) (layer F.SilkS) (width 0.12))
+    (fp_line (start 4.8 -2.4) (end 4.8 7.4) (layer F.Fab) (width 0.1))
+    (fp_line (start 4.8 7.4) (end 0 7.4) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 7.4) (end 0 -2.4) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 -2.4) (end 4.8 -2.4) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 1) (end 0 4) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 4) (end 4.8 4) (layer F.Fab) (width 0.1))
+    (fp_line (start 4.8 4) (end 4.8 1) (layer F.Fab) (width 0.1))
+    (fp_line (start 4.8 1) (end 0 1) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.121 -2.521) (end 4.92 -2.521) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.121 7.52) (end 4.92 7.52) (layer F.SilkS) (width 0.12))
+    (fp_line (start 4.92 -2.521) (end 4.92 1.075) (layer F.SilkS) (width 0.12))
+    (fp_line (start 4.92 3.925) (end 4.92 7.52) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.121 6.425) (end -0.121 7.52) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.121 -2.521) (end -0.121 -1.426) (layer F.SilkS) (width 0.12))
     (fp_line (start -0.121 1.426) (end -0.121 3.575) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.237 4.12) (end 4.92 4.12) (layer F.SilkS) (width 0.12))
     (fp_line (start 1.237 0.88) (end 4.92 0.88) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.237 4.12) (end 4.92 4.12) (layer F.SilkS) (width 0.12))
     (fp_line (start -0.121 1.426) (end -0.121 3.575) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.121 -2.521) (end -0.121 -1.426) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.121 6.425) (end -0.121 7.52) (layer F.SilkS) (width 0.12))
-    (fp_line (start 4.92 3.925) (end 4.92 7.52) (layer F.SilkS) (width 0.12))
-    (fp_line (start 4.92 -2.521) (end 4.92 1.075) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.121 7.52) (end 4.92 7.52) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.121 -2.521) (end 4.92 -2.521) (layer F.SilkS) (width 0.12))
-    (fp_line (start 4.8 1) (end 0 1) (layer F.Fab) (width 0.1))
-    (fp_line (start 4.8 4) (end 4.8 1) (layer F.Fab) (width 0.1))
-    (fp_line (start 0 4) (end 4.8 4) (layer F.Fab) (width 0.1))
-    (fp_line (start 0 1) (end 0 4) (layer F.Fab) (width 0.1))
-    (fp_line (start 0 -2.4) (end 4.8 -2.4) (layer F.Fab) (width 0.1))
-    (fp_line (start 0 7.4) (end 0 -2.4) (layer F.Fab) (width 0.1))
-    (fp_line (start 4.8 7.4) (end 0 7.4) (layer F.Fab) (width 0.1))
-    (fp_line (start 4.8 -2.4) (end 4.8 7.4) (layer F.Fab) (width 0.1))
+    (fp_line (start 4.92 0.88) (end 4.92 1.075) (layer F.SilkS) (width 0.12))
+    (fp_line (start 4.92 3.925) (end 4.92 4.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.45 -2.7) (end -1.45 7.65) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.45 7.65) (end 6.45 7.65) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 6.45 7.65) (end 6.45 -2.7) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 6.45 -2.7) (end -1.45 -2.7) (layer F.CrtYd) (width 0.05))
     (fp_text user %R (at 2.4 2.5) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
@@ -1323,17 +1323,17 @@
     (fp_text value "Arduino Mini Plus" (at 8.89 15.24) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -1.5 31.75) (end -1.5 -1.25) (layer Dwgs.User) (width 0.12))
-    (fp_line (start 16.75 31.75) (end -1.5 31.75) (layer Dwgs.User) (width 0.12))
-    (fp_line (start 16.75 -1.25) (end 16.75 31.75) (layer Dwgs.User) (width 0.12))
-    (fp_line (start -1.5 -1.25) (end 16.75 -1.25) (layer Dwgs.User) (width 0.12))
-    (fp_line (start 1.75 1.25) (end 1.75 -1.25) (layer F.SilkS) (width 0.15))
-    (fp_line (start -1.5 1.25) (end 1.75 1.25) (layer F.SilkS) (width 0.15))
-    (fp_line (start -1.5 31.75) (end -1.25 31.75) (layer F.SilkS) (width 0.15))
-    (fp_line (start -1.5 -1.25) (end -1.5 31.75) (layer F.SilkS) (width 0.15))
-    (fp_line (start 16.75 31.75) (end -1.25 31.75) (layer F.SilkS) (width 0.15))
-    (fp_line (start 16.75 -1.25) (end 16.75 31.75) (layer F.SilkS) (width 0.15))
     (fp_line (start -1.5 -1.25) (end 16.75 -1.25) (layer F.SilkS) (width 0.15))
+    (fp_line (start 16.75 -1.25) (end 16.75 31.75) (layer F.SilkS) (width 0.15))
+    (fp_line (start 16.75 31.75) (end -1.25 31.75) (layer F.SilkS) (width 0.15))
+    (fp_line (start -1.5 -1.25) (end -1.5 31.75) (layer F.SilkS) (width 0.15))
+    (fp_line (start -1.5 31.75) (end -1.25 31.75) (layer F.SilkS) (width 0.15))
+    (fp_line (start -1.5 1.25) (end 1.75 1.25) (layer F.SilkS) (width 0.15))
+    (fp_line (start 1.75 1.25) (end 1.75 -1.25) (layer F.SilkS) (width 0.15))
+    (fp_line (start -1.5 -1.25) (end 16.75 -1.25) (layer Dwgs.User) (width 0.12))
+    (fp_line (start 16.75 -1.25) (end 16.75 31.75) (layer Dwgs.User) (width 0.12))
+    (fp_line (start 16.75 31.75) (end -1.5 31.75) (layer Dwgs.User) (width 0.12))
+    (fp_line (start -1.5 31.75) (end -1.5 -1.25) (layer Dwgs.User) (width 0.12))
     (fp_text user %R (at 6.35 16.51) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
@@ -1403,20 +1403,20 @@
     (fp_text value TL072 (at 3.81 9.95 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 9.1 -1.55) (end -1.45 -1.55) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 9.1 9.15) (end 9.1 -1.55) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.45 9.15) (end 9.1 9.15) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.45 -1.55) (end -1.45 9.15) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 6.06 -1.33) (end 4.81 -1.33) (layer F.SilkS) (width 0.12))
-    (fp_line (start 6.06 8.95) (end 6.06 -1.33) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.56 8.95) (end 6.06 8.95) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.56 -1.33) (end 1.56 8.95) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.81 -1.33) (end 1.56 -1.33) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0.635 -0.27) (end 1.635 -1.27) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.635 8.89) (end 0.635 -0.27) (layer F.Fab) (width 0.1))
-    (fp_line (start 6.985 8.89) (end 0.635 8.89) (layer F.Fab) (width 0.1))
-    (fp_line (start 6.985 -1.27) (end 6.985 8.89) (layer F.Fab) (width 0.1))
     (fp_line (start 1.635 -1.27) (end 6.985 -1.27) (layer F.Fab) (width 0.1))
+    (fp_line (start 6.985 -1.27) (end 6.985 8.89) (layer F.Fab) (width 0.1))
+    (fp_line (start 6.985 8.89) (end 0.635 8.89) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.635 8.89) (end 0.635 -0.27) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.635 -0.27) (end 1.635 -1.27) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.81 -1.33) (end 1.56 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.56 -1.33) (end 1.56 8.95) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.56 8.95) (end 6.06 8.95) (layer F.SilkS) (width 0.12))
+    (fp_line (start 6.06 8.95) (end 6.06 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start 6.06 -1.33) (end 4.81 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.45 -1.55) (end -1.45 9.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.45 9.15) (end 9.1 9.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 9.1 9.15) (end 9.1 -1.55) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 9.1 -1.55) (end -1.45 -1.55) (layer F.CrtYd) (width 0.05))
     (fp_arc (start 3.81 -1.33) (end 2.81 -1.33) (angle -180) (layer F.SilkS) (width 0.12))
     (fp_text user %R (at 3.81 3.81 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
@@ -1455,20 +1455,20 @@
     (fp_text value 74HC14 (at 3.81 17.57 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 9.1 -1.55) (end -1.45 -1.55) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 9.1 16.8) (end 9.1 -1.55) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.45 16.8) (end 9.1 16.8) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.45 -1.55) (end -1.45 16.8) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 6.06 -1.33) (end 4.81 -1.33) (layer F.SilkS) (width 0.12))
-    (fp_line (start 6.06 16.57) (end 6.06 -1.33) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.56 16.57) (end 6.06 16.57) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.56 -1.33) (end 1.56 16.57) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.81 -1.33) (end 1.56 -1.33) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0.635 -0.27) (end 1.635 -1.27) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.635 16.51) (end 0.635 -0.27) (layer F.Fab) (width 0.1))
-    (fp_line (start 6.985 16.51) (end 0.635 16.51) (layer F.Fab) (width 0.1))
-    (fp_line (start 6.985 -1.27) (end 6.985 16.51) (layer F.Fab) (width 0.1))
     (fp_line (start 1.635 -1.27) (end 6.985 -1.27) (layer F.Fab) (width 0.1))
+    (fp_line (start 6.985 -1.27) (end 6.985 16.51) (layer F.Fab) (width 0.1))
+    (fp_line (start 6.985 16.51) (end 0.635 16.51) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.635 16.51) (end 0.635 -0.27) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.635 -0.27) (end 1.635 -1.27) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.81 -1.33) (end 1.56 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.56 -1.33) (end 1.56 16.57) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.56 16.57) (end 6.06 16.57) (layer F.SilkS) (width 0.12))
+    (fp_line (start 6.06 16.57) (end 6.06 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start 6.06 -1.33) (end 4.81 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.45 -1.55) (end -1.45 16.8) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.45 16.8) (end 9.1 16.8) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 9.1 16.8) (end 9.1 -1.55) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 9.1 -1.55) (end -1.45 -1.55) (layer F.CrtYd) (width 0.05))
     (fp_arc (start 3.81 -1.33) (end 2.81 -1.33) (angle -180) (layer F.SilkS) (width 0.12))
     (fp_text user %R (at 3.81 7.62 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
@@ -1519,21 +1519,21 @@
     (fp_text value TSR_1-2450 (at 2.5 3.25 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -2.3 2) (end 8.4 2) (layer F.Fab) (width 0.1))
-    (fp_line (start -3.42 2.12) (end -3.42 -5.73) (layer F.SilkS) (width 0.12))
-    (fp_line (start -3.42 -5.73) (end 8.52 -5.73) (layer F.SilkS) (width 0.12))
-    (fp_line (start 8.52 -5.73) (end 8.52 2.12) (layer F.SilkS) (width 0.12))
-    (fp_line (start 8.52 2.12) (end -3.42 2.12) (layer F.SilkS) (width 0.12))
-    (fp_line (start -3.55 -5.85) (end 8.65 -5.85) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 8.65 -5.85) (end 8.65 2.25) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 8.65 2.25) (end -3.55 2.25) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3.55 2.25) (end -3.55 -5.85) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3.3 -5.6) (end 8.4 -5.6) (layer F.Fab) (width 0.1))
-    (fp_line (start 8.4 2) (end 8.4 -5.6) (layer F.Fab) (width 0.1))
-    (fp_line (start -3.3 1) (end -3.3 -5.6) (layer F.Fab) (width 0.1))
-    (fp_line (start -3.3 1) (end -2.3 2) (layer F.Fab) (width 0.1))
-    (fp_line (start -3.75 0) (end -3.75 2.45) (layer F.SilkS) (width 0.12))
     (fp_line (start -3.75 2.45) (end -1.42 2.45) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.75 0) (end -3.75 2.45) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.3 1) (end -2.3 2) (layer F.Fab) (width 0.1))
+    (fp_line (start -3.3 1) (end -3.3 -5.6) (layer F.Fab) (width 0.1))
+    (fp_line (start 8.4 2) (end 8.4 -5.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -3.3 -5.6) (end 8.4 -5.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -3.55 2.25) (end -3.55 -5.85) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.65 2.25) (end -3.55 2.25) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.65 -5.85) (end 8.65 2.25) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.55 -5.85) (end 8.65 -5.85) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.52 2.12) (end -3.42 2.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 8.52 -5.73) (end 8.52 2.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.42 -5.73) (end 8.52 -5.73) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.42 2.12) (end -3.42 -5.73) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.3 2) (end 8.4 2) (layer F.Fab) (width 0.1))
     (fp_text user %R (at 3 -3 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
@@ -1562,8 +1562,8 @@
     (fp_text value MountingHole (at 0 3.8 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_circle (center 0 0) (end 3.05 0) (layer F.CrtYd) (width 0.05))
     (fp_circle (center 0 0) (end 2.8 0) (layer Cmts.User) (width 0.15))
+    (fp_circle (center 0 0) (end 3.05 0) (layer F.CrtYd) (width 0.05))
     (fp_text user %R (at 0.3 0 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
@@ -1582,8 +1582,8 @@
     (fp_text value MountingHole (at 0 3.8 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_circle (center 0 0) (end 2.8 0) (layer Cmts.User) (width 0.15))
     (fp_circle (center 0 0) (end 3.05 0) (layer F.CrtYd) (width 0.05))
+    (fp_circle (center 0 0) (end 2.8 0) (layer Cmts.User) (width 0.15))
     (fp_text user %R (at 0.3 0 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
@@ -1602,8 +1602,8 @@
     (fp_text value MountingHole (at 0 3.8 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_circle (center 0 0) (end 3.05 0) (layer F.CrtYd) (width 0.05))
     (fp_circle (center 0 0) (end 2.8 0) (layer Cmts.User) (width 0.15))
+    (fp_circle (center 0 0) (end 3.05 0) (layer F.CrtYd) (width 0.05))
     (fp_text user %R (at 0.3 0 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
@@ -1622,8 +1622,8 @@
     (fp_text value MountingHole (at 0 3.8 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_circle (center 0 0) (end 2.8 0) (layer Cmts.User) (width 0.15))
     (fp_circle (center 0 0) (end 3.05 0) (layer F.CrtYd) (width 0.05))
+    (fp_circle (center 0 0) (end 2.8 0) (layer Cmts.User) (width 0.15))
     (fp_text user %R (at 0.3 0 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
@@ -1641,23 +1641,23 @@
     (fp_text value ENC28J60 (at 1.27 15.03 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 0 -1.27) (end 3.81 -1.27) (layer F.Fab) (width 0.1))
-    (fp_line (start 3.81 -1.27) (end 3.81 13.97) (layer F.Fab) (width 0.1))
-    (fp_line (start 3.81 13.97) (end -1.27 13.97) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.27 13.97) (end -1.27 0) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.27 0) (end 0 -1.27) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.33 14.03) (end 3.87 14.03) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.33 1.27) (end -1.33 14.03) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.87 -1.33) (end 3.87 14.03) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.33 1.27) (end 1.27 1.27) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.27 1.27) (end 1.27 -1.33) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.27 -1.33) (end 3.87 -1.33) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.33 0) (end -1.33 -1.33) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.33 -1.33) (end 0 -1.33) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.8 -1.8) (end -1.8 14.5) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.8 14.5) (end 4.35 14.5) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 4.35 14.5) (end 4.35 -1.8) (layer F.CrtYd) (width 0.05))
     (fp_line (start 4.35 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 4.35 14.5) (end 4.35 -1.8) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.8 14.5) (end 4.35 14.5) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.8 -1.8) (end -1.8 14.5) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.33 -1.33) (end 0 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.33 0) (end -1.33 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.27 -1.33) (end 3.87 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.27 1.27) (end 1.27 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.33 1.27) (end 1.27 1.27) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.87 -1.33) (end 3.87 14.03) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.33 1.27) (end -1.33 14.03) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.33 14.03) (end 3.87 14.03) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.27 0) (end 0 -1.27) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.27 13.97) (end -1.27 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 3.81 13.97) (end -1.27 13.97) (layer F.Fab) (width 0.1))
+    (fp_line (start 3.81 -1.27) (end 3.81 13.97) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 -1.27) (end 3.81 -1.27) (layer F.Fab) (width 0.1))
     (fp_text user %R (at 1.27 6.35) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
@@ -1692,10 +1692,13 @@
     )
   )
 
+  (gr_text "ARDUINO MINI PLUS" (at 244.9 112.2) (layer F.SilkS)
+    (effects (font (size 1.5 1.5) (thickness 0.3)))
+  )
   (gr_text SET (at 235.9 97.7 90) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (gr_text 8-24VDC (at 221.9 83.4 270) (layer F.SilkS)
+  (gr_text 8-24VDC (at 223 85.6 270) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
   (gr_text Sensitivity (at 265.3 69.2 90) (layer F.SilkS)
@@ -1756,14 +1759,14 @@
   (segment (start 237.4 91.7) (end 237.4 87.4) (width 0.8) (layer B.Cu) (net 1))
   (segment (start 250.02 124.76) (end 248.106 126.674) (width 1.5) (layer B.Cu) (net 1) (status 20))
   (segment (start 250.02 119.8) (end 250.02 124.76) (width 1.5) (layer B.Cu) (net 1) (status 10))
-  (segment (start 262.6 69.2) (end 262.6 85.1) (width 0.8) (layer B.Cu) (net 1))
-  (segment (start 261.7 86) (end 258.5 86) (width 0.8) (layer B.Cu) (net 1))
+  (segment (start 262.6 69.2) (end 262.6 85.1) (width 0.8) (layer B.Cu) (net 1) (status 10))
+  (segment (start 261.7 86) (end 258.5 86) (width 0.8) (layer B.Cu) (net 1) (status 20))
   (segment (start 262.6 85.1) (end 261.7 86) (width 0.8) (layer B.Cu) (net 1))
-  (segment (start 241.5 64.2) (end 241.5 64.8) (width 0.8) (layer B.Cu) (net 1))
-  (segment (start 242.9 62.8) (end 241.5 64.2) (width 0.8) (layer B.Cu) (net 1))
+  (segment (start 241.5 64.2) (end 241.5 64.8) (width 0.8) (layer B.Cu) (net 1) (status 30))
+  (segment (start 242.9 62.8) (end 241.5 64.2) (width 0.8) (layer B.Cu) (net 1) (status 20))
   (segment (start 260.2 69.2) (end 253.8 62.8) (width 0.8) (layer B.Cu) (net 1))
   (segment (start 253.8 62.8) (end 242.9 62.8) (width 0.8) (layer B.Cu) (net 1))
-  (segment (start 262.6 69.2) (end 260.2 69.2) (width 0.8) (layer B.Cu) (net 1))
+  (segment (start 262.6 69.2) (end 260.2 69.2) (width 0.8) (layer B.Cu) (net 1) (status 10))
   (segment (start 254.74 87.36) (end 254.8 87.3) (width 0.8) (layer B.Cu) (net 2) (status 30))
   (segment (start 241.5 69.8) (end 251.1 69.8) (width 0.8) (layer B.Cu) (net 2) (status 10))
   (segment (start 252.52 71.22) (end 252.52 72.9) (width 0.8) (layer B.Cu) (net 2) (status 20))
@@ -1837,9 +1840,10 @@
   (segment (start 229.2 94.1) (end 225.5 94.1) (width 0.8) (layer B.Cu) (net 2) (status 10))
   (segment (start 225.5 95.6) (end 225.5 94.1) (width 1.5) (layer B.Cu) (net 2))
   (segment (start 226 82.9) (end 225.5 82.4) (width 1.5) (layer B.Cu) (net 2))
-  (segment (start 228.8 82.9) (end 226 82.9) (width 1.5) (layer B.Cu) (net 2))
   (segment (start 225.5 82.4) (end 225.5 72.6) (width 1.5) (layer B.Cu) (net 2))
   (segment (start 225.5 94.1) (end 225.5 82.4) (width 1.5) (layer B.Cu) (net 2))
+  (segment (start 226.2 83.1) (end 226 82.9) (width 1.5) (layer B.Cu) (net 2))
+  (segment (start 228.8 83.1) (end 226.2 83.1) (width 1.5) (layer B.Cu) (net 2))
   (segment (start 257.34 82.3) (end 258.5 83.46) (width 0.8) (layer B.Cu) (net 3) (status 20))
   (segment (start 254.8 82.3) (end 257.34 82.3) (width 0.8) (layer B.Cu) (net 3) (status 10))
   (segment (start 247.44 72.9) (end 247.44 74.26) (width 0.8) (layer B.Cu) (net 3) (status 10))
@@ -1864,10 +1868,10 @@
   (segment (start 233.6 76.1) (end 230.5 76.1) (width 1.5) (layer B.Cu) (net 4))
   (segment (start 235.2 76.1) (end 233.6 76.1) (width 1.5) (layer B.Cu) (net 4))
   (segment (start 237.2 76.1) (end 237.2 76.8) (width 1.5) (layer B.Cu) (net 4) (status 30))
-  (segment (start 231.75 82.85) (end 237.2 77.4) (width 1.5) (layer B.Cu) (net 4))
-  (segment (start 237.2 77.4) (end 237.2 76.1) (width 1.5) (layer B.Cu) (net 4) (status 20))
-  (segment (start 231.75 84.95) (end 231.75 82.85) (width 1.5) (layer B.Cu) (net 4))
-  (segment (start 228.8 87.9) (end 231.75 84.95) (width 1.5) (layer B.Cu) (net 4) (status 10))
+  (segment (start 231.75 85.15) (end 228.8 88.1) (width 1.5) (layer B.Cu) (net 4))
+  (segment (start 231.75 82.85) (end 231.75 85.15) (width 1.5) (layer B.Cu) (net 4))
+  (segment (start 237.2 77.4) (end 231.75 82.85) (width 1.5) (layer B.Cu) (net 4))
+  (segment (start 237.2 76.1) (end 237.2 77.4) (width 1.5) (layer B.Cu) (net 4))
   (segment (start 233.26 100.7) (end 229.2 96.64) (width 0.8) (layer B.Cu) (net 5) (status 20))
   (segment (start 239.6 100.7) (end 233.26 100.7) (width 0.8) (layer B.Cu) (net 5) (status 10))
   (segment (start 236.9 94.9) (end 237.3 94.9) (width 0.8) (layer B.Cu) (net 6) (status 30))
@@ -1897,7 +1901,7 @@
   (segment (start 248.2 77.2) (end 249.98 75.42) (width 0.8) (layer B.Cu) (net 10) (status 10))
   (segment (start 249.98 75.28) (end 249.98 72.9) (width 0.8) (layer B.Cu) (net 10) (status 20))
   (segment (start 249.98 75.42) (end 249.98 75.28) (width 0.8) (layer B.Cu) (net 10))
-  (segment (start 257.6 71.7) (end 257.6 74) (width 0.8) (layer B.Cu) (net 10))
+  (segment (start 257.6 71.7) (end 257.6 74) (width 0.8) (layer B.Cu) (net 10) (status 10))
   (segment (start 256.32 75.28) (end 255.02 75.28) (width 0.8) (layer B.Cu) (net 10))
   (segment (start 257.6 74) (end 256.32 75.28) (width 0.8) (layer B.Cu) (net 10))
   (segment (start 255.02 75.28) (end 249.98 75.28) (width 0.8) (layer B.Cu) (net 10))
diff --git a/hardware/MQTT_energy_meter.kicad_pcb-bak b/hardware/MQTT_energy_meter.kicad_pcb-bak
index 3d3aa4d..7ac3672 100644
--- a/hardware/MQTT_energy_meter.kicad_pcb-bak
+++ b/hardware/MQTT_energy_meter.kicad_pcb-bak
@@ -2,8 +2,8 @@
 
   (general
     (thickness 1.6)
-    (drawings 15)
-    (tracks 221)
+    (drawings 16)
+    (tracks 222)
     (zones 0)
     (modules 28)
     (nets 41)
@@ -34,7 +34,7 @@
   )
 
   (setup
-    (last_trace_width 0.8)
+    (last_trace_width 1.5)
     (user_trace_width 0.4)
     (user_trace_width 0.8)
     (user_trace_width 1.5)
@@ -65,7 +65,7 @@
     (aux_axis_origin 0 0)
     (visible_elements FFFFFF7F)
     (pcbplotparams
-      (layerselection 0x010fc_ffffffff)
+      (layerselection 0x00020_fffffffe)
       (usegerberextensions false)
       (usegerberattributes true)
       (usegerberadvancedattributes true)
@@ -81,16 +81,16 @@
       (hpglpendiameter 15.000000)
       (psnegative false)
       (psa4output false)
-      (plotreference true)
+      (plotreference false)
       (plotvalue true)
       (plotinvisibletext false)
       (padsonsilk false)
       (subtractmaskfromsilk false)
-      (outputformat 1)
+      (outputformat 4)
       (mirror false)
       (drillshape 1)
       (scaleselection 1)
-      (outputdirectory ""))
+      (outputdirectory "/home/marcel/Documenten/electronische_projecten/atmega328p_mqtt_energy_meter/MQTT_energy_meter/"))
   )
 
   (net 0 "")
@@ -185,14 +185,14 @@
   )
 
   (module Symbol:OSHW-Symbol_6.7x6mm_SilkScreen (layer F.Cu) (tedit 0) (tstamp 63B33B3B)
-    (at 116.2 110.9)
+    (at 255.7 129.5 90)
     (descr "Open Source Hardware Symbol")
     (tags "Logo Symbol OSHW")
     (attr virtual)
-    (fp_text reference REF** (at 0 0) (layer F.SilkS) hide
+    (fp_text reference REF** (at 0 0 90) (layer F.SilkS) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value OSHW-Symbol_6.7x6mm_SilkScreen (at 0.75 0) (layer F.Fab) hide
+    (fp_text value OSHW-Symbol_6.7x6mm_SilkScreen (at 0.75 0 90) (layer F.Fab) hide
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_poly (pts (xy 0.555814 -2.531069) (xy 0.639635 -2.086445) (xy 0.94892 -1.958947) (xy 1.258206 -1.831449)
@@ -283,14 +283,14 @@
   )
 
   (module Symbol:OSHW-Symbol_6.7x6mm_Copper (layer B.Cu) (tedit 0) (tstamp 63B33B0E)
-    (at 116.2 110.9 180)
+    (at 255.7 129.5 270)
     (descr "Open Source Hardware Symbol")
     (tags "Logo Symbol OSHW")
     (attr virtual)
-    (fp_text reference REF** (at 0 0) (layer B.SilkS) hide
+    (fp_text reference REF** (at 0 0 90) (layer B.SilkS) hide
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
-    (fp_text value OSHW-Symbol_6.7x6mm_Copper (at 0.75 0) (layer B.Fab) hide
+    (fp_text value OSHW-Symbol_6.7x6mm_Copper (at 0.75 0 90) (layer B.Fab) hide
       (effects (font (size 1 1) (thickness 0.15)) (justify mirror))
     )
     (fp_poly (pts (xy 0.555814 2.531069) (xy 0.639635 2.086445) (xy 0.94892 1.958947) (xy 1.258206 1.831449)
@@ -381,242 +381,14 @@
   )
 
   (module Capacitor_THT:CP_Radial_D5.0mm_P2.50mm (layer F.Cu) (tedit 63B2E029) (tstamp 63B33E9D)
-    (at 178.3 92.4 180)
+    (at 237.2 67.4 270)
     (descr "CP, Radial series, Radial, pin pitch=2.50mm, , diameter=5mm, Electrolytic Capacitor")
     (tags "CP Radial series Radial pin pitch 2.50mm  diameter 5mm Electrolytic Capacitor")
     (path /637E7E46)
-    (fp_text reference C1 (at -2.8 0.4) (layer F.SilkS)
+    (fp_text reference C1 (at -2.8 0.4 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 10U (at 1.25 3.75) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start -1.304775 -1.725) (end -1.304775 -1.225) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.554775 -1.475) (end -1.054775 -1.475) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.851 -0.284) (end 3.851 0.284) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.811 -0.518) (end 3.811 0.518) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.771 -0.677) (end 3.771 0.677) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.731 -0.805) (end 3.731 0.805) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.691 -0.915) (end 3.691 0.915) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.651 -1.011) (end 3.651 1.011) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.611 -1.098) (end 3.611 1.098) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.571 -1.178) (end 3.571 1.178) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.531 1.04) (end 3.531 1.251) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.531 -1.251) (end 3.531 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.491 1.04) (end 3.491 1.319) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.491 -1.319) (end 3.491 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.451 1.04) (end 3.451 1.383) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.451 -1.383) (end 3.451 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.411 1.04) (end 3.411 1.443) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.411 -1.443) (end 3.411 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.371 1.04) (end 3.371 1.5) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.371 -1.5) (end 3.371 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.331 1.04) (end 3.331 1.554) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.331 -1.554) (end 3.331 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.291 1.04) (end 3.291 1.605) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.291 -1.605) (end 3.291 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.251 1.04) (end 3.251 1.653) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.251 -1.653) (end 3.251 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.211 1.04) (end 3.211 1.699) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.211 -1.699) (end 3.211 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.171 1.04) (end 3.171 1.743) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.171 -1.743) (end 3.171 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.131 1.04) (end 3.131 1.785) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.131 -1.785) (end 3.131 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.091 1.04) (end 3.091 1.826) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.091 -1.826) (end 3.091 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.051 1.04) (end 3.051 1.864) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.051 -1.864) (end 3.051 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.011 1.04) (end 3.011 1.901) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.011 -1.901) (end 3.011 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.971 1.04) (end 2.971 1.937) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.971 -1.937) (end 2.971 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.931 1.04) (end 2.931 1.971) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.931 -1.971) (end 2.931 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.891 1.04) (end 2.891 2.004) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.891 -2.004) (end 2.891 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.851 1.04) (end 2.851 2.035) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.851 -2.035) (end 2.851 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.811 1.04) (end 2.811 2.065) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.811 -2.065) (end 2.811 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.771 1.04) (end 2.771 2.095) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.771 -2.095) (end 2.771 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.731 1.04) (end 2.731 2.122) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.731 -2.122) (end 2.731 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.691 1.04) (end 2.691 2.149) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.691 -2.149) (end 2.691 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.651 1.04) (end 2.651 2.175) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.651 -2.175) (end 2.651 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.611 1.04) (end 2.611 2.2) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.611 -2.2) (end 2.611 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.571 1.04) (end 2.571 2.224) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.571 -2.224) (end 2.571 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.531 1.04) (end 2.531 2.247) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.531 -2.247) (end 2.531 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.491 1.04) (end 2.491 2.268) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.491 -2.268) (end 2.491 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.451 1.04) (end 2.451 2.29) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.451 -2.29) (end 2.451 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.411 1.04) (end 2.411 2.31) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.411 -2.31) (end 2.411 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.371 1.04) (end 2.371 2.329) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.371 -2.329) (end 2.371 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.331 1.04) (end 2.331 2.348) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.331 -2.348) (end 2.331 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.291 1.04) (end 2.291 2.365) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.291 -2.365) (end 2.291 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.251 1.04) (end 2.251 2.382) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.251 -2.382) (end 2.251 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.211 1.04) (end 2.211 2.398) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.211 -2.398) (end 2.211 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.171 1.04) (end 2.171 2.414) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.171 -2.414) (end 2.171 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.131 1.04) (end 2.131 2.428) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.131 -2.428) (end 2.131 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.091 1.04) (end 2.091 2.442) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.091 -2.442) (end 2.091 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.051 1.04) (end 2.051 2.455) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.051 -2.455) (end 2.051 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.011 1.04) (end 2.011 2.468) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.011 -2.468) (end 2.011 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.971 1.04) (end 1.971 2.48) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.971 -2.48) (end 1.971 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.93 1.04) (end 1.93 2.491) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.93 -2.491) (end 1.93 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.89 1.04) (end 1.89 2.501) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.89 -2.501) (end 1.89 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.85 1.04) (end 1.85 2.511) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.85 -2.511) (end 1.85 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.81 1.04) (end 1.81 2.52) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.81 -2.52) (end 1.81 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.77 1.04) (end 1.77 2.528) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.77 -2.528) (end 1.77 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.73 1.04) (end 1.73 2.536) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.73 -2.536) (end 1.73 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.69 1.04) (end 1.69 2.543) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.69 -2.543) (end 1.69 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.65 1.04) (end 1.65 2.55) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.65 -2.55) (end 1.65 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.61 1.04) (end 1.61 2.556) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.61 -2.556) (end 1.61 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.57 1.04) (end 1.57 2.561) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.57 -2.561) (end 1.57 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.53 1.04) (end 1.53 2.565) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.53 -2.565) (end 1.53 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.49 1.04) (end 1.49 2.569) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.49 -2.569) (end 1.49 -1.04) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.45 -2.573) (end 1.45 2.573) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.41 -2.576) (end 1.41 2.576) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.37 -2.578) (end 1.37 2.578) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.33 -2.579) (end 1.33 2.579) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.29 -2.58) (end 1.29 2.58) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.25 -2.58) (end 1.25 2.58) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.633605 -1.3375) (end -0.633605 -0.8375) (layer F.Fab) (width 0.1))
-    (fp_line (start -0.883605 -1.0875) (end -0.383605 -1.0875) (layer F.Fab) (width 0.1))
-    (fp_circle (center 1.25 0) (end 4 0) (layer F.CrtYd) (width 0.05))
-    (fp_circle (center 1.25 0) (end 3.87 0) (layer F.SilkS) (width 0.12))
-    (fp_circle (center 1.25 0) (end 3.75 0) (layer F.Fab) (width 0.1))
-    (fp_text user %R (at 1.25 0) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (pad 1 thru_hole rect (at 0 0 180) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
-      (net 1 VCC))
-    (pad 2 thru_hole circle (at 2.5 0 180) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
-      (net 2 GND))
-    (model ${KISYS3DMOD}/Capacitor_THT.3dshapes/CP_Radial_D5.0mm_P2.50mm.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Capacitor_THT:C_Disc_D5.0mm_W2.5mm_P5.00mm (layer F.Cu) (tedit 63B2E009) (tstamp 63B331D3)
-    (at 155.3 96.7 180)
-    (descr "C, Disc series, Radial, pin pitch=5.00mm, , diameter*width=5*2.5mm^2, Capacitor, http://cdn-reichelt.de/documents/datenblatt/B300/DS_KERKO_TC.pdf")
-    (tags "C Disc series Radial pin pitch 5.00mm  diameter 5mm width 2.5mm Capacitor")
-    (path /637DF69F)
-    (fp_text reference C2 (at 4.4 2.3) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 100n (at 2.5 2.5) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 6.05 -1.5) (end -1.05 -1.5) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 6.05 1.5) (end 6.05 -1.5) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 1.5) (end 6.05 1.5) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 -1.5) (end -1.05 1.5) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 5.12 1.055) (end 5.12 1.37) (layer F.SilkS) (width 0.12))
-    (fp_line (start 5.12 -1.37) (end 5.12 -1.055) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.12 1.055) (end -0.12 1.37) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.12 -1.37) (end -0.12 -1.055) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.12 1.37) (end 5.12 1.37) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.12 -1.37) (end 5.12 -1.37) (layer F.SilkS) (width 0.12))
-    (fp_line (start 5 -1.25) (end 0 -1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 5 1.25) (end 5 -1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 0 1.25) (end 5 1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 0 -1.25) (end 0 1.25) (layer F.Fab) (width 0.1))
-    (fp_text user %R (at 2.5 0) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (pad 1 thru_hole circle (at 0 0 180) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
-      (net 1 VCC))
-    (pad 2 thru_hole circle (at 5 0 180) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
-      (net 2 GND))
-    (model ${KISYS3DMOD}/Capacitor_THT.3dshapes/C_Disc_D5.0mm_W2.5mm_P5.00mm.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Capacitor_THT:C_Disc_D5.0mm_W2.5mm_P5.00mm (layer F.Cu) (tedit 63B2DFF7) (tstamp 63B331E8)
-    (at 163.4 110 180)
-    (descr "C, Disc series, Radial, pin pitch=5.00mm, , diameter*width=5*2.5mm^2, Capacitor, http://cdn-reichelt.de/documents/datenblatt/B300/DS_KERKO_TC.pdf")
-    (tags "C Disc series Radial pin pitch 5.00mm  diameter 5mm width 2.5mm Capacitor")
-    (path /6398D053)
-    (fp_text reference C3 (at -2.4 0) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 100n (at 2.5 2.5) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 6.05 -1.5) (end -1.05 -1.5) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 6.05 1.5) (end 6.05 -1.5) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 1.5) (end 6.05 1.5) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 -1.5) (end -1.05 1.5) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 5.12 1.055) (end 5.12 1.37) (layer F.SilkS) (width 0.12))
-    (fp_line (start 5.12 -1.37) (end 5.12 -1.055) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.12 1.055) (end -0.12 1.37) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.12 -1.37) (end -0.12 -1.055) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.12 1.37) (end 5.12 1.37) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.12 -1.37) (end 5.12 -1.37) (layer F.SilkS) (width 0.12))
-    (fp_line (start 5 -1.25) (end 0 -1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 5 1.25) (end 5 -1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 0 1.25) (end 5 1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 0 -1.25) (end 0 1.25) (layer F.Fab) (width 0.1))
-    (fp_text user %R (at 2.5 0) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (pad 1 thru_hole circle (at 0 0 180) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
-      (net 3 "Net-(C3-Pad1)"))
-    (pad 2 thru_hole circle (at 5 0 180) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
-      (net 2 GND))
-    (model ${KISYS3DMOD}/Capacitor_THT.3dshapes/C_Disc_D5.0mm_W2.5mm_P5.00mm.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Capacitor_THT:CP_Radial_D5.0mm_P2.50mm (layer F.Cu) (tedit 63B2E030) (tstamp 63B3326C)
-    (at 169.6 92.4)
-    (descr "CP, Radial series, Radial, pin pitch=2.50mm, , diameter=5mm, Electrolytic Capacitor")
-    (tags "CP Radial series Radial pin pitch 2.50mm  diameter 5mm Electrolytic Capacitor")
-    (path /639134F2)
-    (fp_text reference C4 (at -2.8 0.1) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 10U (at 1.25 3.75) (layer F.Fab)
+    (fp_text value 10U (at 1.25 3.75 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_circle (center 1.25 0) (end 3.75 0) (layer F.Fab) (width 0.1))
@@ -744,13 +516,13 @@
     (fp_line (start 3.851 -0.284) (end 3.851 0.284) (layer F.SilkS) (width 0.12))
     (fp_line (start -1.554775 -1.475) (end -1.054775 -1.475) (layer F.SilkS) (width 0.12))
     (fp_line (start -1.304775 -1.725) (end -1.304775 -1.225) (layer F.SilkS) (width 0.12))
-    (fp_text user %R (at 1.25 0) (layer F.Fab)
+    (fp_text user %R (at 1.25 0 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (pad 2 thru_hole circle (at 2.5 0) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 1 thru_hole rect (at 0 0 270) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
+      (net 1 VCC))
+    (pad 2 thru_hole circle (at 2.5 0 270) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
       (net 2 GND))
-    (pad 1 thru_hole rect (at 0 0) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
-      (net 4 "Net-(C4-Pad1)"))
     (model ${KISYS3DMOD}/Capacitor_THT.3dshapes/CP_Radial_D5.0mm_P2.50mm.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -758,37 +530,37 @@
     )
   )
 
-  (module Capacitor_THT:C_Disc_D5.0mm_W2.5mm_P5.00mm (layer F.Cu) (tedit 63B2E01B) (tstamp 63B361A4)
-    (at 167.3 88.1)
+  (module Capacitor_THT:C_Disc_D5.0mm_W2.5mm_P5.00mm (layer F.Cu) (tedit 63B2E009) (tstamp 63B331D3)
+    (at 241.5 90.4 270)
     (descr "C, Disc series, Radial, pin pitch=5.00mm, , diameter*width=5*2.5mm^2, Capacitor, http://cdn-reichelt.de/documents/datenblatt/B300/DS_KERKO_TC.pdf")
     (tags "C Disc series Radial pin pitch 5.00mm  diameter 5mm width 2.5mm Capacitor")
-    (path /6391A1B5)
-    (fp_text reference C5 (at -0.8 -2.3) (layer F.SilkS)
+    (path /637DF69F)
+    (fp_text reference C2 (at 4.4 2.3 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 100n (at 2.5 2.5) (layer F.Fab)
+    (fp_text value 100n (at 2.5 2.5 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 6.05 -1.5) (end -1.05 -1.5) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 6.05 1.5) (end 6.05 -1.5) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 1.5) (end 6.05 1.5) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 -1.5) (end -1.05 1.5) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 5.12 1.055) (end 5.12 1.37) (layer F.SilkS) (width 0.12))
-    (fp_line (start 5.12 -1.37) (end 5.12 -1.055) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.12 1.055) (end -0.12 1.37) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.12 -1.37) (end -0.12 -1.055) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.12 1.37) (end 5.12 1.37) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.12 -1.37) (end 5.12 -1.37) (layer F.SilkS) (width 0.12))
-    (fp_line (start 5 -1.25) (end 0 -1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 5 1.25) (end 5 -1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 0 1.25) (end 5 1.25) (layer F.Fab) (width 0.1))
     (fp_line (start 0 -1.25) (end 0 1.25) (layer F.Fab) (width 0.1))
-    (fp_text user %R (at 2.5 0) (layer F.Fab)
+    (fp_line (start 0 1.25) (end 5 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 5 1.25) (end 5 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 5 -1.25) (end 0 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.12 -1.37) (end 5.12 -1.37) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.12 1.37) (end 5.12 1.37) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.12 -1.37) (end -0.12 -1.055) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.12 1.055) (end -0.12 1.37) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.12 -1.37) (end 5.12 -1.055) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.12 1.055) (end 5.12 1.37) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.05 -1.5) (end -1.05 1.5) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 1.5) (end 6.05 1.5) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 6.05 1.5) (end 6.05 -1.5) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 6.05 -1.5) (end -1.05 -1.5) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 2.5 0 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (pad 1 thru_hole circle (at 0 0) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
-      (net 4 "Net-(C4-Pad1)"))
-    (pad 2 thru_hole circle (at 5 0) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 1 thru_hole circle (at 0 0 270) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
+      (net 1 VCC))
+    (pad 2 thru_hole circle (at 5 0 270) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
       (net 2 GND))
     (model ${KISYS3DMOD}/Capacitor_THT.3dshapes/C_Disc_D5.0mm_W2.5mm_P5.00mm.wrl
       (at (xyz 0 0 0))
@@ -797,15 +569,15 @@
     )
   )
 
-  (module Capacitor_THT:C_Disc_D5.0mm_W2.5mm_P5.00mm (layer F.Cu) (tedit 63B2E000) (tstamp 63B33296)
-    (at 180.9 96.7 180)
+  (module Capacitor_THT:C_Disc_D5.0mm_W2.5mm_P5.00mm (layer F.Cu) (tedit 63B2DFF7) (tstamp 63B331E8)
+    (at 254.8 82.3 270)
     (descr "C, Disc series, Radial, pin pitch=5.00mm, , diameter*width=5*2.5mm^2, Capacitor, http://cdn-reichelt.de/documents/datenblatt/B300/DS_KERKO_TC.pdf")
     (tags "C Disc series Radial pin pitch 5.00mm  diameter 5mm width 2.5mm Capacitor")
-    (path /6382F4A6)
-    (fp_text reference C6 (at -2.7 -0.1) (layer F.SilkS)
+    (path /6398D053)
+    (fp_text reference C3 (at -2.4 0 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 100n (at 2.5 2.5) (layer F.Fab)
+    (fp_text value 100n (at 2.5 2.5 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start 0 -1.25) (end 0 1.25) (layer F.Fab) (width 0.1))
@@ -822,13 +594,13 @@
     (fp_line (start -1.05 1.5) (end 6.05 1.5) (layer F.CrtYd) (width 0.05))
     (fp_line (start 6.05 1.5) (end 6.05 -1.5) (layer F.CrtYd) (width 0.05))
     (fp_line (start 6.05 -1.5) (end -1.05 -1.5) (layer F.CrtYd) (width 0.05))
-    (fp_text user %R (at 2.5 0) (layer F.Fab)
+    (fp_text user %R (at 2.5 0 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (pad 2 thru_hole circle (at 5 0 180) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 1 thru_hole circle (at 0 0 270) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
+      (net 3 "Net-(C3-Pad1)"))
+    (pad 2 thru_hole circle (at 5 0 270) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
       (net 2 GND))
-    (pad 1 thru_hole circle (at 0 0 180) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
-      (net 1 VCC))
     (model ${KISYS3DMOD}/Capacitor_THT.3dshapes/C_Disc_D5.0mm_W2.5mm_P5.00mm.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -836,15 +608,165 @@
     )
   )
 
-  (module Capacitor_THT:C_Disc_D5.0mm_W2.5mm_P5.00mm (layer F.Cu) (tedit 63B2E012) (tstamp 63B361E0)
-    (at 179.9 88.1 180)
-    (descr "C, Disc series, Radial, pin pitch=5.00mm, , diameter*width=5*2.5mm^2, Capacitor, http://cdn-reichelt.de/documents/datenblatt/B300/DS_KERKO_TC.pdf")
-    (tags "C Disc series Radial pin pitch 5.00mm  diameter 5mm width 2.5mm Capacitor")
-    (path /6391C15A)
-    (fp_text reference C7 (at -2.5 0) (layer F.SilkS)
+  (module Capacitor_THT:CP_Radial_D5.0mm_P2.50mm (layer F.Cu) (tedit 63B2E030) (tstamp 63B3326C)
+    (at 237.2 76.1 90)
+    (descr "CP, Radial series, Radial, pin pitch=2.50mm, , diameter=5mm, Electrolytic Capacitor")
+    (tags "CP Radial series Radial pin pitch 2.50mm  diameter 5mm Electrolytic Capacitor")
+    (path /639134F2)
+    (fp_text reference C4 (at -2.8 0.1 90) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 10U (at 1.25 3.75 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start -1.304775 -1.725) (end -1.304775 -1.225) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.554775 -1.475) (end -1.054775 -1.475) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.851 -0.284) (end 3.851 0.284) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.811 -0.518) (end 3.811 0.518) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.771 -0.677) (end 3.771 0.677) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.731 -0.805) (end 3.731 0.805) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.691 -0.915) (end 3.691 0.915) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.651 -1.011) (end 3.651 1.011) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.611 -1.098) (end 3.611 1.098) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.571 -1.178) (end 3.571 1.178) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.531 1.04) (end 3.531 1.251) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.531 -1.251) (end 3.531 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.491 1.04) (end 3.491 1.319) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.491 -1.319) (end 3.491 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.451 1.04) (end 3.451 1.383) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.451 -1.383) (end 3.451 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.411 1.04) (end 3.411 1.443) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.411 -1.443) (end 3.411 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.371 1.04) (end 3.371 1.5) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.371 -1.5) (end 3.371 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.331 1.04) (end 3.331 1.554) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.331 -1.554) (end 3.331 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.291 1.04) (end 3.291 1.605) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.291 -1.605) (end 3.291 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.251 1.04) (end 3.251 1.653) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.251 -1.653) (end 3.251 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.211 1.04) (end 3.211 1.699) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.211 -1.699) (end 3.211 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.171 1.04) (end 3.171 1.743) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.171 -1.743) (end 3.171 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.131 1.04) (end 3.131 1.785) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.131 -1.785) (end 3.131 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.091 1.04) (end 3.091 1.826) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.091 -1.826) (end 3.091 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.051 1.04) (end 3.051 1.864) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.051 -1.864) (end 3.051 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.011 1.04) (end 3.011 1.901) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.011 -1.901) (end 3.011 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.971 1.04) (end 2.971 1.937) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.971 -1.937) (end 2.971 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.931 1.04) (end 2.931 1.971) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.931 -1.971) (end 2.931 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.891 1.04) (end 2.891 2.004) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.891 -2.004) (end 2.891 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.851 1.04) (end 2.851 2.035) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.851 -2.035) (end 2.851 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.811 1.04) (end 2.811 2.065) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.811 -2.065) (end 2.811 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.771 1.04) (end 2.771 2.095) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.771 -2.095) (end 2.771 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.731 1.04) (end 2.731 2.122) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.731 -2.122) (end 2.731 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.691 1.04) (end 2.691 2.149) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.691 -2.149) (end 2.691 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.651 1.04) (end 2.651 2.175) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.651 -2.175) (end 2.651 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.611 1.04) (end 2.611 2.2) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.611 -2.2) (end 2.611 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.571 1.04) (end 2.571 2.224) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.571 -2.224) (end 2.571 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.531 1.04) (end 2.531 2.247) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.531 -2.247) (end 2.531 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.491 1.04) (end 2.491 2.268) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.491 -2.268) (end 2.491 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.451 1.04) (end 2.451 2.29) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.451 -2.29) (end 2.451 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.411 1.04) (end 2.411 2.31) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.411 -2.31) (end 2.411 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.371 1.04) (end 2.371 2.329) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.371 -2.329) (end 2.371 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.331 1.04) (end 2.331 2.348) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.331 -2.348) (end 2.331 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.291 1.04) (end 2.291 2.365) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.291 -2.365) (end 2.291 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.251 1.04) (end 2.251 2.382) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.251 -2.382) (end 2.251 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.211 1.04) (end 2.211 2.398) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.211 -2.398) (end 2.211 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.171 1.04) (end 2.171 2.414) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.171 -2.414) (end 2.171 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.131 1.04) (end 2.131 2.428) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.131 -2.428) (end 2.131 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.091 1.04) (end 2.091 2.442) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.091 -2.442) (end 2.091 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.051 1.04) (end 2.051 2.455) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.051 -2.455) (end 2.051 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.011 1.04) (end 2.011 2.468) (layer F.SilkS) (width 0.12))
+    (fp_line (start 2.011 -2.468) (end 2.011 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.971 1.04) (end 1.971 2.48) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.971 -2.48) (end 1.971 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.93 1.04) (end 1.93 2.491) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.93 -2.491) (end 1.93 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.89 1.04) (end 1.89 2.501) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.89 -2.501) (end 1.89 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.85 1.04) (end 1.85 2.511) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.85 -2.511) (end 1.85 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.81 1.04) (end 1.81 2.52) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.81 -2.52) (end 1.81 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.77 1.04) (end 1.77 2.528) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.77 -2.528) (end 1.77 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.73 1.04) (end 1.73 2.536) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.73 -2.536) (end 1.73 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.69 1.04) (end 1.69 2.543) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.69 -2.543) (end 1.69 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.65 1.04) (end 1.65 2.55) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.65 -2.55) (end 1.65 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.61 1.04) (end 1.61 2.556) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.61 -2.556) (end 1.61 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.57 1.04) (end 1.57 2.561) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.57 -2.561) (end 1.57 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.53 1.04) (end 1.53 2.565) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.53 -2.565) (end 1.53 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.49 1.04) (end 1.49 2.569) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.49 -2.569) (end 1.49 -1.04) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.45 -2.573) (end 1.45 2.573) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.41 -2.576) (end 1.41 2.576) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.37 -2.578) (end 1.37 2.578) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.33 -2.579) (end 1.33 2.579) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.29 -2.58) (end 1.29 2.58) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.25 -2.58) (end 1.25 2.58) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.633605 -1.3375) (end -0.633605 -0.8375) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.883605 -1.0875) (end -0.383605 -1.0875) (layer F.Fab) (width 0.1))
+    (fp_circle (center 1.25 0) (end 4 0) (layer F.CrtYd) (width 0.05))
+    (fp_circle (center 1.25 0) (end 3.87 0) (layer F.SilkS) (width 0.12))
+    (fp_circle (center 1.25 0) (end 3.75 0) (layer F.Fab) (width 0.1))
+    (fp_text user %R (at 1.25 0 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 2 thru_hole circle (at 2.5 0 90) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
+      (net 2 GND))
+    (pad 1 thru_hole rect (at 0 0 90) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
+      (net 4 "Net-(C4-Pad1)"))
+    (model ${KISYS3DMOD}/Capacitor_THT.3dshapes/CP_Radial_D5.0mm_P2.50mm.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Capacitor_THT:C_Disc_D5.0mm_W2.5mm_P5.00mm (layer F.Cu) (tedit 63B2E01B) (tstamp 63B361A4)
+    (at 232.9 78.4 90)
+    (descr "C, Disc series, Radial, pin pitch=5.00mm, , diameter*width=5*2.5mm^2, Capacitor, http://cdn-reichelt.de/documents/datenblatt/B300/DS_KERKO_TC.pdf")
+    (tags "C Disc series Radial pin pitch 5.00mm  diameter 5mm width 2.5mm Capacitor")
+    (path /6391A1B5)
+    (fp_text reference C5 (at -0.8 -2.3 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 100n (at 2.5 2.5) (layer F.Fab)
+    (fp_text value 100n (at 2.5 2.5 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start 0 -1.25) (end 0 1.25) (layer F.Fab) (width 0.1))
@@ -861,12 +783,90 @@
     (fp_line (start -1.05 1.5) (end 6.05 1.5) (layer F.CrtYd) (width 0.05))
     (fp_line (start 6.05 1.5) (end 6.05 -1.5) (layer F.CrtYd) (width 0.05))
     (fp_line (start 6.05 -1.5) (end -1.05 -1.5) (layer F.CrtYd) (width 0.05))
-    (fp_text user %R (at 2.5 0) (layer F.Fab)
+    (fp_text user %R (at 2.5 0 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (pad 2 thru_hole circle (at 5 0 180) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 1 thru_hole circle (at 0 0 90) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
+      (net 4 "Net-(C4-Pad1)"))
+    (pad 2 thru_hole circle (at 5 0 90) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
       (net 2 GND))
-    (pad 1 thru_hole circle (at 0 0 180) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
+    (model ${KISYS3DMOD}/Capacitor_THT.3dshapes/C_Disc_D5.0mm_W2.5mm_P5.00mm.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Capacitor_THT:C_Disc_D5.0mm_W2.5mm_P5.00mm (layer F.Cu) (tedit 63B2E000) (tstamp 63B33296)
+    (at 241.5 64.8 270)
+    (descr "C, Disc series, Radial, pin pitch=5.00mm, , diameter*width=5*2.5mm^2, Capacitor, http://cdn-reichelt.de/documents/datenblatt/B300/DS_KERKO_TC.pdf")
+    (tags "C Disc series Radial pin pitch 5.00mm  diameter 5mm width 2.5mm Capacitor")
+    (path /6382F4A6)
+    (fp_text reference C6 (at -2.7 -0.1 90) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 100n (at 2.5 2.5 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 6.05 -1.5) (end -1.05 -1.5) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 6.05 1.5) (end 6.05 -1.5) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 1.5) (end 6.05 1.5) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 -1.5) (end -1.05 1.5) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 5.12 1.055) (end 5.12 1.37) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.12 -1.37) (end 5.12 -1.055) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.12 1.055) (end -0.12 1.37) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.12 -1.37) (end -0.12 -1.055) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.12 1.37) (end 5.12 1.37) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.12 -1.37) (end 5.12 -1.37) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5 -1.25) (end 0 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 5 1.25) (end 5 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 1.25) (end 5 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 -1.25) (end 0 1.25) (layer F.Fab) (width 0.1))
+    (fp_text user %R (at 2.5 0 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 2 thru_hole circle (at 5 0 270) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
+      (net 2 GND))
+    (pad 1 thru_hole circle (at 0 0 270) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
+      (net 1 VCC))
+    (model ${KISYS3DMOD}/Capacitor_THT.3dshapes/C_Disc_D5.0mm_W2.5mm_P5.00mm.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Capacitor_THT:C_Disc_D5.0mm_W2.5mm_P5.00mm (layer F.Cu) (tedit 63B2E012) (tstamp 63B361E0)
+    (at 232.9 65.8 270)
+    (descr "C, Disc series, Radial, pin pitch=5.00mm, , diameter*width=5*2.5mm^2, Capacitor, http://cdn-reichelt.de/documents/datenblatt/B300/DS_KERKO_TC.pdf")
+    (tags "C Disc series Radial pin pitch 5.00mm  diameter 5mm width 2.5mm Capacitor")
+    (path /6391C15A)
+    (fp_text reference C7 (at -2.5 0 90) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 100n (at 2.5 2.5 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 6.05 -1.5) (end -1.05 -1.5) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 6.05 1.5) (end 6.05 -1.5) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 1.5) (end 6.05 1.5) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 -1.5) (end -1.05 1.5) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 5.12 1.055) (end 5.12 1.37) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5.12 -1.37) (end 5.12 -1.055) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.12 1.055) (end -0.12 1.37) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.12 -1.37) (end -0.12 -1.055) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.12 1.37) (end 5.12 1.37) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.12 -1.37) (end 5.12 -1.37) (layer F.SilkS) (width 0.12))
+    (fp_line (start 5 -1.25) (end 0 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 5 1.25) (end 5 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 1.25) (end 5 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 -1.25) (end 0 1.25) (layer F.Fab) (width 0.1))
+    (fp_text user %R (at 2.5 0 90) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 2 thru_hole circle (at 5 0 270) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
+      (net 2 GND))
+    (pad 1 thru_hole circle (at 0 0 270) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
       (net 1 VCC))
     (model ${KISYS3DMOD}/Capacitor_THT.3dshapes/C_Disc_D5.0mm_W2.5mm_P5.00mm.wrl
       (at (xyz 0 0 0))
@@ -876,37 +876,37 @@
   )
 
   (module Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical (layer F.Cu) (tedit 63B2DFDE) (tstamp 63B332C1)
-    (at 159.7 113.7 90)
+    (at 258.5 86 180)
     (descr "Through hole straight pin header, 1x02, 2.54mm pitch, single row")
     (tags "Through hole pin header THT 1x02 2.54mm single row")
     (path /637CAE56)
-    (fp_text reference D1 (at 0.1 5.7 180) (layer F.SilkS)
+    (fp_text reference D1 (at 0.1 5.7 270) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value BPW34 (at 0 4.87 90) (layer F.Fab)
+    (fp_text value BPW34 (at 0 4.87) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -0.635 -1.27) (end 1.27 -1.27) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.27 -1.27) (end 1.27 3.81) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.27 3.81) (end -1.27 3.81) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.27 3.81) (end -1.27 -0.635) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.27 -0.635) (end -0.635 -1.27) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.33 3.87) (end 1.33 3.87) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.33 1.27) (end -1.33 3.87) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.33 1.27) (end 1.33 3.87) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.33 1.27) (end 1.33 1.27) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.33 0) (end -1.33 -1.33) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.33 -1.33) (end 0 -1.33) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.8 -1.8) (end -1.8 4.35) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.8 4.35) (end 1.8 4.35) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.8 4.35) (end 1.8 -1.8) (layer F.CrtYd) (width 0.05))
     (fp_line (start 1.8 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05))
-    (fp_text user %R (at 0 1.27) (layer F.Fab)
+    (fp_line (start 1.8 4.35) (end 1.8 -1.8) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.8 4.35) (end 1.8 4.35) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.8 -1.8) (end -1.8 4.35) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.33 -1.33) (end 0 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.33 0) (end -1.33 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.33 1.27) (end 1.33 1.27) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.33 1.27) (end 1.33 3.87) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.33 1.27) (end -1.33 3.87) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.33 3.87) (end 1.33 3.87) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.27 -0.635) (end -0.635 -1.27) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.27 3.81) (end -1.27 -0.635) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.27 3.81) (end -1.27 3.81) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.27 -1.27) (end 1.27 3.81) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.635 -1.27) (end 1.27 -1.27) (layer F.Fab) (width 0.1))
+    (fp_text user %R (at 0 1.27 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (pad 2 thru_hole oval (at 0 2.54 90) (size 2 2) (drill 1) (layers *.Cu *.Mask)
+    (pad 2 thru_hole oval (at 0 2.54 180) (size 2 2) (drill 1) (layers *.Cu *.Mask)
       (net 3 "Net-(C3-Pad1)"))
-    (pad 1 thru_hole rect (at 0 0 90) (size 2 2) (drill 1) (layers *.Cu *.Mask)
+    (pad 1 thru_hole rect (at 0 0 180) (size 2 2) (drill 1) (layers *.Cu *.Mask)
       (net 1 VCC))
     (model ${KISYS3DMOD}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x02_P2.54mm_Vertical.wrl
       (at (xyz 0 0 0))
@@ -916,25 +916,25 @@
   )
 
   (module LED_THT:LED_D3.0mm_IRGrey (layer F.Cu) (tedit 63B2E04B) (tstamp 63B332D5)
-    (at 151.6 84.4 180)
+    (at 229.2 94.1 270)
     (descr "IR-LED, diameter 3.0mm, 2 pins, color: grey")
     (tags "IR infrared LED diameter 3.0mm 2 pins grey")
     (path /63852E70)
-    (fp_text reference D2 (at 2.9 3.3) (layer F.SilkS)
+    (fp_text reference D2 (at 2.9 3.3 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value STATUS (at 1.27 2.96) (layer F.Fab)
+    (fp_text value STATUS (at 1.27 2.96 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_circle (center 1.27 0) (end 2.77 0) (layer F.Fab) (width 0.1))
-    (fp_line (start 3.7 -2.25) (end -1.15 -2.25) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 3.7 2.25) (end 3.7 -2.25) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.15 2.25) (end 3.7 2.25) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.15 -2.25) (end -1.15 2.25) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -0.29 1.08) (end -0.29 1.236) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.29 -1.236) (end -0.29 -1.08) (layer F.SilkS) (width 0.12))
     (fp_line (start -0.23 -1.16619) (end -0.23 1.16619) (layer F.Fab) (width 0.1))
-    (fp_text user %R (at 1.47 0) (layer F.Fab)
+    (fp_line (start -0.29 -1.236) (end -0.29 -1.08) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.29 1.08) (end -0.29 1.236) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.15 -2.25) (end -1.15 2.25) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.15 2.25) (end 3.7 2.25) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.7 2.25) (end 3.7 -2.25) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 3.7 -2.25) (end -1.15 -2.25) (layer F.CrtYd) (width 0.05))
+    (fp_circle (center 1.27 0) (end 2.77 0) (layer F.Fab) (width 0.1))
+    (fp_text user %R (at 1.47 0 90) (layer F.Fab)
       (effects (font (size 0.8 0.8) (thickness 0.12)))
     )
     (fp_arc (start 1.27 0) (end -0.23 -1.16619) (angle 284.3) (layer F.Fab) (width 0.1))
@@ -942,9 +942,9 @@
     (fp_arc (start 1.27 0) (end -0.29 1.235516) (angle -108.8) (layer F.SilkS) (width 0.12))
     (fp_arc (start 1.27 0) (end 0.229039 -1.08) (angle 87.9) (layer F.SilkS) (width 0.12))
     (fp_arc (start 1.27 0) (end 0.229039 1.08) (angle -87.9) (layer F.SilkS) (width 0.12))
-    (pad 1 thru_hole rect (at 0 0 180) (size 2 2) (drill 0.9) (layers *.Cu *.Mask)
+    (pad 1 thru_hole rect (at 0 0 270) (size 2 2) (drill 0.9) (layers *.Cu *.Mask)
       (net 2 GND))
-    (pad 2 thru_hole circle (at 2.54 0 180) (size 2 2) (drill 0.9) (layers *.Cu *.Mask)
+    (pad 2 thru_hole circle (at 2.54 0 270) (size 2 2) (drill 0.9) (layers *.Cu *.Mask)
       (net 5 "Net-(D2-Pad2)"))
     (model ${KISYS3DMOD}/LED_THT.3dshapes/LED_D3.0mm_IRGrey.wrl
       (at (xyz 0 0 0))
@@ -954,60 +954,60 @@
   )
 
   (module TerminalBlock_Phoenix:TerminalBlock_Phoenix_MKDS-1,5-2_1x02_P5.00mm_Horizontal (layer F.Cu) (tedit 5B294EE5) (tstamp 63B33301)
-    (at 157.8 84)
+    (at 228.8 83.1 270)
     (descr "Terminal Block Phoenix MKDS-1,5-2, 2 pins, pitch 5mm, size 10x9.8mm^2, drill diamater 1.3mm, pad diameter 2.6mm, see http://www.farnell.com/datasheets/100425.pdf, script-generated using https://github.com/pointhi/kicad-footprint-generator/scripts/TerminalBlock_Phoenix")
     (tags "THT Terminal Block Phoenix MKDS-1,5-2 pitch 5mm size 10x9.8mm^2 drill 1.3mm pad 2.6mm")
     (path /6392A12E)
-    (fp_text reference J1 (at -1.7 5.8) (layer F.SilkS)
+    (fp_text reference J1 (at -1.7 5.8 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value "8-24V in" (at 2.5 5.66) (layer F.Fab)
+    (fp_text value "8-24V in" (at 2.5 5.66 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 8 -5.71) (end -3 -5.71) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 8 5.1) (end 8 -5.71) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3 5.1) (end 8 5.1) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3 -5.71) (end -3 5.1) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -2.8 4.9) (end -2.3 4.9) (layer F.SilkS) (width 0.12))
-    (fp_line (start -2.8 4.16) (end -2.8 4.9) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.773 1.023) (end 3.726 1.069) (layer F.SilkS) (width 0.12))
-    (fp_line (start 6.07 -1.275) (end 6.035 -1.239) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.966 1.239) (end 3.931 1.274) (layer F.SilkS) (width 0.12))
-    (fp_line (start 6.275 -1.069) (end 6.228 -1.023) (layer F.SilkS) (width 0.12))
-    (fp_line (start 5.955 -1.138) (end 3.863 0.955) (layer F.Fab) (width 0.1))
-    (fp_line (start 6.138 -0.955) (end 4.046 1.138) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.955 -1.138) (end -1.138 0.955) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.138 -0.955) (end -0.955 1.138) (layer F.Fab) (width 0.1))
-    (fp_line (start 7.56 -5.261) (end 7.56 4.66) (layer F.SilkS) (width 0.12))
-    (fp_line (start -2.56 -5.261) (end -2.56 4.66) (layer F.SilkS) (width 0.12))
-    (fp_line (start -2.56 4.66) (end 7.56 4.66) (layer F.SilkS) (width 0.12))
-    (fp_line (start -2.56 -5.261) (end 7.56 -5.261) (layer F.SilkS) (width 0.12))
-    (fp_line (start -2.56 -2.301) (end 7.56 -2.301) (layer F.SilkS) (width 0.12))
-    (fp_line (start -2.5 -2.3) (end 7.5 -2.3) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.56 2.6) (end 7.56 2.6) (layer F.SilkS) (width 0.12))
-    (fp_line (start -2.5 2.6) (end 7.5 2.6) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.56 4.1) (end 7.56 4.1) (layer F.SilkS) (width 0.12))
-    (fp_line (start -2.5 4.1) (end 7.5 4.1) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.5 4.1) (end -2.5 -5.2) (layer F.Fab) (width 0.1))
-    (fp_line (start -2 4.6) (end -2.5 4.1) (layer F.Fab) (width 0.1))
-    (fp_line (start 7.5 4.6) (end -2 4.6) (layer F.Fab) (width 0.1))
-    (fp_line (start 7.5 -5.2) (end 7.5 4.6) (layer F.Fab) (width 0.1))
-    (fp_line (start -2.5 -5.2) (end 7.5 -5.2) (layer F.Fab) (width 0.1))
-    (fp_circle (center 5 0) (end 6.68 0) (layer F.SilkS) (width 0.12))
-    (fp_circle (center 5 0) (end 6.5 0) (layer F.Fab) (width 0.1))
     (fp_circle (center 0 0) (end 1.5 0) (layer F.Fab) (width 0.1))
+    (fp_circle (center 5 0) (end 6.5 0) (layer F.Fab) (width 0.1))
+    (fp_circle (center 5 0) (end 6.68 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.5 -5.2) (end 7.5 -5.2) (layer F.Fab) (width 0.1))
+    (fp_line (start 7.5 -5.2) (end 7.5 4.6) (layer F.Fab) (width 0.1))
+    (fp_line (start 7.5 4.6) (end -2 4.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -2 4.6) (end -2.5 4.1) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.5 4.1) (end -2.5 -5.2) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.5 4.1) (end 7.5 4.1) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.56 4.1) (end 7.56 4.1) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.5 2.6) (end 7.5 2.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.56 2.6) (end 7.56 2.6) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.5 -2.3) (end 7.5 -2.3) (layer F.Fab) (width 0.1))
+    (fp_line (start -2.56 -2.301) (end 7.56 -2.301) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.56 -5.261) (end 7.56 -5.261) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.56 4.66) (end 7.56 4.66) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.56 -5.261) (end -2.56 4.66) (layer F.SilkS) (width 0.12))
+    (fp_line (start 7.56 -5.261) (end 7.56 4.66) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.138 -0.955) (end -0.955 1.138) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.955 -1.138) (end -1.138 0.955) (layer F.Fab) (width 0.1))
+    (fp_line (start 6.138 -0.955) (end 4.046 1.138) (layer F.Fab) (width 0.1))
+    (fp_line (start 5.955 -1.138) (end 3.863 0.955) (layer F.Fab) (width 0.1))
+    (fp_line (start 6.275 -1.069) (end 6.228 -1.023) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.966 1.239) (end 3.931 1.274) (layer F.SilkS) (width 0.12))
+    (fp_line (start 6.07 -1.275) (end 6.035 -1.239) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.773 1.023) (end 3.726 1.069) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.8 4.16) (end -2.8 4.9) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.8 4.9) (end -2.3 4.9) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3 -5.71) (end -3 5.1) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3 5.1) (end 8 5.1) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8 5.1) (end 8 -5.71) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8 -5.71) (end -3 -5.71) (layer F.CrtYd) (width 0.05))
     (fp_arc (start 0 0) (end 0 1.68) (angle -24) (layer F.SilkS) (width 0.12))
     (fp_arc (start 0 0) (end 1.535 0.684) (angle -48) (layer F.SilkS) (width 0.12))
     (fp_arc (start 0 0) (end 0.684 -1.535) (angle -48) (layer F.SilkS) (width 0.12))
     (fp_arc (start 0 0) (end -1.535 -0.684) (angle -48) (layer F.SilkS) (width 0.12))
     (fp_arc (start 0 0) (end -0.684 1.535) (angle -25) (layer F.SilkS) (width 0.12))
-    (fp_text user %R (at 2.5 3.2) (layer F.Fab)
+    (fp_text user %R (at 2.5 3.2 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (pad 1 thru_hole rect (at 0 0) (size 2.6 2.6) (drill 1.3) (layers *.Cu *.Mask)
-      (net 4 "Net-(C4-Pad1)"))
-    (pad 2 thru_hole circle (at 5 0) (size 2.6 2.6) (drill 1.3) (layers *.Cu *.Mask)
+    (pad 1 thru_hole rect (at 0 0 270) (size 2.6 2.6) (drill 1.3) (layers *.Cu *.Mask)
       (net 2 GND))
+    (pad 2 thru_hole circle (at 5 0 270) (size 2.6 2.6) (drill 1.3) (layers *.Cu *.Mask)
+      (net 4 "Net-(C4-Pad1)"))
     (model ${KISYS3DMOD}/TerminalBlock_Phoenix.3dshapes/TerminalBlock_Phoenix_MKDS-1,5-2_1x02_P5.00mm_Horizontal.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1016,37 +1016,37 @@
   )
 
   (module Connector_PinHeader_2.54mm:PinHeader_1x02_P2.54mm_Vertical (layer F.Cu) (tedit 63B2E040) (tstamp 63B33317)
-    (at 150.8 92.1 180)
+    (at 236.9 94.9 270)
     (descr "Through hole straight pin header, 1x02, 2.54mm pitch, single row")
     (tags "Through hole pin header THT 1x02 2.54mm single row")
     (path /6383FB12)
-    (fp_text reference JP1 (at 2.7 2.5) (layer F.SilkS)
+    (fp_text reference JP1 (at 2.7 2.5 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value SET (at 0 4.87) (layer F.Fab)
+    (fp_text value SET (at 0 4.87 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 1.8 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.8 4.35) (end 1.8 -1.8) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.8 4.35) (end 1.8 4.35) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.8 -1.8) (end -1.8 4.35) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.33 -1.33) (end 0 -1.33) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.33 0) (end -1.33 -1.33) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.33 1.27) (end 1.33 1.27) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.33 1.27) (end 1.33 3.87) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.33 1.27) (end -1.33 3.87) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.33 3.87) (end 1.33 3.87) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.27 -0.635) (end -0.635 -1.27) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.27 3.81) (end -1.27 -0.635) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.27 3.81) (end -1.27 3.81) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.27 -1.27) (end 1.27 3.81) (layer F.Fab) (width 0.1))
     (fp_line (start -0.635 -1.27) (end 1.27 -1.27) (layer F.Fab) (width 0.1))
-    (fp_text user %R (at 0 1.27 90) (layer F.Fab)
+    (fp_line (start 1.27 -1.27) (end 1.27 3.81) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.27 3.81) (end -1.27 3.81) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.27 3.81) (end -1.27 -0.635) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.27 -0.635) (end -0.635 -1.27) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.33 3.87) (end 1.33 3.87) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.33 1.27) (end -1.33 3.87) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.33 1.27) (end 1.33 3.87) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.33 1.27) (end 1.33 1.27) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.33 0) (end -1.33 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.33 -1.33) (end 0 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.8 -1.8) (end -1.8 4.35) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.8 4.35) (end 1.8 4.35) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.8 4.35) (end 1.8 -1.8) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.8 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 0 1.27) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (pad 1 thru_hole rect (at 0 0 180) (size 2 2) (drill 1) (layers *.Cu *.Mask)
+    (pad 1 thru_hole rect (at 0 0 270) (size 2 2) (drill 1) (layers *.Cu *.Mask)
       (net 6 "Net-(JP1-Pad1)"))
-    (pad 2 thru_hole oval (at 0 2.54 180) (size 2 2) (drill 1) (layers *.Cu *.Mask)
+    (pad 2 thru_hole oval (at 0 2.54 270) (size 2 2) (drill 1) (layers *.Cu *.Mask)
       (net 2 GND))
     (model ${KISYS3DMOD}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x02_P2.54mm_Vertical.wrl
       (at (xyz 0 0 0))
@@ -1056,97 +1056,56 @@
   )
 
   (module Connector_PinHeader_2.54mm:PinHeader_1x03_P2.54mm_Vertical (layer F.Cu) (tedit 63B2DFE7) (tstamp 63B3332E)
-    (at 153.2 119.2 270)
+    (at 264 92.5)
     (descr "Through hole straight pin header, 1x03, 2.54mm pitch, single row")
     (tags "Through hole pin header THT 1x03 2.54mm single row")
     (path /63B25D42)
-    (fp_text reference JP2 (at -1.2 8.5 180) (layer F.SilkS)
+    (fp_text reference JP2 (at -1.2 8.4 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value "Invert pulse" (at 0 7.41 90) (layer F.Fab)
+    (fp_text value "Invert pulse" (at 0 7.41) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 1.8 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 1.8 6.85) (end 1.8 -1.8) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.8 6.85) (end 1.8 6.85) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.8 -1.8) (end -1.8 6.85) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.33 -1.33) (end 0 -1.33) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.33 0) (end -1.33 -1.33) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.33 1.27) (end 1.33 1.27) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.33 1.27) (end 1.33 6.41) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.33 1.27) (end -1.33 6.41) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.33 6.41) (end 1.33 6.41) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.27 -0.635) (end -0.635 -1.27) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.27 6.35) (end -1.27 -0.635) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.27 6.35) (end -1.27 6.35) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.27 -1.27) (end 1.27 6.35) (layer F.Fab) (width 0.1))
     (fp_line (start -0.635 -1.27) (end 1.27 -1.27) (layer F.Fab) (width 0.1))
-    (fp_text user %R (at 0 2.54) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (pad 1 thru_hole rect (at 0 0 270) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
-      (net 7 "Net-(JP2-Pad1)"))
-    (pad 2 thru_hole oval (at 0 2.54 270) (size 2 2) (drill 1) (layers *.Cu *.Mask)
-      (net 8 "Net-(JP2-Pad2)"))
-    (pad 3 thru_hole oval (at 0 5.08 270) (size 2 2) (drill 1) (layers *.Cu *.Mask)
-      (net 9 "Net-(JP2-Pad3)"))
-    (model ${KISYS3DMOD}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x03_P2.54mm_Vertical.wrl
-      (at (xyz 0 0 0))
-      (scale (xyz 1 1 1))
-      (rotate (xyz 0 0 0))
-    )
-  )
-
-  (module Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P10.16mm_Horizontal (layer F.Cu) (tedit 61E2EAE3) (tstamp 63B33345)
-    (at 168.5 106.7 180)
-    (descr "Resistor, Axial_DIN0207 series, Axial, Horizontal, pin pitch=10.16mm, 0.25W = 1/4W, length*diameter=6.3*2.5mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
-    (tags "Resistor Axial_DIN0207 series Axial Horizontal pin pitch 10.16mm 0.25W = 1/4W length 6.3mm diameter 2.5mm")
-    (path /637CBD86)
-    (fp_text reference R1 (at -1.8 -1.7) (layer F.SilkS)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_text value 10k (at 5.08 2.37) (layer F.Fab)
-      (effects (font (size 1 1) (thickness 0.15)))
-    )
-    (fp_line (start 11.21 -1.5) (end -1.05 -1.5) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 11.21 1.5) (end 11.21 -1.5) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 1.5) (end 11.21 1.5) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.05 -1.5) (end -1.05 1.5) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 9.12 0) (end 8.35 0) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.04 0) (end 1.81 0) (layer F.SilkS) (width 0.12))
-    (fp_line (start 8.35 -1.37) (end 1.81 -1.37) (layer F.SilkS) (width 0.12))
-    (fp_line (start 8.35 1.37) (end 8.35 -1.37) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.81 1.37) (end 8.35 1.37) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.81 -1.37) (end 1.81 1.37) (layer F.SilkS) (width 0.12))
-    (fp_line (start 10.16 0) (end 8.23 0) (layer F.Fab) (width 0.1))
-    (fp_line (start 0 0) (end 1.93 0) (layer F.Fab) (width 0.1))
-    (fp_line (start 8.23 -1.25) (end 1.93 -1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 8.23 1.25) (end 8.23 -1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.93 1.25) (end 8.23 1.25) (layer F.Fab) (width 0.1))
-    (fp_line (start 1.93 -1.25) (end 1.93 1.25) (layer F.Fab) (width 0.1))
-    (fp_text user %R (at 5.08 0) (layer F.Fab)
+    (fp_line (start 1.27 -1.27) (end 1.27 6.35) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.27 6.35) (end -1.27 6.35) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.27 6.35) (end -1.27 -0.635) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.27 -0.635) (end -0.635 -1.27) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.33 6.41) (end 1.33 6.41) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.33 1.27) (end -1.33 6.41) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.33 1.27) (end 1.33 6.41) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.33 1.27) (end 1.33 1.27) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.33 0) (end -1.33 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.33 -1.33) (end 0 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.8 -1.8) (end -1.8 6.85) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.8 6.85) (end 1.8 6.85) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.8 6.85) (end 1.8 -1.8) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 1.8 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 0 2.54 -270) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (pad 2 thru_hole circle (at 10.16 0 180) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
-      (net 2 GND))
-    (pad 1 thru_hole circle (at 0 0 180) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
-      (net 3 "Net-(C3-Pad1)"))
-    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0207_L6.3mm_D2.5mm_P10.16mm_Horizontal.wrl
+    (pad 1 thru_hole rect (at 0 0) (size 1.7 1.7) (drill 1) (layers *.Cu *.Mask)
+      (net 7 "Net-(JP2-Pad1)"))
+    (pad 2 thru_hole oval (at 0 2.54) (size 2 2) (drill 1) (layers *.Cu *.Mask)
+      (net 8 "Net-(JP2-Pad2)"))
+    (pad 3 thru_hole oval (at 0 5.08) (size 2 2) (drill 1) (layers *.Cu *.Mask)
+      (net 9 "Net-(JP2-Pad3)"))
+    (model ${KISYS3DMOD}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_1x03_P2.54mm_Vertical.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
       (rotate (xyz 0 0 0))
     )
   )
 
-  (module Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P10.16mm_Horizontal (layer F.Cu) (tedit 61E2EAE3) (tstamp 63B3335C)
-    (at 168.5 103.4 180)
+  (module Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P10.16mm_Horizontal (layer F.Cu) (tedit 61E2EAE3) (tstamp 63B33345)
+    (at 251.5 77.2 270)
     (descr "Resistor, Axial_DIN0207 series, Axial, Horizontal, pin pitch=10.16mm, 0.25W = 1/4W, length*diameter=6.3*2.5mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
     (tags "Resistor Axial_DIN0207 series Axial Horizontal pin pitch 10.16mm 0.25W = 1/4W length 6.3mm diameter 2.5mm")
-    (path /637CC5CF)
-    (fp_text reference R2 (at -1.8 -1.7) (layer F.SilkS)
+    (path /637CBD86)
+    (fp_text reference R1 (at -1.8 -1.7 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 10k (at 5.08 2.37) (layer F.Fab)
+    (fp_text value 10k (at 5.08 2.37 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start 1.93 -1.25) (end 1.93 1.25) (layer F.Fab) (width 0.1))
@@ -1165,13 +1124,13 @@
     (fp_line (start -1.05 1.5) (end 11.21 1.5) (layer F.CrtYd) (width 0.05))
     (fp_line (start 11.21 1.5) (end 11.21 -1.5) (layer F.CrtYd) (width 0.05))
     (fp_line (start 11.21 -1.5) (end -1.05 -1.5) (layer F.CrtYd) (width 0.05))
-    (fp_text user %R (at 5.08 0) (layer F.Fab)
+    (fp_text user %R (at 5.08 0 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (pad 1 thru_hole circle (at 0 0 180) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
-      (net 10 "Net-(R2-Pad1)"))
-    (pad 2 thru_hole circle (at 10.16 0 180) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 2 thru_hole circle (at 10.16 0 270) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
       (net 2 GND))
+    (pad 1 thru_hole circle (at 0 0 270) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
+      (net 3 "Net-(C3-Pad1)"))
     (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0207_L6.3mm_D2.5mm_P10.16mm_Horizontal.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1179,15 +1138,15 @@
     )
   )
 
-  (module Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P10.16mm_Horizontal (layer F.Cu) (tedit 61E2EAE3) (tstamp 63B33373)
-    (at 158.3 100.1)
+  (module Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P10.16mm_Horizontal (layer F.Cu) (tedit 61E2EAE3) (tstamp 63B3335C)
+    (at 248.2 77.2 270)
     (descr "Resistor, Axial_DIN0207 series, Axial, Horizontal, pin pitch=10.16mm, 0.25W = 1/4W, length*diameter=6.3*2.5mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
     (tags "Resistor Axial_DIN0207 series Axial Horizontal pin pitch 10.16mm 0.25W = 1/4W length 6.3mm diameter 2.5mm")
-    (path /637CEB9B)
-    (fp_text reference R3 (at 12 1.8) (layer F.SilkS)
+    (path /637CC5CF)
+    (fp_text reference R2 (at -1.8 -1.7 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 33k (at 5.08 2.37) (layer F.Fab)
+    (fp_text value 10k (at 5.08 2.37 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start 11.21 -1.5) (end -1.05 -1.5) (layer F.CrtYd) (width 0.05))
@@ -1206,13 +1165,13 @@
     (fp_line (start 8.23 1.25) (end 8.23 -1.25) (layer F.Fab) (width 0.1))
     (fp_line (start 1.93 1.25) (end 8.23 1.25) (layer F.Fab) (width 0.1))
     (fp_line (start 1.93 -1.25) (end 1.93 1.25) (layer F.Fab) (width 0.1))
-    (fp_text user %R (at 5.08 0) (layer F.Fab)
+    (fp_text user %R (at 5.08 0 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (pad 2 thru_hole circle (at 10.16 0) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 1 thru_hole circle (at 0 0 270) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
       (net 10 "Net-(R2-Pad1)"))
-    (pad 1 thru_hole circle (at 0 0) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
-      (net 11 "Net-(R3-Pad1)"))
+    (pad 2 thru_hole circle (at 10.16 0 270) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
+      (net 2 GND))
     (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0207_L6.3mm_D2.5mm_P10.16mm_Horizontal.wrl
       (at (xyz 0 0 0))
       (scale (xyz 1 1 1))
@@ -1220,15 +1179,15 @@
     )
   )
 
-  (module Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P10.16mm_Horizontal (layer F.Cu) (tedit 61E2EAE3) (tstamp 63B3338A)
-    (at 145 94.8 90)
+  (module Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P10.16mm_Horizontal (layer F.Cu) (tedit 61E2EAE3) (tstamp 63B33373)
+    (at 244.9 87.4 90)
     (descr "Resistor, Axial_DIN0207 series, Axial, Horizontal, pin pitch=10.16mm, 0.25W = 1/4W, length*diameter=6.3*2.5mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
     (tags "Resistor Axial_DIN0207 series Axial Horizontal pin pitch 10.16mm 0.25W = 1/4W length 6.3mm diameter 2.5mm")
-    (path /6385274C)
-    (fp_text reference R4 (at -0.3 2.5 180) (layer F.SilkS)
+    (path /637CEB9B)
+    (fp_text reference R3 (at 12 1.8 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 1k (at 5.08 2.37 90) (layer F.Fab)
+    (fp_text value 33k (at 5.08 2.37 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
     (fp_line (start 1.93 -1.25) (end 1.93 1.25) (layer F.Fab) (width 0.1))
@@ -1250,9 +1209,50 @@
     (fp_text user %R (at 5.08 0 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
+    (pad 2 thru_hole circle (at 10.16 0 90) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
+      (net 10 "Net-(R2-Pad1)"))
     (pad 1 thru_hole circle (at 0 0 90) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
+      (net 11 "Net-(R3-Pad1)"))
+    (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0207_L6.3mm_D2.5mm_P10.16mm_Horizontal.wrl
+      (at (xyz 0 0 0))
+      (scale (xyz 1 1 1))
+      (rotate (xyz 0 0 0))
+    )
+  )
+
+  (module Resistor_THT:R_Axial_DIN0207_L6.3mm_D2.5mm_P10.16mm_Horizontal (layer F.Cu) (tedit 61E2EAE3) (tstamp 63B3338A)
+    (at 239.6 100.7 180)
+    (descr "Resistor, Axial_DIN0207 series, Axial, Horizontal, pin pitch=10.16mm, 0.25W = 1/4W, length*diameter=6.3*2.5mm^2, http://cdn-reichelt.de/documents/datenblatt/B400/1_4W%23YAG.pdf")
+    (tags "Resistor Axial_DIN0207 series Axial Horizontal pin pitch 10.16mm 0.25W = 1/4W length 6.3mm diameter 2.5mm")
+    (path /6385274C)
+    (fp_text reference R4 (at -0.3 2.5 270) (layer F.SilkS)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_text value 1k (at 5.08 2.37) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (fp_line (start 11.21 -1.5) (end -1.05 -1.5) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 11.21 1.5) (end 11.21 -1.5) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 1.5) (end 11.21 1.5) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.05 -1.5) (end -1.05 1.5) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 9.12 0) (end 8.35 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.04 0) (end 1.81 0) (layer F.SilkS) (width 0.12))
+    (fp_line (start 8.35 -1.37) (end 1.81 -1.37) (layer F.SilkS) (width 0.12))
+    (fp_line (start 8.35 1.37) (end 8.35 -1.37) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.81 1.37) (end 8.35 1.37) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.81 -1.37) (end 1.81 1.37) (layer F.SilkS) (width 0.12))
+    (fp_line (start 10.16 0) (end 8.23 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 0) (end 1.93 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 8.23 -1.25) (end 1.93 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 8.23 1.25) (end 8.23 -1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.93 1.25) (end 8.23 1.25) (layer F.Fab) (width 0.1))
+    (fp_line (start 1.93 -1.25) (end 1.93 1.25) (layer F.Fab) (width 0.1))
+    (fp_text user %R (at 5.08 0) (layer F.Fab)
+      (effects (font (size 1 1) (thickness 0.15)))
+    )
+    (pad 1 thru_hole circle (at 0 0 180) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
       (net 5 "Net-(D2-Pad2)"))
-    (pad 2 thru_hole circle (at 10.16 0 90) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 2 thru_hole circle (at 10.16 0 180) (size 2 2) (drill 0.8) (layers *.Cu *.Mask)
       (net 12 "Net-(R4-Pad2)"))
     (model ${KISYS3DMOD}/Resistor_THT.3dshapes/R_Axial_DIN0207_L6.3mm_D2.5mm_P10.16mm_Horizontal.wrl
       (at (xyz 0 0 0))
@@ -1262,48 +1262,48 @@
   )
 
   (module Potentiometer_THT:Potentiometer_ACP_CA9-H5_Horizontal (layer F.Cu) (tedit 5A3D4994) (tstamp 63B333AA)
-    (at 179 112.8 270)
+    (at 257.6 66.7)
     (descr "Potentiometer, horizontal, ACP CA9-H5, http://www.acptechnologies.com/wp-content/uploads/2017/05/02-ACP-CA9-CE9.pdf")
     (tags "Potentiometer horizontal ACP CA9-H5")
     (path /637CCCD9)
-    (fp_text reference RV1 (at 0.9 -4.3 180) (layer F.SilkS)
+    (fp_text reference RV1 (at 0.8 -4.3 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 500k (at 0 8.65 90) (layer F.Fab)
+    (fp_text value 500k (at 0 8.65) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 6.45 -2.7) (end -1.45 -2.7) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 6.45 7.65) (end 6.45 -2.7) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.45 7.65) (end 6.45 7.65) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.45 -2.7) (end -1.45 7.65) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 4.92 3.925) (end 4.92 4.12) (layer F.SilkS) (width 0.12))
-    (fp_line (start 4.92 0.88) (end 4.92 1.075) (layer F.SilkS) (width 0.12))
+    (fp_line (start 4.8 -2.4) (end 4.8 7.4) (layer F.Fab) (width 0.1))
+    (fp_line (start 4.8 7.4) (end 0 7.4) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 7.4) (end 0 -2.4) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 -2.4) (end 4.8 -2.4) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 1) (end 0 4) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 4) (end 4.8 4) (layer F.Fab) (width 0.1))
+    (fp_line (start 4.8 4) (end 4.8 1) (layer F.Fab) (width 0.1))
+    (fp_line (start 4.8 1) (end 0 1) (layer F.Fab) (width 0.1))
+    (fp_line (start -0.121 -2.521) (end 4.92 -2.521) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.121 7.52) (end 4.92 7.52) (layer F.SilkS) (width 0.12))
+    (fp_line (start 4.92 -2.521) (end 4.92 1.075) (layer F.SilkS) (width 0.12))
+    (fp_line (start 4.92 3.925) (end 4.92 7.52) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.121 6.425) (end -0.121 7.52) (layer F.SilkS) (width 0.12))
+    (fp_line (start -0.121 -2.521) (end -0.121 -1.426) (layer F.SilkS) (width 0.12))
     (fp_line (start -0.121 1.426) (end -0.121 3.575) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.237 4.12) (end 4.92 4.12) (layer F.SilkS) (width 0.12))
     (fp_line (start 1.237 0.88) (end 4.92 0.88) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.237 4.12) (end 4.92 4.12) (layer F.SilkS) (width 0.12))
     (fp_line (start -0.121 1.426) (end -0.121 3.575) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.121 -2.521) (end -0.121 -1.426) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.121 6.425) (end -0.121 7.52) (layer F.SilkS) (width 0.12))
-    (fp_line (start 4.92 3.925) (end 4.92 7.52) (layer F.SilkS) (width 0.12))
-    (fp_line (start 4.92 -2.521) (end 4.92 1.075) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.121 7.52) (end 4.92 7.52) (layer F.SilkS) (width 0.12))
-    (fp_line (start -0.121 -2.521) (end 4.92 -2.521) (layer F.SilkS) (width 0.12))
-    (fp_line (start 4.8 1) (end 0 1) (layer F.Fab) (width 0.1))
-    (fp_line (start 4.8 4) (end 4.8 1) (layer F.Fab) (width 0.1))
-    (fp_line (start 0 4) (end 4.8 4) (layer F.Fab) (width 0.1))
-    (fp_line (start 0 1) (end 0 4) (layer F.Fab) (width 0.1))
-    (fp_line (start 0 -2.4) (end 4.8 -2.4) (layer F.Fab) (width 0.1))
-    (fp_line (start 0 7.4) (end 0 -2.4) (layer F.Fab) (width 0.1))
-    (fp_line (start 4.8 7.4) (end 0 7.4) (layer F.Fab) (width 0.1))
-    (fp_line (start 4.8 -2.4) (end 4.8 7.4) (layer F.Fab) (width 0.1))
-    (fp_text user %R (at 2.4 2.5 90) (layer F.Fab)
+    (fp_line (start 4.92 0.88) (end 4.92 1.075) (layer F.SilkS) (width 0.12))
+    (fp_line (start 4.92 3.925) (end 4.92 4.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.45 -2.7) (end -1.45 7.65) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.45 7.65) (end 6.45 7.65) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 6.45 7.65) (end 6.45 -2.7) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 6.45 -2.7) (end -1.45 -2.7) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 2.4 2.5) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (pad 3 thru_hole circle (at 0 5 270) (size 2.34 2.34) (drill 1.3) (layers *.Cu *.Mask)
+    (pad 3 thru_hole circle (at 0 5) (size 2.34 2.34) (drill 1.3) (layers *.Cu *.Mask)
       (net 10 "Net-(R2-Pad1)"))
-    (pad 2 thru_hole circle (at 5 2.5 270) (size 2.34 2.34) (drill 1.3) (layers *.Cu *.Mask)
+    (pad 2 thru_hole circle (at 5 2.5) (size 2.34 2.34) (drill 1.3) (layers *.Cu *.Mask)
       (net 1 VCC))
-    (pad 1 thru_hole circle (at 0 0 270) (size 2.34 2.34) (drill 1.3) (layers *.Cu *.Mask)
+    (pad 1 thru_hole circle (at 0 0) (size 2.34 2.34) (drill 1.3) (layers *.Cu *.Mask)
       (net 1 VCC))
     (model ${KISYS3DMOD}/Potentiometer_THT.3dshapes/Potentiometer_ACP_CA9-H5_Horizontal.wrl
       (at (xyz 0 0 0))
@@ -1313,77 +1313,77 @@
   )
 
   (module mtk_processor:Arduino_Mini_Plus (layer F.Cu) (tedit 637BA142) (tstamp 63B3340F)
-    (at 125.9 84.9)
+    (at 229.7 119.8 90)
     (descr "Arduino Nano, http://www.mouser.com/pdfdocs/Gravitech_Arduino_Nano3_0.pdf")
     (tags "Arduino Nano")
     (path /637B78BA)
-    (fp_text reference U3 (at 0 -2.4) (layer F.SilkS)
+    (fp_text reference U3 (at 0 -2.4 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value "Arduino Mini Plus" (at 8.89 15.24 90) (layer F.Fab)
+    (fp_text value "Arduino Mini Plus" (at 8.89 15.24) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -1.5 31.75) (end -1.5 -1.25) (layer Dwgs.User) (width 0.12))
-    (fp_line (start 16.75 31.75) (end -1.5 31.75) (layer Dwgs.User) (width 0.12))
-    (fp_line (start 16.75 -1.25) (end 16.75 31.75) (layer Dwgs.User) (width 0.12))
-    (fp_line (start -1.5 -1.25) (end 16.75 -1.25) (layer Dwgs.User) (width 0.12))
-    (fp_line (start 1.75 1.25) (end 1.75 -1.25) (layer F.SilkS) (width 0.15))
-    (fp_line (start -1.5 1.25) (end 1.75 1.25) (layer F.SilkS) (width 0.15))
-    (fp_line (start -1.5 31.75) (end -1.25 31.75) (layer F.SilkS) (width 0.15))
-    (fp_line (start -1.5 -1.25) (end -1.5 31.75) (layer F.SilkS) (width 0.15))
-    (fp_line (start 16.75 31.75) (end -1.25 31.75) (layer F.SilkS) (width 0.15))
-    (fp_line (start 16.75 -1.25) (end 16.75 31.75) (layer F.SilkS) (width 0.15))
     (fp_line (start -1.5 -1.25) (end 16.75 -1.25) (layer F.SilkS) (width 0.15))
-    (fp_text user %R (at 6.35 16.51 90) (layer F.Fab)
+    (fp_line (start 16.75 -1.25) (end 16.75 31.75) (layer F.SilkS) (width 0.15))
+    (fp_line (start 16.75 31.75) (end -1.25 31.75) (layer F.SilkS) (width 0.15))
+    (fp_line (start -1.5 -1.25) (end -1.5 31.75) (layer F.SilkS) (width 0.15))
+    (fp_line (start -1.5 31.75) (end -1.25 31.75) (layer F.SilkS) (width 0.15))
+    (fp_line (start -1.5 1.25) (end 1.75 1.25) (layer F.SilkS) (width 0.15))
+    (fp_line (start 1.75 1.25) (end 1.75 -1.25) (layer F.SilkS) (width 0.15))
+    (fp_line (start -1.5 -1.25) (end 16.75 -1.25) (layer Dwgs.User) (width 0.12))
+    (fp_line (start 16.75 -1.25) (end 16.75 31.75) (layer Dwgs.User) (width 0.12))
+    (fp_line (start 16.75 31.75) (end -1.5 31.75) (layer Dwgs.User) (width 0.12))
+    (fp_line (start -1.5 31.75) (end -1.5 -1.25) (layer Dwgs.User) (width 0.12))
+    (fp_text user %R (at 6.35 16.51) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (pad 24 thru_hole oval (at 15.24 0) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 24 thru_hole oval (at 15.24 0 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 12 "Net-(R4-Pad2)"))
-    (pad 23 thru_hole oval (at 15.24 2.54) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 23 thru_hole oval (at 15.24 2.54 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 23 "Net-(U3-Pad23)"))
-    (pad 22 thru_hole oval (at 15.24 5.08) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 22 thru_hole oval (at 15.24 5.08 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 24 "Net-(U3-Pad22)"))
-    (pad 12 thru_hole oval (at 0 27.94) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 12 thru_hole oval (at 0 27.94 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 25 "Net-(U3-Pad12)"))
-    (pad 21 thru_hole oval (at 15.24 7.62) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 21 thru_hole oval (at 15.24 7.62 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 26 "Net-(U3-Pad21)"))
-    (pad 11 thru_hole oval (at 0 25.4) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 11 thru_hole oval (at 0 25.4 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 2 GND))
-    (pad 20 thru_hole oval (at 15.24 10.16) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 20 thru_hole oval (at 15.24 10.16 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 27 "Net-(U3-Pad20)"))
-    (pad 10 thru_hole oval (at 0 22.86) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 10 thru_hole oval (at 0 22.86 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 18 "Net-(U1-Pad4)"))
-    (pad 19 thru_hole oval (at 15.24 12.7) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 19 thru_hole oval (at 15.24 12.7 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 6 "Net-(JP1-Pad1)"))
-    (pad 9 thru_hole oval (at 0 20.32) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 9 thru_hole oval (at 0 20.32 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 1 VCC))
-    (pad 18 thru_hole oval (at 15.24 15.24) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 18 thru_hole oval (at 15.24 15.24 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 28 "Net-(U3-Pad18)"))
-    (pad 8 thru_hole oval (at 0 17.78) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 8 thru_hole oval (at 0 17.78 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 29 "Net-(U3-Pad8)"))
-    (pad 17 thru_hole oval (at 15.24 17.78) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 17 thru_hole oval (at 15.24 17.78 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 8 "Net-(JP2-Pad2)"))
-    (pad 7 thru_hole oval (at 0 15.24) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 7 thru_hole oval (at 0 15.24 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 30 "Net-(U3-Pad7)"))
-    (pad 16 thru_hole oval (at 15.24 20.32) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 16 thru_hole oval (at 15.24 20.32 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 2 GND))
-    (pad 6 thru_hole oval (at 0 12.7) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 6 thru_hole oval (at 0 12.7 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 31 "Net-(U3-Pad6)"))
-    (pad 15 thru_hole oval (at 15.24 22.86) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 15 thru_hole oval (at 15.24 22.86 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 32 "Net-(U3-Pad15)"))
-    (pad 5 thru_hole oval (at 0 10.16) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 5 thru_hole oval (at 0 10.16 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 33 "Net-(U3-Pad5)"))
-    (pad 14 thru_hole oval (at 15.24 25.4) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 14 thru_hole oval (at 15.24 25.4 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 34 "Net-(U3-Pad14)"))
-    (pad 4 thru_hole oval (at 0 7.62) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 4 thru_hole oval (at 0 7.62 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 19 "Net-(U1-Pad6)"))
-    (pad 13 thru_hole oval (at 15.24 27.94) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 13 thru_hole oval (at 15.24 27.94 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 35 "Net-(U3-Pad13)"))
-    (pad 3 thru_hole oval (at 0 5.08) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 3 thru_hole oval (at 0 5.08 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 20 "Net-(U1-Pad8)"))
-    (pad 2 thru_hole oval (at 0 2.54) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 2 thru_hole oval (at 0 2.54 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 13 "Net-(U1-Pad5)"))
-    (pad 1 thru_hole rect (at 0 0) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 1 thru_hole rect (at 0 0 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 16 "Net-(U1-Pad3)"))
     (model ${KISYS3DMOD}/Module.3dshapes/Arduino_Nano_WithMountingHoles.wrl
       (at (xyz 0 0 0))
@@ -1393,49 +1393,49 @@
   )
 
   (module Package_DIP:DIP-8_W7.62mm_LongPads (layer F.Cu) (tedit 5A02E8C5) (tstamp 63B3342B)
-    (at 172.8 100.1)
+    (at 244.9 72.9 90)
     (descr "8-lead though-hole mounted DIP package, row spacing 7.62 mm (300 mils), LongPads")
     (tags "THT DIP DIL PDIP 2.54mm 7.62mm 300mil LongPads")
     (path /637C1842)
-    (fp_text reference U2 (at -0.5 -2.8) (layer F.SilkS)
+    (fp_text reference U2 (at -0.5 -2.8 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value TL072 (at 3.81 9.95) (layer F.Fab)
+    (fp_text value TL072 (at 3.81 9.95 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 9.1 -1.55) (end -1.45 -1.55) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 9.1 9.15) (end 9.1 -1.55) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.45 9.15) (end 9.1 9.15) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.45 -1.55) (end -1.45 9.15) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 6.06 -1.33) (end 4.81 -1.33) (layer F.SilkS) (width 0.12))
-    (fp_line (start 6.06 8.95) (end 6.06 -1.33) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.56 8.95) (end 6.06 8.95) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.56 -1.33) (end 1.56 8.95) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.81 -1.33) (end 1.56 -1.33) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0.635 -0.27) (end 1.635 -1.27) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.635 8.89) (end 0.635 -0.27) (layer F.Fab) (width 0.1))
-    (fp_line (start 6.985 8.89) (end 0.635 8.89) (layer F.Fab) (width 0.1))
-    (fp_line (start 6.985 -1.27) (end 6.985 8.89) (layer F.Fab) (width 0.1))
     (fp_line (start 1.635 -1.27) (end 6.985 -1.27) (layer F.Fab) (width 0.1))
+    (fp_line (start 6.985 -1.27) (end 6.985 8.89) (layer F.Fab) (width 0.1))
+    (fp_line (start 6.985 8.89) (end 0.635 8.89) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.635 8.89) (end 0.635 -0.27) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.635 -0.27) (end 1.635 -1.27) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.81 -1.33) (end 1.56 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.56 -1.33) (end 1.56 8.95) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.56 8.95) (end 6.06 8.95) (layer F.SilkS) (width 0.12))
+    (fp_line (start 6.06 8.95) (end 6.06 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start 6.06 -1.33) (end 4.81 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.45 -1.55) (end -1.45 9.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.45 9.15) (end 9.1 9.15) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 9.1 9.15) (end 9.1 -1.55) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 9.1 -1.55) (end -1.45 -1.55) (layer F.CrtYd) (width 0.05))
     (fp_arc (start 3.81 -1.33) (end 2.81 -1.33) (angle -180) (layer F.SilkS) (width 0.12))
-    (fp_text user %R (at 3.81 3.81) (layer F.Fab)
+    (fp_text user %R (at 3.81 3.81 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (pad 1 thru_hole rect (at 0 0) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 1 thru_hole rect (at 0 0 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 11 "Net-(R3-Pad1)"))
-    (pad 5 thru_hole oval (at 7.62 7.62) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 5 thru_hole oval (at 7.62 7.62 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 2 GND))
-    (pad 2 thru_hole oval (at 0 2.54) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 2 thru_hole oval (at 0 2.54 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 3 "Net-(C3-Pad1)"))
-    (pad 6 thru_hole oval (at 7.62 5.08) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 6 thru_hole oval (at 7.62 5.08 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 22 "Net-(U2-Pad6)"))
-    (pad 3 thru_hole oval (at 0 5.08) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 3 thru_hole oval (at 0 5.08 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 10 "Net-(R2-Pad1)"))
-    (pad 7 thru_hole oval (at 7.62 2.54) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 7 thru_hole oval (at 7.62 2.54 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 22 "Net-(U2-Pad6)"))
-    (pad 4 thru_hole oval (at 0 7.62) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 4 thru_hole oval (at 0 7.62 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 2 GND))
-    (pad 8 thru_hole oval (at 7.62 0) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 8 thru_hole oval (at 7.62 0 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 1 VCC))
     (model ${KISYS3DMOD}/Package_DIP.3dshapes/DIP-8_W7.62mm.wrl
       (at (xyz 0 0 0))
@@ -1445,61 +1445,61 @@
   )
 
   (module Package_DIP:DIP-14_W7.62mm_LongPads (layer F.Cu) (tedit 5A02E8C5) (tstamp 63B3344D)
-    (at 147.2 100.1)
+    (at 244.9 98.5 90)
     (descr "14-lead though-hole mounted DIP package, row spacing 7.62 mm (300 mils), LongPads")
     (tags "THT DIP DIL PDIP 2.54mm 7.62mm 300mil LongPads")
     (path /637FF23E)
-    (fp_text reference U5 (at -0.7 -2.5) (layer F.SilkS)
+    (fp_text reference U5 (at -0.7 -2.5 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value 74HC14 (at 3.81 17.57) (layer F.Fab)
+    (fp_text value 74HC14 (at 3.81 17.57 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 9.1 -1.55) (end -1.45 -1.55) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 9.1 16.8) (end 9.1 -1.55) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.45 16.8) (end 9.1 16.8) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.45 -1.55) (end -1.45 16.8) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 6.06 -1.33) (end 4.81 -1.33) (layer F.SilkS) (width 0.12))
-    (fp_line (start 6.06 16.57) (end 6.06 -1.33) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.56 16.57) (end 6.06 16.57) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.56 -1.33) (end 1.56 16.57) (layer F.SilkS) (width 0.12))
-    (fp_line (start 2.81 -1.33) (end 1.56 -1.33) (layer F.SilkS) (width 0.12))
-    (fp_line (start 0.635 -0.27) (end 1.635 -1.27) (layer F.Fab) (width 0.1))
-    (fp_line (start 0.635 16.51) (end 0.635 -0.27) (layer F.Fab) (width 0.1))
-    (fp_line (start 6.985 16.51) (end 0.635 16.51) (layer F.Fab) (width 0.1))
-    (fp_line (start 6.985 -1.27) (end 6.985 16.51) (layer F.Fab) (width 0.1))
     (fp_line (start 1.635 -1.27) (end 6.985 -1.27) (layer F.Fab) (width 0.1))
+    (fp_line (start 6.985 -1.27) (end 6.985 16.51) (layer F.Fab) (width 0.1))
+    (fp_line (start 6.985 16.51) (end 0.635 16.51) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.635 16.51) (end 0.635 -0.27) (layer F.Fab) (width 0.1))
+    (fp_line (start 0.635 -0.27) (end 1.635 -1.27) (layer F.Fab) (width 0.1))
+    (fp_line (start 2.81 -1.33) (end 1.56 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.56 -1.33) (end 1.56 16.57) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.56 16.57) (end 6.06 16.57) (layer F.SilkS) (width 0.12))
+    (fp_line (start 6.06 16.57) (end 6.06 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start 6.06 -1.33) (end 4.81 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.45 -1.55) (end -1.45 16.8) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.45 16.8) (end 9.1 16.8) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 9.1 16.8) (end 9.1 -1.55) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 9.1 -1.55) (end -1.45 -1.55) (layer F.CrtYd) (width 0.05))
     (fp_arc (start 3.81 -1.33) (end 2.81 -1.33) (angle -180) (layer F.SilkS) (width 0.12))
-    (fp_text user %R (at 3.81 7.62) (layer F.Fab)
+    (fp_text user %R (at 3.81 7.62 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (pad 1 thru_hole rect (at 0 0) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 1 thru_hole rect (at 0 0 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 2 GND))
-    (pad 8 thru_hole oval (at 7.62 15.24) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 8 thru_hole oval (at 7.62 15.24 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 36 "Net-(U5-Pad8)"))
-    (pad 2 thru_hole oval (at 0 2.54) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 2 thru_hole oval (at 0 2.54 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 38 "Net-(U5-Pad2)"))
-    (pad 9 thru_hole oval (at 7.62 12.7) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 9 thru_hole oval (at 7.62 12.7 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 2 GND))
-    (pad 3 thru_hole oval (at 0 5.08) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 3 thru_hole oval (at 0 5.08 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 2 GND))
-    (pad 10 thru_hole oval (at 7.62 10.16) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 10 thru_hole oval (at 7.62 10.16 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 7 "Net-(JP2-Pad1)"))
-    (pad 4 thru_hole oval (at 0 7.62) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 4 thru_hole oval (at 0 7.62 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 39 "Net-(U5-Pad4)"))
-    (pad 11 thru_hole oval (at 7.62 7.62) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 11 thru_hole oval (at 7.62 7.62 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 9 "Net-(JP2-Pad3)"))
-    (pad 5 thru_hole oval (at 0 10.16) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 5 thru_hole oval (at 0 10.16 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 2 GND))
-    (pad 12 thru_hole oval (at 7.62 5.08) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 12 thru_hole oval (at 7.62 5.08 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 9 "Net-(JP2-Pad3)"))
-    (pad 6 thru_hole oval (at 0 12.7) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 6 thru_hole oval (at 0 12.7 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 37 "Net-(U5-Pad6)"))
-    (pad 13 thru_hole oval (at 7.62 2.54) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 13 thru_hole oval (at 7.62 2.54 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 11 "Net-(R3-Pad1)"))
-    (pad 7 thru_hole oval (at 0 15.24) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 7 thru_hole oval (at 0 15.24 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 2 GND))
-    (pad 14 thru_hole oval (at 7.62 0) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
+    (pad 14 thru_hole oval (at 7.62 0 90) (size 2.4 1.6) (drill 0.8) (layers *.Cu *.Mask)
       (net 1 VCC))
     (model ${KISYS3DMOD}/Package_DIP.3dshapes/DIP-14_W7.62mm.wrl
       (at (xyz 0 0 0))
@@ -1509,39 +1509,39 @@
   )
 
   (module Converter_DCDC:Converter_DCDC_TRACO_TSR-1_THT (layer F.Cu) (tedit 59FE1FB7) (tstamp 63B33464)
-    (at 171.4 83.9)
+    (at 228.7 74.3 90)
     (descr "DCDC-Converter, TRACO, TSR 1-xxxx")
     (tags "DCDC-Converter TRACO TSR-1")
     (path /639103C8)
-    (fp_text reference U6 (at 9.9 -5.1) (layer F.SilkS)
+    (fp_text reference U6 (at 9.9 -5.1 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value TSR_1-2450 (at 2.5 3.25) (layer F.Fab)
+    (fp_text value TSR_1-2450 (at 2.5 3.25 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start -2.3 2) (end 8.4 2) (layer F.Fab) (width 0.1))
-    (fp_line (start -3.42 2.12) (end -3.42 -5.73) (layer F.SilkS) (width 0.12))
-    (fp_line (start -3.42 -5.73) (end 8.52 -5.73) (layer F.SilkS) (width 0.12))
-    (fp_line (start 8.52 -5.73) (end 8.52 2.12) (layer F.SilkS) (width 0.12))
-    (fp_line (start 8.52 2.12) (end -3.42 2.12) (layer F.SilkS) (width 0.12))
-    (fp_line (start -3.55 -5.85) (end 8.65 -5.85) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 8.65 -5.85) (end 8.65 2.25) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 8.65 2.25) (end -3.55 2.25) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3.55 2.25) (end -3.55 -5.85) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -3.3 -5.6) (end 8.4 -5.6) (layer F.Fab) (width 0.1))
-    (fp_line (start 8.4 2) (end 8.4 -5.6) (layer F.Fab) (width 0.1))
-    (fp_line (start -3.3 1) (end -3.3 -5.6) (layer F.Fab) (width 0.1))
-    (fp_line (start -3.3 1) (end -2.3 2) (layer F.Fab) (width 0.1))
-    (fp_line (start -3.75 0) (end -3.75 2.45) (layer F.SilkS) (width 0.12))
     (fp_line (start -3.75 2.45) (end -1.42 2.45) (layer F.SilkS) (width 0.12))
-    (fp_text user %R (at 3 -3) (layer F.Fab)
+    (fp_line (start -3.75 0) (end -3.75 2.45) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.3 1) (end -2.3 2) (layer F.Fab) (width 0.1))
+    (fp_line (start -3.3 1) (end -3.3 -5.6) (layer F.Fab) (width 0.1))
+    (fp_line (start 8.4 2) (end 8.4 -5.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -3.3 -5.6) (end 8.4 -5.6) (layer F.Fab) (width 0.1))
+    (fp_line (start -3.55 2.25) (end -3.55 -5.85) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.65 2.25) (end -3.55 2.25) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.65 -5.85) (end 8.65 2.25) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -3.55 -5.85) (end 8.65 -5.85) (layer F.CrtYd) (width 0.05))
+    (fp_line (start 8.52 2.12) (end -3.42 2.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start 8.52 -5.73) (end 8.52 2.12) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.42 -5.73) (end 8.52 -5.73) (layer F.SilkS) (width 0.12))
+    (fp_line (start -3.42 2.12) (end -3.42 -5.73) (layer F.SilkS) (width 0.12))
+    (fp_line (start -2.3 2) (end 8.4 2) (layer F.Fab) (width 0.1))
+    (fp_text user %R (at 3 -3 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (pad 1 thru_hole rect (at 0 0) (size 1.5 2.5) (drill 1) (layers *.Cu *.Mask)
+    (pad 1 thru_hole rect (at 0 0 90) (size 1.5 2.5) (drill 1) (layers *.Cu *.Mask)
       (net 4 "Net-(C4-Pad1)"))
-    (pad 2 thru_hole oval (at 2.54 0) (size 1.5 2.5) (drill 1) (layers *.Cu *.Mask)
+    (pad 2 thru_hole oval (at 2.54 0 90) (size 1.5 2.5) (drill 1) (layers *.Cu *.Mask)
       (net 2 GND))
-    (pad 3 thru_hole oval (at 5.08 0) (size 1.5 2.5) (drill 1) (layers *.Cu *.Mask)
+    (pad 3 thru_hole oval (at 5.08 0 90) (size 1.5 2.5) (drill 1) (layers *.Cu *.Mask)
       (net 1 VCC))
     (model ${KISYS3DMOD}/Converter_DCDC.3dshapes/Converter_DCDC_TRACO_TSR-1_THT.wrl
       (at (xyz 0 0 0))
@@ -1551,139 +1551,139 @@
   )
 
   (module MountingHole:MountingHole_3.2mm_M3_DIN965_Pad (layer F.Cu) (tedit 56D1B4CB) (tstamp 63B3582A)
-    (at 186 80)
+    (at 224.8 59.7 90)
     (descr "Mounting Hole 3.2mm, M3, DIN965")
     (tags "mounting hole 3.2mm m3 din965")
     (path /63B932DF)
     (attr virtual)
-    (fp_text reference H1 (at 0 0.1) (layer F.SilkS)
+    (fp_text reference H1 (at 0 0.1 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value MountingHole (at 0 3.8) (layer F.Fab)
+    (fp_text value MountingHole (at 0 3.8 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_circle (center 0 0) (end 3.05 0) (layer F.CrtYd) (width 0.05))
     (fp_circle (center 0 0) (end 2.8 0) (layer Cmts.User) (width 0.15))
-    (fp_text user %R (at 0.3 0) (layer F.Fab)
+    (fp_circle (center 0 0) (end 3.05 0) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 0.3 0 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (pad 1 thru_hole circle (at 0 0) (size 5.6 5.6) (drill 3.2) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at 0 0 90) (size 5.6 5.6) (drill 3.2) (layers *.Cu *.Mask))
   )
 
   (module MountingHole:MountingHole_3.2mm_M3_DIN965_Pad (layer F.Cu) (tedit 56D1B4CB) (tstamp 63B36A9A)
-    (at 186 119)
+    (at 263.8 59.7 90)
     (descr "Mounting Hole 3.2mm, M3, DIN965")
     (tags "mounting hole 3.2mm m3 din965")
     (path /63B92FD1)
     (attr virtual)
-    (fp_text reference H2 (at -0.1 0.1) (layer F.SilkS)
+    (fp_text reference H2 (at -0.1 0.1 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value MountingHole (at 0 3.8) (layer F.Fab)
+    (fp_text value MountingHole (at 0 3.8 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_circle (center 0 0) (end 2.8 0) (layer Cmts.User) (width 0.15))
     (fp_circle (center 0 0) (end 3.05 0) (layer F.CrtYd) (width 0.05))
-    (fp_text user %R (at 0.3 0) (layer F.Fab)
+    (fp_circle (center 0 0) (end 2.8 0) (layer Cmts.User) (width 0.15))
+    (fp_text user %R (at 0.3 0 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (pad 1 thru_hole circle (at 0 0) (size 5.6 5.6) (drill 3.2) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at 0 0 90) (size 5.6 5.6) (drill 3.2) (layers *.Cu *.Mask))
   )
 
   (module MountingHole:MountingHole_3.2mm_M3_DIN965_Pad (layer F.Cu) (tedit 56D1B4CB) (tstamp 63B3583A)
-    (at 115 80)
+    (at 224.8 130.7 90)
     (descr "Mounting Hole 3.2mm, M3, DIN965")
     (tags "mounting hole 3.2mm m3 din965")
     (path /63B92CBB)
     (attr virtual)
-    (fp_text reference H3 (at 0 0) (layer F.SilkS)
+    (fp_text reference H3 (at 0 0 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value MountingHole (at 0 3.8) (layer F.Fab)
+    (fp_text value MountingHole (at 0 3.8 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_circle (center 0 0) (end 3.05 0) (layer F.CrtYd) (width 0.05))
     (fp_circle (center 0 0) (end 2.8 0) (layer Cmts.User) (width 0.15))
-    (fp_text user %R (at 0.3 0) (layer F.Fab)
+    (fp_circle (center 0 0) (end 3.05 0) (layer F.CrtYd) (width 0.05))
+    (fp_text user %R (at 0.3 0 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (pad 1 thru_hole circle (at 0 0) (size 5.6 5.6) (drill 3.2) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at 0 0 90) (size 5.6 5.6) (drill 3.2) (layers *.Cu *.Mask))
   )
 
   (module MountingHole:MountingHole_3.2mm_M3_DIN965_Pad (layer F.Cu) (tedit 56D1B4CB) (tstamp 63B35842)
-    (at 115 119)
+    (at 263.8 130.7 90)
     (descr "Mounting Hole 3.2mm, M3, DIN965")
     (tags "mounting hole 3.2mm m3 din965")
     (path /63B91EC4)
     (attr virtual)
-    (fp_text reference H4 (at -0.1 0) (layer F.SilkS)
+    (fp_text reference H4 (at -0.1 0 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value MountingHole (at 0 3.8) (layer F.Fab)
+    (fp_text value MountingHole (at 0 3.8 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_circle (center 0 0) (end 2.8 0) (layer Cmts.User) (width 0.15))
     (fp_circle (center 0 0) (end 3.05 0) (layer F.CrtYd) (width 0.05))
-    (fp_text user %R (at 0.3 0) (layer F.Fab)
+    (fp_circle (center 0 0) (end 2.8 0) (layer Cmts.User) (width 0.15))
+    (fp_text user %R (at 0.3 0 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (pad 1 thru_hole circle (at 0 0) (size 5.6 5.6) (drill 3.2) (layers *.Cu *.Mask))
+    (pad 1 thru_hole circle (at 0 0 90) (size 5.6 5.6) (drill 3.2) (layers *.Cu *.Mask))
   )
 
   (module Connector_PinHeader_2.54mm:PinHeader_2x06_P2.54mm_Vertical (layer F.Cu) (tedit 63B2E7B9) (tstamp 63B367EA)
-    (at 116.5 90.6)
+    (at 235.4 129.2 90)
     (descr "Through hole straight pin header, 2x06, 2.54mm pitch, double rows")
     (tags "Through hole pin header THT 2x06 2.54mm double row")
     (path /637B9F6F)
-    (fp_text reference U1 (at -0.8 -2.7) (layer F.SilkS)
+    (fp_text reference U1 (at -0.8 -2.7 90) (layer F.SilkS)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_text value ENC28J60 (at 1.27 15.03) (layer F.Fab)
+    (fp_text value ENC28J60 (at 1.27 15.03 90) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (fp_line (start 0 -1.27) (end 3.81 -1.27) (layer F.Fab) (width 0.1))
-    (fp_line (start 3.81 -1.27) (end 3.81 13.97) (layer F.Fab) (width 0.1))
-    (fp_line (start 3.81 13.97) (end -1.27 13.97) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.27 13.97) (end -1.27 0) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.27 0) (end 0 -1.27) (layer F.Fab) (width 0.1))
-    (fp_line (start -1.33 14.03) (end 3.87 14.03) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.33 1.27) (end -1.33 14.03) (layer F.SilkS) (width 0.12))
-    (fp_line (start 3.87 -1.33) (end 3.87 14.03) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.33 1.27) (end 1.27 1.27) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.27 1.27) (end 1.27 -1.33) (layer F.SilkS) (width 0.12))
-    (fp_line (start 1.27 -1.33) (end 3.87 -1.33) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.33 0) (end -1.33 -1.33) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.33 -1.33) (end 0 -1.33) (layer F.SilkS) (width 0.12))
-    (fp_line (start -1.8 -1.8) (end -1.8 14.5) (layer F.CrtYd) (width 0.05))
-    (fp_line (start -1.8 14.5) (end 4.35 14.5) (layer F.CrtYd) (width 0.05))
-    (fp_line (start 4.35 14.5) (end 4.35 -1.8) (layer F.CrtYd) (width 0.05))
     (fp_line (start 4.35 -1.8) (end -1.8 -1.8) (layer F.CrtYd) (width 0.05))
-    (fp_text user %R (at 1.27 6.35 90) (layer F.Fab)
+    (fp_line (start 4.35 14.5) (end 4.35 -1.8) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.8 14.5) (end 4.35 14.5) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.8 -1.8) (end -1.8 14.5) (layer F.CrtYd) (width 0.05))
+    (fp_line (start -1.33 -1.33) (end 0 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.33 0) (end -1.33 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.27 -1.33) (end 3.87 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start 1.27 1.27) (end 1.27 -1.33) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.33 1.27) (end 1.27 1.27) (layer F.SilkS) (width 0.12))
+    (fp_line (start 3.87 -1.33) (end 3.87 14.03) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.33 1.27) (end -1.33 14.03) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.33 14.03) (end 3.87 14.03) (layer F.SilkS) (width 0.12))
+    (fp_line (start -1.27 0) (end 0 -1.27) (layer F.Fab) (width 0.1))
+    (fp_line (start -1.27 13.97) (end -1.27 0) (layer F.Fab) (width 0.1))
+    (fp_line (start 3.81 13.97) (end -1.27 13.97) (layer F.Fab) (width 0.1))
+    (fp_line (start 3.81 -1.27) (end 3.81 13.97) (layer F.Fab) (width 0.1))
+    (fp_line (start 0 -1.27) (end 3.81 -1.27) (layer F.Fab) (width 0.1))
+    (fp_text user %R (at 1.27 6.35) (layer F.Fab)
       (effects (font (size 1 1) (thickness 0.15)))
     )
-    (pad 1 thru_hole roundrect (at 0 0) (size 2 2) (drill 1) (layers *.Cu *.Mask) (roundrect_rratio 0.25)
+    (pad 1 thru_hole roundrect (at 0 0 90) (size 2 2) (drill 1) (layers *.Cu *.Mask) (roundrect_rratio 0.25)
       (net 40 "Net-(U1-Pad1)"))
-    (pad 2 thru_hole oval (at 2.54 0) (size 2 2) (drill 1) (layers *.Cu *.Mask)
+    (pad 2 thru_hole oval (at 2.54 0 90) (size 2 2) (drill 1) (layers *.Cu *.Mask)
       (net 17 "Net-(U1-Pad2)"))
-    (pad 3 thru_hole oval (at 0 2.54) (size 2 2) (drill 1) (layers *.Cu *.Mask)
+    (pad 3 thru_hole oval (at 0 2.54 90) (size 2 2) (drill 1) (layers *.Cu *.Mask)
       (net 16 "Net-(U1-Pad3)"))
-    (pad 4 thru_hole oval (at 2.54 2.54) (size 2 2) (drill 1) (layers *.Cu *.Mask)
+    (pad 4 thru_hole oval (at 2.54 2.54 90) (size 2 2) (drill 1) (layers *.Cu *.Mask)
       (net 18 "Net-(U1-Pad4)"))
-    (pad 5 thru_hole oval (at 0 5.08) (size 2 2) (drill 1) (layers *.Cu *.Mask)
+    (pad 5 thru_hole oval (at 0 5.08 90) (size 2 2) (drill 1) (layers *.Cu *.Mask)
       (net 13 "Net-(U1-Pad5)"))
-    (pad 6 thru_hole oval (at 2.54 5.08) (size 2 2) (drill 1) (layers *.Cu *.Mask)
+    (pad 6 thru_hole oval (at 2.54 5.08 90) (size 2 2) (drill 1) (layers *.Cu *.Mask)
       (net 19 "Net-(U1-Pad6)"))
-    (pad 7 thru_hole oval (at 0 7.62) (size 2 2) (drill 1) (layers *.Cu *.Mask)
+    (pad 7 thru_hole oval (at 0 7.62 90) (size 2 2) (drill 1) (layers *.Cu *.Mask)
       (net 14 "Net-(U1-Pad7)"))
-    (pad 8 thru_hole oval (at 2.54 7.62) (size 2 2) (drill 1) (layers *.Cu *.Mask)
+    (pad 8 thru_hole oval (at 2.54 7.62 90) (size 2 2) (drill 1) (layers *.Cu *.Mask)
       (net 20 "Net-(U1-Pad8)"))
-    (pad 9 thru_hole oval (at 0 10.16) (size 2 2) (drill 1) (layers *.Cu *.Mask)
+    (pad 9 thru_hole oval (at 0 10.16 90) (size 2 2) (drill 1) (layers *.Cu *.Mask)
       (net 15 "Net-(U1-Pad9)"))
-    (pad 10 thru_hole oval (at 2.54 10.16) (size 2 2) (drill 1) (layers *.Cu *.Mask)
+    (pad 10 thru_hole oval (at 2.54 10.16 90) (size 2 2) (drill 1) (layers *.Cu *.Mask)
       (net 21 "Net-(U1-Pad10)"))
-    (pad 11 thru_hole oval (at 0 12.7) (size 2 2) (drill 1) (layers *.Cu *.Mask)
+    (pad 11 thru_hole oval (at 0 12.7 90) (size 2 2) (drill 1) (layers *.Cu *.Mask)
       (net 2 GND))
-    (pad 12 thru_hole oval (at 2.54 12.7) (size 2 2) (drill 1) (layers *.Cu *.Mask)
+    (pad 12 thru_hole oval (at 2.54 12.7 90) (size 2 2) (drill 1) (layers *.Cu *.Mask)
       (net 1 VCC))
     (model ${KISYS3DMOD}/Connector_PinHeader_2.54mm.3dshapes/PinHeader_2x06_P2.54mm_Vertical.wrl
       (at (xyz 0 0 0))
@@ -1692,262 +1692,266 @@
     )
   )
 
-  (gr_text SET (at 148 91.1) (layer F.SilkS)
+  (gr_text "ARDUINO MINI PLUS" (at 244.9 112.2) (layer F.SilkS)
+    (effects (font (size 1.5 1.5) (thickness 0.3)))
+  )
+  (gr_text SET (at 235.9 97.7 90) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (gr_text 8-24VDC (at 162.3 77.1 180) (layer F.SilkS)
+  (gr_text 8-24VDC (at 221.9 83.4 270) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (gr_text Sensitivity (at 176.5 120.5) (layer F.SilkS)
+  (gr_text Sensitivity (at 265.3 69.2 90) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (gr_text "Pulse input" (at 161.1 116.3) (layer F.SilkS)
+  (gr_text "Pulse input" (at 261.1 84.6 90) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (gr_text "Invert pulse" (at 150.7 121.9) (layer F.SilkS)
+  (gr_text "Invert pulse" (at 266.7 95 90) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (gr_text ENC28J60 (at 113.6 97 270) (layer F.SilkS)
+  (gr_text ENC28J60 (at 241.8 132.1) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (gr_text "© 2023 M.T.  Konstapel" (at 129.4 120.9) (layer F.SilkS)
+  (gr_text "© 2023 M.T.  Konstapel" (at 265.7 116.3 90) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (gr_text "Energy meter pulse counter" (at 130.6 118.8) (layer F.SilkS)
+  (gr_text "Energy meter pulse counter" (at 263.6 115.1 90) (layer F.SilkS)
     (effects (font (size 1 1) (thickness 0.15)))
   )
-  (gr_text "Energy meter pulse counter" (at 185.5 98.4 90) (layer B.Cu) (tstamp 63B33B40)
-    (effects (font (size 1.3 1.3) (thickness 0.25)) (justify mirror))
+  (gr_text "Energy meter pulse counter" (at 244.2 60.3 180) (layer B.Cu) (tstamp 63B33B40)
+    (effects (font (size 1.5 1.5) (thickness 0.25)) (justify mirror))
   )
-  (gr_text "© 2023 M.T.  Konstapel" (at 187.9 97 90) (layer B.Cu)
-    (effects (font (size 1.3 1.3) (thickness 0.25)) (justify mirror))
+  (gr_text "© 2023 M.T.  Konstapel" (at 242.6 57.6 180) (layer B.Cu)
+    (effects (font (size 1.5 1.5) (thickness 0.25)) (justify mirror))
   )
-  (gr_line (start 190 76) (end 190 123) (layer Margin) (width 0.15) (tstamp 63B36ACB))
-  (gr_line (start 186 76) (end 190 76) (layer Margin) (width 0.15))
-  (gr_line (start 111 76) (end 186 76) (layer Margin) (width 0.15))
-  (gr_line (start 111 123) (end 111 76) (layer Margin) (width 0.15))
-  (gr_line (start 190 123) (end 111 123) (layer Margin) (width 0.15))
+  (gr_line (start 220.8 55.7) (end 267.8 55.7) (layer Margin) (width 0.15) (tstamp 63B36ACB))
+  (gr_line (start 220.8 59.7) (end 220.8 55.7) (layer Margin) (width 0.15))
+  (gr_line (start 220.8 134.7) (end 220.8 59.7) (layer Margin) (width 0.15))
+  (gr_line (start 267.8 134.7) (end 220.8 134.7) (layer Margin) (width 0.15))
+  (gr_line (start 267.8 55.7) (end 267.8 134.7) (layer Margin) (width 0.15))
 
-  (segment (start 180.42 97.18) (end 180.9 96.7) (width 0.8) (layer B.Cu) (net 1) (status 30))
-  (segment (start 180.42 100.1) (end 180.42 97.18) (width 0.8) (layer B.Cu) (net 1) (status 30))
-  (segment (start 154.82 97.18) (end 155.3 96.7) (width 0.8) (layer B.Cu) (net 1) (status 30))
-  (segment (start 154.82 100.1) (end 154.82 97.18) (width 0.8) (layer B.Cu) (net 1) (status 30))
-  (segment (start 176.48 84.68) (end 179.9 88.1) (width 1.5) (layer B.Cu) (net 1) (status 30))
-  (segment (start 176.48 83.9) (end 176.48 84.68) (width 1.5) (layer B.Cu) (net 1) (status 30))
-  (segment (start 178.3 89.7) (end 179.9 88.1) (width 1.5) (layer B.Cu) (net 1) (status 20))
-  (segment (start 178.3 92.4) (end 178.3 89.7) (width 1.5) (layer B.Cu) (net 1) (status 10))
-  (segment (start 178.3 94.1) (end 180.9 96.7) (width 1.5) (layer B.Cu) (net 1) (status 20))
-  (segment (start 178.3 92.4) (end 178.3 94.1) (width 1.5) (layer B.Cu) (net 1) (status 10))
-  (segment (start 176.48 83.9) (end 176.48 80.08) (width 1.5) (layer B.Cu) (net 1) (status 10))
-  (segment (start 176.48 80.08) (end 174.9 78.5) (width 1.5) (layer B.Cu) (net 1))
-  (segment (start 174.9 78.5) (end 154 78.5) (width 1.5) (layer B.Cu) (net 1))
-  (segment (start 134 78.5) (end 130 82.5) (width 1.5) (layer B.Cu) (net 1))
-  (segment (start 128.6 105.22) (end 125.9 105.22) (width 1.5) (layer B.Cu) (net 1) (status 20))
-  (segment (start 130 103.82) (end 128.6 105.22) (width 1.5) (layer B.Cu) (net 1))
-  (segment (start 130 82.5) (end 130 103.82) (width 1.5) (layer B.Cu) (net 1))
-  (segment (start 155.3 96.7) (end 158.3 96.7) (width 0.8) (layer B.Cu) (net 1) (status 10))
-  (via (at 158.3 96.7) (size 2) (drill 0.8) (layers F.Cu B.Cu) (net 1))
-  (segment (start 158.3 96.7) (end 158.3 92.6) (width 0.8) (layer F.Cu) (net 1))
-  (via (at 158.3 92.6) (size 2) (drill 0.8) (layers F.Cu B.Cu) (net 1))
-  (segment (start 154 78.5) (end 134 78.5) (width 1.5) (layer B.Cu) (net 1) (tstamp 63B36573))
-  (via (at 154 78.5) (size 2) (drill 0.8) (layers F.Cu B.Cu) (net 1))
-  (segment (start 154 78.5) (end 154 92.6) (width 0.8) (layer F.Cu) (net 1))
-  (via (at 154 92.6) (size 2) (drill 0.8) (layers F.Cu B.Cu) (net 1))
-  (segment (start 154 92.6) (end 158.3 92.6) (width 0.8) (layer B.Cu) (net 1))
-  (segment (start 120.94 105.22) (end 119.026 103.306) (width 1.5) (layer B.Cu) (net 1) (status 20))
-  (segment (start 125.9 105.22) (end 120.94 105.22) (width 1.5) (layer B.Cu) (net 1) (status 10))
-  (segment (start 176.5 117.8) (end 160.6 117.8) (width 0.8) (layer B.Cu) (net 1))
-  (segment (start 159.7 116.9) (end 159.7 113.7) (width 0.8) (layer B.Cu) (net 1))
-  (segment (start 160.6 117.8) (end 159.7 116.9) (width 0.8) (layer B.Cu) (net 1))
-  (segment (start 181.5 96.7) (end 180.9 96.7) (width 0.8) (layer B.Cu) (net 1))
-  (segment (start 182.9 98.1) (end 181.5 96.7) (width 0.8) (layer B.Cu) (net 1))
-  (segment (start 176.5 115.4) (end 182.9 109) (width 0.8) (layer B.Cu) (net 1))
-  (segment (start 182.9 109) (end 182.9 98.1) (width 0.8) (layer B.Cu) (net 1))
-  (segment (start 176.5 117.8) (end 176.5 115.4) (width 0.8) (layer B.Cu) (net 1))
-  (segment (start 158.34 109.94) (end 158.4 110) (width 0.8) (layer B.Cu) (net 2) (status 30))
-  (segment (start 175.9 96.7) (end 175.9 106.3) (width 0.8) (layer B.Cu) (net 2) (status 10))
-  (segment (start 174.48 107.72) (end 172.8 107.72) (width 0.8) (layer B.Cu) (net 2) (status 20))
-  (segment (start 175.9 106.3) (end 174.48 107.72) (width 0.8) (layer B.Cu) (net 2))
-  (segment (start 175.9 106.3) (end 175.9 106.4) (width 0.8) (layer B.Cu) (net 2))
-  (segment (start 177.22 107.72) (end 180.42 107.72) (width 0.8) (layer B.Cu) (net 2) (status 20))
-  (segment (start 175.9 106.4) (end 177.22 107.72) (width 0.8) (layer B.Cu) (net 2))
-  (segment (start 147.2 115.34) (end 148.56 115.34) (width 0.8) (layer B.Cu) (net 2) (status 10))
-  (segment (start 148.56 115.34) (end 149.9 114) (width 0.8) (layer B.Cu) (net 2))
-  (segment (start 149.6 100.1) (end 149.9 99.8) (width 0.8) (layer B.Cu) (net 2))
-  (segment (start 147.2 100.1) (end 149.6 100.1) (width 0.8) (layer B.Cu) (net 2) (status 10))
-  (segment (start 149.78 105.18) (end 149.9 105.3) (width 0.8) (layer B.Cu) (net 2))
-  (segment (start 147.2 105.18) (end 149.78 105.18) (width 0.8) (layer B.Cu) (net 2) (status 10))
-  (segment (start 149.9 105.3) (end 149.9 99.8) (width 0.8) (layer B.Cu) (net 2))
-  (segment (start 149.56 110.26) (end 149.9 110.6) (width 0.8) (layer B.Cu) (net 2))
-  (segment (start 147.2 110.26) (end 149.56 110.26) (width 0.8) (layer B.Cu) (net 2) (status 10))
-  (segment (start 149.9 110.6) (end 149.9 105.3) (width 0.8) (layer B.Cu) (net 2))
-  (segment (start 149.9 114) (end 149.9 110.6) (width 0.8) (layer B.Cu) (net 2))
-  (segment (start 173.94 87.14) (end 174.9 88.1) (width 1.5) (layer B.Cu) (net 2) (status 20))
-  (segment (start 173.94 83.9) (end 173.94 87.14) (width 1.5) (layer B.Cu) (net 2) (status 10))
-  (segment (start 173.26 87.14) (end 172.3 88.1) (width 1.5) (layer B.Cu) (net 2) (status 20))
-  (segment (start 173.94 87.14) (end 173.26 87.14) (width 1.5) (layer B.Cu) (net 2))
-  (segment (start 172.3 88.1) (end 174.9 88.1) (width 1.5) (layer B.Cu) (net 2) (status 30))
-  (segment (start 172.3 92.2) (end 172.1 92.4) (width 1.5) (layer B.Cu) (net 2) (status 30))
-  (segment (start 172.3 88.1) (end 172.3 92.2) (width 1.5) (layer B.Cu) (net 2) (status 30))
-  (segment (start 174.9 91.5) (end 175.8 92.4) (width 1.5) (layer B.Cu) (net 2) (status 20))
-  (segment (start 174.9 88.1) (end 174.9 91.5) (width 1.5) (layer B.Cu) (net 2) (status 10))
-  (segment (start 175.9 92.5) (end 175.8 92.4) (width 1.5) (layer B.Cu) (net 2) (status 30))
-  (segment (start 175.9 96.7) (end 175.9 95.4) (width 1.5) (layer B.Cu) (net 2) (status 10))
-  (segment (start 175.9 94.5) (end 175.9 92.5) (width 1.5) (layer B.Cu) (net 2) (status 20))
-  (segment (start 175.9 95.4) (end 175.9 94.5) (width 1.5) (layer B.Cu) (net 2))
-  (segment (start 152.5 94.5) (end 150.3 96.7) (width 0.8) (layer B.Cu) (net 2) (status 20))
-  (segment (start 150.3 99.4) (end 149.9 99.8) (width 0.8) (layer B.Cu) (net 2))
-  (segment (start 150.3 96.7) (end 150.3 99.4) (width 0.8) (layer B.Cu) (net 2) (status 10))
-  (segment (start 158.34 103.4) (end 158.34 103.76) (width 0.8) (layer B.Cu) (net 2) (status 30))
-  (segment (start 158.34 103.76) (end 158.34 109.94) (width 0.8) (layer B.Cu) (net 2) (status 30))
-  (segment (start 158.34 103.3) (end 158.34 103.76) (width 0.8) (layer B.Cu) (net 2) (status 30))
-  (segment (start 158.34 103.4) (end 163.1 98.64) (width 0.8) (layer B.Cu) (net 2) (status 10))
-  (segment (start 163.1 98.64) (end 163.1 97.7) (width 0.8) (layer B.Cu) (net 2))
-  (via (at 163.1 97.5) (size 2) (drill 0.8) (layers F.Cu B.Cu) (net 2))
-  (segment (start 163.1 98.64) (end 163.1 97.5) (width 0.8) (layer B.Cu) (net 2))
-  (segment (start 163.1 97.5) (end 163.1 93.7) (width 0.8) (layer F.Cu) (net 2))
-  (via (at 163.1 93.7) (size 2) (drill 0.8) (layers F.Cu B.Cu) (net 2))
-  (segment (start 163.1 94.4) (end 163 94.5) (width 0.8) (layer B.Cu) (net 2))
-  (segment (start 163.1 93.7) (end 163.1 94.4) (width 0.8) (layer B.Cu) (net 2))
-  (segment (start 155.6 112.8) (end 158.4 110) (width 0.8) (layer B.Cu) (net 2) (status 30))
-  (segment (start 154.82 112.8) (end 155.6 112.8) (width 0.8) (layer B.Cu) (net 2) (status 30))
-  (segment (start 151.6 88.76) (end 150.8 89.56) (width 0.8) (layer B.Cu) (net 2) (status 20))
-  (segment (start 151.6 84.4) (end 151.6 88.76) (width 0.8) (layer B.Cu) (net 2) (status 10))
-  (segment (start 163 94.5) (end 152.5 94.5) (width 0.8) (layer B.Cu) (net 2))
-  (segment (start 137.1 80.7) (end 133.4 84.4) (width 1.5) (layer B.Cu) (net 2))
-  (segment (start 130.1 110.3) (end 125.9 110.3) (width 1.5) (layer B.Cu) (net 2) (status 20))
-  (segment (start 133.4 107) (end 130.1 110.3) (width 1.5) (layer B.Cu) (net 2))
-  (segment (start 133.98 105.22) (end 133.4 105.8) (width 1.5) (layer B.Cu) (net 2))
-  (segment (start 141.14 105.22) (end 133.98 105.22) (width 1.5) (layer B.Cu) (net 2) (status 10))
-  (segment (start 133.4 105.8) (end 133.4 107) (width 1.5) (layer B.Cu) (net 2))
-  (segment (start 133.4 84.4) (end 133.4 105.8) (width 1.5) (layer B.Cu) (net 2))
-  (segment (start 164.7 94.5) (end 163 94.5) (width 0.8) (layer B.Cu) (net 2))
-  (segment (start 175.7 95.6) (end 175.9 95.4) (width 0.8) (layer B.Cu) (net 2))
-  (segment (start 165.8 95.6) (end 175.7 95.6) (width 0.8) (layer B.Cu) (net 2))
-  (segment (start 164.7 94.5) (end 165.8 95.6) (width 0.8) (layer B.Cu) (net 2))
-  (segment (start 151.6 80.8) (end 151.7 80.7) (width 0.8) (layer B.Cu) (net 2))
-  (segment (start 116.486 104.720213) (end 116.486 103.306) (width 1.5) (layer B.Cu) (net 2) (status 20))
-  (segment (start 122.065787 110.3) (end 116.486 104.720213) (width 1.5) (layer B.Cu) (net 2))
-  (segment (start 125.9 110.3) (end 122.065787 110.3) (width 1.5) (layer B.Cu) (net 2) (status 10))
-  (segment (start 173.94 83.26) (end 173.94 83.9) (width 1.5) (layer B.Cu) (net 2) (status 30))
-  (segment (start 173.94 81.54) (end 173.94 83.26) (width 1.5) (layer B.Cu) (net 2) (status 20))
-  (segment (start 173.1 80.7) (end 173.94 81.54) (width 1.5) (layer B.Cu) (net 2))
-  (segment (start 151.7 80.7) (end 150.1 80.7) (width 1.5) (layer B.Cu) (net 2))
-  (segment (start 150.1 80.7) (end 137.1 80.7) (width 1.5) (layer B.Cu) (net 2))
-  (segment (start 151.6 84.4) (end 151.6 80.7) (width 0.8) (layer B.Cu) (net 2) (status 10))
-  (segment (start 150.1 80.7) (end 151.6 80.7) (width 1.5) (layer B.Cu) (net 2))
-  (segment (start 162.8 81.2) (end 163.3 80.7) (width 1.5) (layer B.Cu) (net 2))
-  (segment (start 162.8 84) (end 162.8 81.2) (width 1.5) (layer B.Cu) (net 2))
-  (segment (start 163.3 80.7) (end 173.1 80.7) (width 1.5) (layer B.Cu) (net 2))
-  (segment (start 151.6 80.7) (end 163.3 80.7) (width 1.5) (layer B.Cu) (net 2))
-  (segment (start 163.4 112.54) (end 162.24 113.7) (width 0.8) (layer B.Cu) (net 3) (status 20))
-  (segment (start 163.4 110) (end 163.4 112.54) (width 0.8) (layer B.Cu) (net 3) (status 10))
-  (segment (start 172.8 102.64) (end 171.44 102.64) (width 0.8) (layer B.Cu) (net 3) (status 10))
-  (segment (start 171.44 102.64) (end 170.4 101.6) (width 0.8) (layer B.Cu) (net 3))
-  (segment (start 170.4 101.6) (end 170.4 98.7) (width 0.8) (layer B.Cu) (net 3))
-  (segment (start 170.4 98.7) (end 169.8 98.1) (width 0.8) (layer B.Cu) (net 3))
-  (segment (start 169.8 98.1) (end 166.9 98.1) (width 0.8) (layer B.Cu) (net 3))
-  (segment (start 166.9 98.1) (end 166.2 98.8) (width 0.8) (layer B.Cu) (net 3))
-  (segment (start 166.2 98.8) (end 166.2 105.5) (width 0.8) (layer B.Cu) (net 3))
-  (segment (start 167.4 106.7) (end 168.5 106.7) (width 0.8) (layer B.Cu) (net 3) (status 20))
-  (segment (start 166.2 105.5) (end 167.4 106.7) (width 0.8) (layer B.Cu) (net 3))
-  (segment (start 163.4 108.3) (end 166.2 105.5) (width 0.8) (layer B.Cu) (net 3))
-  (segment (start 163.4 110) (end 163.4 108.3) (width 0.8) (layer B.Cu) (net 3) (status 10))
-  (segment (start 169.6 90.4) (end 167.3 88.1) (width 1.5) (layer B.Cu) (net 4) (status 20))
-  (segment (start 169.6 92.4) (end 169.6 90.4) (width 1.5) (layer B.Cu) (net 4) (status 10))
-  (segment (start 167.3 88.1) (end 167.3 88) (width 1.5) (layer B.Cu) (net 4) (status 30))
-  (segment (start 169.6 85.7) (end 169.85 85.45) (width 1.5) (layer B.Cu) (net 4))
-  (segment (start 169.85 85.45) (end 171.4 83.9) (width 1.5) (layer B.Cu) (net 4) (status 20))
-  (segment (start 167.3 88) (end 169.85 85.45) (width 1.5) (layer B.Cu) (net 4) (status 10))
-  (segment (start 168.9 88.1) (end 169.6 88.8) (width 1.5) (layer B.Cu) (net 4))
-  (segment (start 167.3 88.1) (end 168.9 88.1) (width 1.5) (layer B.Cu) (net 4) (status 10))
-  (segment (start 169.6 88.8) (end 169.6 85.7) (width 1.5) (layer B.Cu) (net 4))
-  (segment (start 169.6 90.4) (end 169.6 88.8) (width 1.5) (layer B.Cu) (net 4))
-  (segment (start 169.6 92.4) (end 168.9 92.4) (width 1.5) (layer B.Cu) (net 4) (status 30))
-  (segment (start 162.85 86.95) (end 168.3 92.4) (width 1.5) (layer B.Cu) (net 4))
-  (segment (start 168.3 92.4) (end 169.6 92.4) (width 1.5) (layer B.Cu) (net 4) (status 20))
-  (segment (start 160.75 86.95) (end 162.85 86.95) (width 1.5) (layer B.Cu) (net 4))
-  (segment (start 157.8 84) (end 160.75 86.95) (width 1.5) (layer B.Cu) (net 4) (status 10))
-  (segment (start 145 88.46) (end 149.06 84.4) (width 0.8) (layer B.Cu) (net 5) (status 20))
-  (segment (start 145 94.8) (end 145 88.46) (width 0.8) (layer B.Cu) (net 5) (status 10))
-  (segment (start 150.8 92.1) (end 150.8 92.5) (width 0.8) (layer B.Cu) (net 6) (status 30))
-  (segment (start 145.7 97.6) (end 141.14 97.6) (width 0.8) (layer B.Cu) (net 6) (status 20))
-  (segment (start 150.8 92.5) (end 145.7 97.6) (width 0.8) (layer B.Cu) (net 6) (status 10))
-  (segment (start 154.82 110.26) (end 153.84 110.26) (width 0.8) (layer B.Cu) (net 7) (status 30))
-  (segment (start 154.82 110.26) (end 153.94 110.26) (width 0.8) (layer B.Cu) (net 7) (status 30))
-  (segment (start 153.94 110.26) (end 152.5 111.7) (width 0.8) (layer B.Cu) (net 7) (status 10))
-  (segment (start 152.5 118.5) (end 153.2 119.2) (width 0.8) (layer B.Cu) (net 7) (status 30))
-  (segment (start 152.5 111.7) (end 152.5 118.5) (width 0.8) (layer B.Cu) (net 7) (status 20))
-  (segment (start 141.14 102.68) (end 142.98 102.68) (width 0.8) (layer B.Cu) (net 8) (status 10))
-  (segment (start 142.98 102.68) (end 144.4 104.1) (width 0.8) (layer B.Cu) (net 8))
-  (segment (start 144.4 104.1) (end 144.4 120.2) (width 0.8) (layer B.Cu) (net 8))
-  (segment (start 144.4 120.2) (end 145.6 121.4) (width 0.8) (layer B.Cu) (net 8))
-  (segment (start 145.6 121.4) (end 149.2 121.4) (width 0.8) (layer B.Cu) (net 8))
-  (segment (start 150.66 119.94) (end 150.66 119.2) (width 0.8) (layer B.Cu) (net 8) (status 30))
-  (segment (start 149.2 121.4) (end 150.66 119.94) (width 0.8) (layer B.Cu) (net 8) (status 20))
-  (segment (start 154.82 105.18) (end 154.82 107.72) (width 0.8) (layer B.Cu) (net 9) (status 30))
-  (segment (start 150.5 116.82) (end 148.12 119.2) (width 0.8) (layer B.Cu) (net 9) (status 20))
-  (segment (start 150.5 116.82) (end 150.5 116.8) (width 0.8) (layer B.Cu) (net 9))
-  (segment (start 151.3 116.02) (end 150.5 116.82) (width 0.8) (layer B.Cu) (net 9))
-  (segment (start 151.3 109.2) (end 151.3 116.02) (width 0.8) (layer B.Cu) (net 9))
-  (segment (start 152.78 107.72) (end 151.3 109.2) (width 0.8) (layer B.Cu) (net 9))
-  (segment (start 154.82 107.72) (end 152.78 107.72) (width 0.8) (layer B.Cu) (net 9) (status 10))
-  (segment (start 168.46 103.36) (end 168.5 103.4) (width 0.8) (layer B.Cu) (net 10) (status 30))
-  (segment (start 168.46 100.1) (end 168.46 103.36) (width 0.8) (layer B.Cu) (net 10) (status 30))
-  (segment (start 168.5 103.4) (end 170.28 105.18) (width 0.8) (layer B.Cu) (net 10) (status 10))
-  (segment (start 170.42 105.18) (end 172.8 105.18) (width 0.8) (layer B.Cu) (net 10) (status 20))
-  (segment (start 170.28 105.18) (end 170.42 105.18) (width 0.8) (layer B.Cu) (net 10))
-  (segment (start 174 112.8) (end 171.7 112.8) (width 0.8) (layer B.Cu) (net 10))
-  (segment (start 170.42 111.52) (end 170.42 110.22) (width 0.8) (layer B.Cu) (net 10))
-  (segment (start 171.7 112.8) (end 170.42 111.52) (width 0.8) (layer B.Cu) (net 10))
-  (segment (start 170.42 110.22) (end 170.42 105.18) (width 0.8) (layer B.Cu) (net 10))
-  (segment (start 170.42 110.72) (end 170.42 110.22) (width 0.8) (layer B.Cu) (net 10))
-  (segment (start 155.76 102.64) (end 158.3 100.1) (width 0.8) (layer B.Cu) (net 11) (status 30))
-  (segment (start 154.82 102.64) (end 155.76 102.64) (width 0.8) (layer B.Cu) (net 11) (status 30))
-  (segment (start 171.5 96.9) (end 172.8 98.2) (width 0.8) (layer B.Cu) (net 11))
-  (segment (start 165.3 96.9) (end 171.5 96.9) (width 0.8) (layer B.Cu) (net 11))
-  (segment (start 172.8 98.2) (end 172.8 100.1) (width 0.8) (layer B.Cu) (net 11) (status 20))
-  (segment (start 162 95.8) (end 164.2 95.8) (width 0.8) (layer B.Cu) (net 11))
-  (segment (start 158.3 99.5) (end 162 95.8) (width 0.8) (layer B.Cu) (net 11) (status 10))
-  (segment (start 164.2 95.8) (end 165.3 96.9) (width 0.8) (layer B.Cu) (net 11))
-  (segment (start 158.3 100.1) (end 158.3 99.5) (width 0.8) (layer B.Cu) (net 11) (status 30))
-  (segment (start 144.74 84.9) (end 145 84.64) (width 0.8) (layer B.Cu) (net 12) (status 30))
-  (segment (start 141.14 84.9) (end 144.74 84.9) (width 0.8) (layer B.Cu) (net 12) (status 30))
-  (segment (start 127.9 87.44) (end 125.9 87.44) (width 0.8) (layer B.Cu) (net 13) (status 20))
-  (segment (start 127.3 82.6) (end 128.4 83.7) (width 0.8) (layer B.Cu) (net 13))
-  (segment (start 122.5 82.6) (end 127.3 82.6) (width 0.8) (layer B.Cu) (net 13))
-  (segment (start 118.7 86.4) (end 122.5 82.6) (width 0.8) (layer B.Cu) (net 13))
-  (segment (start 128.4 86.94) (end 127.9 87.44) (width 0.8) (layer B.Cu) (net 13))
-  (segment (start 114.9 86.4) (end 118.7 86.4) (width 0.8) (layer B.Cu) (net 13))
-  (segment (start 128.4 83.7) (end 128.4 86.94) (width 0.8) (layer B.Cu) (net 13))
-  (segment (start 112.6 88.7) (end 114.9 86.4) (width 0.8) (layer B.Cu) (net 13))
-  (segment (start 112.6 93.6) (end 112.6 88.7) (width 0.8) (layer B.Cu) (net 13))
-  (segment (start 114.7 95.7) (end 112.6 93.6) (width 0.8) (layer B.Cu) (net 13))
-  (segment (start 116.5 95.7) (end 114.7 95.7) (width 0.8) (layer B.Cu) (net 13) (status 10))
-  (segment (start 116.486 93.146) (end 115.646 93.146) (width 0.8) (layer B.Cu) (net 16) (status 30))
-  (segment (start 115.646 93.146) (end 113.9 91.4) (width 0.8) (layer B.Cu) (net 16) (status 10))
-  (segment (start 125.9 84.9) (end 122.4 84.9) (width 0.8) (layer B.Cu) (net 16) (status 10))
-  (segment (start 122.4 84.9) (end 119.5 87.8) (width 0.8) (layer B.Cu) (net 16))
-  (segment (start 119.5 87.8) (end 115.4 87.8) (width 0.8) (layer B.Cu) (net 16))
-  (segment (start 113.9 89.3) (end 113.9 91.4) (width 0.8) (layer B.Cu) (net 16))
-  (segment (start 115.4 87.8) (end 113.9 89.3) (width 0.8) (layer B.Cu) (net 16))
-  (segment (start 125.9 107.76) (end 122.84 107.76) (width 0.8) (layer B.Cu) (net 18) (status 10))
-  (via (at 122.84 107.76) (size 2) (drill 0.8) (layers F.Cu B.Cu) (net 18))
-  (segment (start 122.84 107.76) (end 122.84 93.16) (width 0.8) (layer F.Cu) (net 18))
-  (via (at 122.8 93.2) (size 2) (drill 0.8) (layers F.Cu B.Cu) (net 18))
-  (segment (start 122.84 93.16) (end 122.8 93.2) (width 0.8) (layer F.Cu) (net 18))
-  (segment (start 119.08 93.2) (end 119.026 93.146) (width 0.8) (layer B.Cu) (net 18) (status 30))
-  (segment (start 122.8 93.2) (end 119.08 93.2) (width 0.8) (layer B.Cu) (net 18) (status 20))
-  (segment (start 122.734 95.686) (end 125.9 92.52) (width 0.8) (layer B.Cu) (net 19) (status 20))
-  (segment (start 119.026 95.686) (end 122.734 95.686) (width 0.8) (layer B.Cu) (net 19) (status 10))
-  (segment (start 119.026 98.226) (end 121.774 98.226) (width 0.8) (layer B.Cu) (net 20) (status 10))
-  (segment (start 121.774 98.226) (end 123.6 96.4) (width 0.8) (layer B.Cu) (net 20))
-  (segment (start 123.73999 96.26001) (end 123.6 96.4) (width 0.4) (layer B.Cu) (net 20))
-  (segment (start 127.63999 96.26001) (end 123.73999 96.26001) (width 0.4) (layer B.Cu) (net 20))
-  (segment (start 127.63999 96.26001) (end 128.2 95.7) (width 0.8) (layer B.Cu) (net 20))
-  (segment (start 128.2 90.68) (end 127.5 89.98) (width 0.8) (layer B.Cu) (net 20))
-  (segment (start 128.2 95.7) (end 128.2 90.68) (width 0.8) (layer B.Cu) (net 20))
-  (segment (start 125.9 89.98) (end 127.5 89.98) (width 0.8) (layer B.Cu) (net 20) (status 10))
-  (segment (start 180.42 102.64) (end 180.42 105.18) (width 0.8) (layer B.Cu) (net 22) (status 30))
+  (segment (start 241.98 65.28) (end 241.5 64.8) (width 0.8) (layer B.Cu) (net 1) (status 30))
+  (segment (start 244.9 65.28) (end 241.98 65.28) (width 0.8) (layer B.Cu) (net 1) (status 30))
+  (segment (start 241.98 90.88) (end 241.5 90.4) (width 0.8) (layer B.Cu) (net 1) (status 30))
+  (segment (start 244.9 90.88) (end 241.98 90.88) (width 0.8) (layer B.Cu) (net 1) (status 30))
+  (segment (start 229.48 69.22) (end 232.9 65.8) (width 1.5) (layer B.Cu) (net 1) (status 30))
+  (segment (start 228.7 69.22) (end 229.48 69.22) (width 1.5) (layer B.Cu) (net 1) (status 30))
+  (segment (start 234.5 67.4) (end 232.9 65.8) (width 1.5) (layer B.Cu) (net 1) (status 20))
+  (segment (start 237.2 67.4) (end 234.5 67.4) (width 1.5) (layer B.Cu) (net 1) (status 10))
+  (segment (start 238.9 67.4) (end 241.5 64.8) (width 1.5) (layer B.Cu) (net 1) (status 20))
+  (segment (start 237.2 67.4) (end 238.9 67.4) (width 1.5) (layer B.Cu) (net 1) (status 10))
+  (segment (start 228.7 69.22) (end 224.88 69.22) (width 1.5) (layer B.Cu) (net 1) (status 10))
+  (segment (start 224.88 69.22) (end 223.3 70.8) (width 1.5) (layer B.Cu) (net 1))
+  (segment (start 223.3 70.8) (end 223.3 91.7) (width 1.5) (layer B.Cu) (net 1))
+  (segment (start 223.3 111.7) (end 227.3 115.7) (width 1.5) (layer B.Cu) (net 1))
+  (segment (start 250.02 117.1) (end 250.02 119.8) (width 1.5) (layer B.Cu) (net 1) (status 20))
+  (segment (start 248.62 115.7) (end 250.02 117.1) (width 1.5) (layer B.Cu) (net 1))
+  (segment (start 227.3 115.7) (end 248.62 115.7) (width 1.5) (layer B.Cu) (net 1))
+  (segment (start 241.5 90.4) (end 241.5 87.4) (width 0.8) (layer B.Cu) (net 1) (status 10))
+  (via (at 241.5 87.4) (size 2) (drill 0.8) (layers F.Cu B.Cu) (net 1))
+  (segment (start 241.5 87.4) (end 237.4 87.4) (width 0.8) (layer F.Cu) (net 1))
+  (via (at 237.4 87.4) (size 2) (drill 0.8) (layers F.Cu B.Cu) (net 1))
+  (segment (start 223.3 91.7) (end 223.3 111.7) (width 1.5) (layer B.Cu) (net 1) (tstamp 63B36573))
+  (via (at 223.3 91.7) (size 2) (drill 0.8) (layers F.Cu B.Cu) (net 1))
+  (segment (start 223.3 91.7) (end 237.4 91.7) (width 0.8) (layer F.Cu) (net 1))
+  (via (at 237.4 91.7) (size 2) (drill 0.8) (layers F.Cu B.Cu) (net 1))
+  (segment (start 237.4 91.7) (end 237.4 87.4) (width 0.8) (layer B.Cu) (net 1))
+  (segment (start 250.02 124.76) (end 248.106 126.674) (width 1.5) (layer B.Cu) (net 1) (status 20))
+  (segment (start 250.02 119.8) (end 250.02 124.76) (width 1.5) (layer B.Cu) (net 1) (status 10))
+  (segment (start 262.6 69.2) (end 262.6 85.1) (width 0.8) (layer B.Cu) (net 1) (status 10))
+  (segment (start 261.7 86) (end 258.5 86) (width 0.8) (layer B.Cu) (net 1) (status 20))
+  (segment (start 262.6 85.1) (end 261.7 86) (width 0.8) (layer B.Cu) (net 1))
+  (segment (start 241.5 64.2) (end 241.5 64.8) (width 0.8) (layer B.Cu) (net 1) (status 30))
+  (segment (start 242.9 62.8) (end 241.5 64.2) (width 0.8) (layer B.Cu) (net 1) (status 20))
+  (segment (start 260.2 69.2) (end 253.8 62.8) (width 0.8) (layer B.Cu) (net 1))
+  (segment (start 253.8 62.8) (end 242.9 62.8) (width 0.8) (layer B.Cu) (net 1))
+  (segment (start 262.6 69.2) (end 260.2 69.2) (width 0.8) (layer B.Cu) (net 1) (status 10))
+  (segment (start 254.74 87.36) (end 254.8 87.3) (width 0.8) (layer B.Cu) (net 2) (status 30))
+  (segment (start 241.5 69.8) (end 251.1 69.8) (width 0.8) (layer B.Cu) (net 2) (status 10))
+  (segment (start 252.52 71.22) (end 252.52 72.9) (width 0.8) (layer B.Cu) (net 2) (status 20))
+  (segment (start 251.1 69.8) (end 252.52 71.22) (width 0.8) (layer B.Cu) (net 2))
+  (segment (start 251.1 69.8) (end 251.2 69.8) (width 0.8) (layer B.Cu) (net 2))
+  (segment (start 252.52 68.48) (end 252.52 65.28) (width 0.8) (layer B.Cu) (net 2) (status 20))
+  (segment (start 251.2 69.8) (end 252.52 68.48) (width 0.8) (layer B.Cu) (net 2))
+  (segment (start 260.14 98.5) (end 260.14 97.14) (width 0.8) (layer B.Cu) (net 2) (status 10))
+  (segment (start 260.14 97.14) (end 258.8 95.8) (width 0.8) (layer B.Cu) (net 2))
+  (segment (start 244.9 96.1) (end 244.6 95.8) (width 0.8) (layer B.Cu) (net 2))
+  (segment (start 244.9 98.5) (end 244.9 96.1) (width 0.8) (layer B.Cu) (net 2) (status 10))
+  (segment (start 249.98 95.92) (end 250.1 95.8) (width 0.8) (layer B.Cu) (net 2))
+  (segment (start 249.98 98.5) (end 249.98 95.92) (width 0.8) (layer B.Cu) (net 2) (status 10))
+  (segment (start 250.1 95.8) (end 244.6 95.8) (width 0.8) (layer B.Cu) (net 2))
+  (segment (start 255.06 96.14) (end 255.4 95.8) (width 0.8) (layer B.Cu) (net 2))
+  (segment (start 255.06 98.5) (end 255.06 96.14) (width 0.8) (layer B.Cu) (net 2) (status 10))
+  (segment (start 255.4 95.8) (end 250.1 95.8) (width 0.8) (layer B.Cu) (net 2))
+  (segment (start 258.8 95.8) (end 255.4 95.8) (width 0.8) (layer B.Cu) (net 2))
+  (segment (start 231.94 71.76) (end 232.9 70.8) (width 1.5) (layer B.Cu) (net 2) (status 20))
+  (segment (start 228.7 71.76) (end 231.94 71.76) (width 1.5) (layer B.Cu) (net 2) (status 10))
+  (segment (start 231.94 72.44) (end 232.9 73.4) (width 1.5) (layer B.Cu) (net 2) (status 20))
+  (segment (start 231.94 71.76) (end 231.94 72.44) (width 1.5) (layer B.Cu) (net 2))
+  (segment (start 232.9 73.4) (end 232.9 70.8) (width 1.5) (layer B.Cu) (net 2) (status 30))
+  (segment (start 237 73.4) (end 237.2 73.6) (width 1.5) (layer B.Cu) (net 2) (status 30))
+  (segment (start 232.9 73.4) (end 237 73.4) (width 1.5) (layer B.Cu) (net 2) (status 30))
+  (segment (start 236.3 70.8) (end 237.2 69.9) (width 1.5) (layer B.Cu) (net 2) (status 20))
+  (segment (start 232.9 70.8) (end 236.3 70.8) (width 1.5) (layer B.Cu) (net 2) (status 10))
+  (segment (start 237.3 69.8) (end 237.2 69.9) (width 1.5) (layer B.Cu) (net 2) (status 30))
+  (segment (start 241.5 69.8) (end 240.2 69.8) (width 1.5) (layer B.Cu) (net 2) (status 10))
+  (segment (start 239.3 69.8) (end 237.3 69.8) (width 1.5) (layer B.Cu) (net 2) (status 20))
+  (segment (start 240.2 69.8) (end 239.3 69.8) (width 1.5) (layer B.Cu) (net 2))
+  (segment (start 239.3 93.2) (end 241.5 95.4) (width 0.8) (layer B.Cu) (net 2) (status 20))
+  (segment (start 244.2 95.4) (end 244.6 95.8) (width 0.8) (layer B.Cu) (net 2))
+  (segment (start 241.5 95.4) (end 244.2 95.4) (width 0.8) (layer B.Cu) (net 2) (status 10))
+  (segment (start 248.2 87.36) (end 248.56 87.36) (width 0.8) (layer B.Cu) (net 2) (status 30))
+  (segment (start 248.56 87.36) (end 254.74 87.36) (width 0.8) (layer B.Cu) (net 2) (status 30))
+  (segment (start 248.1 87.36) (end 248.56 87.36) (width 0.8) (layer B.Cu) (net 2) (status 30))
+  (segment (start 248.2 87.36) (end 243.44 82.6) (width 0.8) (layer B.Cu) (net 2) (status 10))
+  (segment (start 243.44 82.6) (end 242.5 82.6) (width 0.8) (layer B.Cu) (net 2))
+  (via (at 242.3 82.6) (size 2) (drill 0.8) (layers F.Cu B.Cu) (net 2))
+  (segment (start 243.44 82.6) (end 242.3 82.6) (width 0.8) (layer B.Cu) (net 2))
+  (segment (start 242.3 82.6) (end 238.5 82.6) (width 0.8) (layer F.Cu) (net 2))
+  (via (at 238.5 82.6) (size 2) (drill 0.8) (layers F.Cu B.Cu) (net 2))
+  (segment (start 239.2 82.6) (end 239.3 82.7) (width 0.8) (layer B.Cu) (net 2))
+  (segment (start 238.5 82.6) (end 239.2 82.6) (width 0.8) (layer B.Cu) (net 2))
+  (segment (start 257.6 90.1) (end 254.8 87.3) (width 0.8) (layer B.Cu) (net 2) (status 30))
+  (segment (start 257.6 90.88) (end 257.6 90.1) (width 0.8) (layer B.Cu) (net 2) (status 30))
+  (segment (start 233.56 94.1) (end 234.36 94.9) (width 0.8) (layer B.Cu) (net 2) (status 20))
+  (segment (start 229.2 94.1) (end 233.56 94.1) (width 0.8) (layer B.Cu) (net 2) (status 10))
+  (segment (start 239.3 82.7) (end 239.3 93.2) (width 0.8) (layer B.Cu) (net 2))
+  (segment (start 225.5 108.6) (end 229.2 112.3) (width 1.5) (layer B.Cu) (net 2))
+  (segment (start 255.1 115.6) (end 255.1 119.8) (width 1.5) (layer B.Cu) (net 2) (status 20))
+  (segment (start 251.8 112.3) (end 255.1 115.6) (width 1.5) (layer B.Cu) (net 2))
+  (segment (start 250.02 111.72) (end 250.6 112.3) (width 1.5) (layer B.Cu) (net 2))
+  (segment (start 250.02 104.56) (end 250.02 111.72) (width 1.5) (layer B.Cu) (net 2) (status 10))
+  (segment (start 250.6 112.3) (end 251.8 112.3) (width 1.5) (layer B.Cu) (net 2))
+  (segment (start 229.2 112.3) (end 250.6 112.3) (width 1.5) (layer B.Cu) (net 2))
+  (segment (start 239.3 81) (end 239.3 82.7) (width 0.8) (layer B.Cu) (net 2))
+  (segment (start 240.4 70) (end 240.2 69.8) (width 0.8) (layer B.Cu) (net 2))
+  (segment (start 240.4 79.9) (end 240.4 70) (width 0.8) (layer B.Cu) (net 2))
+  (segment (start 239.3 81) (end 240.4 79.9) (width 0.8) (layer B.Cu) (net 2))
+  (segment (start 225.6 94.1) (end 225.5 94) (width 0.8) (layer B.Cu) (net 2))
+  (segment (start 249.520213 129.214) (end 248.106 129.214) (width 1.5) (layer B.Cu) (net 2) (status 20))
+  (segment (start 255.1 123.634213) (end 249.520213 129.214) (width 1.5) (layer B.Cu) (net 2))
+  (segment (start 255.1 119.8) (end 255.1 123.634213) (width 1.5) (layer B.Cu) (net 2) (status 10))
+  (segment (start 228.06 71.76) (end 228.7 71.76) (width 1.5) (layer B.Cu) (net 2) (status 30))
+  (segment (start 226.34 71.76) (end 228.06 71.76) (width 1.5) (layer B.Cu) (net 2) (status 20))
+  (segment (start 225.5 72.6) (end 226.34 71.76) (width 1.5) (layer B.Cu) (net 2))
+  (segment (start 225.5 94) (end 225.5 95.6) (width 1.5) (layer B.Cu) (net 2))
+  (segment (start 225.5 95.6) (end 225.5 108.6) (width 1.5) (layer B.Cu) (net 2))
+  (segment (start 229.2 94.1) (end 225.5 94.1) (width 0.8) (layer B.Cu) (net 2) (status 10))
+  (segment (start 225.5 95.6) (end 225.5 94.1) (width 1.5) (layer B.Cu) (net 2))
+  (segment (start 226 82.9) (end 225.5 82.4) (width 1.5) (layer B.Cu) (net 2))
+  (segment (start 225.5 82.4) (end 225.5 72.6) (width 1.5) (layer B.Cu) (net 2))
+  (segment (start 225.5 94.1) (end 225.5 82.4) (width 1.5) (layer B.Cu) (net 2))
+  (segment (start 226.2 83.1) (end 226 82.9) (width 1.5) (layer B.Cu) (net 2))
+  (segment (start 228.8 83.1) (end 226.2 83.1) (width 1.5) (layer B.Cu) (net 2))
+  (segment (start 257.34 82.3) (end 258.5 83.46) (width 0.8) (layer B.Cu) (net 3) (status 20))
+  (segment (start 254.8 82.3) (end 257.34 82.3) (width 0.8) (layer B.Cu) (net 3) (status 10))
+  (segment (start 247.44 72.9) (end 247.44 74.26) (width 0.8) (layer B.Cu) (net 3) (status 10))
+  (segment (start 247.44 74.26) (end 246.4 75.3) (width 0.8) (layer B.Cu) (net 3))
+  (segment (start 246.4 75.3) (end 243.5 75.3) (width 0.8) (layer B.Cu) (net 3))
+  (segment (start 243.5 75.3) (end 242.9 75.9) (width 0.8) (layer B.Cu) (net 3))
+  (segment (start 242.9 75.9) (end 242.9 78.8) (width 0.8) (layer B.Cu) (net 3))
+  (segment (start 242.9 78.8) (end 243.6 79.5) (width 0.8) (layer B.Cu) (net 3))
+  (segment (start 243.6 79.5) (end 250.3 79.5) (width 0.8) (layer B.Cu) (net 3))
+  (segment (start 251.5 78.3) (end 251.5 77.2) (width 0.8) (layer B.Cu) (net 3) (status 20))
+  (segment (start 250.3 79.5) (end 251.5 78.3) (width 0.8) (layer B.Cu) (net 3))
+  (segment (start 253.1 82.3) (end 250.3 79.5) (width 0.8) (layer B.Cu) (net 3))
+  (segment (start 254.8 82.3) (end 253.1 82.3) (width 0.8) (layer B.Cu) (net 3) (status 10))
+  (segment (start 235.2 76.1) (end 232.9 78.4) (width 1.5) (layer B.Cu) (net 4) (status 20))
+  (segment (start 237.2 76.1) (end 235.2 76.1) (width 1.5) (layer B.Cu) (net 4) (status 10))
+  (segment (start 232.9 78.4) (end 232.8 78.4) (width 1.5) (layer B.Cu) (net 4) (status 30))
+  (segment (start 230.5 76.1) (end 230.25 75.85) (width 1.5) (layer B.Cu) (net 4))
+  (segment (start 230.25 75.85) (end 228.7 74.3) (width 1.5) (layer B.Cu) (net 4) (status 20))
+  (segment (start 232.8 78.4) (end 230.25 75.85) (width 1.5) (layer B.Cu) (net 4) (status 10))
+  (segment (start 232.9 76.8) (end 233.6 76.1) (width 1.5) (layer B.Cu) (net 4))
+  (segment (start 232.9 78.4) (end 232.9 76.8) (width 1.5) (layer B.Cu) (net 4) (status 10))
+  (segment (start 233.6 76.1) (end 230.5 76.1) (width 1.5) (layer B.Cu) (net 4))
+  (segment (start 235.2 76.1) (end 233.6 76.1) (width 1.5) (layer B.Cu) (net 4))
+  (segment (start 237.2 76.1) (end 237.2 76.8) (width 1.5) (layer B.Cu) (net 4) (status 30))
+  (segment (start 231.75 85.15) (end 228.8 88.1) (width 1.5) (layer B.Cu) (net 4))
+  (segment (start 231.75 82.85) (end 231.75 85.15) (width 1.5) (layer B.Cu) (net 4))
+  (segment (start 237.2 77.4) (end 231.75 82.85) (width 1.5) (layer B.Cu) (net 4))
+  (segment (start 237.2 76.1) (end 237.2 77.4) (width 1.5) (layer B.Cu) (net 4))
+  (segment (start 233.26 100.7) (end 229.2 96.64) (width 0.8) (layer B.Cu) (net 5) (status 20))
+  (segment (start 239.6 100.7) (end 233.26 100.7) (width 0.8) (layer B.Cu) (net 5) (status 10))
+  (segment (start 236.9 94.9) (end 237.3 94.9) (width 0.8) (layer B.Cu) (net 6) (status 30))
+  (segment (start 242.4 100) (end 242.4 104.56) (width 0.8) (layer B.Cu) (net 6) (status 20))
+  (segment (start 237.3 94.9) (end 242.4 100) (width 0.8) (layer B.Cu) (net 6) (status 10))
+  (segment (start 255.06 90.88) (end 255.06 91.86) (width 0.8) (layer B.Cu) (net 7) (status 30))
+  (segment (start 255.06 90.88) (end 255.06 91.76) (width 0.8) (layer B.Cu) (net 7) (status 30))
+  (segment (start 255.06 91.76) (end 256.5 93.2) (width 0.8) (layer B.Cu) (net 7) (status 10))
+  (segment (start 263.3 93.2) (end 264 92.5) (width 0.8) (layer B.Cu) (net 7) (status 30))
+  (segment (start 256.5 93.2) (end 263.3 93.2) (width 0.8) (layer B.Cu) (net 7) (status 20))
+  (segment (start 247.48 104.56) (end 247.48 102.72) (width 0.8) (layer B.Cu) (net 8) (status 10))
+  (segment (start 247.48 102.72) (end 248.9 101.3) (width 0.8) (layer B.Cu) (net 8))
+  (segment (start 248.9 101.3) (end 265 101.3) (width 0.8) (layer B.Cu) (net 8))
+  (segment (start 265 101.3) (end 266.2 100.1) (width 0.8) (layer B.Cu) (net 8))
+  (segment (start 266.2 100.1) (end 266.2 96.5) (width 0.8) (layer B.Cu) (net 8))
+  (segment (start 264.74 95.04) (end 264 95.04) (width 0.8) (layer B.Cu) (net 8) (status 30))
+  (segment (start 266.2 96.5) (end 264.74 95.04) (width 0.8) (layer B.Cu) (net 8) (status 20))
+  (segment (start 249.98 90.88) (end 252.52 90.88) (width 0.8) (layer B.Cu) (net 9) (status 30))
+  (segment (start 261.62 95.2) (end 264 97.58) (width 0.8) (layer B.Cu) (net 9) (status 20))
+  (segment (start 261.62 95.2) (end 261.6 95.2) (width 0.8) (layer B.Cu) (net 9))
+  (segment (start 260.82 94.4) (end 261.62 95.2) (width 0.8) (layer B.Cu) (net 9))
+  (segment (start 254 94.4) (end 260.82 94.4) (width 0.8) (layer B.Cu) (net 9))
+  (segment (start 252.52 92.92) (end 254 94.4) (width 0.8) (layer B.Cu) (net 9))
+  (segment (start 252.52 90.88) (end 252.52 92.92) (width 0.8) (layer B.Cu) (net 9) (status 10))
+  (segment (start 248.16 77.24) (end 248.2 77.2) (width 0.8) (layer B.Cu) (net 10) (status 30))
+  (segment (start 244.9 77.24) (end 248.16 77.24) (width 0.8) (layer B.Cu) (net 10) (status 30))
+  (segment (start 248.2 77.2) (end 249.98 75.42) (width 0.8) (layer B.Cu) (net 10) (status 10))
+  (segment (start 249.98 75.28) (end 249.98 72.9) (width 0.8) (layer B.Cu) (net 10) (status 20))
+  (segment (start 249.98 75.42) (end 249.98 75.28) (width 0.8) (layer B.Cu) (net 10))
+  (segment (start 257.6 71.7) (end 257.6 74) (width 0.8) (layer B.Cu) (net 10) (status 10))
+  (segment (start 256.32 75.28) (end 255.02 75.28) (width 0.8) (layer B.Cu) (net 10))
+  (segment (start 257.6 74) (end 256.32 75.28) (width 0.8) (layer B.Cu) (net 10))
+  (segment (start 255.02 75.28) (end 249.98 75.28) (width 0.8) (layer B.Cu) (net 10))
+  (segment (start 255.52 75.28) (end 255.02 75.28) (width 0.8) (layer B.Cu) (net 10))
+  (segment (start 247.44 89.94) (end 244.9 87.4) (width 0.8) (layer B.Cu) (net 11) (status 30))
+  (segment (start 247.44 90.88) (end 247.44 89.94) (width 0.8) (layer B.Cu) (net 11) (status 30))
+  (segment (start 241.7 74.2) (end 243 72.9) (width 0.8) (layer B.Cu) (net 11))
+  (segment (start 241.7 80.4) (end 241.7 74.2) (width 0.8) (layer B.Cu) (net 11))
+  (segment (start 243 72.9) (end 244.9 72.9) (width 0.8) (layer B.Cu) (net 11) (status 20))
+  (segment (start 240.6 83.7) (end 240.6 81.5) (width 0.8) (layer B.Cu) (net 11))
+  (segment (start 244.3 87.4) (end 240.6 83.7) (width 0.8) (layer B.Cu) (net 11) (status 10))
+  (segment (start 240.6 81.5) (end 241.7 80.4) (width 0.8) (layer B.Cu) (net 11))
+  (segment (start 244.9 87.4) (end 244.3 87.4) (width 0.8) (layer B.Cu) (net 11) (status 30))
+  (segment (start 229.7 100.96) (end 229.44 100.7) (width 0.8) (layer B.Cu) (net 12) (status 30))
+  (segment (start 229.7 104.56) (end 229.7 100.96) (width 0.8) (layer B.Cu) (net 12) (status 30))
+  (segment (start 232.24 117.8) (end 232.24 119.8) (width 0.8) (layer B.Cu) (net 13) (status 20))
+  (segment (start 227.4 118.4) (end 228.5 117.3) (width 0.8) (layer B.Cu) (net 13))
+  (segment (start 227.4 123.2) (end 227.4 118.4) (width 0.8) (layer B.Cu) (net 13))
+  (segment (start 231.2 127) (end 227.4 123.2) (width 0.8) (layer B.Cu) (net 13))
+  (segment (start 231.74 117.3) (end 232.24 117.8) (width 0.8) (layer B.Cu) (net 13))
+  (segment (start 231.2 130.8) (end 231.2 127) (width 0.8) (layer B.Cu) (net 13))
+  (segment (start 228.5 117.3) (end 231.74 117.3) (width 0.8) (layer B.Cu) (net 13))
+  (segment (start 233.5 133.1) (end 231.2 130.8) (width 0.8) (layer B.Cu) (net 13))
+  (segment (start 238.4 133.1) (end 233.5 133.1) (width 0.8) (layer B.Cu) (net 13))
+  (segment (start 240.5 131) (end 238.4 133.1) (width 0.8) (layer B.Cu) (net 13))
+  (segment (start 240.5 129.2) (end 240.5 131) (width 0.8) (layer B.Cu) (net 13) (status 10))
+  (segment (start 237.946 129.214) (end 237.946 130.054) (width 0.8) (layer B.Cu) (net 16) (status 30))
+  (segment (start 237.946 130.054) (end 236.2 131.8) (width 0.8) (layer B.Cu) (net 16) (status 10))
+  (segment (start 229.7 119.8) (end 229.7 123.3) (width 0.8) (layer B.Cu) (net 16) (status 10))
+  (segment (start 229.7 123.3) (end 232.6 126.2) (width 0.8) (layer B.Cu) (net 16))
+  (segment (start 232.6 126.2) (end 232.6 130.3) (width 0.8) (layer B.Cu) (net 16))
+  (segment (start 234.1 131.8) (end 236.2 131.8) (width 0.8) (layer B.Cu) (net 16))
+  (segment (start 232.6 130.3) (end 234.1 131.8) (width 0.8) (layer B.Cu) (net 16))
+  (segment (start 252.56 119.8) (end 252.56 122.86) (width 0.8) (layer B.Cu) (net 18) (status 10))
+  (via (at 252.56 122.86) (size 2) (drill 0.8) (layers F.Cu B.Cu) (net 18))
+  (segment (start 252.56 122.86) (end 237.96 122.86) (width 0.8) (layer F.Cu) (net 18))
+  (via (at 238 122.9) (size 2) (drill 0.8) (layers F.Cu B.Cu) (net 18))
+  (segment (start 237.96 122.86) (end 238 122.9) (width 0.8) (layer F.Cu) (net 18))
+  (segment (start 238 126.62) (end 237.946 126.674) (width 0.8) (layer B.Cu) (net 18) (status 30))
+  (segment (start 238 122.9) (end 238 126.62) (width 0.8) (layer B.Cu) (net 18) (status 20))
+  (segment (start 240.486 122.966) (end 237.32 119.8) (width 0.8) (layer B.Cu) (net 19) (status 20))
+  (segment (start 240.486 126.674) (end 240.486 122.966) (width 0.8) (layer B.Cu) (net 19) (status 10))
+  (segment (start 243.026 126.674) (end 243.026 123.926) (width 0.8) (layer B.Cu) (net 20) (status 10))
+  (segment (start 243.026 123.926) (end 241.2 122.1) (width 0.8) (layer B.Cu) (net 20))
+  (segment (start 241.06001 121.96001) (end 241.2 122.1) (width 0.4) (layer B.Cu) (net 20))
+  (segment (start 241.06001 118.06001) (end 241.06001 121.96001) (width 0.4) (layer B.Cu) (net 20))
+  (segment (start 241.06001 118.06001) (end 240.5 117.5) (width 0.8) (layer B.Cu) (net 20))
+  (segment (start 235.48 117.5) (end 234.78 118.2) (width 0.8) (layer B.Cu) (net 20))
+  (segment (start 240.5 117.5) (end 235.48 117.5) (width 0.8) (layer B.Cu) (net 20))
+  (segment (start 234.78 119.8) (end 234.78 118.2) (width 0.8) (layer B.Cu) (net 20) (status 10))
+  (segment (start 247.44 65.28) (end 249.98 65.28) (width 0.8) (layer B.Cu) (net 22) (status 30))
 
 )
diff --git a/hardware/MQTT_energy_meter.net b/hardware/MQTT_energy_meter.net
index 9aae521..0aaccf9 100644
--- a/hardware/MQTT_energy_meter.net
+++ b/hardware/MQTT_energy_meter.net
@@ -1,14 +1,14 @@
 (export (version D)
   (design
-    (source /home/marcel/Documenten/electronische_projecten/atmega328p_mqtt_energy_meter/MQTT_energy_meter/MQTT_energy_meter.sch)
-    (date "ma 02 jan 2023 15:23:33 CET")
+    (source /home/marcel/Documenten/electronische_projecten/atmega328p_mqtt_energy_meter/firmware/atmega328p_mqtt_energy_meter/hardware/MQTT_energy_meter.sch)
+    (date "di 10 jan 2023 21:21:15 CET")
     (tool "Eeschema 5.1.8-5.1.8")
     (sheet (number 1) (name /) (tstamps /)
       (title_block
         (title "MQTT ethernet energy meter")
         (company "M. Konstapel")
         (rev 1)
-        (date 2022-11-21)
+        (date 2023-01-02)
         (source MQTT_energy_meter.sch)
         (comment (number 1) (value meezenest.nl/mees))
         (comment (number 2) (value "Mees Electronics"))
@@ -554,7 +554,7 @@
       (node (ref R1) (pin 2))
       (node (ref U3) (pin 16))
       (node (ref C6) (pin 2))
-      (node (ref J1) (pin 2))
+      (node (ref J1) (pin 1))
       (node (ref U5) (pin 7))
       (node (ref U5) (pin 9))
       (node (ref U5) (pin 5))
@@ -580,7 +580,7 @@
       (node (ref D2) (pin 2)))
     (net (code 14) (name "Net-(C4-Pad1)")
       (node (ref U6) (pin 1))
-      (node (ref J1) (pin 1))
+      (node (ref J1) (pin 2))
       (node (ref C5) (pin 1))
       (node (ref C4) (pin 1)))
     (net (code 15) (name "Net-(U1-Pad1)")
diff --git a/hardware/MQTT_energy_meter.pdf b/hardware/MQTT_energy_meter.pdf
index fe4e692..6709aab 100644
Binary files a/hardware/MQTT_energy_meter.pdf and b/hardware/MQTT_energy_meter.pdf differ
diff --git a/hardware/MQTT_energy_meter.png b/hardware/MQTT_energy_meter.png
new file mode 100644
index 0000000..263bec4
Binary files /dev/null and b/hardware/MQTT_energy_meter.png differ
diff --git a/hardware/MQTT_energy_meter.sch b/hardware/MQTT_energy_meter.sch
index 66cbc22..7fa72f2 100644
--- a/hardware/MQTT_energy_meter.sch
+++ b/hardware/MQTT_energy_meter.sch
@@ -499,8 +499,8 @@ F 3 "" H 5250 2525 50  0001 C CNN
 $EndComp
 Wire Wire Line
 	5250 2525 5175 2525
-Text Notes 5575 2625 0    50   ~ 0
-Short this jumper\nto configure device\nvia serial port.
+Text Notes 4800 2650 0    50   ~ 0
+For future use.
 $Comp
 L Device:R_Small R4
 U 1 1 6385274C
@@ -648,13 +648,13 @@ Connection ~ 9125 1500
 $Comp
 L Connector:Conn_01x02_Male J1
 U 1 1 6392A12E
-P 7250 1500
-F 0 "J1" H 7358 1681 50  0000 C CNN
-F 1 "8-24V in" H 7275 1300 50  0000 C CNN
-F 2 "TerminalBlock_Phoenix:TerminalBlock_Phoenix_MKDS-1,5-2_1x02_P5.00mm_Horizontal" H 7250 1500 50  0001 C CNN
-F 3 "~" H 7250 1500 50  0001 C CNN
-	1    7250 1500
-	1    0    0    -1  
+P 7250 1600
+F 0 "J1" H 7250 1425 50  0000 C CNN
+F 1 "8-24V in" H 7275 1675 50  0000 C CNN
+F 2 "TerminalBlock_Phoenix:TerminalBlock_Phoenix_MKDS-1,5-2_1x02_P5.00mm_Horizontal" H 7250 1600 50  0001 C CNN
+F 3 "~" H 7250 1600 50  0001 C CNN
+	1    7250 1600
+	1    0    0    1   
 $EndComp
 Wire Wire Line
 	7450 1500 7725 1500
diff --git a/hardware/MQTT_energy_meter.sch-bak b/hardware/MQTT_energy_meter.sch-bak
index 4596f5a..f58cb6c 100644
--- a/hardware/MQTT_energy_meter.sch-bak
+++ b/hardware/MQTT_energy_meter.sch-bak
@@ -5,7 +5,7 @@ $Descr A4 11693 8268
 encoding utf-8
 Sheet 1 1
 Title "MQTT ethernet energy meter"
-Date "2022-11-21"
+Date "2023-01-02"
 Rev "1"
 Comp "M. Konstapel"
 Comment1 "meezenest.nl/mees"
@@ -499,8 +499,8 @@ F 3 "" H 5250 2525 50  0001 C CNN
 $EndComp
 Wire Wire Line
 	5250 2525 5175 2525
-Text Notes 5575 2625 0    50   ~ 0
-Short this jumper\nto configure device\nvia serial port.
+Text Notes 4800 2650 0    50   ~ 0
+For future use.
 $Comp
 L Device:R_Small R4
 U 1 1 6385274C
diff --git a/hardware/MQTT_energy_meter_3D_view.png b/hardware/MQTT_energy_meter_3D_view.png
new file mode 100644
index 0000000..23debaf
Binary files /dev/null and b/hardware/MQTT_energy_meter_3D_view.png differ