2 files changed, 16 insertions, 7 deletions

diff --git a/app/Resources/static/themes/baggy/js/init.js b/app/Resources/static/themes/baggy/js/init.js
index 5a8911ad..05360a28 100755
--- a/app/Resources/static/themes/baggy/js/init.js
+++ b/app/Resources/static/themes/baggy/js/init.js
@@ -1,7 +1,5 @@
+/* jQuery */
 import $ from 'jquery';
-import { initFilters, initExport } from '../../_global/js/tools';
-import './shortcuts/main.js';
-import './shortcuts/entry.js';
 
 /* eslint-disable no-unused-vars */
 /* jquery has default scope */
@@ -9,8 +7,16 @@ import cookie from 'jquery.cookie';
 import ui from 'jquery-ui-browserify';
 /* eslint-enable no-unused-vars */
 
+/* Annotations */
 import annotator from 'annotator';
 
+/* Shortcuts */
+import './shortcuts/main';
+import './shortcuts/entry';
+import '../../_global/js/shortcuts/main';
+import '../../_global/js/shortcuts/entry';
+
+/* Tools */
 import { savePercent, retrievePercent } from '../../_global/js/tools';
 import toggleSaveLinkForm from './uiTools';
 
diff --git a/app/Resources/static/themes/baggy/js/shortcuts/entry.js b/app/Resources/static/themes/baggy/js/shortcuts/entry.js
index d618f28e..77d267a3 100644
--- a/app/Resources/static/themes/baggy/js/shortcuts/entry.js
+++ b/app/Resources/static/themes/baggy/js/shortcuts/entry.js
@@ -1,19 +1,22 @@
+import Mousetrap from 'mousetrap';
+import $ from 'jquery';
+
 /* Article view */
 Mousetrap.bind('o', () => {
-    $('div#article_toolbar ul.links li:nth-child(2) a')[0].click();
+  $('div#article_toolbar ul.links li:nth-child(2) a')[0].click();
 });
 
 /* mark as favorite */
 Mousetrap.bind('s', () => {
-    $('div#article_toolbar ul.links li:nth-child(5) a')[0].click();
+  $('div#article_toolbar ul.links li:nth-child(5) a')[0].click();
 });
 
 /* mark as read */
 Mousetrap.bind('a', () => {
-    $('div#article_toolbar ul.links li:nth-child(4) a')[0].click();
+  $('div#article_toolbar ul.links li:nth-child(4) a')[0].click();
 });
 
 /* delete */
 Mousetrap.bind('del', () => {
-    $('div#article_toolbar ul.links li:nth-child(7) a')[0].click();
+  $('div#article_toolbar ul.links li:nth-child(7) a')[0].click();
 });