diff --git a/share/keepassxc.ini b/share/keepassxc.ini
new file mode 100644
index 000000000..f7ff52cbc
--- /dev/null
+++ b/share/keepassxc.ini
@@ -0,0 +1,57 @@
+[General]
+ShowToolbar=true
+RememberLastDatabases=true
+RememberLastKeyFiles=true
+OpenPreviousDatabasesOnStartup=true
+AutoSaveAfterEveryChange=false
+AutoSaveOnExit=false
+AutoReloadOnChange=true
+MinimizeOnCopy=false
+UseGroupIconOnEntryCreation=true
+IgnoreGroupExpansion=false
+AutoTypeEntryTitleMatch=true
+GlobalAutoTypeKey=0
+GlobalAutoTypeModifiers=0
+LastOpenedDatabases=@Invalid()
+
+[GUI]
+Language=system
+ShowTrayIcon=false
+MinimizeToTray=false
+MinimizeOnClose=false
+MinimizeOnStartup=false
+MainWindowGeometry="@ByteArray(\x1\xd9\xd0\xcb\0\x2\0\0\0\0\x2(\0\0\0\xbd\0\0\x5W\0\0\x3;\0\0\x2\x30\0\0\0\xdc\0\0\x5O\0\0\x3\x33\0\0\0\0\0\0\0\0\a\x80)"
+SplitterState=@Invalid()
+EntryListColumnSizes=@Invalid()
+EntrySearchColumnSizes=@Invalid()
+
+[security]
+autotypeask=true
+clearclipboard=true
+clearclipboardtimeout=10
+lockdatabaseidle=false
+lockdatabaseidlesec=240
+lockdatabaseminimize=false
+lockdatabasescreenlock=true
+passwordscleartext=false
+passwordsrepeat=false
+
+[Http]
+Enabled=false
+ShowNotification=true
+BestMatchOnly=false
+UnlockDatabase=true
+MatchUrlScheme=true
+SortByUsername=false
+Port=19455
+AlwaysAllowAccess=false
+AlwaysAllowUpdate=false
+SearchInAllDatabases=false
+SupportKphFields=true
+generator\LowerCase=true
+generator\UpperCase=true
+generator\Numbers=true
+generator\SpecialChars=false
+generator\ExcludeAlike=true
+generator\EnsureEvery=true
+generator\Length=16
diff --git a/share/translations/update.sh b/share/translations/update.sh
index 7e8069e0d..eaa1179d4 100755
--- a/share/translations/update.sh
+++ b/share/translations/update.sh
@@ -14,4 +14,4 @@ tx push -s
 
 echo
 echo Pulling translations from Transifex
-tx pull -a --minimum-perc=80
+tx pull -af --minimum-perc=40
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index cc9334842..791685576 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -290,7 +290,12 @@ if(APPLE AND WITH_APP_BUNDLE)
 endif()
 
 if(MINGW)
-  string(REPLACE "AMD" "Win" OUTPUT_FILE_POSTFIX "${CMAKE_HOST_SYSTEM_PROCESSOR}")
+  if(${CMAKE_SIZEOF_VOID_P} EQUAL "8")
+    set(OUTPUT_FILE_POSTFIX "Win64")
+  else()
+    set(OUTPUT_FILE_POSTFIX "Win32")
+  endif()
+
   set(CPACK_GENERATOR "ZIP;NSIS")
   set(CPACK_STRIP_FILES ON)
   set(CPACK_PACKAGE_FILE_NAME "${PROGNAME}-${KEEPASSXC_VERSION}-${OUTPUT_FILE_POSTFIX}")
@@ -299,6 +304,7 @@ if(MINGW)
   set(CPACK_PACKAGE_VENDOR "${PROGNAME} Team")
   string(REGEX REPLACE "/" "\\\\\\\\" CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/share/windows/installer-header.bmp")
   set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE.GPL-2")
+  set(CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL ON)
   set(CPACK_NSIS_MUI_ICON "${CMAKE_SOURCE_DIR}/share/windows/keepassxc.ico")
   set(CPACK_NSIS_MUI_UNIICON "${CPACK_NSIS_MUI_ICON}")
   set(CPACK_NSIS_INSTALLED_ICON_NAME "\\\\${PROGNAME}.exe")
@@ -307,6 +313,7 @@ if(MINGW)
   set(CPACK_NSIS_CREATE_ICONS_EXTRA "CreateShortCut '$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\${PROGNAME}.lnk' '$INSTDIR\\\\${PROGNAME}.exe'")
   set(CPACK_NSIS_DELETE_ICONS_EXTRA "Delete '$SMPROGRAMS\\\\$START_MENU\\\\${PROGNAME}.lnk'")
   set(CPACK_NSIS_URL_INFO_ABOUT "https://keepassxc.org")
+  set(CPACK_NSIS_DISPLAY_NAME ${PROGNAME})
   set(CPACK_NSIS_PACKAGE_NAME "${PROGNAME} v${KEEPASSXC_VERSION}")
   set(CPACK_NSIS_MUI_FINISHPAGE_RUN "../${PROGNAME}.exe")
   include(CPack)