diff --git a/Arduino/AfterBurner/Afterburner.ino b/Arduino/AfterBurner/Afterburner.ino
index baf4af5..3216672 100644
--- a/Arduino/AfterBurner/Afterburner.ino
+++ b/Arduino/AfterBurner/Afterburner.ino
@@ -100,10 +100,10 @@
 #include "src/Utility/DebugPort.h"
 #include "src/Utility/UtilClasses.h"
 #include "src/Utility/BTC_JSON.h"
-#include "src/Utility/GPIO.h"
+#include "src/Utility/RTC_GPIO.h"
 #include "src/Utility/BoardDetect.h"
 #include "src/OLED/ScreenManager.h"
-#include "src/OLED/keypad.h"
+#include "src/OLED/KeyPad.h"
 #include "src/Utility/TempSense.h"
 #include <rom/rtc.h>
 #include <esp_spiffs.h>
diff --git a/README.md b/README.md
index 122d21f..afa12d8 100644
--- a/README.md
+++ b/README.md
@@ -61,6 +61,7 @@ To be implemented
 * MQTT pub/sub 
 * "fuel gauge" - Integrate pump frequency, assuming a repeatable dose of fuel per pump cycle...
 * Regular Hot Burn cycle (DPF mode!)
+* Hour meter - run time, glow time
 * list under construction.....
 
 Suggestions
diff --git a/src/Afterburner/Afterburner.cpp b/src/Afterburner/Afterburner.cpp
index baf4af5..2a27bb2 100644
--- a/src/Afterburner/Afterburner.cpp
+++ b/src/Afterburner/Afterburner.cpp
@@ -100,10 +100,10 @@
 #include "src/Utility/DebugPort.h"
 #include "src/Utility/UtilClasses.h"
 #include "src/Utility/BTC_JSON.h"
-#include "src/Utility/GPIO.h"
+#include "src/Utility/BTC_GPIO.h"
 #include "src/Utility/BoardDetect.h"
 #include "src/OLED/ScreenManager.h"
-#include "src/OLED/keypad.h"
+#include "src/OLED/KeyPad.h"
 #include "src/Utility/TempSense.h"
 #include <rom/rtc.h>
 #include <esp_spiffs.h>
diff --git a/src/Afterburner/src/Bluetooth/BluetoothAbstract.h b/src/Afterburner/src/Bluetooth/BluetoothAbstract.h
index 702544a..afdc47d 100644
--- a/src/Afterburner/src/Bluetooth/BluetoothAbstract.h
+++ b/src/Afterburner/src/Bluetooth/BluetoothAbstract.h
@@ -24,7 +24,7 @@
 
 #include <Arduino.h>
 #include "../Utility/UtilClasses.h"
-#include "../Utility/Debugport.h"
+#include "../Utility/DebugPort.h"
 #include "../Utility/helpers.h"
 
 class CProtocol;
diff --git a/src/Afterburner/src/Bluetooth/BluetoothESP32.cpp b/src/Afterburner/src/Bluetooth/BluetoothESP32.cpp
index 96b9b87..0a1697e 100644
--- a/src/Afterburner/src/Bluetooth/BluetoothESP32.cpp
+++ b/src/Afterburner/src/Bluetooth/BluetoothESP32.cpp
@@ -23,7 +23,7 @@
 #include "../cfg/pins.h"
 #include "../cfg/BTCConfig.h"
 #include "../Protocol/Protocol.h"
-#include "../Utility/debugport.h"
+#include "../Utility/DebugPort.h"
 #include "BluetoothESP32.h"
 
 
diff --git a/src/Afterburner/src/Libraries/Adafruit-GFX-Library/Adafruit_GFX.h b/src/Afterburner/src/Libraries/Adafruit-GFX-Library/Adafruit_GFX.h
index 96f347f..0432079 100644
--- a/src/Afterburner/src/Libraries/Adafruit-GFX-Library/Adafruit_GFX.h
+++ b/src/Afterburner/src/Libraries/Adafruit-GFX-Library/Adafruit_GFX.h
@@ -2,10 +2,10 @@
 #define _ADAFRUIT_GFX_H
 
 #if ARDUINO >= 100
