diff --git a/index.html b/index.html
index 7a4e456..ec9498e 100755
--- a/index.html
+++ b/index.html
@@ -13,11 +13,11 @@
             <h2>Wires</h2>
 
             <ul id="wireOptions">
-                <li><button class="buttonRed" data-colour="red"></button></li>
-                <li><button class="buttonYellow" data-colour="yellow"></button></li>
-                <li><button class="buttonBlue" data-colour="blue"></button></li>
-                <li><button class="buttonWhite" data-colour="white"></button></li>
-                <li><button class="buttonBlack" data-colour="black"></button></li>
+                <li><button class="button red" data-colour="red"></button></li>
+                <li><button class="button yellow" data-colour="yellow"></button></li>
+                <li><button class="button blue" data-colour="blue"></button></li>
+                <li><button class="button white" data-colour="white"></button></li>
+                <li><button class="button black" data-colour="black"></button></li>
             </ul>
 
             <ul id="wireList"></ul>
@@ -27,10 +27,10 @@
             <h2>Button</h2>
             <div>
                 Colour:
-                <input type="radio" name="buttonColour" value="blue" id="buttonColourBlue" checked /> <label for="buttonColourBlue" class="buttonBlue">Blue</label>
-                <input type="radio" name="buttonColour" value="white" id="buttonColourWhite" /> <label for="buttonColourWhite" class="buttonWhite">White</label>
-                <input type="radio" name="buttonColour" value="yellow" id="buttonColourYellow" /> <label for="buttonColourYellow" class="buttonYellow">Yellow</label>
-                <input type="radio" name="buttonColour" value="red" id="buttonColourRed" /> <label for="buttonColourRed" class="buttonRed">Red</label>
+                <input type="radio" name="buttonColour" value="blue" id="buttonColourBlue" checked /> <label for="buttonColourBlue" class="button blue">Blue</label>
+                <input type="radio" name="buttonColour" value="white" id="buttonColourWhite" /> <label for="buttonColourWhite" class="button white">White</label>
+                <input type="radio" name="buttonColour" value="yellow" id="buttonColourYellow" /> <label for="buttonColourYellow" class="button yellow">Yellow</label>
+                <input type="radio" name="buttonColour" value="red" id="buttonColourRed" /> <label for="buttonColourRed" class="button red">Red</label>
             </div>
             <div>
                 Text:
@@ -43,13 +43,46 @@
             <div>
                 If holding the button and the strip colour is
                 <ul>
-                    <li><span class="buttonBlue">Blue</span>: release when timer has a <strong>4</strong> in any position.</li>
-                    <li><span class="buttonYellow">Yellow</span>: release when timer has a <strong>5</strong> in any position.</li>
+                    <li><span class="button blue">Blue</span>: release when timer has a <strong>4</strong> in any position.</li>
+                    <li><span class="button yellow">Yellow</span>: release when timer has a <strong>5</strong> in any position.</li>
                     <li>Other: release when timer has a <strong>1</strong> in any position.</li>
                 </ul>
             </div>
         </section>
 
+        <section id="sectionSimon">
+            <h2>Simon Says</h2>
+
+            <div id="simonInputs">
+                <input type="checkbox" id="simonVowel" /> <label for="simonVowel">Vowel</label>
+
+                <ul>
+                    <li>
+                        <input type="radio" name="simonStrikes" value="0" id="simonStrikes0" />
+                        <label for="simonStrikes0">0 strikes</label>
+                    </li>
+                    <li>
+                        <input type="radio" name="simonStrikes" value="1" id="simonStrikes1" />
+                        <label for="simonStrikes1">1 strike</label>
+                    </li>
+                    <li>
+                        <input type="radio" name="simonStrikes" value="2" id="simonStrikes2" />
+                        <label for="simonStrikes2">2 strikes</label>
+                    </li>
+                </ul>
+            </div>
+
+            <div id="simonBoard">
+                <div>
+                    <div class="blue">&nbsp;</div><div class="yellow">&nbsp;</div>
+                </div>
+                <div>
+                    <div class="red">&nbsp;</div><div class="green">&nbsp;</div>
+                </div>
+            </div>
+
+        </section>
+
         <section id="sectionDisplay">
             <h2>Display</h2>
 
@@ -264,15 +297,15 @@
         <section id="sectionSequence">
             <h2>Wire Sequence</h2>
             <ul id="sequenceOptions">
