diff --git a/thermion_flutter/thermion_flutter/lib/src/widgets/src/thermion_listener_widget.dart b/thermion_flutter/thermion_flutter/lib/src/widgets/src/thermion_listener_widget.dart
index 64d29a24..ae77b9da 100644
--- a/thermion_flutter/thermion_flutter/lib/src/widgets/src/thermion_listener_widget.dart
+++ b/thermion_flutter/thermion_flutter/lib/src/widgets/src/thermion_listener_widget.dart
@@ -28,7 +28,31 @@ final physicalKeyMap = {
   PhysicalKeyboardKey.keyZ: PhysicalKey.z,
   PhysicalKeyboardKey.shiftLeft: PhysicalKey.shift,
   PhysicalKeyboardKey.space: PhysicalKey.space,
-  PhysicalKeyboardKey.backquote: PhysicalKey.backtick
+  PhysicalKeyboardKey.backquote: PhysicalKey.backtick,
+  PhysicalKeyboardKey.period: PhysicalKey.period,
+  PhysicalKeyboardKey.digit0: PhysicalKey.key0,
+  PhysicalKeyboardKey.digit1: PhysicalKey.key1,
+  PhysicalKeyboardKey.digit2: PhysicalKey.key2,
+  PhysicalKeyboardKey.digit3: PhysicalKey.key3,
+  PhysicalKeyboardKey.digit4: PhysicalKey.key4,
+  PhysicalKeyboardKey.digit5: PhysicalKey.key5,
+  PhysicalKeyboardKey.digit6: PhysicalKey.key6,
+  PhysicalKeyboardKey.digit7: PhysicalKey.key7,
+  PhysicalKeyboardKey.digit8: PhysicalKey.key8,
+  PhysicalKeyboardKey.digit9: PhysicalKey.key9,
+  PhysicalKeyboardKey.numpad0: PhysicalKey.numpad0,
+  PhysicalKeyboardKey.numpad1: PhysicalKey.numpad1,
+  PhysicalKeyboardKey.numpad2: PhysicalKey.numpad2,
+  PhysicalKeyboardKey.numpad3: PhysicalKey.numpad3,
+  PhysicalKeyboardKey.numpad4: PhysicalKey.numpad4,
+  PhysicalKeyboardKey.numpad5: PhysicalKey.numpad5,
+  PhysicalKeyboardKey.numpad6: PhysicalKey.numpad6,
+  PhysicalKeyboardKey.numpad7: PhysicalKey.numpad7,
+  PhysicalKeyboardKey.numpad8: PhysicalKey.numpad8,
+  PhysicalKeyboardKey.numpad9: PhysicalKey.numpad9,
+  PhysicalKeyboardKey.numpadDecimal: PhysicalKey.numpadPeriod,
+  PhysicalKeyboardKey.enter: PhysicalKey.enter,
+  PhysicalKeyboardKey.numpadEnter: PhysicalKey.numpadEnter
 };
 
 final logicalKeyMap = {
@@ -46,7 +70,30 @@ final logicalKeyMap = {
   LogicalKeyboardKey.shift: LogicalKey.shift,
   LogicalKeyboardKey.shiftLeft: LogicalKey.shift,
   LogicalKeyboardKey.space: LogicalKey.space,
-  LogicalKeyboardKey.backquote: LogicalKey.backtick
+  LogicalKeyboardKey.backquote: LogicalKey.backtick,
+  LogicalKeyboardKey.digit0: LogicalKey.key0,
+  LogicalKeyboardKey.digit1: LogicalKey.key1,
+  LogicalKeyboardKey.digit2: LogicalKey.key2,
+  LogicalKeyboardKey.digit3: LogicalKey.key3,
+  LogicalKeyboardKey.digit4: LogicalKey.key4,
+  LogicalKeyboardKey.digit5: LogicalKey.key5,
+  LogicalKeyboardKey.digit6: LogicalKey.key6,
+  LogicalKeyboardKey.digit7: LogicalKey.key7,
+  LogicalKeyboardKey.digit8: LogicalKey.key8,
+  LogicalKeyboardKey.digit9: LogicalKey.key9,
+  LogicalKeyboardKey.numpad0: LogicalKey.numpad0,
+  LogicalKeyboardKey.numpad1: LogicalKey.numpad1,
+  LogicalKeyboardKey.numpad2: LogicalKey.numpad2,
+  LogicalKeyboardKey.numpad3: LogicalKey.numpad3,
+  LogicalKeyboardKey.numpad4: LogicalKey.numpad4,
+  LogicalKeyboardKey.numpad5: LogicalKey.numpad5,
+  LogicalKeyboardKey.numpad6: LogicalKey.numpad6,
+  LogicalKeyboardKey.numpad7: LogicalKey.numpad7,
+  LogicalKeyboardKey.numpad8: LogicalKey.numpad8,
+  LogicalKeyboardKey.numpad9: LogicalKey.numpad9,
+  LogicalKeyboardKey.numpadDecimal: LogicalKey.numpadPeriod,
+  LogicalKeyboardKey.enter: LogicalKey.enter,
+  LogicalKeyboardKey.numpadEnter: LogicalKey.numpadEnter
 };
 
 ///