diff --git a/.gitignore b/.gitignore
index 393b16d..fa95f90 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
 *.7z
-Documents
 ownCloudPortable
 *.log
diff --git a/App/AppInfo/Launcher/Splash.jpg b/App/AppInfo/Launcher/Splash.jpg
new file mode 100644
index 0000000..092908d
Binary files /dev/null and b/App/AppInfo/Launcher/Splash.jpg differ
diff --git a/App/AppInfo/Launcher/ownCloudPortable.ini b/App/AppInfo/Launcher/ownCloudPortable.ini
new file mode 100644
index 0000000..747f202
--- /dev/null
+++ b/App/AppInfo/Launcher/ownCloudPortable.ini
@@ -0,0 +1,27 @@
+[Launch]
+ProgramExecutable=encryption\start-hidden.bat
+DirectoryMoveOK=True
+CommandLineArguments="%PAL:Drive%\Documents\"
+WorkingDirectory=%PAL:AppDir%\encryption
+WaitForEXE1=ownCloudPortableEncryptionHelper.exe
+
+[Activate]
+Registry=True
+
+[RegistryKeys]
+ownCloudPortable=HKLM\SOFTWARE\ownCloud
+
+[DirectoriesMove]
+AppData=%USERPROFILE%\AppData\Local\ownCloud
+ProgramFiles=%ProgramFiles%\ownCloud
+-=%USERPROFILE%\ownCloud
+
+[DirectoriesCleanupIfEmpty]
+1=%USERPROFILE%\ownCloud
+
+[FileWrite1]
+Type=INI
+File=%PAL:DataDir%\AppData\folders\ownCloud
+Section=ownCloud
+Key=localPath
+Value=%PAL:Drive%/Documents/ownCloud/
\ No newline at end of file
diff --git a/appicon.ico b/App/AppInfo/appicon.ico
similarity index 100%
rename from appicon.ico
rename to App/AppInfo/appicon.ico
diff --git a/App/AppInfo/appicon_16.png b/App/AppInfo/appicon_16.png
new file mode 100644
index 0000000..3928339
Binary files /dev/null and b/App/AppInfo/appicon_16.png differ
diff --git a/App/AppInfo/appicon_32.png b/App/AppInfo/appicon_32.png
new file mode 100644
index 0000000..63a5c44
Binary files /dev/null and b/App/AppInfo/appicon_32.png differ
diff --git a/App/AppInfo/appinfo.ini b/App/AppInfo/appinfo.ini
new file mode 100644
index 0000000..c92ef95
--- /dev/null
+++ b/App/AppInfo/appinfo.ini
@@ -0,0 +1,26 @@
+[Format]
+Type=PortableApps.comFormat
+Version=3.0
+
+[Details]
+Name=ownCloud Portable
+AppID=ownCloudPortable
+Publisher=ownCloud's Team, DylanTheSoldier, & PortableApps.com
+Homepage=http://portableapps.com/node/37132
+Category=Internet
+Description=ownCloud's Open-Source Client Software.
+Language=Multilingual
+
+[License]
+Shareable=true
+OpenSource=true
+Freeware=false
+CommercialUse=true
+
+[Version]
+PackageVersion=1.8.0.4893
+DisplayVersion=1.8
+
+[Control]
+Icons=1
+Start=ownCloudPortable.exe
\ No newline at end of file
diff --git a/App/AppInfo/installer.ini b/App/AppInfo/installer.ini
new file mode 100644
index 0000000..41d89f3
--- /dev/null
+++ b/App/AppInfo/installer.ini
@@ -0,0 +1,2 @@
+[DirectoriesToPreserve]
+PreserveDirectory1=Data
\ No newline at end of file
diff --git a/App/DefaultData/settings/ownCloudPortable.reg b/App/DefaultData/settings/ownCloudPortable.reg
new file mode 100644
index 0000000..9cc8058
--- /dev/null
+++ b/App/DefaultData/settings/ownCloudPortable.reg
@@ -0,0 +1,9 @@
+Windows Registry Editor Version 5.00
+
+[HKEY_LOCAL_MACHINE\SOFTWARE\ownCloud]
+@="C:\\Program Files\\ownCloud"
+"VersionMajor"=dword:00000001
+"VersionMinor"=dword:00000002
+"VersionRevision"=dword:00000000
+"VersionBuild"=dword:00000005
+
diff --git a/App/Readme.txt b/App/Readme.txt
new file mode 100644
index 0000000..212d219
--- /dev/null
+++ b/App/Readme.txt
@@ -0,0 +1,3 @@
+The files in this directory are necessary for the portable application to
+function.  There is normally no need to directly access or alter any of the
+files within these directories.
diff --git a/hidden.vbs b/App/encryption/hidden.vbs
similarity index 100%
rename from hidden.vbs
rename to App/encryption/hidden.vbs
diff --git a/libs/7-Zip/7za.dll b/App/encryption/libs/7-Zip/7za.dll
similarity index 100%
rename from libs/7-Zip/7za.dll
rename to App/encryption/libs/7-Zip/7za.dll
diff --git a/libs/7-Zip/7za.exe b/App/encryption/libs/7-Zip/7za.exe
similarity index 100%
rename from libs/7-Zip/7za.exe
rename to App/encryption/libs/7-Zip/7za.exe
diff --git a/libs/7-Zip/7zxa.dll b/App/encryption/libs/7-Zip/7zxa.dll
similarity index 100%
rename from libs/7-Zip/7zxa.dll
rename to App/encryption/libs/7-Zip/7zxa.dll
diff --git a/libs/7-Zip/License.txt b/App/encryption/libs/7-Zip/License.txt
similarity index 100%
rename from libs/7-Zip/License.txt
rename to App/encryption/libs/7-Zip/License.txt
diff --git a/App/encryption/libs/Bat_To_Exe/Bat_To_Exe_Converter.exe b/App/encryption/libs/Bat_To_Exe/Bat_To_Exe_Converter.exe
new file mode 100644
index 0000000..088b6cb
Binary files /dev/null and b/App/encryption/libs/Bat_To_Exe/Bat_To_Exe_Converter.exe differ
diff --git a/App/encryption/libs/Bat_To_Exe/Bat_To_Exe_Converter_(x64).exe b/App/encryption/libs/Bat_To_Exe/Bat_To_Exe_Converter_(x64).exe
new file mode 100644
index 0000000..e0d8db9
Binary files /dev/null and b/App/encryption/libs/Bat_To_Exe/Bat_To_Exe_Converter_(x64).exe differ
diff --git a/App/encryption/libs/Bat_To_Exe/help.chm b/App/encryption/libs/Bat_To_Exe/help.chm
new file mode 100644
index 0000000..ff04b82
Binary files /dev/null and b/App/encryption/libs/Bat_To_Exe/help.chm differ
diff --git a/App/encryption/libs/Bat_To_Exe/settings.ini b/App/encryption/libs/Bat_To_Exe/settings.ini
new file mode 100644
index 0000000..9674f29
--- /dev/null
+++ b/App/encryption/libs/Bat_To_Exe/settings.ini
@@ -0,0 +1,27 @@
+
+[lang]
+lang = 
+[files]
+bat = 
+exe = 
+[opt]
+ivi = 0
+dir = 0
+tmp = 0
+enc = 0
+pwd = 
+man = 0
+owr = 0
+cmp = 0
+x64 = 0
+[inc]
+ico = 
+[inf]
+ver = 0
+vr1 = 1,0,0,0
+vr2 = 1,0,0,0
+vr3 = 
+vr4 = 
+vr5 = 
+vr6 = 
+vr7 = 
diff --git a/App/encryption/ownCloudPortableEncryptionHelper.exe b/App/encryption/ownCloudPortableEncryptionHelper.exe
new file mode 100644
index 0000000..bd51b5d
Binary files /dev/null and b/App/encryption/ownCloudPortableEncryptionHelper.exe differ
diff --git a/start-hidden.bat b/App/encryption/start-hidden.bat
similarity index 80%
rename from start-hidden.bat
rename to App/encryption/start-hidden.bat
index c5e9c6a..d9c5515 100644
--- a/start-hidden.bat
+++ b/App/encryption/start-hidden.bat
@@ -3,4 +3,4 @@
 :: Get the password
 powershell -Command $pword = read-host "Enter password" -AsSecureString ; $BSTR=[System.Runtime.InteropServices.Marshal]::SecureStringToBSTR($pword) ; [System.Runtime.InteropServices.Marshal]::PtrToStringAuto($BSTR) > .tmp.txt & set /p passwd=<.tmp.txt & del .tmp.txt
 
