diff --git a/fedora-arm-base.ks b/fedora-arm-base.ks
index f3ee21f..99b5ad3 100644
--- a/fedora-arm-base.ks
+++ b/fedora-arm-base.ks
@@ -5,7 +5,7 @@ selinux --enforcing
 firewall --enabled --service=mdns,ssh
 
 # configure extlinux bootloader
-bootloader extlinux
+bootloader --extlinux
 
 # make sure that initial-setup runs and lets us do all the configuration bits
 firstboot --reconfig
@@ -23,6 +23,8 @@ services --enabled=ssh,NetworkManager,avahi-daemon,rsyslog,chronyd --disabled=ne
 kernel
 kernel-lpae
 
+dracut-config-generic
+
 chrony
 arm-boot-config
 extlinux-bootloader
@@ -30,6 +32,9 @@ initial-setup
 #lets resize / on first boot
 dracut-modules-growroot
 
+# remove this in %post
+dracut-config-generic
+
 # install uboot images
 uboot-beagle
 uboot-beaglebone
@@ -51,5 +56,8 @@ echo "Disabling tmpfs for /tmp."
 systemctl mask tmp.mount
 
 /usr/sbin/a-b-c
+
+yum -y remove dracut-config-generic
+
 %end
 
diff --git a/fedora-live-base.ks b/fedora-live-base.ks
index 322bbe5..a87bc62 100644
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -280,7 +280,7 @@ systemctl enable tmp.mount
 
 # work around for poor key import UI in PackageKit
 rm -f /var/lib/rpm/__db*
-rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
+rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$releasever-$basearch
 echo "Packages within this LiveCD"
 rpm -qa
 # Note that running rpm recreates the rpm db files which aren't needed or wanted
diff --git a/fedora-live-design-suite.ks b/fedora-live-design-suite.ks
index b5e2698..1cd6a23 100644
--- a/fedora-live-design-suite.ks
+++ b/fedora-live-design-suite.ks
@@ -27,6 +27,7 @@ font-manager
 gimp
 gimp-*-plugin
 gimp-data-extras
+gimp-paint-studio
 gimp-high-pass-filter
 gimp-normalmap
 gimp-resynthesizer
@@ -39,6 +40,7 @@ nautilus-image-converter
 optipng
 phatch
 screenruler
+simple-scan
 scribus
 colord-extra-profiles 
 synfigstudio
@@ -55,10 +57,6 @@ filezilla
 audacity
 pitivi
 
-# system
-# gtk-recordmydesktop # dropped for space (#887991)
-# network-manager-applet #part of Gnome Desktop
-
 # fonts
 aajohan-comfortaa-fonts
 adobe-source-sans-pro-fonts
@@ -71,7 +69,7 @@ overpass-fonts
 -gthumb
 -eog
 -gnome-photos
-
+-rdesktop
 
 # Legacy cmdline things we don't want
 -krb5-auth-dialog
@@ -118,6 +116,7 @@ Categories=Graphics;Documentation;
 FOE
 chmod a+x /usr/share/applications/inkscape-course.desktop
 
+<<<<<<< HEAD
 # Add link to lists of tutorials
 cat >> /usr/share/applications/list-design-tutorials.desktop << FOE
 [Desktop Entry]
@@ -125,6 +124,15 @@ Name=List of design tutorials
 GenericName=List of design tutorials
 Comment=Reference of design related tutorials
 Exec=xdg-open http://fedoraproject.org/wiki/Design_Suite/Tutorials
+=======
+# Add link to the list of design tutorials
+cat >> /usr/share/applications/list-design-tutorials.desktop << FOE
+[Desktop Entry]
+Name=List of design tutorials
+GenericName=Design tutorials
+Comment=List of websites using open source design software
+Exec=xdg-open https://fedoraproject.org/wiki/Design_Suite/Tutorials
+>>>>>>> 6aa8533f0e92ff46ad7952e5cbd11458bad3d7fa
 Type=Application
 Icon=applications-graphics
 Categories=Graphics;Documentation;
