diff -Nru ubuntustudio-default-settings-0.63/.bzr-builddeb/default.conf ubuntustudio-default-settings-0.64/.bzr-builddeb/default.conf
--- ubuntustudio-default-settings-0.63/.bzr-builddeb/default.conf	1970-01-01 01:00:00.000000000 +0100
+++ ubuntustudio-default-settings-0.64/.bzr-builddeb/default.conf	2017-02-21 20:09:47.000000000 +0100
@@ -0,0 +1,2 @@
+[BUILDDEB]
+native = True
diff -Nru ubuntustudio-default-settings-0.63/debian/changelog ubuntustudio-default-settings-0.64/debian/changelog
--- ubuntustudio-default-settings-0.63/debian/changelog	2016-10-03 16:06:04.000000000 +0200
+++ ubuntustudio-default-settings-0.64/debian/changelog	2017-02-21 20:09:47.000000000 +0100
@@ -1,3 +1,15 @@
+ubuntustudio-default-settings (0.64) zesty; urgency=medium
+
+  [ Ross Gammon ]
+  * Temporarily override the desktop file for imagemagick
+    with Terminal set to true (LP: #1550210)
+  * Move configuration from ubuntustudio-lightdm-theme (LP: #1630347)
+    Conflict/Replace ubuntustudio-lightdm-theme which will be removed
+    from the archive. Conflicts/Replaces can be removed after next
+    LTS (18.04).
+
+ -- Ross Gammon <rosco2@ubuntu.com>  Sat, 04 Feb 2017 12:28:17 +0100
+
 ubuntustudio-default-settings (0.63) yakkety; urgency=medium
 
   [ Krytarik Raido ]
diff -Nru ubuntustudio-default-settings-0.63/debian/control ubuntustudio-default-settings-0.64/debian/control
--- ubuntustudio-default-settings-0.63/debian/control	2016-09-02 19:04:25.000000000 +0200
+++ ubuntustudio-default-settings-0.64/debian/control	2017-02-21 20:09:47.000000000 +0100
@@ -17,7 +17,8 @@
  lightdm-gtk-greeter (>= 1.0.0-0ubuntu2), exo-utils, python
 Recommends: xfce4-session, libxfce4ui-utils, xfce4-appfinder
 Provides: lightdm-gtk-greeter-config
-Replaces: xubuntu-default-settings,
+Replaces: xubuntu-default-settings, ubuntustudio-lightdm-theme
+Conflicts: ubuntustudio-lightdm-theme
 Description: default settings for the Ubuntu Studio desktop
  This package contains the default settings used by Ubuntu Studio. It sets
  the session name, menu icon, backdrops for lightdm and the session. It
diff -Nru ubuntustudio-default-settings-0.63/usr/share/lightdm/lightdm-gtk-greeter.conf.d/30_ubuntustudio.conf ubuntustudio-default-settings-0.64/usr/share/lightdm/lightdm-gtk-greeter.conf.d/30_ubuntustudio.conf
--- ubuntustudio-default-settings-0.63/usr/share/lightdm/lightdm-gtk-greeter.conf.d/30_ubuntustudio.conf	1970-01-01 01:00:00.000000000 +0100
+++ ubuntustudio-default-settings-0.64/usr/share/lightdm/lightdm-gtk-greeter.conf.d/30_ubuntustudio.conf	2017-02-21 20:09:47.000000000 +0100
@@ -0,0 +1,11 @@
+# Ubuntu Studio specific defaults
+# Settings stack on top of 01_ubuntu.conf
+#
+
+[greeter]
+background=/usr/share/backgrounds/ubuntustudio/ubuntustudio-default.png
+theme-name=NumixBlue
+icon-theme-name=ubuntustudio
+font-name=Noto Sans 10
+keyboard=onboard
+screensaver-timeout=60
diff -Nru ubuntustudio-default-settings-0.63/usr/share/ubuntustudio/applications/display-im6.q16.desktop ubuntustudio-default-settings-0.64/usr/share/ubuntustudio/applications/display-im6.q16.desktop
--- ubuntustudio-default-settings-0.63/usr/share/ubuntustudio/applications/display-im6.q16.desktop	1970-01-01 01:00:00.000000000 +0100
+++ ubuntustudio-default-settings-0.64/usr/share/ubuntustudio/applications/display-im6.q16.desktop	2017-02-21 20:09:47.000000000 +0100
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Version=1.0
+Name=ImageMagick (display Q16)
+Comment=Display and edit image files
+Comment[fr]=Affiche et édite des fichiers images
+Comment[pt]=Exiba e edite arquivos de imagem
+Exec=/usr/bin/display-im6.q16 %f
+Terminal=true
+Icon=display-im6.q16
+Type=Application
+Categories=Graphics;
+Keywords=Image;Slideshow;View;Transform;Enhance;F/X;Special Effects
+Keywords[fr]=Image;Diaporama;Visualiser;Transformer;Améliorer;Effets spéciaux
+MimeType=image/avs;image/bie;image/x-ms-bmp;image/cmyk;image/dcx;image/eps;image/fax;image/fits;image/gif;image/gray;image/jpeg;image/pjpeg;image/miff;image/mono;image/mtv;image/x-portable-bitmap;image/pcd;image/pcx;image/pdf;image/x-portable-graymap;image/pict;image/png;image/x-portable-anymap;image/x-portable-pixmap;image/ps;image/rad;image/x-rgb;image/rgba;image/rla;image/rle;image/sgi;image/sun-raster;image/targa;image/tiff;image/uyvy;image/vid;image/viff;image/x-xbitmap;image/x-xpixmap;image/x-xwindowdump;image/x-icon;image/yuv;