Merge branch 'master' of gitlab.com:inkscape/inkscape

10 files changed, 364 insertions, 396 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8daaabe3b..7bd6294ee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -151,9 +151,11 @@ endif()
 # -----------------------------------------------------------------------------
 # Dist Target
 # -----------------------------------------------------------------------------
-if(EXISTS ${CMAKE_SOURCE_DIR}/.bzr/)
-    execute_process(COMMAND
-        bzr revno --tree ${CMAKE_SOURCE_DIR}
+if(EXISTS ${CMAKE_SOURCE_DIR}/.git/)
+    execute_process(
+        COMMAND git show --format=format:"%ad %h" --date=short
+        COMMAND head -n 1
+        COMMAND tr "\n" " "
                 OUTPUT_VARIABLE INKSCAPE_REVISION
                 OUTPUT_STRIP_TRAILING_WHITESPACE)
 else()
@@ -161,11 +163,10 @@ else()
 endif()
 set(INKSCAPE_DIST_PREFIX "${PROJECT_NAME}-${INKSCAPE_VERSION}")
 add_custom_target(dist
-    COMMAND sed -i "s/unknown/r${INKSCAPE_REVISION}/" CMakeScripts/inkscape-version.cmake
+    COMMAND sed -i "s/unknown//" CMakeScripts/inkscape-version.cmake
     && sed -i "s/custom//" CMakeScripts/inkscape-version.cmake
-    && bzr export --uncommitted --root=${INKSCAPE_DIST_PREFIX}
-    "${CMAKE_BINARY_DIR}/${INKSCAPE_DIST_PREFIX}.tar.bz2" 
-    && bzr revert ${CMAKE_SOURCE_DIR}/CMakeScripts/inkscape-version.cmake
+    && tar cfz ${CMAKE_BINARY_DIR}/${INKSCAPE_DIST_PREFIX}.tar.gz ${CMAKE_SOURCE_DIR} --exclude=".*" --exclude-vcs-ignores
+    && git checkout ${CMAKE_SOURCE_DIR}/CMakeScripts/inkscape-version.cmake
     WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}")
 
 # -----------------------------------------------------------------------------
diff --git a/CMakeScripts/inkscape-version.cmake b/CMakeScripts/inkscape-version.cmake
index 2e23925c4..12b8a26d8 100644
--- a/CMakeScripts/inkscape-version.cmake
+++ b/CMakeScripts/inkscape-version.cmake
@@ -11,14 +11,22 @@
 set(INKSCAPE_REVISION "unknown")
 set(INKSCAPE_CUSTOM "custom")
 
-if(EXISTS ${INKSCAPE_SOURCE_DIR}/.bzr/)
-    execute_process(COMMAND
-	bzr revno --tree ${INKSCAPE_SOURCE_DIR}
-	OUTPUT_VARIABLE INKSCAPE_REVISION
-	OUTPUT_STRIP_TRAILING_WHITESPACE)
+if(EXISTS ${INKSCAPE_SOURCE_DIR}/.git/)
+
+    execute_process(COMMAND git describe
+        COMMAND tr "\n" " "
+        WORKING_DIRECTORY ${INKSCAPE_SOURCE_DIR}
+        OUTPUT_VARIABLE INKSCAPE_REV1)
+    execute_process(COMMAND git show --format=format:%ad --date=short
+        COMMAND head -n 1 
+        COMMAND tr "\n" " "
+        WORKING_DIRECTORY ${INKSCAPE_SOURCE_DIR}
+	OUTPUT_VARIABLE INKSCAPE_REV2
+        OUTPUT_STRIP_TRAILING_WHITESPACE)
+    set(INKSCAPE_REVISION ${INKSCAPE_REV1} ${INKSCAPE_REV2})
 
     execute_process(COMMAND
-        bzr status -S -V ${INKSCAPE_SOURCE_DIR}/src
+        git status -s ${INKSCAPE_SOURCE_DIR}/src
         OUTPUT_VARIABLE INKSCAPE_SOURCE_MODIFIED
         OUTPUT_STRIP_TRAILING_WHITESPACE)
     if(NOT INKSCAPE_SOURCE_MODIFIED STREQUAL "")
diff --git a/share/icons/format-text-direction-horizontal.svg b/share/icons/format-text-direction-horizontal.svg
index ecac387c4..351ea6036 100644
--- a/share/icons/format-text-direction-horizontal.svg
+++ b/share/icons/format-text-direction-horizontal.svg
@@ -1,48 +1,36 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg1"
    width="24"
    height="24"
   >
-  <sodipodi:namedview
-     id="base"
-     showgrid="true"
-     gridspacingy="1pt"
-     gridspacingx="1pt"
-     gridoriginy="0pt"
-     gridoriginx="0pt"
-  />
-  <defs id="defs3">
-
-    <linearGradient id="linearGradient6524">
-      <stop id="stop6526" offset="0" style="stop-color:#ffffff;stop-opacity:1"/>
-      <stop id="stop6528" offset="1" style="stop-color:#e2e1e1;stop-opacity:1"/>
+  <defs>
+    <linearGradient id="linearGradientA"
+		    xlink:href="#linearGradientVector"
+		    gradientUnits="userSpaceOnUse"
+		    x1="30" x2="4" y1="25" y2="4" />
+    <linearGradient id="linearGradientVector">
+      <stop offset="0" style="stop-color:#ffffff"/>
+      <stop offset="1" style="stop-color:#e2e1e1"/>
     </linearGradient>
-    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradient3749" inkscape:collect="always" x1="860.239" x2="843.9635" xlink:href="#linearGradient6524" y1="45.30668" y2="28.96459"/>
   </defs>
-<g id="format-text-direction-horizontal" inkscape:label="#writing_mode_lr" transform="translate(-839.5246,-24.9991)">
-  <g id="use5602" transform="translate(-0.4754,-9e-4)">
-    <path d="M 841,26 863,26 864,27 864,47 862,49 842,49 841,48 841,26 Z" id="path3731" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc" style="color:#000000;fill:#000000;fill-opacity:0.0666667;fill-rule:evenodd"/>
-    <path d="M 840,26 841,26 841,46 840,46 840,26 Z" id="path3733" inkscape:connector-curvature="0" style="color:#000000;fill:#000000;fill-rule:evenodd"/>
-    <rect height="20" id="rect3735" style="color:#000000;fill:#000000;fill-rule:evenodd" width="1" x="861" y="26"/>
-    <rect height="20" id="rect3737" style="color:#000000;fill:#000000;fill-rule:evenodd" transform="rotate(-90)" width="1" x="-26" y="841"/>
-    <rect height="20" id="rect3739" style="color:#000000;fill:#000000;fill-rule:evenodd" transform="rotate(-90)" width="1" x="-47" y="841"/>
-    <rect height="20" id="rect3741" style="color:#000000;fill:url(#linearGradient3749);fill-rule:evenodd" width="20" x="841" y="26"/>
-    <path d="M 842,46 841,46 841,26 861,26 861,27 842,27 842,46 Z" id="path3743" inkscape:connector-curvature="0" style="fill:#ffffff;fill-rule:evenodd"/>
-    <path d="M 843.5,34.75 843.5,30.75 C 843.5,27.75 848.5,27.75 848.5,30.75 L 848.5,34.75" id="path3745" inkscape:connector-curvature="0" sodipodi:nodetypes="cccc" style="fill:none;stroke:#383838;stroke-width:1.0000001px;stroke-linecap:round"/>
-    <path d="M 843.5,32 848.6429,32" id="path3747" inkscape:connector-curvature="0" style="fill:none;stroke:#383838;stroke-width:1.0000001px"/>
+  <g id="format-text-direction-horizontal" inkscape:label="#writing_mode_lr">
+
+    <!-- Background -->
+    <path d="m 1,1 h 22 l 1,1 v 20 l -2,2 h -20 l -1,-1 z" style="fill:black;fill-opacity:0.0667" />
+    <rect x="0.5" y="0.5" width="21" height="21"  style="fill:url(#linearGradientA);stroke:black;stroke-linejoin:round" />
+    <path d="m 2,21 h -1 v -20 h 20 v 1 h -19 z" style="fill:white" />
+
+    <!-- A -->
+    <path d="m 3.5,9.75 v -4 c 0,-3 5,-3 5,0 v 4" style="fill:none;stroke:#383838;stroke-linecap:round" />
+    <path d="m 3.5,7 h 5.1" style="fill:none;stroke:#383838" />
+
+    <!-- Arrows -->
+    <path d="m 20,5.5 -3,-2.5 v 2 h -7 v 1 h 7 v 2 z" style="fill:#5a5a5a" />
+    <path d="m 20,11.5 -3,-2.5 v 2 h -15 v 1 h 15 v 2 z" style="fill:#5a5a5a" />
+    <path d="m 20,17.5 -3,-2.5 v 2 h -15 v 1 h 15 v 2 z" style="fill:#5a5a5a" />
   </g>
-  <path d="M 859.5492,30.4982 856.5246,27.9991 856.5246,29.9991 849.5246,29.9991 849.5246,30.9991 856.5246,30.9991 856.5246,32.9991 859.5492,30.4982 Z" id="path6495" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc" style="fill:#5a5a5a;fill-rule:evenodd"/>
-  <path d="M 859.5492,36.4982 856.5246,33.9991 856.5246,35.9991 841.5246,35.9991 841.5246,36.9991 856.5246,36.9991 856.5246,38.9991 859.5492,36.4982 Z" id="path6497" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc" style="fill:#5a5a5a;fill-rule:evenodd"/>
-  <path d="M 859.5492,36.4982 856.5246,33.9991 856.5246,35.9991 841.5246,35.9991 841.5246,36.9991 856.5246,36.9991 856.5246,38.9991 859.5492,36.4982 Z" id="use5502" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc" style="fill:#5a5a5a;fill-rule:evenodd" transform="matrix(1,0,0,1,0,6)"/>
-</g>
 
 </svg>
diff --git a/share/icons/format-text-direction-r2l.svg b/share/icons/format-text-direction-r2l.svg
index 22abacfcf..fd2cd7ea1 100644
--- a/share/icons/format-text-direction-r2l.svg
+++ b/share/icons/format-text-direction-r2l.svg
@@ -1,44 +1,37 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg1"
    width="24"
    height="24"
   >
-  <sodipodi:namedview
-     id="base"
-     showgrid="true"
-     gridspacingy="1pt"
-     gridspacingx="1pt"
-     gridoriginy="0pt"
-     gridoriginx="0pt"
-  />
-  <defs id="defs3">
-
+  <defs>
+    <linearGradient id="linearGradientA"
+		    xlink:href="#linearGradientVector"
+		    gradientUnits="userSpaceOnUse"
+		    x1="30" x2="4" y1="25" y2="4" />
+    <linearGradient id="linearGradientVector">
+      <stop offset="0" style="stop-color:#ffffff"/>
+      <stop offset="1" style="stop-color:#e2e1e1"/>
+    </linearGradient>
   </defs>
-<g id="format-text-direction-r2l" inkscape:label="#writing_mode_rl" transform="translate(-839.5246,-25)">
+
   <!-- Note "format-text-direction-rtl" is the GTK icon name but we want to use our own. -->
-  <g id="g10375" transform="translate(-0.4754,0)">
-    <path d="m 841,26 h 22 l 1,1 v 20 l -2,2 h -20 l -1,-1 z" id="path10356" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc" style="color:#000000;fill:#000000;fill-opacity:0.06666673;fill-rule:evenodd"/>
-    <path d="m 840,26 h 1 v 20 h -1 z" id="path10358" inkscape:connector-curvature="0" style="color:#000000;fill:#000000;fill-rule:evenodd"/>
-    <rect height="20" id="rect10361" style="color:#000000;fill:#000000;fill-rule:evenodd" width="1" x="861" y="26"/>
-    <rect height="20" id="rect10363" style="color:#000000;fill:#000000;fill-rule:evenodd" transform="rotate(-90)" width="1" x="-26" y="841"/>
-    <rect height="20" id="rect10365" style="color:#000000;fill:#000000;fill-rule:evenodd" transform="rotate(-90)" width="1" x="-47" y="841"/>
-    <rect height="20" id="rect10367" style="color:#000000;fill:url(#linearGradient10389);fill-rule:evenodd" width="20" x="841" y="26"/>
-    <path d="m 842,46 h -1 V 26 h 20 v 1 h -19 z" id="path10369" inkscape:connector-curvature="0" style="fill:#ffffff;fill-rule:evenodd"/>
-    <path d="m 858.5246,34.75 v -4 c 0,-3 -5,-3 -5,0 v 4" id="path10371" inkscape:connector-curvature="0" sodipodi:nodetypes="cccc" style="fill:none;stroke:#383838;stroke-linecap:round"/>
-    <path d="m 858.5246,32 h -5.1429" id="path10373" inkscape:connector-curvature="0" style="fill:none;stroke:#383838"/>
-  </g>
-  <path d="m 841.5246,30.4982 3.0246,-2.4991 v 2 h 7 v 1 h -7 v 2 z" id="path10377" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc" style="fill:#5a5a5a;fill-rule:evenodd"/>
-  <path d="m 841.5246,36.4982 3.0246,-2.4991 v 2 h 15 v 1 h -15 v 2 z" id="path10379" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc" style="fill:#5a5a5a;fill-rule:evenodd"/>
-  <path d="M 859.5492,36.4982 856.5246,33.9991 856.5246,35.9991 841.5246,35.9991 841.5246,36.9991 856.5246,36.9991 856.5246,38.9991 859.5492,36.4982 Z" id="use10381" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc" style="fill:#5a5a5a;fill-rule:evenodd" transform="matrix(-1,0,0,1,1701.0738,6)"/>
-</g>
+  <g id="format-text-direction-r2l" inkscape:label="#writing_mode_rl">
 
+    <!-- Background -->
+    <path d="m 1,1 h 22 l 1,1 v 20 l -2,2 h -20 l -1,-1 z" style="fill:black;fill-opacity:0.0667" />
+    <rect x="0.5" y="0.5" width="21" height="21"  style="fill:url(#linearGradientA);stroke:black;stroke-linejoin:round" />
+    <path d="m 2,21 h -1 v -20 h 20 v 1 h -19 z" style="fill:white" />
+
+    <!-- A -->
+    <path d="m 18.5,9.75 v -4 c 0,-3 -5,-3 -5,0 v 4" style="fill:none;stroke:#383838;stroke-linecap:round" />
+    <path d="m 18.5,7 h -5.1" style="fill:none;stroke:#383838" />
+
+    <!-- Arrows -->
+    <path d="m 2,5.5 3,-2.5 v 2 h 7 v 1 h -7 v 2 z"    style="fill:#5a5a5a" />
+    <path d="m 2,11.5 3,-2.5 v 2 h 15 v 1 h -15 v 2 z" style="fill:#5a5a5a" />
+    <path d="m 2,17.5 3,-2.5 v 2 h 15 v 1 h -15 v 2 z" style="fill:#5a5a5a" />
+  </g>
 </svg>
diff --git a/share/icons/format-text-direction-vertical.svg b/share/icons/format-text-direction-vertical.svg
index fb5b5f7fe..3d61497e7 100644
--- a/share/icons/format-text-direction-vertical.svg
+++ b/share/icons/format-text-direction-vertical.svg
@@ -1,46 +1,40 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg1"
    width="24"
    height="24"
   >
-  <sodipodi:namedview
-     id="base"
-     showgrid="true"
-     gridspacingy="1pt"
-     gridspacingx="1pt"
-     gridoriginy="0pt"
-     gridoriginx="0pt"
-  />
-  <defs id="defs3">
-
-    <linearGradient gradientUnits="userSpaceOnUse" id="linearGradient3755" inkscape:collect="always" x1="860.239" x2="843.9635" xlink:href="#linearGradient6524" y1="45.30668" y2="28.96459"/>
-    <linearGradient id="linearGradient6524">
-      <stop id="stop6526" offset="0" style="stop-color:#ffffff;stop-opacity:1"/>
-      <stop id="stop6528" offset="1" style="stop-color:#e2e1e1;stop-opacity:1"/>
+  <defs>
+    <linearGradient id="linearGradientA"
+		    xlink:href="#linearGradientVector"
+		    gradientUnits="userSpaceOnUse"
+		    x1="30" x2="4" y1="25" y2="4" />
+    <linearGradient id="linearGradientVector">
+      <stop offset="0" style="stop-color:#ffffff"/>
+      <stop offset="1" style="stop-color:#e2e1e1"/>
     </linearGradient>
   </defs>
-<g id="format-text-direction-vertical" inkscape:label="#writing_mode_tb" transform="translate(-840,-25)">
-  <path d="M 841,26 863,26 864,27 864,47 862,49 842,49 841,48 841,26 Z" id="path6536" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc" style="color:#000000;fill:#000000;fill-opacity:0.0666667;fill-rule:evenodd"/>
-  <path d="M 840,26 841,26 841,46 840,46 840,26 Z" id="rect6538" inkscape:connector-curvature="0" style="color:#000000;fill:#000000;fill-rule:evenodd"/>
-  <rect height="20" id="rect6540" style="color:#000000;fill:#000000;fill-rule:evenodd" width="1" x="861" y="26"/>
-  <rect height="20" id="rect6542" style="color:#000000;fill:#000000;fill-rule:evenodd" transform="rotate(-90)" width="1" x="-26" y="841"/>
-  <rect height="20" id="rect6544" style="color:#000000;fill:#000000;fill-rule:evenodd" transform="rotate(-90)" width="1" x="-47" y="841"/>
-  <rect height="20" id="rect6546" style="color:#000000;fill:url(#linearGradient3755);fill-rule:evenodd" width="20" x="841" y="26"/>
-  <path d="M 842,46 841,46 841,26 861,26 861,27 842,27 842,46 Z" id="path6565" inkscape:connector-curvature="0" style="fill:#ffffff;fill-rule:evenodd"/>
-  <path d="M 859.5246,34.7491 859.5246,30.7491 C 859.5246,27.7491 854.5246,27.7491 854.5246,30.7491 L 854.5246,34.7491" id="path6554" inkscape:connector-curvature="0" sodipodi:nodetypes="cccc" style="fill:none;stroke:#383838;stroke-width:1.0000001px;stroke-linecap:round"/>
-  <path d="M 859.6675,31.9991 854.5246,31.9991" id="path6556" inkscape:connector-curvature="0" style="fill:none;stroke:#383838;stroke-width:1.0000001px"/>
-  <path d="M 857.4754,45.0009 855,42 857,42 857,35 858,35 858,42 860,42 857.4754,45.0009 Z" id="path6548" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc" style="fill:#5a5a5a;fill-rule:evenodd"/>
-  <path d="M 851.4754,45 849,42 851,42 851,27 852,27 852,42 854,42 851.4754,45 Z" id="path6550" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc" style="fill:#5a5a5a;fill-rule:evenodd"/>
-  <path d="M 851.4754,45 849,42 851,42 851,27 852,27 852,42 854,42 851.4754,45 Z" id="use5600" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc" style="fill:#5a5a5a;fill-rule:evenodd" transform="matrix(1,0,0,1,0,0)"/>
-</g>
+  <g id="format-text-direction-vertical" inkscape:label="#writing_mode_tb">
+
+    <!-- Background -->
+    <path d="m 1,1 h 22 l 1,1 v 20 l -2,2 h -20 l -1,-1 z"
+	  style="fill:black;fill-opacity:0.0667" />
+    <path d="m 0.5,1  0,20" style="fill:none;stroke:black" />
+    <path d="m 21.5,1 0,20" style="fill:none;stroke:black" />
+    <path d="m 1,0.5  20,0" style="fill:none;stroke:black" />
+    <path d="m 1,21.5 20,0" style="fill:none;stroke:black" />
+    <rect x="1" y="1" width="20" height="20"  style="fill:url(#linearGradientA)" />
+    <path d="m 2,21 h -1 v -20 h 20 v 1 h -19 z" style="fill:white" />
+
+    <!-- A -->
+    <path d="m 19.5,9.75 v -4 c 0,-3 -5,-3 -5,0 v 4" style="fill:none;stroke:#383838;stroke-linecap:round" />
+    <path d="m 19.7,7 h -5.2" style="fill:none;stroke:#383838" />
 
+    <!-- Arrows -->
+    <path d="m 17.5,20 -2.5,-3 h 2 v -7 h 1 v 7 h 2 z" style="fill:#5a5a5a" />
+    <path d="m 11.5,20 -2.5,-3 h 2 v -15 h 1 v 15 h 2 z" style="fill:#5a5a5a" />
+    <path d="m 5.5,20 -2.5,-3 h 2 v -15 h 1 v 15 h 2 z" style="fill:#5a5a5a" />
+  </g>
 </svg>
diff --git a/share/icons/text-orientation-auto.svg b/share/icons/text-orientation-auto.svg
index 8e4428bac..a4bf06643 100644
--- a/share/icons/text-orientation-auto.svg
+++ b/share/icons/text-orientation-auto.svg
@@ -1,45 +1,37 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg1"
    width="24"
    height="24"
   >
-  <sodipodi:namedview
-     id="base"
-     showgrid="true"
-     gridspacingy="1pt"
-     gridspacingx="1pt"
-     gridoriginy="0pt"
-     gridoriginx="0pt"
-  />
-  <defs id="defs3">
-
-    <linearGradient gradientTransform="translate(-256,405)" gradientUnits="userSpaceOnUse" id="linearGradient10161" inkscape:collect="always" x1="860.239" x2="843.9635" xlink:href="#linearGradient6524" y1="45.30668" y2="28.96459"/>
-    <linearGradient id="linearGradient6524">
-      <stop id="stop6526" offset="0" style="stop-color:#ffffff;stop-opacity:1"/>
-      <stop id="stop6528" offset="1" style="stop-color:#e2e1e1;stop-opacity:1"/>
+  <defs>
+    <linearGradient id="linearGradientA"
+		    xlink:href="#linearGradientVector"
+		    gradientUnits="userSpaceOnUse"
+		    x1="30" x2="4" y1="25" y2="4" />
+    <linearGradient id="linearGradientVector">
+      <stop offset="0" style="stop-color:#ffffff"/>
+      <stop offset="1" style="stop-color:#e2e1e1"/>
     </linearGradient>
   </defs>
-<g id="text-orientation-auto" inkscape:label="#text_orientation_auto" transform="translate(-584,-430)">
-  <path d="m 585,431 22,0 1,1 0,20 -2,2 -20,0 -1,-1 0,-22 z" id="path10137" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc" style="color:#000000;fill:#000000;fill-opacity:0.06666673;fill-rule:evenodd"/>
-  <path d="m 584,431 1,0 0,20 -1,0 0,-20 z" id="path10139" inkscape:connector-curvature="0" style="color:#000000;fill:#000000;fill-rule:evenodd"/>
-  <rect height="20" id="rect10141" style="color:#000000;fill:#000000;fill-rule:evenodd" width="1" x="605" y="431"/>
-  <rect height="20" id="rect10143" style="color:#000000;fill:#000000;fill-rule:evenodd" transform="matrix(0,-1,1,0,0,0)" width="1" x="-431" y="585"/>
-  <rect height="20" id="rect10145" style="color:#000000;fill:#000000;fill-rule:evenodd" transform="matrix(0,-1,1,0,0,0)" width="1" x="-452" y="585"/>
-  <rect height="20" id="rect10147" style="color:#000000;fill:url(#linearGradient10161);fill-rule:evenodd" width="20" x="585" y="431"/>
-  <path d="m 586,451 -1,0 0,-20 20,0 0,1 -19,0 0,19 z" id="path10149" inkscape:connector-curvature="0" style="fill:#ffffff;fill-rule:evenodd"/>
-  <path d="m 595.30711,449.12856 4,0 c 3,0 3,-5 0,-5 l -4,0" id="path10151" inkscape:connector-curvature="0" sodipodi:nodetypes="cccc" style="fill:none;stroke:#383838;stroke-width:1.00000012px;stroke-linecap:round"/>
-  <path d="m 598.05711,449.27146 0,-5.1429" id="path10153" inkscape:connector-curvature="0" style="fill:none;stroke:#383838;stroke-width:1.00000012px"/>
-  <path d="M 851.4754,45 849,42 851,42 851,27 852,27 852,42 854,42 851.4754,45 Z" id="use10159" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc" style="fill:#5a5a5a;fill-rule:evenodd" transform="matrix(1,0,0,1,-261,405)"/>
-  <path d="m 595,438.5 7.5,0.0854 m -6,-2.5854 4.20941,0 -1.70941,1.5 0.0234,3 c -0.0234,0.5 -0.52344,1 -1.02344,1 l -1,0 m 2.00004,-7.72791 -0.5,-0.77209 m -3.5,2.00274 0,-1.00274 7.5,0 -0.0207,0.98202" id="path11017" inkscape:connector-curvature="0" style="color:#000000;solid-opacity:1;fill:none;stroke:#383838;stroke-width:1.00000012px;stroke-linecap:round;stroke-linejoin:round"/>
-</g>
 
+  <!-- Note "format-text-direction-rtl" is the GTK icon name but we want to use our own. -->
+  <g id="format-text-direction-r2l" inkscape:label="#writing_mode_rl">
+
+    <!-- Background -->
+    <path d="m 1,1 h 22 l 1,1 v 20 l -2,2 h -20 l -1,-1 z" style="fill:black;fill-opacity:0.0667" />
+    <rect x="0.5" y="0.5" width="21" height="21"  style="fill:url(#linearGradientA);stroke:black;stroke-linejoin:round" />
+    <path d="m 2,21 h -1 v -20 h 20 v 1 h -19 z" style="fill:white" />
+
+    <!-- Glyphs -->
+    <path d="m 11.3,19.1 h 4 c 3,0 3,-5 0,-5 h -4" style="fill:none;stroke:#383838;stroke-linecap:round"/>
+    <path d="m 14.1,19.3 v -5.2" style="fill:none;stroke:#383838"/>
+    <path d="m 11,8.5 7.5,0.1 m -6,-2.6 h 4.2 l -1.7,1.5 v 3 c 0,0.5 -0.5,1 -1,1 h -1 m 2,-7.7 -0.5,-0.8 m -3.5,2 v -1 h 7.5 v 1"
+	  style="fill:none;stroke:#383838;stroke-linecap:round;stroke-linejoin:round" />
+
+    <!-- Arrow -->
+    <path d="m 6.5,20 -2.5,-3 h 2 v -15 h 1 v 15 h 2 z" style="fill:#5a5a5a"/>
+  </g>
 </svg>
diff --git a/share/icons/text-orientation-sideways.svg b/share/icons/text-orientation-sideways.svg
index 97bb55173..a6ce53531 100644
--- a/share/icons/text-orientation-sideways.svg
+++ b/share/icons/text-orientation-sideways.svg
@@ -1,45 +1,37 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg1"
    width="24"
    height="24"
   >
-  <sodipodi:namedview
-     id="base"
-     showgrid="true"
-     gridspacingy="1pt"
-     gridspacingx="1pt"
-     gridoriginy="0pt"
-     gridoriginx="0pt"
-  />
-  <defs id="defs3">
-
-    <linearGradient id="linearGradient6524">
-      <stop id="stop6526" offset="0" style="stop-color:#ffffff;stop-opacity:1"/>
-      <stop id="stop6528" offset="1" style="stop-color:#e2e1e1;stop-opacity:1"/>
+  <defs>
+    <linearGradient id="linearGradientA"
+		    xlink:href="#linearGradientVector"
+		    gradientUnits="userSpaceOnUse"
+		    x1="30" x2="4" y1="25" y2="4" />
+    <linearGradient id="linearGradientVector">
+      <stop offset="0" style="stop-color:#ffffff"/>
+      <stop offset="1" style="stop-color:#e2e1e1"/>
     </linearGradient>
-    <linearGradient gradientTransform="translate(-196,405)" gradientUnits="userSpaceOnUse" id="linearGradient11155" inkscape:collect="always" x1="860.239" x2="843.9635" xlink:href="#linearGradient6524" y1="45.30668" y2="28.96459"/>
   </defs>
-<g id="text-orientation-sideways" inkscape:label="#text_orientation_sideways" transform="translate(-644,-430)">
-  <path d="m 645,431 22,0 1,1 0,20 -2,2 -20,0 -1,-1 0,-22 z" id="path11133" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc" style="color:#000000;fill:#000000;fill-opacity:0.06666673;fill-rule:evenodd"/>
-  <path d="m 644,431 1,0 0,20 -1,0 0,-20 z" id="path11135" inkscape:connector-curvature="0" style="color:#000000;fill:#000000;fill-rule:evenodd"/>
-  <rect height="20" id="rect11137" style="color:#000000;fill:#000000;fill-rule:evenodd" width="1" x="665" y="431"/>
-  <rect height="20" id="rect11139" style="color:#000000;fill:#000000;fill-rule:evenodd" transform="matrix(0,-1,1,0,0,0)" width="1" x="-431" y="645"/>
-  <rect height="20" id="rect11141" style="color:#000000;fill:#000000;fill-rule:evenodd" transform="matrix(0,-1,1,0,0,0)" width="1" x="-452" y="645"/>
-  <rect height="20" id="rect11143" style="color:#000000;fill:url(#linearGradient11155);fill-rule:evenodd" width="20" x="645" y="431"/>
-  <path d="m 646,451 -1,0 0,-20 20,0 0,1 -19,0 0,19 z" id="path11145" inkscape:connector-curvature="0" style="fill:#ffffff;fill-rule:evenodd"/>
-  <path d="m 655.30711,449.12856 4,0 c 3,0 3,-5 0,-5 l -4,0" id="path11147" inkscape:connector-curvature="0" sodipodi:nodetypes="cccc" style="fill:none;stroke:#383838;stroke-width:1.00000012px;stroke-linecap:round"/>
-  <path d="m 658.05711,449.27146 0,-5.1429" id="path11149" inkscape:connector-curvature="0" style="fill:none;stroke:#383838;stroke-width:1.00000012px"/>
-  <path d="M 851.4754,45 849,42 851,42 851,27 852,27 852,42 854,42 851.4754,45 Z" id="use11151" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc" style="fill:#5a5a5a;fill-rule:evenodd" transform="matrix(1,0,0,1,-201,405)"/>
-  <path d="m 657.49703,433.49703 -0.0854,7.5 m 2.5854,-6 0,4.20941 -1.5,-1.70941 -3,0.0234 c -0.5,-0.0234 -1,-0.52344 -1,-1.02344 l 0,-1 m 7.72791,2.00004 0.77209,-0.5 m -2.00274,-3.5 1.00274,0 0,7.5 -0.98202,-0.0207" id="path11153" inkscape:connector-curvature="0" style="color:#000000;solid-opacity:1;fill:none;stroke:#383838;stroke-width:1.00000012px;stroke-linecap:round;stroke-linejoin:round"/>
-</g>
 
+  <!-- Note "format-text-direction-rtl" is the GTK icon name but we want to use our own. -->
+  <g id="format-text-direction-r2l" inkscape:label="#writing_mode_rl">
+
+    <!-- Background -->
+    <path d="m 1,1 h 22 l 1,1 v 20 l -2,2 h -20 l -1,-1 z" style="fill:black;fill-opacity:0.0667" />
+    <rect x="0.5" y="0.5" width="21" height="21"  style="fill:url(#linearGradientA);stroke:black;stroke-linejoin:round" />
+    <path d="m 2,21 h -1 v -20 h 20 v 1 h -19 z" style="fill:white" />
+
+    <!-- Glyphs -->
+    <path d="m 11.3,19.1 h 4 c 3,0 3,-5 0,-5 h -4" style="fill:none;stroke:#383838;stroke-linecap:round"/>
+    <path d="m 14.1,19.3 v -5.2" style="fill:none;stroke:#383838"/>
+    <path d="m 13.5,3.5 -0.1,7.5 m 2.6,-6 v 4.2 l -1.5,-1.7 h -3 c -0.5,0 -1,-0.5 -1,-1 v -1 m 7.7,2 0.8,-0.5 m -2,-3.5 h 1 v 7.5 h -1"
+	  style="fill:none;stroke:#383838;stroke-linecap:round;stroke-linejoin:round" />
+
+    <!-- Arrow -->
+    <path d="m 6.5,20 -2.5,-3 h 2 v -15 h 1 v 15 h 2 z" style="fill:#5a5a5a"/>
+  </g>
 </svg>
diff --git a/share/icons/text-orientation-upright.svg b/share/icons/text-orientation-upright.svg
index 5092b267b..222a3d518 100644
--- a/share/icons/text-orientation-upright.svg
+++ b/share/icons/text-orientation-upright.svg
@@ -1,45 +1,37 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg1"
    width="24"
    height="24"
   >
-  <sodipodi:namedview
-     id="base"
-     showgrid="true"
-     gridspacingy="1pt"
-     gridspacingx="1pt"
-     gridoriginy="0pt"
-     gridoriginx="0pt"
-  />
-  <defs id="defs3">
-
-    <linearGradient gradientTransform="translate(-226,405)" gradientUnits="userSpaceOnUse" id="linearGradient11127" inkscape:collect="always" x1="860.239" x2="843.9635" xlink:href="#linearGradient6524" y1="45.30668" y2="28.96459"/>
-    <linearGradient id="linearGradient6524">
-      <stop id="stop6526" offset="0" style="stop-color:#ffffff;stop-opacity:1"/>
-      <stop id="stop6528" offset="1" style="stop-color:#e2e1e1;stop-opacity:1"/>
+  <defs>
+    <linearGradient id="linearGradientA"
+		    xlink:href="#linearGradientVector"
+		    gradientUnits="userSpaceOnUse"
+		    x1="30" x2="4" y1="25" y2="4" />
+    <linearGradient id="linearGradientVector">
+      <stop offset="0" style="stop-color:#ffffff"/>
+      <stop offset="1" style="stop-color:#e2e1e1"/>
     </linearGradient>
   </defs>
-<g id="text-orientation-upright" inkscape:label="#text_orientation_upright" transform="translate(-614,-430)">
-  <path d="m 615,431 22,0 1,1 0,20 -2,2 -20,0 -1,-1 0,-22 z" id="path11105" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc" style="color:#000000;fill:#000000;fill-opacity:0.06666673;fill-rule:evenodd"/>
-  <path d="m 614,431 1,0 0,20 -1,0 0,-20 z" id="path11107" inkscape:connector-curvature="0" style="color:#000000;fill:#000000;fill-rule:evenodd"/>
-  <rect height="20" id="rect11109" style="color:#000000;fill:#000000;fill-rule:evenodd" width="1" x="635" y="431"/>
-  <rect height="20" id="rect11111" style="color:#000000;fill:#000000;fill-rule:evenodd" transform="matrix(0,-1,1,0,0,0)" width="1" x="-431" y="615"/>
-  <rect height="20" id="rect11113" style="color:#000000;fill:#000000;fill-rule:evenodd" transform="matrix(0,-1,1,0,0,0)" width="1" x="-452" y="615"/>
-  <rect height="20" id="rect11115" style="color:#000000;fill:url(#linearGradient11127);fill-rule:evenodd" width="20" x="615" y="431"/>
-  <path d="m 616,451 -1,0 0,-20 20,0 0,1 -19,0 0,19 z" id="path11117" inkscape:connector-curvature="0" style="fill:#ffffff;fill-rule:evenodd"/>
-  <path d="m 630.92855,449.75 0,-4 c 0,-3 -5,-3 -5,0 l 0,4" id="path11119" inkscape:connector-curvature="0" sodipodi:nodetypes="cccc" style="fill:none;stroke:#383838;stroke-width:1.00000012px;stroke-linecap:round"/>
-  <path d="m 631.07145,447 -5.1429,0" id="path11121" inkscape:connector-curvature="0" style="fill:none;stroke:#383838;stroke-width:1.00000012px"/>
-  <path d="M 851.4754,45 849,42 851,42 851,27 852,27 852,42 854,42 851.4754,45 Z" id="use11123" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccc" style="fill:#5a5a5a;fill-rule:evenodd" transform="matrix(1,0,0,1,-231,405)"/>
-  <path d="m 625,438.5 7.5,0.0854 m -6,-2.5854 4.20941,0 -1.70941,1.5 0.0234,3 c -0.0234,0.5 -0.52344,1 -1.02344,1 l -1,0 m 2.00004,-7.72791 -0.5,-0.77209 m -3.5,2.00274 0,-1.00274 7.5,0 -0.0207,0.98202" id="path11125" inkscape:connector-curvature="0" style="color:#000000;solid-opacity:1;fill:none;stroke:#383838;stroke-width:1.00000012px;stroke-linecap:round;stroke-linejoin:round"/>
-</g>
 
+  <!-- Note "format-text-direction-rtl" is the GTK icon name but we want to use our own. -->
+  <g id="format-text-direction-r2l" inkscape:label="#writing_mode_rl">
+
+    <!-- Background -->
+    <path d="m 1,1 h 22 l 1,1 v 20 l -2,2 h -20 l -1,-1 z" style="fill:black;fill-opacity:0.0667" />
+    <rect x="0.5" y="0.5" width="21" height="21"  style="fill:url(#linearGradientA);stroke:black;stroke-linejoin:round" />
+    <path d="m 2,21 h -1 v -20 h 20 v 1 h -19 z" style="fill:white" />
+
+    <!-- Glyphs -->
+    <path d="m 16.9,19.8 v -4 c 0,-3 -5,-3 -5,0 v 4" style="fill:none;stroke:#383838;stroke-linecap:round"/>
+    <path d="m 17.1,17 h -5.2" style="fill:none;stroke:#383838" />
+    <path d="m 11,8.5 7.5,0.1 m -6,-2.6 h 4.2 l -1.7,1.5 v 3 c 0,0.5 -0.5,1 -1,1 h -1 m 2,-7.7 -0.5,-0.8 m -3.5,2 v -1 h 7.5 v 1"
+	  style="fill:none;stroke:#383838;stroke-linecap:round;stroke-linejoin:round" />
+
+    <!-- Arrow -->
+    <path d="m 6.5,20 -2.5,-3 h 2 v -15 h 1 v 15 h 2 z" style="fill:#5a5a5a"/>
+  </g>
 </svg>
diff --git a/share/keys/default.xml b/share/keys/default.xml
index 134251752..9a072d9da 100644
--- a/share/keys/default.xml
+++ b/share/keys/default.xml
@@ -11,7 +11,9 @@ source locally, you can view that file at:
   http://git.gnome.org/browse/gtk+/plain/gdk/gdkkeysyms.h
 
 - The "modifiers" attribute contains a comma-separated list of modifiers, which can be
-one or more of: "Ctrl", "Shift", "Alt".
+one or more of: "Ctrl", "Shift", "Alt", "Meta", "Super", "Hyper", or "Primary".
+
+"Primary" means Meta on Apple and Primary everywhere else, it's recommended over the use of Ctrl.
 
 - The "action" attribute contains the name of the action. The complete list of actions
 (called "verbs") is in the file src/verbs.cpp in Inkscape source; there you can see
@@ -41,42 +43,42 @@ override) the bindings in the main default.xml.
 
 <!-- File -->
 
