diff --git a/source/EnyoEditor.js b/source/EnyoEditor.js
index ba5ebd123..6c1ea9014 100644
--- a/source/EnyoEditor.js
+++ b/source/EnyoEditor.js
@@ -246,6 +246,7 @@ enyo.kind({
 		if (this.activeDocument.getCurrentIF() === 'hera') {
 			this.$.hera.csssave();
 			this.manageControls('code','css');
+			this.activeDocument.setCurrentIF('code');
 			this.$.panels.setIndex(0);
 			this.$.toolbar.resized();
 		} else {
@@ -1123,7 +1124,7 @@ enyo.kind({
 	},
 	
 	/*
-	* a reflow to fix deimos fro poking through here
+	* a reflow to fix deimos for poking through here
 	*/
 	reflowed: function(inSender, inEvent){
 		this.trace(inSender, inEvent);
diff --git a/source/utilities/EditorSettings.js b/source/utilities/EditorSettings.js
index 028f0cb6b..b059cbefd 100644
--- a/source/utilities/EditorSettings.js
+++ b/source/utilities/EditorSettings.js
@@ -65,7 +65,9 @@ enyo.kind({
 								{content: "eclipse"},
 								{content: "github"},
 								{content: "idle_fingers"},
+								{content: "katzenmilch"},
 								{content: "kr_theme"},
+								{content: "kuroir"},
 								{content: "merbivore"},
 								{content: "merbivore_soft"},
 								{content: "mono_industrial"},
@@ -73,6 +75,7 @@ enyo.kind({
 								{content: "pastel_on_dark"},
 								{content: "solarized_dark"},
 								{content: "solarized_light"},
+								{content: "terminal"},
 								{content: "textmate"},
 								{content: "tomorrow"},
 								{content: "tomorrow_night"},