diff --git a/fedora-live-jam-kde.ks b/fedora-live-jam-kde.ks
index 99743b7..6ddd76b 100644
--- a/fedora-live-jam-kde.ks
+++ b/fedora-live-jam-kde.ks
@@ -81,6 +81,9 @@ seq24
 muse
 qtractor
 non-session-manager
+non-daw
+non-sequencer
+non-mixer
 
 # audio-plugins
 calf
diff --git a/fedora-live-kde-base.ks b/fedora-live-kde-base.ks
index 3bbd023..7624f29 100644
--- a/fedora-live-kde-base.ks
+++ b/fedora-live-kde-base.ks
@@ -40,12 +40,11 @@ chmod a+x /home/liveuser/.xsession
 chown liveuser:liveuser /home/liveuser/.xsession
 
 # set up autologin for user liveuser
-sed -i 's/#AutoLoginEnable=true/AutoLoginEnable=true/' /etc/kde/kdm/kdmrc
-sed -i 's/#AutoLoginUser=fred/AutoLoginUser=liveuser/' /etc/kde/kdm/kdmrc
+sed -i 's/^AutoUser=.*/AutoUser=liveuser/' /etc/sddm.conf
 
 # set up user liveuser as default user and preselected user
-sed -i 's/#PreselectUser=Default/PreselectUser=Default/' /etc/kde/kdm/kdmrc
-sed -i 's/#DefaultUser=johndoe/DefaultUser=liveuser/' /etc/kde/kdm/kdmrc
+sed -i 's/^LastUser=.*/LastUser=liveuser/' /etc/sddm.conf
+sed -i 's/^LastSession=.*/LastSession=kde-plasma.desktop/' /etc/sddm.conf
 
 # add liveinst.desktop to favorites menu
 mkdir -p /home/liveuser/.kde/share/config/
diff --git a/fedora-livecd-desktop.ks b/fedora-livecd-desktop.ks
index 9187028..2e5661e 100644
--- a/fedora-livecd-desktop.ks
+++ b/fedora-livecd-desktop.ks
@@ -14,6 +14,10 @@
 -libreoffice-emailmerge
 -libreoffice-math
 
+# remove some other applications
+-gnome-boxes
+-gnome-dictionary
+
 # remove input method things we don't need
 -ibus-typing-booster
 -imsettings
@@ -31,6 +35,9 @@
 -foomatic-db-ppds
 -foomatic
 
+# we don't want prelink
+-prelink
+
 # Dictionaries are big
 # we're going to try keeping hunspell-* after notting, davidz, and ajax voiced
 # strong preference to giving it a go on #fedora-desktop.
@@ -90,6 +97,8 @@
 -gnu-free-mono-fonts
 -gnu-free-sans-fonts
 -gnu-free-serif-fonts
+-uboot-tools
+-dtc
 
 # Without gnu freefonts, the lack of Malayalam coverage is
 # a problem in anaconda (#977764)
diff --git a/fedora-livecd-mate-compiz.ks b/fedora-livecd-mate-compiz.ks
index 3d17dc5..c3166c7 100644
--- a/fedora-livecd-mate-compiz.ks
+++ b/fedora-livecd-mate-compiz.ks
@@ -11,9 +11,27 @@
 -planner
 
 # Drop things for size
+-@3d-printing
+-brasero
+-bluez
+-bluez-cups
+-@dial-up
+-dnf
 -firefox
+-gnome-bluetooth-libs
+-gnome-icon-theme-symbolic
+-gnome-software
+-gnome-user-docs
+-@guest-desktop-agents
 -@libreoffice
+-@mate-applications
+-mate-bluetooth
 -mate-icon-theme-faenza
+-transmission-gtk
+
+# Drop oversized fonts that aren't needed
+-cjkuni-uming-fonts
+-wqy-zenhei-fonts
 
 # A web browser would be nice for a live cd
 midori
@@ -66,8 +84,8 @@ midori
 -ntsysv
 
 # Drop some system-config things
--system-config-boot
 -system-config-language
+-system-config-printer
 -system-config-rootpassword
 -system-config-services
 -policycoreutils-gui
@@ -79,4 +97,3 @@ midori
 rm -f /usr/share/icons/HighContrast/icon-theme.cache
 
 %end