-  <bind key="n" modifiers="Ctrl" action="FileNew" display="true" />
-  <bind key="N" modifiers="Ctrl" action="FileNew" />
+  <bind key="n" modifiers="Primary" action="FileNew" display="true" />
+  <bind key="N" modifiers="Primary" action="FileNew" />
 
-  <bind key="n" modifiers="Ctrl,Alt" action="FileTemplates" display="true" />
-  <bind key="N" modifiers="Ctrl,Alt" action="FileTemplates" />
+  <bind key="n" modifiers="Primary,Alt" action="FileTemplates" display="true" />
+  <bind key="N" modifiers="Primary,Alt" action="FileTemplates" />
 
-  <bind key="o" modifiers="Ctrl" action="FileOpen" display="true" />
-  <bind key="O" modifiers="Ctrl" action="FileOpen" />
+  <bind key="o" modifiers="Primary" action="FileOpen" display="true" />
+  <bind key="O" modifiers="Primary" action="FileOpen" />
 
   <bind action="FileRevert" />
 
-  <bind key="s" modifiers="Ctrl" action="FileSave" display="true" />
-  <bind key="S" modifiers="Ctrl" action="FileSave" />
+  <bind key="s" modifiers="Primary" action="FileSave" display="true" />
+  <bind key="S" modifiers="Primary" action="FileSave" />
 
