diff --git a/LesionTracker/client/lib/customCommands.js b/LesionTracker/client/lib/customCommands.js
new file mode 100644
index 000000000..d9d882298
--- /dev/null
+++ b/LesionTracker/client/lib/customCommands.js
@@ -0,0 +1,25 @@
+import { Meteor } from 'meteor/meteor';
+import { _ } from 'meteor/underscore';
+import { OHIF } from 'meteor/ohif:core';
+
+Meteor.startup(() => {
+    // Enable the custom tools
+    const customTools = [{
+        id: 'nonTarget',
+        name: 'Non-Target'
+    }, {
+        id: 'targetCR',
+        name: 'CR Target'
+    }, {
+        id: 'targetUN',
+        name: 'UN Target'
+    }];
+
+    customTools.forEach(tool => {
+        _.defaults(OHIF.hotkeys.defaults.viewer, { [tool.id]: '' });
+        OHIF.commands.register('viewer', tool.id, {
+            name: tool.name,
+            action: () => OHIF.viewerbase.toolManager.setActiveTool(tool.id)
+        });
+    });
+});
diff --git a/Packages/ohif-viewerbase/client/lib/WLPresets.js b/Packages/ohif-viewerbase/client/lib/WLPresets.js
index aa1e45665..353f1d20a 100644
--- a/Packages/ohif-viewerbase/client/lib/WLPresets.js
+++ b/Packages/ohif-viewerbase/client/lib/WLPresets.js
@@ -205,6 +205,7 @@ class WindowLevelPresetsManager {
 const WLPresets = new WindowLevelPresetsManager();
 
 Meteor.startup(() => {
+    WLPresets.loadDefaults();
     WLPresets.load();
 });