diff --git a/client/homebrew/brewRenderer/brewRenderer.jsx b/client/homebrew/brewRenderer/brewRenderer.jsx
index 096a4f87e..fff2ccbf4 100644
--- a/client/homebrew/brewRenderer/brewRenderer.jsx
+++ b/client/homebrew/brewRenderer/brewRenderer.jsx
@@ -1,97 +1,115 @@
-var React = require('react');
-var _ = require('lodash');
-var cx = require('classnames');
-
-var Markdown = require('marked');
-
-var PAGE_HEIGHT = 1056 + 30;
-
-var BrewRenderer = React.createClass({
-	getDefaultProps: function() {
-		return {
-			text : ''
-		};
-	},
-	getInitialState: function() {
-		return {
-			viewablePageNumber: 0,
-			height : 0,
-			isMounted : false
-		};
-	},
-	totalPages : 0,
-	height : 0,
-
-	componentDidMount: function() {
-		this.setState({
-			height : this.refs.main.parentNode.clientHeight,
-			isMounted : true
-		});
-	},
-	handleScroll : function(e){
-		this.setState({
-			viewablePageNumber : Math.floor(e.target.scrollTop / PAGE_HEIGHT)
-		});
-	},
-	//Implement later
-	scrollToPage : function(pageNumber){
-	},
-
-	shouldRender : function(pageText, index){
-		if(!this.state.isMounted) return false;
-
-		var viewIndex = this.state.viewablePageNumber;
-		if(index == viewIndex - 1) return true;
-		if(index == viewIndex)     return true;
-		if(index == viewIndex + 1) return true;
-
-		//Check for style tages
-		if(pageText.indexOf('<style>') !== -1) return true;
-
-		return false;
-	},
-
-	renderPageInfo : function(){
-		return <div className='pageInfo'>
-			{this.state.viewablePageNumber + 1} / {this.totalPages}
-		</div>
-	},
-
-	renderDummyPage : function(key){
-		return <div className='phb' key={key}>
-			<i className='fa fa-spinner fa-spin' />
-		</div>
-	},
-
-	renderPage : function(pageText, index){
-		return <div className='phb' dangerouslySetInnerHTML={{__html:Markdown(pageText)}} key={index} />
-	},
-
-	renderPages : function(){
-		var pages = this.props.text.split('\\page');
-		this.totalPages = pages.length;
-
-		return _.map(pages, (page, index)=>{
-			if(this.shouldRender(page, index)){
-				return this.renderPage(page, index);
-			}else{
-				return this.renderDummyPage(index);
-			}
-		});
-	},
-
-	render : function(){
-		return <div className='brewRenderer'
-			onScroll={this.handleScroll}
-			ref='main'
-			style={{height : this.state.height}}>
-
-			<div className='pages'>
-				{this.renderPages()}
-			</div>
-			{this.renderPageInfo()}
-		</div>
-	}
-});
-
-module.exports = BrewRenderer;
+var React = require('react');
+var _ = require('lodash');
+var cx = require('classnames');
+
+var Markdown = require('marked');
+var renderer = new Markdown.Renderer();
+
+//Processes the markdown within an HTML block if it's just a class-wrapper
+renderer.html = function (html) {
+	if(_.startsWith(html, '<div class=') && _.endsWith(_.trim(html), '</div>')){
+		var openTag = html.substring(0, html.indexOf('>')+1);
+		html = html.substring(html.indexOf('>')+1);
+		html = html.substring(0, html.lastIndexOf('</div>'));
+
+		console.log(html);
+
+		console.log(Markdown(html));
+
+		return `${openTag} ${Markdown(html)} </div>`;
+	}
+	return html;
+}
+
+
+var PAGE_HEIGHT = 1056 + 30;
+
+var BrewRenderer = React.createClass({
+	getDefaultProps: function() {
+		return {
+			text : ''
+		};
+	},
+	getInitialState: function() {
+		return {
+			viewablePageNumber: 0,
+			height : 0,
+			isMounted : false
+		};
+	},
+	totalPages : 0,
+	height : 0,
+
+	componentDidMount: function() {
+		this.setState({
+			height : this.refs.main.parentNode.clientHeight,
+			isMounted : true
+		});
+	},
+	handleScroll : function(e){
+		this.setState({
+			viewablePageNumber : Math.floor(e.target.scrollTop / PAGE_HEIGHT)
+		});
+	},
+	//Implement later
+	scrollToPage : function(pageNumber){
+	},
+
+	shouldRender : function(pageText, index){
+		if(!this.state.isMounted) return false;
+
+		var viewIndex = this.state.viewablePageNumber;
+		if(index == viewIndex - 1) return true;
+		if(index == viewIndex)     return true;
+		if(index == viewIndex + 1) return true;
+
+		//Check for style tages
+		if(pageText.indexOf('<style>') !== -1) return true;
+
+		return false;
+	},
+
+	renderPageInfo : function(){
+		return <div className='pageInfo'>
+			{this.state.viewablePageNumber + 1} / {this.totalPages}
+		</div>
+	},
+
+	renderDummyPage : function(key){
+		return <div className='phb' key={key}>
+			<i className='fa fa-spinner fa-spin' />
+		</div>
+	},
+
+	renderPage : function(pageText, index){
+		return <div className='phb' dangerouslySetInnerHTML={{__html:Markdown(pageText, {renderer : renderer})}} key={index} />
+	},
+
+	renderPages : function(){
+		var pages = this.props.text.split('\\page');
+		this.totalPages = pages.length;
+
+		return _.map(pages, (page, index)=>{
+			if(this.shouldRender(page, index)){
+				return this.renderPage(page, index);
+			}else{
+				return this.renderDummyPage(index);
+			}
+		});
+	},
+
+	render : function(){
+		return <div className='brewRenderer'
+			onScroll={this.handleScroll}
+			ref='main'
+			style={{height : this.state.height}}>
+
+			<div className='pages'>
+				{this.renderPages()}
+			</div>
+			{this.renderPageInfo()}
+		</div>
+	}
+});
+
+module.exports = BrewRenderer;
diff --git a/client/homebrew/editor/snippets/magic.gen.js b/client/homebrew/editor/snippets/magic.gen.js
new file mode 100644
index 000000000..82469cd18
--- /dev/null
+++ b/client/homebrew/editor/snippets/magic.gen.js
@@ -0,0 +1,91 @@
+var _ = require('lodash');
+
+var spellNames = [
+	"Astral Rite of Acne",
+	"Create Acne",
+	"Cursed Ramen Erruption",
+	"Dark Chant of the Dentists",
+	"Erruption of Immaturity",
+	"Flaming Disc of Inconvenience",
+	"Heal Bad Hygene",
+	"Heavenly Transfiguration of the Cream Devil",
+	"Hellish Cage of Mucus",
+	"Irritate Peanut Butter Fairy",
+	"Luminous Erruption of Tea",
+	"Mystic Spell of the Poser",
+	"Sorcerous Enchantment of the Chimneysweep",
+	"Steak Sauce Ray",
+	"Talk to Groupie",
+	"Astonishing Chant of Chocolate",
+	"Astounding Pasta Puddle",
+	"Ball of Annoyance",
+	"Cage of Yarn",
+	"Control Noodles Elemental",
+	"Create Nervousness",
+	"Cure Baldness",
+	"Cursed Ritual of Bad Hair",
+	"Dispell Piles in Dentist",
+	"Eliminate Florists",
+	"Illusionary Transfiguration of the Babysitter",
+	"Necromantic Armor of Salad Dressing",
+	"Occult Transfiguration of Foot Fetish",
+	"Protection from Mucus Giant",
+	"Tinsel Blast",
+	"Alchemical Evocation of the Goths",
+	"Call Fangirl",
+	"Divine Spell of Crossdressing",
+	"Dominate Ramen Giant",
+	"Eliminate Vindictiveness in Gym Teacher",
+	"Extra-Planar Spell of Irritation",
+	"Induce Whining in Babysitter",
+	"Invoke Complaining",
+	"Magical Enchantment of Arrogance",
+	"Occult Globe of Salad Dressing",
+	"Overwhelming Enchantment of the Chocolate Fairy",
+	"Sorcerous Dandruff Globe",
+	"Spiritual Invocation of the Costumers",
+	"Ultimate Rite of the Confetti Angel",
+	"Ultimate Ritual of Mouthwash",
+];
+
+module.exports = {
+
+	spellList : function(){
+		var levels = ['Cantrips (0 Level)', '2nd Level', '3rd Level', '4th Level', '5th Level', '6th Level', '7th Level', '8th Level', '9th Level'];
+
+		var content = _.map(levels, (level)=>{
+			var spells = _.map(_.sampleSize(spellNames, _.random(5, 15)), (spell)=>{
+				return `- ${spell}`;
+			}).join('\n');
+			return `##### ${level} \n${spells} \n`;
+		}).join('\n');
+
+		return `<div class='spellList'>\n${content}\n</div>`;
+	},
+
+	spell : function(){
+		var level = ["1st", "2nd", "3rd", "4th", "5th", "6th", "7th", "8th", "9th"];
+		var spellSchools = ["abjuration", "conjuration", "divination", "enchantment", "evocation", "illusion", "necromancy", "transmutation"];
+
+
+		var components = _.sampleSize(["V", "S", "M"], _.random(1,3)).join(', ');
+		if(components.indexOf("M") !== -1){
+			components += " (" +  _.sampleSize(['a small doll', 'a crushed button worth at least 1cp', 'discarded gum wrapper'], _.random(1,3)).join(', ') + ")"
+		}
+
+		return [
+			"#### " + _.sample(spellNames),
+			"*" + _.sample(level) + "-level " + _.sample(spellSchools) + "*",
+			"___",
+			"- **Casting Time:** 1 action",
+			"- **Range:** " + _.sample(["Self", "Touch", "30 feet", "60 feet"]),
+			"- **Components:** " + components,
+			"- **Duration:** " + _.sample(["Until dispelled", "1 round", "Instantaneous", "Concentration, up to 10 minutes", "1 hour"]),
+			"",
+			"A flame, equivalent in brightness to a torch, springs from from an object that you touch. ",
+			"The effect look like a regular flame, but it creates no heat and doesn't use oxygen. ",
+			"A *continual flame* can be covered or hidden but not smothered or quenched.",
+			"\n\n\n"
+		].join('\n');
+	}
+}
\ No newline at end of file
diff --git a/client/homebrew/editor/snippets/snippets.js b/client/homebrew/editor/snippets/snippets.js
index 74e267a0f..c303a6ddc 100644
--- a/client/homebrew/editor/snippets/snippets.js
+++ b/client/homebrew/editor/snippets/snippets.js
@@ -1,175 +1,178 @@
-var SpellGen = require('./spell.gen.js');
-var ClassTableGen = require('./classtable.gen.js');
-var MonsterBlockGen = require('./monsterblock.gen.js');
-var ClassFeatureGen = require('./classfeature.gen.js');
-var FullClassGen = require('./fullclass.gen.js');
-
-
-
-module.exports = [
-
-	{
-		groupName : 'Editor',
-		icon : 'fa-pencil',
-		snippets : [
-			{
-				name : "Column Break",
-				icon : 'fa-columns',
-				gen : "```\n```\n\n"
-			},
-			{
-				name : "New Page",
-				icon : 'fa-file-text',
-				gen : "\\page\n\n"
-			},
-			{
-				name : "Vertical Spacing",
-				icon : 'fa-arrows-v',
-				gen : "<div style='margin-top:140px'></div>\n\n"
-			},
-			{
-				name : "Image",
-				icon : 'fa-image',
-				gen : [
-					"<img ",
-					"  src='https://s-media-cache-ak0.pinimg.com/736x/4a/81/79/4a8179462cfdf39054a418efd4cb743e.jpg' ",
-					"  style='width:325px' />",
-					"Credit: Kyounghwan Kim"
-				].join('\n')
-			},
-			{
-				name : "Background Image",
-				icon : 'fa-tree',
-				gen : [
-					"<img ",
-					"  src='http://i.imgur.com/hMna6G0.png' ",
-					"  style='position:absolute; top:50px; right:30px; width:280px' />"
-				].join('\n')
-			},
-
-			{
-				name : "Page Number",
-				icon : 'fa-bookmark',
-				gen : "<div class='pageNumber'>1</div>\n<div class='footnote'>PART 1 | FANCINESS</div>\n\n"
-			},
-
-
-		]
-	},
-
-
-	/************************* PHB ********************/
-
-	{
-		groupName : 'PHB',
-		icon : 'fa-book',
-		snippets : [
-			{
-				name : 'Spell',
-				icon : 'fa-magic',
-				gen : SpellGen,
-			},
-			{
-				name : 'Class Feature',
-				icon : 'fa-trophy',
-				gen : ClassFeatureGen,
-			},
-			{
-				name : 'Note',
-				icon : 'fa-sticky-note',
-				gen : function(){
-					return [
-						"> ##### Time to Drop Knowledge",
-						"> Use notes to point out some interesting information. ",
-						"> ",
-						"> **Tables and lists** both work within a note."
-					].join('\n');
-				},
-			},
-			{
-				name : 'Monster Stat Block',
-				icon : 'fa-bug',
-				gen : MonsterBlockGen.half,
-			},
-			{
-				name : 'Wide Monster Stat Block',
-				icon : 'fa-paw',
-				gen : MonsterBlockGen.full,
-			}
-		]
-	},
-
-
-
-	/*********************  TABLES *********************/
-
-	{
-		groupName : 'Tables',
-		icon : 'fa-table',
-		snippets : [
-			{
-				name : "Class Table",
-				icon : 'fa-table',
-				gen : ClassTableGen.full,
-			},
-			{
-				name : "Half Class Table",
-				icon : 'fa-list-alt',
-				gen : ClassTableGen.half,
-			},
-			{
-				name : 'Table',
-				icon : 'fa-th-list',
-				gen : function(){
-					return [
-						"##### Cookie Tastiness",
-						"| Tastiness | Cookie Type |",
-						"|:----:|:-------------|",
-						"| -5  | Raisin |",
-						"| 8th  | Chocolate Chip |",
-						"| 11th | 2 or lower |",
-						"| 14th | 3 or lower |",
-						"| 17th | 4 or lower |\n\n",
-					].join('\n');
-				},
-			}
-		]
-	},
-
-
-
-
-	/**************** PRINT *************/
-
-	{
-		groupName : 'Print',
-		icon : 'fa-print',
-		snippets : [
-			{
-				name : "A4 PageSize",
-				icon : 'fa-file-o',
-				gen : ['<style>',
-					'  .phb{',
-					'    width : 210mm;',
-					'    height : 296.8mm;',
-					'  }',
-					'</style>'
-				].join('\n')
-			},
-			{
-				name : "Ink Friendly",
-				icon : 'fa-tint',
-				gen : ['<style>',
-					'  .phb{ background : white;}',
-					'  .phb img{ display : none;}',
-					'  .phb hr+blockquote{background : white;}',
-					'</style>',
-					''
-				].join('\n')
-			},
-		]
-	},
-
-]
-
-
+var MagicGen = require('./magic.gen.js');
+var ClassTableGen = require('./classtable.gen.js');
+var MonsterBlockGen = require('./monsterblock.gen.js');
+var ClassFeatureGen = require('./classfeature.gen.js');
+var FullClassGen = require('./fullclass.gen.js');
+
+
+
+module.exports = [
+
+	{
+		groupName : 'Editor',
+		icon : 'fa-pencil',
+		snippets : [
+			{
+				name : "Column Break",
+				icon : 'fa-columns',
+				gen : "```\n```\n\n"
+			},
+			{
+				name : "New Page",
+				icon : 'fa-file-text',
+				gen : "\\page\n\n"
+			},
+			{
+				name : "Vertical Spacing",
+				icon : 'fa-arrows-v',
+				gen : "<div style='margin-top:140px'></div>\n\n"
+			},
+			{
+				name : "Image",
+				icon : 'fa-image',
+				gen : [
+					"<img ",
+					"  src='https://s-media-cache-ak0.pinimg.com/736x/4a/81/79/4a8179462cfdf39054a418efd4cb743e.jpg' ",
+					"  style='width:325px' />",
+					"Credit: Kyounghwan Kim"
+				].join('\n')
+			},
+			{
+				name : "Background Image",
+				icon : 'fa-tree',
+				gen : [
+					"<img ",
+					"  src='http://i.imgur.com/hMna6G0.png' ",
+					"  style='position:absolute; top:50px; right:30px; width:280px' />"
+				].join('\n')
+			},
+
+			{
+				name : "Page Number",
+				icon : 'fa-bookmark',
+				gen : "<div class='pageNumber'>1</div>\n<div class='footnote'>PART 1 | FANCINESS</div>\n\n"
+			},
+
+
+		]
+	},
+
+
+	/************************* PHB ********************/
+
+	{
+		groupName : 'PHB',
+		icon : 'fa-book',
+		snippets : [
+			{
+				name : 'Spell',
+				icon : 'fa-magic',
+				gen : MagicGen.spell,
+			},
+			{
+				name : 'Spell List',
+				icon : 'fa-list',
+				gen : MagicGen.spellList,
+			},
+			{
+				name : 'Class Feature',
+				icon : 'fa-trophy',
+				gen : ClassFeatureGen,
+			},
+			{
+				name : 'Note',
+				icon : 'fa-sticky-note',
+				gen : function(){
+					return [
+						"> ##### Time to Drop Knowledge",
+						"> Use notes to point out some interesting information. ",
+						"> ",
+						"> **Tables and lists** both work within a note."
+					].join('\n');
+				},
+			},
+			{
+				name : 'Monster Stat Block',
+				icon : 'fa-bug',
+				gen : MonsterBlockGen.half,
+			},
+			{
+				name : 'Wide Monster Stat Block',
+				icon : 'fa-paw',
+				gen : MonsterBlockGen.full,
+			}
+		]
+	},
+
+
+
+	/*********************  TABLES *********************/
+
+	{
+		groupName : 'Tables',
+		icon : 'fa-table',
+		snippets : [
+			{
+				name : "Class Table",
+				icon : 'fa-table',
+				gen : ClassTableGen.full,
+			},
+			{
+				name : "Half Class Table",
+				icon : 'fa-list-alt',
+				gen : ClassTableGen.half,
+			},
+			{
+				name : 'Table',
+				icon : 'fa-th-list',
+				gen : function(){
+					return [
+						"##### Cookie Tastiness",
+						"| Tastiness | Cookie Type |",
+						"|:----:|:-------------|",
+						"| -5  | Raisin |",
+						"| 8th  | Chocolate Chip |",
+						"| 11th | 2 or lower |",
+						"| 14th | 3 or lower |",
+						"| 17th | 4 or lower |\n\n",
+					].join('\n');
+				},
+			}
+		]
+	},
+
+
+
+
+	/**************** PRINT *************/
+
+	{
+		groupName : 'Print',
+		icon : 'fa-print',
+		snippets : [
+			{
+				name : "A4 PageSize",
+				icon : 'fa-file-o',
+				gen : ['<style>',
+					'  .phb{',
+					'    width : 210mm;',
+					'    height : 296.8mm;',
+					'  }',
+					'</style>'
+				].join('\n')
+			},
+			{
+				name : "Ink Friendly",
+				icon : 'fa-tint',
+				gen : ['<style>',
+					'  .phb{ background : white;}',
+					'  .phb img{ display : none;}',
+					'  .phb hr+blockquote{background : white;}',
+					'</style>',
+					''
+				].join('\n')
+			},
+		]
+	},
+
+]
diff --git a/client/homebrew/phbStyle/phb.style.less b/client/homebrew/phbStyle/phb.style.less
index de8291fd4..7c4f4f763 100644
--- a/client/homebrew/phbStyle/phb.style.less
+++ b/client/homebrew/phbStyle/phb.style.less
@@ -64,17 +64,17 @@
 	}
 	ul{
 		margin-bottom       : 0.8em;
+		padding-left        : 1.4em;
 		line-height         : 1.3em;
 		list-style-position : outside;
 		list-style-type     : disc;
-		padding-left: 1.4em;
 	}
 	ol{
 		margin-bottom       : 0.8em;
+		padding-left        : 1.4em;
 		line-height         : 1.3em;
 		list-style-position : outside;
 		list-style-type     : decimal;
-		padding-left: 1.4em;
 	}
 	img{
 		z-index : -1;
@@ -169,15 +169,15 @@
 	// *****************************/
 	blockquote{
 		.useSansSerif();
-		box-sizing       : border-box;
-		margin-bottom    : 1em;
-		padding          : 5px 10px;
-		background-color : @noteGreen;
-		border-style: solid;
-		border-width: 11px;
-		border-image: @noteBorderImage 11;
-		border-image-outset: 9px 0px;
-		box-shadow       : 1px 4px 14px #888;
+		box-sizing          : border-box;
+		margin-bottom       : 1em;
+		padding             : 5px 10px;
+		background-color    : @noteGreen;
+		border-style        : solid;
+		border-width        : 11px;
+		border-image        : @noteBorderImage 11;
+		border-image-outset : 9px 0px;
+		box-shadow          : 1px 4px 14px #888;
 		p, ul{
 			font-size   : 0.352cm;
 			line-height : 1.1em;
@@ -185,7 +185,7 @@
 	}
 	//If a note starts a column, give it space at the top to render border
 	pre+blockquote{
-		margin-top: 11px;
+		margin-top : 11px;
 	}
 	//*****************************
 	// *    MONSTER STAT BLOCK
@@ -222,8 +222,8 @@
 			margin              : 0;
 			column-span         : 1;
 			background-color    : transparent;
+			border-style        : none;
 			border-image        : none;
-			border-style : none;
 			-webkit-column-span : 1;
 			tbody{
 				tr:nth-child(odd), tr:nth-child(even){
@@ -339,7 +339,7 @@
 		-moz-column-span    : all;
 	}
 	//Column Break
-	pre{
+	pre, code{
 		visibility                 : hidden;
 		-webkit-column-break-after : always;
 		break-after                : always;
@@ -367,6 +367,31 @@
 	}
 }
 //*****************************
+// *         SPELL LIST
+// *****************************/
+.phb .spellList{
+	.useSansSerif();
+	column-count        : 4;
+	column-span         : all;
+	-webkit-column-span : all;
+	-moz-column-span    : all;
+	ul+h5{
+		margin-top : 15px;
+	}
+	p, ul{
+		font-size   : 0.352cm;
+		line-height : 1.3em;
+	}
+	ul{
+		margin-bottom               : 0.5em;
+		padding-left                : 1em;
+		text-indent                 : -1em;
+		list-style-type             : none;
+		-webkit-column-break-inside : auto;
+		column-break-inside         : auto;
+	}
+}
+//*****************************
 // *         PRINT
 // *****************************/
 .phb.print{
diff --git a/shared/codemirror/addon/comment/continuecomment.js b/shared/codemirror/addon/comment/continuecomment.js
deleted file mode 100644
index 837b18bce..000000000
--- a/shared/codemirror/addon/comment/continuecomment.js
+++ /dev/null
@@ -1,85 +0,0 @@
-// CodeMirror, copyright (c) by Marijn Haverbeke and others
-// Distributed under an MIT license: http://codemirror.net/LICENSE
-
-(function(mod) {
-  if (typeof exports == "object" && typeof module == "object") // CommonJS
-    mod(require("../../lib/codemirror"));
-  else if (typeof define == "function" && define.amd) // AMD
-    define(["../../lib/codemirror"], mod);
-  else // Plain browser env
-    mod(CodeMirror);
-})(function(CodeMirror) {
-  var modes = ["clike", "css", "javascript"];
-
-  for (var i = 0; i < modes.length; ++i)
-    CodeMirror.extendMode(modes[i], {blockCommentContinue: " * "});
-
-  function continueComment(cm) {
-    if (cm.getOption("disableInput")) return CodeMirror.Pass;
-    var ranges = cm.listSelections(), mode, inserts = [];
-    for (var i = 0; i < ranges.length; i++) {
-      var pos = ranges[i].head, token = cm.getTokenAt(pos);
-      if (token.type != "comment") return CodeMirror.Pass;
-      var modeHere = CodeMirror.innerMode(cm.getMode(), token.state).mode;
-      if (!mode) mode = modeHere;
-      else if (mode != modeHere) return CodeMirror.Pass;
-
-      var insert = null;
-      if (mode.blockCommentStart && mode.blockCommentContinue) {
-        var end = token.string.indexOf(mode.blockCommentEnd);
-        var full = cm.getRange(CodeMirror.Pos(pos.line, 0), CodeMirror.Pos(pos.line, token.end)), found;
-        if (end != -1 && end == token.string.length - mode.blockCommentEnd.length && pos.ch >= end) {
-          // Comment ended, don't continue it
-        } else if (token.string.indexOf(mode.blockCommentStart) == 0) {
-          insert = full.slice(0, token.start);
-          if (!/^\s*$/.test(insert)) {
-            insert = "";
-            for (var j = 0; j < token.start; ++j) insert += " ";
-          }
-        } else if ((found = full.indexOf(mode.blockCommentContinue)) != -1 &&
-                   found + mode.blockCommentContinue.length > token.start &&
-                   /^\s*$/.test(full.slice(0, found))) {
-          insert = full.slice(0, found);
-        }
-        if (insert != null) insert += mode.blockCommentContinue;
-      }
-      if (insert == null && mode.lineComment && continueLineCommentEnabled(cm)) {
-        var line = cm.getLine(pos.line), found = line.indexOf(mode.lineComment);
-        if (found > -1) {
-          insert = line.slice(0, found);
-          if (/\S/.test(insert)) insert = null;
-          else insert += mode.lineComment + line.slice(found + mode.lineComment.length).match(/^\s*/)[0];
-        }
-      }
-      if (insert == null) return CodeMirror.Pass;
-      inserts[i] = "\n" + insert;
-    }
-
-    cm.operation(function() {
-      for (var i = ranges.length - 1; i >= 0; i--)
-        cm.replaceRange(inserts[i], ranges[i].from(), ranges[i].to(), "+insert");
-    });
-  }
-
-  function continueLineCommentEnabled(cm) {
-    var opt = cm.getOption("continueComments");
-    if (opt && typeof opt == "object")
-      return opt.continueLineComment !== false;
-    return true;
-  }
-
-  CodeMirror.defineOption("continueComments", null, function(cm, val, prev) {
-    if (prev && prev != CodeMirror.Init)
-      cm.removeKeyMap("continueComment");
-    if (val) {
-      var key = "Enter";
-      if (typeof val == "string")
-        key = val;
-      else if (typeof val == "object" && val.key)
-        key = val.key;
-      var map = {name: "continueComment"};
-      map[key] = continueComment;
-      cm.addKeyMap(map);
-    }
-  });
-});
diff --git a/shared/codemirror/addon/dialog/dialog.css b/shared/codemirror/addon/dialog/dialog.css
deleted file mode 100644
index 8f713c077..000000000
--- a/shared/codemirror/addon/dialog/dialog.css
+++ /dev/null
@@ -1,32 +0,0 @@
-.CodeMirror-dialog {
-  position: absolute;
-  left: 0; right: 0;
-  background: inherit;
-  z-index: 15;
-  padding: .1em .8em;
-  overflow: hidden;
-  color: inherit;
-}
-
-.CodeMirror-dialog-top {
-  border-bottom: 1px solid #eee;
-  top: 0;
-}
-
-.CodeMirror-dialog-bottom {
-  border-top: 1px solid #eee;
-  bottom: 0;
-}
-
-.CodeMirror-dialog input {
-  border: none;
-  outline: none;
-  background: transparent;
-  width: 20em;
-  color: inherit;
-  font-family: monospace;
-}
-
-.CodeMirror-dialog button {
-  font-size: 70%;
-}