diff --git a/fedora-python-classroom-common.ks b/fedora-python-classroom-common.ks
index a9cb371..bf49a53 100644
--- a/fedora-python-classroom-common.ks
+++ b/fedora-python-classroom-common.ks
@@ -6,6 +6,10 @@
 
 %packages
 @python-classroom
+nano
+openssh-clients
+vim-enhanced
+wget
 
 # Remove Pythons possibly recommended by tox
 -python26
diff --git a/fedora-python-classroom-gnome-common.ks b/fedora-python-classroom-gnome-common.ks
index 61c98be..fbcd123 100644
--- a/fedora-python-classroom-gnome-common.ks
+++ b/fedora-python-classroom-gnome-common.ks
@@ -7,6 +7,9 @@
 %include fedora-python-classroom-common.ks
 
 %packages
+ninja-ide
+emacs
+
 # Remove extra gnome-y things
 -@graphical-internet
 -@games