diff --git a/ShiftOS/ShiftOSDesktop.vb b/ShiftOS/ShiftOSDesktop.vb
index d0e19ef..51ba848 100644
--- a/ShiftOS/ShiftOSDesktop.vb
+++ b/ShiftOS/ShiftOSDesktop.vb
@@ -2390,7 +2390,7 @@
         End If
     End Sub
 
-   
+
 
     Public Sub setuppanelbuttons()
         If boughtpanelbuttons Then
@@ -5214,21 +5214,23 @@
     End Sub
 
     Private Sub ApplicationsToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ApplicationsToolStripMenuItem.Click
-        If boughtadvapplauncher = False And Skins.useClassicAppLauncher = False Then 'Change false to true when the ability to buy the Advanced App Launcher from the Shiftnet is finished.
-            ApplicationsToolStripMenuItem.HideDropDown()
-            If pnladvapplauncher.Visible = False Then
-                pnladvapplauncher.Show()
-            Else
-                pnladvapplauncher.Hide()
-            End If
-            lbuser.Text = username
-            Select Case Skins.desktoppanelposition
-                Case "Top"
-                    pnladvapplauncher.Location = New Point(0, desktoppanel.Height)
-                Case "Bottom"
-                    pnladvapplauncher.Location = New Point(0, Me.Height - desktoppanel.Height - pnladvapplauncher.Height)
-            End Select
-            refreshIcons()
+        'boughtadvapplauncher = True
+        'Skins.useClassicAppLauncher = True
+        'If boughtadvapplauncher = False And Skins.useClassicAppLauncher = False Then 'Change false to true when the ability to buy the Advanced App Launcher from the Shiftnet is finished.
+        ApplicationsToolStripMenuItem.HideDropDown()
+        If pnladvapplauncher.Visible = False Then
+            pnladvapplauncher.Show()
+        Else
+            pnladvapplauncher.Hide()
         End If
+        lbuser.Text = username
+        Select Case Skins.desktoppanelposition
+            Case "Top"
+                pnladvapplauncher.Location = New Point(0, desktoppanel.Height)
+            Case "Bottom"
+                pnladvapplauncher.Location = New Point(0, Me.Height - desktoppanel.Height - pnladvapplauncher.Height)
+        End Select
+        refreshIcons()
+        'End If
     End Sub
 End Class
\ No newline at end of file
diff --git a/ShiftOS/skins.vb b/ShiftOS/skins.vb
index e2c4f24..b6cbd2d 100644
--- a/ShiftOS/skins.vb
+++ b/ShiftOS/skins.vb
@@ -420,13 +420,6 @@ Module Skins
             If loaddata(117) = "" Then startHeight = 526 Else startHeight = loaddata(117)
             If loaddata(118) = "" Then startWidth = 320 Else startWidth = loaddata(118)
             If loaddata(119) = "" Then shutdownstring = "Shut Down ShiftOS" Else shutdownstring = loaddata(119)
-<<<<<<< HEAD
-            If loaddata(120) = "" Then userNamePosition = "Middle, Right" Else userNamePosition = loaddata(120)
-            If loaddata(121) = "" Then recentIconsHorizontal = False Else recentIconsHorizontal = loaddata(121)
-            If loaddata(122) = "" Then usernametextcolor = Color.White Else usernametextcolor = Color.FromArgb(loaddata(122))
-            If loaddata(123) = "" Then usernamefont = "Trebuchet MS" Else usernamefont = loaddata(123)
-            If loaddata(124) = "" Then usernamefontsize = 12 Else usernamefontsize = loaddata(124)
-=======
             If loaddata(120) = "" Then userNamePosition = "Middle, Right" Else userNamePosition = loaddata(200)
             Try
                 If loaddata(121) = "" Then recentIconsHorizontal = False Else recentIconsHorizontal = loaddata(201)
@@ -439,7 +432,6 @@ Module Skins
                 recentIconsHorizontal = False
                 usernamefontsize = 12
             End Try
->>>>>>> origin/master
             If loaddata(125) = "" Then usernamefontstyle = FontStyle.Bold Else usernamefontstyle = loaddata(125)
             If loaddata(126) = "" Then userNamePanelBackgroundColor = Color.Gray Else userNamePanelBackgroundColor = Color.FromArgb(loaddata(126))
             If loaddata(127) = "" Then powerPanelBackgroundColor = Color.Gray Else powerPanelBackgroundColor = Color.FromArgb(loaddata(127))