diff --git a/client/homebrew/pages/editPage/editPage.jsx b/client/homebrew/pages/editPage/editPage.jsx
index 494de6c88..b209e7ef7 100644
--- a/client/homebrew/pages/editPage/editPage.jsx
+++ b/client/homebrew/pages/editPage/editPage.jsx
@@ -469,7 +469,6 @@ const EditPage = createClass({
 						renderer={this.state.brew.renderer}
 						userThemes={this.props.userThemes}
 						themeBundle={this.state.themeBundle}
-						snippetBundle={this.state.themeBundle.snippets}
 						updateBrew={this.updateBrew}
 						onCursorPageChange={this.handleEditorCursorPageChange}
 						onViewPageChange={this.handleEditorViewPageChange}
diff --git a/client/homebrew/pages/homePage/homePage.jsx b/client/homebrew/pages/homePage/homePage.jsx
index 0a598556a..45efedf6a 100644
--- a/client/homebrew/pages/homePage/homePage.jsx
+++ b/client/homebrew/pages/homePage/homePage.jsx
@@ -108,7 +108,6 @@ const HomePage = createClass({
 					onTextChange={this.handleTextChange}
 					renderer={this.state.brew.renderer}
 					showEditButtons={false}
-					snippets={this.props.snippets}
 					themeBundle={this.state.themeBundle}
 					onCursorPageChange={this.handleEditorCursorPageChange}
 					onViewPageChange={this.handleEditorViewPageChange}
diff --git a/client/homebrew/pages/newPage/newPage.jsx b/client/homebrew/pages/newPage/newPage.jsx
index cb6ab5c76..6daa881f6 100644
--- a/client/homebrew/pages/newPage/newPage.jsx
+++ b/client/homebrew/pages/newPage/newPage.jsx
@@ -246,7 +246,6 @@ const NewPage = createClass({
 						onSnipChange={this.handleSnipChange}
 						renderer={this.state.brew.renderer}
 						userThemes={this.props.userThemes}
-						snippets={this.props.snippets}
 						themeBundle={this.state.themeBundle}
 						onCursorPageChange={this.handleEditorCursorPageChange}
 						onViewPageChange={this.handleEditorViewPageChange}
diff --git a/shared/helpers.js b/shared/helpers.js
index 1f6ccc936..efe7eb008 100644
--- a/shared/helpers.js
+++ b/shared/helpers.js
@@ -4,7 +4,7 @@ import request from '../client/homebrew/utils/request-middleware.js';
 
 // Convert the templates from a brew to a Snippets Structure.
 const brewSnippetsToJSON = (menuTitle, userBrewSnippets, themeBundleSnippets=null, full=true)=>{
-	const textSplit  = /^\\snippet /gm;
+	const textSplit  = /^\\snippet +/gm;
 	const mpAsSnippets = [];
 	// Snippets from Themes first.
 	if(themeBundleSnippets) {
@@ -15,7 +15,7 @@ const brewSnippetsToJSON = (menuTitle, userBrewSnippets, themeBundleSnippets=nul
 					const name = snips.trim().split('\n')[0];
 					if(name.length != 0) {
 						userSnippets.push({
-							name : name.slice('\snippets'.length),
+							name : name,
 							icon : '',
 							gen  : snips.slice(name.length + 1).trim(),
 						});