diff --git a/@Resources/Fonts/MaterialIcon.ttf b/@Resources/Fonts/MaterialIcon.ttf
index 1b97a04..eb9d35a 100644
Binary files a/@Resources/Fonts/MaterialIcon.ttf and b/@Resources/Fonts/MaterialIcon.ttf differ
diff --git a/@Resources/ModuleList.inc b/@Resources/ModuleList.inc
index 28414a8..dd9b869 100644
Binary files a/@Resources/ModuleList.inc and b/@Resources/ModuleList.inc differ
diff --git a/@Resources/Modules/Network/Include/Variables.inc b/@Resources/Modules/Network/Include/Variables.inc
new file mode 100644
index 0000000..775a461
--- /dev/null
+++ b/@Resources/Modules/Network/Include/Variables.inc
@@ -0,0 +1,6 @@
+[Variables]
+; vargen|Network Position|Network|int|0:#Body.Width#
+Module.Network.P=1060
+; vargen|Network Anchor [0/1/2]|Network|int|0:2
+Module.Network.A=2
+Module.Network.W=(2*#Body.Element#)
diff --git a/@Resources/Modules/Network/Network.inc b/@Resources/Modules/Network/Network.inc
new file mode 100644
index 0000000..90da6cf
--- /dev/null
+++ b/@Resources/Modules/Network/Network.inc
@@ -0,0 +1,65 @@
+[Variables]
+@IncludeNetworkVariables=#@#Modules\Network\Include\Variables.inc
+
+[Module.Network.StyleIconString]
+InlineSetting=Face | #Font.Icon#
+InlineSetting2=Size | #Font.IconS#
+InlineSetting3=Color | #Colour.2#,#Colour.2.Alpha#
+InlineSetting4=Color | 0,0,0,0
+InlinePattern4=Highlight
+InlineSetting5=CharacterSpacing | 0 | (-[#CurrentSection#:h]*0.75)
+InlinePattern5=Highlight
+StringAlign=CenterCenter
+Prefix=Highlight
+AntiAlias=1
+DynamicVariables=1
+
+[Module.Network.StyleInfoString]
+InlineSetting=Face | #Font.Display#
+InlineSetting2=Size | #Font.DisplayS#
+InlineSetting3=Color | #Colour.2#,#Colour.2.Alpha#
+StringAlign=CenterCenter
+AntiAlias=1
+DynamicVariables=1
+
+[Module.Network.ConnectivityReader]
+Measure=SysInfo
+SysInfoType=INTERNET_CONNECTIVITY
+SysInfoData=Best
+UpdateDivider=(1000/#UpdateInterval#)
+OnChangeAction=[!UpdateMeasureGroup Module.Network.calc][!UpdateMeterGroup Module.Network.Display][!Redraw]
+Substitute="-1":"NA","1":"OK"
+
+[Module.Network.NetworkIconS]
+Group=Module.Network.calc
+Measure=Calc
+Formula=(Module.Network.ConnectivityReader=-1?0:(Module.Network.ConnectivityReader=1?1:0))
+
+[Module.Network.Container]
+Meter=Image
+x=(#Body.Border#+#Module.Network.P#-(#Module.Network.A#*0.5)*#Module.Network.W#)
+y=((#Skin.Height#-#Body.Element#)/2)
+w=#Module.Network.W#
+h=#Body.Element#
+SolidColor=0,0,0
+DynamicVariables=1
+LeftMouseUpAction=[!CommandMeasure Main.PSRM "Update"][!WriteKeyValue Variables Parent.Position "([#CurrentSection#:x]+[#CurrentSection#:w]/2)" "#RootConfigPath#\PopUp\Network_PopUp.ini"][!ActivateConfig "#ROOTCONFIG#\PopUp" "Network_PopUp.ini"]
+
+[Module.Network.NetworkIcon]
+Group=module.Network.Display
+MeterStyle=Module.Network.StyleIconString
+Meter=String
+x=(#Body.Element#*0.5)
+y=(#Body.Element#*0.5)
+MeasureName=Module.Network.NetworkIconS
+Text=Network%1
+Container=Module.Network.Container
+
+[Module.Network.ConnectivityDisplay]
+Group=Module.Network.Display
+MeterStyle=Module.Network.StyleInfoString
+Meter=String
+x=(#Body.Element#*1.5)
+y=(#Body.Element#*0.5)
+MeasureName=Module.Network.ConnectivityReader
+Container=Module.Network.Container
diff --git a/@Resources/Modules/NowPlaying/Include/Variables.inc b/@Resources/Modules/NowPlaying/Include/Variables.inc
index 2ae2a13..70688d6 100644
Binary files a/@Resources/Modules/NowPlaying/Include/Variables.inc and b/@Resources/Modules/NowPlaying/Include/Variables.inc differ
diff --git a/@Resources/Modules/NowPlaying/NowPlaying.inc b/@Resources/Modules/NowPlaying/NowPlaying.inc
index 302eba8..6559bb0 100644
Binary files a/@Resources/Modules/NowPlaying/NowPlaying.inc and b/@Resources/Modules/NowPlaying/NowPlaying.inc differ
diff --git a/@Resources/Modules/Time/Include/Variables.inc b/@Resources/Modules/Time/Include/Variables.inc
index 31c9266..008f5ef 100644
--- a/@Resources/Modules/Time/Include/Variables.inc
+++ b/@Resources/Modules/Time/Include/Variables.inc
@@ -1,6 +1,9 @@
 [Variables]
 ; vargen|Time Position|Time|int|0:#Body.Width#
-Module.Time.P=1192
+Module.Time.P=1184
 ; vargen|Time Anchor [0/1/2]|Time|int|0:2
 Module.Time.A=2
-Module.Time.W=(2*#Body.Element#)
+; vargen|Time Format (See docs.rainmeter.net for Format Codes)|Time|string
+Module.Time.F=%H : %M
+
+Module.Time.W=[Module.Time.TimeDisplay:w]
diff --git a/@Resources/Modules/Time/Time.inc b/@Resources/Modules/Time/Time.inc
index 9a02e14..068e129 100644
--- a/@Resources/Modules/Time/Time.inc
+++ b/@Resources/Modules/Time/Time.inc
@@ -19,7 +19,7 @@ OnChangeAction=[!UpdateMeter Module.Time.TimeDisplay]
 
 [Module.Time.Time.HM]
 Measure=Time
-Format=%H : %M
+Format=#Module.Time.F#
 UpdateDivider=(5000/#UpdateInterval#)
 OnChangeAction=[!UpdateMeter Module.Time.TimeDisplay]
 
@@ -37,7 +37,7 @@ LeftMouseUpAction=[!CommandMeasure Main.PSRM "Update"][!WriteKeyValue Variables
 Group=Module.Time.Display
 MeterStyle=Module.Time.StyleInfoString
 Meter=String
-x=#Body.Element#
+x=(#Module.Time.W#/2)
 y=(#Body.Element#*12/24)
 MeasureName=Module.Time.Time.HM
 DynamicVariables=1
diff --git a/@Resources/Settings/Settings.ps1 b/@Resources/Settings/Settings.ps1
index bea456b..e8fd0b8 100644
--- a/@Resources/Settings/Settings.ps1
+++ b/@Resources/Settings/Settings.ps1
@@ -320,7 +320,7 @@ function SetInteractableData {
                 $RmAPI.Bang("!HideMeter `"`"`"Button.$i`"`"`" ")
                 $RmAPI.Bang("!SetOption Label.$i Text `"`"`"$($Data[$i]["Desc"])`"`"`" ")
                 $RmAPI.Bang("!SetOption Value.$i Text `"`"`"$($Data[$i]["Value"])`"`"`" ")
-                $RmAPI.Bang("!SetOption Value.$i LeftMouseUpAction `"`"`"[!SetOption InputText Command1 `"`"`"[!CommandMeasure $($RmAPI.GetMeasureName()) `"`"`"ValidateVariableInput $Page $i `"$($Data[$i]["Path"])`" `'$`UserInput$`' `"`"`"] y=([`*Value.$i`:y*]`+#*Padding*#) defaultvalue=$($Data[$i]["Value"]) `"`"`"][!UpdateMeasure InputText][!CommandMeasure InputText `"`"`"ExecuteBatch 1`"`"`"]`"`"`" ")
+                $RmAPI.Bang("!SetOption Value.$i LeftMouseUpAction `"`"`"[!SetOption InputText Command1 `"`"`"[!CommandMeasure $($RmAPI.GetMeasureName()) `"`"`"ValidateVariableInput $Page $i `"$($Data[$i]["Path"])`" `'$`UserInput$`' `"`"`"] y=([`*Value.$i`:y*]`+#*Padding*#) defaultvalue=`"$($Data[$i]["Value"])`" `"`"`"][!UpdateMeasure InputText][!CommandMeasure InputText `"`"`"ExecuteBatch 1`"`"`"]`"`"`" ")
             }
             $RmAPI.Bang("!UpdateMeterGroup `"`"`"Interactable`"`"`" ")
             $RmAPI.Bang("!Redraw")
@@ -362,7 +362,7 @@ function SetInteractableData {
                 $RmAPI.Bang("!HideMeter `"`"`"Button.$i`"`"`" ")
                 $RmAPI.Bang("!SetOption Label.$i Text `"`"`"$($Data[$i]["Desc"])`"`"`" ")
                 $RmAPI.Bang("!SetOption Value.$i Text `"`"`"$($Data[$i]["Value"])`"`"`" ")
-                $RmAPI.Bang("!SetOption Value.$i LeftMouseUpAction `"`"`"[!SetOption InputText Command1 `"`"`"[!CommandMeasure $($RmAPI.GetMeasureName()) `"`"`"ValidateVariableInput $Page $i `"$($Data[$i]["Path"])`" `'$`UserInput$`' `"`"`"] y=([`*Value.$i`:y*]`+#*Padding*#) defaultvalue=$($Data[$i]["Value"]) `"`"`"][!UpdateMeasure InputText][!CommandMeasure InputText `"`"`"ExecuteBatch 1`"`"`"]`"`"`" ")
+                $RmAPI.Bang("!SetOption Value.$i LeftMouseUpAction `"`"`"[!SetOption InputText Command1 `"`"`"[!CommandMeasure $($RmAPI.GetMeasureName()) `"`"`"ValidateVariableInput $Page $i `"$($Data[$i]["Path"])`" `'$`UserInput$`' `"`"`"] y=([`*Value.$i`:y*]`+#*Padding*#) defaultvalue=`"$($Data[$i]["Value"])`" `"`"`"][!UpdateMeasure InputText][!CommandMeasure InputText `"`"`"ExecuteBatch 1`"`"`"]`"`"`" ")
             }
             $RmAPI.Bang("!ShowMeter `"`"`"Setting.ButtonReturn`"`"`" ")
             $RmAPI.Bang("!SetOption `"`"`"Setting.ButtonReturn`"`"`" LeftMouseUpAction `"`"`"[!CommandMeasure $($RmAPI.GetMeasureName()) `"`"`"SetInteractableData Modules`"`"`"] `"`"`" ")
diff --git a/PopUp/Network_PopUp.ini b/PopUp/Network_PopUp.ini
new file mode 100644
index 0000000..243c253
--- /dev/null
+++ b/PopUp/Network_PopUp.ini
@@ -0,0 +1,136 @@
+[Rainmeter]
+SkinWidth=#Skin.Width#
+SkinHeight=#Skin.Height#
+Update=#UpdateInterval#
+DefaultUpdateDivider=-1
+AccurateText=1
+OnRefreshAction=[!CommandMeasure Main.ActionTimer "Stop 1" "#RootConfig#"][!Move "#Skin.X#" "#Skin.Y#"][!Update]
+MouseLeaveAction=[!CommandMeasure Main.ActionTimer "Execute 1" "#RootConfig#"]
+MouseOverAction=[!CommandMeasure Main.ActionTimer "Stop 1" "#RootConfig#"]
+DefaultAlwaysOnTop=-2
+
+[Variables]
+@IncludeVar=#@#variables.inc
+UpdateInterval=1000
+
+; Dicatates popup size
+Skin.Width=(#Body.Element#*10)
+Skin.Height=(#Body.Element#*2+#Body.Padding#*2)
+
+; Do not change
+Parent.Position=1031
+Skin.X=(clamp((#Body.X#+#Parent.Position#-#Skin.Width#/2),(#Body.X#),(#Body.X#+(#Body.Width#+2*#Body.Border#)-#Skin.Width#)))
+Skin.Y=(((#Body.Y#+#Body.Height#/2)<(#ScreenAreaHeight#/2)?(#Body.Y#+#Body.Height#+#Body.PopUp#+2*#Body.Border#):(#Body.Y#-#body.PopUp#-#Skin.Height#-2*#Body.Border#)))
+Format=(((#Format#=0?1:0)=0?1:0)=0?1:0)
+
+[Module.Network.StyleInfoString]
+h=#Body.Element#
+InlineSetting=Face | #Font.Display#
+InlineSetting2=Size | #Font.DisplayS#
+InlineSetting3=Color | #Colour.2#,#Colour.2.Alpha#
+Postfix=[\x00A0]
+AntiAlias=1
+DynamicVariables=1
+
+[Module.Network.StyleIconString]
+InlineSetting=Face | #Font.Icon#
+InlineSetting2=Size | #Font.IconS#
+InlineSetting3=Color | #Colour.2#,#Colour.2.Alpha#
+InlineSetting4=Color | 0,0,0,0
+InlinePattern4=Highlight
+InlineSetting5=CharacterSpacing | 0 | (-#Font.IconS#)
+InlinePattern5=Highlight
+StringAlign=CenterCenter
+Prefix=Highlight
+AntiAlias=1
+DynamicVariables=1
+
+[Module.Network.SsidReader]
+Measure=WifiStatus
+WifiInfoType=SSID
+UpdateDivider=(1000/#UpdateInterval#)
+OnChangeAction=[!UpdateMeasureGroup Module.Network.calc][!UpdateMeterGroup Module.Network.Display][!Redraw]
+Substitute="-1":""
+
+[Module.Network.TypeReader]
+Measure=SysInfo
+SysInfoType=ADAPTER_TYPE
+SysInfoData=Best
+UpdateDivider=(1000/#UpdateInterval#)
+OnChangeAction=[!UpdateMeasureGroup Module.Network.calc][!UpdateMeterGroup Module.Network.Display][!Redraw]
+
+[Module.Network.StateReader]
+Measure=SysInfo
+SysInfoType=ADAPTER_STATE
+SysInfoData=Best
+UpdateDivider=(1000/#UpdateInterval#)
+OnChangeAction=[!UpdateMeasureGroup Module.Network.calc][!UpdateMeterGroup Module.Network.Display][!Redraw]
+
+[Module.Network.ConnectivityReader]
+Measure=SysInfo
+SysInfoType=INTERNET_CONNECTIVITY
+SysInfoData=Best
+UpdateDivider=(1000/#UpdateInterval#)
+OnChangeAction=[!UpdateMeasureGroup Module.Network.calc][!UpdateMeterGroup Module.Network.Display][!Redraw]
+Substitute="-1":"but Offline","1":"and Online"
+
+[Module.Network.Border]
+Meter=Shape
+Shape=Rectangle 0,0,#Skin.Width#,#Skin.Height#,#Body.Corner# | StrokeWidth 0 | Fill Color #Colour.4#,#Colour.4.Alpha#
+
+[Module.Network.Background]
+Meter=Shape
+Shape=Rectangle #Body.Border#,#Body.Border#,(#Skin.Width#-#Body.Border#*2),(#Skin.Height#-#Body.Border#*2),#Body.Corner# | StrokeWidth 0 | Fill Color #Colour.1#,#Colour.1.Alpha#
+
+[Module.Network.SwitchIcon]
+MeterStyle=Module.Network.StyleIconString
+Meter=String
+x=(#Body.Padding#+#Body.Element#*0.5)
+y=(#Body.Padding#+#Body.Element#*0.5)
+w=#Body.Element#
+h=#Body.Element#
+Text=Switch
+DynamicVariables=1
+InlineSetting3=Color | #Colour.2#,(#Colour.2.Alpha#*0.25)
+
+[Module.Network.TypeDisplay]
+Group=Module.Network.Display
+MeterStyle=Module.Network.StyleInfoString
+Meter=String
+MeasureName=Module.Network.TypeReader
+x=(#Skin.Width#-#Body.Padding#)
+y=(#Body.Padding#+#Body.Element#*0.5)
+StringAlign=RightCenter
+
+[Module.Network.SsidDisplay]
+Group=Module.Network.Display
+MeterStyle=Module.Network.StyleInfoString
+Meter=String
+MeasureName=Module.Network.SsidReader
+x=-[Module.Network.TypeDisplay:w]r
+y=(#Body.Padding#+#Body.Element#*0.5)
+w=(#Skin.Width#-#Body.Padding#-[Module.Network.TypeDisplay:w]*1.5)
+StringAlign=RightCenter
+ClipString=1
+
+[Module.Network.EmptyIcon]
+MeterStyle=Module.Network.StyleIconString
+Meter=String
+x=(#Body.Padding#+#Body.Element#*0.5)
+y=(#Body.Padding#+#Body.Element#*1.5)
+w=#Body.Element#
+h=#Body.Element#
+Text=ItemEmpty
+DynamicVariables=1
+InlineSetting3=Color | #Colour.2#,(#Colour.2.Alpha#*0.25)
+
+[Module.Network.StateDisplay]
+Group=Module.Network.Display
+MeterStyle=Module.Network.StyleInfoString
+Meter=String
+MeasureName=Module.Network.StateReader
+MeasureName2=Module.Network.ConnectivityReader
+x=(#Skin.Width#-#Body.Padding#)
+y=(#Body.Padding#+#Body.Element#*1.5)
+StringAlign=RightCenter
+Text=%1 %2