diff --git a/cockatrice/cockatrice_en@source.ts b/cockatrice/cockatrice_en@source.ts
index 01bafd9fb..f449e31e1 100644
--- a/cockatrice/cockatrice_en@source.ts
+++ b/cockatrice/cockatrice_en@source.ts
@@ -25,77 +25,82 @@
 <context>
     <name>AppearanceSettingsPage</name>
     <message>
-        <location filename="src/dlg_settings.cpp" line="403"/>
+        <location filename="src/dlg_settings.cpp" line="408"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="403"/>
+        <location filename="src/dlg_settings.cpp" line="408"/>
         <source>Could not create themes directory at &apos;%1&apos;.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="409"/>
+        <location filename="src/dlg_settings.cpp" line="414"/>
         <source>Theme settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="410"/>
+        <location filename="src/dlg_settings.cpp" line="415"/>
         <source>Current theme:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="411"/>
+        <location filename="src/dlg_settings.cpp" line="416"/>
         <source>Open themes folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="413"/>
+        <location filename="src/dlg_settings.cpp" line="418"/>
         <source>Card rendering</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="414"/>
+        <location filename="src/dlg_settings.cpp" line="419"/>
         <source>Display card names on cards having a picture</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="415"/>
+        <location filename="src/dlg_settings.cpp" line="420"/>
         <source>Scale cards on mouse over</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="src/dlg_settings.cpp" line="417"/>
-        <source>Hand layout</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/dlg_settings.cpp" line="418"/>
-        <source>Display hand horizontally (wastes space)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/dlg_settings.cpp" line="419"/>
-        <source>Enable left justification</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/dlg_settings.cpp" line="421"/>
-        <source>Table grid layout</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <location filename="src/dlg_settings.cpp" line="422"/>
-        <source>Invert vertical coordinate</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="src/dlg_settings.cpp" line="423"/>
-        <source>Minimum player count for multi-column layout:</source>
+        <source>Minimum overlap percentage of cards on the stack and in vertical hand</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="src/dlg_settings.cpp" line="424"/>
+        <source>Hand layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/dlg_settings.cpp" line="425"/>
+        <source>Display hand horizontally (wastes space)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/dlg_settings.cpp" line="426"/>
+        <source>Enable left justification</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/dlg_settings.cpp" line="428"/>
+        <source>Table grid layout</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/dlg_settings.cpp" line="429"/>
+        <source>Invert vertical coordinate</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/dlg_settings.cpp" line="430"/>
+        <source>Minimum player count for multi-column layout:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="src/dlg_settings.cpp" line="431"/>
         <source>Maximum font size for information displayed on cards:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -530,151 +535,151 @@ This is only saved for moderators and cannot be seen by the banned person.</sour
 <context>
     <name>DeckEditorSettingsPage</name>
     <message>
-        <location filename="src/dlg_settings.cpp" line="541"/>
-        <location filename="src/dlg_settings.cpp" line="755"/>
+        <location filename="src/dlg_settings.cpp" line="548"/>
+        <location filename="src/dlg_settings.cpp" line="762"/>
         <source>Update Spoilers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="651"/>
-        <location filename="src/dlg_settings.cpp" line="687"/>
+        <location filename="src/dlg_settings.cpp" line="658"/>
+        <location filename="src/dlg_settings.cpp" line="694"/>
         <source>Success</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="651"/>
+        <location filename="src/dlg_settings.cpp" line="658"/>
         <source>Download URLs have been reset.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="687"/>
+        <location filename="src/dlg_settings.cpp" line="694"/>
         <source>Downloaded card pictures have been reset.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="690"/>
+        <location filename="src/dlg_settings.cpp" line="697"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="690"/>
+        <location filename="src/dlg_settings.cpp" line="697"/>
         <source>One or more downloaded card pictures could not be cleared.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="697"/>
+        <location filename="src/dlg_settings.cpp" line="704"/>
         <source>Add URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="697"/>
-        <location filename="src/dlg_settings.cpp" line="717"/>
+        <location filename="src/dlg_settings.cpp" line="704"/>
+        <location filename="src/dlg_settings.cpp" line="724"/>
         <source>URL:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="565"/>
