diff --git a/etc/calamares/branding/neon/branding.desc b/etc/calamares/branding/neon/branding.desc
new file mode 100644
index 0000000..8c9f2ac
--- /dev/null
+++ b/etc/calamares/branding/neon/branding.desc
@@ -0,0 +1,23 @@
+---
+componentName:  neon
+
+strings:
+    productName:         KDE neon
+    shortProductName:    neon
+    version:             Developer Edition (Unstable Branches)
+    shortVersion:        devunstable
+    versionedName:       KDE neon
+    shortVersionedName:  KDE neon devunstable
+    bootloaderEntryName: KDE neon Developer Edition (Unstable Branches)
+
+images:
+    productLogo:         "kdeneon.png"
+    productIcon:         "kdeneon.png"
+    productWelcome:      "welcome.png"
+
+slideshow:               "show.qml"
+
+style:
+   sidebarBackground:    "#0C0C0C"
+   sidebarText:          "#5A5A5A"
+   sidebarTextSelect:    "#FFFFFF"
diff --git a/etc/calamares/branding/netrunner-core/branding.desc b/etc/calamares/branding/neon/branding.desc~
similarity index 100%
rename from etc/calamares/branding/netrunner-core/branding.desc
rename to etc/calamares/branding/neon/branding.desc~
diff --git a/etc/calamares/branding/neon/kdeneon.png b/etc/calamares/branding/neon/kdeneon.png
new file mode 100644
index 0000000..c1e2e10
Binary files /dev/null and b/etc/calamares/branding/neon/kdeneon.png differ
diff --git a/etc/calamares/branding/netrunner-core/show.qml b/etc/calamares/branding/neon/show.qml
similarity index 100%
rename from etc/calamares/branding/netrunner-core/show.qml
rename to etc/calamares/branding/neon/show.qml
diff --git a/etc/calamares/branding/netrunner-core/slide1.png b/etc/calamares/branding/neon/slide1.png
similarity index 100%
rename from etc/calamares/branding/netrunner-core/slide1.png
rename to etc/calamares/branding/neon/slide1.png
diff --git a/etc/calamares/branding/netrunner-core/slide2.png b/etc/calamares/branding/neon/slide2.png
similarity index 100%
rename from etc/calamares/branding/netrunner-core/slide2.png
rename to etc/calamares/branding/neon/slide2.png
diff --git a/etc/calamares/branding/netrunner-core/slide3.png b/etc/calamares/branding/neon/slide3.png
similarity index 100%
rename from etc/calamares/branding/netrunner-core/slide3.png
rename to etc/calamares/branding/neon/slide3.png
diff --git a/etc/calamares/branding/netrunner-core/slide4.png b/etc/calamares/branding/neon/slide4.png
similarity index 100%
rename from etc/calamares/branding/netrunner-core/slide4.png
rename to etc/calamares/branding/neon/slide4.png
diff --git a/etc/calamares/branding/netrunner-core/slide5.png b/etc/calamares/branding/neon/slide5.png
similarity index 100%
rename from etc/calamares/branding/netrunner-core/slide5.png
rename to etc/calamares/branding/neon/slide5.png
diff --git a/etc/calamares/branding/netrunner-core/slide6.png b/etc/calamares/branding/neon/slide6.png
similarity index 100%
rename from etc/calamares/branding/netrunner-core/slide6.png
rename to etc/calamares/branding/neon/slide6.png
diff --git a/etc/calamares/branding/neon/welcome.png b/etc/calamares/branding/neon/welcome.png
new file mode 100644
index 0000000..a64cd09
Binary files /dev/null and b/etc/calamares/branding/neon/welcome.png differ
diff --git a/etc/calamares/branding/netrunner-core/netrunner-core-icon.png b/etc/calamares/branding/netrunner-core/netrunner-core-icon.png
deleted file mode 100644
index 8de41c7..0000000
Binary files a/etc/calamares/branding/netrunner-core/netrunner-core-icon.png and /dev/null differ
diff --git a/etc/calamares/branding/netrunner-core/netrunner-core-logo.png b/etc/calamares/branding/netrunner-core/netrunner-core-logo.png
deleted file mode 100644
index 8de41c7..0000000
Binary files a/etc/calamares/branding/netrunner-core/netrunner-core-logo.png and /dev/null differ
diff --git a/etc/calamares/branding/netrunner-core/squid.png b/etc/calamares/branding/netrunner-core/squid.png
deleted file mode 100644
index 452e445..0000000
Binary files a/etc/calamares/branding/netrunner-core/squid.png and /dev/null differ
diff --git a/etc/calamares/branding/netrunner-core/welcome.png b/etc/calamares/branding/netrunner-core/welcome.png
deleted file mode 100644
index 1304eee..0000000
Binary files a/etc/calamares/branding/netrunner-core/welcome.png and /dev/null differ
diff --git a/etc/calamares/modules/unpackfs.conf b/etc/calamares/modules/unpackfs.conf
index 9519c23..96d16a5 100644
--- a/etc/calamares/modules/unpackfs.conf
+++ b/etc/calamares/modules/unpackfs.conf
@@ -1,5 +1,5 @@
 ---
 unpack:
-    -   source: "/lib/live/mount/medium/live/filesystem.squashfs"
+    -   source: "/cdrom/casper/filesystem.squashfs"
         sourcefs: "squashfs"
         destination: ""
diff --git a/etc/calamares/modules/welcome.conf b/etc/calamares/modules/welcome.conf
index 68ec50e..f49acea 100644
--- a/etc/calamares/modules/welcome.conf
+++ b/etc/calamares/modules/welcome.conf
@@ -4,7 +4,7 @@ showKnownIssuesUrl:     true
 showReleaseNotesUrl:    true
 
 requirements:
-    requiredStorage:    10.0
+    requiredStorage:    8.0
     requiredRam:        1.0
     check:
         - storage
diff --git a/etc/calamares/settings.conf b/etc/calamares/settings.conf
index a180d60..e17e6ec 100644
--- a/etc/calamares/settings.conf
+++ b/etc/calamares/settings.conf
@@ -36,5 +36,5 @@ sequence:
     - finished
 
 
-branding: netrunner-core
+branding: neon
 prompt-install: false
diff --git a/lib/live/config/1200-calamares b/lib/live/config/1200-calamares
deleted file mode 100755
index 79a469d..0000000
--- a/lib/live/config/1200-calamares
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/sh
-
-## live-config(7) - System Configuration Components
-## Copyright (C) 2014 Rohan Garg <rohan@kde.org>
-##
-## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-## This is free software, and you are welcome to redistribute it
-## under certain conditions; see COPYING for details.
-
-
-set -e
-
-Cmdline ()
-{
-	# Reading kernel command line
-	for _PARAMETER in ${LIVE_CONFIG_CMDLINE}
-	do
-		case "${_PARAMETER}" in
-			live-config.no_calamares=|no_calamares=)
-				NO_CALAMARES="true"
-				;;
-
-			live-config.username=*|username=*)
-				LIVE_USERNAME="${_PARAMETER#*username=}"
-				;;
-		esac
-	done
-}
-
-Init ()
-{
-	# Checking if package is installed or already configured
-	if  [ ! -e /usr/bin/calamares ]
-	then
-		exit 0
-	fi
-
-	echo -n " calamares"
-}
-
-Config ()
-{
-	if [ ! -e /usr/bin/calamares ]
-	then
-		exit 0
-	fi
-
-	if [ "${NO_CALAMARES}" != "true" ]
-	then
-		if [ ! -e /home/${LIVE_USERNAME}/Desktop ]
-		then
-			mkdir -p "/home/${LIVE_USERNAME}/Desktop"
-		fi
-
-cat > "/home/${LIVE_USERNAME}/Desktop/calamares.desktop" << EOF
-#!/usr/bin/env xdg-open
-[Desktop Entry]
-Type=Application
-Version=1.0
-Name=Install Netrunner Core
-GenericName=Install Netrunner Core
-TryExec=calamares
-Exec=pkexec /usr/bin/calamares
-Comment=Calamares — System Installer
-Icon=calamares
-Terminal=false
-StartupNotify=true
-Categories=Qt;System;
-EOF
-
-		chmod a+x "/home/${LIVE_USERNAME}/Desktop/calamares.desktop"
-		chown -R ${LIVE_USERNAME}:${LIVE_USERNAME}  "/home/${LIVE_USERNAME}/Desktop"
-
-	fi
-	# Creating state file
-	touch /var/lib/live/config/calamares
-}
-
-Cmdline
-Init
-Config
diff --git a/usr/share/icons/hicolor/128x128/apps/calamares.png b/usr/share/icons/hicolor/128x128/apps/calamares.png
deleted file mode 100644
index 22d9d1a..0000000
Binary files a/usr/share/icons/hicolor/128x128/apps/calamares.png and /dev/null differ