diff --git a/NsfwBox.dproj b/NsfwBox.dproj
index 531fe7b..0379884 100755
--- a/NsfwBox.dproj
+++ b/NsfwBox.dproj
@@ -109,6 +109,7 @@
         <OrientationPortraitUpsideDown>true</OrientationPortraitUpsideDown>
         <OrientationLandscapeLeft>true</OrientationLandscapeLeft>
         <OrientationLandscapeRight>true</OrientationLandscapeRight>
+        <DCC_MaxStackSize>2048576</DCC_MaxStackSize>
     </PropertyGroup>
     <PropertyGroup Condition="'$(Base_Android)'!=''">
         <DCC_UsePackage>fmx;DbxCommonDriver;bindengine;IndyIPCommon;emsclient;FireDACCommonDriver;IndyProtocols;IndyIPClient;dbxcds;FmxTeeUI;bindcompfmx;ibmonitor;FireDACSqliteDriver;DbxClientDriver;soapmidas;fmxFireDAC;dbexpress;inet;DataSnapCommon;dbrtl;FireDACDBXDriver;CustomIPTransport;DBXInterBaseDriver;IndySystem;ibxbindings;bindcomp;FireDACCommon;IndyCore;RESTBackendComponents;bindcompdbx;rtl;RESTComponents;DBXSqliteDriver;IndyIPServer;dsnapxml;DataSnapClient;DataSnapProviderClient;DataSnapFireDAC;emsclientfiredac;FireDAC;FireDACDSDriver;xmlrtl;tethering;ibxpress;dsnap;CloudService;DataSnapNativeClient;FMXTee;soaprtl;soapserver;FireDACIBDriver;$(DCC_UsePackage)</DCC_UsePackage>
@@ -294,6 +295,7 @@
         <VerInfo_MajorVer>3</VerInfo_MajorVer>
         <VerInfo_Keys>CompanyName=https://github.com/Kisspeace;FileDescription=$(MSBuildProjectName);FileVersion=3.3.0.0;InternalName=;LegalCopyright=;LegalTrademarks=;OriginalFilename=NsfwBox.exe;ProgramID=delphi.Kisspeace.$(MSBuildProjectName);ProductName=$(MSBuildProjectName);ProductVersion=3.3.0.0;Comments=</VerInfo_Keys>
         <VerInfo_MinorVer>3</VerInfo_MinorVer>
+        <DCC_MaxStackSize>2048576</DCC_MaxStackSize>
     </PropertyGroup>
     <ItemGroup>
         <DelphiCompile Include="$(MainSource)">
@@ -308,7 +310,6 @@
         <DCCReference Include="source\NsfwBox.ContentScraper.pas"/>
         <DCCReference Include="source\NsfwBox.Consts.pas"/>
         <DCCReference Include="source\NsfwBox.Styling.pas"/>
-        <DCCReference Include="source\Unit2.pas"/>
         <DCCReference Include="source\NsfwBox.DownloadManager.pas"/>
         <DCCReference Include="source\NsfwBox.Bookmarks.pas"/>
         <DCCReference Include="source\DbHelper.pas"/>
@@ -318,8 +319,6 @@
         <DCCReference Include="source\SimpleClipboard.pas"/>
         <DCCReference Include="source\NsfwBox.UpdateChecker.pas"/>
         <DCCReference Include="source\NsfwBox.MessageForDeveloper.pas"/>
-        <DCCReference Include="source\NsfwBox.WindowsTitlebar.pas"/>
-        <DCCReference Include="source\FMX.ColumnsView.pas"/>
         <DCCReference Include="source\NsfwBox.Tests.pas"/>
         <DCCReference Include="source\NsfwBox.Logging.pas"/>
         <DCCReference Include="source\NsfwBox.Utils.pas"/>
@@ -346,6 +345,9 @@
         <DCCReference Include="source\gui\NsfwBox.Graphics.ImageViewer.pas"/>
         <DCCReference Include="source\gui\NsfwBox.Graphics.pas"/>
         <DCCReference Include="source\gui\NsfwBox.Graphics.Rectangle.pas"/>
