diff --git a/src/SFML/Window/Unix/KeyboardImpl.cpp b/src/SFML/Window/Unix/KeyboardImpl.cpp
index 1951956e..18990773 100644
--- a/src/SFML/Window/Unix/KeyboardImpl.cpp
+++ b/src/SFML/Window/Unix/KeyboardImpl.cpp
@@ -279,172 +279,172 @@ std::map<std::string, sf::Keyboard::Scancode> getNameScancodeMap()
 {
     std::map<std::string, sf::Keyboard::Scancode> mapping;
 
-    mapping.insert(std::make_pair("LSGT", sf::Keyboard::Scan::NonUsBackslash));
+    mapping.emplace("LSGT", sf::Keyboard::Scan::NonUsBackslash);
 
-    mapping.insert(std::make_pair("TLDE", sf::Keyboard::Scan::Grave));
-    mapping.insert(std::make_pair("AE01", sf::Keyboard::Scan::Num1));
-    mapping.insert(std::make_pair("AE02", sf::Keyboard::Scan::Num2));
-    mapping.insert(std::make_pair("AE03", sf::Keyboard::Scan::Num3));
-    mapping.insert(std::make_pair("AE04", sf::Keyboard::Scan::Num4));
-    mapping.insert(std::make_pair("AE05", sf::Keyboard::Scan::Num5));
-    mapping.insert(std::make_pair("AE06", sf::Keyboard::Scan::Num6));
-    mapping.insert(std::make_pair("AE07", sf::Keyboard::Scan::Num7));
-    mapping.insert(std::make_pair("AE08", sf::Keyboard::Scan::Num8));
-    mapping.insert(std::make_pair("AE09", sf::Keyboard::Scan::Num9));
-    mapping.insert(std::make_pair("AE10", sf::Keyboard::Scan::Num0));
-    mapping.insert(std::make_pair("AE11", sf::Keyboard::Scan::Hyphen));
-    mapping.insert(std::make_pair("AE12", sf::Keyboard::Scan::Equal));
-    mapping.insert(std::make_pair("BKSP", sf::Keyboard::Scan::Backspace));
-    mapping.insert(std::make_pair("TAB", sf::Keyboard::Scan::Tab));
-    mapping.insert(std::make_pair("AD01", sf::Keyboard::Scan::Q));
-    mapping.insert(std::make_pair("AD02", sf::Keyboard::Scan::W));
-    mapping.insert(std::make_pair("AD03", sf::Keyboard::Scan::E));
-    mapping.insert(std::make_pair("AD04", sf::Keyboard::Scan::R));
-    mapping.insert(std::make_pair("AD05", sf::Keyboard::Scan::T));
-    mapping.insert(std::make_pair("AD06", sf::Keyboard::Scan::Y));
-    mapping.insert(std::make_pair("AD07", sf::Keyboard::Scan::U));
-    mapping.insert(std::make_pair("AD08", sf::Keyboard::Scan::I));
-    mapping.insert(std::make_pair("AD09", sf::Keyboard::Scan::O));
-    mapping.insert(std::make_pair("AD10", sf::Keyboard::Scan::P));
-    mapping.insert(std::make_pair("AD11", sf::Keyboard::Scan::LBracket));
-    mapping.insert(std::make_pair("AD12", sf::Keyboard::Scan::RBracket));
-    mapping.insert(std::make_pair("BKSL", sf::Keyboard::Scan::Backslash));
-    mapping.insert(std::make_pair("RTRN", sf::Keyboard::Scan::Enter));
+    mapping.emplace("TLDE", sf::Keyboard::Scan::Grave);
+    mapping.emplace("AE01", sf::Keyboard::Scan::Num1);
+    mapping.emplace("AE02", sf::Keyboard::Scan::Num2);
+    mapping.emplace("AE03", sf::Keyboard::Scan::Num3);
+    mapping.emplace("AE04", sf::Keyboard::Scan::Num4);
+    mapping.emplace("AE05", sf::Keyboard::Scan::Num5);
+    mapping.emplace("AE06", sf::Keyboard::Scan::Num6);
+    mapping.emplace("AE07", sf::Keyboard::Scan::Num7);
+    mapping.emplace("AE08", sf::Keyboard::Scan::Num8);
+    mapping.emplace("AE09", sf::Keyboard::Scan::Num9);
+    mapping.emplace("AE10", sf::Keyboard::Scan::Num0);
+    mapping.emplace("AE11", sf::Keyboard::Scan::Hyphen);
+    mapping.emplace("AE12", sf::Keyboard::Scan::Equal);
+    mapping.emplace("BKSP", sf::Keyboard::Scan::Backspace);
+    mapping.emplace("TAB", sf::Keyboard::Scan::Tab);
+    mapping.emplace("AD01", sf::Keyboard::Scan::Q);
+    mapping.emplace("AD02", sf::Keyboard::Scan::W);
+    mapping.emplace("AD03", sf::Keyboard::Scan::E);
+    mapping.emplace("AD04", sf::Keyboard::Scan::R);
+    mapping.emplace("AD05", sf::Keyboard::Scan::T);
+    mapping.emplace("AD06", sf::Keyboard::Scan::Y);
+    mapping.emplace("AD07", sf::Keyboard::Scan::U);
+    mapping.emplace("AD08", sf::Keyboard::Scan::I);
+    mapping.emplace("AD09", sf::Keyboard::Scan::O);
+    mapping.emplace("AD10", sf::Keyboard::Scan::P);
+    mapping.emplace("AD11", sf::Keyboard::Scan::LBracket);
+    mapping.emplace("AD12", sf::Keyboard::Scan::RBracket);
+    mapping.emplace("BKSL", sf::Keyboard::Scan::Backslash);
+    mapping.emplace("RTRN", sf::Keyboard::Scan::Enter);
 
-    mapping.insert(std::make_pair("CAPS", sf::Keyboard::Scan::CapsLock));
-    mapping.insert(std::make_pair("AC01", sf::Keyboard::Scan::A));
-    mapping.insert(std::make_pair("AC02", sf::Keyboard::Scan::S));
-    mapping.insert(std::make_pair("AC03", sf::Keyboard::Scan::D));
-    mapping.insert(std::make_pair("AC04", sf::Keyboard::Scan::F));
-    mapping.insert(std::make_pair("AC05", sf::Keyboard::Scan::G));
-    mapping.insert(std::make_pair("AC06", sf::Keyboard::Scan::H));
-    mapping.insert(std::make_pair("AC07", sf::Keyboard::Scan::J));
-    mapping.insert(std::make_pair("AC08", sf::Keyboard::Scan::K));
-    mapping.insert(std::make_pair("AC09", sf::Keyboard::Scan::L));
-    mapping.insert(std::make_pair("AC10", sf::Keyboard::Scan::Semicolon));
-    mapping.insert(std::make_pair("AC11", sf::Keyboard::Scan::Apostrophe));
-    mapping.insert(std::make_pair("AC12", sf::Keyboard::Scan::Backslash));
+    mapping.emplace("CAPS", sf::Keyboard::Scan::CapsLock);
+    mapping.emplace("AC01", sf::Keyboard::Scan::A);
+    mapping.emplace("AC02", sf::Keyboard::Scan::S);
+    mapping.emplace("AC03", sf::Keyboard::Scan::D);
+    mapping.emplace("AC04", sf::Keyboard::Scan::F);
+    mapping.emplace("AC05", sf::Keyboard::Scan::G);
+    mapping.emplace("AC06", sf::Keyboard::Scan::H);
+    mapping.emplace("AC07", sf::Keyboard::Scan::J);
+    mapping.emplace("AC08", sf::Keyboard::Scan::K);
+    mapping.emplace("AC09", sf::Keyboard::Scan::L);
+    mapping.emplace("AC10", sf::Keyboard::Scan::Semicolon);
+    mapping.emplace("AC11", sf::Keyboard::Scan::Apostrophe);
+    mapping.emplace("AC12", sf::Keyboard::Scan::Backslash);
 
-    mapping.insert(std::make_pair("LFSH", sf::Keyboard::Scan::LShift));
-    mapping.insert(std::make_pair("AB01", sf::Keyboard::Scan::Z));
-    mapping.insert(std::make_pair("AB02", sf::Keyboard::Scan::X));
-    mapping.insert(std::make_pair("AB03", sf::Keyboard::Scan::C));
-    mapping.insert(std::make_pair("AB04", sf::Keyboard::Scan::V));
-    mapping.insert(std::make_pair("AB05", sf::Keyboard::Scan::B));
-    mapping.insert(std::make_pair("AB06", sf::Keyboard::Scan::N));
-    mapping.insert(std::make_pair("AB07", sf::Keyboard::Scan::M));
-    mapping.insert(std::make_pair("AB08", sf::Keyboard::Scan::Comma));
-    mapping.insert(std::make_pair("AB09", sf::Keyboard::Scan::Period));
-    mapping.insert(std::make_pair("AB10", sf::Keyboard::Scan::Slash));
-    mapping.insert(std::make_pair("RTSH", sf::Keyboard::Scan::RShift));
+    mapping.emplace("LFSH", sf::Keyboard::Scan::LShift);
+    mapping.emplace("AB01", sf::Keyboard::Scan::Z);
+    mapping.emplace("AB02", sf::Keyboard::Scan::X);
+    mapping.emplace("AB03", sf::Keyboard::Scan::C);
+    mapping.emplace("AB04", sf::Keyboard::Scan::V);
+    mapping.emplace("AB05", sf::Keyboard::Scan::B);
+    mapping.emplace("AB06", sf::Keyboard::Scan::N);
+    mapping.emplace("AB07", sf::Keyboard::Scan::M);
+    mapping.emplace("AB08", sf::Keyboard::Scan::Comma);
+    mapping.emplace("AB09", sf::Keyboard::Scan::Period);
+    mapping.emplace("AB10", sf::Keyboard::Scan::Slash);
+    mapping.emplace("RTSH", sf::Keyboard::Scan::RShift);
 
-    mapping.insert(std::make_pair("LCTL", sf::Keyboard::Scan::LControl));
-    mapping.insert(std::make_pair("LALT", sf::Keyboard::Scan::LAlt));
-    mapping.insert(std::make_pair("SPCE", sf::Keyboard::Scan::Space));
-    mapping.insert(std::make_pair("RCTL", sf::Keyboard::Scan::RControl));
-    mapping.insert(std::make_pair("RALT", sf::Keyboard::Scan::RAlt));
-    mapping.insert(std::make_pair("LVL3", sf::Keyboard::Scan::RAlt));
-    mapping.insert(std::make_pair("ALGR", sf::Keyboard::Scan::RAlt));
-    mapping.insert(std::make_pair("LWIN", sf::Keyboard::Scan::LSystem));
-    mapping.insert(std::make_pair("RWIN", sf::Keyboard::Scan::RSystem));
+    mapping.emplace("LCTL", sf::Keyboard::Scan::LControl);
+    mapping.emplace("LALT", sf::Keyboard::Scan::LAlt);
+    mapping.emplace("SPCE", sf::Keyboard::Scan::Space);
+    mapping.emplace("RCTL", sf::Keyboard::Scan::RControl);
+    mapping.emplace("RALT", sf::Keyboard::Scan::RAlt);
+    mapping.emplace("LVL3", sf::Keyboard::Scan::RAlt);
+    mapping.emplace("ALGR", sf::Keyboard::Scan::RAlt);
+    mapping.emplace("LWIN", sf::Keyboard::Scan::LSystem);
+    mapping.emplace("RWIN", sf::Keyboard::Scan::RSystem);
 
-    mapping.insert(std::make_pair("HYPR", sf::Keyboard::Scan::Application));
-    mapping.insert(std::make_pair("EXEC", sf::Keyboard::Scan::Execute));
-    mapping.insert(std::make_pair("MDSW", sf::Keyboard::Scan::ModeChange));
-    mapping.insert(std::make_pair("MENU", sf::Keyboard::Scan::Menu));
-    mapping.insert(std::make_pair("COMP", sf::Keyboard::Scan::Menu));
-    mapping.insert(std::make_pair("SELE", sf::Keyboard::Scan::Select));
+    mapping.emplace("HYPR", sf::Keyboard::Scan::Application);
+    mapping.emplace("EXEC", sf::Keyboard::Scan::Execute);
+    mapping.emplace("MDSW", sf::Keyboard::Scan::ModeChange);
+    mapping.emplace("MENU", sf::Keyboard::Scan::Menu);
+    mapping.emplace("COMP", sf::Keyboard::Scan::Menu);
+    mapping.emplace("SELE", sf::Keyboard::Scan::Select);
 
-    mapping.insert(std::make_pair("ESC", sf::Keyboard::Scan::Escape));
-    mapping.insert(std::make_pair("FK01", sf::Keyboard::Scan::F1));
-    mapping.insert(std::make_pair("FK02", sf::Keyboard::Scan::F2));
-    mapping.insert(std::make_pair("FK03", sf::Keyboard::Scan::F3));
-    mapping.insert(std::make_pair("FK04", sf::Keyboard::Scan::F4));
-    mapping.insert(std::make_pair("FK05", sf::Keyboard::Scan::F5));
-    mapping.insert(std::make_pair("FK06", sf::Keyboard::Scan::F6));
-    mapping.insert(std::make_pair("FK07", sf::Keyboard::Scan::F7));
-    mapping.insert(std::make_pair("FK08", sf::Keyboard::Scan::F8));
-    mapping.insert(std::make_pair("FK09", sf::Keyboard::Scan::F9));
-    mapping.insert(std::make_pair("FK10", sf::Keyboard::Scan::F10));
-    mapping.insert(std::make_pair("FK11", sf::Keyboard::Scan::F11));
-    mapping.insert(std::make_pair("FK12", sf::Keyboard::Scan::F12));
+    mapping.emplace("ESC", sf::Keyboard::Scan::Escape);
+    mapping.emplace("FK01", sf::Keyboard::Scan::F1);
+    mapping.emplace("FK02", sf::Keyboard::Scan::F2);
+    mapping.emplace("FK03", sf::Keyboard::Scan::F3);
+    mapping.emplace("FK04", sf::Keyboard::Scan::F4);
+    mapping.emplace("FK05", sf::Keyboard::Scan::F5);
+    mapping.emplace("FK06", sf::Keyboard::Scan::F6);
+    mapping.emplace("FK07", sf::Keyboard::Scan::F7);
+    mapping.emplace("FK08", sf::Keyboard::Scan::F8);
+    mapping.emplace("FK09", sf::Keyboard::Scan::F9);
+    mapping.emplace("FK10", sf::Keyboard::Scan::F10);
+    mapping.emplace("FK11", sf::Keyboard::Scan::F11);
+    mapping.emplace("FK12", sf::Keyboard::Scan::F12);
 
-    mapping.insert(std::make_pair("PRSC", sf::Keyboard::Scan::PrintScreen));
-    mapping.insert(std::make_pair("SCLK", sf::Keyboard::Scan::ScrollLock));
-    mapping.insert(std::make_pair("PAUS", sf::Keyboard::Scan::Pause));
+    mapping.emplace("PRSC", sf::Keyboard::Scan::PrintScreen);
+    mapping.emplace("SCLK", sf::Keyboard::Scan::ScrollLock);
+    mapping.emplace("PAUS", sf::Keyboard::Scan::Pause);
 
-    mapping.insert(std::make_pair("INS", sf::Keyboard::Scan::Insert));
-    mapping.insert(std::make_pair("HOME", sf::Keyboard::Scan::Home));
-    mapping.insert(std::make_pair("PGUP", sf::Keyboard::Scan::PageUp));
-    mapping.insert(std::make_pair("DELE", sf::Keyboard::Scan::Delete));
-    mapping.insert(std::make_pair("END", sf::Keyboard::Scan::End));
-    mapping.insert(std::make_pair("PGDN", sf::Keyboard::Scan::PageDown));
+    mapping.emplace("INS", sf::Keyboard::Scan::Insert);
+    mapping.emplace("HOME", sf::Keyboard::Scan::Home);
+    mapping.emplace("PGUP", sf::Keyboard::Scan::PageUp);
+    mapping.emplace("DELE", sf::Keyboard::Scan::Delete);
+    mapping.emplace("END", sf::Keyboard::Scan::End);
+    mapping.emplace("PGDN", sf::Keyboard::Scan::PageDown);
 
-    mapping.insert(std::make_pair("UP", sf::Keyboard::Scan::Up));
-    mapping.insert(std::make_pair("RGHT", sf::Keyboard::Scan::Right));
-    mapping.insert(std::make_pair("DOWN", sf::Keyboard::Scan::Down));
-    mapping.insert(std::make_pair("LEFT", sf::Keyboard::Scan::Left));
+    mapping.emplace("UP", sf::Keyboard::Scan::Up);
+    mapping.emplace("RGHT", sf::Keyboard::Scan::Right);
+    mapping.emplace("DOWN", sf::Keyboard::Scan::Down);
+    mapping.emplace("LEFT", sf::Keyboard::Scan::Left);
 
-    mapping.insert(std::make_pair("NMLK", sf::Keyboard::Scan::NumLock));
-    mapping.insert(std::make_pair("KPDV", sf::Keyboard::Scan::NumpadDivide));
-    mapping.insert(std::make_pair("KPMU", sf::Keyboard::Scan::NumpadMultiply));
-    mapping.insert(std::make_pair("KPSU", sf::Keyboard::Scan::NumpadMinus));
+    mapping.emplace("NMLK", sf::Keyboard::Scan::NumLock);
+    mapping.emplace("KPDV", sf::Keyboard::Scan::NumpadDivide);
+    mapping.emplace("KPMU", sf::Keyboard::Scan::NumpadMultiply);
+    mapping.emplace("KPSU", sf::Keyboard::Scan::NumpadMinus);
 
-    mapping.insert(std::make_pair("KP7", sf::Keyboard::Scan::Numpad7));
-    mapping.insert(std::make_pair("KP8", sf::Keyboard::Scan::Numpad8));
-    mapping.insert(std::make_pair("KP9", sf::Keyboard::Scan::Numpad9));
-    mapping.insert(std::make_pair("KPAD", sf::Keyboard::Scan::NumpadPlus));
-    mapping.insert(std::make_pair("KP4", sf::Keyboard::Scan::Numpad4));
-    mapping.insert(std::make_pair("KP5", sf::Keyboard::Scan::Numpad5));
-    mapping.insert(std::make_pair("KP6", sf::Keyboard::Scan::Numpad6));
-    mapping.insert(std::make_pair("KP1", sf::Keyboard::Scan::Numpad1));
-    mapping.insert(std::make_pair("KP2", sf::Keyboard::Scan::Numpad2));
-    mapping.insert(std::make_pair("KP3", sf::Keyboard::Scan::Numpad3));
-    mapping.insert(std::make_pair("KPEN", sf::Keyboard::Scan::NumpadEnter));
-    mapping.insert(std::make_pair("KP0", sf::Keyboard::Scan::Numpad0));
-    mapping.insert(std::make_pair("KPDL", sf::Keyboard::Scan::NumpadDecimal));
-    mapping.insert(std::make_pair("KPEQ", sf::Keyboard::Scan::NumpadEqual));
+    mapping.emplace("KP7", sf::Keyboard::Scan::Numpad7);
+    mapping.emplace("KP8", sf::Keyboard::Scan::Numpad8);
+    mapping.emplace("KP9", sf::Keyboard::Scan::Numpad9);
+    mapping.emplace("KPAD", sf::Keyboard::Scan::NumpadPlus);
+    mapping.emplace("KP4", sf::Keyboard::Scan::Numpad4);
+    mapping.emplace("KP5", sf::Keyboard::Scan::Numpad5);
+    mapping.emplace("KP6", sf::Keyboard::Scan::Numpad6);
+    mapping.emplace("KP1", sf::Keyboard::Scan::Numpad1);
+    mapping.emplace("KP2", sf::Keyboard::Scan::Numpad2);
+    mapping.emplace("KP3", sf::Keyboard::Scan::Numpad3);
+    mapping.emplace("KPEN", sf::Keyboard::Scan::NumpadEnter);
+    mapping.emplace("KP0", sf::Keyboard::Scan::Numpad0);
+    mapping.emplace("KPDL", sf::Keyboard::Scan::NumpadDecimal);
+    mapping.emplace("KPEQ", sf::Keyboard::Scan::NumpadEqual);
 
-    mapping.insert(std::make_pair("FK13", sf::Keyboard::Scan::F13));
-    mapping.insert(std::make_pair("FK14", sf::Keyboard::Scan::F14));
-    mapping.insert(std::make_pair("FK15", sf::Keyboard::Scan::F15));
-    mapping.insert(std::make_pair("FK16", sf::Keyboard::Scan::F16));
-    mapping.insert(std::make_pair("FK17", sf::Keyboard::Scan::F17));
-    mapping.insert(std::make_pair("FK18", sf::Keyboard::Scan::F18));
-    mapping.insert(std::make_pair("FK19", sf::Keyboard::Scan::F19));
-    mapping.insert(std::make_pair("FK20", sf::Keyboard::Scan::F20));
-    mapping.insert(std::make_pair("FK21", sf::Keyboard::Scan::F21));
-    mapping.insert(std::make_pair("FK22", sf::Keyboard::Scan::F22));
-    mapping.insert(std::make_pair("FK23", sf::Keyboard::Scan::F23));
-    mapping.insert(std::make_pair("FK24", sf::Keyboard::Scan::F24));
-    mapping.insert(std::make_pair("LMTA", sf::Keyboard::Scan::LSystem));
-    mapping.insert(std::make_pair("RMTA", sf::Keyboard::Scan::RSystem));
-    mapping.insert(std::make_pair("MUTE", sf::Keyboard::Scan::VolumeMute));
-    mapping.insert(std::make_pair("VOL-", sf::Keyboard::Scan::VolumeDown));
-    mapping.insert(std::make_pair("VOL+", sf::Keyboard::Scan::VolumeUp));
-    mapping.insert(std::make_pair("STOP", sf::Keyboard::Scan::Stop));
-    mapping.insert(std::make_pair("REDO", sf::Keyboard::Scan::Redo));
-    mapping.insert(std::make_pair("AGAI", sf::Keyboard::Scan::Redo));
-    mapping.insert(std::make_pair("UNDO", sf::Keyboard::Scan::Undo));
-    mapping.insert(std::make_pair("COPY", sf::Keyboard::Scan::Copy));
-    mapping.insert(std::make_pair("PAST", sf::Keyboard::Scan::Paste));
-    mapping.insert(std::make_pair("FIND", sf::Keyboard::Scan::Search));
-    mapping.insert(std::make_pair("CUT", sf::Keyboard::Scan::Cut));
-    mapping.insert(std::make_pair("HELP", sf::Keyboard::Scan::Help));
+    mapping.emplace("FK13", sf::Keyboard::Scan::F13);
+    mapping.emplace("FK14", sf::Keyboard::Scan::F14);
+    mapping.emplace("FK15", sf::Keyboard::Scan::F15);
+    mapping.emplace("FK16", sf::Keyboard::Scan::F16);
+    mapping.emplace("FK17", sf::Keyboard::Scan::F17);
+    mapping.emplace("FK18", sf::Keyboard::Scan::F18);
+    mapping.emplace("FK19", sf::Keyboard::Scan::F19);
+    mapping.emplace("FK20", sf::Keyboard::Scan::F20);
+    mapping.emplace("FK21", sf::Keyboard::Scan::F21);
+    mapping.emplace("FK22", sf::Keyboard::Scan::F22);
+    mapping.emplace("FK23", sf::Keyboard::Scan::F23);
+    mapping.emplace("FK24", sf::Keyboard::Scan::F24);
+    mapping.emplace("LMTA", sf::Keyboard::Scan::LSystem);
+    mapping.emplace("RMTA", sf::Keyboard::Scan::RSystem);
+    mapping.emplace("MUTE", sf::Keyboard::Scan::VolumeMute);
+    mapping.emplace("VOL-", sf::Keyboard::Scan::VolumeDown);
+    mapping.emplace("VOL+", sf::Keyboard::Scan::VolumeUp);
+    mapping.emplace("STOP", sf::Keyboard::Scan::Stop);
+    mapping.emplace("REDO", sf::Keyboard::Scan::Redo);
+    mapping.emplace("AGAI", sf::Keyboard::Scan::Redo);
+    mapping.emplace("UNDO", sf::Keyboard::Scan::Undo);
+    mapping.emplace("COPY", sf::Keyboard::Scan::Copy);
+    mapping.emplace("PAST", sf::Keyboard::Scan::Paste);
+    mapping.emplace("FIND", sf::Keyboard::Scan::Search);
+    mapping.emplace("CUT", sf::Keyboard::Scan::Cut);
+    mapping.emplace("HELP", sf::Keyboard::Scan::Help);
 
-    mapping.insert(std::make_pair("I156", sf::Keyboard::Scan::LaunchApplication1));
-    mapping.insert(std::make_pair("I157", sf::Keyboard::Scan::LaunchApplication2));
-    mapping.insert(std::make_pair("I164", sf::Keyboard::Scan::Favorites));
-    mapping.insert(std::make_pair("I166", sf::Keyboard::Scan::Back));
-    mapping.insert(std::make_pair("I167", sf::Keyboard::Scan::Forward));
-    mapping.insert(std::make_pair("I171", sf::Keyboard::Scan::MediaNextTrack));
-    mapping.insert(std::make_pair("I172", sf::Keyboard::Scan::MediaPlayPause));
-    mapping.insert(std::make_pair("I173", sf::Keyboard::Scan::MediaPreviousTrack));
-    mapping.insert(std::make_pair("I174", sf::Keyboard::Scan::MediaStop));
-    mapping.insert(std::make_pair("I180", sf::Keyboard::Scan::HomePage));
-    mapping.insert(std::make_pair("I181", sf::Keyboard::Scan::Refresh));
-    mapping.insert(std::make_pair("I223", sf::Keyboard::Scan::LaunchMail));
-    mapping.insert(std::make_pair("I234", sf::Keyboard::Scan::LaunchMediaSelect));
+    mapping.emplace("I156", sf::Keyboard::Scan::LaunchApplication1);
+    mapping.emplace("I157", sf::Keyboard::Scan::LaunchApplication2);
+    mapping.emplace("I164", sf::Keyboard::Scan::Favorites);
+    mapping.emplace("I166", sf::Keyboard::Scan::Back);
+    mapping.emplace("I167", sf::Keyboard::Scan::Forward);
+    mapping.emplace("I171", sf::Keyboard::Scan::MediaNextTrack);
+    mapping.emplace("I172", sf::Keyboard::Scan::MediaPlayPause);
+    mapping.emplace("I173", sf::Keyboard::Scan::MediaPreviousTrack);
+    mapping.emplace("I174", sf::Keyboard::Scan::MediaStop);
+    mapping.emplace("I180", sf::Keyboard::Scan::HomePage);
+    mapping.emplace("I181", sf::Keyboard::Scan::Refresh);
+    mapping.emplace("I223", sf::Keyboard::Scan::LaunchMail);
+    mapping.emplace("I234", sf::Keyboard::Scan::LaunchMediaSelect);
 
     return mapping;
 }