diff --git a/Telegram/SourceFiles/_other/genstyles.cpp b/Telegram/SourceFiles/_other/genstyles.cpp
index 3d52dc82c..cad91743a 100644
--- a/Telegram/SourceFiles/_other/genstyles.cpp
+++ b/Telegram/SourceFiles/_other/genstyles.cpp
@@ -383,7 +383,7 @@ to link the code of portions of this program with the OpenSSL library.\n\
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE\n\
 Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org\n\
 */\n";
-			tout << "#pragma once\n\n#include \"ui/style.h\"\n\nnamespace style {\n";
+			tout << "#pragma once\n\n#include \"ui/style_core.h\"\n\nnamespace style {\n";
 			for (int i = 0, l = byIndex.size(); i < l; ++i) {
 				ClassData &cls(byIndex[i]);
 				classes.insert(cls.name, cls);
@@ -513,7 +513,7 @@ typedef QPair<ScalarType, ScalarValue> ScalarData;
 typedef QPair<string, ScalarData> Scalar;
 typedef QMap<string, ScalarData> Fields;
 typedef QPair<string, Fields> ObjectData;
-typedef QPair<string, ObjectData> Object; 
+typedef QPair<string, ObjectData> Object;
 typedef QVector<Object> Objects;
 typedef QVector<Scalar> Scalars;
 
@@ -646,7 +646,7 @@ ScalarValue prepareNumber(int variant, const string &token, const char *&text, c
 ScalarValue prepareColorRGB(int variant, const string &name, const char *&text, const char *end) {
 	StyleGenTokenType type;
 	string token;
-	
+
 	readStyleGenToken(text, end, type, token);
 	if (type != stConsStart) throw Exception(QString("Unexpected token %1 while reading rgb() cons!").arg(type));
 
@@ -685,7 +685,7 @@ ScalarValue prepareColorRGB(int variant, const string &name, const char *&text,
 ScalarValue prepareColorRGBA(int variant, const string &name, const char *&text, const char *end) {
 	StyleGenTokenType type;
 	string token;
-	
+
 	readStyleGenToken(text, end, type, token);
 	if (type != stConsStart) throw Exception(QString("Unexpected token %1 while reading rgba() cons!").arg(type));
 
@@ -731,7 +731,7 @@ ScalarValue prepareColorRGBA(int variant, const string &name, const char *&text,
 ScalarValue prepareRect(int variant, const char *&text, const char *end) {
 	StyleGenTokenType type;
 	string token;
-	
+
 	readStyleGenToken(text, end, type, token);
 	if (type != stConsStart) throw Exception(QString("Unexpected token %1 while reading rect() cons!").arg(type));
 
@@ -869,7 +869,7 @@ ScalarValue prepareSprite(int variant, const char *&text, const char *end) {
 ScalarValue preparePoint(int variant, const char *&text, const char *end) {
 	StyleGenTokenType type;
 	string token;
-	
+
 	readStyleGenToken(text, end, type, token);
 	if (type != stConsStart) throw Exception(QString("Unexpected token %1 while reading point() cons!").arg(type));
 
@@ -902,7 +902,7 @@ ScalarValue preparePoint(int variant, const char *&text, const char *end) {
 ScalarValue prepareSize(int variant, const char *&text, const char *end) {
 	StyleGenTokenType type;
 	string token;
-	
+
 	readStyleGenToken(text, end, type, token);
 	if (type != stConsStart) throw Exception(QString("Unexpected token %1 while reading size() cons!").arg(type));
 
@@ -935,7 +935,7 @@ ScalarValue prepareSize(int variant, const char *&text, const char *end) {
 ScalarValue prepareTransition(int variant, const char *&text, const char *end) {
 	StyleGenTokenType type;
 	string token;
-	
+
 	readStyleGenToken(text, end, type, token);
 	if (type != stConsStart) throw Exception(QString("Unexpected token %1 while reading transition() cons!").arg(type));
 
@@ -952,7 +952,7 @@ ScalarValue prepareTransition(int variant, const char *&text, const char *end) {
 ScalarValue prepareCursor(int variant, const char *&text, const char *end) {
 	StyleGenTokenType type;
 	string token;
-	
+
 	readStyleGenToken(text, end, type, token);
 	if (type != stConsStart) throw Exception(QString("Unexpected token %1 while reading cursor() cons!").arg(type));
 
@@ -969,7 +969,7 @@ ScalarValue prepareCursor(int variant, const char *&text, const char *end) {
 ScalarValue prepareAlign(int variant, const char *&text, const char *end) {
 	StyleGenTokenType type;
 	string token;
-	
+
 	readStyleGenToken(text, end, type, token);
 	if (type != stConsStart) throw Exception(QString("Unexpected token %1 while reading align() cons!").arg(type));
 
@@ -986,7 +986,7 @@ ScalarValue prepareAlign(int variant, const char *&text, const char *end) {
 ScalarValue prepareMargins(int variant, const char *&text, const char *end) {
 	StyleGenTokenType type;
 	string token;
-	
+
 	readStyleGenToken(text, end, type, token);
 	if (type != stConsStart) throw Exception(QString("Unexpected token %1 while reading margins() cons!").arg(type));
 
@@ -1059,7 +1059,7 @@ QMap<int, Fonts> fonts;
 ScalarValue prepareFont(int variant, const string &name, const char *&text, const char *end) {
 	StyleGenTokenType type;
 	string token;
-	
+
 	ScalarValue sizeScalar, familyScalar;
 
 	string size, family;
@@ -1544,7 +1544,7 @@ to link the code of portions of this program with the OpenSSL library.\n\
 Full license: https://github.com/telegramdesktop/tdesktop/blob/master/LICENSE\n\
 Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org\n\
 */\n";
-			tout << "#pragma once\n\n#include \"ui/style.h\"\n\nnamespace st {\n";
+			tout << "#pragma once\n\n#include \"ui/style_core.h\"\n\nnamespace st {\n";
 			tcpp << "\
 /*\n\
 Created from \'/Resources/style.txt\' by \'/MetaStyle\' project\n\
@@ -1604,7 +1604,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org\n\
 			tcpp << "\tColorDatas _colorsMap;\n";
 			tcpp << "\tint _spriteWidth = " << spriteWidths[0] << ";\n\n";
 			tcpp << "\tvoid startManager() {\n";
-            
+
             tcpp << "\n\t\tif (cRetina()) {\n";
 			tcpp << "\t\t\tcSetRealScale(dbisOne);\n";
 			tcpp << "\t\t\t_spriteWidth = " << spriteWidths[variantsCount - 1] << ";\n\n";
diff --git a/Telegram/SourceFiles/stdafx.h b/Telegram/SourceFiles/stdafx.h
index e1e8bc5c7..0683fc16f 100644
--- a/Telegram/SourceFiles/stdafx.h
+++ b/Telegram/SourceFiles/stdafx.h
@@ -53,7 +53,7 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 
 #include "mtproto/facade.h"
 
-#include "ui/style_core.h"
+#include "ui/style.h"
 #include "ui/twidget.h"
 #include "ui/animation.h"
 #include "ui/flatinput.h"
diff --git a/Telegram/SourceFiles/ui/style.h b/Telegram/SourceFiles/ui/style.h
index f9fcf062a..b3108ab22 100644
--- a/Telegram/SourceFiles/ui/style.h
+++ b/Telegram/SourceFiles/ui/style.h
@@ -20,5 +20,6 @@ Copyright (c) 2014-2016 John Preston, https://desktop.telegram.org
 */
 #pragma once
 
-#include "../GeneratedFiles/style_classes.h"
-#include "../GeneratedFiles/style_auto.h"
+#include "ui/style_core.h"
+#include "GeneratedFiles/style_classes.h"
+#include "GeneratedFiles/style_auto.h"
diff --git a/Telegram/SourceFiles/ui/style_core.cpp b/Telegram/SourceFiles/ui/style_core.cpp
index d7c99ccd4..f1b52a7fa 100644
--- a/Telegram/SourceFiles/ui/style_core.cpp
+++ b/Telegram/SourceFiles/ui/style_core.cpp
@@ -134,24 +134,13 @@ namespace style {
 		return *this;
 	}
 
-	void Color::set(const QColor &newv) {
-		if (!owner) {
-			ptr = new ColorData(*ptr);
-			owner = true;
-		}
-		ptr->set(newv);
+	namespace {
+	inline uint32 colorKey(uchar r, uchar g, uchar b, uchar a) {
+		return (((((uint32(r) << 8) | uint32(g)) << 8) | uint32(b)) << 8) | uint32(a);
 	}
-
-	void Color::set(uchar r, uchar g, uchar b, uchar a) {
-		if (!owner) {
-			ptr = new ColorData(*ptr);
-			owner = true;
-		}
-		ptr->set(QColor(r, g, b, a));
 	}
-
 	void Color::init(uchar r, uchar g, uchar b, uchar a) {
-		uint32 key = _colorKey(r, g, b, a);
+		uint32 key = colorKey(r, g, b, a);
 		ColorDatas::const_iterator i = _colorsMap.constFind(key);
 		if (i == _colorsMap.cend()) {
 			i = _colorsMap.insert(key, new ColorData(r, g, b, a));
diff --git a/Telegram/SourceFiles/ui/style_core.h b/Telegram/SourceFiles/ui/style_core.h
index c35d125bc..1528284d1 100644
--- a/Telegram/SourceFiles/ui/style_core.h
+++ b/Telegram/SourceFiles/ui/style_core.h
@@ -46,7 +46,7 @@ inline QRect centerrect(const QRect &inRect, const QRect &rect) {
 }
 
 namespace style {
-	
+
 	class FontData;
 	class Font {
 	public:
@@ -189,7 +189,7 @@ namespace style {
 		bool owner;
 
 		void init(uchar r, uchar g, uchar b, uchar a);
-		
+
 		friend void startManager();
 
 		Color(ColorData *p) : ptr(p) {
@@ -213,7 +213,7 @@ namespace style {
 
 		ColorData(uchar r, uchar g, uchar b, uchar a);
 		void set(const QColor &c);
-		
+
 		friend class Color;
 
 	};
diff --git a/Telegram/SourceFiles/ui/text/text.cpp b/Telegram/SourceFiles/ui/text/text.cpp
index ff9915df3..3df18ee76 100644
--- a/Telegram/SourceFiles/ui/text/text.cpp
+++ b/Telegram/SourceFiles/ui/text/text.cpp
@@ -1591,7 +1591,7 @@ public:
 				if (_wLeft < si.width) {
 					lineText = lineText.mid(0, currentBlock->from() - _localFrom) + _Elide;
 					lineLength = currentBlock->from() + _Elide.size() - _lineStart;
-					_selection.to = std::min({ _selection.to, currentBlock->from() });
+					_selection.to = _selection.to = qMin(_selection.to, currentBlock->from());
 					setElideBidi(currentBlock->from(), _Elide.size());
 					elideSaveBlock(blockIndex - 1, _endBlock, currentBlock->from(), elideWidth);
 					return;
@@ -1623,7 +1623,7 @@ public:
 						if (lineText.size() <= pos || repeat > 3) {
 							lineText += _Elide;
 							lineLength = _localFrom + pos + _Elide.size() - _lineStart;
-							_selection.to = std::min({ _selection.to, uint16(_localFrom + pos) });
+							_selection.to = qMin(_selection.to, uint16(_localFrom + pos));
 							setElideBidi(_localFrom + pos, _Elide.size());
 							_blocksSize = blockIndex;
 							_endBlock = nextBlock;
@@ -1643,7 +1643,7 @@ public:
 		}
 
 		int32 elideStart = _localFrom + lineText.size();
-		_selection.to = std::min({ _selection.to, uint16(elideStart) });
+		_selection.to = qMin(_selection.to, uint16(elideStart));
 		setElideBidi(elideStart, _Elide.size());
 
 		lineText += _Elide;
diff --git a/Telegram/Telegram.vcxproj.filters b/Telegram/Telegram.vcxproj.filters
index 0b17e3c99..9257f6659 100644
--- a/Telegram/Telegram.vcxproj.filters
+++ b/Telegram/Telegram.vcxproj.filters
@@ -1,39 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <Filter Include="Generated Files">
-      <UniqueIdentifier>{71ED8ED8-ACB9-4CE9-BBE1-E00B30144E11}</UniqueIdentifier>
-      <Extensions>moc;h;cpp</Extensions>
-      <SourceControlFiles>False</SourceControlFiles>
-    </Filter>
-    <Filter Include="Generated Files\Debug">
-      <UniqueIdentifier>{4e5e8958-0a60-4117-8701-cbd387932d83}</UniqueIdentifier>
-      <Extensions>cpp;moc</Extensions>
-      <SourceControlFiles>False</SourceControlFiles>
-    </Filter>
-    <Filter Include="Generated Files\Release">
-      <UniqueIdentifier>{9c05f518-3867-45cb-b08c-19c0d32151c7}</UniqueIdentifier>
-      <Extensions>cpp;moc</Extensions>
-      <SourceControlFiles>False</SourceControlFiles>
-    </Filter>
-    <Filter Include="mtproto">
-      <UniqueIdentifier>{d01d021a-d92f-4ac3-9155-6d297fffe596}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;cxx;c;def</Extensions>
-    </Filter>
-    <Filter Include="boxes">
-      <UniqueIdentifier>{65fcb834-0002-4007-80c2-8bd6cbc63c93}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="intro">
-      <UniqueIdentifier>{08a48c4d-2526-4578-ad4b-db659e4eec8d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Generated Files\Deploy">
-      <UniqueIdentifier>{8a7cc1a8-8332-4937-967f-3a04725db75d}</UniqueIdentifier>
-      <Extensions>cpp;moc</Extensions>
-      <SourceControlFiles>False</SourceControlFiles>
-    </Filter>
     <Filter Include="Resources">
       <UniqueIdentifier>{df139398-6d5d-4bd5-8abe-b509b102f5d8}</UniqueIdentifier>
     </Filter>
@@ -46,1080 +13,1113 @@
     <Filter Include="ThirdParty\minizip">
       <UniqueIdentifier>{1abe710c-3c36-484c-b2a5-881c29a051c2}</UniqueIdentifier>
     </Filter>
-    <Filter Include="inline_bots">
-      <UniqueIdentifier>{da3d0334-a011-41dd-a8e0-9b701afacfb3}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="ui">
-      <UniqueIdentifier>{93203856-b459-49ec-8097-689d0feda013}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="ui\toast">
-      <UniqueIdentifier>{815de139-ef13-45d6-a131-a3556eefae55}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="serialize">
-      <UniqueIdentifier>{e9244e0a-a3ae-43dc-8a72-fd7d14cee20b}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Resources\langs">
       <UniqueIdentifier>{67311646-a8af-4626-976d-0a5733bf90e8}</UniqueIdentifier>
     </Filter>
-    <Filter Include="dialogs">
-      <UniqueIdentifier>{405e59c2-0800-4f73-b975-1749c8c36e87}</UniqueIdentifier>
+    <Filter Include="SourceFiles">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;cxx;c;def</Extensions>
     </Filter>
-    <Filter Include="ui\buttons">
-      <UniqueIdentifier>{24292a88-6707-4070-b2d2-8b53acd5cdd0}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="core">
-      <UniqueIdentifier>{162feb92-08a4-4abf-9936-79c389d4fcb9}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="history">
-      <UniqueIdentifier>{39b5a449-928d-4add-9610-95c03878d52f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="window">
+    <Filter Include="SourceFiles\window">
       <UniqueIdentifier>{0192d4a5-ecf0-4076-937a-d3a08443e543}</UniqueIdentifier>
     </Filter>
-    <Filter Include="overview">
+    <Filter Include="SourceFiles\overview">
       <UniqueIdentifier>{ddcc5634-90e7-4815-ba86-a3db539f4774}</UniqueIdentifier>
     </Filter>
-    <Filter Include="ui\text">
+    <Filter Include="SourceFiles\mtproto">
+      <UniqueIdentifier>{d01d021a-d92f-4ac3-9155-6d297fffe596}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="SourceFiles\serialize">
+      <UniqueIdentifier>{e9244e0a-a3ae-43dc-8a72-fd7d14cee20b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="SourceFiles\intro">
+      <UniqueIdentifier>{08a48c4d-2526-4578-ad4b-db659e4eec8d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="SourceFiles\inline_bots">
+      <UniqueIdentifier>{da3d0334-a011-41dd-a8e0-9b701afacfb3}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="SourceFiles\history">
+      <UniqueIdentifier>{39b5a449-928d-4add-9610-95c03878d52f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="SourceFiles\dialogs">
+      <UniqueIdentifier>{405e59c2-0800-4f73-b975-1749c8c36e87}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="SourceFiles\core">
+      <UniqueIdentifier>{162feb92-08a4-4abf-9936-79c389d4fcb9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="SourceFiles\boxes">
+      <UniqueIdentifier>{65fcb834-0002-4007-80c2-8bd6cbc63c93}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="SourceFiles\ui">
+      <UniqueIdentifier>{93203856-b459-49ec-8097-689d0feda013}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="SourceFiles\ui\toast">
+      <UniqueIdentifier>{815de139-ef13-45d6-a131-a3556eefae55}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="SourceFiles\ui\buttons">
+      <UniqueIdentifier>{24292a88-6707-4070-b2d2-8b53acd5cdd0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="SourceFiles\ui\text">
       <UniqueIdentifier>{850c3d13-024a-4ef3-a6b7-b546e67cca48}</UniqueIdentifier>
     </Filter>
+    <Filter Include="GeneratedFiles">
+      <UniqueIdentifier>{71ED8ED8-ACB9-4CE9-BBE1-E00B30144E11}</UniqueIdentifier>
+      <Extensions>moc;h;cpp</Extensions>
+      <SourceControlFiles>False</SourceControlFiles>
+    </Filter>
+    <Filter Include="GeneratedFiles\Debug">
+      <UniqueIdentifier>{4e5e8958-0a60-4117-8701-cbd387932d83}</UniqueIdentifier>
+      <Extensions>cpp;moc</Extensions>
+      <SourceControlFiles>False</SourceControlFiles>
+    </Filter>
+    <Filter Include="GeneratedFiles\Release">
+      <UniqueIdentifier>{9c05f518-3867-45cb-b08c-19c0d32151c7}</UniqueIdentifier>
+      <Extensions>cpp;moc</Extensions>
+      <SourceControlFiles>False</SourceControlFiles>
+    </Filter>
+    <Filter Include="GeneratedFiles\Deploy">
+      <UniqueIdentifier>{8a7cc1a8-8332-4937-967f-3a04725db75d}</UniqueIdentifier>
+      <Extensions>cpp;moc</Extensions>
+      <SourceControlFiles>False</SourceControlFiles>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="SourceFiles\main.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\stdafx.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\logs.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\application.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\qrc_telegram.cpp">
-      <Filter>Generated Files</Filter>
+      <Filter>GeneratedFiles</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\qrc_telegram_emojis.cpp">
-      <Filter>Generated Files</Filter>
+      <Filter>GeneratedFiles</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\qrc_telegram_wnd.cpp">
-      <Filter>Generated Files</Filter>
+      <Filter>GeneratedFiles</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\mainwidget.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\style_auto.cpp">
-      <Filter>Generated Files</Filter>
+      <Filter>GeneratedFiles</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\app.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\dialogswidget.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\history.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\historywidget.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\layerwidget.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\localimageloader.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\fileuploader.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\profilewidget.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\sysbuttons.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\title.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\boxes\aboutbox.cpp">
-      <Filter>boxes</Filter>
+      <Filter>SourceFiles\boxes</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\boxes\addcontactbox.cpp">
-      <Filter>boxes</Filter>
+      <Filter>SourceFiles\boxes</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\boxes\confirmbox.cpp">
-      <Filter>boxes</Filter>
+      <Filter>SourceFiles\boxes</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\boxes\connectionbox.cpp">
-      <Filter>boxes</Filter>
+      <Filter>SourceFiles\boxes</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\boxes\contactsbox.cpp">
-      <Filter>boxes</Filter>
+      <Filter>SourceFiles\boxes</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\boxes\photocropbox.cpp">
-      <Filter>boxes</Filter>
+      <Filter>SourceFiles\boxes</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\boxes\photosendbox.cpp">
-      <Filter>boxes</Filter>
+      <Filter>SourceFiles\boxes</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\boxes\emojibox.cpp">
-      <Filter>boxes</Filter>
+      <Filter>SourceFiles\boxes</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\intro\introcode.cpp">
-      <Filter>intro</Filter>
+      <Filter>SourceFiles\intro</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\intro\introphone.cpp">
-      <Filter>intro</Filter>
+      <Filter>SourceFiles\intro</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\intro\introsignup.cpp">
-      <Filter>intro</Filter>
+      <Filter>SourceFiles\intro</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\dropdown.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\settingswidget.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\settings.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\boxes\downloadpathbox.cpp">
-      <Filter>boxes</Filter>
+      <Filter>SourceFiles\boxes</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\langloaderplain.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_title.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_title.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_title.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_sysbuttons.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_sysbuttons.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_sysbuttons.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_settingswidget.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_settingswidget.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_settingswidget.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_profilewidget.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_profilewidget.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_profilewidget.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_photosendbox.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_photosendbox.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_photosendbox.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_photocropbox.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_photocropbox.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_photocropbox.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_mainwidget.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_mainwidget.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_mainwidget.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_localimageloader.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_localimageloader.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_localimageloader.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_layerwidget.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_layerwidget.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_layerwidget.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_introsignup.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_introsignup.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_introsignup.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_introphone.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_introphone.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_introphone.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_introcode.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_introcode.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_introcode.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_historywidget.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_historywidget.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_historywidget.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_fileuploader.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_fileuploader.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_fileuploader.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_emojibox.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_emojibox.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_emojibox.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_dropdown.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_dropdown.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_dropdown.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_downloadpathbox.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_downloadpathbox.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_downloadpathbox.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_dialogswidget.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_dialogswidget.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_dialogswidget.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_contactsbox.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_contactsbox.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_contactsbox.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_connectionbox.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_connectionbox.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_connectionbox.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_confirmbox.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_confirmbox.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_confirmbox.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_application.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_application.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_application.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_addcontactbox.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_addcontactbox.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_addcontactbox.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_aboutbox.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_aboutbox.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_aboutbox.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\mediaview.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_mediaview.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_mediaview.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_mediaview.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_overviewwidget.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\overviewwidget.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_overviewwidget.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_overviewwidget.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\audio.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_audio.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_audio.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_audio.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\boxes\usernamebox.cpp">
-      <Filter>boxes</Filter>
+      <Filter>SourceFiles\boxes</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_usernamebox.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_usernamebox.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_usernamebox.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\localstorage.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_localstorage.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_localstorage.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_localstorage.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\lang_auto.cpp">
-      <Filter>Generated Files</Filter>
+      <Filter>GeneratedFiles</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\lang.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\boxes\languagebox.cpp">
-      <Filter>boxes</Filter>
+      <Filter>SourceFiles\boxes</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_languagebox.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_languagebox.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_languagebox.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\boxes\backgroundbox.cpp">
-      <Filter>boxes</Filter>
+      <Filter>SourceFiles\boxes</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_backgroundbox.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_backgroundbox.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_backgroundbox.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\pspecific_linux.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_pspecific_linux.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_pspecific_linux.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_pspecific_linux.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\pspecific_mac.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_pspecific_mac.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_pspecific_mac.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_pspecific_mac.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_passcodewidget.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_passcodewidget.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_passcodewidget.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\passcodewidget.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_autolockbox.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_autolockbox.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_autolockbox.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\boxes\autolockbox.cpp">
-      <Filter>boxes</Filter>
+      <Filter>SourceFiles\boxes</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_passcodebox.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_passcodebox.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_passcodebox.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\boxes\passcodebox.cpp">
-      <Filter>boxes</Filter>
+      <Filter>SourceFiles\boxes</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\apiwrap.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_apiwrap.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_apiwrap.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_apiwrap.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_sessionsbox.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_sessionsbox.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_sessionsbox.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\boxes\sessionsbox.cpp">
-      <Filter>boxes</Filter>
+      <Filter>SourceFiles\boxes</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\boxes\abstractbox.cpp">
-      <Filter>boxes</Filter>
+      <Filter>SourceFiles\boxes</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_abstractbox.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_abstractbox.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_abstractbox.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\intro\intropwdcheck.cpp">
-      <Filter>intro</Filter>
+      <Filter>SourceFiles\intro</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_intropwdcheck.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_intropwdcheck.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_intropwdcheck.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\structs.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_stickersetbox.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_stickersetbox.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_stickersetbox.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\boxes\stickersetbox.cpp">
-      <Filter>boxes</Filter>
+      <Filter>SourceFiles\boxes</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\autoupdater.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_autoupdater.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_autoupdater.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_autoupdater.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\playerwidget.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_playerwidget.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_playerwidget.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_playerwidget.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\numbers.cpp">
-      <Filter>Generated Files</Filter>
+      <Filter>GeneratedFiles</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\facades.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\layout.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_history.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_history.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_history.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="ThirdParty\minizip\zip.c">
       <Filter>ThirdParty\minizip</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\shortcuts.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\intro\introstart.cpp">
-      <Filter>intro</Filter>
+      <Filter>SourceFiles\intro</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_introwidget.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_introwidget.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_introwidget.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\intro\introwidget.cpp">
-      <Filter>intro</Filter>
+      <Filter>SourceFiles\intro</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_pspecific_win.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_pspecific_win.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_pspecific_win.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\pspecific_win.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\pspecific_winrt.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_pspecific_winrt.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_pspecific_winrt.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_pspecific_winrt.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_connection_tcp.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\mtproto\connection_tcp.cpp">
-      <Filter>mtproto</Filter>
+      <Filter>SourceFiles\mtproto</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_connection_tcp.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_connection_tcp.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_connection_http.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\mtproto\connection_http.cpp">
-      <Filter>mtproto</Filter>
+      <Filter>SourceFiles\mtproto</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\mtproto\connection_auto.cpp">
-      <Filter>mtproto</Filter>
+      <Filter>SourceFiles\mtproto</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\mtproto\auth_key.cpp">
-      <Filter>mtproto</Filter>
+      <Filter>SourceFiles\mtproto</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\mtproto\connection.cpp">
-      <Filter>mtproto</Filter>
+      <Filter>SourceFiles\mtproto</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_connection.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_connection.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_connection.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\mtproto\core_types.cpp">
-      <Filter>mtproto</Filter>
+      <Filter>SourceFiles\mtproto</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\mtproto\dcenter.cpp">
-      <Filter>mtproto</Filter>
+      <Filter>SourceFiles\mtproto</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_dcenter.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_dcenter.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_dcenter.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\mtproto\facade.cpp">
-      <Filter>mtproto</Filter>
+      <Filter>SourceFiles\mtproto</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\mtproto\file_download.cpp">
-      <Filter>mtproto</Filter>
+      <Filter>SourceFiles\mtproto</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_file_download.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_file_download.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_file_download.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\mtproto\rpc_sender.cpp">
-      <Filter>mtproto</Filter>
+      <Filter>SourceFiles\mtproto</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\mtproto\rsa_public_key.cpp">
-      <Filter>mtproto</Filter>
+      <Filter>SourceFiles\mtproto</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\mtproto\scheme_auto.cpp">
-      <Filter>mtproto</Filter>
+      <Filter>SourceFiles\mtproto</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\mtproto\session.cpp">
-      <Filter>mtproto</Filter>
+      <Filter>SourceFiles\mtproto</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_session.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_session.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_session.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\mtproto\connection_abstract.cpp">
-      <Filter>mtproto</Filter>
+      <Filter>SourceFiles\mtproto</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_connection_abstract.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_connection_abstract.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_connection_abstract.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_connection_http.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_connection_http.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_connection_auto.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_connection_auto.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_connection_auto.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_facade.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_facade.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_facade.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\inline_bots\inline_bot_result.cpp">
-      <Filter>inline_bots</Filter>
+      <Filter>SourceFiles\inline_bots</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\inline_bots\inline_bot_layout_item.cpp">
-      <Filter>inline_bots</Filter>
+      <Filter>SourceFiles\inline_bots</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\inline_bots\inline_bot_send_data.cpp">
-      <Filter>inline_bots</Filter>
+      <Filter>SourceFiles\inline_bots</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\inline_bots\inline_bot_layout_internal.cpp">
-      <Filter>inline_bots</Filter>
+      <Filter>SourceFiles\inline_bots</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\ui\animation.cpp">
-      <Filter>ui</Filter>
+      <Filter>SourceFiles\ui</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_animation.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_animation.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_animation.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\ui\boxshadow.cpp">
-      <Filter>ui</Filter>
+      <Filter>SourceFiles\ui</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\ui\button.cpp">
-      <Filter>ui</Filter>
+      <Filter>SourceFiles\ui</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_button.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_button.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_button.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\ui\countryinput.cpp">
-      <Filter>ui</Filter>
+      <Filter>SourceFiles\ui</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_countryinput.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_countryinput.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_countryinput.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\ui\emoji_config.cpp">
-      <Filter>ui</Filter>
+      <Filter>SourceFiles\ui</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\ui\filedialog.cpp">
-      <Filter>ui</Filter>
+      <Filter>SourceFiles\ui</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\ui\flatbutton.cpp">
-      <Filter>ui</Filter>
+      <Filter>SourceFiles\ui</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_flatbutton.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_flatbutton.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_flatbutton.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\ui\flatcheckbox.cpp">
-      <Filter>ui</Filter>
+      <Filter>SourceFiles\ui</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_flatcheckbox.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_flatcheckbox.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_flatcheckbox.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\ui\flatinput.cpp">
-      <Filter>ui</Filter>
+      <Filter>SourceFiles\ui</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_flatinput.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_flatinput.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_flatinput.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\ui\flatlabel.cpp">
-      <Filter>ui</Filter>
+      <Filter>SourceFiles\ui</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_flatlabel.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_flatlabel.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_flatlabel.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\ui\flattextarea.cpp">
-      <Filter>ui</Filter>
+      <Filter>SourceFiles\ui</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_flattextarea.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_flattextarea.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_flattextarea.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\ui\images.cpp">
-      <Filter>ui</Filter>
+      <Filter>SourceFiles\ui</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\ui\popupmenu.cpp">
-      <Filter>ui</Filter>
+      <Filter>SourceFiles\ui</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_popupmenu.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_popupmenu.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_popupmenu.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\ui\scrollarea.cpp">
-      <Filter>ui</Filter>
+      <Filter>SourceFiles\ui</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_scrollarea.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_scrollarea.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_scrollarea.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\ui\style_core.cpp">
-      <Filter>ui</Filter>
+      <Filter>SourceFiles\ui</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\ui\twidget.cpp">
-      <Filter>ui</Filter>
+      <Filter>SourceFiles\ui</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_twidget.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_twidget.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_twidget.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\ui\toast\toast.cpp">
-      <Filter>ui\toast</Filter>
+      <Filter>SourceFiles\ui\toast</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\ui\toast\toast_manager.cpp">
-      <Filter>ui\toast</Filter>
+      <Filter>SourceFiles\ui\toast</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_toast_manager.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_toast_manager.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_toast_manager.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\ui\toast\toast_widget.cpp">
-      <Filter>ui\toast</Filter>
+      <Filter>SourceFiles\ui\toast</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\serialize\serialize_document.cpp">
-      <Filter>serialize</Filter>
+      <Filter>SourceFiles\serialize</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\serialize\serialize_common.cpp">
-      <Filter>serialize</Filter>
+      <Filter>SourceFiles\serialize</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\dialogs\dialogs_layout.cpp">
-      <Filter>dialogs</Filter>
+      <Filter>SourceFiles\dialogs</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\dialogs\dialogs_list.cpp">
-      <Filter>dialogs</Filter>
+      <Filter>SourceFiles\dialogs</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\dialogs\dialogs_indexed_list.cpp">
-      <Filter>dialogs</Filter>
+      <Filter>SourceFiles\dialogs</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\ui\buttons\peer_avatar_button.cpp">
-      <Filter>ui\buttons</Filter>
+      <Filter>SourceFiles\ui\buttons</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\window\top_bar_widget.cpp">
-      <Filter>window</Filter>
+      <Filter>SourceFiles\window</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_top_bar_widget.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_mainwindow.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_mainwindow.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_mainwindow.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\mainwindow.cpp">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_top_bar_widget.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_top_bar_widget.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\core\click_handler.cpp">
-      <Filter>core</Filter>
+      <Filter>SourceFiles\core</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\core\basic_types.cpp">
-      <Filter>core</Filter>
+      <Filter>SourceFiles\core</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Deploy\moc_basic_types.cpp">
-      <Filter>Generated Files\Deploy</Filter>
+      <Filter>GeneratedFiles\Deploy</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Debug\moc_basic_types.cpp">
-      <Filter>Generated Files\Debug</Filter>
+      <Filter>GeneratedFiles\Debug</Filter>
     </ClCompile>
     <ClCompile Include="GeneratedFiles\Release\moc_basic_types.cpp">
-      <Filter>Generated Files\Release</Filter>
+      <Filter>GeneratedFiles\Release</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\core\click_handler_types.cpp">
-      <Filter>core</Filter>
+      <Filter>SourceFiles\core</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\overview\overview_layout.cpp">
-      <Filter>overview</Filter>
+      <Filter>SourceFiles\overview</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\ui\text\text.cpp">
-      <Filter>ui\text</Filter>
+      <Filter>SourceFiles\ui\text</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\ui\text\text_entity.cpp">
-      <Filter>ui\text</Filter>
+      <Filter>SourceFiles\ui\text</Filter>
     </ClCompile>
     <ClCompile Include="SourceFiles\ui\text\text_block.cpp">
-      <Filter>ui\text</Filter>
+      <Filter>SourceFiles\ui\text</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="SourceFiles\stdafx.h">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </ClInclude>
     <ClInclude Include="SourceFiles\logs.h">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </ClInclude>
     <ClInclude Include="GeneratedFiles\style_auto.h">
-      <Filter>Generated Files</Filter>
+      <Filter>GeneratedFiles</Filter>
     </ClInclude>
     <ClInclude Include="GeneratedFiles\style_classes.h">
-      <Filter>Generated Files</Filter>
+      <Filter>GeneratedFiles</Filter>
     </ClInclude>
     <ClInclude Include="SourceFiles\countries.h">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </ClInclude>
     <ClInclude Include="SourceFiles\app.h">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </ClInclude>
     <ClInclude Include="resource.h">
-      <Filter>Generated Files</Filter>
+      <Filter>GeneratedFiles</Filter>
     </ClInclude>
     <ClInclude Include="SourceFiles\settings.h">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </ClInclude>
     <ClInclude Include="SourceFiles\langloaderplain.h">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </ClInclude>
     <ClInclude Include="SourceFiles\pspecific.h">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </ClInclude>
     <ClInclude Include="GeneratedFiles\lang_auto.h">
-      <Filter>Generated Files</Filter>
+      <Filter>GeneratedFiles</Filter>
     </ClInclude>
     <ClInclude Include="SourceFiles\lang.h">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </ClInclude>
     <ClInclude Include="SourceFiles\pspecific_mac_p.h">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </ClInclude>
     <ClInclude Include="SourceFiles\numbers.h">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </ClInclude>
     <ClInclude Include="SourceFiles\config.h">
       <Filter>Version</Filter>
@@ -1134,240 +1134,240 @@
       <Filter>ThirdParty\minizip</Filter>
     </ClInclude>
     <ClInclude Include="SourceFiles\shortcuts.h">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </ClInclude>
     <ClInclude Include="SourceFiles\intro\introstart.h">
-      <Filter>intro</Filter>
+      <Filter>SourceFiles\intro</Filter>
     </ClInclude>
     <ClInclude Include="SourceFiles\mtproto\auth_key.h">
-      <Filter>mtproto</Filter>
+      <Filter>SourceFiles\mtproto</Filter>
     </ClInclude>
     <ClInclude Include="SourceFiles\mtproto\core_types.h">
-      <Filter>mtproto</Filter>
+      <Filter>SourceFiles\mtproto</Filter>
     </ClInclude>
     <ClInclude Include="SourceFiles\mtproto\rpc_sender.h">
-      <Filter>mtproto</Filter>
+      <Filter>SourceFiles\mtproto</Filter>
     </ClInclude>
     <ClInclude Include="SourceFiles\mtproto\rsa_public_key.h">
-      <Filter>mtproto</Filter>
+      <Filter>SourceFiles\mtproto</Filter>
     </ClInclude>
     <ClInclude Include="SourceFiles\mtproto\scheme_auto.h">
-      <Filter>mtproto</Filter>
+      <Filter>SourceFiles\mtproto</Filter>
     </ClInclude>
     <ClInclude Include="SourceFiles\inline_bots\inline_bot_layout_item.h">
-      <Filter>inline_bots</Filter>
+      <Filter>SourceFiles\inline_bots</Filter>
     </ClInclude>
     <ClInclude Include="SourceFiles\inline_bots\inline_bot_result.h">
-      <Filter>inline_bots</Filter>
+      <Filter>SourceFiles\inline_bots</Filter>
     </ClInclude>
     <ClInclude Include="SourceFiles\inline_bots\inline_bot_send_data.h">
-      <Filter>inline_bots</Filter>
+      <Filter>SourceFiles\inline_bots</Filter>
     </ClInclude>
     <ClInclude Include="SourceFiles\inline_bots\inline_bot_layout_internal.h">
-      <Filter>inline_bots</Filter>
+      <Filter>SourceFiles\inline_bots</Filter>
     </ClInclude>
     <ClInclude Include="SourceFiles\ui\boxshadow.h">
-      <Filter>ui</Filter>
+      <Filter>SourceFiles\ui</Filter>
     </ClInclude>
     <ClInclude Include="SourceFiles\ui\emoji_config.h">
-      <Filter>ui</Filter>
+      <Filter>SourceFiles\ui</Filter>
     </ClInclude>
     <ClInclude Include="SourceFiles\ui\filedialog.h">
-      <Filter>ui</Filter>
+      <Filter>SourceFiles\ui</Filter>
     </ClInclude>
     <ClInclude Include="SourceFiles\ui\images.h">
-      <Filter>ui</Filter>
+      <Filter>SourceFiles\ui</Filter>
     </ClInclude>
     <ClInclude Include="SourceFiles\ui\style.h">
-      <Filter>ui</Filter>
+      <Filter>SourceFiles\ui</Filter>
     </ClInclude>
     <ClInclude Include="SourceFiles\ui\style_core.h">
-      <Filter>ui</Filter>
+      <Filter>SourceFiles\ui</Filter>
     </ClInclude>
     <ClInclude Include="SourceFiles\ui\toast\toast.h">
-      <Filter>ui\toast</Filter>
+      <Filter>SourceFiles\ui\toast</Filter>
     </ClInclude>
     <ClInclude Include="SourceFiles\ui\toast\toast_widget.h">
-      <Filter>ui\toast</Filter>
+      <Filter>SourceFiles\ui\toast</Filter>
     </ClInclude>
     <ClInclude Include="SourceFiles\serialize\serialize_document.h">
-      <Filter>serialize</Filter>
+      <Filter>SourceFiles\serialize</Filter>
     </ClInclude>
     <ClInclude Include="SourceFiles\serialize\serialize_common.h">
-      <Filter>serialize</Filter>
+      <Filter>SourceFiles\serialize</Filter>
     </ClInclude>
     <ClInclude Include="SourceFiles\dialogs\dialogs_layout.h">
-      <Filter>dialogs</Filter>
+      <Filter>SourceFiles\dialogs</Filter>
     </ClInclude>
     <ClInclude Include="SourceFiles\dialogs\dialogs_list.h">
-      <Filter>dialogs</Filter>
+      <Filter>SourceFiles\dialogs</Filter>
     </ClInclude>
     <ClInclude Include="SourceFiles\dialogs\dialogs_indexed_list.h">
-      <Filter>dialogs</Filter>
+      <Filter>SourceFiles\dialogs</Filter>
     </ClInclude>
     <ClInclude Include="SourceFiles\dialogs\dialogs_common.h">
-      <Filter>dialogs</Filter>
+      <Filter>SourceFiles\dialogs</Filter>
     </ClInclude>
     <ClInclude Include="SourceFiles\dialogs\dialogs_row.h">
-      <Filter>dialogs</Filter>
+      <Filter>SourceFiles\dialogs</Filter>
     </ClInclude>
     <ClInclude Include="SourceFiles\ui\buttons\peer_avatar_button.h">
-      <Filter>ui\buttons</Filter>
+      <Filter>SourceFiles\ui\buttons</Filter>
     </ClInclude>
     <ClInclude Include="SourceFiles\history\history_common.h">
-      <Filter>history</Filter>
+      <Filter>SourceFiles\history</Filter>
     </ClInclude>
     <ClInclude Include="SourceFiles\core\click_handler.h">
-      <Filter>core</Filter>
+      <Filter>SourceFiles\core</Filter>
     </ClInclude>
     <ClInclude Include="SourceFiles\core\click_handler_types.h">
-      <Filter>core</Filter>
+      <Filter>SourceFiles\core</Filter>
     </ClInclude>
     <ClInclude Include="SourceFiles\overview\overview_layout.h">
-      <Filter>overview</Filter>
+      <Filter>SourceFiles\overview</Filter>
     </ClInclude>
     <ClInclude Include="SourceFiles\ui\text\text.h">
-      <Filter>ui\text</Filter>
+      <Filter>SourceFiles\ui\text</Filter>
     </ClInclude>
     <ClInclude Include="SourceFiles\ui\text\text_entity.h">
-      <Filter>ui\text</Filter>
+      <Filter>SourceFiles\ui\text</Filter>
     </ClInclude>
     <ClInclude Include="SourceFiles\ui\text\text_block.h">
-      <Filter>ui\text</Filter>
+      <Filter>SourceFiles\ui\text</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="SourceFiles\application.h">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\mainwidget.h">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\dialogswidget.h">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\historywidget.h">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\layerwidget.h">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\localimageloader.h">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\fileuploader.h">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\profilewidget.h">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\sysbuttons.h">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\title.h">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\boxes\aboutbox.h">
-      <Filter>boxes</Filter>
+      <Filter>SourceFiles\boxes</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\boxes\addcontactbox.h">
-      <Filter>boxes</Filter>
+      <Filter>SourceFiles\boxes</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\boxes\confirmbox.h">
-      <Filter>boxes</Filter>
+      <Filter>SourceFiles\boxes</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\boxes\connectionbox.h">
-      <Filter>boxes</Filter>
+      <Filter>SourceFiles\boxes</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\boxes\contactsbox.h">
-      <Filter>boxes</Filter>
+      <Filter>SourceFiles\boxes</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\boxes\photocropbox.h">
-      <Filter>boxes</Filter>
+      <Filter>SourceFiles\boxes</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\boxes\photosendbox.h">
-      <Filter>boxes</Filter>
+      <Filter>SourceFiles\boxes</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\boxes\emojibox.h">
-      <Filter>boxes</Filter>
+      <Filter>SourceFiles\boxes</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\intro\introcode.h">
-      <Filter>intro</Filter>
+      <Filter>SourceFiles\intro</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\intro\introphone.h">
-      <Filter>intro</Filter>
+      <Filter>SourceFiles\intro</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\intro\introsignup.h">
-      <Filter>intro</Filter>
+      <Filter>SourceFiles\intro</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\dropdown.h">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\settingswidget.h">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\boxes\downloadpathbox.h">
-      <Filter>boxes</Filter>
+      <Filter>SourceFiles\boxes</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\mediaview.h">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\overviewwidget.h">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\audio.h">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\boxes\usernamebox.h">
-      <Filter>boxes</Filter>
+      <Filter>SourceFiles\boxes</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\history.h">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\localstorage.h">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\boxes\languagebox.h">
-      <Filter>boxes</Filter>
+      <Filter>SourceFiles\boxes</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\boxes\backgroundbox.h">
-      <Filter>boxes</Filter>
+      <Filter>SourceFiles\boxes</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\pspecific_linux.h">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\pspecific_mac.h">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\passcodewidget.h">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\boxes\autolockbox.h">
-      <Filter>boxes</Filter>
+      <Filter>SourceFiles\boxes</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\boxes\passcodebox.h">
-      <Filter>boxes</Filter>
+      <Filter>SourceFiles\boxes</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\apiwrap.h">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\boxes\sessionsbox.h">
-      <Filter>boxes</Filter>
+      <Filter>SourceFiles\boxes</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\boxes\abstractbox.h">
-      <Filter>boxes</Filter>
+      <Filter>SourceFiles\boxes</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\intro\intropwdcheck.h">
-      <Filter>intro</Filter>
+      <Filter>SourceFiles\intro</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\boxes\stickersetbox.h">
-      <Filter>boxes</Filter>
+      <Filter>SourceFiles\boxes</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\autoupdater.h">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\playerwidget.h">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </CustomBuild>
     <CustomBuild Include="Resources\lang.strings">
       <Filter>Resources</Filter>
@@ -1391,94 +1391,94 @@
       <Filter>Resources</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\layout.h">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\structs.h">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\intro\introwidget.h">
-      <Filter>intro</Filter>
+      <Filter>SourceFiles\intro</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\pspecific_win.h">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\pspecific_winrt.h">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\mtproto\connection_tcp.h">
-      <Filter>mtproto</Filter>
+      <Filter>SourceFiles\mtproto</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\mtproto\connection_http.h">
-      <Filter>mtproto</Filter>
+      <Filter>SourceFiles\mtproto</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\mtproto\connection.h">
-      <Filter>mtproto</Filter>
+      <Filter>SourceFiles\mtproto</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\mtproto\dcenter.h">
-      <Filter>mtproto</Filter>
+      <Filter>SourceFiles\mtproto</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\mtproto\facade.h">
-      <Filter>mtproto</Filter>
+      <Filter>SourceFiles\mtproto</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\mtproto\file_download.h">
-      <Filter>mtproto</Filter>
+      <Filter>SourceFiles\mtproto</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\mtproto\session.h">
-      <Filter>mtproto</Filter>
+      <Filter>SourceFiles\mtproto</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\mtproto\connection_abstract.h">
-      <Filter>mtproto</Filter>
+      <Filter>SourceFiles\mtproto</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\mtproto\connection_auto.h">
-      <Filter>mtproto</Filter>
+      <Filter>SourceFiles\mtproto</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\facades.h">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\ui\animation.h">
-      <Filter>ui</Filter>
+      <Filter>SourceFiles\ui</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\ui\button.h">
-      <Filter>ui</Filter>
+      <Filter>SourceFiles\ui</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\ui\countryinput.h">
-      <Filter>ui</Filter>
+      <Filter>SourceFiles\ui</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\ui\flatbutton.h">
-      <Filter>ui</Filter>
+      <Filter>SourceFiles\ui</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\ui\flatcheckbox.h">
-      <Filter>ui</Filter>
+      <Filter>SourceFiles\ui</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\ui\flatinput.h">
-      <Filter>ui</Filter>
+      <Filter>SourceFiles\ui</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\ui\flatlabel.h">
-      <Filter>ui</Filter>
+      <Filter>SourceFiles\ui</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\ui\flattextarea.h">
-      <Filter>ui</Filter>
+      <Filter>SourceFiles\ui</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\ui\popupmenu.h">
-      <Filter>ui</Filter>
+      <Filter>SourceFiles\ui</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\ui\scrollarea.h">
-      <Filter>ui</Filter>
+      <Filter>SourceFiles\ui</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\ui\twidget.h">
-      <Filter>ui</Filter>
+      <Filter>SourceFiles\ui</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\ui\toast\toast_manager.h">
-      <Filter>ui\toast</Filter>
+      <Filter>SourceFiles\ui\toast</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\window\top_bar_widget.h">
-      <Filter>window</Filter>
+      <Filter>SourceFiles\window</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\mainwindow.h">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </CustomBuild>
     <CustomBuild Include="SourceFiles\core\basic_types.h">
-      <Filter>core</Filter>
+      <Filter>SourceFiles\core</Filter>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
@@ -1516,13 +1516,13 @@
       <Filter>Version</Filter>
     </None>
     <None Include="SourceFiles\mtproto\generate.py">
-      <Filter>mtproto</Filter>
+      <Filter>SourceFiles\mtproto</Filter>
     </None>
     <None Include="SourceFiles\mtproto\scheme.tl">
-      <Filter>mtproto</Filter>
+      <Filter>SourceFiles\mtproto</Filter>
     </None>
     <None Include="SourceFiles\pspecific_mac_p.mm">
-      <Filter>Source Files</Filter>
+      <Filter>SourceFiles</Filter>
     </None>
   </ItemGroup>
   <ItemGroup>