diff --git a/images/exit.svg b/images/exit.svg
index 4c67ba03..c4b6bc27 100644
--- a/images/exit.svg
+++ b/images/exit.svg
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>Combined Shape</title>
+    <title>Exit</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="exit" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="Artboard-1" fill="#D8D8D8">
-            <path d="M8,5.87867966 L2.69669914,0.575378798 L0.575378798,2.69669914 L5.87867966,8 L0.575378798,13.3033009 L2.69669914,15.4246212 L8,10.1213203 L13.3033009,15.4246212 L15.4246212,13.3033009 L10.1213203,8 L15.4246212,2.69669914 L13.3033009,0.575378798 L8,5.87867966 Z" id="Combined-Shape"></path>
+            <path d="M8,5.87867966 L2.69669914,0.575378798 L0.575378798,2.69669914 L5.87867966,8 L0.575378798,13.3033009 L2.69669914,15.4246212 L8,10.1213203 L13.3033009,15.4246212 L15.4246212,13.3033009 L10.1213203,8 L15.4246212,2.69669914 L13.3033009,0.575378798 L8,5.87867966 Z" id="exit"></path>
         </g>
     </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/images/minus.svg b/images/minus.svg
index 8cdc54cc..95f8494b 100644
--- a/images/minus.svg
+++ b/images/minus.svg
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>Rectangle 2</title>
+    <title>Decrease Value</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="Decrease value" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="16" transform="translate(0.000000, -6.000000)" fill="#D8D8D8">
-            <rect id="Rectangle-2" x="0" y="12" width="16" height="4"></rect>
+            <rect id="Decrease value" x="0" y="12" width="16" height="4"></rect>
         </g>
     </g>
 </svg>
diff --git a/images/plus.svg b/images/plus.svg
index 93b3c44b..449abd95 100644
--- a/images/plus.svg
+++ b/images/plus.svg
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
     <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>Combined Shape</title>
+    <title>Increase Value</title>
     <desc>Created with Sketch.</desc>
     <defs></defs>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="Increase Value" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <g id="16" fill="#D8D8D8">
-            <path d="M10,6 L10,0 L6,0 L6,6 L0,6 L0,10 L6,10 L6,16 L10,16 L10,10 L16,10 L16,6 L10,6 Z" id="Combined-Shape"></path>
+            <path d="M10,6 L10,0 L6,0 L6,6 L0,6 L0,10 L6,10 L6,16 L10,16 L10,10 L16,10 L16,6 L10,6 Z" id="Increase Value"></path>
         </g>
     </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/shared/components/Editor/Editor.jsx b/shared/components/Editor/Editor.jsx
index 87195feb..2d793b17 100644
--- a/shared/components/Editor/Editor.jsx
+++ b/shared/components/Editor/Editor.jsx
@@ -4,7 +4,7 @@ import 'codemirror/mode/javascript/javascript';
 import 'codemirror/addon/selection/active-line'
 
 class Editor extends React.Component {
-	_cm: CodeMirror.Editor
+  _cm: CodeMirror.Editor
 
 	componentDidMount() {
 		this._cm = CodeMirror(this.refs.container, {
diff --git a/shared/components/Preferences/Preferences.jsx b/shared/components/Preferences/Preferences.jsx
index 89b849bd..7af63eb6 100644
--- a/shared/components/Preferences/Preferences.jsx
+++ b/shared/components/Preferences/Preferences.jsx
@@ -15,18 +15,18 @@ class Preferences extends React.Component {
 		return (
 			<div className={preferencesContainerClass} tabindex="0">
 				<div className="preferences__heading">
-					<h2 className="preferences__title-text">Preferences</h2>
+					<h2 className="preferences__title">Preferences</h2>
 					<button className="preferences__exit-button" onClick={this.props.closePreferences}>
 						<Isvg src={exitUrl} alt="Exit Preferences" />
 					</button>
 				</div>
 				<div className="preference">
-					<h3 className="preference__title-text">Font Size</h3>
-						<button className="preferences__plus-button" onClick={this.props.decreaseFont}>
+					<h3 className="preference__title">Font Size</h3>
+						<button className="preference__plus-button" onClick={this.props.decreaseFont}>
 							<Isvg src={minusUrl} alt="Decrease Font Size" />
 						</button>
 						<p className="preference__value">{this.props.fontSize}</p>
-						<button className="preferences__minus-button" onClick={this.props.increaseFont}>
+						<button className="preference__minus-button" onClick={this.props.increaseFont}>
 							<Isvg src={plusUrl} alt="Increase Font Size" />
 						</button>
 				</div>
diff --git a/styles/components/_preferences.scss b/styles/components/_preferences.scss
index 0c415c99..c660148f 100644
--- a/styles/components/_preferences.scss
+++ b/styles/components/_preferences.scss
@@ -19,12 +19,12 @@
 	}
 }
 
-.preferences__plus-button {
+.preference__plus-button {
 	@extend %preferences-button;
 	margin-right: auto;
 }
 
-.preferences__minus-button {
+.preference__minus-button {
 	@extend %preferences-button;
 }
 
@@ -33,7 +33,7 @@
 	flex-direction: rows;
 	margin-left: #{20 / $base-font-size}rem;
 }
-.preferences__title-text {
+.preferences__title {
 	margin: 0 0;
 	font-size: #{$menu-font-size}px;
 	font-weight: 700;
@@ -45,7 +45,7 @@
 	margin: 0 #{20 / $base-font-size}rem;
 }
 
-.preference__title-text {
+.preference__title {
 	margin: 0 0;
 	font-size: #{$base-font-size}px;
 	font-weight: 400;