-                <li><button class="buttonRed" data-colour="red" data-letter="A">A</button></li>
-                <li><button class="buttonBlue" data-colour="blue" data-letter="A">A</button></li>
-                <li><button class="buttonBlack" data-colour="black" data-letter="A">A</button></li>
-                <li><button class="buttonRed" data-colour="red" data-letter="B">B</button></li>
-                <li><button class="buttonBlue" data-colour="blue" data-letter="B">B</button></li>
-                <li><button class="buttonBlack" data-colour="black" data-letter="B">B</button></li>
-                <li><button class="buttonRed" data-colour="red" data-letter="C">C</button></li>
-                <li><button class="buttonBlue" data-colour="blue" data-letter="C">C</button></li>
-                <li><button class="buttonBlack" data-colour="black" data-letter="C">C</button></li>
+                <li><button class="button red" data-colour="red" data-letter="A">A</button></li>
+                <li><button class="button blue" data-colour="blue" data-letter="A">A</button></li>
+                <li><button class="button black" data-colour="black" data-letter="A">A</button></li>
+                <li><button class="button red" data-colour="red" data-letter="B">B</button></li>
+                <li><button class="button blue" data-colour="blue" data-letter="B">B</button></li>
+                <li><button class="button black" data-colour="black" data-letter="B">B</button></li>
+                <li><button class="button red" data-colour="red" data-letter="C">C</button></li>
+                <li><button class="button blue" data-colour="blue" data-letter="C">C</button></li>
+                <li><button class="button black" data-colour="black" data-letter="C">C</button></li>
             </ul>
             <ul id="sequenceInstruction"></ul>
         </section>
diff --git a/ktane.css b/ktane.css
index ebf9b72..91d6330 100755
--- a/ktane.css
+++ b/ktane.css
@@ -22,29 +22,37 @@ button {
     border-width: 1px;
 }
 
-.buttonRed, .buttonYellow, .buttonBlue, .buttonWhite, .buttonBlack {
-    color: black;
+.button {
     padding: 0.2em;
 }
-.buttonRed {
+.red {
     background-color: red;
     color: white;
 }
-.buttonYellow {
+.yellow {
     background-color: yellow;
+    color: black;
 }
-.buttonBlue {
+.blue {
     background-color: blue;
     color: white;
 }
-.buttonWhite {
+.green {
+    background-color: green;
+    color: white;
+}
+.white {
     background-color: white;
     border-color: black;
+    color: black;
 }
-.buttonBlack {
+.black {
     background-color: black;
     color: white;
 }
+.button.white {
+    border: 1px solid black;
+}
 
 .active {
     opacity: 1;
@@ -108,6 +116,34 @@ h2 {
     border-width: 1px;
 }
 
+#simonInputs {
+    float: left;
+    margin-right: 5em;
+}
+#simonBoard {
+    display: inline-block;
+    padding-bottom: 40px; /* Compensate for height increase as a result of rotation */
+    transform: rotate(45deg);
+}
+#simonBoard > div > div {
+    border: 2px solid black;
+    display: inline-block;
+    height: 64px;
+    width: 64px;
+}
+#simonBoard > div:first-child > div {
+    border-top-width: 4px;
+}
+#simonBoard > div:last-child > div {
+    border-bottom-width: 4px;
+}
+#simonBoard > div > div:first-child {
+    border-left-width: 4px;
+}
+#simonBoard > div > div:last-child {
+    border-right-width: 4px;
+}
+
 #sectionDisplay {
     white-space: nowrap;
 }
diff --git a/ktane.js b/ktane.js
index 45c63aa..fcd99e1 100755
--- a/ktane.js
+++ b/ktane.js
@@ -350,8 +350,8 @@ $('.jsResetSection').on('click', function () {
     $('#sequenceOptions button').on('click', function () {
         var colour = this.getAttribute('data-colour'),
                 letter = this.getAttribute('data-letter'),
-                $li = $('<li><button class="button' + colour.charAt(0).toUpperCase() + colour.substring(1)
-                        + '" data-colour="' + colour + '" data-letter="' + letter + '">' + letter + '</button></li>');
+                $li = $('<li><button class="button ' + colour + '" data-colour="' + colour + '" data-letter="' + letter
+                        + '">' + letter + '</button></li>');
 
         if (typeof occurrences[colour][count[colour]] !== 'undefined') {
             $li.append(occurrences[colour][count[colour]].indexOf(letter) === -1 ? 'Ignore' : 'Cut');