-  <bind key="s" modifiers="Ctrl,Shift" action="FileSaveAs" display="true" />
-  <bind key="S" modifiers="Ctrl,Shift" action="FileSaveAs" />
+  <bind key="s" modifiers="Primary,Shift" action="FileSaveAs" display="true" />
+  <bind key="S" modifiers="Primary,Shift" action="FileSaveAs" />
 
-  <bind key="s" modifiers="Ctrl,Shift,Alt" action="FileSaveACopy" display="true" />
-  <bind key="S" modifiers="Ctrl,Shift,Alt" action="FileSaveACopy" />
+  <bind key="s" modifiers="Primary,Shift,Alt" action="FileSaveACopy" display="true" />
+  <bind key="S" modifiers="Primary,Shift,Alt" action="FileSaveACopy" />
 
-  <bind key="p" modifiers="Ctrl" action="FilePrint" display="true" />
-  <bind key="P" modifiers="Ctrl" action="FilePrint" />
+  <bind key="p" modifiers="Primary" action="FilePrint" display="true" />
+  <bind key="P" modifiers="Primary" action="FilePrint" />
 
-  <bind key="i" modifiers="Ctrl" action="FileImport" display="true" />
-  <bind key="I" modifiers="Ctrl" action="FileImport" />
+  <bind key="i" modifiers="Primary" action="FileImport" display="true" />
+  <bind key="I" modifiers="Primary" action="FileImport" />
 
