diff --git a/remote/modules/ldm-gtk-greeter/module.build b/remote/modules/ldm-gtk-greeter/module.build
index 27e5a592d409572f8a0306b47f02229f6c65ec85..d467f386aea36f840c319e41ab026a561ff9536b 100644
--- a/remote/modules/ldm-gtk-greeter/module.build
+++ b/remote/modules/ldm-gtk-greeter/module.build
@@ -1,11 +1,11 @@
 #tool/distro specific functions for fetching, building and installing dependencies
 
 fetch_source () {
-	download_untar "$URL" "src/"
+	download_untar "$REQUIRED_URL" "src/"
 }	
 
 build () {
-	cd "src/$VERSION"
+	cd "src/$REQUIRED_VERSION"
 	pinfo "Running configure"
 	./configure --prefix="/" --datarootdir="/usr/share" || perror "failed."
 	pinfo "Running make"
diff --git a/remote/modules/ldm-gtk-greeter/module.conf b/remote/modules/ldm-gtk-greeter/module.conf
index e93490020f705d7f3d93175096567b5c2279225c..d393283155d528b133e331b2f781a0d364e37f3f 100644
--- a/remote/modules/ldm-gtk-greeter/module.conf
+++ b/remote/modules/ldm-gtk-greeter/module.conf
@@ -1,9 +1,7 @@
-VERSION=lightdm-gtk-greeter-1.3.1
-URL=https://launchpad.net/lightdm-gtk-greeter/1.4/1.3.1/+download/lightdm-gtk-greeter-1.3.1.tar.gz
-REQUIRED_INSTALLED_PACKAGES="gtk+-3.0 liblightdm-gobject-1-dev libgdk-pixbuf2.0-0 libpango1.0-0 librsvg2-common shared-mime-info gnome-themes-standard"
-REQUIRED_CONTENT_PACKAGES="libgdk-pixbuf2.0-0 libpango1.0-0 librsvg2-common shared-mime-info gnome-themes-standard"
+REQUIRED_VERSION=lightdm-gtk-greeter-1.3.1
+REQUIRED_URL=https://launchpad.net/lightdm-gtk-greeter/1.4/1.3.1/+download/lightdm-gtk-greeter-1.3.1.tar.gz
 REQUIRED_BINARIES="lightdm-gtk-greeter"
-REQUIRED_DIRECTORIES="/usr/lib /usr/share/lightdm-gtk-greeter /usr/share/mime /usr/share/xgreeters /usr/share/icons /usr/share/themes /etc /usr/bin"
+REQUIRED_DIRECTORIES="/usr/lib /usr/share/lightdm-gtk-greeter /usr/share/mime /usr/share/xgreeters /etc /usr/bin"
 REQUIRED_FILES="/etc/lightdm/lightdm-gtk-greeter.conf"
 REQUIRED_MODULES="ldm"
 
diff --git a/remote/modules/ldm-gtk-greeter/module.conf.ubuntu b/remote/modules/ldm-gtk-greeter/module.conf.ubuntu
new file mode 100644
index 0000000000000000000000000000000000000000..202245593deb440ee6f30477a8e473a564307da1
--- /dev/null
+++ b/remote/modules/ldm-gtk-greeter/module.conf.ubuntu
@@ -0,0 +1,2 @@
+REQUIRED_INSTALLED_PACKAGES="gtk+-3.0 liblightdm-gobject-1-dev libgdk-pixbuf2.0-0 libpango1.0-0 librsvg2-common shared-mime-info gnome-themes-standard"
+REQUIRED_CONTENT_PACKAGES="libgdk-pixbuf2.0-0 libpango1.0-0 librsvg2-common shared-mime-info gnome-themes-standard"
diff --git a/remote/modules/ldm/module.conf b/remote/modules/ldm/module.conf
index 74ab945052e36b4e9402adac59c7226b0d9258e4..ab383825503af02c85d00acc505bf5f331b78a6c 100644
--- a/remote/modules/ldm/module.conf
+++ b/remote/modules/ldm/module.conf
@@ -1,7 +1,5 @@
-VERSION=lightdm-1.4.0
-URL=https://launchpad.net/lightdm/1.4/1.4.0/+download/lightdm-1.4.0.tar.gz
-REQUIRED_INSTALLED_PACKAGES="libpam-dev itstool liblightdm-gobject-1-dev"
-REQUIRED_CONTENT_PACKAGES=""
+REQUIRED_VERSION=lightdm-1.4.0
+REQUIRED_URL=https://launchpad.net/lightdm/1.4/1.4.0/+download/lightdm-1.4.0.tar.gz
 REQUIRED_BINARIES="dm-tool lightdm lightdm-set-defaults gdmflexiserver lightdm-guest-session-wrapper lightdm-set-defaults"
 REQUIRED_DIRECTORIES="/etc /lib"
 REQUIRED_FILES=""
diff --git a/remote/modules/ldm/module.conf.ubuntu b/remote/modules/ldm/module.conf.ubuntu
index ccb52e257d9f2acf6869970f169e36f8fbdf54d4..ebb01f52f077e6d3043c38136ccf7bcd3e0761da 100644
--- a/remote/modules/ldm/module.conf.ubuntu
+++ b/remote/modules/ldm/module.conf.ubuntu
@@ -1,5 +1,2 @@
 REQUIRED_INSTALLED_PACKAGES="libpam-dev itstool liblightdm-gobject-1-dev"
 REQUIRED_CONTENT_PACKAGES=""
-REQUIRED_BINARIES="dm-tool lightdm"
-REQUIRED_DIRECTORIES="/etc /lib"
-REQUIRED_FILES=""