diff --git a/debian/changelog b/debian/changelog
index 569e3e2f..1fe0fa26 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+livecd-rootfs (2.320) wily; urgency=medium
+
+  * Copied some touch tweaks (n-m config and user groups) to desktop-next
+
+  [ Michael Vogt ]
+  * snappy/desktop-next:
+    - add snappypkg user and remove clickpkg user
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Tue, 30 Jun 2015 18:08:10 +0200
+
 livecd-rootfs (2.319) wily; urgency=medium
 
   * copy set locale hook from core to desktop-next
diff --git a/live-build/ubuntu-core/hooks/00-uid-gid-fix.chroot_early b/live-build/ubuntu-core/hooks/00-uid-gid-fix.chroot_early
index 00ff4e3f..71f5bbd4 100755
--- a/live-build/ubuntu-core/hooks/00-uid-gid-fix.chroot_early
+++ b/live-build/ubuntu-core/hooks/00-uid-gid-fix.chroot_early
@@ -36,7 +36,7 @@ irc:x:39:39:ircd:/var/run/ircd:/usr/sbin/nologin
 gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/usr/sbin/nologin
 nobody:x:65534:65534:nobody:/nonexistent:/usr/sbin/nologin
 messagebus:x:100:103::/var/run/dbus:/bin/false
-clickpkg:x:101:104::/nonexistent:/bin/false
+snappypkg:x:101:104::/nonexistent:/bin/false
 sshd:x:102:65534::/var/run/sshd:/usr/sbin/nologin
 systemd-timesync:x:103:108:systemd Time Synchronization,,,:/run/systemd:/bin/false
 systemd-network:x:104:109:systemd Network Management,,,:/run/systemd/netif:/bin/false
@@ -75,7 +75,7 @@ irc:*:16329:0:99999:7:::
 gnats:*:16329:0:99999:7:::
 nobody:*:16329:0:99999:7:::
 messagebus:*:16413:0:99999:7:::
-clickpkg:*:16413:0:99999:7:::
+snappypkg:*:16413:0:99999:7:::
 sshd:*:16413:0:99999:7:::
 systemd-timesync:*:16413:0:99999:7:::
 systemd-network:*:16413:0:99999:7:::
@@ -137,7 +137,7 @@ nogroup:x:65534:
 netdev:x:101:
 crontab:x:102:
 messagebus:x:103:
-clickpkg:x:104:
+snappypkg:x:104:
 ssh:x:105:
 systemd-journal:x:106:
 systemd-journal-remote:x:107:
@@ -202,7 +202,7 @@ nogroup:*::
 netdev:!::
 crontab:!::
 messagebus:!::
-clickpkg:!::
+snappypkg:!::
 ssh:!::
 systemd-journal:!::
 systemd-journal-remote:!::
diff --git a/live-build/ubuntu-desktop-next/hooks/00-uid-gid-fix.chroot_early b/live-build/ubuntu-desktop-next/hooks/00-uid-gid-fix.chroot_early
index 4f7fc896..7854c554 100755
--- a/live-build/ubuntu-desktop-next/hooks/00-uid-gid-fix.chroot_early
+++ b/live-build/ubuntu-desktop-next/hooks/00-uid-gid-fix.chroot_early
@@ -43,7 +43,7 @@ syslog:x:104:110::/home/syslog:/bin/false
 usermetrics:x:105:111:User Metrics:/var/lib/usermetrics:/bin/false
 messagebus:x:106:112::/var/run/dbus:/bin/false
 uuidd:x:107:113::/run/uuidd:/bin/false
-clickpkg:x:108:114::/nonexistent:/bin/false
+snappypkg:x:108:114::/nonexistent:/bin/false
 avahi:x:109:115:Avahi mDNS daemon,,,:/var/run/avahi-daemon:/bin/false
 dnsmasq:x:110:65534:dnsmasq,,,:/var/lib/misc:/bin/false
 pulse:x:111:116:PulseAudio daemon,,,:/var/run/pulse:/bin/false
