diff --git a/Library/DialogManage.cpp b/Library/DialogManage.cpp
index 2f35dba3..2519abb7 100644
--- a/Library/DialogManage.cpp
+++ b/Library/DialogManage.cpp
@@ -1140,7 +1140,7 @@ INT_PTR CDialogManage::CTabSkins::OnNotify(WPARAM wParam, LPARAM lParam)
 			file += m_SkinName;
 			file += L"\\";
 			file += m_FileName;
-			WritePrivateProfileString(L"Rainmeter", L"\r\n[Metadata]\r\nInformation=\r\nLicense=\r\nVersion", L"", file.c_str());
+			WritePrivateProfileString(L"Rainmeter", L"\r\n[Metadata]\r\nName=\r\nInformation=\r\nLicense=\r\nVersion", L"", file.c_str());
 			SendMessage(m_Window, WM_COMMAND, MAKEWPARAM(IDC_MANAGESKINS_EDIT_BUTTON, 0), 0);
 			ShowWindow(nm->hwndFrom, SW_HIDE);
 		}
@@ -1175,6 +1175,9 @@ INT_PTR CDialogManage::CTabSkins::OnNotify(WPARAM wParam, LPARAM lParam)
 				if (menu && TreeView_GetItem(nm->hwndFrom, &tvi))
 				{
 					HMENU subMenu;
+					MENUITEMINFO mii = {0};
+					mii.cbSize = sizeof(MENUITEMINFO);
+					mii.fMask = MIIM_STRING;
 
 					if (m_FileName.empty())
 					{
@@ -1184,9 +1187,6 @@ INT_PTR CDialogManage::CTabSkins::OnNotify(WPARAM wParam, LPARAM lParam)
 
 						if (tvi.state & TVIS_EXPANDED)
 						{
-							MENUITEMINFO mii = {0};
-							mii.cbSize = sizeof(MENUITEMINFO);
-							mii.fMask = MIIM_STRING;
 							mii.dwTypeData = L"Collapse";
 							SetMenuItemInfo(subMenu, ID_CONTEXT_MANAGESKINSMENU_EXPAND, MF_BYCOMMAND, &mii);
 						}
@@ -1199,9 +1199,6 @@ INT_PTR CDialogManage::CTabSkins::OnNotify(WPARAM wParam, LPARAM lParam)
 
 						if (m_SkinWindow)
 						{
-							MENUITEMINFO mii = {0};
-							mii.cbSize = sizeof(MENUITEMINFO);
-							mii.fMask = MIIM_STRING;
 							mii.dwTypeData = L"Unload";
 							SetMenuItemInfo(subMenu, ID_CONTEXT_MANAGESKINSMENU_LOAD, MF_BYCOMMAND, &mii);
 						}
@@ -1238,8 +1235,6 @@ INT_PTR CDialogManage::CTabSkins::OnNotify(WPARAM wParam, LPARAM lParam)
 			// Temporarily disable handling commands
 			m_HandleCommands = false;
 
-			//LSLog(LOG_DEBUG, L"Rainmeter", L"UPDATE");
-
 			WCHAR buffer[MAX_PATH];
 
 			// Get current selection name
diff --git a/Library/Library.rc b/Library/Library.rc
index 1b8bb2a5..4957e1ff 100644
--- a/Library/Library.rc
+++ b/Library/Library.rc
@@ -234,10 +234,10 @@ IDD_ABOUTVERSION_DIALOG DIALOGEX 15, 30, 370, 148
 STYLE DS_CONTROL | WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS
 FONT 8, "MS Shell Dlg 2", 0, 0, 0x0
 BEGIN
-    CONTROL         IDI_WINDOW, IDC_ABOUTVERSION_LOGO_BITMAP, STATIC, SS_ICON | WS_CHILD | WS_VISIBLE, 0, 8, 24, 24
+    CONTROL         IDI_WINDOW, IDC_STATIC, STATIC, SS_ICON | WS_CHILD | WS_VISIBLE, 0, 8, 24, 24
     LTEXT           "", IDC_ABOUTVERSION_VERSION_TEXT, 28, 0, 300, 9
     CONTROL         "Get the latest version at <a href=""http://rainmeter.net"">rainmeter.net</a>.", IDC_STATIC, "SysLink", 0x0, 28, 13, 300, 9
-    CONTROL         "Rainmeter is an open source project distributed under the <a href=""http://www.gnu.org/licenses"">GNU GPL v2</a> license.", IDC_STATIC, "SysLink", 0x0, 28, 26, 300, 9
+    CONTROL         "Distributed under the <a href=""http://www.gnu.org/licenses"">GNU GPL v2</a> license.", IDC_STATIC, "SysLink", 0x0, 28, 26, 300, 9
     LTEXT           "", IDC_ABOUTVERSION_PATHS_TEXT, 0, 43, 300, 34
     PUSHBUTTON      "Copy to clipboard", IDC_ABOUTVERSION_COPY_BUTTON, 0, 81, 80, 14, WS_TABSTOP
 END
diff --git a/Library/resource.h b/Library/resource.h
index 9e1b006c..38889e38 100644
--- a/Library/resource.h
+++ b/Library/resource.h
@@ -28,10 +28,9 @@
 #define IDC_ABOUTMEASURES_ITEMS_LISTBOX              1007
 #define IDC_ABOUTMEASURES_ITEMS_LISTVIEW             1008
 #define IDC_ABOUTPLUGINS_ITEMS_LISTVIEW              1009
-#define IDC_ABOUTVERSION_LOGO_BITMAP                 1010
-#define IDC_ABOUTVERSION_VERSION_TEXT                1011
-#define IDC_ABOUTVERSION_PATHS_TEXT                  1012
-#define IDC_ABOUTVERSION_COPY_BUTTON                 1013
+#define IDC_ABOUTVERSION_VERSION_TEXT                1010
+#define IDC_ABOUTVERSION_PATHS_TEXT                  1011
+#define IDC_ABOUTVERSION_COPY_BUTTON                 1012
 
 #define IDC_MANAGE_TAB                               1017
 #define IDC_REFRESHALL_BUTTON                        1018