-
diff --git a/fedora-livecd-security.ks b/fedora-livecd-security.ks
index b452861..5d4b519 100644
--- a/fedora-livecd-security.ks
+++ b/fedora-livecd-security.ks
@@ -18,18 +18,20 @@
 %include fedora-live-base.ks
 %include fedora-live-minimization.ks
 
+# spin was failing to compose due to lack of space, so bumping the size.
+part / --size 10240
+
 %packages
 @xfce-desktop
 @xfce-apps
-#@xfce-extra-plugins
-#@xfce-media
-#@xfce-office
-#@firefox
 
 # Security tools (not ready at the moment)
 @security-lab
 security-menus
 
+# unlock default keyring. FIXME: Should probably be done in comps
+gnome-keyring-pam
+
 # save some space
 -autofs
 -acpid
@@ -38,6 +40,12 @@ security-menus
 -realmd                     # only seems to be used in GNOME
 -PackageKit*                # we switched to yumex, so we don't need this
 -aspell-*                   # dictionaries are big
+-gnumeric
+-foomatic-db-ppds
+-foomatic
+-stix-fonts
+-ibus-typing-booster
+-xfce4-sensors-plugin
 -man-pages-*
 
 # drop some system-config things
@@ -50,14 +58,25 @@ security-menus
 # exclude some packages to save some space
 # use './fsl-maintenance.py -l' in your security spin git folder to build
 -ArpON
+-aide
+-binwalk
+-bkhive
 -bonesi
+-bro
 -cmospwd
 -dnstop
+-etherape
 -hfsutils
--honeyd
+-httpie
+-httrack
+-hydra
 -kismon
+-labrea
+-nebula
 -netsed
 -onesixtyone
+-packETH
+-pads
 -pdfcrack
 -picviz-gui
 -prelude-lml
@@ -66,8 +85,11 @@ security-menus
 -proxychains
 -pyrit
 -raddump
+-rkhunter
 -safecopy
+-samdump2
 -scalpel
+-sshscan
 -sslstrip
 -tcpreen
 -tcpreplay
diff --git a/fedora-livecd-soas.ks b/fedora-livecd-soas.ks
index a65de4e..61faa07 100644
--- a/fedora-livecd-soas.ks
+++ b/fedora-livecd-soas.ks
@@ -83,6 +83,16 @@ gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults
 # Enable Sugar power management
 gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /desktop/sugar/power/automatic True >/dev/null
 
+cat >> /etc/rc.d/init.d/livesys << EOF
+# set up lightdm autologin
+sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.conf
+sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf
+#sed -i 's/^#show-language-selector=.*/show-language-selector=true/' /etc/lightdm/lightdm-gtk-greeter.conf
+
+# set Sugar as default session, otherwise login will fail
+sed -i 's/^#user-session=.*/user-session=sugar/' /etc/lightdm/lightdm.conf
+EOF
+
 cat >> /etc/rc.d/init.d/livesys-late << EOF
 
 # disable screensaver locking
diff --git a/fedora-livedvd-electronic-lab.ks b/fedora-livedvd-electronic-lab.ks
index c4a8e4a..f23c762 100644
--- a/fedora-livedvd-electronic-lab.ks
+++ b/fedora-livedvd-electronic-lab.ks
@@ -7,7 +7,7 @@
 %include fedora-livecd-desktop.ks
 
 # DVD payload
-part / --size=8192
+part / --size 10240
 
 %packages
 
@@ -49,7 +49,8 @@ perl-Test-Pod-Coverage
 -gimp-libs
 -gimp-data-extras
 -kdebluetooth
-
+-kbluetooth
+-rdesktop
 
 %end
 
diff --git a/fedora-livedvd-scientific-kde.ks b/fedora-livedvd-scientific-kde.ks
index e23befa..19530f9 100644
--- a/fedora-livedvd-scientific-kde.ks
+++ b/fedora-livedvd-scientific-kde.ks
@@ -10,12 +10,10 @@
 # Maintainer: Amit Saha <amitksaha@fedoraproject.org>
 #             https://fedoraproject.org/wiki/User:Amitksaha
 
-# Last modified: March 10, 2012.
-
 %include fedora-live-kde.ks
 