-        <location filename="src/dlg_settings.cpp" line="717"/>
+        <location filename="src/dlg_settings.cpp" line="572"/>
+        <location filename="src/dlg_settings.cpp" line="724"/>
         <source>Edit URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="561"/>
+        <location filename="src/dlg_settings.cpp" line="568"/>
         <source>Add New URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="569"/>
+        <location filename="src/dlg_settings.cpp" line="576"/>
         <source>Remove URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="744"/>
+        <location filename="src/dlg_settings.cpp" line="751"/>
         <source>Updating...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="774"/>
+        <location filename="src/dlg_settings.cpp" line="781"/>
         <source>Choose path</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="800"/>
+        <location filename="src/dlg_settings.cpp" line="807"/>
         <source>URL Download Priority</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="801"/>
+        <location filename="src/dlg_settings.cpp" line="808"/>
         <source>Spoilers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="802"/>
+        <location filename="src/dlg_settings.cpp" line="809"/>
         <source>Download Spoilers Automatically</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="803"/>
+        <location filename="src/dlg_settings.cpp" line="810"/>
         <source>Spoiler Location:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="804"/>
+        <location filename="src/dlg_settings.cpp" line="811"/>
         <source>Last Change</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="805"/>
+        <location filename="src/dlg_settings.cpp" line="812"/>
         <source>Spoilers download automatically on launch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="806"/>
+        <location filename="src/dlg_settings.cpp" line="813"/>
         <source>Press the button to manually update without relaunching</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="807"/>
+        <location filename="src/dlg_settings.cpp" line="814"/>
         <source>Do not close settings until manual update is complete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="808"/>
+        <location filename="src/dlg_settings.cpp" line="815"/>
         <source>Download card pictures on the fly</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="809"/>
+        <location filename="src/dlg_settings.cpp" line="816"/>
         <source>How to add a custom URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="810"/>
+        <location filename="src/dlg_settings.cpp" line="817"/>
         <source>Delete Downloaded Images</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="811"/>
+        <location filename="src/dlg_settings.cpp" line="818"/>
         <source>Reset Download URLs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="812"/>
+        <location filename="src/dlg_settings.cpp" line="819"/>
         <source>Downloaded images directory size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="813"/>
+        <location filename="src/dlg_settings.cpp" line="820"/>
         <source>On-disk cache for downloaded pictures</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="814"/>
+        <location filename="src/dlg_settings.cpp" line="821"/>
         <source>Picture cache size:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="815"/>
+        <location filename="src/dlg_settings.cpp" line="822"/>
         <source>In-memory cache for pictures not currently on screen</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1725,12 +1730,12 @@ Your email will be used to verify your account.</source>
 <context>
     <name>DlgSettings</name>
     <message>
-        <location filename="src/dlg_settings.cpp" line="1406"/>
+        <location filename="src/dlg_settings.cpp" line="1413"/>
         <source>Unknown Error loading card database</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="1414"/>
+        <location filename="src/dlg_settings.cpp" line="1421"/>
         <source>Your card database is invalid.
 
 Cockatrice may not function correctly with an invalid database
@@ -1741,7 +1746,7 @@ Would you like to change your database location setting?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="1420"/>
+        <location filename="src/dlg_settings.cpp" line="1427"/>
         <source>Your card database version is too old.
 
 This can cause problems loading card information or images
@@ -1752,7 +1757,7 @@ Would you like to change your database location setting?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="1426"/>
+        <location filename="src/dlg_settings.cpp" line="1433"/>
         <source>Your card database did not finish loading
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues with your cards.xml attached
@@ -1761,21 +1766,21 @@ Would you like to change your database location setting?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="1432"/>
+        <location filename="src/dlg_settings.cpp" line="1439"/>
         <source>File Error loading your card database.
 
 Would you like to change your database location setting?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="1436"/>
+        <location filename="src/dlg_settings.cpp" line="1443"/>
         <source>Your card database was loaded but contains no cards.
 
 Would you like to change your database location setting?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="1440"/>
+        <location filename="src/dlg_settings.cpp" line="1447"/>
         <source>Unknown card database load status
 
 Please file a ticket at https://github.com/Cockatrice/Cockatrice/issues
