diff --git a/res/app/components/stf/control/control-service.js b/res/app/components/stf/control/control-service.js
index 338342f8..7740bc66 100644
--- a/res/app/components/stf/control/control-service.js
+++ b/res/app/components/stf/control/control-service.js
@@ -5,43 +5,12 @@ module.exports = function ControlServiceFactory(
 , TransactionService
 , $rootScope
 , gettext
+, KeycodesMapped
 ) {
   var controlService = {
   }
 
   function ControlService(target, channel) {
-    var keyCodes = {
-      8: 'del' // backspace
-    , 9: 'tab' // tab
-    , 13: 'enter' // enter
-    , 20: 'caps_lock' // caps lock
-    , 27: 'escape' // esc
-    , 33: 'page_up' // page up
-    , 34: 'page_down' // page down
-    , 35: 'move_end' // end
-    , 36: 'move_home' // home
-    , 37: 'dpad_left' // left arrow
-    , 38: 'dpad_up' // up arrow
-    , 39: 'dpad_right' // right arrow
-    , 40: 'dpad_down' // down arrow
-    , 45: 'insert' // insert
-    , 46: 'forward_del' // delete
-    , 93: 'menu' // windows menu key
-    , 112: 'f1' // f1
-    , 113: 'f2' // f2
-    , 114: 'f3' // f3
-    , 115: 'f4' // f4
-    , 116: 'f5' // f5
-    , 117: 'f6' // f6
-    , 118: 'f7' // f7
-    , 119: 'f8' // f8
-    , 120: 'f9' // f9
-    , 121: 'f10' // f10
-    , 122: 'f11' // f11
-    , 123: 'f12' // f12
-    , 144: 'num_lock' // num lock
-    }
-
     function sendOneWay(action, data) {
       socket.emit(action, channel, data)
     }
@@ -70,7 +39,7 @@ module.exports = function ControlServiceFactory(
           })
         }
         else {
-          var mapped = fixedKey || keyCodes[key]
+          var mapped = fixedKey || KeycodesMapped[key]
           if (mapped) {
             sendOneWay(type, {
               key: mapped
diff --git a/res/app/components/stf/control/index.js b/res/app/components/stf/control/index.js
index e6bd42cd..223392b8 100644
--- a/res/app/components/stf/control/index.js
+++ b/res/app/components/stf/control/index.js
@@ -1,5 +1,6 @@
 module.exports = angular.module('stf/control', [
   require('stf/socket').name,
-  require('stf/transaction').name
+  require('stf/transaction').name,
+  require('stf/keycodes').name
 ])
   .factory('ControlService', require('./control-service'))
diff --git a/res/app/components/stf/keycodes/index.js b/res/app/components/stf/keycodes/index.js
index a6bcb4a5..0c2faad1 100644
--- a/res/app/components/stf/keycodes/index.js
+++ b/res/app/components/stf/keycodes/index.js
@@ -1,10 +1,16 @@
 module.exports = angular.module('stf.keycodes', [
 
 ])
-  .factory('KeycodesAndroid', function () {
-    return require('./android/index.json')
+  .factory('KeycodesMapped', function () {
+    return require('./mapped/index.json')
   })
-  .factory('KeycodesJS', function () {
-    return require('./android/index.json')
-  })
-  .factory('KeycodesService', require('./keycodes-service'))
+
+// Not used for now:
+//
+//  .factory('KeycodesAndroid', function () {
+//    return require('./android/index.json')
+//  })
+//  .factory('KeycodesJS', function () {
+//    return require('./android/index.json')
+//  })
+//  .factory('KeycodesService', require('./keycodes-service'))
diff --git a/res/app/components/stf/keycodes/mapped/index.json b/res/app/components/stf/keycodes/mapped/index.json
new file mode 100644
index 00000000..20c288c6
--- /dev/null
+++ b/res/app/components/stf/keycodes/mapped/index.json
@@ -0,0 +1,31 @@
+{
+  "8": "del",
+  "9": "tab",
+  "13": "enter",
+  "20": "caps_lock",
+  "27": "escape",
+  "33": "page_up",
+  "34": "page_down",
+  "35": "move_end",
+  "36": "move_home",
+  "37": "dpad_left",
+  "38": "dpad_up",
+  "39": "dpad_right",
+  "40": "dpad_down",
+  "45": "insert",
+  "46": "forward_del",
+  "93": "menu",
+  "112": "f1",
+  "113": "f2",
+  "114": "f3",
+  "115": "f4",
+  "116": "f5",
+  "117": "f6",
+  "118": "f7",
+  "119": "f8",
+  "120": "f9",
+  "121": "f10",
+  "122": "f11",
+  "123": "f12",
+  "144": "num_lock"
+}