- #include "Arduino.h"
- #include "Print.h"
+ #include <Arduino.h>
+ #include <Print.h>
 #else
- #include "WProgram.h"
+ #include <WProgram.h>
 #endif
 #include "gfxfont.h"
 
diff --git a/src/Afterburner/src/Libraries/PubSubClient/src/PubSubClient.cpp b/src/Afterburner/src/Libraries/PubSubClient/src/PubSubClient.cpp
index ff9a914..592b024 100644
--- a/src/Afterburner/src/Libraries/PubSubClient/src/PubSubClient.cpp
+++ b/src/Afterburner/src/Libraries/PubSubClient/src/PubSubClient.cpp
@@ -5,7 +5,7 @@
 */
 
 #include "PubSubClient.h"
-#include "Arduino.h"
+#include <Arduino.h>
 
 PubSubClient::PubSubClient() {
     this->_state = MQTT_DISCONNECTED;
diff --git a/src/Afterburner/src/Libraries/PubSubClient/tests/src/lib/Buffer.cpp_ b/src/Afterburner/src/Libraries/PubSubClient/tests/src/lib/Buffer.cpp_
index f07759a..656f7dd 100644
--- a/src/Afterburner/src/Libraries/PubSubClient/tests/src/lib/Buffer.cpp_
+++ b/src/Afterburner/src/Libraries/PubSubClient/tests/src/lib/Buffer.cpp_
@@ -1,5 +1,5 @@
 #include "Buffer.h"
-#include "Arduino.h"
+#include <Arduino.h>
 
 Buffer::Buffer() {
     this->pos = 0;
diff --git a/src/Afterburner/src/Libraries/PubSubClient/tests/src/lib/Buffer.h b/src/Afterburner/src/Libraries/PubSubClient/tests/src/lib/Buffer.h
index f448cad..4d46caa 100644
--- a/src/Afterburner/src/Libraries/PubSubClient/tests/src/lib/Buffer.h
+++ b/src/Afterburner/src/Libraries/PubSubClient/tests/src/lib/Buffer.h
@@ -1,7 +1,7 @@
 #ifndef buffer_h
 #define buffer_h
 
-#include "Arduino.h"
+#include <Arduino.h>
 
 class Buffer {
 private:
diff --git a/src/Afterburner/src/Libraries/PubSubClient/tests/src/lib/ShimClient.h b/src/Afterburner/src/Libraries/PubSubClient/tests/src/lib/ShimClient.h
index 2e3f874..17fc61a 100644
--- a/src/Afterburner/src/Libraries/PubSubClient/tests/src/lib/ShimClient.h
+++ b/src/Afterburner/src/Libraries/PubSubClient/tests/src/lib/ShimClient.h
@@ -1,7 +1,7 @@
 #ifndef shimclient_h
 #define shimclient_h
 
-#include "Arduino.h"
+#include <Arduino.h>
 #include "Client.h"
 #include "IPAddress.h"
 #include "Buffer.h"
diff --git a/src/Afterburner/src/Libraries/PubSubClient/tests/src/lib/Stream.h b/src/Afterburner/src/Libraries/PubSubClient/tests/src/lib/Stream.h
index 4e41f86..a488d2d 100644
--- a/src/Afterburner/src/Libraries/PubSubClient/tests/src/lib/Stream.h
+++ b/src/Afterburner/src/Libraries/PubSubClient/tests/src/lib/Stream.h
@@ -1,7 +1,7 @@
 #ifndef Stream_h
 #define Stream_h
 
-#include "Arduino.h"
+#include <Arduino.h>
 #include "Buffer.h"
 
 class Stream {
diff --git a/src/Afterburner/src/Libraries/esp32-ds18b20/ds18b20.c b/src/Afterburner/src/Libraries/esp32-ds18b20/ds18b20.c
index cb1b393..31203b3 100644
--- a/src/Afterburner/src/Libraries/esp32-ds18b20/ds18b20.c
+++ b/src/Afterburner/src/Libraries/esp32-ds18b20/ds18b20.c
@@ -38,8 +38,8 @@
 #include <stdint.h>
 #include <math.h>
 
-#include "freertos/FreeRTOS.h"
-#include "freertos/task.h"
+#include "FreeRTOS/FreeRTOS.h"
+#include "FreeRTOS/task.h"
 #include "driver/gpio.h"
 #include "esp_system.h"
 #include "esp_log.h"
diff --git a/src/Afterburner/src/Libraries/esp32-owb/owb.c b/src/Afterburner/src/Libraries/esp32-owb/owb.c
index 8591a63..37eed43 100644
--- a/src/Afterburner/src/Libraries/esp32-owb/owb.c
+++ b/src/Afterburner/src/Libraries/esp32-owb/owb.c
@@ -33,8 +33,8 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "freertos/FreeRTOS.h"
-#include "freertos/task.h"
+#include "FreeRTOS/FreeRTOS.h"
+#include "FreeRTOS/task.h"
 #include "esp_log.h"
 #include "sdkconfig.h"
 #include "driver/gpio.h"
diff --git a/src/Afterburner/src/Libraries/esp32-owb/owb_rmt.h b/src/Afterburner/src/Libraries/esp32-owb/owb_rmt.h
index f203dc7..f755110 100644
--- a/src/Afterburner/src/Libraries/esp32-owb/owb_rmt.h
+++ b/src/Afterburner/src/Libraries/esp32-owb/owb_rmt.h
@@ -27,9 +27,9 @@
 #ifndef OWB_RMT_H
 #define OWB_RMT_H
 
-#include "freertos/FreeRTOS.h"
-#include "freertos/queue.h"
-#include "freertos/ringbuf.h"
+#include "FreeRTOS/FreeRTOS.h"
+#include "FreeRTOS/queue.h"
+#include "FreeRTOS/ringbuf.h"
 #include "driver/rmt.h"
 
 #ifdef __cplusplus
diff --git a/src/Afterburner/src/Libraries/esp32-sh1106-oled/Adafruit_SH1106.h b/src/Afterburner/src/Libraries/esp32-sh1106-oled/Adafruit_SH1106.h
index 3e3479b..efd0393 100644
--- a/src/Afterburner/src/Libraries/esp32-sh1106-oled/Adafruit_SH1106.h
+++ b/src/Afterburner/src/Libraries/esp32-sh1106-oled/Adafruit_SH1106.h
@@ -17,10 +17,10 @@ All text above, and the splash screen must be included in any redistribution
 *********************************************************************/
 
 #if ARDUINO >= 100
- #include "Arduino.h"
+ #include <Arduino.h>
  #define WIRE_WRITE Wire.write
 #else
- #include "WProgram.h"
+ #include <WProgram.h>
   #define WIRE_WRITE Wire.send
 #endif
 
diff --git a/src/Afterburner/src/Libraries/esp32FOTA/src/esp32fota.cpp b/src/Afterburner/src/Libraries/esp32FOTA/src/esp32fota.cpp
index d3c1765..df30883 100644
--- a/src/Afterburner/src/Libraries/esp32FOTA/src/esp32fota.cpp
+++ b/src/Afterburner/src/Libraries/esp32FOTA/src/esp32fota.cpp
@@ -6,7 +6,7 @@
 */
 
 #include "esp32fota.h"
-#include "Arduino.h"
+#include <Arduino.h>
 #include <WiFi.h>
 #include <HTTPClient.h>
 #include <Update.h>
diff --git a/src/Afterburner/src/Libraries/esp32FOTA/src/esp32fota.h b/src/Afterburner/src/Libraries/esp32FOTA/src/esp32fota.h
index 2955d7c..685c875 100644
--- a/src/Afterburner/src/Libraries/esp32FOTA/src/esp32fota.h
+++ b/src/Afterburner/src/Libraries/esp32FOTA/src/esp32fota.h
@@ -8,7 +8,7 @@
 #ifndef esp32fota_h
 #define esp32fota_h
 
-#include "Arduino.h"
+#include <Arduino.h>
 
 class esp32FOTA
 {
diff --git a/src/Afterburner/src/OLED/BasicScreen.cpp b/src/Afterburner/src/OLED/BasicScreen.cpp
index 588f1e0..099f4ab 100644
--- a/src/Afterburner/src/OLED/BasicScreen.cpp
+++ b/src/Afterburner/src/OLED/BasicScreen.cpp
@@ -20,8 +20,8 @@
  */
 
 #include "128x64OLED.h"
-#include "fonts/tahoma16.h"
-#include "fonts/tahoma24.h"
+#include "fonts/Tahoma16.h"
+#include "fonts/Tahoma24.h"
 #include "fonts/Icons.h"
 #include "BasicScreen.h"
 #include "KeyPad.h"
diff --git a/src/Afterburner/src/OLED/FuelMixtureScreen.cpp b/src/Afterburner/src/OLED/FuelMixtureScreen.cpp
index dbf73df..ae9d6bc 100644
--- a/src/Afterburner/src/OLED/FuelMixtureScreen.cpp
+++ b/src/Afterburner/src/OLED/FuelMixtureScreen.cpp
@@ -32,7 +32,7 @@
 #include "KeyPad.h"
 #include "../Utility/helpers.h"
 #include "../WiFi/BTCWifi.h"
-#include "../Utility/debugPort.h"
+#include "../Utility/DebugPort.h"
 #include "../Utility/macros.h"
 #include "../Protocol/Protocol.h"
 
diff --git a/src/Afterburner/src/OLED/GPIOScreen.cpp b/src/Afterburner/src/OLED/GPIOScreen.cpp
index 3c1d039..451eebd 100644
--- a/src/Afterburner/src/OLED/GPIOScreen.cpp
+++ b/src/Afterburner/src/OLED/GPIOScreen.cpp
@@ -25,7 +25,7 @@
 #include "../Utility/helpers.h"
 #include "../Utility/UtilClasses.h"
 #include "../Utility/NVStorage.h"
-#include "../Utility/GPIO.h"
+#include "../Utility/BTC_GPIO.h"
 #include "fonts/Icons.h"
 
 extern CGPIOout GPIOout;
diff --git a/src/Afterburner/src/OLED/GPIOScreen.h b/src/Afterburner/src/OLED/GPIOScreen.h
index 1c58547..fdcceb5 100644
--- a/src/Afterburner/src/OLED/GPIOScreen.h
+++ b/src/Afterburner/src/OLED/GPIOScreen.h
@@ -24,7 +24,7 @@
 
 #include <stdint.h>
 #include "PasswordScreen.h"
-#include "../Utility/GPIO.h"
+#include "../Utility/BTC_GPIO.h"
 
 class C128x64_OLED;
 class CScreenManager;
diff --git a/src/Afterburner/src/OLED/HomeMenuSelScreen.cpp b/src/Afterburner/src/OLED/HomeMenuSelScreen.cpp
index 3924e15..7bc1c0d 100644
--- a/src/Afterburner/src/OLED/HomeMenuSelScreen.cpp
+++ b/src/Afterburner/src/OLED/HomeMenuSelScreen.cpp
@@ -25,7 +25,7 @@
 #include "../Utility/helpers.h"
 #include "../Utility/UtilClasses.h"
 #include "../Utility/NVStorage.h"
-#include "../Utility/GPIO.h"
+#include "../Utility/BTC_GPIO.h"
 #include "fonts/Icons.h"
 
 
diff --git a/src/Afterburner/src/OLED/keypad.cpp b/src/Afterburner/src/OLED/KeyPad.cpp
similarity index 100%
rename from src/Afterburner/src/OLED/keypad.cpp
rename to src/Afterburner/src/OLED/KeyPad.cpp
diff --git a/src/Afterburner/src/OLED/keypad.h b/src/Afterburner/src/OLED/KeyPad.h
similarity index 100%
rename from src/Afterburner/src/OLED/keypad.h
rename to src/Afterburner/src/OLED/KeyPad.h
diff --git a/src/Afterburner/src/OLED/OtherOptionsScreen.cpp b/src/Afterburner/src/OLED/OtherOptionsScreen.cpp
index 7d9c1c0..43a51e5 100644
--- a/src/Afterburner/src/OLED/OtherOptionsScreen.cpp
+++ b/src/Afterburner/src/OLED/OtherOptionsScreen.cpp
@@ -25,7 +25,7 @@
 #include "../Utility/helpers.h"
 #include "../Utility/UtilClasses.h"
 #include "../Utility/NVStorage.h"
-#include "../Utility/GPIO.h"
+#include "../Utility/BTC_GPIO.h"
 #include "fonts/Icons.h"
 
 
diff --git a/src/Afterburner/src/OLED/ScreenManager.cpp b/src/Afterburner/src/OLED/ScreenManager.cpp
index 35656b8..9c94d78 100644
--- a/src/Afterburner/src/OLED/ScreenManager.cpp
+++ b/src/Afterburner/src/OLED/ScreenManager.cpp
@@ -42,7 +42,7 @@
 #include <Wire.h>
 #include "../cfg/pins.h"
 #include "../cfg/BTCConfig.h"
-#include "keypad.h"
+#include "KeyPad.h"
 #include "fonts/Icons.h"
 #include "fonts/MiniFont.h"
 #include "fonts/MidiFont.h"
diff --git a/src/Afterburner/src/OLED/VersionInfoScreen.cpp b/src/Afterburner/src/OLED/VersionInfoScreen.cpp
index 9ea25ee..8c56c60 100644
--- a/src/Afterburner/src/OLED/VersionInfoScreen.cpp
+++ b/src/Afterburner/src/OLED/VersionInfoScreen.cpp
@@ -25,7 +25,7 @@
 #include "../Utility/helpers.h"
 #include "../Utility/UtilClasses.h"
 #include "../Utility/NVStorage.h"
-#include "../Utility/GPIO.h"
+#include "../Utility/BTC_GPIO.h"
 #include "../WiFi/BTCWifi.h"
 #include "../Utility/BoardDetect.h"
 #include "fonts/Icons.h"
diff --git a/src/Afterburner/src/OLED/fonts/Tahoma16.c b/src/Afterburner/src/OLED/fonts/Tahoma16.c
index 371bc76..07ae5e0 100644
--- a/src/Afterburner/src/OLED/fonts/Tahoma16.c
+++ b/src/Afterburner/src/OLED/fonts/Tahoma16.c
@@ -29,7 +29,7 @@
 /////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-#include "tahoma16.h"
+#include "Tahoma16.h"
 
 // Character bitmaps for Tahoma 16pt
 const uint8_t tahoma_16ptBitmaps[] PROGMEM =
diff --git a/src/Afterburner/src/OLED/fonts/Tahoma24.c b/src/Afterburner/src/OLED/fonts/Tahoma24.c
index ab0eb07..064db1a 100644
--- a/src/Afterburner/src/OLED/fonts/Tahoma24.c
+++ b/src/Afterburner/src/OLED/fonts/Tahoma24.c
@@ -29,7 +29,7 @@
 /////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-#include "tahoma24.h"
+#include "Tahoma24.h"
 
 // Character bitmaps for Tahoma 24pt
 const uint8_t tahoma_24ptBitmaps [] PROGMEM = 
diff --git a/src/Afterburner/src/Utility/GPIO.cpp b/src/Afterburner/src/Utility/BTC_GPIO.cpp
similarity index 99%
rename from src/Afterburner/src/Utility/GPIO.cpp
rename to src/Afterburner/src/Utility/BTC_GPIO.cpp
index 2d04a75..70b946c 100644
--- a/src/Afterburner/src/Utility/GPIO.cpp
+++ b/src/Afterburner/src/Utility/BTC_GPIO.cpp
@@ -19,8 +19,8 @@
  * 
  */
 
-#include "GPIO.h"
-#include "../Utility/helpers.h"
+#include "BTC_GPIO.h"
+#include "helpers.h"
 #include <driver/adc.h>
 #include "DebugPort.h"
 #include "../Protocol/Protocol.h"
diff --git a/src/Afterburner/src/Utility/GPIO.h b/src/Afterburner/src/Utility/BTC_GPIO.h
similarity index 100%
rename from src/Afterburner/src/Utility/GPIO.h
rename to src/Afterburner/src/Utility/BTC_GPIO.h
diff --git a/src/Afterburner/src/Utility/debugport.h b/src/Afterburner/src/Utility/DebugPort.h
similarity index 100%
rename from src/Afterburner/src/Utility/debugport.h
rename to src/Afterburner/src/Utility/DebugPort.h
diff --git a/src/Afterburner/src/Utility/Moderator.h b/src/Afterburner/src/Utility/Moderator.h
index 685f42a..e93d4a4 100644
--- a/src/Afterburner/src/Utility/Moderator.h
+++ b/src/Afterburner/src/Utility/Moderator.h
@@ -26,7 +26,7 @@
 #include "../Libraries/ArduinoJson/ArduinoJson.h"
 #include "../RTC/Timers.h"
 #include "DebugPort.h"
-#include "GPIO.h"
+#include "BTC_GPIO.h"
 
 
 class CTimerModerator {
diff --git a/src/Afterburner/src/Utility/NVStorage.h b/src/Afterburner/src/Utility/NVStorage.h
index d0452c6..a5dcbc1 100644
--- a/src/Afterburner/src/Utility/NVStorage.h
+++ b/src/Afterburner/src/Utility/NVStorage.h
@@ -22,7 +22,7 @@
 #ifndef __BTC_NV_STORAGE_H__
 #define __BTC_NV_STORAGE_H__
 
-#include "GPIO.h"
+#include "BTC_GPIO.h"
 #include "NVCore.h"
 #include "../Utility/helpers.h"
 
diff --git a/src/Afterburner/src/WiFi/ABmqtt.h b/src/Afterburner/src/WiFi/ABmqtt.h
index 65dc582..9b9d339 100644
--- a/src/Afterburner/src/WiFi/ABmqtt.h
+++ b/src/Afterburner/src/WiFi/ABmqtt.h
@@ -4,16 +4,16 @@
 #define _ABMQTT_h
 
 #if defined(ARDUINO) && ARDUINO >= 100
-	#include "arduino.h"
+	#include <Arduino.h>
 #else
-	#include "WProgram.h"
+	#include <WProgram.h>
 #endif
 
 
 #endif
 
 
-#include <PubSubClient.h>
+#include "../Libraries/PubSubClient/src/PubSubClient.h"
 #include "BTCWifi.h""
 #include "BTCWebServer.h"
 
diff --git a/src/Afterburner/src/WiFi/BTCWebServer.cpp b/src/Afterburner/src/WiFi/BTCWebServer.cpp
index ce198d0..779c67b 100644
--- a/src/Afterburner/src/WiFi/BTCWebServer.cpp
+++ b/src/Afterburner/src/WiFi/BTCWebServer.cpp
@@ -28,7 +28,7 @@
 #include "../Utility/helpers.h"
 #include "../cfg/pins.h"
 #include "../cfg/BTCConfig.h"
-#include "Index.h"
+//#include "Index.h"
 #include "../Utility/BTC_JSON.h"
 #include "../Utility/Moderator.h"
 #include "../Libraries/WiFiManager-dev/WiFiManager.h"
diff --git a/src/Afterburner/src/WiFi/BTCWebServer.h b/src/Afterburner/src/WiFi/BTCWebServer.h
index 3aec2c8..16b7e4f 100644
--- a/src/Afterburner/src/WiFi/BTCWebServer.h
+++ b/src/Afterburner/src/WiFi/BTCWebServer.h
@@ -26,9 +26,9 @@
 #define _BTCWEBSERVER_h
 
 #if defined(ARDUINO) && ARDUINO >= 100
-	#include "arduino.h"
+	#include <Arduino.h>
 #else
-	#include "WProgram.h"
+	#include <WProgram.h>
 #endif
 
 #include "BTCWifi.h"
diff --git a/src/Libraries/AsyncTCP.zip b/src/Libraries/AsyncTCP.zip
deleted file mode 100644
index a85b6b1..0000000
Binary files a/src/Libraries/AsyncTCP.zip and /dev/null differ
diff --git a/src/Libraries/ESPAsyncWebServer.zip b/src/Libraries/ESPAsyncWebServer.zip
deleted file mode 100644
index f11d6a2..0000000
Binary files a/src/Libraries/ESPAsyncWebServer.zip and /dev/null differ
diff --git a/src/Libraries/WiFiManager.zip b/src/Libraries/WiFiManager.zip
deleted file mode 100644
index d3cb0e3..0000000
Binary files a/src/Libraries/WiFiManager.zip and /dev/null differ