-wscript.exe hidden.vbs start.bat %passwd%
+wscript.exe hidden.vbs ownCloudPortableEncryptionHelper.exe %passwd% %1
diff --git a/App/encryption/start.bat b/App/encryption/start.bat
new file mode 100644
index 0000000..64d456b
--- /dev/null
+++ b/App/encryption/start.bat
@@ -0,0 +1,39 @@
+::@echo off
+set CONFIG_ARCHIV="..\..\Data\config.7z"
+set DATA_ARCHIV="ownCloudData.7z"
+:: [ 0 | 1 | 3 | 5 | 7 | 9 ]
+set COMPRESSION=0
+set SEVENEXE="libs\7-Zip\7za.exe"
+set PASSWD=%1
+set RUNTIME_CONFIG_DIR=%USERPROFILE%\AppData\Local\ownCloud
+set PAPPS_DOCUMENTS_DIR=%2
+set RUNTIME_OWNCLOUD_DATA_DIR=%PAPPS_DOCUMENTS_DIR%ownCloud
+set LOG_FILE="..\..\Data\ownCloudPortableEncryption.log"
+
+echo This is the ownCloudPortable encryption starter script! > %LOG_FILE%
+echo Configuration: >> %LOG_FILE%
+echo \t CONFIG_ARCHIV = %CONFIG_ARCHIV% >> %LOG_FILE%
+echo \t DATA_ARCHIV = %PAPPS_DOCUMENTS_DIR%%DATA_ARCHIV% >> %LOG_FILE%
+
+if exist %CONFIG_ARCHIV% (
+	echo Extracting portable ownCloud client config and data... >> %LOG_FILE%
+	%SEVENEXE% x %CONFIG_ARCHIV% -o%RUNTIME_CONFIG_DIR% -p%PASSWD% -y >> %LOG_FILE%
+	%SEVENEXE% x %PAPPS_DOCUMENTS_DIR%%DATA_ARCHIV% -o%RUNTIME_OWNCLOUD_DATA_DIR% -r -p%PASSWD% -y >> %LOG_FILE%
+	del /s /f /q %PAPPS_DOCUMENTS_DIR%%DATA_ARCHIV%
+)
+
+echo Starting ownCloud client. >> %LOG_FILE%
+START /WAIT ..\ownCloud\ownCloud.exe >> %LOG_FILE%
+
+echo Encrypting ownCloud client config and data... >> %LOG_FILE%
+:: Explanation:
+::   -mhe to encrypt headers so nobody can browse the archive
+::   -mx0 to not compress the archiv (only for performance)
+%SEVENEXE% u %CONFIG_ARCHIV% %RUNTIME_CONFIG_DIR%\owncloud.cfg -mx%COMPRESSION% -mhe -p%PASSWD% -y >> %LOG_FILE%
+%SEVENEXE% a %PAPPS_DOCUMENTS_DIR%%DATA_ARCHIV% %RUNTIME_OWNCLOUD_DATA_DIR%\* -mx%COMPRESSION% -mhe -p%PASSWD% -y >> %LOG_FILE%
+
+echo Securely removing data from this computer... >> %LOG_FILE%
+del /s /f /q %RUNTIME_OWNCLOUD_DATA_DIR% & rd /s /q %RUNTIME_OWNCLOUD_DATA_DIR% >> %LOG_FILE%
+del /s /f /q %RUNTIME_CONFIG_DIR%\owncloud.cfg >> %LOG_FILE%
+
+:exit
diff --git a/App/ownCloud/CPack.GenericLicense.txt b/App/ownCloud/CPack.GenericLicense.txt
new file mode 100644
index 0000000..c211bb3
--- /dev/null
+++ b/App/ownCloud/CPack.GenericLicense.txt
@@ -0,0 +1,5 @@
+LICENSE
+=======
+
+This is an installer created using CPack (http://www.cmake.org). No license provided.
+
diff --git a/App/ownCloud/Qt5Core.dll b/App/ownCloud/Qt5Core.dll
new file mode 100644
index 0000000..b3419cc
Binary files /dev/null and b/App/ownCloud/Qt5Core.dll differ
diff --git a/App/ownCloud/Qt5Gui.dll b/App/ownCloud/Qt5Gui.dll
new file mode 100644
index 0000000..9b16871
Binary files /dev/null and b/App/ownCloud/Qt5Gui.dll differ
diff --git a/App/ownCloud/Qt5Multimedia.dll b/App/ownCloud/Qt5Multimedia.dll
new file mode 100644
index 0000000..472b007
Binary files /dev/null and b/App/ownCloud/Qt5Multimedia.dll differ
diff --git a/App/ownCloud/Qt5MultimediaWidgets.dll b/App/ownCloud/Qt5MultimediaWidgets.dll
new file mode 100644
index 0000000..b8d3c32
Binary files /dev/null and b/App/ownCloud/Qt5MultimediaWidgets.dll differ
diff --git a/App/ownCloud/Qt5Network.dll b/App/ownCloud/Qt5Network.dll
new file mode 100644
index 0000000..6f56011
Binary files /dev/null and b/App/ownCloud/Qt5Network.dll differ
diff --git a/App/ownCloud/Qt5OpenGL.dll b/App/ownCloud/Qt5OpenGL.dll
new file mode 100644
index 0000000..d266408
Binary files /dev/null and b/App/ownCloud/Qt5OpenGL.dll differ
diff --git a/App/ownCloud/Qt5PrintSupport.dll b/App/ownCloud/Qt5PrintSupport.dll
new file mode 100644
index 0000000..c5244a5
Binary files /dev/null and b/App/ownCloud/Qt5PrintSupport.dll differ
diff --git a/App/ownCloud/Qt5Qml.dll b/App/ownCloud/Qt5Qml.dll
new file mode 100644
index 0000000..d106a98
Binary files /dev/null and b/App/ownCloud/Qt5Qml.dll differ
diff --git a/App/ownCloud/Qt5Quick.dll b/App/ownCloud/Qt5Quick.dll
new file mode 100644
index 0000000..4acfafb
Binary files /dev/null and b/App/ownCloud/Qt5Quick.dll differ
diff --git a/App/ownCloud/Qt5Sensors.dll b/App/ownCloud/Qt5Sensors.dll
new file mode 100644
index 0000000..2d79238
Binary files /dev/null and b/App/ownCloud/Qt5Sensors.dll differ
diff --git a/App/ownCloud/Qt5Sql.dll b/App/ownCloud/Qt5Sql.dll
new file mode 100644
index 0000000..6fad3ca
Binary files /dev/null and b/App/ownCloud/Qt5Sql.dll differ
diff --git a/App/ownCloud/Qt5WebKit.dll b/App/ownCloud/Qt5WebKit.dll
new file mode 100644
index 0000000..333bebd
Binary files /dev/null and b/App/ownCloud/Qt5WebKit.dll differ
diff --git a/App/ownCloud/Qt5WebKitWidgets.dll b/App/ownCloud/Qt5WebKitWidgets.dll
new file mode 100644
index 0000000..ba45047
Binary files /dev/null and b/App/ownCloud/Qt5WebKitWidgets.dll differ
diff --git a/App/ownCloud/Qt5Widgets.dll b/App/ownCloud/Qt5Widgets.dll
new file mode 100644
index 0000000..f99251c
Binary files /dev/null and b/App/ownCloud/Qt5Widgets.dll differ
diff --git a/App/ownCloud/Qt5Xml.dll b/App/ownCloud/Qt5Xml.dll
new file mode 100644
index 0000000..3bbe97b
Binary files /dev/null and b/App/ownCloud/Qt5Xml.dll differ
diff --git a/App/ownCloud/client_TW.qm b/App/ownCloud/client_TW.qm
new file mode 100644
index 0000000..2757763
Binary files /dev/null and b/App/ownCloud/client_TW.qm differ
diff --git a/App/ownCloud/client_ca.qm b/App/ownCloud/client_ca.qm
new file mode 100644
index 0000000..332e1b2
Binary files /dev/null and b/App/ownCloud/client_ca.qm differ
diff --git a/App/ownCloud/client_cs.qm b/App/ownCloud/client_cs.qm
new file mode 100644
index 0000000..7cadd12
Binary files /dev/null and b/App/ownCloud/client_cs.qm differ
diff --git a/App/ownCloud/client_de.qm b/App/ownCloud/client_de.qm
new file mode 100644
index 0000000..92ebac6
Binary files /dev/null and b/App/ownCloud/client_de.qm differ
diff --git a/App/ownCloud/client_el.qm b/App/ownCloud/client_el.qm
new file mode 100644
index 0000000..c562d3d
Binary files /dev/null and b/App/ownCloud/client_el.qm differ
diff --git a/App/ownCloud/client_en.qm b/App/ownCloud/client_en.qm
new file mode 100644
index 0000000..9dad8df
Binary files /dev/null and b/App/ownCloud/client_en.qm differ
diff --git a/App/ownCloud/client_es.qm b/App/ownCloud/client_es.qm
new file mode 100644
index 0000000..99cd171
Binary files /dev/null and b/App/ownCloud/client_es.qm differ
diff --git a/App/ownCloud/client_es_AR.qm b/App/ownCloud/client_es_AR.qm
new file mode 100644
index 0000000..94f2c4c
Binary files /dev/null and b/App/ownCloud/client_es_AR.qm differ
diff --git a/App/ownCloud/client_et.qm b/App/ownCloud/client_et.qm
new file mode 100644
index 0000000..8043f19
Binary files /dev/null and b/App/ownCloud/client_et.qm differ
diff --git a/App/ownCloud/client_eu.qm b/App/ownCloud/client_eu.qm
new file mode 100644
index 0000000..e96372e
Binary files /dev/null and b/App/ownCloud/client_eu.qm differ
diff --git a/App/ownCloud/client_fa.qm b/App/ownCloud/client_fa.qm
new file mode 100644
index 0000000..84c6f82
Binary files /dev/null and b/App/ownCloud/client_fa.qm differ
diff --git a/App/ownCloud/client_fi.qm b/App/ownCloud/client_fi.qm
new file mode 100644
index 0000000..cb755a8
Binary files /dev/null and b/App/ownCloud/client_fi.qm differ
diff --git a/App/ownCloud/client_fr.qm b/App/ownCloud/client_fr.qm
new file mode 100644
index 0000000..b65e0a7
Binary files /dev/null and b/App/ownCloud/client_fr.qm differ
diff --git a/App/ownCloud/client_gl.qm b/App/ownCloud/client_gl.qm
new file mode 100644
index 0000000..21f2b50
Binary files /dev/null and b/App/ownCloud/client_gl.qm differ
diff --git a/App/ownCloud/client_hu.qm b/App/ownCloud/client_hu.qm
new file mode 100644
index 0000000..0b9ae76
Binary files /dev/null and b/App/ownCloud/client_hu.qm differ
diff --git a/App/ownCloud/client_it.qm b/App/ownCloud/client_it.qm
new file mode 100644
index 0000000..69bc7e7
Binary files /dev/null and b/App/ownCloud/client_it.qm differ
diff --git a/App/ownCloud/client_ja.qm b/App/ownCloud/client_ja.qm
new file mode 100644
index 0000000..708ec37
Binary files /dev/null and b/App/ownCloud/client_ja.qm differ
diff --git a/App/ownCloud/client_nl.qm b/App/ownCloud/client_nl.qm
new file mode 100644
index 0000000..92006c5
Binary files /dev/null and b/App/ownCloud/client_nl.qm differ
diff --git a/App/ownCloud/client_pl.qm b/App/ownCloud/client_pl.qm
new file mode 100644
index 0000000..cca5e76
Binary files /dev/null and b/App/ownCloud/client_pl.qm differ
diff --git a/App/ownCloud/client_pt.qm b/App/ownCloud/client_pt.qm
new file mode 100644
index 0000000..819adc3
Binary files /dev/null and b/App/ownCloud/client_pt.qm differ
diff --git a/App/ownCloud/client_pt_BR.qm b/App/ownCloud/client_pt_BR.qm
new file mode 100644
index 0000000..902744a
Binary files /dev/null and b/App/ownCloud/client_pt_BR.qm differ
diff --git a/App/ownCloud/client_ru.qm b/App/ownCloud/client_ru.qm
new file mode 100644
index 0000000..3c87695
Binary files /dev/null and b/App/ownCloud/client_ru.qm differ
diff --git a/App/ownCloud/client_sk.qm b/App/ownCloud/client_sk.qm
new file mode 100644
index 0000000..d259661
Binary files /dev/null and b/App/ownCloud/client_sk.qm differ
diff --git a/App/ownCloud/client_sl.qm b/App/ownCloud/client_sl.qm
new file mode 100644
index 0000000..2597753
Binary files /dev/null and b/App/ownCloud/client_sl.qm differ
diff --git a/App/ownCloud/client_sv.qm b/App/ownCloud/client_sv.qm
new file mode 100644
index 0000000..26f1318
Binary files /dev/null and b/App/ownCloud/client_sv.qm differ
diff --git a/App/ownCloud/client_th.qm b/App/ownCloud/client_th.qm
new file mode 100644
index 0000000..142f6a5
Binary files /dev/null and b/App/ownCloud/client_th.qm differ
diff --git a/App/ownCloud/client_tr.qm b/App/ownCloud/client_tr.qm
new file mode 100644
index 0000000..30fc6eb
Binary files /dev/null and b/App/ownCloud/client_tr.qm differ
diff --git a/App/ownCloud/client_uk.qm b/App/ownCloud/client_uk.qm
new file mode 100644
index 0000000..e47d82f
Binary files /dev/null and b/App/ownCloud/client_uk.qm differ
diff --git a/App/ownCloud/client_zh_CN.qm b/App/ownCloud/client_zh_CN.qm
new file mode 100644
index 0000000..af4b279
Binary files /dev/null and b/App/ownCloud/client_zh_CN.qm differ
diff --git a/App/ownCloud/client_zh_TW.qm b/App/ownCloud/client_zh_TW.qm
new file mode 100644
index 0000000..2ef9829
Binary files /dev/null and b/App/ownCloud/client_zh_TW.qm differ
diff --git a/App/ownCloud/icudata53.dll b/App/ownCloud/icudata53.dll
new file mode 100644
index 0000000..9c9f23e
Binary files /dev/null and b/App/ownCloud/icudata53.dll differ
diff --git a/App/ownCloud/icui18n53.dll b/App/ownCloud/icui18n53.dll
new file mode 100644
index 0000000..0960fe8
Binary files /dev/null and b/App/ownCloud/icui18n53.dll differ
diff --git a/App/ownCloud/icuuc53.dll b/App/ownCloud/icuuc53.dll
new file mode 100644
index 0000000..b447d3c
Binary files /dev/null and b/App/ownCloud/icuuc53.dll differ
diff --git a/App/ownCloud/imageformats/qgif.dll b/App/ownCloud/imageformats/qgif.dll
new file mode 100644
index 0000000..af6dc6d
Binary files /dev/null and b/App/ownCloud/imageformats/qgif.dll differ
diff --git a/App/ownCloud/imageformats/qico.dll b/App/ownCloud/imageformats/qico.dll
new file mode 100644
index 0000000..7550367
Binary files /dev/null and b/App/ownCloud/imageformats/qico.dll differ
diff --git a/App/ownCloud/imageformats/qjpeg.dll b/App/ownCloud/imageformats/qjpeg.dll
new file mode 100644
index 0000000..07a4de3
Binary files /dev/null and b/App/ownCloud/imageformats/qjpeg.dll differ
diff --git a/App/ownCloud/libEGL.dll b/App/ownCloud/libEGL.dll
new file mode 100644
index 0000000..48256a8
Binary files /dev/null and b/App/ownCloud/libEGL.dll differ
diff --git a/App/ownCloud/libGLESv2.dll b/App/ownCloud/libGLESv2.dll
new file mode 100644
index 0000000..37be422
Binary files /dev/null and b/App/ownCloud/libGLESv2.dll differ
diff --git a/App/ownCloud/libcrypto-10.dll b/App/ownCloud/libcrypto-10.dll
new file mode 100644
index 0000000..a6d2c1a
Binary files /dev/null and b/App/ownCloud/libcrypto-10.dll differ
diff --git a/App/ownCloud/libgcc_s_sjlj-1.dll b/App/ownCloud/libgcc_s_sjlj-1.dll
new file mode 100644
index 0000000..6859385
Binary files /dev/null and b/App/ownCloud/libgcc_s_sjlj-1.dll differ
diff --git a/App/ownCloud/libjpeg-8.dll b/App/ownCloud/libjpeg-8.dll
new file mode 100644
index 0000000..a2a5055
Binary files /dev/null and b/App/ownCloud/libjpeg-8.dll differ
diff --git a/App/ownCloud/libocsync.dll b/App/ownCloud/libocsync.dll
new file mode 100644
index 0000000..887057b
Binary files /dev/null and b/App/ownCloud/libocsync.dll differ
diff --git a/App/ownCloud/libowncloudsync.dll b/App/ownCloud/libowncloudsync.dll
new file mode 100644
index 0000000..b379500
Binary files /dev/null and b/App/ownCloud/libowncloudsync.dll differ
diff --git a/App/ownCloud/libpcre16-0.dll b/App/ownCloud/libpcre16-0.dll
new file mode 100644
index 0000000..af3118d
Binary files /dev/null and b/App/ownCloud/libpcre16-0.dll differ
diff --git a/App/ownCloud/libpng16-16.dll b/App/ownCloud/libpng16-16.dll
new file mode 100644
index 0000000..a874876
Binary files /dev/null and b/App/ownCloud/libpng16-16.dll differ
diff --git a/App/ownCloud/libqt5keychain.dll b/App/ownCloud/libqt5keychain.dll
new file mode 100644
index 0000000..1b9a804
Binary files /dev/null and b/App/ownCloud/libqt5keychain.dll differ
diff --git a/App/ownCloud/libsqlite3-0.dll b/App/ownCloud/libsqlite3-0.dll
new file mode 100644
index 0000000..87ae81b
Binary files /dev/null and b/App/ownCloud/libsqlite3-0.dll differ
diff --git a/App/ownCloud/libssl-10.dll b/App/ownCloud/libssl-10.dll
new file mode 100644
index 0000000..cf4a2d9
Binary files /dev/null and b/App/ownCloud/libssl-10.dll differ
diff --git a/App/ownCloud/libstdc++-6.dll b/App/ownCloud/libstdc++-6.dll
new file mode 100644
index 0000000..e9aeae2
Binary files /dev/null and b/App/ownCloud/libstdc++-6.dll differ
diff --git a/App/ownCloud/libwebp-4.dll b/App/ownCloud/libwebp-4.dll
new file mode 100644
index 0000000..61031ff
Binary files /dev/null and b/App/ownCloud/libwebp-4.dll differ
diff --git a/App/ownCloud/libwinpthread-1.dll b/App/ownCloud/libwinpthread-1.dll
new file mode 100644
index 0000000..b731b0e
Binary files /dev/null and b/App/ownCloud/libwinpthread-1.dll differ
diff --git a/App/ownCloud/libxml2-2.dll b/App/ownCloud/libxml2-2.dll
new file mode 100644
index 0000000..b28b811
Binary files /dev/null and b/App/ownCloud/libxml2-2.dll differ
diff --git a/App/ownCloud/libxslt-1.dll b/App/ownCloud/libxslt-1.dll
new file mode 100644
index 0000000..7573537
Binary files /dev/null and b/App/ownCloud/libxslt-1.dll differ
diff --git a/App/ownCloud/owncloud.exe b/App/ownCloud/owncloud.exe
new file mode 100644
index 0000000..ddecf12
Binary files /dev/null and b/App/ownCloud/owncloud.exe differ
diff --git a/App/ownCloud/owncloud_crash_reporter.exe b/App/ownCloud/owncloud_crash_reporter.exe
new file mode 100644
index 0000000..da6e77a
Binary files /dev/null and b/App/ownCloud/owncloud_crash_reporter.exe differ
diff --git a/App/ownCloud/owncloudcmd.exe b/App/ownCloud/owncloudcmd.exe
new file mode 100644
index 0000000..c5bb4eb
Binary files /dev/null and b/App/ownCloud/owncloudcmd.exe differ
diff --git a/App/ownCloud/platforms/qwindows.dll b/App/ownCloud/platforms/qwindows.dll
new file mode 100644
index 0000000..c0b93ab
Binary files /dev/null and b/App/ownCloud/platforms/qwindows.dll differ
diff --git a/App/ownCloud/qt_ar.qm b/App/ownCloud/qt_ar.qm
new file mode 100644
index 0000000..e524d5b
Binary files /dev/null and b/App/ownCloud/qt_ar.qm differ
diff --git a/App/ownCloud/qt_ca.qm b/App/ownCloud/qt_ca.qm
new file mode 100644
index 0000000..adf9cde
Binary files /dev/null and b/App/ownCloud/qt_ca.qm differ
diff --git a/App/ownCloud/qt_cs.qm b/App/ownCloud/qt_cs.qm
new file mode 100644
index 0000000..b04e24c
Binary files /dev/null and b/App/ownCloud/qt_cs.qm differ
diff --git a/App/ownCloud/qt_da.qm b/App/ownCloud/qt_da.qm
new file mode 100644
index 0000000..1e7dda6
Binary files /dev/null and b/App/ownCloud/qt_da.qm differ
diff --git a/App/ownCloud/qt_de.qm b/App/ownCloud/qt_de.qm
new file mode 100644
index 0000000..3650eec
Binary files /dev/null and b/App/ownCloud/qt_de.qm differ
diff --git a/App/ownCloud/qt_es.qm b/App/ownCloud/qt_es.qm
new file mode 100644
index 0000000..5191160
Binary files /dev/null and b/App/ownCloud/qt_es.qm differ
diff --git a/App/ownCloud/qt_fa.qm b/App/ownCloud/qt_fa.qm
new file mode 100644
index 0000000..103df26
Binary files /dev/null and b/App/ownCloud/qt_fa.qm differ
diff --git a/App/ownCloud/qt_fi.qm b/App/ownCloud/qt_fi.qm
new file mode 100644
index 0000000..c784676
Binary files /dev/null and b/App/ownCloud/qt_fi.qm differ
diff --git a/App/ownCloud/qt_fr.qm b/App/ownCloud/qt_fr.qm
new file mode 100644
index 0000000..a3e8eaf
Binary files /dev/null and b/App/ownCloud/qt_fr.qm differ
diff --git a/App/ownCloud/qt_gl.qm b/App/ownCloud/qt_gl.qm
new file mode 100644
index 0000000..bbc92ce
Binary files /dev/null and b/App/ownCloud/qt_gl.qm differ
diff --git a/App/ownCloud/qt_he.qm b/App/ownCloud/qt_he.qm
new file mode 100644
index 0000000..4ff507e
Binary files /dev/null and b/App/ownCloud/qt_he.qm differ
diff --git a/App/ownCloud/qt_hu.qm b/App/ownCloud/qt_hu.qm
new file mode 100644
index 0000000..fe78c34
Binary files /dev/null and b/App/ownCloud/qt_hu.qm differ
diff --git a/App/ownCloud/qt_it.qm b/App/ownCloud/qt_it.qm
new file mode 100644
index 0000000..a4b9f25
Binary files /dev/null and b/App/ownCloud/qt_it.qm differ
diff --git a/App/ownCloud/qt_ja.qm b/App/ownCloud/qt_ja.qm
new file mode 100644
index 0000000..99648ea
Binary files /dev/null and b/App/ownCloud/qt_ja.qm differ
diff --git a/App/ownCloud/qt_ko.qm b/App/ownCloud/qt_ko.qm
new file mode 100644
index 0000000..31f2b67
Binary files /dev/null and b/App/ownCloud/qt_ko.qm differ
diff --git a/App/ownCloud/qt_lt.qm b/App/ownCloud/qt_lt.qm
new file mode 100644
index 0000000..bdd0f98
Binary files /dev/null and b/App/ownCloud/qt_lt.qm differ
diff --git a/App/ownCloud/qt_pl.qm b/App/ownCloud/qt_pl.qm
new file mode 100644
index 0000000..2967b46
Binary files /dev/null and b/App/ownCloud/qt_pl.qm differ
diff --git a/App/ownCloud/qt_pt.qm b/App/ownCloud/qt_pt.qm
new file mode 100644
index 0000000..fc92511
Binary files /dev/null and b/App/ownCloud/qt_pt.qm differ
diff --git a/App/ownCloud/qt_ru.qm b/App/ownCloud/qt_ru.qm
new file mode 100644
index 0000000..d54bae8
Binary files /dev/null and b/App/ownCloud/qt_ru.qm differ
diff --git a/App/ownCloud/qt_sk.qm b/App/ownCloud/qt_sk.qm
new file mode 100644
index 0000000..9e8f862
Binary files /dev/null and b/App/ownCloud/qt_sk.qm differ
diff --git a/App/ownCloud/qt_sl.qm b/App/ownCloud/qt_sl.qm
new file mode 100644
index 0000000..46428f3
Binary files /dev/null and b/App/ownCloud/qt_sl.qm differ
diff --git a/App/ownCloud/qt_sv.qm b/App/ownCloud/qt_sv.qm
new file mode 100644
index 0000000..f3556bc
Binary files /dev/null and b/App/ownCloud/qt_sv.qm differ
diff --git a/App/ownCloud/qt_uk.qm b/App/ownCloud/qt_uk.qm
new file mode 100644
index 0000000..2d9dabc
Binary files /dev/null and b/App/ownCloud/qt_uk.qm differ
diff --git a/App/ownCloud/qt_zh_CN.qm b/App/ownCloud/qt_zh_CN.qm
new file mode 100644
index 0000000..623b8e3
Binary files /dev/null and b/App/ownCloud/qt_zh_CN.qm differ
diff --git a/App/ownCloud/qt_zh_TW.qm b/App/ownCloud/qt_zh_TW.qm
new file mode 100644
index 0000000..a9a25b2
Binary files /dev/null and b/App/ownCloud/qt_zh_TW.qm differ
diff --git a/App/ownCloud/qtbase_ca.qm b/App/ownCloud/qtbase_ca.qm
new file mode 100644
index 0000000..e11e4fe
Binary files /dev/null and b/App/ownCloud/qtbase_ca.qm differ
diff --git a/App/ownCloud/qtbase_cs.qm b/App/ownCloud/qtbase_cs.qm
new file mode 100644
index 0000000..722d6c4
Binary files /dev/null and b/App/ownCloud/qtbase_cs.qm differ
diff --git a/App/ownCloud/qtbase_de.qm b/App/ownCloud/qtbase_de.qm
new file mode 100644
index 0000000..2c89706
Binary files /dev/null and b/App/ownCloud/qtbase_de.qm differ
diff --git a/App/ownCloud/qtbase_fi.qm b/App/ownCloud/qtbase_fi.qm
new file mode 100644
index 0000000..c76b228
Binary files /dev/null and b/App/ownCloud/qtbase_fi.qm differ
diff --git a/App/ownCloud/qtbase_hu.qm b/App/ownCloud/qtbase_hu.qm
new file mode 100644
index 0000000..64ce7fe
Binary files /dev/null and b/App/ownCloud/qtbase_hu.qm differ
diff --git a/App/ownCloud/qtbase_it.qm b/App/ownCloud/qtbase_it.qm
new file mode 100644
index 0000000..bffac5a
Binary files /dev/null and b/App/ownCloud/qtbase_it.qm differ
diff --git a/App/ownCloud/qtbase_ja.qm b/App/ownCloud/qtbase_ja.qm
new file mode 100644
index 0000000..a22860a
Binary files /dev/null and b/App/ownCloud/qtbase_ja.qm differ
diff --git a/App/ownCloud/qtbase_lv.qm b/App/ownCloud/qtbase_lv.qm
new file mode 100644
index 0000000..a0cd9d3
Binary files /dev/null and b/App/ownCloud/qtbase_lv.qm differ
diff --git a/App/ownCloud/qtbase_ru.qm b/App/ownCloud/qtbase_ru.qm
new file mode 100644
index 0000000..eb5c743
Binary files /dev/null and b/App/ownCloud/qtbase_ru.qm differ
diff --git a/App/ownCloud/qtbase_sk.qm b/App/ownCloud/qtbase_sk.qm
new file mode 100644
index 0000000..630595b
Binary files /dev/null and b/App/ownCloud/qtbase_sk.qm differ
diff --git a/App/ownCloud/qtbase_uk.qm b/App/ownCloud/qtbase_uk.qm
new file mode 100644
index 0000000..1441866
Binary files /dev/null and b/App/ownCloud/qtbase_uk.qm differ
diff --git a/App/ownCloud/qtkeychain_de.qm b/App/ownCloud/qtkeychain_de.qm
new file mode 100644
index 0000000..202fe5e
Binary files /dev/null and b/App/ownCloud/qtkeychain_de.qm differ
diff --git a/App/ownCloud/qtkeychain_ro.qm b/App/ownCloud/qtkeychain_ro.qm
new file mode 100644
index 0000000..ecd5412
Binary files /dev/null and b/App/ownCloud/qtkeychain_ro.qm differ
diff --git a/App/ownCloud/shellext/OCContextMenu_x64.dll b/App/ownCloud/shellext/OCContextMenu_x64.dll
new file mode 100644
index 0000000..c6c6ff4
Binary files /dev/null and b/App/ownCloud/shellext/OCContextMenu_x64.dll differ
diff --git a/App/ownCloud/shellext/OCOverlays_x64.dll b/App/ownCloud/shellext/OCOverlays_x64.dll
new file mode 100644
index 0000000..a739fa4
Binary files /dev/null and b/App/ownCloud/shellext/OCOverlays_x64.dll differ
diff --git a/App/ownCloud/shellext/OCUtil_x64.dll b/App/ownCloud/shellext/OCUtil_x64.dll
new file mode 100644
index 0000000..6e9ea3b
Binary files /dev/null and b/App/ownCloud/shellext/OCUtil_x64.dll differ
diff --git a/App/ownCloud/sqldrivers/qsqlite.dll b/App/ownCloud/sqldrivers/qsqlite.dll
new file mode 100644
index 0000000..ff11743
Binary files /dev/null and b/App/ownCloud/sqldrivers/qsqlite.dll differ
diff --git a/App/ownCloud/sync-exclude.lst b/App/ownCloud/sync-exclude.lst
new file mode 100644
index 0000000..7c68bf3
--- /dev/null
+++ b/App/ownCloud/sync-exclude.lst
@@ -0,0 +1,41 @@
+*.filepart
+*~
+*.part
+*.crdownload
+
+*.unison*
+*csync_timedif.ctmp*
+.csync_journal.db
+.csync_journal.db.ctmp
+.owncloudsync.log
+
+.*.sw?
+.*.*sw?
+].csync-progressdatabase
+
+].DS_Store
+].ds_store
+._*
+]Thumbs.db
+desktop.ini
+
+*.kate-swp
+
+*_conflict-*
+]*.~*
+
+].TemporaryItems
+].Trashes
+].DocumentRevisions-V100
+.fseventd
+.apdisk
+
+.htaccess
+
+]Icon\r*
+
+~$*
+.~lock.*
+*.tmp
+
+*.gnucash.tmp-*
\ No newline at end of file
diff --git a/App/ownCloud/uninstall.exe b/App/ownCloud/uninstall.exe
new file mode 100644
index 0000000..70e898f
Binary files /dev/null and b/App/ownCloud/uninstall.exe differ
diff --git a/App/ownCloud/zlib1.dll b/App/ownCloud/zlib1.dll
new file mode 100644
index 0000000..f37e952
Binary files /dev/null and b/App/ownCloud/zlib1.dll differ
diff --git a/README.md b/README.md
index 6b85e5d..4beed1e 100644
--- a/README.md
+++ b/README.md
@@ -18,3 +18,7 @@ Currently packaged is the ownCloud client version 1.8.0 (build 4893) from https:
 For encrypted packaging a 7za.exe is included. This is the official portable one in version 9.38 beta from http://www.7-zip.org/download.html.
 
 If you ask yourself if 7-Zip is secure enough, please reefer to http://security.stackexchange.com/questions/29375/is-7-zips-aes-encryption-just-as-secure-as-truecrypts-version.
