diff --git a/app/scripts/services/keyboardlayout.js b/app/scripts/services/keyboardlayout.js
diff --git a/app/sound/notify.mp3 b/app/sound/notify.mp3
diff --git a/app/styles/main.scss b/app/styles/main.scss
@@ -118,7 +118,13 @@ $piano-black: #1a1a1a;
       &.keydown {
         .key-top {
           margin-top: 5px;
-          background: #0F0 !important;
+          @include permiter-white-key;
+        }
+      }
+      &.keydown.flat {
+        .key-top {
+          margin-top: 5px;
+          @include perimeter-black-key;
         }
       }
     }

diff --git a/app/views/keyboard.html b/app/views/keyboard.html
@@ -1,6 +1,6 @@
-<div class='keyboard-container' ng-keydown='notePressed($event)' tabindex='0'>
+<div class='keyboard-container'>
     <ul class='key-row'>
-        <li ng-click='noteClicked($event)' ng-class='{keydown: key.active}' ng-repeat='key in keyboardLayout' class='{{key.class}}'>
+        <li ng-class='{keydown: key.active}' ng-repeat='key in keyboardLayout' class='{{key.class}}'>
             <div class='key-top'>{{key.key}}</div>
         </li>
     </ul>

diff --git a/test/spec/controllers/about.js b/test/spec/controllers/about.js
diff --git a/test/spec/services/keyboardlayout.js b/test/spec/services/keyboardlayout.js