diff --git a/README.md b/README.md
index bdb1eaa6..18364e17 100644
--- a/README.md
+++ b/README.md
@@ -42,6 +42,7 @@ class App extends Component {
 
 export default App;
 ````
+> Need a more extensive example? [Click here](https://github.com/hodgef/simple-keyboard/blob/master/src/demo/App.js).
 
 # Options
 You can customize the Keyboard by passing options (props) to it.
diff --git a/package.json b/package.json
index 3ddec63a..181e7d29 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "simple-keyboard",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "description": "React.js Virtual Keyboard",
   "main": "build/index.js",
   "scripts": {
diff --git a/src/demo/App.js b/src/demo/App.js
index 272f6a3f..8ee8fb04 100644
--- a/src/demo/App.js
+++ b/src/demo/App.js
@@ -34,7 +34,7 @@ class App extends Component {
               '.com @ {space}'
             ]
           }}
-          theme={"myTheme hg-theme-default"}
+          theme={"hg-layout-default hg-theme-default"}
           debug={true}
           display={{
             '{bksp}': 'delete',
diff --git a/src/lib/services/Utilities.js b/src/lib/services/Utilities.js
index 14a97da4..ccf22272 100644
--- a/src/lib/services/Utilities.js
+++ b/src/lib/services/Utilities.js
@@ -30,6 +30,8 @@ class Utilities {
       output = 'openbracket';
     else if(string === "]")
       output = 'closebracket';
+    else if(string === "//")
+      output = 'emptybutton';
     else
       output = '';
 
@@ -37,7 +39,7 @@ class Utilities {
   }
 
   static getButtonClass = button => {
-    let buttonTypeClass = button.includes("{") ? "functionBtn" : "standardBtn";
+    let buttonTypeClass = (button.includes("{") && button !== '{//}') ? "functionBtn" : "standardBtn";
     let buttonWithoutBraces = button.replace("{", "").replace("}", "");
 
     let buttonNormalized =