-  <bind key="e" modifiers="Ctrl,Shift" action="DialogExport" display="true" />
-  <bind key="E" modifiers="Ctrl,Shift" action="DialogExport" />
+  <bind key="e" modifiers="Primary,Shift" action="DialogExport" display="true" />
+  <bind key="E" modifiers="Primary,Shift" action="DialogExport" />
 
   <bind action="FileVacuum" />
 
-  <bind key="w" modifiers="Ctrl" action="FileClose" display="true" />
-  <bind key="W" modifiers="Ctrl" action="FileClose" />
+  <bind key="w" modifiers="Primary" action="FileClose" display="true" />
+  <bind key="W" modifiers="Primary" action="FileClose" />
 
-  <bind key="q" modifiers="Ctrl" action="FileQuit" display="true" />
-  <bind key="Q" modifiers="Ctrl" action="FileQuit" />
+  <bind key="q" modifiers="Primary" action="FileQuit" display="true" />
+  <bind key="Q" modifiers="Primary" action="FileQuit" />
 
 <!-- Tools -->
 
@@ -152,7 +154,7 @@ override) the bindings in the main default.xml.
 
   <bind action="PenPrefs" />
 
-  <bind key="F6" modifiers="Ctrl" action="ToolCalligraphic" display="true" />
+  <bind key="F6" modifiers="Primary" action="ToolCalligraphic" display="true" />
   <bind key="c" action="ToolCalligraphic" />
   <bind key="C" action="ToolCalligraphic" />
 