@@ -91,7 +91,7 @@ syslog:*:16591:0:99999:7:::
 usermetrics:*:16594:0:99999:7:::
 messagebus:*:16594:0:99999:7:::
 uuidd:*:16594:0:99999:7:::
-clickpkg:*:16594:0:99999:7:::
+snappypkg:*:16594:0:99999:7:::
 avahi:*:16594:0:99999:7:::
 dnsmasq:*:16594:0:99999:7:::
 pulse:*:16594:0:99999:7:::
@@ -165,7 +165,7 @@ syslog:x:110:
 usermetrics:x:111:
 messagebus:x:112:
 uuidd:x:113:
-clickpkg:x:114:
+snappypkg:x:114:
 avahi:x:115:
 pulse:x:116:
 pulse-access:x:117:
@@ -243,7 +243,7 @@ syslog:!::
 usermetrics:!::
 messagebus:!::
 uuidd:!::
-clickpkg:!::
+snappypkg:!::
 avahi:!::
 pulse:!::
 pulse-access:!::
diff --git a/live-build/ubuntu-desktop-next/hooks/01-setup_user.chroot b/live-build/ubuntu-desktop-next/hooks/01-setup_user.chroot
index 967c6a1b..84e07272 100755
--- a/live-build/ubuntu-desktop-next/hooks/01-setup_user.chroot
+++ b/live-build/ubuntu-desktop-next/hooks/01-setup_user.chroot
@@ -8,6 +8,11 @@ UGID=1000
 echo "I: creating default user $USER"
 adduser --gecos $USER --disabled-login $USER --uid $UGID
 
+mkdir -p /home/$USER/Music
+mkdir -p /home/$USER/Pictures
+mkdir -p /home/$USER/Videos
+mkdir -p /home/$USER/Downloads
+mkdir -p /home/$USER/Documents
 chown -R $UGID:$UGID /home/$USER
 
 # Enable libnss-extrusers
diff --git a/live-build/ubuntu-desktop-next/hooks/02-add_user_to_groups.chroot b/live-build/ubuntu-desktop-next/hooks/02-add_user_to_groups.chroot
index 2e48e233..232fab3e 100755
--- a/live-build/ubuntu-desktop-next/hooks/02-add_user_to_groups.chroot
+++ b/live-build/ubuntu-desktop-next/hooks/02-add_user_to_groups.chroot
@@ -2,7 +2,7 @@
 
 USER=ubuntu
 
-DEFGROUPS="sudo"
+DEFGROUPS="sudo,adm,dialout,cdrom,plugdev,audio,dip,video"
 
 echo "I: add $USER to ($DEFGROUPS) group(s)"
 usermod -a -G ${DEFGROUPS} ${USER}
diff --git a/live-build/ubuntu-desktop-next/hooks/45-add-sudo-group-nm.chroot b/live-build/ubuntu-desktop-next/hooks/45-add-sudo-group-nm.chroot
new file mode 100755
index 00000000..66d45396
--- /dev/null
+++ b/live-build/ubuntu-desktop-next/hooks/45-add-sudo-group-nm.chroot
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+echo "Adding admin group policy to NM system service"
+
+sed -i 's/<policy user="root">/<policy group="sudo">\n\t\t\t\t<allow send_destination="org.freedesktop.NetworkManager"\/>\n\t\t\t\t<allow send_interface="org.freedesktop.NetworkManager"\/>\n\t\t\t\t<allow send_interface="org.freedesktop.NetworkManager.SecretAgent"\/>\n\t\t<\/policy>\n\t\t<policy user="root">/g' /etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf
+
+mkdir -p /etc/polkit-1/localauthority/50-local.d
+cat > /etc/polkit-1/localauthority/50-local.d/org.freedesktop.NetworkManager.pkla << EOF
+[indicator-network-service]
+Identity=unix-group:sudo
+Action=org.freedesktop.NetworkManager.*
+ResultAny=yes
+ResultInactive=no
+ResultActive=yes
+EOF