diff --git a/README.md b/README.md
index 62ff025..c722003 100644
--- a/README.md
+++ b/README.md
@@ -64,6 +64,7 @@ Timeline (Versions):
 - 2023.07.16 New Icons for Oled Screen (Runner, Car, Jeep)
 - 2023.07.18 Add Support for triggering PTT to external amplifier.
 - 2023.07.24 New Validation for Callsings, Overlay change and New Icons (Bike, Motorcycle).
+- 2023.08.05 New Support for SH1106 Oled Screen (0,96" and 1.3")
 ____________________________________________________
 This code was based on the work by OE5BPA LoRa Tracker, Serge Y. Stroobandt, ON4AA in the byte-saving part of the APRS 434 firmware  and Manfred DC2MH (Mane76) with the mods for multiple Callsigns and processor speed.
 - https://github.com/aprs434/lora.tracker
diff --git a/data/tracker_config.json b/data/tracker_config.json
index 4ef444b..53437f8 100644
--- a/data/tracker_config.json
+++ b/data/tracker_config.json
@@ -1,7 +1,7 @@
 {
 	"beacons": [
 		{
-			"callsign": "CD2RXU-6",
+			"callsign": "CD2RXU-7",
 			"symbol": "[",
 			"overlay": "/",
 			"comment": "",
@@ -18,7 +18,7 @@
 			}
 		},
 		{
-			"callsign": "CD2RXU-6",
+			"callsign": "CD2RXU-7",
 			"symbol": ">",
 			"overlay": "/",
 			"comment": "",
@@ -35,7 +35,7 @@
 			}
 		},
 		{
-			"callsign": "CD2RXU-6",
+			"callsign": "CD2RXU-7",
 			"symbol": "j",
 			"overlay": "/",
 			"comment": "",
@@ -70,7 +70,8 @@
 		"maxDistanceToTracker": 30, 
 		"standingUpdateTime": 15,
 		"sendAltitude": true,
-		"sendBatteryInfo": false
+		"sendBatteryInfo": false,
+		"bluetooth": true
 	},
 	"ptt_trigger": {
 		"active": false,
diff --git a/platformio.ini b/platformio.ini
index cf83902..47e5b75 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -16,7 +16,6 @@ platform = espressif32 @ 6.3.1
 framework = arduino
 lib_ldf_mode = deep+
 monitor_speed = 115200
-upload_speed = 921600
 monitor_filters = esp32_exception_decoder
 lib_deps = 
 	adafruit/Adafruit BusIO@^1.14.1
@@ -37,14 +36,14 @@ check_flags =
 check_skip_packages = yes
 board_build.partitions = no_ota.csv
 
-[env:ttgo-t-beam-v1]
-board = ttgo-t-beam
-build_flags = -Werror -Wall -DTTGO_T_Beam_V1_0
-
 [env:ttgo-t-beam-v0_7]
 board = ttgo-t-beam
 build_flags = -Werror -Wall -DTTGO_T_Beam_V0_7
 
+[env:ttgo-t-beam-v1]
+board = ttgo-t-beam
+build_flags = -Werror -Wall -DTTGO_T_Beam_V1_0
+
 [env:ttgo-t-beam-v1_2]
 board = ttgo-t-beam
 build_flags = -Werror -Wall -DTTGO_T_Beam_V1_2
diff --git a/src/LoRa_APRS_Tracker.cpp b/src/LoRa_APRS_Tracker.cpp
index 540565f..2969d46 100644
--- a/src/LoRa_APRS_Tracker.cpp
+++ b/src/LoRa_APRS_Tracker.cpp
@@ -27,7 +27,7 @@ TinyGPSPlus                   gps;
 BluetoothSerial               SerialBT;
 OneButton userButton          = OneButton(BUTTON_PIN, true, true);
 
-String    versionDate         = "2023.08.04";
+String    versionDate         = "2023.08.05";
 
 int       myBeaconsIndex      = 0;
 int       myBeaconsSize       = Config.beacons.size();
diff --git a/src/configuration.cpp b/src/configuration.cpp
index 7b074fe..5d0c278 100644
--- a/src/configuration.cpp
+++ b/src/configuration.cpp
@@ -68,6 +68,8 @@ void Configuration::readFile(fs::FS &fs, const char *fileName) {
     standingUpdateTime            = data["other"]["standingUpdateTime"].as<int>();
     sendAltitude                  = data["other"]["sendAltitude"].as<bool>();
     sendBatteryInfo               = data["other"]["sendBatteryInfo"].as<bool>();
+    bluetooth                     = data["other"]["bluetooth"].as<bool>();
+    disableGps                    = data["other"]["disableGps"].as<bool>();
 
     configFile.close();
 }
diff --git a/src/configuration.h b/src/configuration.h
index ac62d32..0329c51 100644
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -58,6 +58,8 @@ public:
   int     standingUpdateTime;
   bool    sendAltitude;
   bool    sendBatteryInfo;
+  bool    bluetooth;
+  bool    disableGps;
 
   Configuration();
   void validateConfigFile(String currentBeaconCallsign);