diff --git a/.gitignore b/.gitignore
index 8916ea41e..4290dcd1b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,4 @@ tests/autotests/autotests
 .ycm_extra_conf.py*
 *.stash
 bin/profiles
+CMakeLists.txt.user
diff --git a/bin/locale/qt_ca.qm b/bin/locale/qt_ca.qm
deleted file mode 100644
index 097360310..000000000
Binary files a/bin/locale/qt_ca.qm and /dev/null differ
diff --git a/bin/locale/qt_el.qm b/bin/locale/qt_el.qm
deleted file mode 100644
index 5be1d7ade..000000000
Binary files a/bin/locale/qt_el.qm and /dev/null differ
diff --git a/bin/locale/qt_nl.qm b/bin/locale/qt_nl.qm
deleted file mode 100644
index ce9f56f47..000000000
Binary files a/bin/locale/qt_nl.qm and /dev/null differ
diff --git a/bin/locale/qt_sr.qm b/bin/locale/qt_sr.qm
deleted file mode 100644
index 194e3883f..000000000
Binary files a/bin/locale/qt_sr.qm and /dev/null differ
diff --git a/bin/locale/qt_sr@ijekavian.qm b/bin/locale/qt_sr@ijekavian.qm
deleted file mode 100644
index 5dc63fdb2..000000000
Binary files a/bin/locale/qt_sr@ijekavian.qm and /dev/null differ
diff --git a/bin/locale/qt_sr@ijekavianlatin.qm b/bin/locale/qt_sr@ijekavianlatin.qm
deleted file mode 100644
index 12caafe49..000000000
Binary files a/bin/locale/qt_sr@ijekavianlatin.qm and /dev/null differ
diff --git a/bin/locale/qt_sr@latin.qm b/bin/locale/qt_sr@latin.qm
deleted file mode 100644
index e2211bc58..000000000
Binary files a/bin/locale/qt_sr@latin.qm and /dev/null differ
diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt
index b1a6eaeae..ecc603dde 100644
--- a/src/main/CMakeLists.txt
+++ b/src/main/CMakeLists.txt
@@ -21,19 +21,19 @@ if (APPLE)
     set_target_properties(falkon PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "org.kde.falkon")
     set_target_properties(falkon PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "Falkon")
     install(FILES lib/data/icons/exeicons/qupzilla.icns DESTINATION ${BUNDLE_INSTALL_DIR}/falkon.app/Contents/Resources)
-    install(DIRECTORY ${CMAKE_SOURCE_DIR}/bin/locale DESTINATION ${BUNDLE_INSTALL_DIR}/falkon.app/Contents/Resources)
-    install(DIRECTORY ${CMAKE_SOURCE_DIR}/bin/themes DESTINATION ${BUNDLE_INSTALL_DIR}/falkon.app/Contents/Resources)
-    install(DIRECTORY ${CMAKE_SOURCE_DIR}/bin/plugins DESTINATION ${BUNDLE_INSTALL_DIR}/falkon.app/Contents/Resources)
+    #install(DIRECTORY ${CMAKE_BINARY_DIR}/bin/locale DESTINATION ${BUNDLE_INSTALL_DIR}/falkon.app/Contents/Resources)
+    install(DIRECTORY ${CMAKE_SOURCE_DIR}/themes DESTINATION ${BUNDLE_INSTALL_DIR}/falkon.app/Contents/Resources)
+    install(DIRECTORY ${CMAKE_BINARY_DIR}/bin/plugins DESTINATION ${BUNDLE_INSTALL_DIR}/falkon.app/Contents/Resources)
 endif ()
 
-if (CMAKE_SYSTEM_NAME MATCHES FreeBSD OR CMAKE_SYSTEM_NAME MATCHES OpenBSD OR HAIKU)
+if (CMAKE_SYSTEM_NAME MATCHES FreeBSD OR CMAKE_SYSTEM_NAME MATCHES OpenBSD)
     target_link_libraries(falkon execinfo)
 endif()
 
 if (UNIX AND NOT APPLE)
     install(TARGETS falkon ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
-    install(DIRECTORY ${CMAKE_SOURCE_DIR}/bin/locale DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}) # TODO correct?
-    install(DIRECTORY ${CMAKE_SOURCE_DIR}/bin/themes DESTINATION ${CMAKE_INSTALL_DATAROOTDIR})
+    #install(DIRECTORY ${CMAKE_BINARY_DIR}/bin/locale DESTINATION ${CMAKE_INSTALL_DATAROOTDIR})
+    install(DIRECTORY ${CMAKE_SOURCE_DIR}/themes DESTINATION ${CMAKE_INSTALL_DATAROOTDIR})
 
     install(PROGRAMS ../../linux/applications/org.kde.Falkon.desktop DESTINATION ${KDE_INSTALL_APPDIR})
 