@@ -174,13 +176,13 @@ override) the bindings in the main default.xml.
 
   <bind action="TextPrefs" />
 
-  <bind key="F1" modifiers="Ctrl" action="ToolGradient" display="true" />
+  <bind key="F1" modifiers="Primary" action="ToolGradient" display="true" />
   <bind key="g" action="ToolGradient" />
   <bind key="G" action="ToolGradient" />
 
   <bind action="GradientPrefs" />
 
-  <bind key="F2" modifiers="Ctrl" action="ToolConnector" display="true" />
+  <bind key="F2" modifiers="Primary" action="ToolConnector" display="true" />
   <bind key="o" action="ToolConnector" />
   <bind key="O" action="ToolConnector" />
 
@@ -232,8 +234,8 @@ override) the bindings in the main default.xml.
   <bind key="6" modifiers="Shift" action="ZoomPageWidth" />
   <bind key="KP_6" action="ZoomPageWidth" />
 
-  <bind key="e" modifiers="Ctrl" action="ZoomPageWidth" />
-  <bind key="E" modifiers="Ctrl" action="ZoomPageWidth" />
+  <bind key="e" modifiers="Primary" action="ZoomPageWidth" />
+  <bind key="E" modifiers="Primary" action="ZoomPageWidth" />
 
   <bind key="grave" modifiers="Shift" action="ZoomNext" display="true" /> <!-- ` -->
   <bind key="asciitilde" modifiers="Shift" action="ZoomNext" /> <!-- ~ -->
@@ -245,12 +247,12 @@ override) the bindings in the main default.xml.
 
   <bind key="F11" action="FullScreen" display="true" /> 
   <bind key="F11" action="FocusToggle" modifiers="Shift" display="true" /> 
-  <bind key="F11" action="FullScreenFocus" modifiers="Ctrl" display="true" /> 
+  <bind key="F11" action="FullScreenFocus" modifiers="Primary" display="true" /> 
 
-  <bind key="Tab" modifiers="Ctrl" action="NextWindow" display="true" />
-  <bind key="ISO_Left_Tab" modifiers="Ctrl" action="NextWindow" />
-  <bind key="Tab" modifiers="Ctrl,Shift" action="PrevWindow" display="true" />
-  <bind key="ISO_Left_Tab" modifiers="Ctrl,Shift" action="PrevWindow" />
+  <bind key="Tab" modifiers="Primary" action="NextWindow" display="true" />
+  <bind key="ISO_Left_Tab" modifiers="Primary" action="NextWindow" />
+  <bind key="Tab" modifiers="Primary,Shift" action="PrevWindow" display="true" />
+  <bind key="ISO_Left_Tab" modifiers="Primary,Shift" action="PrevWindow" />
 
   <bind key="numbersign" modifiers="Shift" action="ToggleGrid" /> <!-- # -->
   <bind key="numbersign" action="ToggleGrid" display="true" />
@@ -266,11 +268,11 @@ override) the bindings in the main default.xml.
   <bind action="ToggleToolToolbar" />
   <bind action="ToggleToolbox" />
 
-  <bind key="r" modifiers="Ctrl" action="ToggleRulers" display="true" />
-  <bind key="R" modifiers="Ctrl" action="ToggleRulers" />
+  <bind key="r" modifiers="Primary" action="ToggleRulers" display="true" />
+  <bind key="R" modifiers="Primary" action="ToggleRulers" />
 
-  <bind key="b" modifiers="Ctrl" action="ToggleScrollbars" display="true" />
-  <bind key="B" modifiers="Ctrl" action="ToggleScrollbars" />
+  <bind key="b" modifiers="Primary" action="ToggleScrollbars" display="true" />
+  <bind key="B" modifiers="Primary" action="ToggleScrollbars" />
 
   <bind key="p" modifiers="Shift,Alt" action="TogglePalette" display="true" />
   <bind key="P" modifiers="Shift,Alt" action="TogglePalette" />
@@ -281,8 +283,8 @@ override) the bindings in the main default.xml.
   <bind action="ViewNewPreview" />
   <bind action="ViewIconPreview" />
 
-  <bind key="KP_5" modifiers="Ctrl" action="ViewModeToggle" display="true" />
-  <bind key="KP_Begin" modifiers="Ctrl" action="ViewModeToggle" />
+  <bind key="KP_5" modifiers="Primary" action="ViewModeToggle" display="true" />
+  <bind key="KP_Begin" modifiers="Primary" action="ViewModeToggle" />
 
   <bind action="ViewModeNormal" />
   <bind action="ViewModeNoFilters" />
@@ -295,35 +297,35 @@ override) the bindings in the main default.xml.
 
 <!-- Edit -->
   
-  <bind key="z" modifiers="Ctrl" action="EditUndo" display="true" />
-  <bind key="Z" modifiers="Ctrl" action="EditUndo" />
-  <!--Do not put in Ctrl,Shift+Y, already used-->
+  <bind key="z" modifiers="Primary" action="EditUndo" display="true" />
+  <bind key="Z" modifiers="Primary" action="EditUndo" />
+  <!--Do not put in Primary,Shift+Y, already used-->
 
-  <bind key="z" modifiers="Ctrl,Shift" action="EditRedo" display="true" />
-  <bind key="Z" modifiers="Ctrl,Shift" action="EditRedo" />
-  <bind key="y" modifiers="Ctrl" action="EditRedo" />
-  <bind key="Y" modifiers="Ctrl" action="EditRedo" />
+  <bind key="z" modifiers="Primary,Shift" action="EditRedo" display="true" />
+  <bind key="Z" modifiers="Primary,Shift" action="EditRedo" />
+  <bind key="y" modifiers="Primary" action="EditRedo" />
+  <bind key="Y" modifiers="Primary" action="EditRedo" />
 
-  <bind key="h" modifiers="Ctrl,Shift" action="DialogUndoHistory" display="true" />
-  <bind key="H" modifiers="Ctrl,Shift" action="DialogUndoHistory" />
+  <bind key="h" modifiers="Primary,Shift" action="DialogUndoHistory" display="true" />
+  <bind key="H" modifiers="Primary,Shift" action="DialogUndoHistory" />
 
-  <bind key="x" modifiers="Ctrl" action="EditCut" display="true" />
-  <bind key="X" modifiers="Ctrl" action="EditCut" />
+  <bind key="x" modifiers="Primary" action="EditCut" display="true" />
+  <bind key="X" modifiers="Primary" action="EditCut" />
   <bind key="Delete" modifiers="Shift" action="EditCut"/>
   
-  <bind key="c" modifiers="Ctrl" action="EditCopy" display="true" />
-  <bind key="C" modifiers="Ctrl" action="EditCopy" />
-  <bind key="Insert" modifiers="Ctrl" action="EditCopy"/>
+  <bind key="c" modifiers="Primary" action="EditCopy" display="true" />
+  <bind key="C" modifiers="Primary" action="EditCopy" />
+  <bind key="Insert" modifiers="Primary" action="EditCopy"/>
 
-  <bind key="v" modifiers="Ctrl" action="EditPaste" display="true" />
-  <bind key="V" modifiers="Ctrl" action="EditPaste" />
+  <bind key="v" modifiers="Primary" action="EditPaste" display="true" />
+  <bind key="V" modifiers="Primary" action="EditPaste" />
   <bind key="Insert" modifiers="Shift" action="EditPaste"/>
 
-  <bind key="v" modifiers="Ctrl,Shift" action="EditPasteStyle" display="true" />
-  <bind key="V" modifiers="Ctrl,Shift" action="EditPasteStyle" />
+  <bind key="v" modifiers="Primary,Shift" action="EditPasteStyle" display="true" />
+  <bind key="V" modifiers="Primary,Shift" action="EditPasteStyle" />
 
-  <bind key="v" modifiers="Ctrl,Alt" action="EditPasteInPlace" display="true" />
-  <bind key="V" modifiers="Ctrl,Alt" action="EditPasteInPlace" />
+  <bind key="v" modifiers="Primary,Alt" action="EditPasteInPlace" display="true" />
+  <bind key="V" modifiers="Primary,Alt" action="EditPasteInPlace" />
 
   <bind action="EditPasteSize" />
   <bind action="EditPasteWidth" />
@@ -336,8 +338,8 @@ override) the bindings in the main default.xml.
   <bind key="KP_Delete" action="EditDelete" />
   <bind key="BackSpace" action="EditDelete" />
 
-  <bind key="d" modifiers="Ctrl" action="EditDuplicate" display="true" />
-  <bind key="D" modifiers="Ctrl" action="EditDuplicate" />
+  <bind key="d" modifiers="Primary" action="EditDuplicate" display="true" />
+  <bind key="D" modifiers="Primary" action="EditDuplicate" />
 
   <bind key="d" modifiers="Alt" action="EditClone" display="true" />
   <bind key="D" modifiers="Alt" action="EditClone" />
@@ -352,13 +354,13 @@ override) the bindings in the main default.xml.
 
   <bind action="EditCloneOriginalPathLPE" />
 
-  <bind key="a" modifiers="Ctrl" action="EditSelectAll" display="true" />
-  <bind key="A" modifiers="Ctrl" action="EditSelectAll" />
+  <bind key="a" modifiers="Primary" action="EditSelectAll" display="true" />
+  <bind key="A" modifiers="Primary" action="EditSelectAll" />
 
   <bind action="EditClearAll" />
 
-  <bind key="a" modifiers="Ctrl,Alt" action="EditSelectAllInAllLayers" display="true" />
-  <bind key="A" modifiers="Ctrl,Alt" action="EditSelectAllInAllLayers" />
+  <bind key="a" modifiers="Primary,Alt" action="EditSelectAllInAllLayers" display="true" />
+  <bind key="A" modifiers="Primary,Alt" action="EditSelectAllInAllLayers" />
 
   <bind action="EditSelectSameFillStroke" />  
   <bind action="EditSelectSameFillColor" />  
@@ -385,8 +387,8 @@ override) the bindings in the main default.xml.
 
   <bind action="EditSwapFillStroke" display="true" />
 
-  <bind key="r" modifiers="Ctrl,Shift" action="FitCanvasToSelectionOrDrawing" display="true" />
-  <bind key="R" modifiers="Ctrl,Shift" action="FitCanvasToSelectionOrDrawing" display="true" />
+  <bind key="r" modifiers="Primary,Shift" action="FitCanvasToSelectionOrDrawing" display="true" />
+  <bind key="R" modifiers="Primary,Shift" action="FitCanvasToSelectionOrDrawing" display="true" />
 
   <!-- Objects/selection -->
 
@@ -414,8 +416,8 @@ override) the bindings in the main default.xml.
   <bind key="comma" modifiers="Alt" action="SelectionShrinkScreen" />
   <bind key="less" modifiers="Alt" action="SelectionShrinkScreen" />
   
-  <bind key="comma" modifiers="Ctrl" action="SelectionShrinkHalve" />
-  <bind key="less" modifiers="Ctrl" action="SelectionShrinkHalve" />
+  <bind key="comma" modifiers="Primary" action="SelectionShrinkHalve" />
+  <bind key="less" modifiers="Primary" action="SelectionShrinkHalve" />
   
   <bind key="period" action="SelectionGrow" display="true" />
   <bind key="greater" action="SelectionGrow" />
@@ -423,18 +425,18 @@ override) the bindings in the main default.xml.
   <bind key="period" modifiers="Alt" action="SelectionGrowScreen" />
   <bind key="greater" modifiers="Alt" action="SelectionGrowScreen" />
   
-  <bind key="period" modifiers="Ctrl" action="SelectionGrowDouble" />
-  <bind key="greater" modifiers="Ctrl" action="SelectionGrowDouble" />
+  <bind key="period" modifiers="Primary" action="SelectionGrowDouble" />
+  <bind key="greater" modifiers="Primary" action="SelectionGrowDouble" />
 
-  <bind key="g" modifiers="Ctrl" action="SelectionGroup" display="true" />
-  <bind key="G" modifiers="Ctrl" action="SelectionGroup" />
-  <bind key="u" modifiers="Ctrl,Shift" action="SelectionGroup" />
-  <bind key="U" modifiers="Ctrl,Shift" action="SelectionGroup" />
+  <bind key="g" modifiers="Primary" action="SelectionGroup" display="true" />
+  <bind key="G" modifiers="Primary" action="SelectionGroup" />
+  <bind key="u" modifiers="Primary,Shift" action="SelectionGroup" />
+  <bind key="U" modifiers="Primary,Shift" action="SelectionGroup" />
 
-  <bind key="g" modifiers="Ctrl,Shift" action="SelectionUnGroup" display="true" />
-  <bind key="G" modifiers="Ctrl,Shift" action="SelectionUnGroup" />
-  <bind key="u" modifiers="Ctrl" action="SelectionUnGroup" />
-  <bind key="U" modifiers="Ctrl" action="SelectionUnGroup" />
+  <bind key="g" modifiers="Primary,Shift" action="SelectionUnGroup" display="true" />
+  <bind key="G" modifiers="Primary,Shift" action="SelectionUnGroup" />
+  <bind key="u" modifiers="Primary" action="SelectionUnGroup" />
+  <bind key="U" modifiers="Primary" action="SelectionUnGroup" />
 
   <bind key="b" modifiers="Alt" action="SelectionCreateBitmap" display="true" />
   <bind key="B" modifiers="Alt" action="SelectionCreateBitmap" />
@@ -471,46 +473,46 @@ override) the bindings in the main default.xml.
 
 <!-- Path -->
 
-  <bind key="c" modifiers="Ctrl,Shift" action="ObjectToPath" display="true" />
-  <bind key="C" modifiers="Ctrl,Shift" action="ObjectToPath" />
+  <bind key="c" modifiers="Primary,Shift" action="ObjectToPath" display="true" />
+  <bind key="C" modifiers="Primary,Shift" action="ObjectToPath" />
 
-  <bind key="c" modifiers="Ctrl,Alt" action="StrokeToPath" display="true" />
-  <bind key="C" modifiers="Ctrl,Alt" action="StrokeToPath" />
+  <bind key="c" modifiers="Primary,Alt" action="StrokeToPath" display="true" />
+  <bind key="C" modifiers="Primary,Alt" action="StrokeToPath" />
 
-  <bind key="k" modifiers="Ctrl" action="SelectionCombine" display="true" />
-  <bind key="K" modifiers="Ctrl" action="SelectionCombine" />
+  <bind key="k" modifiers="Primary" action="SelectionCombine" display="true" />
+  <bind key="K" modifiers="Primary" action="SelectionCombine" />
 
-  <bind key="k" modifiers="Ctrl,Shift" action="SelectionBreakApart" display="true" />
-  <bind key="K" modifiers="Ctrl,Shift" action="SelectionBreakApart" />
+  <bind key="k" modifiers="Primary,Shift" action="SelectionBreakApart" display="true" />
+  <bind key="K" modifiers="Primary,Shift" action="SelectionBreakApart" />
 
-  <bind key="plus" modifiers="Ctrl" action="SelectionUnion" display="true" />
-  <bind key="KP_Add" modifiers="Ctrl" action="SelectionUnion" />
-  <bind key="plus" modifiers="Ctrl,Shift" action="SelectionUnion" />
+  <bind key="plus" modifiers="Primary" action="SelectionUnion" display="true" />
+  <bind key="KP_Add" modifiers="Primary" action="SelectionUnion" />
+  <bind key="plus" modifiers="Primary,Shift" action="SelectionUnion" />
 
-  <bind key="asterisk" modifiers="Ctrl" action="SelectionIntersect" display="true" />
-  <bind key="KP_Multiply" modifiers="Ctrl" action="SelectionIntersect" />
-  <bind key="asterisk" modifiers="Ctrl,Shift" action="SelectionIntersect" />
+  <bind key="asterisk" modifiers="Primary" action="SelectionIntersect" display="true" />
+  <bind key="KP_Multiply" modifiers="Primary" action="SelectionIntersect" />
+  <bind key="asterisk" modifiers="Primary,Shift" action="SelectionIntersect" />
 
-  <bind key="minus" modifiers="Ctrl" action="SelectionDiff" display="true" />
-  <bind key="underscore" modifiers="Ctrl" action="SelectionDiff" />
-  <bind key="underscore" modifiers="Ctrl,Shift" action="SelectionDiff" />
-  <bind key="KP_Subtract" modifiers="Ctrl" action="SelectionDiff" />
-  <bind key="minus" modifiers="Ctrl,Shift" action="SelectionDiff" />
+  <bind key="minus" modifiers="Primary" action="SelectionDiff" display="true" />
+  <bind key="underscore" modifiers="Primary" action="SelectionDiff" />
+  <bind key="underscore" modifiers="Primary,Shift" action="SelectionDiff" />
+  <bind key="KP_Subtract" modifiers="Primary" action="SelectionDiff" />
+  <bind key="minus" modifiers="Primary,Shift" action="SelectionDiff" />
 
-  <bind key="asciicircum" modifiers="Ctrl" action="SelectionSymDiff" display="true" /> <!-- ^ -->
-  <bind key="asciicircum" modifiers="Ctrl,Shift" action="SelectionSymDiff" />
+  <bind key="asciicircum" modifiers="Primary" action="SelectionSymDiff" display="true" /> <!-- ^ -->
+  <bind key="asciicircum" modifiers="Primary,Shift" action="SelectionSymDiff" />
 
-  <bind key="slash" modifiers="Ctrl,Alt" action="SelectionCutPath" display="true" />
-  <bind key="slash" modifiers="Ctrl,Alt,Shift" action="SelectionCutPath" />
+  <bind key="slash" modifiers="Primary,Alt" action="SelectionCutPath" display="true" />
+  <bind key="slash" modifiers="Primary,Alt,Shift" action="SelectionCutPath" />
 
-  <bind key="slash" modifiers="Ctrl" action="SelectionDivide" display="true" />
-  <bind key="KP_Divide" modifiers="Ctrl" action="SelectionDivide" />
-  <bind key="slash" modifiers="Ctrl,Shift" action="SelectionDivide" />
+  <bind key="slash" modifiers="Primary" action="SelectionDivide" display="true" />
+  <bind key="KP_Divide" modifiers="Primary" action="SelectionDivide" />
+  <bind key="slash" modifiers="Primary,Shift" action="SelectionDivide" />
 
-  <bind key="parenright" modifiers="Ctrl" action="SelectionOffset" display="true" />
-  <bind key="parenright" modifiers="Ctrl,Shift" action="SelectionOffset" />
-  <bind key="0" modifiers="Ctrl,Shift" action="SelectionOffset" />
-  <bind key="0" modifiers="Ctrl" action="SelectionOffset" />
+  <bind key="parenright" modifiers="Primary" action="SelectionOffset" display="true" />
+  <bind key="parenright" modifiers="Primary,Shift" action="SelectionOffset" />
+  <bind key="0" modifiers="Primary,Shift" action="SelectionOffset" />
+  <bind key="0" modifiers="Primary" action="SelectionOffset" />
   
   <bind key="parenright" modifiers="Alt" action="SelectionOffsetScreen" display="true" />
   <bind key="0" modifiers="Alt" action="SelectionOffsetScreen" />
@@ -518,10 +520,10 @@ override) the bindings in the main default.xml.
   <bind key="parenright" modifiers="Alt,Shift" action="SelectionOffsetScreen10" display="true" />
   <bind key="0" modifiers="Alt,Shift" action="SelectionOffsetScreen10" />
 
-  <bind key="parenleft" modifiers="Ctrl" action="SelectionInset" display="true" />
-  <bind key="parenleft" modifiers="Ctrl,Shift" action="SelectionInset" />
-  <bind key="9" modifiers="Ctrl,Shift" action="SelectionInset" />
-  <bind key="9" modifiers="Ctrl" action="SelectionInset" />
+  <bind key="parenleft" modifiers="Primary" action="SelectionInset" display="true" />
+  <bind key="parenleft" modifiers="Primary,Shift" action="SelectionInset" />
+  <bind key="9" modifiers="Primary,Shift" action="SelectionInset" />
+  <bind key="9" modifiers="Primary" action="SelectionInset" />
 
   <bind key="parenleft" modifiers="Alt" action="SelectionInsetScreen" display="true" />
   <bind key="9" modifiers="Alt" action="SelectionInsetScreen" />
@@ -529,14 +531,14 @@ override) the bindings in the main default.xml.
   <bind key="parenleft" modifiers="Alt,Shift" action="SelectionInsetScreen10" display="true" />
   <bind key="9" modifiers="Alt,Shift" action="SelectionInsetScreen10" />
 
-  <bind key="j" modifiers="Ctrl" action="SelectionDynOffset" display="true" />
-  <bind key="J" modifiers="Ctrl" action="SelectionDynOffset" />
+  <bind key="j" modifiers="Primary" action="SelectionDynOffset" display="true" />
+  <bind key="J" modifiers="Primary" action="SelectionDynOffset" />
 
-  <bind key="j" modifiers="Ctrl,Alt" action="SelectionLinkedOffset" display="true" />
-  <bind key="J" modifiers="Ctrl,Alt" action="SelectionLinkedOffset" />
+  <bind key="j" modifiers="Primary,Alt" action="SelectionLinkedOffset" display="true" />
+  <bind key="J" modifiers="Primary,Alt" action="SelectionLinkedOffset" />
 
-  <bind key="l" modifiers="Ctrl" action="SelectionSimplify" display="true" />
-  <bind key="L" modifiers="Ctrl" action="SelectionSimplify" />
+  <bind key="l" modifiers="Primary" action="SelectionSimplify" display="true" />
+  <bind key="L" modifiers="Primary" action="SelectionSimplify" />
 
   <bind action="SelectionReverse" />
 
@@ -554,32 +556,32 @@ override) the bindings in the main default.xml.
   <bind action="ObjectFlowtextToText" />
   <bind action="SelectionTextRemoveKerns" />
 
-  <bind key="k" modifiers="Ctrl,Alt" action="DialogSpellcheck" display="true" />
-  <bind key="K" modifiers="Ctrl,Alt" action="DialogSpellcheck" />
+  <bind key="k" modifiers="Primary,Alt" action="DialogSpellcheck" display="true" />
+  <bind key="K" modifiers="Primary,Alt" action="DialogSpellcheck" />
 
 <!-- Layers -->
 
-  <bind key="N" modifiers="Ctrl,Shift" action="LayerNew" display="true" />
-  <bind key="n" modifiers="Ctrl,Shift" action="LayerNew" />
+  <bind key="N" modifiers="Primary,Shift" action="LayerNew" display="true" />
+  <bind key="n" modifiers="Primary,Shift" action="LayerNew" />
 
   <bind action="LayerRename" />
-  <bind key="Page_Up" modifiers="Ctrl" action="LayerNext" display="true" />
-  <bind key="KP_Page_Up" modifiers="Ctrl" action="LayerNext" />
-  <bind key="Page_Down" modifiers="Ctrl" action="LayerPrev" display="true" />
-  <bind key="KP_Page_Down" modifiers="Ctrl" action="LayerPrev" />
+  <bind key="Page_Up" modifiers="Primary" action="LayerNext" display="true" />
+  <bind key="KP_Page_Up" modifiers="Primary" action="LayerNext" />
+  <bind key="Page_Down" modifiers="Primary" action="LayerPrev" display="true" />
+  <bind key="KP_Page_Down" modifiers="Primary" action="LayerPrev" />
   <bind action="LayerDelete" />
 
-  <bind key="Page_Up" modifiers="Ctrl,Shift" action="LayerRaise" display="true" />
-  <bind key="KP_Page_Up" modifiers="Ctrl,Shift" action="LayerRaise" />
+  <bind key="Page_Up" modifiers="Primary,Shift" action="LayerRaise" display="true" />
+  <bind key="KP_Page_Up" modifiers="Primary,Shift" action="LayerRaise" />
 
-  <bind key="Page_Down" modifiers="Ctrl,Shift" action="LayerLower" display="true" />
-  <bind key="KP_Page_Down" modifiers="Ctrl,Shift" action="LayerLower" />
+  <bind key="Page_Down" modifiers="Primary,Shift" action="LayerLower" display="true" />
+  <bind key="KP_Page_Down" modifiers="Primary,Shift" action="LayerLower" />
 
-  <bind key="Home" modifiers="Ctrl,Shift" action="LayerToTop" display="true" />
-  <bind key="KP_Home" modifiers="Ctrl,Shift" action="LayerToTop" />
+  <bind key="Home" modifiers="Primary,Shift" action="LayerToTop" display="true" />
+  <bind key="KP_Home" modifiers="Primary,Shift" action="LayerToTop" />
 
-  <bind key="End" modifiers="Ctrl,Shift" action="LayerToBottom" display="true" />
-  <bind key="KP_End" modifiers="Ctrl,Shift" action="LayerToBottom" />
+  <bind key="End" modifiers="Primary,Shift" action="LayerToBottom" display="true" />
+  <bind key="KP_End" modifiers="Primary,Shift" action="LayerToBottom" />
 
   <bind key="Page_Up" modifiers="Shift" action="LayerMoveToNext" display="true" />
   <bind key="KP_Page_Up" modifiers="Shift" action="LayerMoveToNext" />
@@ -589,8 +591,8 @@ override) the bindings in the main default.xml.
 
   <bind action="LayerMoveTo" />  
 
-  <bind key="l" modifiers="Ctrl,Shift" action="DialogLayers" display="true" />
-  <bind key="L" modifiers="Ctrl,Shift" action="DialogLayers" />  
+  <bind key="l" modifiers="Primary,Shift" action="DialogLayers" display="true" />
+  <bind key="L" modifiers="Primary,Shift" action="DialogLayers" />  
 
   <bind action="LayerDuplicate" />  
   <bind action="LayerDelete" />  
@@ -608,46 +610,46 @@ override) the bindings in the main default.xml.
 
 <!-- Dialogs -->
 
-  <bind key="x" modifiers="Ctrl,Shift" action="DialogXMLEditor" display="true" />
-  <bind key="X" modifiers="Ctrl,Shift" action="DialogXMLEditor" />
+  <bind key="x" modifiers="Primary,Shift" action="DialogXMLEditor" display="true" />
+  <bind key="X" modifiers="Primary,Shift" action="DialogXMLEditor" />
 
-  <bind key="d" modifiers="Ctrl,Shift" action="DialogDocumentProperties" display="true" />
-  <bind key="D" modifiers="Ctrl,Shift" action="DialogDocumentProperties" />
+  <bind key="d" modifiers="Primary,Shift" action="DialogDocumentProperties" display="true" />
+  <bind key="D" modifiers="Primary,Shift" action="DialogDocumentProperties" />
 
-  <bind key="a" modifiers="Ctrl,Shift" action="DialogAlignDistribute" display="true" />
-  <bind key="A" modifiers="Ctrl,Shift" action="DialogAlignDistribute" />
+  <bind key="a" modifiers="Primary,Shift" action="DialogAlignDistribute" display="true" />
+  <bind key="A" modifiers="Primary,Shift" action="DialogAlignDistribute" />
 
-  <bind key="t" modifiers="Ctrl,Shift" action="DialogText" display="true" />
-  <bind key="T" modifiers="Ctrl,Shift" action="DialogText" />
+  <bind key="t" modifiers="Primary,Shift" action="DialogText" display="true" />
+  <bind key="T" modifiers="Primary,Shift" action="DialogText" />
 
-  <bind key="p" modifiers="Ctrl,Shift" action="DialogPreferences" display="true" />
-  <bind key="P" modifiers="Ctrl,Shift" action="DialogPreferences" />
+  <bind key="p" modifiers="Primary,Shift" action="DialogPreferences" display="true" />
+  <bind key="P" modifiers="Primary,Shift" action="DialogPreferences" />
 
-  <bind key="f" modifiers="Ctrl,Shift" action="DialogFillStroke" display="true" />
-  <bind key="F" modifiers="Ctrl,Shift" action="DialogFillStroke" />
+  <bind key="f" modifiers="Primary,Shift" action="DialogFillStroke" display="true" />
+  <bind key="F" modifiers="Primary,Shift" action="DialogFillStroke" />
 
-  <bind key="f" modifiers="Ctrl" action="DialogFind" display="true" />
-  <bind key="F" modifiers="Ctrl" action="DialogFind" />
+  <bind key="f" modifiers="Primary" action="DialogFind" display="true" />
+  <bind key="F" modifiers="Primary" action="DialogFind" />
 
-  <bind key="m" modifiers="Ctrl,Shift" action="DialogTransform" display="true" />
-  <bind key="M" modifiers="Ctrl,Shift" action="DialogTransform" />
+  <bind key="m" modifiers="Primary,Shift" action="DialogTransform" display="true" />
+  <bind key="M" modifiers="Primary,Shift" action="DialogTransform" />
 
-  <bind key="o" modifiers="Ctrl,Shift" action="DialogObjectProperties" display="true" />
-  <bind key="O" modifiers="Ctrl,Shift" action="DialogObjectProperties" />
+  <bind key="o" modifiers="Primary,Shift" action="DialogObjectProperties" display="true" />
+  <bind key="O" modifiers="Primary,Shift" action="DialogObjectProperties" />
 
   <bind action="DialogObjectAttributes" />
 
-  <bind key="w" modifiers="Ctrl,Shift" action="DialogSwatches" display="true" />
-  <bind key="W" modifiers="Ctrl,Shift" action="DialogSwatches" />
+  <bind key="w" modifiers="Primary,Shift" action="DialogSwatches" display="true" />
+  <bind key="W" modifiers="Primary,Shift" action="DialogSwatches" />
 
-  <bind key="y" modifiers="Ctrl,Shift" action="DialogSymbols" display="true" />
-  <bind key="Y" modifiers="Ctrl,Shift" action="DialogSymbols" />
+  <bind key="y" modifiers="Primary,Shift" action="DialogSymbols" display="true" />
+  <bind key="Y" modifiers="Primary,Shift" action="DialogSymbols" />
 
-  <bind key="ampersand" modifiers="Ctrl,Shift" action="DialogLivePathEffect" />
-  <bind key="7" modifiers="Ctrl,Shift" action="DialogLivePathEffect" display="true" />
+  <bind key="ampersand" modifiers="Primary,Shift" action="DialogLivePathEffect" />
+  <bind key="7" modifiers="Primary,Shift" action="DialogLivePathEffect" display="true" />
 
-  <bind key="ampersand" modifiers="Ctrl" action="PasteLivePathEffect" />
-  <bind key="7" modifiers="Ctrl" action="PasteLivePathEffect" display="true" />
+  <bind key="ampersand" modifiers="Primary" action="PasteLivePathEffect" />
+  <bind key="7" modifiers="Primary" action="PasteLivePathEffect" display="true" />
 
   <bind action="RemoveLivePathEffect" />
 
@@ -659,26 +661,26 @@ override) the bindings in the main default.xml.
 
   <bind key="F12" action="DialogsToggle" display="true" />
 
-  <bind key="h" modifiers="Ctrl,Alt" action="AlignHorizontalCenter" display="true" />
-  <bind key="H" modifiers="Ctrl,Alt" action="AlignHorizontalCenter" />
+  <bind key="h" modifiers="Primary,Alt" action="AlignHorizontalCenter" display="true" />
+  <bind key="H" modifiers="Primary,Alt" action="AlignHorizontalCenter" />
 
-  <bind key="t" modifiers="Ctrl,Alt" action="AlignVerticalCenter" display="true" />
-  <bind key="T" modifiers="Ctrl,Alt" action="AlignVerticalCenter" />
+  <bind key="t" modifiers="Primary,Alt" action="AlignVerticalCenter" display="true" />
+  <bind key="T" modifiers="Primary,Alt" action="AlignVerticalCenter" />
 
-  <bind key="KP_2" modifiers="Ctrl,Alt" action="AlignVerticalBottom" display="true" />
-  <bind key="KP_2" modifiers="Ctrl,Alt" action="AlignVerticalBottom" />
+  <bind key="KP_2" modifiers="Primary,Alt" action="AlignVerticalBottom" display="true" />
+  <bind key="KP_2" modifiers="Primary,Alt" action="AlignVerticalBottom" />
 
-  <bind key="KP_4" modifiers="Ctrl,Alt" action="AlignHorizontalLeft" display="true" />
-  <bind key="KP_4" modifiers="Ctrl,Alt" action="AlignHorizontalLeft" />
+  <bind key="KP_4" modifiers="Primary,Alt" action="AlignHorizontalLeft" display="true" />
+  <bind key="KP_4" modifiers="Primary,Alt" action="AlignHorizontalLeft" />
 
-  <bind key="KP_5" modifiers="Ctrl,Alt" action="AlignVerticalHorizontalCenter" display="true" />
-  <bind key="KP_5" modifiers="Ctrl,Alt" action="AlignVerticalHorizontalCenter" />
+  <bind key="KP_5" modifiers="Primary,Alt" action="AlignVerticalHorizontalCenter" display="true" />
+  <bind key="KP_5" modifiers="Primary,Alt" action="AlignVerticalHorizontalCenter" />
 
-  <bind key="KP_6" modifiers="Ctrl,Alt" action="AlignHorizontalRight" display="true" />
-  <bind key="KP_6" modifiers="Ctrl,Alt" action="AlignHorizontalRight" />
+  <bind key="KP_6" modifiers="Primary,Alt" action="AlignHorizontalRight" display="true" />
+  <bind key="KP_6" modifiers="Primary,Alt" action="AlignHorizontalRight" />
 
-  <bind key="KP_8" modifiers="Ctrl,Alt" action="AlignVerticalTop" display="true" />
-  <bind key="KP_8" modifiers="Ctrl,Alt" action="AlignVerticalTop" />
+  <bind key="KP_8" modifiers="Primary,Alt" action="AlignVerticalTop" display="true" />
+  <bind key="KP_8" modifiers="Primary,Alt" action="AlignVerticalTop" />
 
 <!-- Help -->
 
@@ -699,15 +701,15 @@ override) the bindings in the main default.xml.
   effect id from the .inx file, for example "org.ekips.filter.addnodes" for the Add
   Nodes effect. -->
 
-  <bind key="g" modifiers="Ctrl,Alt" action="org.inkscape.typography.newglyphlayer" display="true"/>
-  <bind key="G" modifiers="Ctrl,Alt" action="org.inkscape.typography.newglyphlayer"/>
+  <bind key="g" modifiers="Primary,Alt" action="org.inkscape.typography.newglyphlayer" display="true"/>
+  <bind key="G" modifiers="Primary,Alt" action="org.inkscape.typography.newglyphlayer"/>
 
 <!-- 
-  <bind key="h" modifiers="Ctrl,Alt" action="org.inkscape.typography.previousglyphlayer" display="true"/>
-  <bind key="H" modifiers="Ctrl,Alt" action="org.inkscape.typography.previousglyphlayer"/>
+  <bind key="h" modifiers="Primary,Alt" action="org.inkscape.typography.previousglyphlayer" display="true"/>
+  <bind key="H" modifiers="Primary,Alt" action="org.inkscape.typography.previousglyphlayer"/>
  -->
  
-  <bind key="j" modifiers="Ctrl,Alt" action="org.inkscape.typography.nextglyphlayer" display="true"/>
-  <bind key="J" modifiers="Ctrl,Alt" action="org.inkscape.typography.nextglyphlayer"/>
+  <bind key="j" modifiers="Primary,Alt" action="org.inkscape.typography.nextglyphlayer" display="true"/>
+  <bind key="J" modifiers="Primary,Alt" action="org.inkscape.typography.nextglyphlayer"/>
 
 </keys>
diff --git a/src/shortcuts.cpp b/src/shortcuts.cpp
index 0cb0285f8..8a8d36d5a 100644
--- a/src/shortcuts.cpp
+++ b/src/shortcuts.cpp
@@ -625,6 +625,12 @@ static void read_shortcuts_file(char const *filename, bool const is_user_set) {
                     modifiers |= SP_SHORTCUT_HYPER_MASK;
                 } else if (!strcmp(mod, "Meta")) {
                     modifiers |= SP_SHORTCUT_META_MASK;
+                } else if (!strcmp(mod, "Primary")) {
+#ifdef __APPLE__
+                    modifiers |= SP_SHORTCUT_META_MASK;
+#else
+                    modifiers |= SP_SHORTCUT_CONTROL_MASK;
+#endif
                 } else {
                     g_warning("Unknown modifier %s for %s", mod, verb_name);
                 }