diff --git a/SEN0395_distance.h b/SEN0395_distance.h
deleted file mode 100644
index b74e80a..0000000
--- a/SEN0395_distance.h
+++ /dev/null
@@ -1,102 +0,0 @@
-#include "esphome.h"
-#include <string>
-
-class Sen0395Distance : public Component, public UARTDevice {
-public:
-  Sen0395Distance(UARTComponent *parent) : UARTDevice(parent) {}
-
-  float t_snr[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-  float t_distance[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-  bool t_active[10] = {false, false, false, false, false, false, false, false, false, false};
-
-  void setup() override {
-    // nothing to do here
-  }
-
-  int readline(int readch, char *buffer, int len) {
-    static int pos = 0;
-    int rpos;
-
-    if (readch > 0) {
-      switch (readch) {
-        case '\n': // Ignore new-lines
-          break;
-        case '\r': // Return on CR
-          rpos = pos;
-          pos = 0; // Reset position index ready for next time
-          return rpos;
-        default:
-          if (pos < len - 1) {
-            buffer[pos++] = readch;
-            buffer[pos] = 0;
-          }
-      }
-    }
-    // No end of line has been found, so return -1.
-    return -1;
-  }
-
-  void loop() override {
-    const int max_line_length = 40;
-    static char buffer[max_line_length];
-
-    while (available()) {
-      if (readline(read(), buffer, max_line_length) >= 4) {
-        std::string line = buffer;
-
-        if (line.substr(0, 6) == "$JYRPO") {
-          std::string vline = line.substr(6);
-          std::vector<std::string> v;
-          for (int i = 0; i < vline.length(); i++) {
-            if (vline[i] == ',') {
-              v.push_back("");
-            } else {
-              v.back() += vline[i];
-            }
-          }
-          int target_count = parse_number<int>(v[0]).value();
-          int target_index = parse_number<int>(v[1]).value();
-          float target_distance = parse_number<float>(v[2]).value();
-          float target_snr = parse_number<float>(v[4]).value();
-
-          // Update the SNR, distance, and active status for the current target index
-          t_snr[target_index] = target_snr;
-          t_distance[target_index] = target_distance;
-          t_active[target_index] = true;
-
-          if (target_count == target_index) {
-            // Publish the data for each target without sorting
-            for (int i = 1; i <= target_count; i++) {
-              auto get_sensors = App.get_sensors();
-              for (int j = 0; j < get_sensors.size(); j++) {
-                std::string name = get_sensors[j]->get_name();
-                if (name == "Target " + std::to_string(i) + " Distance") {
-                  get_sensors[j]->publish_state(t_distance[i]);
-                } else if (name == "Target " + std::to_string(i) + " SNR") {
-                  get_sensors[j]->publish_state(t_snr[i]);
-                }
-              }
-            }
-
-            // Publish the state of the binary sensor for each target
-            for (int i = 1; i <= 10; i++) {
-              auto get_binary_sensors = App.get_binary_sensors();
-              for (int j = 0; j < get_binary_sensors.size(); j++) {
-                std::string name = get_binary_sensors[j]->get_name();
-                if (name == "Target " + std::to_string(i) + " Active") {
-                  get_binary_sensors[j]->publish_state(t_active[i]);
-                }
-              }
-            }
-
-            for (int i = target_count + 1; i <= 9; i++) {
-              t_active[i] = false;
-            }
-
-            //ESP_LOGD("custom", "Target %d Distance: %f, SNR: %f", i, t_distance[i], t_snr[i]);
-          }
-        }
-      }
-    }
-  }
-};
\ No newline at end of file
diff --git a/components/SEN0395/SEN0395_distance.h b/components/SEN0395/SEN0395_distance.h
deleted file mode 100644
index 1cce15c..0000000
--- a/components/SEN0395/SEN0395_distance.h
+++ /dev/null
@@ -1,102 +0,0 @@
-#include "esphome.h"
-#include <string>
-
-class Sen0395Distance : public Component, public UARTDevice {
-public:
-  Sen0395Distance(UARTComponent *parent) : UARTDevice(parent) {}
-
-  float t_snr[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-  float t_distance[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-  bool t_active[10] = {false, false, false, false, false, false, false, false, false, false};
-
-  void setup() override {
-    // nothing to do here
-  }
-
-  int readline(int readch, char *buffer, int len) {
-    static int pos = 0;
-    int rpos;
-
-    if (readch > 0) {
-      switch (readch) {
-        case '\n': // Ignore new-lines
-          break;
-        case '\r': // Return on CR
-          rpos = pos;
-          pos = 0; // Reset position index ready for next time
-          return rpos;
-        default:
-          if (pos < len - 1) {
-            buffer[pos++] = readch;
-            buffer[pos] = 0;
-          }
-      }
-    }
-    // No end of line has been found, so return -1.
-    return -1;
-  }
-
-  void loop() override {
-    const int max_line_length = 40;
-    static char buffer[max_line_length];
-
-    while (available()) {
-      if (readline(read(), buffer, max_line_length) >= 4) {
-        std::string line = buffer;
-
-        if (line.substr(0, 6) == "$JYRPO") {
-          std::string vline = line.substr(6);
-          std::vector<std::string> v;
-          for (int i = 0; i < vline.length(); i++) {
-            if (vline[i] == ',') {
-              v.push_back("");
-            } else {
-              v.back() += vline[i];
-            }
-          }
-          int target_count = parse_number<int>(v[0]).value();
-          int target_index = parse_number<int>(v[1]).value();
-          float target_distance = parse_number<float>(v[2]).value();
-          float target_snr = parse_number<float>(v[4]).value();
-
-          // Update the SNR, distance, and active status for the current target index
-          t_snr[target_index] = target_snr;
-          t_distance[target_index] = target_distance;
-          t_active[target_index] = true;
-
-          if (target_count == target_index) {
-            // Publish the data for each target without sorting
-            for (int i = 1; i <= target_count; i++) {
-              auto get_sensors = App.get_sensors();
-              for (int j = 0; j < get_sensors.size(); j++) {
-                std::string name = get_sensors[j]->get_name();
-                if (name == "Target " + std::to_string(i) + " Distance") {
-                  get_sensors[j]->publish_state(t_distance[i]);
-                } else if (name == "Target " + std::to_string(i) + " SNR") {
-                  get_sensors[j]->publish_state(t_snr[i]);
-                }
-              }
-            }
-
-            // Publish the state of the binary sensor for each target
-            for (int i = 1; i <= 10; i++) {
-              auto get_binary_sensors = App.get_binary_sensors();
-              for (int j = 0; j < get_binary_sensors.size(); j++) {
-                std::string name = get_binary_sensors[j]->get_name();
-                if (name == "Target " + std::to_string(i) + " Active") {
-                  get_binary_sensors[j]->publish_state(t_active[i]);
-                }
-              }
-            }
-
-            for (int i = target_count + 1; i <= 9; i++) {
-              t_active[i] = false;
-            }
-
-            //ESP_LOGD("custom", "Target %d Distance: %f, SNR: %f", i, t_distance[i], t_snr[i]);
-          }
-        }
-      }
-    }
-  }
-};
diff --git a/components/SEN0395/__init__.py b/components/SEN0395/__init__.py
deleted file mode 100644
index 314b9fa..0000000
--- a/components/SEN0395/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-#__init__.py
diff --git a/components/SEN0395_distance.h b/components/SEN0395_distance.h
deleted file mode 100644
index 1cce15c..0000000
--- a/components/SEN0395_distance.h
+++ /dev/null
@@ -1,102 +0,0 @@
-#include "esphome.h"
-#include <string>
-
-class Sen0395Distance : public Component, public UARTDevice {
-public:
-  Sen0395Distance(UARTComponent *parent) : UARTDevice(parent) {}
-
-  float t_snr[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-  float t_distance[10] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
-  bool t_active[10] = {false, false, false, false, false, false, false, false, false, false};
-
-  void setup() override {
-    // nothing to do here
-  }
-
-  int readline(int readch, char *buffer, int len) {
-    static int pos = 0;
-    int rpos;
-
-    if (readch > 0) {
-      switch (readch) {
-        case '\n': // Ignore new-lines
-          break;
-        case '\r': // Return on CR
-          rpos = pos;
-          pos = 0; // Reset position index ready for next time
-          return rpos;
-        default:
-          if (pos < len - 1) {
-            buffer[pos++] = readch;
-            buffer[pos] = 0;
-          }
-      }
-    }
-    // No end of line has been found, so return -1.
-    return -1;
-  }
-
-  void loop() override {
-    const int max_line_length = 40;
-    static char buffer[max_line_length];
-
-    while (available()) {
-      if (readline(read(), buffer, max_line_length) >= 4) {
-        std::string line = buffer;
-
-        if (line.substr(0, 6) == "$JYRPO") {
-          std::string vline = line.substr(6);
-          std::vector<std::string> v;
-          for (int i = 0; i < vline.length(); i++) {
-            if (vline[i] == ',') {
-              v.push_back("");
-            } else {
-              v.back() += vline[i];
-            }
-          }
-          int target_count = parse_number<int>(v[0]).value();
-          int target_index = parse_number<int>(v[1]).value();
-          float target_distance = parse_number<float>(v[2]).value();
-          float target_snr = parse_number<float>(v[4]).value();
-
-          // Update the SNR, distance, and active status for the current target index
-          t_snr[target_index] = target_snr;
-          t_distance[target_index] = target_distance;
-          t_active[target_index] = true;
-
-          if (target_count == target_index) {
-            // Publish the data for each target without sorting
-            for (int i = 1; i <= target_count; i++) {
-              auto get_sensors = App.get_sensors();
-              for (int j = 0; j < get_sensors.size(); j++) {
-                std::string name = get_sensors[j]->get_name();
-                if (name == "Target " + std::to_string(i) + " Distance") {
-                  get_sensors[j]->publish_state(t_distance[i]);
-                } else if (name == "Target " + std::to_string(i) + " SNR") {
-                  get_sensors[j]->publish_state(t_snr[i]);
-                }
-              }
-            }
-
-            // Publish the state of the binary sensor for each target
-            for (int i = 1; i <= 10; i++) {
-              auto get_binary_sensors = App.get_binary_sensors();
-              for (int j = 0; j < get_binary_sensors.size(); j++) {
-                std::string name = get_binary_sensors[j]->get_name();
-                if (name == "Target " + std::to_string(i) + " Active") {
-                  get_binary_sensors[j]->publish_state(t_active[i]);
-                }
-              }
-            }
-
-            for (int i = target_count + 1; i <= 9; i++) {
-              t_active[i] = false;
-            }
-
-            //ESP_LOGD("custom", "Target %d Distance: %f, SNR: %f", i, t_distance[i], t_snr[i]);
-          }
-        }
-      }
-    }
-  }
-};
diff --git a/components/__init__.py b/components/__init__.py
deleted file mode 100644
index 8b13789..0000000
--- a/components/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/static/images/sen0395.png b/static/images/sen0395.png
new file mode 100644
index 0000000..70dca85
Binary files /dev/null and b/static/images/sen0395.png differ
diff --git a/static/images/sen0609.png b/static/images/sen0609.png
new file mode 100644
index 0000000..958d075
Binary files /dev/null and b/static/images/sen0609.png differ
diff --git a/static/updating.md b/static/updating.md
index 8f94687..c0e76ad 100644
--- a/static/updating.md
+++ b/static/updating.md
@@ -50,7 +50,32 @@ After clicking the "Connect" button, if you do not see a "USB Serial" port liste
         </label>
     </div>
 
-    <!-- Firmware Type Selection for Home Assistant -->
+    <div id="sensorModelOptions" class="hidden">
+        <div class="question-prompt">Select Your mmWave Sensor Model:</div>
+        <div class="types">
+            <label>
+                <input type="radio" name="sensorModel" value="DFRobot SEN0395" />
+                <div class="option-content">
+                    <img src="images/sen0395.png" alt="DFRobot SEN0395" class="option-image">
+                    <div>
+                        <div class="title">DFRobot SEN0395</div>
+                        <div class="description">Select this option if you are using the DFRobot SEN0395 sensor (6 Pin).</div>
+                    </div>
+                </div>
+            </label>
+            <label>
+                <input type="radio" name="sensorModel" value="DFRobot SEN0609" />
+                <div class="option-content">
+                    <img src="images/sen0609.png" alt="DFRobot SEN0609" class="option-image">
+                    <div>
+                        <div class="title">DFRobot SEN0609</div>
+                        <div class="description">Select this option if you are using the DFRobot SEN0609 sensor (5 Pin).</div>
+                    </div>
+                </div>
+            </label>
+        </div>
+    </div>
+
     <div id="homeAssistantOptions" class="hidden">
         <div class="question-prompt">Select Firmware Type:</div>
         <div class="types">
@@ -73,13 +98,12 @@ After clicking the "Connect" button, if you do not see a "USB Serial" port liste
         </div>
     </div>
 
-    <!-- Firmware Version Selection for Home Assistant -->
     <div id="firmwareVersionOptions" class="hidden">
         <div class="question-prompt">Select Firmware Version:</div>
         <div class="types">
             <label>
                 <input type="radio" name="firmwareVersion" value="Stable" />
-                <img src="images/stable-logo.png" alt="BLE Logo" class="option-image">
+                <img src="images/stable-logo.png" alt="Stable Logo" class="option-image">
                 <div>
                     <div class="title">Stable</div>
                     <div class="description">Choose this for a stable version of the firmware.</div>
@@ -87,7 +111,7 @@ After clicking the "Connect" button, if you do not see a "USB Serial" port liste
             </label>
             <label>
                 <input type="radio" name="firmwareVersion" value="Beta" />
-                <img src="images/beta-logo.png" alt="BLE Logo" class="option-image">
+                <img src="images/beta-logo.png" alt="Beta Logo" class="option-image">
                 <div>
                     <div class="title">Beta</div>
                     <div class="description">The Beta release includes target tracking and distance zones. Do not use unless you are comfortable with troubleshooting and reporting bugs.</div>
@@ -114,111 +138,109 @@ With the EP1 fully updated and connected to WiFi, the final step is to connect i
 
 <script
   type="module"
-  src="https://unpkg.com/esp-web-tools@9.0.3/dist/web/install-button.js?module"
+  src="https://unpkg.com/esp-web-tools@10/dist/web/install-button.js?module"
 ></script>
 
-<script>
-const toggleDarkMode = document.querySelector('.js-toggle-dark-mode');
-
-jtd.addEvent(toggleDarkMode, 'click', function(){
-  if (jtd.getTheme() === 'dark') {
-    jtd.setTheme('light');
-    toggleDarkMode.textContent = 'Preview dark color scheme';
-  } else {
-    jtd.setTheme('dark');
-    toggleDarkMode.textContent = 'Return to the light side';
-  }
-});
-</script>
-
 <script>
 document.addEventListener("DOMContentLoaded", function() {
-
-  function clearSelectedOption(groupSelector) {
-        document.querySelectorAll(groupSelector + ' label').forEach(label => {
-            label.classList.remove('selected-option');
-        });
-    }
-
-    function handleRadioButtonChange(event, groupSelector) {
-        clearSelectedOption(groupSelector);
-        event.target.closest('label').classList.add('selected-option');
-    }
-
     const homeAssistantOptions = document.getElementById("homeAssistantOptions");
+    const sensorModelOptions = document.getElementById("sensorModelOptions");
     const firmwareVersionOptions = document.getElementById("firmwareVersionOptions");
     const summary = document.getElementById("summary");
     const installButton = document.querySelector("esp-web-install-button");
 
     function clearAndHideOptions() {
         homeAssistantOptions.classList.add("hidden");
+        sensorModelOptions.classList.add("hidden");
         firmwareVersionOptions.classList.add("hidden");
         summary.classList.add("hidden");
         installButton.classList.add("hidden");
     }
 
-    
+    function handleRadioButtonChange(event, groupSelector) {
+        document.querySelectorAll(groupSelector + ' label').forEach(label => {
+            label.classList.remove('selected-option');
+        });
+        event.target.closest('label').classList.add('selected-option');
+    }
+
     document.querySelectorAll('input[name="platform"]').forEach(radio => {
         radio.addEventListener("change", function() {
-          handleRadioButtonChange(event, '.types');
+            handleRadioButtonChange(event, '.types');
             clearAndHideOptions();
-            const selectedPlatform = this.value;
-            if (selectedPlatform === "Home Assistant") {
-                homeAssistantOptions.classList.remove("hidden");
-            } else if (selectedPlatform === "Smartthings") {
-                updateSummary("Smartthings", "Stable");
+            if (this.value === "Home Assistant") {
+                sensorModelOptions.classList.remove("hidden");
+            } else if (this.value === "Smartthings") {
+                updateSummary("Smartthings", "", "Stable");
             }
         });
     });
 
-    
+    document.querySelectorAll('input[name="sensorModel"]').forEach(radio => {
+        radio.addEventListener("change", function() {
+            handleRadioButtonChange(event, '#sensorModelOptions .types');
+            homeAssistantOptions.classList.remove("hidden");
+        });
+    });
+
     document.querySelectorAll('input[name="haOption"]').forEach(radio => {
         radio.addEventListener("change", function() {
-            firmwareVersionOptions.classList.remove("hidden");
             handleRadioButtonChange(event, '#homeAssistantOptions .types');
+            firmwareVersionOptions.classList.remove("hidden");
         });
     });
 
-    
     document.querySelectorAll('input[name="firmwareVersion"]').forEach(radio => {
         radio.addEventListener("change", function() {
-          handleRadioButtonChange(event, '#firmwareVersionOptions .types');
+            handleRadioButtonChange(event, '#firmwareVersionOptions .types');
             const selectedVersion = this.value;
             const selectedOption = document.querySelector('input[name="haOption"]:checked').value;
-            updateSummary("Home Assistant", `${selectedOption} - ${selectedVersion}`);
+            const selectedSensorModel = document.querySelector('input[name="sensorModel"]:checked').value;
+            updateSummary("Home Assistant", selectedSensorModel, `${selectedOption} - ${selectedVersion}`);
         });
     });
-    
-    function updateSummary(platform, firmware) {
+
+    function updateSummary(platform, sensorModel, firmware) {
         document.getElementById("summaryPlatform").textContent = "Platform: " + platform;
-        document.getElementById("summarySensor").textContent = "";
+        document.getElementById("summarySensor").textContent = "Sensor Model: " + sensorModel;
         document.getElementById("summaryOption").textContent = "Firmware: " + firmware;
         summary.classList.remove("hidden");
 
         installButton.classList.remove("hidden");
-        
-        
-        let manifestUrl = "";
-        if (platform === "Home Assistant") {
-            if (firmware == "Bluetooth - Stable") {
+
+        let manifestUrl = determineManifestUrl(platform, sensorModel, firmware);
+        installButton.setAttribute("manifest", manifestUrl);
+    }
+
+    function determineManifestUrl(platform, sensorModel, firmware) {
+    let manifestUrl = "";
+    if (platform === "Home Assistant") {
+        if (sensorModel === "DFRobot SEN0395") {
+            if (firmware === "Bluetooth - Stable") {
                 manifestUrl = "https://everythingsmarthome.github.io/everything-presence-one/everything-presence-one-ble-manifest.json";
-            } else if (firmware == "Bluetooth - Beta") {
+            } else if (firmware === "Bluetooth - Beta") {
                 manifestUrl = "https://everythingsmarthome.github.io/everything-presence-one/everything-presence-one-ha-ble-beta-manifest.json";
-            } else if (firmware == "No-Bluetooth - Stable") {
+            } else if (firmware === "No-Bluetooth - Stable") {
                 manifestUrl = "https://everythingsmarthome.github.io/everything-presence-one/everything-presence-one-manifest.json";
-            } else if (firmware == "No-Bluetooth - Beta") {
+            } else if (firmware === "No-Bluetooth - Beta") {
                 manifestUrl = "https://everythingsmarthome.github.io/everything-presence-one/everything-presence-one-ha-beta-manifest.json";
             }
-        } else if (platform === "Smartthings") {
-            
-            manifestUrl = "https://everythingsmarthome.github.io/everything-presence-one/everything-presence-one-st-manifest.json";
+        } else if (sensorModel === "DFRobot SEN0609") {
+            if (firmware === "Bluetooth - Stable") {
+                manifestUrl = "https://everythingsmarthome.github.io/everything-presence-one/everything-presence-one-sen0609-ble-manifest.json";
+            } else if (firmware === "No-Bluetooth - Stable") {
+                manifestUrl = "https://everythingsmarthome.github.io/everything-presence-one/everything-presence-one-sen0609-manifest.json";
+            } else if (firmware === "Bluetooth - Beta") {
+                manifestUrl = "https://everythingsmarthome.github.io/everything-presence-one/everything-presence-one-sen0609-ble-manifest.json";
+            } else if (firmware === "No-Bluetooth - Beta") {
+                manifestUrl = "https://everythingsmarthome.github.io/everything-presence-one/everything-presence-one-sen0609-manifest.json";
+            }
         }
-        installButton.setAttribute("manifest", manifestUrl);
+    } else if (platform === "Smartthings") {
+        manifestUrl = "https://everythingsmarthome.github.io/everything-presence-one/everything-presence-one-st-manifest.json";
     }
-});
+    return manifestUrl;
+}
 
-document.getElementById("advancedSensorsDivider").addEventListener("click", function() {
-    var advancedSensors = document.getElementById("advancedSensors");
-    advancedSensors.classList.toggle("hidden");
 });
 </script>