diff --git a/calamares/PKGBUILD b/calamares/PKGBUILD
index 83825d6a1..0b3efe0ed 100644
--- a/calamares/PKGBUILD
+++ b/calamares/PKGBUILD
@@ -1,19 +1,19 @@
 
 pkgname=calamares
-pkgver=1.0.1
-pkgrel=3
+pkgver=1.1.2
+pkgrel=8
 pkgdesc='Distribution-independent installer framework'
 arch=('x86_64')
 url='https://github.com/calamares/calamares'
 license=('LGPL')
 depends=('qt5-svg' 'kconfig' 'ki18n' 'kcoreaddons' 'solid' 'yaml-cpp'
          'parted' 'libatasmart' 'udisks2' 'polkit-qt5' 'boost-libs'
-         'rsync')
+         'rsync' 'python3' 'keyboardctl')
 makedepends=('extra-cmake-modules' 'git' 'qt5-tools')
-_gitsha='b15ccdf'
-source=("git://github.com/calamares/calamares#commit=${_gitsha}"
-        http://rsync.chakraos.org/sources/chakra-artwork/calamares/chakra-branding_2015.04-1.tar.gz
-#source=("git://github.com/rshipp/calamares"
+_gitsha='a6cfa251715173b8b75027b5c0a3e5bc02eaed3a'
+#source=("git://github.com/calamares/calamares#commit=${_gitsha}"
+source=("git://github.com/rshipp/calamares#commit=${_gitsha}"
+        http://rsync.chakraos.org/sources/chakra-artwork/calamares/chakra-branding_2015.09-2.tar.gz
         'displaymanagers.conf'
         'locale.conf'
         'prepare.conf'
@@ -29,12 +29,12 @@ source=("git://github.com/calamares/calamares#commit=${_gitsha}"
 #        'JobQueue.diff'
 #        'along_UEFI.diff')
 md5sums=('SKIP'
-         '6e17cea14a849620a557be50f7e2cb0c'
+         '1585fde86cad4ae518d92bb06a6d761a'
          '0364830e843823dff80b18509ea4042e'
          'c05b2dda2e0a8a57cf25cc89913a1f4f'
          '76cf16c8e4347d369330ed64ff28083b'
-         '97973937b364dde58aafbf937330316e'
-         'c98260c476e1a9eee8f03b01714c8099'
+         'ee752ca04615b78792ce33ada19d2f8b'
+         '8642e08971cc8e0e133a1e63ce1aeb7d'
          'f8e10a9fa0324f68650a646769339da9'
          '2437e44479a54376ad9244d120369f6c'
          'f005a6e10b8e0425e04207920b6231b7'
diff --git a/calamares/packages.conf b/calamares/packages.conf
index ad1e68243..6a02b220c 100644
--- a/calamares/packages.conf
+++ b/calamares/packages.conf
@@ -26,7 +26,7 @@ backend: pacman
 #
 operations:
   - localInstall:
-      - /opt/chakra/pkgs/octopi-notifier-qt5-0.6.0-1-x86_64.pkg.tar.xz
+      - /opt/chakra/pkgs/octopi-notifier-qt5-0.7.0-2-x86_64.pkg.tar.xz
 #  - remove:
 #      - pkg3
 #      - pkg4
diff --git a/calamares/settings.conf b/calamares/settings.conf
index ef24e813c..20454bdde 100644
--- a/calamares/settings.conf
+++ b/calamares/settings.conf
@@ -16,10 +16,9 @@ modules-search: [ local, /path/to/dir/with/more/modules ]
 # the background.
 # Jobs should be executed sparingly (if at all) in this phase.
 prepare:
-- greeting
+- welcome
 - locale
 - keyboard
-- prepare
 - partition
 - users
 - summary
@@ -46,8 +45,10 @@ install:
 #- kdm_sddm
 #- usercfg
 #- userkf5
-#- driver_cleanup
-#- nonfree_drivers
+#- removeuser
+- _driver_cleanup
+- _nonfree_drivers
+- _locale_cleanup
 - packages
 - grubcfg
 - bootloader