diff --git a/debian/patches/30_no_mnemonics.patch b/debian/patches/30_no_mnemonics.patch
new file mode 100644
index 0000000..87e8f8c
--- /dev/null
+++ b/debian/patches/30_no_mnemonics.patch
@@ -0,0 +1,1206 @@
+Description: Remove mnemonics from non-Roman localized strings
+Origin: Callisto Desktop
+Author: Maia <maia@tsundoku.ne.jp>
+Last-Update: 2025-06-09 xpad-5.8.0
+
+diff -urN a/po/ja.po b/po/ja.po
+--- a/po/ja.po	2022-05-23 05:07:02.000000000 -0700
++++ b/po/ja.po	2025-06-09 05:34:15.218475953 -0700
+@@ -55,7 +55,7 @@
+ 
+ #: ../src/xpad-app.c:251
+ msgid "_Ok"
+-msgstr "OK(_O)"
++msgstr "OK"
+ 
+ #: ../src/xpad-app.c:504
+ #, c-format
+@@ -124,11 +124,11 @@
+ 
+ #: ../src/xpad-pad.c:926 ../src/xpad-pad.c:1609
+ msgid "_Delete"
+-msgstr "削除(_D)"
++msgstr "削除"
+ 
+ #: ../src/xpad-pad.c:926
+ msgid "_Cancel"
+-msgstr "キャンセル(_C)"
++msgstr "キャンセル"
+ 
+ #: ../src/xpad-pad.c:955
+ #, c-format
+@@ -156,94 +156,94 @@
+ 
+ #: ../src/xpad-pad.c:1608 ../src/xpad-tray.c:67
+ msgid "_New"
+-msgstr "新規(_N)"
++msgstr "新規"
+ 
+ #: ../src/xpad-pad.c:1610
+ msgid "_Reload"
+-msgstr "再読み込み(_R)"
++msgstr "再読み込み"
+ 
+ #: ../src/xpad-pad.c:1611
+ msgid "_Close"
+-msgstr "閉じる(_C)"
++msgstr "閉じる"
+ 
+ #. Edit submenu
+ #: ../src/xpad-pad.c:1614
+ msgid "_Edit"
+-msgstr "編集(_E)"
++msgstr "編集"
+ 
+ #: ../src/xpad-pad.c:1618
+ msgid "_Undo"
+-msgstr "元に戻す(_U)"
++msgstr "元に戻す"
+ 
+ #: ../src/xpad-pad.c:1620
+ msgid "_Redo"
+-msgstr "やり直す(_R)"
++msgstr "やり直す"
+ 
+ #: ../src/xpad-pad.c:1623 ../src/xpad-pad.c:1763
+ msgid "_Paste"
+-msgstr "貼り付け(_P)"
++msgstr "貼り付け"
+ 
+ #: ../src/xpad-pad.c:1626
+ msgid "_Find"
+-msgstr "検索(_F)"
++msgstr "検索"
+ 
+ #: ../src/xpad-pad.c:1628
+ msgid "_Layout"
+-msgstr "レイアウト(_L)"
++msgstr "レイアウト"
+ 
+ #: ../src/xpad-pad.c:1629
+ msgid "_Read only"
+-msgstr "読み取り専用(_R)"
++msgstr "読み取り専用"
+ 
+ #. Notes submenu - The list of notes will get added in the prep function below
+ #: ../src/xpad-pad.c:1635
+ msgid "_Notes"
+-msgstr "メモ(_N)"
++msgstr "メモ"
+ 
+ #: ../src/xpad-pad.c:1640 ../src/xpad-tray.c:74
+ msgid "_Show All"
+-msgstr "すべて表示(_S)"
++msgstr "すべて表示"
+ 
+ #: ../src/xpad-pad.c:1641 ../src/xpad-tray.c:79
+ msgid "_Close All"
+-msgstr "すべて閉じる(_C)"
++msgstr "すべて閉じる"
+ 
+ #. Help submenu
+ #: ../src/xpad-pad.c:1644 ../src/xpad-pad.c:1648 ../src/xpad-tray.c:96
+ msgid "_Help"
+-msgstr "ヘルプ(_H)"
++msgstr "ヘルプ"
+ 
+ #: ../src/xpad-pad.c:1649
+ msgid "_About"
+-msgstr "情報(_A)"
++msgstr "情報"
+ 
+ #: ../src/xpad-pad.c:1654 ../src/xpad-tray.c:92
+ msgid "_Preferences"
+-msgstr "設定(_P)"
++msgstr "設定"
+ 
+ #: ../src/xpad-pad.c:1761
+ msgid "Cu_t"
+-msgstr "切り取り(_T)"
++msgstr "切り取り"
+ 
+ #: ../src/xpad-pad.c:1762
+ msgid "_Copy"
+-msgstr "コピー(_C)"
++msgstr "コピー"
+ 
+ #: ../src/xpad-pad.c:1766
+ msgid "_Bold"
+-msgstr "太字(_B)"
++msgstr "太字"
+ 
+ #: ../src/xpad-pad.c:1767
+ msgid "_Italic"
+-msgstr "斜体(_I)"
++msgstr "斜体"
+ 
+ #: ../src/xpad-pad.c:1768
+ msgid "_Underline"
+-msgstr "下線(_U)"
++msgstr "下線"
+ 
+ #: ../src/xpad-pad.c:1769
+ msgid "_Strikethrough"
+-msgstr "取り消し線(_S)"
++msgstr "取り消し線"
+ 
+ #: ../src/xpad-pad-properties.c:104
+ msgid "Appearance"
+@@ -292,32 +292,32 @@
+ 
+ #: ../src/xpad-preferences.c:264
+ msgid "_Show toolbar"
+-msgstr "ツールバーを表示する(_S)"
++msgstr "ツールバーを表示する"
+ 
+ #: ../src/xpad-preferences.c:268
+ msgid "_Autohide toolbar"
+-msgstr "ツールバーを自動で非表示にする(_A)"
++msgstr "ツールバーを自動で非表示にする"
+ 
+ #: ../src/xpad-preferences.c:275
+ msgid "_Show scrollbar"
+-msgstr "スクロールバーを表示する(_S)"
++msgstr "スクロールバーを表示する"
+ 
+ #: ../src/xpad-preferences.c:279
+ msgid "_Show notes on all workspaces"
+-msgstr "すべてのワークスペースにメモを表示する(_S)"
++msgstr "すべてのワークスペースにメモを表示する"
+ 
+ #: ../src/xpad-preferences.c:283
+ msgid "_Show window decorations"
+-msgstr "ウィンドウ装飾を表示する(_S)"
++msgstr "ウィンドウ装飾を表示する"
+ 
+ #: ../src/xpad-preferences.c:287
+ msgid "_Hide all notes from the taskbar and possibly the task switcher"
+-msgstr "すべてのメモをタスクバーとタスクスイッチャーに表示しない(_H)"
++msgstr "すべてのメモをタスクバーとタスクスイッチャーに表示しない"
+ 
+ #: ../src/xpad-preferences.c:291
+ msgid ""
+ "_Hide all notes from the workspace switcher and possibly the task switcher"
+-msgstr "すべてのメモをワークスペーススイッチャーとタスクスイッチャーに表示しない(_H)"
++msgstr "すべてのメモをワークスペーススイッチャーとタスクスイッチャーに表示しない"
+ 
+ #. Layout options
+ #: ../src/xpad-preferences.c:296
+@@ -364,15 +364,15 @@
+ 
+ #: ../src/xpad-preferences.c:434
+ msgid "_Start Xpad automatically after login"
+-msgstr "ログイン時に Xpad を自動的に起動する(_S)"
++msgstr "ログイン時に Xpad を自動的に起動する"
+ 
+ #: ../src/xpad-preferences.c:438
+ msgid "_Wait for systray (if possible)"
+-msgstr "システムトレイで待機する (可能な場合)(_W)"
++msgstr "システムトレイで待機する (可能な場合)"
+ 
+ #: ../src/xpad-preferences.c:449
+ msgid "_Open a new empty pad"
+-msgstr "新しい空のパッドを開く(_O)"
++msgstr "新しい空のパッドを開く"
+ 
+ #: ../src/xpad-preferences.c:453
+ msgid "Delay in seconds"
+@@ -397,7 +397,7 @@
+ 
+ #: ../src/xpad-preferences.c:487
+ msgid "_Enable tray icon"
+-msgstr "トレイアイコンを有効にする(_E)"
++msgstr "トレイアイコンを有効にする"
+ 
+ #: ../src/xpad-preferences.c:490
+ msgid "Tray left mouse click behavior"
+@@ -426,15 +426,15 @@
+ 
+ #: ../src/xpad-preferences.c:514
+ msgid "_Make pads read-only (CTRL-J)"
+-msgstr "パッドを読み取り専用にする (CTRL-J)(_M)"
++msgstr "パッドを読み取り専用にする (CTRL-J)"
+ 
+ #: ../src/xpad-preferences.c:515
+ msgid "_Confirm pad deletion"
+-msgstr "パッドの削除を確認する(_C)"
++msgstr "パッドの削除を確認する"
+ 
+ #: ../src/xpad-preferences.c:516
+ msgid "Enable _line numbering"
+-msgstr "行番号を有効にする(_L)"
++msgstr "行番号を有効にする"
+ 
+ #: ../src/xpad-preferences.c:530
+ msgid "Xpad Preferences"
+@@ -503,7 +503,7 @@
+ 
+ #: ../src/xpad-toolbar.c:80
+ msgid "Add C_lear button"
+-msgstr "消去ボタンを追加(_L)"
++msgstr "消去ボタンを追加"
+ 
+ #: ../src/xpad-toolbar.c:81
+ msgid "Close and Save Pad"
+@@ -511,7 +511,7 @@
+ 
+ #: ../src/xpad-toolbar.c:81
+ msgid "Add _Close button"
+-msgstr "閉じるボタンを追加(_C)"
++msgstr "閉じるボタンを追加"
+ 
+ #: ../src/xpad-toolbar.c:82
+ msgid "Copy to Clipboard"
+@@ -519,7 +519,7 @@
+ 
+ #: ../src/xpad-toolbar.c:82
+ msgid "Add C_opy button"
+-msgstr "コピーボタンを追加(_O)"
++msgstr "コピーボタンを追加"
+ 
+ #: ../src/xpad-toolbar.c:83
+ msgid "Cut to Clipboard"
+@@ -527,7 +527,7 @@
+ 
+ #: ../src/xpad-toolbar.c:83
+ msgid "Add C_ut button"
+-msgstr "切り取りボタンを追加(_U)"
++msgstr "切り取りボタンを追加"
+ 
+ #: ../src/xpad-toolbar.c:84
+ msgid "Delete Pad"
+@@ -535,7 +535,7 @@
+ 
+ #: ../src/xpad-toolbar.c:84
+ msgid "Add _Delete button"
+-msgstr "削除ボタンを追加(_D)"
++msgstr "削除ボタンを追加"
+ 
+ #: ../src/xpad-toolbar.c:85
+ msgid "Find text"
+@@ -543,7 +543,7 @@
+ 
+ #: ../src/xpad-toolbar.c:85
+ msgid "Add _Find button"
+-msgstr "検索ボタンを追加(_F)"
++msgstr "検索ボタンを追加"
+ 
+ #: ../src/xpad-toolbar.c:86
+ msgid "Open New Pad"
+@@ -551,7 +551,7 @@
+ 
+ #: ../src/xpad-toolbar.c:86
+ msgid "Add _New button"
+-msgstr "新規ボタンを追加(_N)"
++msgstr "新規ボタンを追加"
+ 
+ #: ../src/xpad-toolbar.c:87
+ msgid "Paste from Clipboard"
+@@ -559,7 +559,7 @@
+ 
+ #: ../src/xpad-toolbar.c:87
+ msgid "Add Pa_ste button"
+-msgstr "貼り付けボタンを追加(_S)"
++msgstr "貼り付けボタンを追加"
+ 
+ #: ../src/xpad-toolbar.c:88
+ msgid "Edit Preferences"
+@@ -567,7 +567,7 @@
+ 
+ #: ../src/xpad-toolbar.c:88
+ msgid "Add Pr_eferences button"
+-msgstr "設定ボタンを追加(_E)"
++msgstr "設定ボタンを追加"
+ 
+ #: ../src/xpad-toolbar.c:89
+ msgid "Edit Pad Properties"
+@@ -575,7 +575,7 @@
+ 
+ #: ../src/xpad-toolbar.c:89
+ msgid "Add Proper_ties button"
+-msgstr "プロパティボタンを追加(_T)"
++msgstr "プロパティボタンを追加"
+ 
+ #: ../src/xpad-toolbar.c:90
+ msgid "Redo"
+@@ -583,7 +583,7 @@
+ 
+ #: ../src/xpad-toolbar.c:90
+ msgid "Add _Redo button"
+-msgstr "やり直すボタンを追加(_R)"
++msgstr "やり直すボタンを追加"
+ 
+ #: ../src/xpad-toolbar.c:91
+ msgid "Close All Pads"
+@@ -591,7 +591,7 @@
+ 
+ #: ../src/xpad-toolbar.c:91
+ msgid "Add Close _All button"
+-msgstr "すべて閉じるボタンを追加(_A)"
++msgstr "すべて閉じるボタンを追加"
+ 
+ #: ../src/xpad-toolbar.c:92
+ msgid "Undo"
+@@ -599,23 +599,23 @@
+ 
+ #: ../src/xpad-toolbar.c:92
+ msgid "Add _Undo button"
+-msgstr "元に戻すボタンを追加(_U)"
++msgstr "元に戻すボタンを追加"
+ 
+ #: ../src/xpad-toolbar.c:93
+ msgid "Add Se_parator"
+-msgstr "区切りを追加(_P)"
++msgstr "区切りを追加"
+ 
+ #: ../src/xpad-toolbar.c:528
+ msgid "Remove All _Buttons"
+-msgstr "すべてのボタンを削除(_B)"
++msgstr "すべてのボタンを削除"
+ 
+ #: ../src/xpad-toolbar.c:535
+ msgid "Remo_ve Last Button"
+-msgstr "最後のボタンを削除(_V)"
++msgstr "最後のボタンを削除"
+ 
+ #: ../src/xpad-tray.c:100
+ msgid "_Quit"
+-msgstr "終了(_Q)"
++msgstr "終了"
+ 
+ #~ msgid "Options"
+ #~ msgstr "オプション"
+@@ -625,22 +625,22 @@
+ #~ msgstr "コメントやバク報告を xpad-devel@lists.sourceforge.net にお送りください"
+ 
+ #~ msgid "_Autohide Toolbar"
+-#~ msgstr "ツールバーを自動で隠す(_A)"
++#~ msgstr "ツールバーを自動で隠す"
+ 
+ #~ msgid "_View"
+-#~ msgstr "表示(_V)"
++#~ msgstr "表示"
+ 
+ #~ msgid "_Window Decorations"
+-#~ msgstr "ウィンドウ装飾(_W)"
++#~ msgstr "ウィンドウ装飾"
+ 
+ #~ msgid "_Scrollbar"
+-#~ msgstr "スクロールバー(_S)"
++#~ msgstr "スクロールバー"
+ 
+ #~ msgid "_Contents"
+-#~ msgstr "目次(_C)"
++#~ msgstr "目次"
+ 
+ #~ msgid "_Move"
+-#~ msgstr "移動(_M)"
++#~ msgstr "移動"
+ 
+ #~ msgid ""
+ #~ "<b>To change color settings</b>, right click on a pad and choose Edit-"
+@@ -669,7 +669,7 @@
+ #~ msgstr "'%s' 属性"
+ 
+ #~ msgid "_Pad"
+-#~ msgstr "パッド(_P)"
++#~ msgstr "パッド"
+ 
+ #~ msgid "Sticky Notes"
+ #~ msgstr "付箋"
+@@ -680,43 +680,43 @@
+ #~ msgstr "各Xpadセッションは1つまたは複数開いたパッドで構成されます。これらのパッドは基本的にメモとして書き込めるデスクトップ上の付箋です。"
+ 
+ #~ msgid "_Toolbar"
+-#~ msgstr "ツールバー(_T)"
++#~ msgstr "ツールバー"
+ 
+ #~ msgid "_Edit lock"
+-#~ msgstr "ロックを編集(_E)"
++#~ msgstr "ロックを編集"
+ 
+ #~ msgid "_Pads start on all workspaces"
+-#~ msgstr "すべてのワークスペースにパッドを表示する(_P)"
++#~ msgstr "すべてのワークスペースにパッドを表示する"
+ 
+ #~ msgid "Show on _All Workspaces"
+-#~ msgstr "すべてのワークスペースに表示(_A)"
++#~ msgstr "すべてのワークスペースに表示"
+ 
+ #~ msgid "Add C_lear to Toolbar"
+-#~ msgstr "ツールバーに「消去」を追加(_L)"
++#~ msgstr "ツールバーに「消去」を追加"
+ 
+ #~ msgid "Add _Close to Toolbar"
+-#~ msgstr "ツールバーに「閉じる」を追加(_C)"
++#~ msgstr "ツールバーに「閉じる」を追加"
+ 
+ #~ msgid "Add _Delete to Toolbar"
+-#~ msgstr "ツールバーに「削除」を追加(_D)"
++#~ msgstr "ツールバーに「削除」を追加"
+ 
+ #~ msgid "Add _New to Toolbar"
+-#~ msgstr "ツールバーに「新規」を追加(_N)"
++#~ msgstr "ツールバーに「新規」を追加"
+ 
+ #~ msgid "Add Pr_eferences to Toolbar"
+-#~ msgstr "ツールバーに「設定」を追加(_E)"
++#~ msgstr "ツールバーに「設定」を追加"
+ 
+ #~ msgid "Add Proper_ties to Toolbar"
+-#~ msgstr "ツールバーに「プロパティ」を追加(_T)"
++#~ msgstr "ツールバーに「プロパティ」を追加"
+ 
+ #~ msgid "Add Close _All to Toolbar"
+-#~ msgstr "ツールバーに「すべて閉じる」を追加(_A)"
++#~ msgstr "ツールバーに「すべて閉じる」を追加"
+ 
+ #~ msgid "Add a Se_parator to Toolbar"
+-#~ msgstr "ツールバーに「区切り」を追加(_P)"
++#~ msgstr "ツールバーに「区切り」を追加"
+ 
+ #~ msgid "_Remove From Toolbar"
+-#~ msgstr "ツールバーから削除(_R)"
++#~ msgstr "ツールバーから削除"
+ 
+ #~ msgid "Jot down notes for later"
+ #~ msgstr "手早くメモを取る"
+diff -urN a/po/ko.po b/po/ko.po
+--- a/po/ko.po	2022-05-23 05:07:02.000000000 -0700
++++ b/po/ko.po	2025-06-09 05:34:15.222475994 -0700
+@@ -54,7 +54,7 @@
+ 
+ #: ../src/xpad-app.c:251
+ msgid "_Ok"
+-msgstr "확인(_O)"
++msgstr "확인"
+ 
+ #: ../src/xpad-app.c:504
+ #, c-format
+@@ -123,11 +123,11 @@
+ 
+ #: ../src/xpad-pad.c:926 ../src/xpad-pad.c:1609
+ msgid "_Delete"
+-msgstr "지우기(_D)"
++msgstr "지우기"
+ 
+ #: ../src/xpad-pad.c:926
+ msgid "_Cancel"
+-msgstr "취소(_C)"
++msgstr "취소"
+ 
+ #: ../src/xpad-pad.c:955
+ #, c-format
+@@ -156,70 +156,70 @@
+ 
+ #: ../src/xpad-pad.c:1608 ../src/xpad-tray.c:67
+ msgid "_New"
+-msgstr "새로 만들기(_N)"
++msgstr "새로 만들기"
+ 
+ #: ../src/xpad-pad.c:1610
+ msgid "_Reload"
+-msgstr "다시 읽기(_R)"
++msgstr "다시 읽기"
+ 
+ #: ../src/xpad-pad.c:1611
+ msgid "_Close"
+-msgstr "닫기(_C)"
++msgstr "닫기"
+ 
+ #. Edit submenu
+ #: ../src/xpad-pad.c:1614
+ msgid "_Edit"
+-msgstr "편집(_E)"
++msgstr "편집"
+ 
+ #: ../src/xpad-pad.c:1618
+ msgid "_Undo"
+-msgstr "되돌리기(_U)"
++msgstr "되돌리기"
+ 
+ #: ../src/xpad-pad.c:1620
+ msgid "_Redo"
+-msgstr "다시 실행(_R)"
++msgstr "다시 실행"
+ 
+ #: ../src/xpad-pad.c:1623 ../src/xpad-pad.c:1763
+ msgid "_Paste"
+-msgstr "붙여넣기(_P)"
++msgstr "붙여넣기"
+ 
+ #: ../src/xpad-pad.c:1626
+ msgid "_Find"
+-msgstr "찾기(_F)"
++msgstr "찾기"
+ 
+ #: ../src/xpad-pad.c:1628
+ msgid "_Layout"
+-msgstr "레이아웃(_L)"
++msgstr "레이아웃"
+ 
+ #: ../src/xpad-pad.c:1629
+ msgid "_Read only"
+-msgstr "읽기 전용(_R)"
++msgstr "읽기 전용"
+ 
+ #. Notes submenu - The list of notes will get added in the prep function below
+ #: ../src/xpad-pad.c:1635
+ msgid "_Notes"
+-msgstr "메모(_N)"
++msgstr "메모"
+ 
+ #: ../src/xpad-pad.c:1640 ../src/xpad-tray.c:74
+ msgid "_Show All"
+-msgstr "모두 보기(_S)"
++msgstr "모두 보기"
+ 
+ #: ../src/xpad-pad.c:1641 ../src/xpad-tray.c:79
+ msgid "_Close All"
+-msgstr "모두 닫기(_C)"
++msgstr "모두 닫기"
+ 
+ #. Help submenu
+ #: ../src/xpad-pad.c:1644 ../src/xpad-pad.c:1648 ../src/xpad-tray.c:96
+ msgid "_Help"
+-msgstr "도움말(_H)"
++msgstr "도움말"
+ 
+ #: ../src/xpad-pad.c:1649
+ msgid "_About"
+-msgstr "대하여..(_A)"
++msgstr "대하여.."
+ 
+ #: ../src/xpad-pad.c:1654 ../src/xpad-tray.c:92
+ msgid "_Preferences"
+-msgstr "설정(_P)"
++msgstr "설정"
+ 
+ #: ../src/xpad-pad.c:1761
+ msgid "Cu_t"
+@@ -227,23 +227,23 @@
+ 
+ #: ../src/xpad-pad.c:1762
+ msgid "_Copy"
+-msgstr "복사(_C)"
++msgstr "복사"
+ 
+ #: ../src/xpad-pad.c:1766
+ msgid "_Bold"
+-msgstr "굵게(_B)"
++msgstr "굵게"
+ 
+ #: ../src/xpad-pad.c:1767
+ msgid "_Italic"
+-msgstr "기울임(_I)"
++msgstr "기울임"
+ 
+ #: ../src/xpad-pad.c:1768
+ msgid "_Underline"
+-msgstr "밑줄(_U)"
++msgstr "밑줄"
+ 
+ #: ../src/xpad-pad.c:1769
+ msgid "_Strikethrough"
+-msgstr "취소선(_S)"
++msgstr "취소선"
+ 
+ #: ../src/xpad-pad-properties.c:104
+ msgid "Appearance"
+@@ -292,32 +292,32 @@
+ 
+ #: ../src/xpad-preferences.c:264
+ msgid "_Show toolbar"
+-msgstr "툴바 보기(_S)"
++msgstr "툴바 보기"
+ 
+ #: ../src/xpad-preferences.c:268
+ msgid "_Autohide toolbar"
+-msgstr "툴바 자동 감추기(_A)"
++msgstr "툴바 자동 감추기"
+ 
+ #: ../src/xpad-preferences.c:275
+ msgid "_Show scrollbar"
+-msgstr "스크롤 막대 표시(_S)"
++msgstr "스크롤 막대 표시"
+ 
+ #: ../src/xpad-preferences.c:279
+ msgid "_Show notes on all workspaces"
+-msgstr "모든 작업 공간에 메모 보기(_S)"
++msgstr "모든 작업 공간에 메모 보기"
+ 
+ #: ../src/xpad-preferences.c:283
+ msgid "_Show window decorations"
+-msgstr "창 장식 보기(_S)"
++msgstr "창 장식 보기"
+ 
+ #: ../src/xpad-preferences.c:287
+ msgid "_Hide all notes from the taskbar and possibly the task switcher"
+-msgstr "태스크바와 태스크 전환으로부터 모든 메모 감추기(_H)"
++msgstr "태스크바와 태스크 전환으로부터 모든 메모 감추기"
+ 
+ #: ../src/xpad-preferences.c:291
+ msgid ""
+ "_Hide all notes from the workspace switcher and possibly the task switcher"
+-msgstr "작업 공간 전환과 태스크 전환으로부터 모든 메모 감추기(_H)"
++msgstr "작업 공간 전환과 태스크 전환으로부터 모든 메모 감추기"
+ 
+ #. Layout options
+ #: ../src/xpad-preferences.c:296
+@@ -364,15 +364,15 @@
+ 
+ #: ../src/xpad-preferences.c:434
+ msgid "_Start Xpad automatically after login"
+-msgstr "로그인 후 Xpad 자동 시작(_S)"
++msgstr "로그인 후 Xpad 자동 시작"
+ 
+ #: ../src/xpad-preferences.c:438
+ msgid "_Wait for systray (if possible)"
+-msgstr "(가능하면) 시스템 트레이 대기(_W)"
++msgstr "(가능하면) 시스템 트레이 대기"
+ 
+ #: ../src/xpad-preferences.c:449
+ msgid "_Open a new empty pad"
+-msgstr "새로운 빈 메모 열기(_O)"
++msgstr "새로운 빈 메모 열기"
+ 
+ #: ../src/xpad-preferences.c:453
+ msgid "Delay in seconds"
+@@ -397,7 +397,7 @@
+ 
+ #: ../src/xpad-preferences.c:487
+ msgid "_Enable tray icon"
+-msgstr "트레이 아이콘 사용(_E)"
++msgstr "트레이 아이콘 사용"
+ 
+ #: ../src/xpad-preferences.c:490
+ msgid "Tray left mouse click behavior"
+@@ -426,11 +426,11 @@
+ 
+ #: ../src/xpad-preferences.c:514
+ msgid "_Make pads read-only (CTRL-J)"
+-msgstr "읽기 전용 메모(_M) (CTRL-J)"
++msgstr "읽기 전용 메모 (CTRL-J)"
+ 
+ #: ../src/xpad-preferences.c:515
+ msgid "_Confirm pad deletion"
+-msgstr "메모 삭제 확인(_C)"
++msgstr "메모 삭제 확인"
+ 
+ #: ../src/xpad-preferences.c:516
+ msgid "Enable _line numbering"
+@@ -511,7 +511,7 @@
+ 
+ #: ../src/xpad-toolbar.c:81
+ msgid "Add _Close button"
+-msgstr "닫기 단추 추가(_C)"
++msgstr "닫기 단추 추가"
+ 
+ #: ../src/xpad-toolbar.c:82
+ msgid "Copy to Clipboard"
+@@ -535,7 +535,7 @@
+ 
+ #: ../src/xpad-toolbar.c:84
+ msgid "Add _Delete button"
+-msgstr "지우기 단추 추가(_D)"
++msgstr "지우기 단추 추가"
+ 
+ #: ../src/xpad-toolbar.c:85
+ msgid "Find text"
+@@ -543,7 +543,7 @@
+ 
+ #: ../src/xpad-toolbar.c:85
+ msgid "Add _Find button"
+-msgstr "찾기 버튼 추가(_F)"
++msgstr "찾기 버튼 추가"
+ 
+ #: ../src/xpad-toolbar.c:86
+ msgid "Open New Pad"
+@@ -551,7 +551,7 @@
+ 
+ #: ../src/xpad-toolbar.c:86
+ msgid "Add _New button"
+-msgstr "새 단추 추가(_N)"
++msgstr "새 단추 추가"
+ 
+ #: ../src/xpad-toolbar.c:87
+ msgid "Paste from Clipboard"
+@@ -583,7 +583,7 @@
+ 
+ #: ../src/xpad-toolbar.c:90
+ msgid "Add _Redo button"
+-msgstr "다시 하기 단추 추가(_R)"
++msgstr "다시 하기 단추 추가"
+ 
+ #: ../src/xpad-toolbar.c:91
+ msgid "Close All Pads"
+@@ -591,7 +591,7 @@
+ 
+ #: ../src/xpad-toolbar.c:91
+ msgid "Add Close _All button"
+-msgstr "모두 닫기 단추 추가(_A)"
++msgstr "모두 닫기 단추 추가"
+ 
+ #: ../src/xpad-toolbar.c:92
+ msgid "Undo"
+@@ -599,7 +599,7 @@
+ 
+ #: ../src/xpad-toolbar.c:92
+ msgid "Add _Undo button"
+-msgstr "되돌리기 단추 추가(_U)"
++msgstr "되돌리기 단추 추가"
+ 
+ #: ../src/xpad-toolbar.c:93
+ msgid "Add Se_parator"
+@@ -607,7 +607,7 @@
+ 
+ #: ../src/xpad-toolbar.c:528
+ msgid "Remove All _Buttons"
+-msgstr "모든 단추 삭제(_B)"
++msgstr "모든 단추 삭제"
+ 
+ #: ../src/xpad-toolbar.c:535
+ msgid "Remo_ve Last Button"
+@@ -615,41 +615,41 @@
+ 
+ #: ../src/xpad-tray.c:100
+ msgid "_Quit"
+-msgstr "끝내기(_Q)"
++msgstr "끝내기"
+ 
+ #, c-format
+ #~ msgid "'%s' Properties"
+ #~ msgstr "%s' 속성"
+ 
+ #~ msgid "_Pad"
+-#~ msgstr "메모(_P)"
++#~ msgstr "메모"
+ 
+ #~ msgid "Show on _All Workspaces"
+-#~ msgstr "모든 화면에서 보이기(_A)"
++#~ msgstr "모든 화면에서 보이기"
+ 
+ #~ msgid "_View"
+-#~ msgstr "보기(_V)"
++#~ msgstr "보기"
+ 
+ #~ msgid "_Toolbar"
+-#~ msgstr "툴바(_T)"
++#~ msgstr "툴바"
+ 
+ #~ msgid "_Autohide Toolbar"
+-#~ msgstr "툴바 자동숨기기(_A)"
++#~ msgstr "툴바 자동숨기기"
+ 
+ #~ msgid "_Scrollbar"
+-#~ msgstr "스크롤바(_S)"
++#~ msgstr "스크롤바"
+ 
+ #~ msgid "_Window Decorations"
+-#~ msgstr "메모 창 테두리 보이기(_W)"
++#~ msgstr "메모 창 테두리 보이기"
+ 
+ #~ msgid "_Contents"
+ #~ msgstr "_Contents"
+ 
+ #~ msgid "_Edit lock"
+-#~ msgstr "고치기 잠금(_E)"
++#~ msgstr "고치기 잠금"
+ 
+ #~ msgid "_Pads start on all workspaces"
+-#~ msgstr "시작할때 모든 화면에서 메모 보이기(_P)"
++#~ msgstr "시작할때 모든 화면에서 메모 보이기"
+ 
+ #~ msgid "Options"
+ #~ msgstr "옵션"
+@@ -658,13 +658,13 @@
+ #~ msgstr "클리어 버튼을 툴바에 추가(_l)"
+ 
+ #~ msgid "Add _Close to Toolbar"
+-#~ msgstr "닫기를 버튼을 툴바에 추가(_C)"
++#~ msgstr "닫기를 버튼을 툴바에 추가"
+ 
+ #~ msgid "Add _Delete to Toolbar"
+-#~ msgstr "툴바에 지우기 버튼 추가(_D)"
++#~ msgstr "툴바에 지우기 버튼 추가"
+ 
+ #~ msgid "Add _New to Toolbar"
+-#~ msgstr "툴바에 생성버튼 추가(_N)"
++#~ msgstr "툴바에 생성버튼 추가"
+ 
+ #~ msgid "Add Pr_eferences to Toolbar"
+ #~ msgstr "설정버튼을 툴바에 추가(_e)"
+@@ -676,10 +676,10 @@
+ #~ msgstr "나누기 버튼을 툴바에 추가(_p)"
+ 
+ #~ msgid "_Remove From Toolbar"
+-#~ msgstr "툴바에서 제거(_R)"
++#~ msgstr "툴바에서 제거"
+ 
+ #~ msgid "_Move"
+-#~ msgstr "옮기기(_M)"
++#~ msgstr "옮기기"
+ 
+ #~ msgid "Sticky Notes"
+ #~ msgstr "메모지"
+diff -urN a/po/ta.po b/po/ta.po
+--- a/po/ta.po	2022-05-23 05:07:02.000000000 -0700
++++ b/po/ta.po	2025-06-09 05:34:15.298476740 -0700
+@@ -51,7 +51,7 @@
+ 
+ #: ../src/xpad-app.c:251
+ msgid "_Ok"
+-msgstr "சரி (_O)"
++msgstr "சரி"
+ 
+ #: ../src/xpad-app.c:504
+ #, c-format
+@@ -124,7 +124,7 @@
+ 
+ #: ../src/xpad-pad.c:926
+ msgid "_Cancel"
+-msgstr "ரத்துசெய் (_C)"
++msgstr "ரத்துசெய்"
+ 
+ #: ../src/xpad-pad.c:955
+ #, c-format
+@@ -146,7 +146,7 @@
+ 
+ #: ../src/xpad-pad.c:1608 ../src/xpad-tray.c:67
+ msgid "_New"
+-msgstr "புதிய (_N)"
++msgstr "புதிய"
+ 
+ #: ../src/xpad-pad.c:1610
+ msgid "_Reload"
+@@ -171,7 +171,7 @@
+ 
+ #: ../src/xpad-pad.c:1623 ../src/xpad-pad.c:1763
+ msgid "_Paste"
+-msgstr "ஒட்டு (_P)"
++msgstr "ஒட்டு"
+ 
+ #: ../src/xpad-pad.c:1626
+ msgid "_Find"
+@@ -192,7 +192,7 @@
+ 
+ #: ../src/xpad-pad.c:1640 ../src/xpad-tray.c:74
+ msgid "_Show All"
+-msgstr "அனைத்தையும் காட்டு (_S)"
++msgstr "அனைத்தையும் காட்டு"
+ 
+ #: ../src/xpad-pad.c:1641 ../src/xpad-tray.c:79
+ msgid "_Close All"
+@@ -201,15 +201,15 @@
+ #. Help submenu
+ #: ../src/xpad-pad.c:1644 ../src/xpad-pad.c:1648 ../src/xpad-tray.c:96
+ msgid "_Help"
+-msgstr "உதவி (_H)"
++msgstr "உதவி"
+ 
+ #: ../src/xpad-pad.c:1649
+ msgid "_About"
+-msgstr "பற்றி (_A)"
++msgstr "பற்றி"
+ 
+ #: ../src/xpad-pad.c:1654 ../src/xpad-tray.c:92
+ msgid "_Preferences"
+-msgstr "முன்னுரிமைகள் (_P)"
++msgstr "முன்னுரிமைகள்"
+ 
+ #: ../src/xpad-pad.c:1761
+ msgid "Cu_t"
+@@ -217,7 +217,7 @@
+ 
+ #: ../src/xpad-pad.c:1762
+ msgid "_Copy"
+-msgstr "நகலெடு (_C)"
++msgstr "நகலெடு"
+ 
+ #: ../src/xpad-pad.c:1766
+ msgid "_Bold"
+@@ -595,4 +595,4 @@
+ 
+ #: ../src/xpad-tray.c:100
+ msgid "_Quit"
+-msgstr "வெளியேறு (_Q)"
++msgstr "வெளியேறு"
+diff -urN a/po/zh_CN.po b/po/zh_CN.po
+--- a/po/zh_CN.po	2022-05-23 05:07:02.000000000 -0700
++++ b/po/zh_CN.po	2025-06-09 05:34:15.230476072 -0700
+@@ -167,7 +167,7 @@
+ #. Edit submenu
+ #: ../src/xpad-pad.c:1614
+ msgid "_Edit"
+-msgstr "编辑(_E)"
++msgstr "编辑"
+ 
+ #: ../src/xpad-pad.c:1618
+ msgid "_Undo"
+@@ -196,24 +196,24 @@
+ #. Notes submenu - The list of notes will get added in the prep function below
+ #: ../src/xpad-pad.c:1635
+ msgid "_Notes"
+-msgstr "备注(_N)"
++msgstr "备注"
+ 
+ #: ../src/xpad-pad.c:1640 ../src/xpad-tray.c:74
+ msgid "_Show All"
+-msgstr "全部显示(_S)"
++msgstr "全部显示"
+ 
+ #: ../src/xpad-pad.c:1641 ../src/xpad-tray.c:79
+ msgid "_Close All"
+-msgstr "全部关闭(_C)"
++msgstr "全部关闭"
+ 
+ #. Help submenu
+ #: ../src/xpad-pad.c:1644 ../src/xpad-pad.c:1648 ../src/xpad-tray.c:96
+ msgid "_Help"
+-msgstr "帮助(_H)"
++msgstr "帮助"
+ 
+ #: ../src/xpad-pad.c:1649
+ msgid "_About"
+-msgstr "关于(_A)"
++msgstr "关于"
+ 
+ #: ../src/xpad-pad.c:1654 ../src/xpad-tray.c:92
+ msgid "_Preferences"
+@@ -428,7 +428,7 @@
+ 
+ #: ../src/xpad-preferences.c:515
+ msgid "_Confirm pad deletion"
+-msgstr "确认便笺删除(_C)"
++msgstr "确认便笺删除"
+ 
+ #: ../src/xpad-preferences.c:516
+ msgid "Enable _line numbering"
+@@ -610,64 +610,64 @@
+ #~ msgstr "‘%s’属性"
+ 
+ #~ msgid "_Pad"
+-#~ msgstr "便笺(_P)"
++#~ msgstr "便笺"
+ 
+ #~ msgid "Show on _All Workspaces"
+-#~ msgstr "显示于所有工作区中(_A)"
++#~ msgstr "显示于所有工作区中"
+ 
+ #~ msgid "_View"
+-#~ msgstr "查看(_V)"
++#~ msgstr "查看"
+ 
+ #~ msgid "_Toolbar"
+-#~ msgstr "工具栏(_T)"
++#~ msgstr "工具栏"
+ 
+ #~ msgid "_Autohide Toolbar"
+-#~ msgstr "自动隐藏工具栏(_A)"
++#~ msgstr "自动隐藏工具栏"
+ 
+ #~ msgid "_Scrollbar"
+-#~ msgstr "滚动条(_S)"
++#~ msgstr "滚动条"
+ 
+ #~ msgid "_Window Decorations"
+-#~ msgstr "窗口装饰(_W)"
++#~ msgstr "窗口装饰"
+ 
+ #~ msgid "_Contents"
+-#~ msgstr "内容(_C)"
++#~ msgstr "内容"
+ 
+ #~ msgid "_Edit lock"
+-#~ msgstr "编辑锁定(_E)"
++#~ msgstr "编辑锁定"
+ 
+ #~ msgid "_Pads start on all workspaces"
+-#~ msgstr "便笺在所有工作区启动(_P)"
++#~ msgstr "便笺在所有工作区启动"
+ 
+ #~ msgid "Options"
+ #~ msgstr "选项"
+ 
+ #~ msgid "Add C_lear to Toolbar"
+-#~ msgstr "将清空添加至工具栏(_C)"
++#~ msgstr "将清空添加至工具栏"
+ 
+ #~ msgid "Add _Close to Toolbar"
+-#~ msgstr "将关闭添加至工具栏(_C)"
++#~ msgstr "将关闭添加至工具栏"
+ 
+ #~ msgid "Add _Delete to Toolbar"
+-#~ msgstr "将删除添加至工具栏(_D)"
++#~ msgstr "将删除添加至工具栏"
+ 
+ #~ msgid "Add _New to Toolbar"
+-#~ msgstr "将新建添加至工具栏(_N)"
++#~ msgstr "将新建添加至工具栏"
+ 
+ #~ msgid "Add Pr_eferences to Toolbar"
+-#~ msgstr "将首选项添加至工具栏(_E)"
++#~ msgstr "将首选项添加至工具栏"
+ 
+ #~ msgid "Add Proper_ties to Toolbar"
+-#~ msgstr "将属性添加至工具栏(_T)"
++#~ msgstr "将属性添加至工具栏"
+ 
+ #~ msgid "Add a Se_parator to Toolbar"
+-#~ msgstr "将分隔线添加至工具栏(_P)"
++#~ msgstr "将分隔线添加至工具栏"
+ 
+ #~ msgid "_Remove From Toolbar"
+-#~ msgstr "从工具栏中删除(_R)"
++#~ msgstr "从工具栏中删除"
+ 
+ #~ msgid "_Move"
+-#~ msgstr "移动(_M)"
++#~ msgstr "移动"
+ 
+ #~ msgid "Jot down notes for later"
+ #~ msgstr "简要记录备注以备日后使用"
+@@ -681,7 +681,7 @@
+ #~ msgstr "<b>想改变颜色设置</b>，在某个页面里点鼠标右键，选择 编辑 -> 参数。"
+ 
+ #~ msgid "Add Close _All to Toolbar"
+-#~ msgstr "添加 全部关闭 到工具栏(_A)"
++#~ msgstr "添加 全部关闭 到工具栏"
+ 
+ #~ msgid ""
+ #~ "<b>To move a pad</b>, left drag on the toolbar, right drag on the resizer in "
+diff -urN a/po/zh_TW.po b/po/zh_TW.po
+--- a/po/zh_TW.po	2022-05-23 05:07:02.000000000 -0700
++++ b/po/zh_TW.po	2025-06-09 05:34:15.278476545 -0700
+@@ -162,7 +162,7 @@
+ #. Edit submenu
+ #: ../src/xpad-pad.c:1614
+ msgid "_Edit"
+-msgstr "編輯(_E)"
++msgstr "編輯"
+ 
+ #: ../src/xpad-pad.c:1618
+ msgid "_Undo"
+@@ -191,24 +191,24 @@
+ #. Notes submenu - The list of notes will get added in the prep function below
+ #: ../src/xpad-pad.c:1635
+ msgid "_Notes"
+-msgstr "備忘(_N)"
++msgstr "備忘"
+ 
+ #: ../src/xpad-pad.c:1640 ../src/xpad-tray.c:74
+ msgid "_Show All"
+-msgstr "全部顯示(_S)"
++msgstr "全部顯示"
+ 
+ #: ../src/xpad-pad.c:1641 ../src/xpad-tray.c:79
+ msgid "_Close All"
+-msgstr "全部關閉(_C)"
++msgstr "全部關閉"
+ 
+ #. Help submenu
+ #: ../src/xpad-pad.c:1644 ../src/xpad-pad.c:1648 ../src/xpad-tray.c:96
+ msgid "_Help"
+-msgstr "求助(_H)"
++msgstr "求助"
+ 
+ #: ../src/xpad-pad.c:1649
+ msgid "_About"
+-msgstr "關於(_A)"
++msgstr "關於"
+ 
+ #: ../src/xpad-pad.c:1654 ../src/xpad-tray.c:92
+ msgid "_Preferences"
+@@ -423,7 +423,7 @@
+ 
+ #: ../src/xpad-preferences.c:515
+ msgid "_Confirm pad deletion"
+-msgstr "確認刪除便條(_C)"
++msgstr "確認刪除便條"
+ 
+ #: ../src/xpad-preferences.c:516
+ msgid "Enable _line numbering"
+@@ -605,64 +605,64 @@
+ #~ msgstr "'%s' 的屬性"
+ 
+ #~ msgid "_Pad"
+-#~ msgstr "便條(_P)"
++#~ msgstr "便條"
+ 
+ #~ msgid "Show on _All Workspaces"
+-#~ msgstr "顯示於所有工作區中(_A)"
++#~ msgstr "顯示於所有工作區中"
+ 
+ #~ msgid "_View"
+-#~ msgstr "顯示(_V)"
++#~ msgstr "顯示"
+ 
+ #~ msgid "_Toolbar"
+-#~ msgstr "工具列(_T)"
++#~ msgstr "工具列"
+ 
+ #~ msgid "_Autohide Toolbar"
+-#~ msgstr "自動隱藏工具列(_A)"
++#~ msgstr "自動隱藏工具列"
+ 
+ #~ msgid "_Scrollbar"
+-#~ msgstr "捲動列(_S)"
++#~ msgstr "捲動列"
+ 
+ #~ msgid "_Window Decorations"
+-#~ msgstr "視窗裝飾(_W)"
++#~ msgstr "視窗裝飾"
+ 
+ #~ msgid "_Contents"
+-#~ msgstr "內容(_C)"
++#~ msgstr "內容"
+ 
+ #~ msgid "_Edit lock"
+-#~ msgstr "編輯上鎖(_E)"
++#~ msgstr "編輯上鎖"
+ 
+ #~ msgid "_Pads start on all workspaces"
+-#~ msgstr "在所有工作區中開啟便條(_P)"
++#~ msgstr "在所有工作區中開啟便條"
+ 
+ #~ msgid "Options"
+ #~ msgstr "選項"
+ 
+ #~ msgid "Add C_lear to Toolbar"
+-#~ msgstr "加入清除到工具列(_L)"
++#~ msgstr "加入清除到工具列"
+ 
+ #~ msgid "Add _Close to Toolbar"
+-#~ msgstr "加入關閉到工具列(_C)"
++#~ msgstr "加入關閉到工具列"
+ 
+ #~ msgid "Add _Delete to Toolbar"
+-#~ msgstr "加入刪除到工具列(_D)"
++#~ msgstr "加入刪除到工具列"
+ 
+ #~ msgid "Add _New to Toolbar"
+-#~ msgstr "加入新增到工具列(_N)"
++#~ msgstr "加入新增到工具列"
+ 
+ #~ msgid "Add Pr_eferences to Toolbar"
+-#~ msgstr "加入偏好設定到工具列(_E)"
++#~ msgstr "加入偏好設定到工具列"
+ 
+ #~ msgid "Add Proper_ties to Toolbar"
+-#~ msgstr "加入內容到工具列(_T)"
++#~ msgstr "加入內容到工具列"
+ 
+ #~ msgid "Add a Se_parator to Toolbar"
+-#~ msgstr "加入分隔線到工具列(_P)"
++#~ msgstr "加入分隔線到工具列"
+ 
+ #~ msgid "_Remove From Toolbar"
+-#~ msgstr "從工具列中移除(_R)"
++#~ msgstr "從工具列中移除"
+ 
+ #~ msgid "_Move"
+-#~ msgstr "移動(_M)"
++#~ msgstr "移動"
+ 
+ #~ msgid "Jot down notes for later"
+ #~ msgstr "大略記下備註以供之後使用"
diff --git a/debian/patches/31_command_key.patch b/debian/patches/31_command_key.patch
new file mode 100644
index 0000000..9714022
--- /dev/null
+++ b/debian/patches/31_command_key.patch
@@ -0,0 +1,61 @@
+Description: Use Command key as the primary modifier
+Origin: Callisto Desktop
+Author: Maia <maia@tsundoku.ne.jp>
+Last-Update: 2023-06-19 xpad 5.8.0
+
+diff -urN a/src/xpad-pad.c b/src/xpad-pad.c
+--- a/src/xpad-pad.c	2022-05-18 00:42:43.000000000 -0700
++++ b/src/xpad-pad.c	2022-06-09 07:00:29.146969445 -0700
+@@ -355,7 +355,7 @@
+ 	gtk_window_add_accel_group (pad_window, pad->priv->accel_group);
+ 	pad->priv->menu = menu_get_popup_no_highlight (pad, pad->priv->accel_group);
+ 	pad->priv->highlight_menu = menu_get_popup_highlight (pad, pad->priv->accel_group);
+-	gtk_accel_group_connect (pad->priv->accel_group, GDK_KEY_Q, GDK_CONTROL_MASK, 0, g_cclosure_new_swap (G_CALLBACK (xpad_app_quit), pad, NULL));
++	gtk_accel_group_connect (pad->priv->accel_group, GDK_KEY_Q, GDK_SUPER_MASK, 0, g_cclosure_new_swap (G_CALLBACK (xpad_app_quit), pad, NULL));
+ 
+ 	/* GtkBox with overlay and toolbar */
+ 	GtkBox *vbox = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 0));
+@@ -1605,25 +1605,25 @@
+ 	uppermenu = gtk_menu_new ();
+ 	gtk_menu_set_accel_group (GTK_MENU (uppermenu), accel_group);
+ 	menu = uppermenu;
+-	MENU_ADD (_("_New"), "document-new", GDK_KEY_N, GDK_CONTROL_MASK, xpad_pad_spawn);
++	MENU_ADD (_("_New"), "document-new", GDK_KEY_N, GDK_SUPER_MASK, xpad_pad_spawn);
+ 	MENU_ADD (_("_Delete"), "edit-delete", GDK_KEY_Delete, GDK_SHIFT_MASK, xpad_pad_delete);
+ 	MENU_ADD (_("_Reload"), "reload-pad-content", GDK_KEY_F5, 0, xpad_pad_load_content);
+-	MENU_ADD (_("_Close"), "window-close", GDK_KEY_W, GDK_CONTROL_MASK, xpad_pad_close);
++	MENU_ADD (_("_Close"), "window-close", GDK_KEY_W, GDK_SUPER_MASK, xpad_pad_close);
+ 
+ 	/* Edit submenu */
+ 	item = gtk_menu_item_new_with_mnemonic (_("_Edit"));
+ 	gtk_container_add (GTK_CONTAINER (uppermenu), item);
+ 	menu = gtk_menu_new ();
+ 	gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), menu);
+-	MENU_ADD (_("_Undo"), "edit-undo", GDK_KEY_Z, GDK_CONTROL_MASK, xpad_pad_undo);
++	MENU_ADD (_("_Undo"), "edit-undo", GDK_KEY_Z, GDK_SUPER_MASK, xpad_pad_undo);
+ 	g_object_set_data (G_OBJECT (uppermenu), "undo", item);
+-	MENU_ADD (_("_Redo"), "edit-redo", GDK_KEY_Y, GDK_CONTROL_MASK, xpad_pad_redo);
++	MENU_ADD (_("_Redo"), "edit-redo", GDK_KEY_Y, GDK_SUPER_MASK, xpad_pad_redo);
+ 	g_object_set_data (G_OBJECT (uppermenu), "redo", item);
+ 	MENU_ADD_SEP();
+ 	MENU_ADD (_("_Paste"), "edit-paste", 0, 0, xpad_pad_paste);
+ 	g_object_set_data (G_OBJECT (uppermenu), "paste", item);
+ 	MENU_ADD_SEP();
+-	MENU_ADD (_("_Find"), "edit-find", GDK_KEY_F, GDK_CONTROL_MASK, xpad_pad_search);
++	MENU_ADD (_("_Find"), "edit-find", GDK_KEY_F, GDK_SUPER_MASK, xpad_pad_search);
+ 	MENU_ADD_SEP();
+ 	MENU_ADD (_("_Layout"), "document-properties", 0, 0, xpad_pad_open_properties);
+ 	MENU_ADD (_("_Read only"), "editable", 0, 0, xpad_pad_open_properties);
+@@ -1763,9 +1763,9 @@
+ 	MENU_ADD (_("_Paste"), "edit-paste", 0, 0, xpad_pad_paste);
+ 	g_object_set_data (G_OBJECT (menu), "paste", item);
+ 	MENU_ADD_SEP ();
+-	MENU_ADD (_("_Bold"), "format-text-bold", GDK_KEY_b, GDK_CONTROL_MASK, menu_bold);
+-	MENU_ADD (_("_Italic"), "format-text-italic", GDK_KEY_i, GDK_CONTROL_MASK, menu_italic);
+-	MENU_ADD (_("_Underline"), "format-text-underline", GDK_KEY_u, GDK_CONTROL_MASK, menu_underline);
++	MENU_ADD (_("_Bold"), "format-text-bold", GDK_KEY_b, GDK_SUPER_MASK, menu_bold);
++	MENU_ADD (_("_Italic"), "format-text-italic", GDK_KEY_i, GDK_SUPER_MASK, menu_italic);
++	MENU_ADD (_("_Underline"), "format-text-underline", GDK_KEY_u, GDK_SUPER_MASK, menu_underline);
+ 	MENU_ADD (_("_Strikethrough"), "format-text-strikethrough", 0, 0, menu_strikethrough);
+ 
+ 	gtk_widget_show_all (menu);
diff --git a/debian/patches/series b/debian/patches/series
index 45d9ea5..60265fa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 01_allow_build_with_newer_gettext.diff
+30_no_mnemonics.patch
+31_command_key.patch