+
+### Bat To Exe Converter
+To convert the start.bat to .exe I used Bat To Exe Converter version 2.2.0.0 from http://www.f2ko.de/en/b2e.php.
+Currently I need an .exe file because the PortableApps Launcher cannot handle .bat files with the [WaitForEXEN](http://portableapps.com/manuals/PortableApps.comLauncher/ref/launcher.ini/launch.html#waitforexen) setting.
diff --git a/ownCloudPortable.exe b/ownCloudPortable.exe
new file mode 100644
index 0000000..ce6a21b
Binary files /dev/null and b/ownCloudPortable.exe differ
diff --git a/start.bat b/start.bat
deleted file mode 100644
index 2a14978..0000000
--- a/start.bat
+++ /dev/null
@@ -1,47 +0,0 @@
-@echo off
-set ARCHIV="documents-sync.7z"
-:: [ 0 | 1 | 3 | 5 | 7 | 9 ]
-set COMPRESSION=0
-set SEVENEXE="libs\7-Zip\7za.exe"
-set PASSWD=%1
-set LOG_FILE="ownCloudPortable.log"
-
-echo This is the ownCloudPortable starter script! > %LOG_FILE%
-
-if exist %ARCHIV% (
-	echo Extracting portable ownCloud client and data... >> %LOG_FILE%
-
-	%SEVENEXE% x %ARCHIV% -p%PASSWD% -y >> %LOG_FILE%
-
-) else (
-	echo Creating directory structure and downloading client... >> %LOG_FILE%
-
-	mkdir Documents >> %LOG_FILE%
-	::xcopy libs\ownCloudPortable ownCloudPortable\ /E >> %LOG_FILE%
-	%SEVENEXE% x libs\ownCloudPortable.7z -y >> %LOG_FILE%
-)
-
-:: Check if the extraction worked (password verification)
-if not exist ownCloudPortable (
-  echo Something went wrong! >> %LOG_FILE%
-	goto exit
-)
-
-echo Starting ownCloud client. >> %LOG_FILE%
-START /WAIT ownCloudPortable\ownCloudPortable.exe >> %LOG_FILE%
-
-echo Encrypting ownCloud client and data... >> %LOG_FILE%
-:: First we need to remove the old mutable data to guarantee deletion of files.
-%SEVENEXE% d documents-sync.7z ownCloudPortable/Data/* -r -p%PASSWD% -y >> %LOG_FILE%
-%SEVENEXE% d documents-sync.7z Documents/* -r -p%PASSWD% -y >> %LOG_FILE%
-:: Explanation:
-::   -mhe to encrypt headers so nobody can browse the archive
-::   -mx0 to not compress the archiv (only for performance)
-%SEVENEXE% u documents-sync.7z Documents -mx%COMPRESSION% -mhe -p%PASSWD% -y >> %LOG_FILE%
-%SEVENEXE% u documents-sync.7z ownCloudPortable -mx%COMPRESSION% -mhe -p%PASSWD% -y >> %LOG_FILE%
-
-echo Securely removing data from this computer... >> %LOG_FILE%
-del /s /f /q ownCloudPortable & rd /s /q ownCloudPortable >> %LOG_FILE%
-del /s /f /q Documents & rd /s /q Documents >> %LOG_FILE%
-
-:exit