diff --git a/bin/themes/breathe/images/add.png b/themes/breathe/images/add.png
similarity index 100%
rename from bin/themes/breathe/images/add.png
rename to themes/breathe/images/add.png
diff --git a/bin/themes/breathe/images/find.png b/themes/breathe/images/find.png
similarity index 100%
rename from bin/themes/breathe/images/find.png
rename to themes/breathe/images/find.png
diff --git a/bin/themes/breathe/images/goto.png b/themes/breathe/images/goto.png
similarity index 100%
rename from bin/themes/breathe/images/goto.png
rename to themes/breathe/images/goto.png
diff --git a/bin/themes/breathe/images/home.png b/themes/breathe/images/home.png
similarity index 100%
rename from bin/themes/breathe/images/home.png
rename to themes/breathe/images/home.png
diff --git a/bin/themes/breathe/images/library-bg.png b/themes/breathe/images/library-bg.png
similarity index 100%
rename from bin/themes/breathe/images/library-bg.png
rename to themes/breathe/images/library-bg.png
diff --git a/bin/themes/breathe/images/lineedit-bg.png b/themes/breathe/images/lineedit-bg.png
similarity index 100%
rename from bin/themes/breathe/images/lineedit-bg.png
rename to themes/breathe/images/lineedit-bg.png
diff --git a/bin/themes/breathe/images/login.png b/themes/breathe/images/login.png
similarity index 100%
rename from bin/themes/breathe/images/login.png
rename to themes/breathe/images/login.png
diff --git a/bin/themes/breathe/images/menu.png b/themes/breathe/images/menu.png
similarity index 100%
rename from bin/themes/breathe/images/menu.png
rename to themes/breathe/images/menu.png
diff --git a/bin/themes/breathe/images/navigation-dropdown.png b/themes/breathe/images/navigation-dropdown.png
similarity index 100%
rename from bin/themes/breathe/images/navigation-dropdown.png
rename to themes/breathe/images/navigation-dropdown.png
diff --git a/bin/themes/breathe/images/next.png b/themes/breathe/images/next.png
similarity index 100%
rename from bin/themes/breathe/images/next.png
rename to themes/breathe/images/next.png
diff --git a/bin/themes/breathe/images/previous.png b/themes/breathe/images/previous.png
similarity index 100%
rename from bin/themes/breathe/images/previous.png
rename to themes/breathe/images/previous.png
diff --git a/bin/themes/breathe/images/reload.png b/themes/breathe/images/reload.png
similarity index 100%
rename from bin/themes/breathe/images/reload.png
rename to themes/breathe/images/reload.png
diff --git a/bin/themes/breathe/images/restore.png b/themes/breathe/images/restore.png
similarity index 100%
rename from bin/themes/breathe/images/restore.png
rename to themes/breathe/images/restore.png
diff --git a/bin/themes/breathe/images/semi-transp.png b/themes/breathe/images/semi-transp.png
similarity index 100%
rename from bin/themes/breathe/images/semi-transp.png
rename to themes/breathe/images/semi-transp.png
diff --git a/bin/themes/breathe/images/siteicon-bg-a.png b/themes/breathe/images/siteicon-bg-a.png
similarity index 100%
rename from bin/themes/breathe/images/siteicon-bg-a.png
rename to themes/breathe/images/siteicon-bg-a.png
diff --git a/bin/themes/breathe/images/siteicon-bg-h.png b/themes/breathe/images/siteicon-bg-h.png
similarity index 100%
rename from bin/themes/breathe/images/siteicon-bg-h.png
rename to themes/breathe/images/siteicon-bg-h.png
diff --git a/bin/themes/breathe/images/siteicon-bg.png b/themes/breathe/images/siteicon-bg.png
similarity index 100%
rename from bin/themes/breathe/images/siteicon-bg.png
rename to themes/breathe/images/siteicon-bg.png
diff --git a/bin/themes/breathe/images/siteicon-secure-bg-a.png b/themes/breathe/images/siteicon-secure-bg-a.png
similarity index 100%
rename from bin/themes/breathe/images/siteicon-secure-bg-a.png
rename to themes/breathe/images/siteicon-secure-bg-a.png
diff --git a/bin/themes/breathe/images/siteicon-secure-bg-h.png b/themes/breathe/images/siteicon-secure-bg-h.png
similarity index 100%
rename from bin/themes/breathe/images/siteicon-secure-bg-h.png
rename to themes/breathe/images/siteicon-secure-bg-h.png
diff --git a/bin/themes/breathe/images/siteicon-secure-bg.png b/themes/breathe/images/siteicon-secure-bg.png
similarity index 100%
rename from bin/themes/breathe/images/siteicon-secure-bg.png
rename to themes/breathe/images/siteicon-secure-bg.png
diff --git a/bin/themes/breathe/images/star-a.png b/themes/breathe/images/star-a.png
similarity index 100%
rename from bin/themes/breathe/images/star-a.png
rename to themes/breathe/images/star-a.png
diff --git a/bin/themes/breathe/images/star.png b/themes/breathe/images/star.png
similarity index 100%
rename from bin/themes/breathe/images/star.png
rename to themes/breathe/images/star.png
diff --git a/bin/themes/breathe/images/stop.png b/themes/breathe/images/stop.png
similarity index 100%
rename from bin/themes/breathe/images/stop.png
rename to themes/breathe/images/stop.png
diff --git a/bin/themes/breathe/images/tab-left.png b/themes/breathe/images/tab-left.png
similarity index 100%
rename from bin/themes/breathe/images/tab-left.png
rename to themes/breathe/images/tab-left.png
diff --git a/bin/themes/breathe/images/tab-right.png b/themes/breathe/images/tab-right.png
similarity index 100%
rename from bin/themes/breathe/images/tab-right.png
rename to themes/breathe/images/tab-right.png
diff --git a/bin/themes/breathe/images/tabs-list.png b/themes/breathe/images/tabs-list.png
similarity index 100%
rename from bin/themes/breathe/images/tabs-list.png
rename to themes/breathe/images/tabs-list.png
diff --git a/bin/themes/breathe/images/transp.png b/themes/breathe/images/transp.png
similarity index 100%
rename from bin/themes/breathe/images/transp.png
rename to themes/breathe/images/transp.png
diff --git a/bin/themes/breathe/images/trash.png b/themes/breathe/images/trash.png
similarity index 100%
rename from bin/themes/breathe/images/trash.png
rename to themes/breathe/images/trash.png
diff --git a/bin/themes/breathe/images/websearch-bg-a.png b/themes/breathe/images/websearch-bg-a.png
similarity index 100%
rename from bin/themes/breathe/images/websearch-bg-a.png
rename to themes/breathe/images/websearch-bg-a.png
diff --git a/bin/themes/breathe/images/websearch-bg-h.png b/themes/breathe/images/websearch-bg-h.png
similarity index 100%
rename from bin/themes/breathe/images/websearch-bg-h.png
rename to themes/breathe/images/websearch-bg-h.png
diff --git a/bin/themes/breathe/images/websearch-bg.png b/themes/breathe/images/websearch-bg.png
similarity index 100%
rename from bin/themes/breathe/images/websearch-bg.png
rename to themes/breathe/images/websearch-bg.png
diff --git a/bin/themes/breathe/main.css b/themes/breathe/main.css
similarity index 100%
rename from bin/themes/breathe/main.css
rename to themes/breathe/main.css
diff --git a/bin/themes/breathe/rtl.css b/themes/breathe/rtl.css
similarity index 100%
rename from bin/themes/breathe/rtl.css
rename to themes/breathe/rtl.css
diff --git a/bin/themes/breathe/theme.info b/themes/breathe/theme.info
similarity index 100%
rename from bin/themes/breathe/theme.info
rename to themes/breathe/theme.info
diff --git a/bin/themes/breathe/theme.png b/themes/breathe/theme.png
similarity index 100%
rename from bin/themes/breathe/theme.png
rename to themes/breathe/theme.png
diff --git a/bin/themes/chrome/images/gotoaddress.png b/themes/chrome/images/gotoaddress.png
similarity index 100%
rename from bin/themes/chrome/images/gotoaddress.png
rename to themes/chrome/images/gotoaddress.png
diff --git a/bin/themes/chrome/images/key.png b/themes/chrome/images/key.png
similarity index 100%
rename from bin/themes/chrome/images/key.png
rename to themes/chrome/images/key.png
diff --git a/bin/themes/chrome/images/library-bg.png b/themes/chrome/images/library-bg.png
similarity index 100%
rename from bin/themes/chrome/images/library-bg.png
rename to themes/chrome/images/library-bg.png
diff --git a/bin/themes/chrome/images/lineedit-bg.png b/themes/chrome/images/lineedit-bg.png
similarity index 100%
rename from bin/themes/chrome/images/lineedit-bg.png
rename to themes/chrome/images/lineedit-bg.png
diff --git a/bin/themes/chrome/images/navigation-addtab.png b/themes/chrome/images/navigation-addtab.png
similarity index 100%
rename from bin/themes/chrome/images/navigation-addtab.png
rename to themes/chrome/images/navigation-addtab.png
diff --git a/bin/themes/chrome/images/navigation-back.png b/themes/chrome/images/navigation-back.png
similarity index 100%
rename from bin/themes/chrome/images/navigation-back.png
rename to themes/chrome/images/navigation-back.png
diff --git a/bin/themes/chrome/images/navigation-dropdown.png b/themes/chrome/images/navigation-dropdown.png
similarity index 100%
rename from bin/themes/chrome/images/navigation-dropdown.png
rename to themes/chrome/images/navigation-dropdown.png
diff --git a/bin/themes/chrome/images/navigation-forward.png b/themes/chrome/images/navigation-forward.png
similarity index 100%
rename from bin/themes/chrome/images/navigation-forward.png
rename to themes/chrome/images/navigation-forward.png
diff --git a/bin/themes/chrome/images/navigation-home.png b/themes/chrome/images/navigation-home.png
similarity index 100%
rename from bin/themes/chrome/images/navigation-home.png
rename to themes/chrome/images/navigation-home.png
diff --git a/bin/themes/chrome/images/navigation-reload.png b/themes/chrome/images/navigation-reload.png
similarity index 100%
rename from bin/themes/chrome/images/navigation-reload.png
rename to themes/chrome/images/navigation-reload.png
diff --git a/bin/themes/chrome/images/navigation-stop.png b/themes/chrome/images/navigation-stop.png
similarity index 100%
rename from bin/themes/chrome/images/navigation-stop.png
rename to themes/chrome/images/navigation-stop.png
diff --git a/bin/themes/chrome/images/navigation-supermenu.png b/themes/chrome/images/navigation-supermenu.png
similarity index 100%
rename from bin/themes/chrome/images/navigation-supermenu.png
rename to themes/chrome/images/navigation-supermenu.png
diff --git a/bin/themes/chrome/images/search-icon.png b/themes/chrome/images/search-icon.png
similarity index 100%
rename from bin/themes/chrome/images/search-icon.png
rename to themes/chrome/images/search-icon.png
diff --git a/bin/themes/chrome/images/searchbar-provider-bg.png b/themes/chrome/images/searchbar-provider-bg.png
similarity index 100%
rename from bin/themes/chrome/images/searchbar-provider-bg.png
rename to themes/chrome/images/searchbar-provider-bg.png
diff --git a/bin/themes/chrome/images/semi-transp.png b/themes/chrome/images/semi-transp.png
similarity index 100%
rename from bin/themes/chrome/images/semi-transp.png
rename to themes/chrome/images/semi-transp.png
diff --git a/bin/themes/chrome/images/siteicon-bg.png b/themes/chrome/images/siteicon-bg.png
similarity index 100%
rename from bin/themes/chrome/images/siteicon-bg.png
rename to themes/chrome/images/siteicon-bg.png
diff --git a/bin/themes/chrome/images/siteicon-secure-bg.png b/themes/chrome/images/siteicon-secure-bg.png
similarity index 100%
rename from bin/themes/chrome/images/siteicon-secure-bg.png
rename to themes/chrome/images/siteicon-secure-bg.png
diff --git a/bin/themes/chrome/images/star-a.png b/themes/chrome/images/star-a.png
similarity index 100%
rename from bin/themes/chrome/images/star-a.png
rename to themes/chrome/images/star-a.png
diff --git a/bin/themes/chrome/images/star.png b/themes/chrome/images/star.png
similarity index 100%
rename from bin/themes/chrome/images/star.png
rename to themes/chrome/images/star.png
diff --git a/bin/themes/chrome/images/tab-left-arrow.png b/themes/chrome/images/tab-left-arrow.png
similarity index 100%
rename from bin/themes/chrome/images/tab-left-arrow.png
rename to themes/chrome/images/tab-left-arrow.png
diff --git a/bin/themes/chrome/images/tab-right-arrow.png b/themes/chrome/images/tab-right-arrow.png
similarity index 100%
rename from bin/themes/chrome/images/tab-right-arrow.png
rename to themes/chrome/images/tab-right-arrow.png
diff --git a/bin/themes/chrome/images/tabbar-addtab.png b/themes/chrome/images/tabbar-addtab.png
similarity index 100%
rename from bin/themes/chrome/images/tabbar-addtab.png
rename to themes/chrome/images/tabbar-addtab.png
diff --git a/bin/themes/chrome/images/tabs-bg.png b/themes/chrome/images/tabs-bg.png
similarity index 100%
rename from bin/themes/chrome/images/tabs-bg.png
rename to themes/chrome/images/tabs-bg.png
diff --git a/bin/themes/chrome/images/tabs-list-button.png b/themes/chrome/images/tabs-list-button.png
similarity index 100%
rename from bin/themes/chrome/images/tabs-list-button.png
rename to themes/chrome/images/tabs-list-button.png
diff --git a/bin/themes/chrome/images/toolbar-bg.png b/themes/chrome/images/toolbar-bg.png
similarity index 100%
rename from bin/themes/chrome/images/toolbar-bg.png
rename to themes/chrome/images/toolbar-bg.png
diff --git a/bin/themes/chrome/images/toolbutton-a.png b/themes/chrome/images/toolbutton-a.png
similarity index 100%
rename from bin/themes/chrome/images/toolbutton-a.png
rename to themes/chrome/images/toolbutton-a.png
diff --git a/bin/themes/chrome/images/toolbutton-h.png b/themes/chrome/images/toolbutton-h.png
similarity index 100%
rename from bin/themes/chrome/images/toolbutton-h.png
rename to themes/chrome/images/toolbutton-h.png
diff --git a/bin/themes/chrome/images/toolbutton.png b/themes/chrome/images/toolbutton.png
similarity index 100%
rename from bin/themes/chrome/images/toolbutton.png
rename to themes/chrome/images/toolbutton.png
diff --git a/bin/themes/chrome/linux.css b/themes/chrome/linux.css
similarity index 100%
rename from bin/themes/chrome/linux.css
rename to themes/chrome/linux.css
diff --git a/bin/themes/chrome/main.css b/themes/chrome/main.css
similarity index 100%
rename from bin/themes/chrome/main.css
rename to themes/chrome/main.css
diff --git a/bin/themes/chrome/rtl.css b/themes/chrome/rtl.css
similarity index 100%
rename from bin/themes/chrome/rtl.css
rename to themes/chrome/rtl.css
diff --git a/bin/themes/chrome/theme.info b/themes/chrome/theme.info
similarity index 100%
rename from bin/themes/chrome/theme.info
rename to themes/chrome/theme.info
diff --git a/bin/themes/chrome/theme.license b/themes/chrome/theme.license
similarity index 100%
rename from bin/themes/chrome/theme.license
rename to themes/chrome/theme.license
diff --git a/bin/themes/chrome/theme.png b/themes/chrome/theme.png
similarity index 100%
rename from bin/themes/chrome/theme.png
rename to themes/chrome/theme.png
diff --git a/bin/themes/chrome/windows.css b/themes/chrome/windows.css
similarity index 100%
rename from bin/themes/chrome/windows.css
rename to themes/chrome/windows.css
diff --git a/bin/themes/linux/images/arrow-down.svg b/themes/linux/images/arrow-down.svg
similarity index 100%
rename from bin/themes/linux/images/arrow-down.svg
rename to themes/linux/images/arrow-down.svg
diff --git a/bin/themes/linux/images/goto.svg b/themes/linux/images/goto.svg
similarity index 100%
rename from bin/themes/linux/images/goto.svg
rename to themes/linux/images/goto.svg
diff --git a/bin/themes/linux/images/library-bg.png b/themes/linux/images/library-bg.png
similarity index 100%
rename from bin/themes/linux/images/library-bg.png
rename to themes/linux/images/library-bg.png
diff --git a/bin/themes/linux/images/menu.svg b/themes/linux/images/menu.svg
similarity index 100%
rename from bin/themes/linux/images/menu.svg
rename to themes/linux/images/menu.svg
diff --git a/bin/themes/linux/images/semi-transp.png b/themes/linux/images/semi-transp.png
similarity index 100%
rename from bin/themes/linux/images/semi-transp.png
rename to themes/linux/images/semi-transp.png
diff --git a/bin/themes/linux/images/star-a.svg b/themes/linux/images/star-a.svg
similarity index 100%
rename from bin/themes/linux/images/star-a.svg
rename to themes/linux/images/star-a.svg
diff --git a/bin/themes/linux/images/star.svg b/themes/linux/images/star.svg
similarity index 100%
rename from bin/themes/linux/images/star.svg
rename to themes/linux/images/star.svg
diff --git a/bin/themes/linux/images/tab-left-arrow.svg b/themes/linux/images/tab-left-arrow.svg
similarity index 100%
rename from bin/themes/linux/images/tab-left-arrow.svg
rename to themes/linux/images/tab-left-arrow.svg
diff --git a/bin/themes/linux/images/tab-right-arrow.svg b/themes/linux/images/tab-right-arrow.svg
similarity index 100%
rename from bin/themes/linux/images/tab-right-arrow.svg
rename to themes/linux/images/tab-right-arrow.svg
diff --git a/bin/themes/linux/images/transp.png b/themes/linux/images/transp.png
similarity index 100%
rename from bin/themes/linux/images/transp.png
rename to themes/linux/images/transp.png
diff --git a/bin/themes/linux/images/user.svg b/themes/linux/images/user.svg
similarity index 100%
rename from bin/themes/linux/images/user.svg
rename to themes/linux/images/user.svg
diff --git a/bin/themes/linux/images/websearch-bg.png b/themes/linux/images/websearch-bg.png
similarity index 100%
rename from bin/themes/linux/images/websearch-bg.png
rename to themes/linux/images/websearch-bg.png
diff --git a/bin/themes/linux/main.css b/themes/linux/main.css
similarity index 100%
rename from bin/themes/linux/main.css
rename to themes/linux/main.css
diff --git a/bin/themes/linux/rtl.css b/themes/linux/rtl.css
similarity index 100%
rename from bin/themes/linux/rtl.css
rename to themes/linux/rtl.css
diff --git a/bin/themes/linux/theme.info b/themes/linux/theme.info
similarity index 100%
rename from bin/themes/linux/theme.info
rename to themes/linux/theme.info
diff --git a/bin/themes/linux/theme.png b/themes/linux/theme.png
similarity index 100%
rename from bin/themes/linux/theme.png
rename to themes/linux/theme.png
diff --git a/bin/themes/mac/images/gotoaddress.png b/themes/mac/images/gotoaddress.png
similarity index 100%
rename from bin/themes/mac/images/gotoaddress.png
rename to themes/mac/images/gotoaddress.png
diff --git a/bin/themes/mac/images/key.png b/themes/mac/images/key.png
similarity index 100%
rename from bin/themes/mac/images/key.png
rename to themes/mac/images/key.png
diff --git a/bin/themes/mac/images/library-bg.png b/themes/mac/images/library-bg.png
similarity index 100%
rename from bin/themes/mac/images/library-bg.png
rename to themes/mac/images/library-bg.png
diff --git a/bin/themes/mac/images/lineedit-bg.png b/themes/mac/images/lineedit-bg.png
similarity index 100%
rename from bin/themes/mac/images/lineedit-bg.png
rename to themes/mac/images/lineedit-bg.png
diff --git a/bin/themes/mac/images/navigation-addtab.png b/themes/mac/images/navigation-addtab.png
similarity index 100%
rename from bin/themes/mac/images/navigation-addtab.png
rename to themes/mac/images/navigation-addtab.png
diff --git a/bin/themes/mac/images/navigation-back.png b/themes/mac/images/navigation-back.png
similarity index 100%
rename from bin/themes/mac/images/navigation-back.png
rename to themes/mac/images/navigation-back.png
diff --git a/bin/themes/mac/images/navigation-dropdown.png b/themes/mac/images/navigation-dropdown.png
similarity index 100%
rename from bin/themes/mac/images/navigation-dropdown.png
rename to themes/mac/images/navigation-dropdown.png
diff --git a/bin/themes/mac/images/navigation-forward.png b/themes/mac/images/navigation-forward.png
similarity index 100%
rename from bin/themes/mac/images/navigation-forward.png
rename to themes/mac/images/navigation-forward.png
diff --git a/bin/themes/mac/images/navigation-home.png b/themes/mac/images/navigation-home.png
similarity index 100%
rename from bin/themes/mac/images/navigation-home.png
rename to themes/mac/images/navigation-home.png
diff --git a/bin/themes/mac/images/navigation-reload.png b/themes/mac/images/navigation-reload.png
similarity index 100%
rename from bin/themes/mac/images/navigation-reload.png
rename to themes/mac/images/navigation-reload.png
diff --git a/bin/themes/mac/images/navigation-stop.png b/themes/mac/images/navigation-stop.png
similarity index 100%
rename from bin/themes/mac/images/navigation-stop.png
rename to themes/mac/images/navigation-stop.png
diff --git a/bin/themes/mac/images/navigation-supermenu.png b/themes/mac/images/navigation-supermenu.png
similarity index 100%
rename from bin/themes/mac/images/navigation-supermenu.png
rename to themes/mac/images/navigation-supermenu.png
diff --git a/bin/themes/mac/images/search-icon.png b/themes/mac/images/search-icon.png
similarity index 100%
rename from bin/themes/mac/images/search-icon.png
rename to themes/mac/images/search-icon.png
diff --git a/bin/themes/mac/images/searchbar-provider-bg.png b/themes/mac/images/searchbar-provider-bg.png
similarity index 100%
rename from bin/themes/mac/images/searchbar-provider-bg.png
rename to themes/mac/images/searchbar-provider-bg.png
diff --git a/bin/themes/mac/images/semi-transp.png b/themes/mac/images/semi-transp.png
similarity index 100%
rename from bin/themes/mac/images/semi-transp.png
rename to themes/mac/images/semi-transp.png
diff --git a/bin/themes/mac/images/siteicon-bg.png b/themes/mac/images/siteicon-bg.png
similarity index 100%
rename from bin/themes/mac/images/siteicon-bg.png
rename to themes/mac/images/siteicon-bg.png
diff --git a/bin/themes/mac/images/siteicon-secure-bg.png b/themes/mac/images/siteicon-secure-bg.png
similarity index 100%
rename from bin/themes/mac/images/siteicon-secure-bg.png
rename to themes/mac/images/siteicon-secure-bg.png
diff --git a/bin/themes/mac/images/splitter.png b/themes/mac/images/splitter.png
similarity index 100%
rename from bin/themes/mac/images/splitter.png
rename to themes/mac/images/splitter.png
diff --git a/bin/themes/mac/images/star-a.png b/themes/mac/images/star-a.png
similarity index 100%
rename from bin/themes/mac/images/star-a.png
rename to themes/mac/images/star-a.png
diff --git a/bin/themes/mac/images/star.png b/themes/mac/images/star.png
similarity index 100%
rename from bin/themes/mac/images/star.png
rename to themes/mac/images/star.png
diff --git a/bin/themes/mac/images/tab-left-arrow.png b/themes/mac/images/tab-left-arrow.png
similarity index 100%
rename from bin/themes/mac/images/tab-left-arrow.png
rename to themes/mac/images/tab-left-arrow.png
diff --git a/bin/themes/mac/images/tab-right-arrow.png b/themes/mac/images/tab-right-arrow.png
similarity index 100%
rename from bin/themes/mac/images/tab-right-arrow.png
rename to themes/mac/images/tab-right-arrow.png
diff --git a/bin/themes/mac/images/tabbar-addtab.png b/themes/mac/images/tabbar-addtab.png
similarity index 100%
rename from bin/themes/mac/images/tabbar-addtab.png
rename to themes/mac/images/tabbar-addtab.png
diff --git a/bin/themes/mac/images/tabs-bg.png b/themes/mac/images/tabs-bg.png
similarity index 100%
rename from bin/themes/mac/images/tabs-bg.png
rename to themes/mac/images/tabs-bg.png
diff --git a/bin/themes/mac/images/tabs-list-button.png b/themes/mac/images/tabs-list-button.png
similarity index 100%
rename from bin/themes/mac/images/tabs-list-button.png
rename to themes/mac/images/tabs-list-button.png
diff --git a/bin/themes/mac/images/tabs-list-button_rtl.png b/themes/mac/images/tabs-list-button_rtl.png
similarity index 100%
rename from bin/themes/mac/images/tabs-list-button_rtl.png
rename to themes/mac/images/tabs-list-button_rtl.png
diff --git a/bin/themes/mac/images/toolbar-bg.png b/themes/mac/images/toolbar-bg.png
similarity index 100%
rename from bin/themes/mac/images/toolbar-bg.png
rename to themes/mac/images/toolbar-bg.png
diff --git a/bin/themes/mac/images/transp.png b/themes/mac/images/transp.png
similarity index 100%
rename from bin/themes/mac/images/transp.png
rename to themes/mac/images/transp.png
diff --git a/bin/themes/mac/images/user-trash-full.png b/themes/mac/images/user-trash-full.png
similarity index 100%
rename from bin/themes/mac/images/user-trash-full.png
rename to themes/mac/images/user-trash-full.png
diff --git a/bin/themes/mac/linux.css b/themes/mac/linux.css
similarity index 100%
rename from bin/themes/mac/linux.css
rename to themes/mac/linux.css
diff --git a/bin/themes/mac/main.css b/themes/mac/main.css
similarity index 100%
rename from bin/themes/mac/main.css
rename to themes/mac/main.css
diff --git a/bin/themes/mac/rtl.css b/themes/mac/rtl.css
similarity index 100%
rename from bin/themes/mac/rtl.css
rename to themes/mac/rtl.css
diff --git a/bin/themes/mac/theme.info b/themes/mac/theme.info
similarity index 100%
rename from bin/themes/mac/theme.info
rename to themes/mac/theme.info
diff --git a/bin/themes/mac/theme.license b/themes/mac/theme.license
similarity index 100%
rename from bin/themes/mac/theme.license
rename to themes/mac/theme.license
diff --git a/bin/themes/mac/theme.png b/themes/mac/theme.png
similarity index 100%
rename from bin/themes/mac/theme.png
rename to themes/mac/theme.png
diff --git a/bin/themes/mac/windows.css b/themes/mac/windows.css
similarity index 100%
rename from bin/themes/mac/windows.css
rename to themes/mac/windows.css
diff --git a/bin/themes/windows/images/gotoaddress.png b/themes/windows/images/gotoaddress.png
similarity index 100%
rename from bin/themes/windows/images/gotoaddress.png
rename to themes/windows/images/gotoaddress.png
diff --git a/bin/themes/windows/images/key.png b/themes/windows/images/key.png
similarity index 100%
rename from bin/themes/windows/images/key.png
rename to themes/windows/images/key.png
diff --git a/bin/themes/windows/images/library-bg.png b/themes/windows/images/library-bg.png
similarity index 100%
rename from bin/themes/windows/images/library-bg.png
rename to themes/windows/images/library-bg.png
diff --git a/bin/themes/windows/images/lineedit-bg.png b/themes/windows/images/lineedit-bg.png
similarity index 100%
rename from bin/themes/windows/images/lineedit-bg.png
rename to themes/windows/images/lineedit-bg.png
diff --git a/bin/themes/windows/images/navigation-addtab.png b/themes/windows/images/navigation-addtab.png
similarity index 100%
rename from bin/themes/windows/images/navigation-addtab.png
rename to themes/windows/images/navigation-addtab.png
diff --git a/bin/themes/windows/images/navigation-back.png b/themes/windows/images/navigation-back.png
similarity index 100%
rename from bin/themes/windows/images/navigation-back.png
rename to themes/windows/images/navigation-back.png
diff --git a/bin/themes/windows/images/navigation-dropdown.png b/themes/windows/images/navigation-dropdown.png
similarity index 100%
rename from bin/themes/windows/images/navigation-dropdown.png
rename to themes/windows/images/navigation-dropdown.png
diff --git a/bin/themes/windows/images/navigation-forward.png b/themes/windows/images/navigation-forward.png
similarity index 100%
rename from bin/themes/windows/images/navigation-forward.png
rename to themes/windows/images/navigation-forward.png
diff --git a/bin/themes/windows/images/navigation-home.png b/themes/windows/images/navigation-home.png
similarity index 100%
rename from bin/themes/windows/images/navigation-home.png
rename to themes/windows/images/navigation-home.png
diff --git a/bin/themes/windows/images/navigation-reload.png b/themes/windows/images/navigation-reload.png
similarity index 100%
rename from bin/themes/windows/images/navigation-reload.png
rename to themes/windows/images/navigation-reload.png
diff --git a/bin/themes/windows/images/navigation-stop.png b/themes/windows/images/navigation-stop.png
similarity index 100%
rename from bin/themes/windows/images/navigation-stop.png
rename to themes/windows/images/navigation-stop.png
diff --git a/bin/themes/windows/images/navigation-supermenu.png b/themes/windows/images/navigation-supermenu.png
similarity index 100%
rename from bin/themes/windows/images/navigation-supermenu.png
rename to themes/windows/images/navigation-supermenu.png
diff --git a/bin/themes/windows/images/search-icon.png b/themes/windows/images/search-icon.png
similarity index 100%
rename from bin/themes/windows/images/search-icon.png
rename to themes/windows/images/search-icon.png
diff --git a/bin/themes/windows/images/searchbar-provider-bg.png b/themes/windows/images/searchbar-provider-bg.png
similarity index 100%
rename from bin/themes/windows/images/searchbar-provider-bg.png
rename to themes/windows/images/searchbar-provider-bg.png
diff --git a/bin/themes/windows/images/semi-transp.png b/themes/windows/images/semi-transp.png
similarity index 100%
rename from bin/themes/windows/images/semi-transp.png
rename to themes/windows/images/semi-transp.png
diff --git a/bin/themes/windows/images/siteicon-bg.png b/themes/windows/images/siteicon-bg.png
similarity index 100%
rename from bin/themes/windows/images/siteicon-bg.png
rename to themes/windows/images/siteicon-bg.png
diff --git a/bin/themes/windows/images/siteicon-secure-bg.png b/themes/windows/images/siteicon-secure-bg.png
similarity index 100%
rename from bin/themes/windows/images/siteicon-secure-bg.png
rename to themes/windows/images/siteicon-secure-bg.png
diff --git a/bin/themes/windows/images/star-a.png b/themes/windows/images/star-a.png
similarity index 100%
rename from bin/themes/windows/images/star-a.png
rename to themes/windows/images/star-a.png
diff --git a/bin/themes/windows/images/star.png b/themes/windows/images/star.png
similarity index 100%
rename from bin/themes/windows/images/star.png
rename to themes/windows/images/star.png
diff --git a/bin/themes/windows/images/tab-active-bg.png b/themes/windows/images/tab-active-bg.png
similarity index 100%
rename from bin/themes/windows/images/tab-active-bg.png
rename to themes/windows/images/tab-active-bg.png
diff --git a/bin/themes/windows/images/tab-deactive-bg.png b/themes/windows/images/tab-deactive-bg.png
similarity index 100%
rename from bin/themes/windows/images/tab-deactive-bg.png
rename to themes/windows/images/tab-deactive-bg.png
diff --git a/bin/themes/windows/images/tab-deactive-hover-bg.png b/themes/windows/images/tab-deactive-hover-bg.png
similarity index 100%
rename from bin/themes/windows/images/tab-deactive-hover-bg.png
rename to themes/windows/images/tab-deactive-hover-bg.png
diff --git a/bin/themes/windows/images/tab-left-arrow.png b/themes/windows/images/tab-left-arrow.png
similarity index 100%
rename from bin/themes/windows/images/tab-left-arrow.png
rename to themes/windows/images/tab-left-arrow.png
diff --git a/bin/themes/windows/images/tab-right-arrow.png b/themes/windows/images/tab-right-arrow.png
similarity index 100%
rename from bin/themes/windows/images/tab-right-arrow.png
rename to themes/windows/images/tab-right-arrow.png
diff --git a/bin/themes/windows/images/tabbar-addtab-outside.png b/themes/windows/images/tabbar-addtab-outside.png
similarity index 100%
rename from bin/themes/windows/images/tabbar-addtab-outside.png
rename to themes/windows/images/tabbar-addtab-outside.png
diff --git a/bin/themes/windows/images/tabbar-addtab.png b/themes/windows/images/tabbar-addtab.png
similarity index 100%
rename from bin/themes/windows/images/tabbar-addtab.png
rename to themes/windows/images/tabbar-addtab.png
diff --git a/bin/themes/windows/images/tabbar-addtab_rtl.png b/themes/windows/images/tabbar-addtab_rtl.png
similarity index 100%
rename from bin/themes/windows/images/tabbar-addtab_rtl.png
rename to themes/windows/images/tabbar-addtab_rtl.png
diff --git a/bin/themes/windows/images/tabs-bg.png b/themes/windows/images/tabs-bg.png
similarity index 100%
rename from bin/themes/windows/images/tabs-bg.png
rename to themes/windows/images/tabs-bg.png
diff --git a/bin/themes/windows/images/tabs-list-button.png b/themes/windows/images/tabs-list-button.png
similarity index 100%
rename from bin/themes/windows/images/tabs-list-button.png
rename to themes/windows/images/tabs-list-button.png
diff --git a/bin/themes/windows/images/toolbar-bg.png b/themes/windows/images/toolbar-bg.png
similarity index 100%
rename from bin/themes/windows/images/toolbar-bg.png
rename to themes/windows/images/toolbar-bg.png
diff --git a/bin/themes/windows/images/transp.png b/themes/windows/images/transp.png
similarity index 100%
rename from bin/themes/windows/images/transp.png
rename to themes/windows/images/transp.png
diff --git a/bin/themes/windows/images/user-trash-full.png b/themes/windows/images/user-trash-full.png
similarity index 100%
rename from bin/themes/windows/images/user-trash-full.png
rename to themes/windows/images/user-trash-full.png
diff --git a/bin/themes/windows/linux.css b/themes/windows/linux.css
similarity index 100%
rename from bin/themes/windows/linux.css
rename to themes/windows/linux.css
diff --git a/bin/themes/windows/main.css b/themes/windows/main.css
similarity index 100%
rename from bin/themes/windows/main.css
rename to themes/windows/main.css
diff --git a/bin/themes/windows/rtl.css b/themes/windows/rtl.css
similarity index 100%
rename from bin/themes/windows/rtl.css
rename to themes/windows/rtl.css
diff --git a/bin/themes/windows/theme.info b/themes/windows/theme.info
similarity index 100%
rename from bin/themes/windows/theme.info
rename to themes/windows/theme.info
diff --git a/bin/themes/windows/theme.license b/themes/windows/theme.license
similarity index 100%
rename from bin/themes/windows/theme.license
rename to themes/windows/theme.license
diff --git a/bin/themes/windows/theme.png b/themes/windows/theme.png
similarity index 100%
rename from bin/themes/windows/theme.png
rename to themes/windows/theme.png
diff --git a/bin/themes/windows/windows.css b/themes/windows/windows.css
similarity index 100%
rename from bin/themes/windows/windows.css
rename to themes/windows/windows.css