diff --git a/config/packages/network.yaml b/config/packages/network.yaml
index 50c05aa2..808419fa 100755
--- a/config/packages/network.yaml
+++ b/config/packages/network.yaml
@@ -75,7 +75,7 @@ group:
       - sensor.ha_uptime
       - sensor.since_last_boot_templated
       - sensor.disk_use_percent_
-      - sensor.database_sensor
+      - sensor.homeassistant_v2db
       - sensor.speedtest_download
       - sensor.speedtest_upload
       - binary_sensor.carlowink
@@ -141,6 +141,7 @@ group:
       - device_tracker.stacey
       - device_tracker.study_ap
       - device_tracker.tablotv
+      - device_tracker.tesla_powerwall
       - device_tracker.unifi_ap_office
       - device_tracker.wii
       - device_tracker.withings_scale
diff --git a/config/packages/powerwall.yaml b/config/packages/powerwall.yaml
index 20e57004..dd9a394f 100755
--- a/config/packages/powerwall.yaml
+++ b/config/packages/powerwall.yaml
@@ -4,6 +4,18 @@
 # Original Repo : https://github.com/CCOSTAN/Home-AssistantConfig
 ######################################################################################################
 
+#-------------------------------------------
+group:
+  Power:
+    entities:
+      - sensor.powerwall_battery_capacity
+      - sensor.powerwall_battery_now
+      - sensor.grid_now
+      - sensor.house_now
+      - sensor.solar_now
+      - camera.grafana_solar_graph
+#-------------------------------------------
+
 sensor:
 
   - platform: rest
@@ -47,16 +59,6 @@ sensor:
     unit_of_measurement: W
 
 #-------------------------------------------
-group:
-  Power:
-    entities:
-      - sensor.powerwall_battery_capacity
-      - sensor.powerwall_battery_now
-      - sensor.grid_now
-      - sensor.house_now
-      - sensor.solar_now
-      - camera.grafana_solar_graph
-#-------------------------------------------
 
 #
 # automation:
diff --git a/config/script/tweet.yaml b/config/script/tweet.yaml
index d5409ddf..a5dcda8f 100755
--- a/config/script/tweet.yaml
+++ b/config/script/tweet.yaml
@@ -47,7 +47,7 @@ tweet_engine_setup:
                 "When you add it all up, I have spoken for about {{ states.sensor.speech_time.attributes.value|replace('m', '') }} minutes in the last 24 hours!",
                 "The #Docker Host has been running for {{ states('sensor.since_last_boot_templated') }} (http://www.vmwareinfo.com/2018/02/journey-to-docker.html)",
                 "The #Docker Host for Home Assistant is using {{ states('sensor.disk_use_percent_') }}% of the hard drive currently. (http://www.vmwareinfo.com/2018/02/journey-to-docker.html)",
-                "My Home Assistant Database is currently using {{ states('sensor.database_sensor') }} MBs. I will have to keep an eye on that.",
+                "My Home Assistant Database is currently using {{ states(' sensor.homeassistant_v2db') }} MBs. I will have to keep an eye on that.",
                 "I am running Home Assistant version {{ states('sensor.ha_installed_version') }} (https://github.com/CCOSTAN/Home-AssistantConfig#logo)",
                 "Home Assistant has been running for {{ states('sensor.ha_uptime') }}. (https://github.com/CCOSTAN/Home-AssistantConfig#logo)",
                 "My Home Assistant has been tested by Travis-CI and {{states('sensor.ccostanhomeassistantconfig_state')}}. (https://github.com/CCOSTAN/Home-AssistantConfig#logo)",