@@ -1784,59 +1789,59 @@ Would you like to change your database location setting?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="1448"/>
-        <location filename="src/dlg_settings.cpp" line="1458"/>
-        <location filename="src/dlg_settings.cpp" line="1468"/>
+        <location filename="src/dlg_settings.cpp" line="1455"/>
+        <location filename="src/dlg_settings.cpp" line="1465"/>
+        <location filename="src/dlg_settings.cpp" line="1475"/>
         <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="1459"/>
+        <location filename="src/dlg_settings.cpp" line="1466"/>
         <source>The path to your deck directory is invalid. Would you like to go back and set the correct path?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="1469"/>
+        <location filename="src/dlg_settings.cpp" line="1476"/>
         <source>The path to your card pictures directory is invalid. Would you like to go back and set the correct path?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="1481"/>
+        <location filename="src/dlg_settings.cpp" line="1488"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="1483"/>
+        <location filename="src/dlg_settings.cpp" line="1490"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="1484"/>
+        <location filename="src/dlg_settings.cpp" line="1491"/>
         <source>Appearance</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="1485"/>
+        <location filename="src/dlg_settings.cpp" line="1492"/>
         <source>User Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="1486"/>
+        <location filename="src/dlg_settings.cpp" line="1493"/>
         <source>Card Sources</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="1487"/>
+        <location filename="src/dlg_settings.cpp" line="1494"/>
         <source>Chat</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="1488"/>
+        <location filename="src/dlg_settings.cpp" line="1495"/>
         <source>Sound</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="1489"/>
+        <location filename="src/dlg_settings.cpp" line="1496"/>
         <source>Shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3709,110 +3714,110 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>MessagesSettingsPage</name>
     <message>
-        <location filename="src/dlg_settings.cpp" line="858"/>
+        <location filename="src/dlg_settings.cpp" line="865"/>
         <source>Word1 Word2 Word3</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="899"/>
+        <location filename="src/dlg_settings.cpp" line="906"/>
         <source>Add New Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="903"/>
+        <location filename="src/dlg_settings.cpp" line="910"/>
         <source>Edit Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="907"/>
+        <location filename="src/dlg_settings.cpp" line="914"/>
         <source>Remove Message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="1003"/>
+        <location filename="src/dlg_settings.cpp" line="1010"/>
         <source>Add message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="1003"/>
-        <location filename="src/dlg_settings.cpp" line="1016"/>
+        <location filename="src/dlg_settings.cpp" line="1010"/>
+        <location filename="src/dlg_settings.cpp" line="1023"/>
         <source>Message:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="1016"/>
+        <location filename="src/dlg_settings.cpp" line="1023"/>
         <source>Edit message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="1034"/>
+        <location filename="src/dlg_settings.cpp" line="1041"/>
         <source>Chat settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="1035"/>
+        <location filename="src/dlg_settings.cpp" line="1042"/>
         <source>Custom alert words</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="1036"/>
+        <location filename="src/dlg_settings.cpp" line="1043"/>
         <source>Enable chat mentions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="1037"/>
+        <location filename="src/dlg_settings.cpp" line="1044"/>
         <source>Enable mention completer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="1038"/>
+        <location filename="src/dlg_settings.cpp" line="1045"/>
         <source>In-game message macros</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="1040"/>
+        <location filename="src/dlg_settings.cpp" line="1047"/>
         <source>How to use in-game message macros</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="1041"/>
+        <location filename="src/dlg_settings.cpp" line="1048"/>
         <source>Ignore chat room messages sent by unregistered users</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="1042"/>
+        <location filename="src/dlg_settings.cpp" line="1049"/>
         <source>Ignore private messages sent by unregistered users</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="1043"/>
-        <location filename="src/dlg_settings.cpp" line="1044"/>
+        <location filename="src/dlg_settings.cpp" line="1050"/>
+        <location filename="src/dlg_settings.cpp" line="1051"/>
         <source>Invert text color</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="1045"/>
+        <location filename="src/dlg_settings.cpp" line="1052"/>
         <source>Enable desktop notifications for private messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="1046"/>
+        <location filename="src/dlg_settings.cpp" line="1053"/>
         <source>Enable desktop notification for mentions</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="1047"/>
