diff --git a/Indicators/Connection/Connection.ini b/Indicators/Connection/Connection.ini
deleted file mode 100644
index c04f6ee..0000000
--- a/Indicators/Connection/Connection.ini
+++ /dev/null
@@ -1,39 +0,0 @@
-[Rainmeter]
-Update=1000
-BackgroundMode=1
-
-[Metadata]
-Name=Connection
-Author=mhatch
-Information=Indicates current status of network uplink.
-Version=1.0.0
-License=Creative Commons Attribution-Non-Commercial-Share Alike 4.0
-
-[Variables]
-@includeGlobal=#@#Styles\GlobalVariables.inc
-@include=#StylePath#StyleSheetVars.inc
-@include2=#StylePath#MeterStyles.inc
-
-@includeMeasures1="#ROOTCONFIGPATH#Indicators\Connection\ConnectionMeasures.inc"
-
-[MeterConnection]
-Meter=String
-MeasureName=MeasureConnection
-MeterStyle=StyleSmallerText
-X=0
-Y=0
-StringAlign=Left
-FontColor=#PrimaryColor#
-Text="OFFLINE"
-
-[MeterQualityText]
-Meter=String
-Group=MeterWiFi
-MeasureName=MeasureWiFiQuality
-MeterStyle=StyleSmallerText
-X=0
-Y=0
-StringAlign=Left
-FontColor=#PrimaryColor#
-Text=SIG:%1%
-Hidden=1
diff --git a/Indicators/Connection/ConnectionMeasures.inc b/Indicators/Connection/ConnectionMeasures.inc
deleted file mode 100644
index 1da3a35..0000000
--- a/Indicators/Connection/ConnectionMeasures.inc
+++ /dev/null
@@ -1,46 +0,0 @@
-; Determines whether the machine has an internet connection or not
-[MeasureNetwork]
-Measure=Plugin
-Plugin=WebParser.dll
-Url=http://www.msftncsi.com/ncsi.txt
-RegExp="^(.*)$"
-UpdateRate=30
-ForceReload=1
-StringIndex=1
-FinishAction=[!EnableMeasure MeasureConnection]
-
-; Has a value of 1 if uplink exists, else 0
-[MeasureConnection]
-Measure=Calc
-Formula=1
-Disabled=1
-IfEqualValue=1
-IfEqualAction=[!HideMeter MeterConnection][!EnableMeasureGroup MeasureWifi]
-IfBelowValue=1
-IfBelowAction=[!ShowMeter MeterConnection][!DisableMeasureGroup MeasureWifi]
-
-;[MeasureWiFiQuality]
-;Measure=Plugin
-;Group=MeasureWiFi
-;Plugin=WiFiStatus
-;WiFiInfoType=Quality
-;WiFiIntfID=#WiFiAdapterID#
-;IfAboveValue=0
-;IfAboveAction=[!ShowMeterGroup MeterWiFi]
-;IfEqualValue=0
-;IfEqualAction=[!HideMeterGroup MeterWiFi]
-;
-;[MeasureWiFiSSID]
-;Measure=Plugin
-;Group=MeasureWiFi
-;Plugin=WiFiStatus
-;WiFiInfoType=SSID
-;WiFiIntfID=#WiFiAdapterID#
-
-[MeasureWiFiQuality]
-Measure=Calc
-Group=MeasureWiFi
-Formula=20
-IfCondition=(MeasureWiFiQuality = 0)
-IfTrueAction=[!HideMeterGroup MeterWiFi]
-IfFalseAction=[!ShowMeterGroup MeterWiFi]
diff --git a/Indicators/Power/Power.ini b/Indicators/Power/Power.ini
deleted file mode 100644
index 6ef4753..0000000
--- a/Indicators/Power/Power.ini
+++ /dev/null
@@ -1,59 +0,0 @@
-[Rainmeter]
-Update=1000
-BackgroundMode=1
-
-[Metadata]
-Name=Power
-Author=mhatch
-Information=Indicates current status of power supply.
-Version=1.0.0
-License=Creative Commons Attribution-Non-Commercial-Share Alike 4.0
-
-[Variables]
-@includeGlobal=#@#Styles\GlobalVariables.inc
-@include=#StylePath#StyleSheetVars.inc
-@include2=#StylePath#MeterStyles.inc
-
-BatteryStatusColor=#ACColor#
-
-@includeMeasures1="#ROOTCONFIGPATH#Indicators\Power\PowerMeasures.inc"
-
-; Meters
-
-[MeterBatteryPercentText]
-Meter=String
-Group=BatteryMeters
-MeasureName=MeasureBatteryPercent
-MeterStyle=StyleSmallerText
-X=0
-Y=0
-FontColor=#PrimaryColor#
-Text=%1%
-
-[MeterBatteryLifeText]
-Meter=String
-Group=BatteryMeters
-MeasureName=MeasureBatteryLife
-MeterStyle=StyleSmallerText
-X=0
-Y=0R
-FontColor=#PrimaryColor#
-Text=%1
-
-[MeterBatteryStatusDebug]
-Meter=String
-Group=BatteryMeters
-MeasureName=MeasureBatteryStatus
-MeterStyle=StyleSmallerText
-X=0
-Y=0R
-FontColor=#PrimaryColor#
-
-[MeterBatteryACLineDebug]
-Meter=String
-Group=BatteryMeters
-MeasureName=MeasureBatteryACLine
-MeterStyle=StyleSmallerText
-X=0
-Y=0R
-FontColor=#PrimaryColor#
diff --git a/Indicators/Power/PowerMeasures.inc b/Indicators/Power/PowerMeasures.inc
deleted file mode 100644
index 530368f..0000000
--- a/Indicators/Power/PowerMeasures.inc
+++ /dev/null
@@ -1,39 +0,0 @@
-[MeasureBatteryPercent]
-Measure=Plugin
-Group=BatteryMeasures
-Plugin=PowerPlugin
-PowerState=Percent
-
-[MeasureBatteryLife]
-Measure=Plugin
-Group=BatteryMeasures
-Plugin=PowerPlugin
-PowerState=Lifetime
-Format=#BatteryLifetimeFormat#
-
-[MeasureBatteryACLine]
-Measure=Plugin
-Plugin=PowerPlugin
-PowerState=ACLine
-; Plugged in - disable battery monitoring
-IfEqualValue=1
-IfEqualAction=[!SetVariable BatteryStatusColor #ACLine#][!DisableMeasureGroup BatteryMeasures][!HideMeterGroup BatteryMeters]
-; Not plugged in - enable battery monitoring
-IfBelowValue=1
-IfBelowAction=[!EnableMeasureGroup BatteryMeasures][!ShowMeterGroup BatteryMeters]
-
-
-[MeasureBatteryStatus]
-Measure=Plugin
-Group=BatteryMeasures
-Plugin=PowerPlugin
-PowerState=Status
-; Battery high
-IfCondition=MeasureBatteryStatus = 4
-IfTrueAction=[!SetVariable BatteryStatusColor #BatteryNominalColor#]
-; Battery low
-IfCondition2=MeasureBatteryStatus = 3
-IfTrueAction2=[!SetVariable MeterBatteryBarGhost ImageTint #BatteryMidColor#]
-; Battery critical
-IfCondition3=MeasureBatteryStatus = 2
-IfTrueAction3=[!SetVariable #BatteryCriticalColor#]