-# DVD payload
-part / --size 10000
+# The recommended part size for DVDs is too close to use for the scientific spin
+part / --size 12288
 
 %packages
 
@@ -27,6 +25,11 @@ scilab
 scilab-devel
 scilab-doc
 
+# sagemath
+# BZ #1006230 should fix this
+sagemath
+sagemath-notebook
+
 #Devel tools
 
 #Install the mandatory packages from dev-tools and dev-libs
@@ -35,14 +38,41 @@ scilab-doc
 @development-libs
 @c-development
 @rpm-development-tools
+#others, not included
+# C++ libraries
+blitz-devel
+armadillo-devel
 
 # Misc. related utils
 ddd
 valgrind
-ipython
+
+#python 2 tools/libraries not included from the groups
+python-ipython
+python-ipython-console
+python-ipython-notebook
+sympy
+python-networkx
+
+#python 3 and tools/libraries not included from the groups
+python3
+python3-matplotlib
+python3-scipy
+python3-numpy
+python3-ipython
+python3-ipython-console
+python3-ipython-notebook
+python3-networkx
+
+# matplotlib backends
+python-matplotlib-qt4
+python-matplotlib-tk
+python3-matplotlib-qt4
+python3-matplotlib-tk
 
 # Include Java development tools
 @java-development
+apache-commons-math
 
 #fortran compiler
 gcc-gfortran
@@ -54,7 +84,7 @@ rkward
 qtoctave
 
 # IDEs for the IDE folks
-eclipse
+@eclipse
 spyder
 
 #writing & publishing
@@ -71,21 +101,22 @@ kile
 BibTool
 pdfshuffler
 
-
 # Parallel/Distributed computing libraries/tools
 openmpi
+openmpi-devel
 valgrind-openmpi
 pvm
 pvm-gui #will install 'pvm' as well
 libgomp
 python-pp
-
+mpi4py-openmpi
+python3-mpi4py-openmpi
 
 #Version control- a GUI for each as well
 
 # Installing rapidsvn will also install subversion package
 rapidsvn 
-# Install git-gui, will also install git
+git
 git-gui
 # Mercurial
 mercurial
@@ -94,7 +125,6 @@ mercurial-hgk
 #Backup Utilities
 backintime-kde
 
-
 #needs to install this specifically because of some conflict between openmpi
 #and emacs (http://lists.fedoraproject.org/pipermail/devel/2011-July/153812.html)
 libotf
@@ -105,13 +135,13 @@ root-gui-fitpanel
 root-python
 
 #Multiple jobs/clustering system
-torque
-torque-server
-torque-scheduler
-torque-gui
-torque-libs
-torque-mom
-python-pbs
+# torque
+# torque-server
+# torque-scheduler
+# torque-gui
+# torque-libs
+# torque-mom
+# python-pbs
 
 #Drawing, Picture viewing tools, Visualization tools
 dia
@@ -125,8 +155,9 @@ Mayavi
 
 #Misc. Utils
 screen
+tmux
 rlwrap
-xchat
+hexchat
 shutter
 fig2ps
 bibtex2html
@@ -139,4 +170,4 @@ firefox
 
 %post
 
-%end
+%end
\ No newline at end of file
diff --git a/fedora-repo-not-rawhide.ks b/fedora-repo-not-rawhide.ks
index 75f87cb..7a67d8b 100644
--- a/fedora-repo-not-rawhide.ks
+++ b/fedora-repo-not-rawhide.ks
@@ -1,3 +1,3 @@
 repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
-repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-$releasever&arch=$basearch
-#repo --name=updates-testing --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-$releasever&arch=$basearch
+repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch
+#repo --name=updates-testing --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f$releasever&arch=$basearch
diff --git a/fedora-soas-packages.ks b/fedora-soas-packages.ks
index 1bbda45..d99468c 100644
--- a/fedora-soas-packages.ks
+++ b/fedora-soas-packages.ks
@@ -34,6 +34,8 @@
 @sugar-desktop
 -sugar-ruler
 sugar-cp-updater
+lightdm
+lightdm-gtk
 
 # Write breaks unless we do this (we don't need it anyway)
 # enable for testing in the F17 dev cycle