+        <location filename="src/dlg_settings.cpp" line="1054"/>
         <source>Enable room message history on join</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="1048"/>
-        <location filename="src/dlg_settings.cpp" line="1049"/>
+        <location filename="src/dlg_settings.cpp" line="1055"/>
+        <location filename="src/dlg_settings.cpp" line="1056"/>
         <source>(Color is hexadecimal)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="1050"/>
+        <location filename="src/dlg_settings.cpp" line="1057"/>
         <source>Separate words with a space, alphanumeric characters only</source>
         <translation type="unfinished"></translation>
     </message>
@@ -3994,7 +3999,7 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>PictureLoader</name>
     <message>
-        <location filename="src/pictureloader.cpp" line="355"/>
+        <location filename="src/pictureloader.cpp" line="357"/>
         <source>en</source>
         <comment>code for scryfall&apos;s language property, not available for all languages</comment>
         <translation type="unfinished"></translation>
@@ -4060,7 +4065,6 @@ Cockatrice will now reload the card database.</source>
         <location filename="src/player.cpp" line="733"/>
         <location filename="src/player.cpp" line="739"/>
         <location filename="src/player.cpp" line="745"/>
-        <location filename="src/player.cpp" line="858"/>
         <source>&amp;Top of library</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4176,7 +4180,8 @@ Cockatrice will now reload the card database.</source>
     </message>
     <message>
         <location filename="src/player.cpp" line="774"/>
-        <source>Take top cards &amp;until...</source>
+        <source>Put top cards on stack &amp;until...</source>
+        <oldsource>Take top cards &amp;until...</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -4387,6 +4392,11 @@ Cockatrice will now reload the card database.</source>
         <source>&amp;Set counters (%1)...</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="src/player.cpp" line="858"/>
+        <source>&amp;Top of library in random order</source>
+        <translation type="unfinished"></translation>
+    </message>
     <message>
         <location filename="src/player.cpp" line="859"/>
         <source>X cards from the top of library...</source>
@@ -4429,7 +4439,7 @@ Cockatrice will now reload the card database.</source>
     </message>
     <message>
         <location filename="src/player.cpp" line="1783"/>
-        <location filename="src/player.cpp" line="3343"/>
+        <location filename="src/player.cpp" line="3366"/>
         <source>Number:</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4550,7 +4560,7 @@ Cockatrice will now reload the card database.</source>
     </message>
     <message>
         <location filename="src/player.cpp" line="1636"/>
-        <location filename="src/player.cpp" line="3752"/>
+        <location filename="src/player.cpp" line="3775"/>
         <source>C&amp;reate another %1 token</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4565,47 +4575,47 @@ Cockatrice will now reload the card database.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/player.cpp" line="3143"/>
+        <location filename="src/player.cpp" line="3153"/>
         <source>Change power/toughness</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/player.cpp" line="3143"/>
+        <location filename="src/player.cpp" line="3153"/>
         <source>Change stats to:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/player.cpp" line="3252"/>
+        <location filename="src/player.cpp" line="3273"/>
         <source>Set annotation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/player.cpp" line="3253"/>
+        <location filename="src/player.cpp" line="3274"/>
         <source>Please enter the new annotation:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/player.cpp" line="3343"/>
+        <location filename="src/player.cpp" line="3366"/>
         <source>Set counters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/player.cpp" line="3541"/>
+        <location filename="src/player.cpp" line="3564"/>
         <source>Re&amp;veal to...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/player.cpp" line="3588"/>
+        <location filename="src/player.cpp" line="3611"/>
         <source>View related cards</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/player.cpp" line="3627"/>
+        <location filename="src/player.cpp" line="3650"/>
         <source>Token: </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/player.cpp" line="3644"/>
+        <location filename="src/player.cpp" line="3667"/>
         <source>All tokens</source>
         <translation type="unfinished"></translation>
     </message>
@@ -4933,55 +4943,61 @@ Cockatrice will now reload the card database.</source>
 <context>
     <name>ShortcutSettingsPage</name>
     <message>
-        <location filename="src/dlg_settings.cpp" line="1207"/>
+        <location filename="src/dlg_settings.cpp" line="1214"/>
+        <location filename="src/dlg_settings.cpp" line="1291"/>
         <source>Restore all default shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="1208"/>
