diff --git a/.gitignore b/.gitignore
index 68305eb..e660fd9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,17 +1 @@
-.storage/
 bin/
-custom_components/
-themes/
-tts/
-www/
-.google.token
-.spotify-token-cache
-*.db
-*.db-journal
-*.log
-*.tile.conf
-config/secrets.yaml
-google_calendars.yaml
-known_devices.yaml
-webostv.conf
-zigbee.db
diff --git a/config/.gitignore b/config/.gitignore
new file mode 100644
index 0000000..99b4e97
--- /dev/null
+++ b/config/.gitignore
@@ -0,0 +1,15 @@
+custom_components/
+.google.token
+.spotify-token-cache
+.storage/
+google_calendars.yaml
+known_devices.yaml
+secrets.yaml
+themes/
+tts/
+webostv.conf
+zigbee.db
+*.db
+*.db-journal
+*.log
+*.tile.conf
diff --git a/config/configuration.yaml b/config/configuration.yaml
index 2c9551f..52b3ed5 100644
--- a/config/configuration.yaml
+++ b/config/configuration.yaml
@@ -65,9 +65,14 @@ lovelace:
     lovelace-yaml:
       mode: yaml
       title: YAML
-      icon: mdi:script
-      show_in_sidebar: true
+      icon: mdi:home
       filename: ui-lovelace.yaml
+    lovelace-floorlan:
+      mode: yaml
+      title: Floorplan
+      icon: mdi:map
+      show_in_sidebar: true
+      filename: floorplan-lovelace.yaml
 
 # https://www.home-assistant.io/components/logbook
 logbook:
diff --git a/config/floorplan-lovelace.yaml b/config/floorplan-lovelace.yaml
new file mode 100644
index 0000000..601f5c6
--- /dev/null
+++ b/config/floorplan-lovelace.yaml
@@ -0,0 +1,117 @@
+custom_header:
+  hide_header: true
+  hide_config: true
+  hide_help: true
+  hide_unused: true
+
+decluttering_templates: !include_dir_merge_named lovelace/templates
+
+title: Floorplan
+views:
+  - title: Floorplan
+    path: floorplan
+    panel: true
+    icon: mdi:floor-plan
+    cards:
+      - type: picture-elements
+        image: /local/images/floorplan/floorplan_night.jpg
+        elements:
+          # Lighting Overlays
+          - type: conditional
+            conditions:
+              - entity: light.pc
+                state: "on"
+              - entity: light.living_room_main_lights
+                state: "off"
+            elements:
+              - type: image
+                image: /local/images/floorplan/living_room_pc_light.png
+                tap_action: none
+                hold_action: none
+                style:
+                  top: 71.04%
+                  left: 65.65%
+                  width: 40.08%
+          - type: conditional
+            conditions:
+              - entity: light.pc
+                state: "off"
+              - entity: light.living_room_main_lights
+                state: "on"
+            elements:
+              - type: image
+                image: /local/images/floorplan/living_room_main_lights.png
+                tap_action: none
+                hold_action: none
+                style:
+                  top: 71.04%
+                  left: 65.65%
+                  width: 40.08%
+          - type: conditional
+            conditions:
+              - entity: light.pc
+                state: "on"
+              - entity: light.living_room_main_lights
+                state: "on"
+            elements:
+              - type: image
+                image: /local/images/floorplan/living_room_all_lights.png
+                tap_action: none
+                hold_action: none
+                style:
+                  top: 71.04%
+                  left: 65.65%
+                  width: 40.08%
+
+          - type: image
+            entity: light.pc
+            tap_action:
+              action: toggle
+            image: /local/images/floorplan/transparent.png
+            style:
+              top: 71%
+              left: 77.8%
+          - type: image
+            entity: light.living_room_main_lights
+            tap_action:
+              action: toggle
+            image: /local/images/floorplan/transparent.png
+            style:
+              top: 69.8%
+              left: 64.8%
+              width: 5%
+              height: 2%
+
+          - type: state-icon
+            entity: binary_sensor.bedroom_right_window_on_off_wrapper
+            style:
+              top: 35%
+              left: 82.3%
+              transform: scaleX(-1)
+              border-radius: 50%
+              text-align: center
+              background-color: rgba(0, 0, 0, 0.6)
+              --paper-item-icon-active-color: "#ff0000"
+
+          - type: state-label
+            entity: sensor.bedroom_weather_temperature
+            style:
+              top: 38%
+              left: 69.5%
+              color: "#000"
+              border-radius: 50%
+              text-align: center
+              background-color: "rgba(255, 255, 255, 0.3)"
+              font-size: 14px
+              font-weight: bold
+
+          - type: state-icon
+            entity: binary_sensor.living_room_right_window_on_off_wrapper
+            style:
+              top: 73.2%
+              left: 82.3%
+              transform: scaleX(-1)
+              border-radius: 50%
+              text-align: center
+              background-color: rgba(0, 0, 0, 0.6)
+              --paper-item-icon-active-color: "#ff0000"
diff --git a/config/www/images/floorplan/bedroom_bedside_light.png b/config/www/images/floorplan/bedroom_bedside_light.png
new file mode 100644
index 0000000..87dbfcf
Binary files /dev/null and b/config/www/images/floorplan/bedroom_bedside_light.png differ
diff --git a/config/www/images/floorplan/floorplan_night.jpg b/config/www/images/floorplan/floorplan_night.jpg
new file mode 100644
index 0000000..d8dd9cd
Binary files /dev/null and b/config/www/images/floorplan/floorplan_night.jpg differ
diff --git a/config/www/images/floorplan/living_room_all_lights.png b/config/www/images/floorplan/living_room_all_lights.png
new file mode 100644
index 0000000..e5df167
Binary files /dev/null and b/config/www/images/floorplan/living_room_all_lights.png differ
diff --git a/config/www/images/floorplan/living_room_main_lights.png b/config/www/images/floorplan/living_room_main_lights.png
new file mode 100644
index 0000000..2957c15
Binary files /dev/null and b/config/www/images/floorplan/living_room_main_lights.png differ
diff --git a/config/www/images/floorplan/living_room_pc_light.png b/config/www/images/floorplan/living_room_pc_light.png
new file mode 100644
index 0000000..3aad49d
Binary files /dev/null and b/config/www/images/floorplan/living_room_pc_light.png differ
diff --git a/config/www/images/floorplan/transparent.png b/config/www/images/floorplan/transparent.png
new file mode 100644
index 0000000..c95d974
Binary files /dev/null and b/config/www/images/floorplan/transparent.png differ