diff --git a/src/components/App.jsx b/src/components/App.jsx
index 9265b93..eda2f05 100644
--- a/src/components/App.jsx
+++ b/src/components/App.jsx
@@ -63,7 +63,7 @@ export default class App extends React.Component {
       "o": 79,
       "e": 69,
       "s": 83,
-      "p": 80,
+      "d": 68,
       "i": 73,
       "m": 77,
     }
@@ -88,13 +88,13 @@ export default class App extends React.Component {
         }
       },
       {
-        keyCode: keyCodes["s"],
+        keyCode: keyCodes["d"],
         handler: () => {
           this.toggleModal("sources");
         }
       },
       {
-        keyCode: keyCodes["p"],
+        keyCode: keyCodes["s"],
         handler: () => {
           this.toggleModal("settings");
         }
diff --git a/src/components/Toolbar.jsx b/src/components/Toolbar.jsx
index 2d85653..4e83d66 100644
--- a/src/components/Toolbar.jsx
+++ b/src/components/Toolbar.jsx
@@ -118,7 +118,7 @@ export default class Toolbar extends React.Component {
           </ToolbarAction>
           <ToolbarAction wdKey="nav:sources" onClick={this.props.onToggleModal.bind(this, 'sources')}>
             <SourcesIcon />
-            <IconText>Sources</IconText>
+            <IconText>Data Sources</IconText>
           </ToolbarAction>
           <ToolbarAction wdKey="nav:settings" onClick={this.props.onToggleModal.bind(this, 'settings')}>
             <SettingsIcon />
diff --git a/src/components/modals/ShortcutsModal.jsx b/src/components/modals/ShortcutsModal.jsx
index b14b413..0aa0a7f 100644
--- a/src/components/modals/ShortcutsModal.jsx
+++ b/src/components/modals/ShortcutsModal.jsx
@@ -30,12 +30,12 @@ class ShortcutsModal extends React.Component {
         text: "Export modal"
       },
       {
-        key: "s",
-        text: "Sources modal"
+        key: "d",
+        text: "Data Sources modal"
       },
       {
-        key: "p",
-        text: "Style settings modal"
+        key: "s",
+        text: "Style Settings modal"
       },
       {
         key: "i",