+        <location filename="src/dlg_settings.cpp" line="1215"/>
         <source>Do you really want to restore all default shortcuts?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="1268"/>
+        <location filename="src/dlg_settings.cpp" line="1275"/>
         <source>Clear all default shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="1269"/>
+        <location filename="src/dlg_settings.cpp" line="1276"/>
         <source>Do you really want to clear all shortcuts?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="1276"/>
+        <location filename="src/dlg_settings.cpp" line="1283"/>
         <source>Action</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="1276"/>
+        <location filename="src/dlg_settings.cpp" line="1283"/>
         <source>Shortcut</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="1279"/>
+        <location filename="src/dlg_settings.cpp" line="1286"/>
         <source>Section:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="1280"/>
+        <location filename="src/dlg_settings.cpp" line="1287"/>
         <source>Action:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="1281"/>
+        <location filename="src/dlg_settings.cpp" line="1288"/>
         <source>Shortcut:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="1283"/>
+        <location filename="src/dlg_settings.cpp" line="1290"/>
         <source>How to set custom shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="src/dlg_settings.cpp" line="1292"/>
+        <source>Clear all shortcuts</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ShortcutsSettings</name>
@@ -5019,27 +5035,27 @@ Please check your shortcut settings!</source>
 <context>
     <name>SoundSettingsPage</name>
     <message>
-        <location filename="src/dlg_settings.cpp" line="1119"/>
+        <location filename="src/dlg_settings.cpp" line="1126"/>
         <source>Enable &amp;sounds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="1120"/>
+        <location filename="src/dlg_settings.cpp" line="1127"/>
         <source>Current sounds theme:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="1121"/>
+        <location filename="src/dlg_settings.cpp" line="1128"/>
         <source>Test system sound engine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="1122"/>
+        <location filename="src/dlg_settings.cpp" line="1129"/>
         <source>Sound settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="1123"/>
+        <location filename="src/dlg_settings.cpp" line="1130"/>
         <source>Master volume</source>
         <translation type="unfinished"></translation>
     </message>
@@ -5163,7 +5179,8 @@ Please check your shortcut settings!</source>
     <name>TabDeckEditor</name>
     <message>
         <location filename="src/tab_deck_editor.cpp" line="379"/>
-        <source>Search by card name</source>
+        <source>Search by card name (or search expressions)</source>
+        <oldsource>Search by card name</oldsource>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -6606,57 +6623,57 @@ Please refrain from engaging in this activity or further actions may be taken ag
 <context>
     <name>UserInterfaceSettingsPage</name>
     <message>
-        <location filename="src/dlg_settings.cpp" line="507"/>
+        <location filename="src/dlg_settings.cpp" line="514"/>
         <source>General interface settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="508"/>
+        <location filename="src/dlg_settings.cpp" line="515"/>
         <source>&amp;Double-click cards to play them (instead of single-click)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="509"/>
+        <location filename="src/dlg_settings.cpp" line="516"/>
         <source>&amp;Play all nonlands onto the stack (not the battlefield) by default</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="510"/>
+        <location filename="src/dlg_settings.cpp" line="517"/>
         <source>Annotate card text on tokens</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="511"/>
+        <location filename="src/dlg_settings.cpp" line="518"/>
         <source>Use tear-off menus, allowing right click menus to persist on screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="512"/>
+        <location filename="src/dlg_settings.cpp" line="519"/>
         <source>Notifications settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="513"/>
+        <location filename="src/dlg_settings.cpp" line="520"/>
         <source>Enable notifications in taskbar</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="514"/>
+        <location filename="src/dlg_settings.cpp" line="521"/>
         <source>Notify in the taskbar for game events while you are spectating</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="515"/>
+        <location filename="src/dlg_settings.cpp" line="522"/>
         <source>Notify in the taskbar when users in your buddy list connect</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="516"/>
+        <location filename="src/dlg_settings.cpp" line="523"/>
         <source>Animation settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/dlg_settings.cpp" line="517"/>
+        <location filename="src/dlg_settings.cpp" line="524"/>
         <source>&amp;Tap/untap animation</source>
         <translation type="unfinished"></translation>
     </message>