+        <DCCReference Include="source\gui\NsfwBox.Graphics.SearchMenu.pas"/>
+        <DCCReference Include="source\gui\FMX.ColumnsView.pas"/>
+        <DCCReference Include="source\gui\NsfwBox.WindowsTitlebar.pas"/>
         <BuildConfiguration Include="Base">
             <Key>Base</Key>
         </BuildConfiguration>
@@ -376,21 +378,21 @@
                 </Source>
             </Delphi.Personality>
             <Deployment Version="3">
-                <DeployFile LocalName="assets\themes\default\video.png" Configuration="Debug" Class="File">
+                <DeployFile LocalName="assets\themes\default\downloads.png" Configuration="Release" Class="File">
                     <Platform Name="Android64">
                         <RemoteDir>assets\internal\themes\default</RemoteDir>
-                        <RemoteName>video.png</RemoteName>
+                        <RemoteName>downloads.png</RemoteName>
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="assets\themes\default\content-origin-3.png" Configuration="Debug" Class="File">
+                <DeployFile LocalName="assets\themes\default\content-origin-3.png" Configuration="Release" Class="File">
                     <Platform Name="Android64">
                         <RemoteDir>assets\internal\themes\default</RemoteDir>
                         <RemoteName>content-origin-3.png</RemoteName>
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="assets\themes\default\content-origin-3.png" Configuration="Release" Class="File">
+                <DeployFile LocalName="assets\themes\default\content-origin-3.png" Configuration="Debug" Class="File">
                     <Platform Name="Android64">
                         <RemoteDir>assets\internal\themes\default</RemoteDir>
                         <RemoteName>content-origin-3.png</RemoteName>
@@ -449,13 +451,6 @@
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="assets\themes\default\content-origin-4.png" Configuration="Debug" Class="File">
-                    <Platform Name="Android64">
-                        <RemoteDir>assets\internal\themes\default</RemoteDir>
-                        <RemoteName>content-origin-4.png</RemoteName>
-                        <Overwrite>true</Overwrite>
-                    </Platform>
-                </DeployFile>
                 <DeployFile LocalName="$(BDS)\bin\Artwork\Android\FM_SplashImage_640x480.png" Configuration="Release" Class="Android_SplashImage640">
                     <Platform Name="Android64">
                         <Enabled>false</Enabled>
@@ -470,6 +465,13 @@
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
+                <DeployFile LocalName="assets\themes\default\content-origin-4.png" Configuration="Debug" Class="File">
+                    <Platform Name="Android64">
+                        <RemoteDir>assets\internal\themes\default</RemoteDir>
+                        <RemoteName>content-origin-4.png</RemoteName>
+                        <Overwrite>true</Overwrite>
+                    </Platform>
+                </DeployFile>
                 <DeployFile LocalName="assets\themes\default\content-origin-11.png" Configuration="Release" Class="File">
                     <Platform Name="Android64">
                         <RemoteDir>assets\internal\themes\default</RemoteDir>
@@ -1647,17 +1649,17 @@
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="assets\themes\default\video.png" Configuration="Release" Class="File">
+                <DeployFile LocalName="assets\themes\default\video.png" Configuration="Debug" Class="File">
                     <Platform Name="Android64">
                         <RemoteDir>assets\internal\themes\default</RemoteDir>
                         <RemoteName>video.png</RemoteName>
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
-                <DeployFile LocalName="assets\themes\default\downloads.png" Configuration="Release" Class="File">
+                <DeployFile LocalName="assets\themes\default\video.png" Configuration="Release" Class="File">
                     <Platform Name="Android64">
                         <RemoteDir>assets\internal\themes\default</RemoteDir>
-                        <RemoteName>downloads.png</RemoteName>
+                        <RemoteName>video.png</RemoteName>
                         <Overwrite>true</Overwrite>
                     </Platform>
                 </DeployFile>
@@ -2464,8 +2466,8 @@
                 <ProjectRoot Platform="OSX64" Name="$(PROJECTNAME).app"/>
                 <ProjectRoot Platform="Win32" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="OSXARM64" Name="$(PROJECTNAME).app"/>
-                <ProjectRoot Platform="Android64" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="Android" Name="$(PROJECTNAME)"/>
+                <ProjectRoot Platform="Android64" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="Win64" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="Linux64" Name="$(PROJECTNAME)"/>
                 <ProjectRoot Platform="iOSDevice32" Name="$(PROJECTNAME).app"/>