diff --git a/client/admin/admin.less b/client/admin/admin.less
index d408f2aa3..432f92e8b 100644
--- a/client/admin/admin.less
+++ b/client/admin/admin.less
@@ -3,7 +3,7 @@
 @import '@sharedStyles/animations.less';
 @import '@sharedStyles/colors.less';
 @import '@sharedStyles/tooltip.less';
-@import './themes/fonts/iconFonts/fontAwesome.less';
+@import '@themes/fonts/iconFonts/fontAwesome.less';
 
 html,body, #reactContainer, .naturalCrit { min-height : 100%; }
 
diff --git a/client/components/codeEditor/codeEditor.less b/client/components/codeEditor/codeEditor.less
index c8e60974b..89d0c9497 100644
--- a/client/components/codeEditor/codeEditor.less
+++ b/client/components/codeEditor/codeEditor.less
@@ -5,10 +5,10 @@
 @import (less) 'codemirror/addon/hint/show-hint.css';
 
 //Icon fonts included so they can appear in emoji autosuggest dropdown
-@import (less) './themes/fonts/iconFonts/diceFont.less';
-@import (less) './themes/fonts/iconFonts/elderberryInn.less';
-@import (less) './themes/fonts/iconFonts/gameIcons.less';
-@import (less) './themes/fonts/iconFonts/fontAwesome.less';
+@import (less) '@themes/fonts/iconFonts/diceFont.less';
+@import (less) '@themes/fonts/iconFonts/elderberryInn.less';
+@import (less) '@themes/fonts/iconFonts/gameIcons.less';
+@import (less) '@themes/fonts/iconFonts/fontAwesome.less';
 
 @keyframes sourceMoveAnimation {
 	50% {   color            : white;background-color : red;}
diff --git a/client/homebrew/editor/editor.less b/client/homebrew/editor/editor.less
index d2962dbaf..3851b50c5 100644
--- a/client/homebrew/editor/editor.less
+++ b/client/homebrew/editor/editor.less
@@ -1,5 +1,5 @@
 @import '@sharedStyles/core.less';
-@import './themes/codeMirror/customEditorStyles.less';
+@import '@themes/codeMirror/customEditorStyles.less';
 
 .editor {
 	position  : relative;
diff --git a/client/homebrew/editor/snippetbar/snippetbar.less b/client/homebrew/editor/snippetbar/snippetbar.less
index 880f7c1f6..00a087871 100644
--- a/client/homebrew/editor/snippetbar/snippetbar.less
+++ b/client/homebrew/editor/snippetbar/snippetbar.less
@@ -1,6 +1,6 @@
 @import '@sharedStyles/core.less';
 @import (less) './client/icons/customIcons.less';
-@import (less) '././././themes/fonts/5e/fonts.less';
+@import (less) './././@themes/fonts/5e/fonts.less';
 
 .snippetBar {
 	@menuHeight      : 25px;