diff --git a/plugins/mousepad/windowsremoteinput.cpp b/plugins/mousepad/windowsremoteinput.cpp
index ef945336..3d892a90 100644
--- a/plugins/mousepad/windowsremoteinput.cpp
+++ b/plugins/mousepad/windowsremoteinput.cpp
@@ -1,140 +1,247 @@
 /**
  * Copyright 2018 Albert Vaca Cintora <albertvaka@gmail.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation; either version 2 of
  * the License or (at your option) version 3 or any later version
  * accepted by the membership of KDE e.V. (or its successor approved
  * by the membership of KDE e.V.), which shall act as a proxy
  * defined in Section 14 of version 3 of the license.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "windowsremoteinput.h"
 
 #include <QCursor>
+#include <QDebug>
 
 #include <Windows.h>
 
+//Translation table to keep in sync within all the implementations
+int SpecialKeysMap[] = {
+    0,              // Invalid
+    VK_BACK,        // 1
+    VK_TAB,         // 2
+    VK_RETURN,      // 3
+    VK_LEFT,        // 4
+    VK_UP,          // 5
+    VK_RIGHT,       // 6
+    VK_DOWN,        // 7
+    VK_PRIOR,       // 8
+    VK_NEXT,        // 9
+    VK_HOME,        // 10
+    VK_END,         // 11
+    VK_RETURN,      // 12
+    VK_DELETE,      // 13
+    VK_ESCAPE,      // 14
+    VK_SNAPSHOT,    // 15
+    VK_SCROLL,      // 16
+    0,              // 17
+    0,              // 18
+    0,              // 19
+    0,              // 20
+    VK_F1,          // 21
+    VK_F2,          // 22
+    VK_F3,          // 23
+    VK_F4,          // 24
+    VK_F5,          // 25
+    VK_F6,          // 26
+    VK_F7,          // 27
+    VK_F8,          // 28
+    VK_F9,          // 29
+    VK_F10,         // 30
+    VK_F11,         // 31
+    VK_F12,         // 32
+};
+
+template <typename T, size_t N>
+size_t arraySize(T(&arr)[N]) { (void)arr; return N; }
+
+
 WindowsRemoteInput::WindowsRemoteInput(QObject* parent)
     : AbstractRemoteInput(parent)
 {
 
 }
 
 bool WindowsRemoteInput::handlePacket(const NetworkPacket& np)
 {
     float dx = np.get<float>(QStringLiteral("dx"), 0);
     float dy = np.get<float>(QStringLiteral("dy"), 0);
 
     bool isSingleClick = np.get<bool>(QStringLiteral("singleclick"), false);
     bool isDoubleClick = np.get<bool>(QStringLiteral("doubleclick"), false);
     bool isMiddleClick = np.get<bool>(QStringLiteral("middleclick"), false);
     bool isRightClick = np.get<bool>(QStringLiteral("rightclick"), false);
     bool isSingleHold = np.get<bool>(QStringLiteral("singlehold"), false);
     bool isSingleRelease = np.get<bool>(QStringLiteral("singlerelease"), false);
     bool isScroll = np.get<bool>(QStringLiteral("scroll"), false);
     QString key = np.get<QString>(QStringLiteral("key"), QLatin1String(""));
     int specialKey = np.get<int>(QStringLiteral("specialKey"), 0);
 
     if (isSingleClick || isDoubleClick || isMiddleClick || isRightClick || isSingleHold || isScroll || !key.isEmpty() || specialKey) {
 
 		INPUT input={0};
 		input.type = INPUT_MOUSE;
 
         if (isSingleClick) {
 			input.mi.dwFlags = MOUSEEVENTF_LEFTDOWN;
 			::SendInput(1,&input,sizeof(INPUT));
 			input.mi.dwFlags = MOUSEEVENTF_LEFTUP;
 			::SendInput(1,&input,sizeof(INPUT));
         } else if (isDoubleClick) {
 			input.mi.dwFlags = MOUSEEVENTF_LEFTDOWN;
 			::SendInput(1,&input,sizeof(INPUT));
 			input.mi.dwFlags = MOUSEEVENTF_LEFTUP;
 			::SendInput(1,&input,sizeof(INPUT));
 			input.mi.dwFlags = MOUSEEVENTF_LEFTDOWN;
 			::SendInput(1,&input,sizeof(INPUT));
 			input.mi.dwFlags = MOUSEEVENTF_LEFTUP;
 			::SendInput(1,&input,sizeof(INPUT));
 		} else if (isMiddleClick) {
 			input.mi.dwFlags = MOUSEEVENTF_MIDDLEDOWN;
 			::SendInput(1,&input,sizeof(INPUT));
 			input.mi.dwFlags = MOUSEEVENTF_MIDDLEUP;
 			::SendInput(1,&input,sizeof(INPUT));
         } else if (isRightClick) {
 			input.mi.dwFlags = MOUSEEVENTF_RIGHTDOWN;
 			::SendInput(1,&input,sizeof(INPUT));
 			input.mi.dwFlags = MOUSEEVENTF_RIGHTUP;
 			::SendInput(1,&input,sizeof(INPUT));
         } else if (isSingleHold){
 			input.mi.dwFlags = MOUSEEVENTF_LEFTDOWN;
 			::SendInput(1,&input,sizeof(INPUT));
         } else if (isSingleRelease){
 			input.mi.dwFlags = MOUSEEVENTF_LEFTUP;
 			::SendInput(1,&input,sizeof(INPUT));
         } else if (isScroll) {
 			input.mi.dwFlags = MOUSEEVENTF_WHEEL;
 			input.mi.mouseData = dy;
 			::SendInput(1,&input,sizeof(INPUT));
-//TODO: Keyboard input support
-/*
-		} else if (!key.isEmpty() || specialKey) {
+
+        } else if (!key.isEmpty() || specialKey) {
+            input.type = INPUT_KEYBOARD;
+
+            input.ki.time = 0;
+            input.ki.dwExtraInfo = 0;
+            input.ki.wScan = 0;
+            input.ki.dwFlags = 0;
 
             bool ctrl = np.get<bool>(QStringLiteral("ctrl"), false);
             bool alt = np.get<bool>(QStringLiteral("alt"), false);
             bool shift = np.get<bool>(QStringLiteral("shift"), false);
 
-            if (ctrl) XTestFakeKeyEvent (display, XKeysymToKeycode(display, XK_Control_L), True, 0);
-            if (alt) XTestFakeKeyEvent (display, XKeysymToKeycode(display, XK_Alt_L), True, 0);
-            if (shift) XTestFakeKeyEvent (display, XKeysymToKeycode(display, XK_Shift_L), True, 0);
+            if (ctrl) {
+                input.ki.wVk = VK_LCONTROL;
+                ::SendInput(1,&input,sizeof(INPUT));
+            }
+            if (alt) {
+                input.ki.wVk = VK_LMENU;
+                ::SendInput(1,&input,sizeof(INPUT));
+            }
+            if (shift) {
+                input.ki.wVk = VK_LSHIFT;
+                ::SendInput(1,&input,sizeof(INPUT));
+            }
 
             if (specialKey)
             {
                 if (specialKey >= (int)arraySize(SpecialKeysMap)) {
                     qWarning() << "Unsupported special key identifier";
                     return false;
                 }
 
-                int keycode = XKeysymToKeycode(display, SpecialKeysMap[specialKey]);
+                input.ki.wVk = SpecialKeysMap[specialKey];
+                ::SendInput(1,&input,sizeof(INPUT));
 
-                XTestFakeKeyEvent (display, keycode, True, 0);
-                XTestFakeKeyEvent (display, keycode, False, 0);
+                input.ki.dwFlags = KEYEVENTF_KEYUP;
+                ::SendInput(1,&input,sizeof(INPUT));
 
             } else {
 
-                if (!m_fakekey) {
-                    m_fakekey = fakekey_init(display);
-                    if (!m_fakekey) {
-                        qWarning() << "Failed to initialize libfakekey";
-                        return false;
+                for (int i=0;i<key.length();i++) {
+                    wchar_t inputChar = *QString(key.at(i)).utf16();
+                    short inputVk = VkKeyScanExW(inputChar, GetKeyboardLayout(0));
+
+                    if(inputVk != -1) {
+                        // Uses virtual keycodes so key combinations work
+                        input.ki.wScan = 0;
+                        input.ki.dwFlags = 0;
+
+                        if (inputVk & 0x100){
+                            input.ki.wVk = VK_LSHIFT;
+                            ::SendInput(1,&input,sizeof(INPUT));
+                        }
+                        if (inputVk & 0x200) {
+                            input.ki.wVk = VK_LCONTROL;
+                            ::SendInput(1,&input,sizeof(INPUT));
+                        }
+                        if (inputVk & 0x400) {
+                            input.ki.wVk = VK_LMENU;
+                            ::SendInput(1,&input,sizeof(INPUT));
+                        }
+
+                        input.ki.wVk = inputVk & 0xFF;
+                        ::SendInput(1,&input,sizeof(INPUT));
+
+                        input.ki.dwFlags = KEYEVENTF_KEYUP;
+                        ::SendInput(1,&input,sizeof(INPUT));
+
+                        if ((inputVk & 0x100) && !shift) {
+                            input.ki.wVk = VK_LSHIFT;
+                            ::SendInput(1,&input,sizeof(INPUT));
+                        }
+                        if ((inputVk & 0x200) && !ctrl) {
+                            input.ki.wVk = VK_LCONTROL;
+                            ::SendInput(1,&input,sizeof(INPUT));
+                        }
+                        if ((inputVk & 0x400) && !alt) {
+                            input.ki.wVk = VK_LMENU;
+                            ::SendInput(1,&input,sizeof(INPUT));
+                        }
+
+                    } else {
+                        // Falls back to KEYEVENTF_UNICODE
+                        input.ki.wVk = 0;
+                        input.ki.wScan = inputChar;
+                        input.ki.dwFlags = KEYEVENTF_UNICODE;
+                        ::SendInput(1,&input,sizeof(INPUT));
+
+                        input.ki.dwFlags = KEYEVENTF_KEYUP | KEYEVENTF_UNICODE;
+                        ::SendInput(1,&input,sizeof(INPUT));
                     }
                 }
+            }
 
-                //We use fakekey here instead of XTest (above) because it can handle utf characters instead of keycodes.
-                for (int i=0;i<key.length();i++) {
-                    QByteArray utf8 = QString(key.at(i)).toUtf8();
-                    fakekey_press(m_fakekey, (const uchar*)utf8.constData(), utf8.size(), 0);
-                    fakekey_release(m_fakekey);
-                }
+            input.ki.dwFlags = KEYEVENTF_KEYUP;
+            input.ki.wScan = 0;
+
+            if (ctrl) {
+                input.ki.wVk = VK_LCONTROL;
+                ::SendInput(1,&input,sizeof(INPUT));
+            }
+            if (alt) {
+                input.ki.wVk = VK_LMENU;
+                ::SendInput(1,&input,sizeof(INPUT));
+            }
+            if (shift) {
+                input.ki.wVk = VK_LSHIFT;
+                ::SendInput(1,&input,sizeof(INPUT));
             }
 
-            if (ctrl) XTestFakeKeyEvent (display, XKeysymToKeycode(display, XK_Control_L), False, 0);
-            if (alt) XTestFakeKeyEvent (display, XKeysymToKeycode(display, XK_Alt_L), False, 0);
-            if (shift) XTestFakeKeyEvent (display, XKeysymToKeycode(display, XK_Shift_L), False, 0);
-*/
         }
 
     } else { //Is a mouse move event
         QPoint point = QCursor::pos();
         QCursor::setPos(point.x() + (int)dx, point.y() + (int)dy);
     }
     return true;
 }