diff --git a/META-INF/plugin.xml b/META-INF/plugin.xml
index 7b0dc9a..e3497c3 100644
--- a/META-INF/plugin.xml
+++ b/META-INF/plugin.xml
@@ -1,7 +1,7 @@
 <idea-plugin version="2">
   <id>com.chrisfolger.needsmoredojo</id>
   <name>Needs More Dojo</name>
-  <version>0.7</version>
+  <version>0.8.1</version>
   <vendor email="cefolger@gmail.com" url="http://www.chrisfolger.com">Chris Folger</vendor>
 
   <description><![CDATA[
@@ -40,6 +40,17 @@
       ]]></description>
 
   <change-notes><![CDATA[
+            <b>0.8.1</b>
+            <ul>
+                <li>Compatibility with IntelliJ IDEA 2017.3</li>
+            </ul>
+
+            <b>0.8</b>
+            <ul>
+                <li>Compatibility with IntelliJ IDEA 2016.1 and above</li>
+                <li>Added import block name configuration option</li>
+            </ul>
+
             <b>0.7 (major release) </b>
             <ul>
                 <li>Quick fix to add a mismatched import exception </li>
@@ -89,7 +100,7 @@
       ]]>
   </change-notes>
 
-  <idea-version since-build="107.105"/>
+  <idea-version since-build="145.1"/>
 
     <depends>JavaScript</depends>
     <depends>com.intellij.modules.xml</depends>
@@ -217,7 +228,7 @@
 
         <!-- overrides the default JavaScript unresolved variable inspection so that we are able to resolve attach points. Otherwise there
             is no way to provide references to attach point variables -->
-        <localInspection language="JavaScript" groupPath="JavaScript" shortName="JSUnresolvedVariable"
+        <localInspection language="JavaScript" groupPath="JavaScript"
                          key="js.unresolved.variable.inspection.name" groupKey="js.inspection.group.name" enabledByDefault="true"
                          level="WEAK WARNING" implementationClass="com.chrisfolger.needsmoredojo.intellij.inspections.DojoUnresolvedVariableInspection" unfair="true"/>
     </extensions>
diff --git a/changelog.html b/changelog.html
index 08b418e..691885d 100644
--- a/changelog.html
+++ b/changelog.html
@@ -1,5 +1,16 @@
 <html>
     <body>
+        <b>0.8.1</b>
+        <ul>
+            <li>Compatibility with IntelliJ IDEA 2017.3</li>
+        </ul>
+
+        <b>0.8</b>
+        <ul>
+            <li>Compatibility with IntelliJ IDEA 2016.1 and above</li>
+            <li>Added import block name configuration option</li>
+        </ul>
+
         <b>0.7 (major release) </b>
         <ul>
             <li>Quick fix to add a mismatched import exception </li>
diff --git a/dist/needsmoredojo-0.8.1.jar b/dist/needsmoredojo-0.8.1.jar
new file mode 100644
index 0000000..57d0ec6
Binary files /dev/null and b/dist/needsmoredojo-0.8.1.jar differ
diff --git a/dist/needsmoredojo-0.8.jar b/dist/needsmoredojo-0.8.jar
new file mode 100644
index 0000000..927ef77
Binary files /dev/null and b/dist/needsmoredojo-0.8.jar differ
diff --git a/src/com/chrisfolger/needsmoredojo/core/amd/define/DefineResolver.java b/src/com/chrisfolger/needsmoredojo/core/amd/define/DefineResolver.java
index a686ca4..397a41b 100644
--- a/src/com/chrisfolger/needsmoredojo/core/amd/define/DefineResolver.java
+++ b/src/com/chrisfolger/needsmoredojo/core/amd/define/DefineResolver.java
@@ -2,7 +2,10 @@
 
 import com.chrisfolger.needsmoredojo.core.amd.CompletionCallback;
 import com.chrisfolger.needsmoredojo.core.amd.importing.InvalidDefineException;
+import com.chrisfolger.needsmoredojo.core.settings.DojoSettings;
 import com.intellij.lang.javascript.psi.*;
+import com.intellij.openapi.components.ServiceManager;
+import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiElementVisitor;
 import com.intellij.psi.PsiFile;
@@ -183,8 +186,8 @@ public void run(Object[] result) {
             if(parent instanceof JSCallExpression)
             {
                 JSCallExpression statement = (JSCallExpression) parent;
-                if(statement.getMethodExpression() != null && (statement.getMethodExpression().getText().equals("define")
-                        || statement.getMethodExpression().getText().equals("require")))
+                if(statement.getMethodExpression() != null &&
+                        isValidImportBlockName(statement.getMethodExpression().getText(), element.getProject()))
                 {
                     return getDefineStatementItemsFromArguments(statement.getArguments(), statement);
                 }
@@ -238,7 +241,7 @@ public Set<JSCallExpression> getAllImportBlocks(PsiFile file)
             public void visitJSCallExpression(JSCallExpression expression)
             {
                 if(expression != null && expression.getMethodExpression() != null &&
-                        (expression.getMethodExpression().getText().equals("define") || expression.getMethodExpression().getText().equals("require")))
+                        isValidImportBlockName(expression.getMethodExpression().getText(), file.getProject()))
                 {
                     listOfDefinesOrRequiresToVisit.add(expression);
                 }
@@ -250,4 +253,15 @@ public void visitJSCallExpression(JSCallExpression expression)
 
         return listOfDefinesOrRequiresToVisit;
     }
+
+    private Boolean isValidImportBlockName(String name, Project project) {
+        DojoSettings settings = ServiceManager.getService(project, DojoSettings.class);
+        String[] defineBlockNames = settings.getImportBlockNames().split(",");
+        for (String defineBlockName:defineBlockNames) {
+            if (name.equals(defineBlockName)) {
+                return true;
+            }
+        }
+        return false;
+    }
 }
diff --git a/src/com/chrisfolger/needsmoredojo/core/amd/importing/ImportCreator.java b/src/com/chrisfolger/needsmoredojo/core/amd/importing/ImportCreator.java
index dacab80..0cf9028 100644
--- a/src/com/chrisfolger/needsmoredojo/core/amd/importing/ImportCreator.java
+++ b/src/com/chrisfolger/needsmoredojo/core/amd/importing/ImportCreator.java
@@ -27,7 +27,7 @@ private void displayDuplicateMessage(String parameter, Project project)
 
     public void createImport(String module, String quoteCharacter, String parameter, JSArrayLiteralExpression imports, JSParameterList parameters)
     {
-        for(JSParameter element : parameters.getParameters())
+        for(JSParameter element : parameters.getParameterVariables())
         {
             if(element.getName().equals(parameter))
             {
@@ -37,7 +37,7 @@ public void createImport(String module, String quoteCharacter, String parameter,
             }
         }
 
-        if(imports.getChildren().length == 0)
+        if(imports.getExpressions().length == 0)
         {
             // how to insert
             /*
@@ -80,7 +80,7 @@ else if(defineText.contains("\n"))
         else
         {
             String formatString = quoteCharacter + "%s" + quoteCharacter + ",";
-            JSUtil.addStatementBeforeElement(imports, imports.getChildren()[0], String.format(formatString, module), "\n");
+            JSUtil.addStatementBeforeElement(imports, imports.getExpressions()[0], String.format(formatString, module), "\n");
             if(parameters.getChildren().length > 0)
             {
                 JSUtil.addStatementBeforeElement(parameters, parameters.getChildren()[0], parameter + ",", " ");
@@ -99,9 +99,9 @@ public void createImport(String module, String quoteCharacter, JSArrayLiteralExp
 
         // if the parameter would cause a duplicate, then assume it is a module with a different path but the same name
         // as an existing imported module.
-        for (int i = 0; i < parameters.getParameters().length; i++)
+        for (int i = 0; i < parameters.getParameterVariables().length; i++)
         {
-            JSParameter existingParameter = parameters.getParameters()[i];
+            JSParameter existingParameter = parameters.getParameterVariables()[i];
             if(existingParameter != null && existingParameter.getText().equals(parameter))
             {
                 String existingAbsolutePath = NameResolver.getModuleAndPathWithoutPluginResourceId(imports.getExpressions()[i].getText().replaceAll("'", "").replaceAll("\"", ""));
diff --git a/src/com/chrisfolger/needsmoredojo/core/amd/importing/ImportReorderer.java b/src/com/chrisfolger/needsmoredojo/core/amd/importing/ImportReorderer.java
index be122f1..607ad32 100644
--- a/src/com/chrisfolger/needsmoredojo/core/amd/importing/ImportReorderer.java
+++ b/src/com/chrisfolger/needsmoredojo/core/amd/importing/ImportReorderer.java
@@ -111,7 +111,7 @@ public void doSwap(PsiElement source, Editor editor, AMDPsiUtil.Direction direct
 
         int sourceIndex = PsiUtil.getIndexInParent(defines[0]);
         int destinationIndex = PsiUtil.getIndexInParent(defines[1]);
-        JSParameter[] parameterList = items.getFunction().getParameters();
+        JSParameter[] parameterList = items.getFunction().getParameterVariables();
 
         if(sourceIndex >= parameterList.length || destinationIndex >= parameterList.length)
         {
diff --git a/src/com/chrisfolger/needsmoredojo/core/amd/importing/visitors/UnusedImportsRemovalVisitor.java b/src/com/chrisfolger/needsmoredojo/core/amd/importing/visitors/UnusedImportsRemovalVisitor.java
index cab0718..9f9121b 100644
--- a/src/com/chrisfolger/needsmoredojo/core/amd/importing/visitors/UnusedImportsRemovalVisitor.java
+++ b/src/com/chrisfolger/needsmoredojo/core/amd/importing/visitors/UnusedImportsRemovalVisitor.java
@@ -40,7 +40,7 @@ private boolean isOwnedByCurrentImportBlock(PsiElement node, String nodeText, St
         {
             // if the nearest block contains a reference AND it is not equal to the owning block, then the owning
             // block cannot claim this reference
-            for(JSParameter parameter : block.getFunction().getParameters())
+            for(JSParameter parameter : block.getFunction().getParameterVariables())
             {
                 String matchText = prefix + parameter.getText();
 
diff --git a/src/com/chrisfolger/needsmoredojo/core/amd/psi/AMDPsiUtil.java b/src/com/chrisfolger/needsmoredojo/core/amd/psi/AMDPsiUtil.java
index 2eb385e..95b6ba0 100644
--- a/src/com/chrisfolger/needsmoredojo/core/amd/psi/AMDPsiUtil.java
+++ b/src/com/chrisfolger/needsmoredojo/core/amd/psi/AMDPsiUtil.java
@@ -352,9 +352,9 @@ public static PsiElement resolveReferencedDefine(PsiElement psiElement)
 
         try
         {
-            for (int x = 0; x < defineStatement.getFunction().getParameters().length; x++)
+            for (int x = 0; x < defineStatement.getFunction().getParameterVariables().length; x++)
             {
-                JSParameter parameter = defineStatement.getFunction().getParameters()[x];
+                JSParameter parameter = defineStatement.getFunction().getParameterVariables()[x];
                 JSExpression define = defineStatement.getArguments().getExpressions()[x];
 
                 if(parameter.getText().equals(psiElement.getText()))
diff --git a/src/com/chrisfolger/needsmoredojo/core/refactoring/UtilFinder.java b/src/com/chrisfolger/needsmoredojo/core/refactoring/UtilFinder.java
index 2db65cb..e2ccaec 100644
--- a/src/com/chrisfolger/needsmoredojo/core/refactoring/UtilFinder.java
+++ b/src/com/chrisfolger/needsmoredojo/core/refactoring/UtilFinder.java
@@ -32,9 +32,10 @@ else if (statement instanceof JSVarStatement && statement.getText().contains("de
 
                         for(JSVariable variable : ((JSVarStatement)statement).getVariables())
                         {
-                            if(variable.getInitializerText().contains("declare"))
+                            final JSExpression initializer = variable.getInitializer();
+                            if(initializer instanceof JSCallExpression && initializer.getText().contains("declare"))
                             {
-                                JSCallExpression declareCall = (JSCallExpression) variable.getInitializer();
+                                JSCallExpression declareCall = (JSCallExpression) initializer;
                                 declaration = declareCall;
                                 break;
                             }
diff --git a/src/com/chrisfolger/needsmoredojo/core/settings/DojoSettings.java b/src/com/chrisfolger/needsmoredojo/core/settings/DojoSettings.java
index dcb64f0..36be2c2 100644
--- a/src/com/chrisfolger/needsmoredojo/core/settings/DojoSettings.java
+++ b/src/com/chrisfolger/needsmoredojo/core/settings/DojoSettings.java
@@ -6,7 +6,6 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import javax.naming.NamingException;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
@@ -37,6 +36,7 @@ public class DojoSettings implements PersistentStateComponent<DojoSettings>
     private boolean setupWarningDisabled;
     private boolean refactoringEnabled;
     private String supportedFileTypes;
+    private String importBlockNames;
     private boolean singleQuotedModuleIDs;
     // this will be used for converting to module specific sources later
     private String version;
@@ -62,6 +62,7 @@ public DojoSettings()
         addModuleIfThereAreNoneDefined = false;
         allowCaseInsensitiveSearch = true;
         supportedFileTypes = "jsp,js,php,html";
+        importBlockNames = "require,define";
         singleQuotedModuleIDs = true;
     }
 
@@ -158,6 +159,14 @@ public void setSupportedFileTypes(String supportedFileTypes) {
         this.supportedFileTypes = supportedFileTypes;
     }
 
+    public String getImportBlockNames() {
+        return importBlockNames;
+    }
+
+    public void setImportBlockNames(String importBlockNames) {
+        this.importBlockNames = importBlockNames;
+    }
+
     @Nullable
     @Override
     public DojoSettings getState() {
diff --git a/src/com/chrisfolger/needsmoredojo/core/util/JSUtil.java b/src/com/chrisfolger/needsmoredojo/core/util/JSUtil.java
index f6128d9..86fa07e 100644
--- a/src/com/chrisfolger/needsmoredojo/core/util/JSUtil.java
+++ b/src/com/chrisfolger/needsmoredojo/core/util/JSUtil.java
@@ -19,7 +19,7 @@ public class JSUtil
 {
     public static PsiElement addStatementBeforeElement(PsiElement parent, PsiElement element, String statement, String whitespace)
     {
-        ASTNode node = JSChangeUtil.createStatementFromText(parent.getProject(), statement, JSUtils.getDialect(parent.getContainingFile()));
+        ASTNode node = JSChangeUtil.createExpressionFromText(parent.getProject(), statement, JSUtils.getDialect(parent.getContainingFile()));
         parent.addBefore(node.getPsi(), element);
 
         if(!whitespace.equals(""))
diff --git a/src/com/chrisfolger/needsmoredojo/intellij/configurable/DojoSettings.form b/src/com/chrisfolger/needsmoredojo/intellij/configurable/DojoSettings.form
index f56d907..cfcfeaf 100644
--- a/src/com/chrisfolger/needsmoredojo/intellij/configurable/DojoSettings.form
+++ b/src/com/chrisfolger/needsmoredojo/intellij/configurable/DojoSettings.form
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <form xmlns="http://www.intellij.com/uidesigner/form/" version="1" bind-to-class="com.chrisfolger.needsmoredojo.intellij.configurable.DojoSettingsConfigurable">
-  <grid id="27dc6" binding="myPanel" layout-manager="GridLayoutManager" row-count="25" column-count="4" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
+  <grid id="27dc6" binding="myPanel" layout-manager="GridLayoutManager" row-count="26" column-count="4" same-size-horizontally="false" same-size-vertically="false" hgap="-1" vgap="-1">
     <margin top="0" left="0" bottom="0" right="0"/>
     <constraints>
-      <xy x="20" y="20" width="854" height="680"/>
+      <xy x="20" y="20" width="1066" height="781"/>
     </constraints>
     <properties/>
     <border type="none"/>
@@ -22,7 +22,7 @@
       </component>
       <component id="ba5c8" class="javax.swing.JLabel">
         <constraints>
-          <grid row="16" column="0" row-span="1" col-span="4" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false">
+          <grid row="17" column="0" row-span="1" col-span="4" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false">
             <maximum-size width="-1" height="20"/>
           </grid>
         </constraints>
@@ -32,7 +32,7 @@
       </component>
       <scrollpane id="8ea0">
         <constraints>
-          <grid row="17" column="0" row-span="1" col-span="3" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false">
+          <grid row="18" column="0" row-span="1" col-span="3" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false">
             <maximum-size width="-1" height="200"/>
           </grid>
         </constraints>
@@ -50,7 +50,7 @@
       </scrollpane>
       <component id="7aefc" class="javax.swing.JTextField" binding="addModuleText">
         <constraints>
-          <grid row="19" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false">
+          <grid row="20" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false">
             <preferred-size width="150" height="-1"/>
           </grid>
         </constraints>
@@ -61,7 +61,7 @@
       </component>
       <component id="66f8d" class="javax.swing.JButton" binding="addMapping">
         <constraints>
-          <grid row="19" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="20" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <icon value="general/add.png"/>
@@ -71,7 +71,7 @@
       </component>
       <component id="c3a2e" class="javax.swing.JTextField" binding="addParameterText">
         <constraints>
-          <grid row="19" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+          <grid row="20" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
             <preferred-size width="150" height="-1"/>
           </grid>
         </constraints>
@@ -81,7 +81,7 @@
       </component>
       <component id="b44d8" class="javax.swing.JButton" binding="removeMapping">
         <constraints>
-          <grid row="17" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="1" fill="1" indent="0" use-parent-layout="false"/>
+          <grid row="18" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="1" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <icon value="general/remove.png"/>
@@ -91,7 +91,7 @@
       </component>
       <component id="ec03" class="javax.swing.JLabel">
         <constraints>
-          <grid row="18" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="19" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <text value="Module"/>
@@ -99,7 +99,7 @@
       </component>
       <component id="2a9d6" class="javax.swing.JLabel">
         <constraints>
-          <grid row="18" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="19" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <text value="Parameter"/>
@@ -107,7 +107,7 @@
       </component>
       <component id="71c4c" class="javax.swing.JCheckBox" binding="preferRelativePathsWhenCheckBox" default-binding="true">
         <constraints>
-          <grid row="11" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="12" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <text value="Prefer relative paths when adding new imports from project sources"/>
@@ -135,7 +135,7 @@
       </component>
       <component id="d14d4" class="javax.swing.JLabel">
         <constraints>
-          <grid row="21" column="0" row-span="1" col-span="4" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="22" column="0" row-span="1" col-span="4" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <text value="Unused import exceptions:"/>
@@ -143,7 +143,7 @@
       </component>
       <scrollpane id="d3a31">
         <constraints>
-          <grid row="22" column="0" row-span="1" col-span="3" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false">
+          <grid row="23" column="0" row-span="1" col-span="3" vsize-policy="7" hsize-policy="7" anchor="0" fill="3" indent="0" use-parent-layout="false">
             <maximum-size width="-1" height="200"/>
           </grid>
         </constraints>
@@ -161,7 +161,7 @@
       </scrollpane>
       <component id="bcaae" class="javax.swing.JTextField" binding="addRUIExceptionModuleText">
         <constraints>
-          <grid row="24" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false">
+          <grid row="25" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="6" anchor="0" fill="1" indent="0" use-parent-layout="false">
             <preferred-size width="150" height="-1"/>
           </grid>
         </constraints>
@@ -172,7 +172,7 @@
       </component>
       <component id="2c20b" class="javax.swing.JButton" binding="addRUIModule">
         <constraints>
-          <grid row="24" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="25" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="0" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <icon value="general/add.png"/>
@@ -182,7 +182,7 @@
       </component>
       <component id="e923c" class="javax.swing.JTextField" binding="addRUIExceptionParameterText">
         <constraints>
-          <grid row="24" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+          <grid row="25" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
             <preferred-size width="150" height="-1"/>
           </grid>
         </constraints>
@@ -192,7 +192,7 @@
       </component>
       <component id="30614" class="javax.swing.JButton" binding="removeRUIModule">
         <constraints>
-          <grid row="22" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="1" fill="1" indent="0" use-parent-layout="false"/>
+          <grid row="23" column="3" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="1" fill="1" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <icon value="general/remove.png"/>
@@ -202,7 +202,7 @@
       </component>
       <component id="b63ac" class="javax.swing.JLabel">
         <constraints>
-          <grid row="23" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="24" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <text value="Module"/>
@@ -210,7 +210,7 @@
       </component>
       <component id="3c474" class="javax.swing.JLabel">
         <constraints>
-          <grid row="23" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="24" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <text value="Parameter"/>
@@ -234,7 +234,7 @@
       </component>
       <component id="e8a1" class="javax.swing.JLabel">
         <constraints>
-          <grid row="10" column="0" row-span="1" col-span="4" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false">
+          <grid row="11" column="0" row-span="1" col-span="4" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false">
             <maximum-size width="-1" height="20"/>
           </grid>
         </constraints>
@@ -244,7 +244,7 @@
       </component>
       <component id="9ec05" class="javax.swing.JCheckBox" binding="addModulesIfThereAreNoneDetected">
         <constraints>
-          <grid row="11" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="12" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <text value="If there are no detected modules, add the import anyway"/>
@@ -268,7 +268,7 @@
       </component>
       <component id="38d31" class="javax.swing.JCheckBox" binding="allowCaseInsensitiveSearch">
         <constraints>
-          <grid row="12" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="13" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <text value="Use case-insensitive searching "/>
@@ -301,7 +301,7 @@
       </component>
       <component id="20caa" class="javax.swing.JLabel">
         <constraints>
-          <grid row="8" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="9" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <text value="Refactoring options:"/>
@@ -309,7 +309,7 @@
       </component>
       <component id="99747" class="javax.swing.JCheckBox" binding="enableRefactoringSupportForCheckBox" default-binding="true">
         <constraints>
-          <grid row="9" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="10" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <text value="Enable refactoring support for move and rename file actions"/>
@@ -317,7 +317,7 @@
       </component>
       <component id="d6b80" class="javax.swing.JLabel">
         <constraints>
-          <grid row="13" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="14" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <text value="Module ID Strings:"/>
@@ -325,7 +325,7 @@
       </component>
       <component id="6e28a" class="javax.swing.JRadioButton" binding="singleQuotesRadioButton">
         <constraints>
-          <grid row="14" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="15" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <text value="Single quoted (')"/>
@@ -334,7 +334,7 @@
       </component>
       <component id="b19cb" class="javax.swing.JRadioButton" binding="doubleQuotesRadioButton">
         <constraints>
-          <grid row="15" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+          <grid row="16" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="3" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
         </constraints>
         <properties>
           <text value="Double Quoted (&quot;)"/>
@@ -343,7 +343,23 @@
       </component>
       <component id="7be8d" class="javax.swing.JSeparator">
         <constraints>
-          <grid row="20" column="0" row-span="1" col-span="4" vsize-policy="6" hsize-policy="6" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+          <grid row="21" column="0" row-span="1" col-span="4" vsize-policy="6" hsize-policy="6" anchor="0" fill="3" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties/>
+      </component>
+      <component id="d10dc" class="javax.swing.JLabel">
+        <constraints>
+          <grid row="8" column="0" row-span="1" col-span="1" vsize-policy="0" hsize-policy="0" anchor="8" fill="0" indent="0" use-parent-layout="false"/>
+        </constraints>
+        <properties>
+          <text value="Comma delimited list of import block names:"/>
+        </properties>
+      </component>
+      <component id="ae75" class="javax.swing.JTextField" binding="importBlockNames">
+        <constraints>
+          <grid row="8" column="1" row-span="1" col-span="2" vsize-policy="0" hsize-policy="6" anchor="8" fill="1" indent="0" use-parent-layout="false">
+            <preferred-size width="150" height="-1"/>
+          </grid>
         </constraints>
         <properties/>
       </component>
diff --git a/src/com/chrisfolger/needsmoredojo/intellij/configurable/DojoSettingsConfigurable.java b/src/com/chrisfolger/needsmoredojo/intellij/configurable/DojoSettingsConfigurable.java
index e76ecc1..2b5f267 100644
--- a/src/com/chrisfolger/needsmoredojo/intellij/configurable/DojoSettingsConfigurable.java
+++ b/src/com/chrisfolger/needsmoredojo/intellij/configurable/DojoSettingsConfigurable.java
@@ -55,6 +55,7 @@ public class DojoSettingsConfigurable implements Configurable {
     private JCheckBox enableRefactoringSupportForCheckBox;
     private JRadioButton singleQuotesRadioButton;
     private JRadioButton doubleQuotesRadioButton;
+    private JTextField importBlockNames;
     private ButtonGroup quotesButtonGroup;
     private Project project;
     private String dojoSourceString;
@@ -149,6 +150,7 @@ private void updateModifiedState()
                 addModulesIfThereAreNoneDetected.isSelected() != settingsService.isAddModuleIfThereAreNoneDefined() ||
                 allowCaseInsensitiveSearch.isSelected() != settingsService.isAllowCaseInsensitiveSearch() ||
                 !supportedFileTypes.getText().equals(settingsService.getSupportedFileTypes()) ||
+                !importBlockNames.getText().equals(settingsService.getImportBlockNames()) ||
                 enableRefactoringSupportForCheckBox.isSelected() != settingsService.isRefactoringEnabled() ||
                 singleQuotesRadioButton.isSelected() != settingsService.isSingleQuotedModuleIDs() ||
                 // this flag is true if it's unchecked
@@ -265,6 +267,8 @@ public void stateChanged(ChangeEvent e) {
 
         supportedFileTypes.addKeyListener(new TextChangedListener());
 
+        importBlockNames.addKeyListener(new TextChangedListener());
+
         pluginEnabled.addChangeListener(new ChangeListener() {
             @Override
             public void stateChanged(ChangeEvent e) {
@@ -377,6 +381,7 @@ public void apply()
         settingsService.setAddModuleIfThereAreNoneDefined(addModulesIfThereAreNoneDetected.isSelected());
         settingsService.setAllowCaseInsensitiveSearch(allowCaseInsensitiveSearch.isSelected());
         settingsService.setSupportedFileTypes(supportedFileTypes.getText());
+        settingsService.setImportBlockNames(importBlockNames.getText());
         settingsService.setSetupWarningDisabled(!displayWarningIfSourcesCheckBox.isSelected());
         settingsService.setRefactoringEnabled(enableRefactoringSupportForCheckBox.isSelected());
         settingsService.setSingleQuotedModuleIDs(singleQuotesRadioButton.isSelected());
@@ -407,6 +412,7 @@ public void reset()
         addModulesIfThereAreNoneDetected.setSelected(settingsService.isAddModuleIfThereAreNoneDefined());
         allowCaseInsensitiveSearch.setSelected(settingsService.isAllowCaseInsensitiveSearch());
         supportedFileTypes.setText(settingsService.getSupportedFileTypes());
+        importBlockNames.setText(settingsService.getImportBlockNames());
         displayWarningIfSourcesCheckBox.setSelected(!settingsService.isSetupWarningDisabled());
         enableRefactoringSupportForCheckBox.setSelected(settingsService.isRefactoringEnabled());
         if (settingsService.isSingleQuotedModuleIDs()) {
diff --git a/src/com/chrisfolger/needsmoredojo/intellij/modules/DojoToolkitModuleType.java b/src/com/chrisfolger/needsmoredojo/intellij/modules/DojoToolkitModuleType.java
index 4f1620f..5363f7e 100644
--- a/src/com/chrisfolger/needsmoredojo/intellij/modules/DojoToolkitModuleType.java
+++ b/src/com/chrisfolger/needsmoredojo/intellij/modules/DojoToolkitModuleType.java
@@ -37,11 +37,6 @@ public String getDescription() {
                 "The module's content root should be the root of your most top level packages so that they can be imported correctly.";
     }
 
-    @Override
-    public Icon getBigIcon() {
-        return AllIcons.Modules.Types.WebModule;
-    }
-
     @Override
     public Icon getNodeIcon(@Deprecated boolean b) {
         return AllIcons.Nodes.WebFolder;
diff --git a/tests/com/chrisfolger/needsmoredojo/core/amd/importing/TestImportResolver.java b/tests/com/chrisfolger/needsmoredojo/core/amd/importing/TestImportResolver.java
index a71f7f6..fcf7702 100644
--- a/tests/com/chrisfolger/needsmoredojo/core/amd/importing/TestImportResolver.java
+++ b/tests/com/chrisfolger/needsmoredojo/core/amd/importing/TestImportResolver.java
@@ -2,7 +2,12 @@
 
 import com.chrisfolger.needsmoredojo.core.amd.filesystem.SourceLibrary;
 import com.chrisfolger.needsmoredojo.testutil.MockPsiFile;
+import com.intellij.openapi.project.impl.ProjectImpl;
+import com.intellij.psi.FileViewProvider;
 import com.intellij.psi.PsiFile;
+import com.intellij.psi.PsiManager;
+import com.intellij.psi.impl.PsiManagerEx;
+import com.intellij.psi.impl.PsiManagerImpl;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -10,6 +15,8 @@
 import java.util.List;
 
 import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 /**
  * the *Priority tests are to check if suggested imports for some common modules come up in the expected order
@@ -18,6 +25,7 @@ public class TestImportResolver
 {
     private ImportResolver resolver;
     private List<SourceLibrary> libraries;
+    private FileViewProvider fileViewProviderMock;
 
     @Before
     public void setup()
@@ -31,14 +39,20 @@ public void setup()
         libraries.add(new SourceLibrary("dgrid", "js/dgrid", false));
         libraries.add(new SourceLibrary("dojo", "js/dojo", false));
         libraries.add(new SourceLibrary("util", "js/util", false));
+
+        fileViewProviderMock = mock(FileViewProvider.class);
+        PsiManagerEx psiManagerMock = mock(PsiManagerEx.class);
+        ProjectImpl projectMock = mock(ProjectImpl.class);
+        when(fileViewProviderMock.getManager()).thenReturn(psiManagerMock);
+        when(psiManagerMock.getProject()).thenReturn(projectMock);
     }
 
     @Test
     public void testDijitLibraryPriority()
     {
         PsiFile[] files = new PsiFile[] {
-                new MockPsiFile("BorderContainer.js", "js/dojox/layout"),
-                new MockPsiFile("BorderContainer.js", "js/dijit/layout")
+                new MockPsiFile("BorderContainer.js", "js/dojox/layout", fileViewProviderMock),
+                new MockPsiFile("BorderContainer.js", "js/dijit/layout", fileViewProviderMock)
         };
 
         String[] choices = resolver.getChoicesFromFiles(files, libraries.toArray(new SourceLibrary[0]), "BorderContainer", null);
@@ -50,8 +64,8 @@ public void testDijitLibraryPriority()
     public void testFunctionalPriority()
     {
         PsiFile[] files = new PsiFile[] {
-                new MockPsiFile("functional.js", "js/dojox/lang"),
-                new MockPsiFile("functional.js", "js/util/docscripts/tests")
+                new MockPsiFile("functional.js", "js/dojox/lang", fileViewProviderMock),
+                new MockPsiFile("functional.js", "js/util/docscripts/tests", fileViewProviderMock)
         };
 
         String[] choices = resolver.getChoicesFromFiles(files, libraries.toArray(new SourceLibrary[0]), "functional", null);
@@ -64,7 +78,7 @@ public void testFunctionalPriority()
     public void testWidgetWithUnderscoreDoesNotGetTwoUnderscoresInserted()
     {
         PsiFile[] files = new PsiFile[] {
-                new MockPsiFile("_WidgetBase.js", "js/dijit")
+                new MockPsiFile("_WidgetBase.js", "js/dijit", fileViewProviderMock)
         };
 
         String[] choices = resolver.getChoicesFromFiles(files, libraries.toArray(new SourceLibrary[0]), "_WidgetBase", null);
@@ -77,7 +91,7 @@ public void testWidgetWithUnderscoreDoesNotGetTwoUnderscoresInserted()
     public void testWidgetWithDoubleUnderscoresIsStillInsertedCorrectly()
     {
         PsiFile[] files = new PsiFile[] {
-                new MockPsiFile("__WidgetBase.js", "js/dijit")
+                new MockPsiFile("__WidgetBase.js", "js/dijit", fileViewProviderMock)
         };
 
         String[] choices = resolver.getChoicesFromFiles(files, libraries.toArray(new SourceLibrary[0]), "__WidgetBase", null);
@@ -89,10 +103,10 @@ public void testWidgetWithDoubleUnderscoresIsStillInsertedCorrectly()
     public void testDgridPriority()
     {
         PsiFile[] files = new PsiFile[] {
-                new MockPsiFile("Grid.js", "js/dojox/drawing/plugins/drawing"),
-                new MockPsiFile("Grid.js", "js/dojox/grid"),
-                new MockPsiFile("Grid.js", "js/dgrid"),
-                new MockPsiFile("Grid.js", "js/dojox/charting/plot2d")
+                new MockPsiFile("Grid.js", "js/dojox/drawing/plugins/drawing", fileViewProviderMock),
+                new MockPsiFile("Grid.js", "js/dojox/grid", fileViewProviderMock),
+                new MockPsiFile("Grid.js", "js/dgrid", fileViewProviderMock),
+                new MockPsiFile("Grid.js", "js/dojox/charting/plot2d", fileViewProviderMock)
         };
 
         String[] choices = resolver.getChoicesFromFiles(files, libraries.toArray(new SourceLibrary[0]), "Grid", null);
@@ -104,8 +118,8 @@ public void testDgridPriority()
     public void testDojoTestPriority()
     {
         PsiFile[] files = new PsiFile[] {
-                new MockPsiFile("on.js", "js/dojo/tests"),
-                new MockPsiFile("on.js", "js/dojo")
+                new MockPsiFile("on.js", "js/dojo/tests", fileViewProviderMock),
+                new MockPsiFile("on.js", "js/dojo", fileViewProviderMock)
         };
 
         String[] choices = resolver.getChoicesFromFiles(files, libraries.toArray(new SourceLibrary[0]), "on", null);
@@ -117,7 +131,7 @@ public void testDojoTestPriority()
     public void testExternalLibrary()
     {
         PsiFile[] files = new PsiFile[] {
-                new MockPsiFile("StandbyWrapper.js", "C:/foo/path/website/static/js/website")
+                new MockPsiFile("StandbyWrapper.js", "C:/foo/path/website/static/js/website", fileViewProviderMock)
         };
 
         libraries.add(new SourceLibrary("website", "C:/foo/path/website/static/js/website", true));
@@ -131,7 +145,7 @@ public void testExternalLibrary()
     public void testLibrary_withNoSourceRoot()
     {
         PsiFile[] files = new PsiFile[] {
-                new MockPsiFile("Grid.js", "website/static/js/dojo/foo")
+                new MockPsiFile("Grid.js", "website/static/js/dojo/foo", fileViewProviderMock)
         };
 
         libraries.add(new SourceLibrary("dojo", "website/static/js", true));
@@ -144,8 +158,8 @@ public void testLibrary_withNoSourceRoot()
     public void testDojoLibraryPriority()
     {
         PsiFile[] files = new PsiFile[] {
-                new MockPsiFile("BorderContainer.js", "js/dojox"),
-                new MockPsiFile("BorderContainer.js", "js/dojo")
+                new MockPsiFile("BorderContainer.js", "js/dojox", fileViewProviderMock),
+                new MockPsiFile("BorderContainer.js", "js/dojo", fileViewProviderMock)
         };
 
         String[] choices = resolver.getChoicesFromFiles(files, libraries.toArray(new SourceLibrary[0]), "BorderContainer", null);
@@ -157,7 +171,7 @@ public void testDojoLibraryPriority()
     public void correctDojoSourceReferenceWithExternalLibrary()
     {
         PsiFile[] files = new PsiFile[] {
-                new MockPsiFile("ContentPane.js", "website/static/deps/dijit/layout")
+                new MockPsiFile("ContentPane.js", "website/static/deps/dijit/layout", fileViewProviderMock)
         };
 
         libraries = new ArrayList<SourceLibrary>();
@@ -172,12 +186,12 @@ public void correctDojoSourceReferenceWithExternalLibrary()
     public void testRelativePathWithExternalModule()
     {
         PsiFile[] files = new PsiFile[] {
-                new MockPsiFile("StandbyWrapper.js", "C:/foo/path/website/static/js/website")
+                new MockPsiFile("StandbyWrapper.js", "C:/foo/path/website/static/js/website", fileViewProviderMock)
         };
 
         libraries.add(new SourceLibrary("website", "C:/foo/path/website/static/js/website", true));
 
-        PsiFile originalModule = new MockPsiFile("FooModule.js", "C:/foo/path/website/static/js/website/anotherpackage");
+        PsiFile originalModule = new MockPsiFile("FooModule.js", "C:/foo/path/website/static/js/website/anotherpackage", fileViewProviderMock);
         String[] choices = resolver.getChoicesFromFiles(files, libraries.toArray(new SourceLibrary[0]) , "StandbyWrapper" , originalModule, true);
 
         assertEquals("../StandbyWrapper", choices[0]);
@@ -187,12 +201,12 @@ public void testRelativePathWithExternalModule()
     public void testRelativePathWithExternalModuleInSameDirectory()
     {
         PsiFile[] files = new PsiFile[] {
-                new MockPsiFile("StandbyWrapper.js", "C:/foo/path/website/static/js/website")
+                new MockPsiFile("StandbyWrapper.js", "C:/foo/path/website/static/js/website", fileViewProviderMock)
         };
 
         libraries.add(new SourceLibrary("website", "C:/foo/path/website/static/js/website", true));
 
-        PsiFile originalModule = new MockPsiFile("FooModule.js", "C:/foo/path/website/static/js/website");
+        PsiFile originalModule = new MockPsiFile("FooModule.js", "C:/foo/path/website/static/js/website", fileViewProviderMock);
         String[] choices = resolver.getChoicesFromFiles(files, libraries.toArray(new SourceLibrary[0]) , "StandbyWrapper" , originalModule, true);
 
         assertEquals("./StandbyWrapper", choices[0]);
@@ -202,12 +216,12 @@ public void testRelativePathWithExternalModuleInSameDirectory()
     public void testRelativePathWithExternalModuleInTopLevel()
     {
         PsiFile[] files = new PsiFile[] {
-                new MockPsiFile("StandbyWrapper.js", "C:/foo/path/website/static/js/website/package")
+                new MockPsiFile("StandbyWrapper.js", "C:/foo/path/website/static/js/website/package", fileViewProviderMock)
         };
 
         libraries.add(new SourceLibrary("website", "C:/foo/path/website/static/js/website", true));
 
-        PsiFile originalModule = new MockPsiFile("FooModule.js", "C:/foo/path/website/static/js/website");
+        PsiFile originalModule = new MockPsiFile("FooModule.js", "C:/foo/path/website/static/js/website", fileViewProviderMock);
         String[] choices = resolver.getChoicesFromFiles(files, libraries.toArray(new SourceLibrary[0]) , "StandbyWrapper" , originalModule, true);
 
         assertEquals("./package/StandbyWrapper", choices[0]);
@@ -217,12 +231,12 @@ public void testRelativePathWithExternalModuleInTopLevel()
     public void testRelativePathWithExternalModuleInAnotherPackage()
     {
         PsiFile[] files = new PsiFile[] {
-                new MockPsiFile("StandbyWrapper.js", "C:/foo/path/website/static/js/theroot/website/package")
+                new MockPsiFile("StandbyWrapper.js", "C:/foo/path/website/static/js/theroot/website/package", fileViewProviderMock)
         };
 
         libraries.add(new SourceLibrary("theroot", "C:/foo/path/website/static/js/theroot", true));
 
-        PsiFile originalModule = new MockPsiFile("FooModule.js", "C:/foo/path/website/static/js/theroot/other");
+        PsiFile originalModule = new MockPsiFile("FooModule.js", "C:/foo/path/website/static/js/theroot/other", fileViewProviderMock);
         String[] choices = resolver.getChoicesFromFiles(files, libraries.toArray(new SourceLibrary[0]) , "StandbyWrapper" , originalModule, true);
 
         assertEquals("../website/package/StandbyWrapper", choices[0]);
@@ -232,7 +246,7 @@ public void testRelativePathWithExternalModuleInAnotherPackage()
     public void pluginIsTakenIntoAccountCorrectly()
     {
         PsiFile[] files = new PsiFile[] {
-                new MockPsiFile("text.js", "dojo")
+                new MockPsiFile("text.js", "dojo", fileViewProviderMock)
         };
 
         libraries = new ArrayList<SourceLibrary>();
@@ -245,10 +259,10 @@ public void pluginIsTakenIntoAccountCorrectly()
     @Test
     public void testImportOfExternalModuleFromDojoLibrary()
     {
-        PsiFile original = new MockPsiFile("behavior.js", "website/static/js/dojo");
+        PsiFile original = new MockPsiFile("behavior.js", "website/static/js/dojo", fileViewProviderMock);
 
         PsiFile[] files = new PsiFile[] {
-                new MockPsiFile("MainToolbar.js", "website/static/js/website/widgets")
+                new MockPsiFile("MainToolbar.js", "website/static/js/website/widgets", fileViewProviderMock)
         };
 
         SourceLibrary website = new SourceLibrary("website", "website/static/js/website", true);
@@ -262,8 +276,8 @@ public void testImportOfExternalModuleFromDojoLibrary()
     public void testNlsModuleIsLowerPriorityWhenItHasTheSameNameAsTheModule()
     {
         PsiFile[] files = new PsiFile[] {
-                new MockPsiFile("Comment.js", "js/dojo/Comment/nls"),
-                new MockPsiFile("Comment.js", "js/dojo/Comment")
+                new MockPsiFile("Comment.js", "js/dojo/Comment/nls", fileViewProviderMock),
+                new MockPsiFile("Comment.js", "js/dojo/Comment", fileViewProviderMock)
         };
 
         String[] choices = resolver.getChoicesFromFiles(files, libraries.toArray(new SourceLibrary[0]), "Comment", null);
diff --git a/tests/com/chrisfolger/needsmoredojo/core/amd/objectmodel/TestDeclareResolver.java b/tests/com/chrisfolger/needsmoredojo/core/amd/objectmodel/TestDeclareResolver.java
index 3e8741c..5a8fbf4 100644
--- a/tests/com/chrisfolger/needsmoredojo/core/amd/objectmodel/TestDeclareResolver.java
+++ b/tests/com/chrisfolger/needsmoredojo/core/amd/objectmodel/TestDeclareResolver.java
@@ -3,6 +3,9 @@
 import com.chrisfolger.needsmoredojo.testutil.*;
 import com.intellij.lang.javascript.psi.JSCallExpression;
 import com.intellij.lang.javascript.psi.JSExpression;
+import com.intellij.openapi.Disposable;
+import com.intellij.openapi.application.Application;
+import com.intellij.openapi.application.ApplicationManager;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -11,6 +14,8 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
 public class TestDeclareResolver
 {
@@ -20,6 +25,11 @@ public class TestDeclareResolver
     public void setup()
     {
         resolver = new DeclareResolver();
+
+        Application applicationMock = mock(Application.class);
+        Disposable disposableMock = mock(Disposable.class);
+        when(applicationMock.isUnitTestMode()).thenReturn(true);
+        ApplicationManager.setApplication(applicationMock, disposableMock);
     }
 
     @Test
diff --git a/tests/com/chrisfolger/needsmoredojo/testutil/BasicPsiElements.java b/tests/com/chrisfolger/needsmoredojo/testutil/BasicPsiElements.java
index ae62ddd..4d453d6 100644
--- a/tests/com/chrisfolger/needsmoredojo/testutil/BasicPsiElements.java
+++ b/tests/com/chrisfolger/needsmoredojo/testutil/BasicPsiElements.java
@@ -7,6 +7,7 @@
 import com.intellij.lang.javascript.psi.impl.JSElementImpl;
 import com.intellij.lang.javascript.psi.impl.JSExpressionImpl;
 import com.intellij.psi.PsiElement;
+import com.intellij.psi.tree.IElementType;
 
 import static org.mockito.Mockito.mock;
 
@@ -38,7 +39,7 @@ public static MockJSArrayLiteralExpression define()
 
     public static JSElement elementFromText(final String text)
     {
-        return new JSElementImpl(mock(ASTNode.class)) {
+        return new JSElementImpl(mock(IElementType.class)) {
             @Override
             public String getText()
             {
@@ -72,7 +73,7 @@ public static MockJSElement lineBreak()
 
     public static JSExpression expressionFromText(final String text)
     {
-        return new JSExpressionImpl(mock(ASTNode.class)) {
+        return new JSExpressionImpl(mock(IElementType.class)) {
             @Override
             public String getText()
             {
diff --git a/tests/com/chrisfolger/needsmoredojo/testutil/MockJSArrayLiteralExpression.java b/tests/com/chrisfolger/needsmoredojo/testutil/MockJSArrayLiteralExpression.java
index 14df158..7a8a59e 100644
--- a/tests/com/chrisfolger/needsmoredojo/testutil/MockJSArrayLiteralExpression.java
+++ b/tests/com/chrisfolger/needsmoredojo/testutil/MockJSArrayLiteralExpression.java
@@ -4,6 +4,7 @@
 import com.intellij.lang.javascript.psi.JSElement;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.impl.JSArrayLiteralExpressionImpl;
+import com.intellij.psi.tree.IElementType;
 import org.apache.commons.lang.NotImplementedException;
 
 import static org.mockito.Mockito.mock;
@@ -15,7 +16,7 @@ public class MockJSArrayLiteralExpression extends JSArrayLiteralExpressionImpl i
     private MockJSElement bracket;
 
     public MockJSArrayLiteralExpression(String[] defines) {
-        super(mock(ASTNode.class));
+        super(mock(IElementType.class));
 
         expressions = new JSExpression[defines.length];
         for(int i=0;i<defines.length;i++)
diff --git a/tests/com/chrisfolger/needsmoredojo/testutil/MockJSElement.java b/tests/com/chrisfolger/needsmoredojo/testutil/MockJSElement.java
index f4560c0..992d264 100644
--- a/tests/com/chrisfolger/needsmoredojo/testutil/MockJSElement.java
+++ b/tests/com/chrisfolger/needsmoredojo/testutil/MockJSElement.java
@@ -4,6 +4,7 @@
 import com.intellij.lang.javascript.psi.JSElement;
 import com.intellij.lang.javascript.psi.impl.JSElementImpl;
 import com.intellij.psi.PsiElement;
+import com.intellij.psi.tree.IElementType;
 
 import static org.mockito.Mockito.mock;
 
@@ -16,7 +17,7 @@ public class MockJSElement extends JSElementImpl implements  MockJSElementInterf
     private MockJSElementInterface lastChild;
 
     public MockJSElement(String text) {
-        super(mock(ASTNode.class));
+        super(mock(IElementType.class));
 
         this.text = text;
     }
diff --git a/tests/com/chrisfolger/needsmoredojo/testutil/MockJSExpressionStatement.java b/tests/com/chrisfolger/needsmoredojo/testutil/MockJSExpressionStatement.java
index eb0edd1..720e7c8 100644
--- a/tests/com/chrisfolger/needsmoredojo/testutil/MockJSExpressionStatement.java
+++ b/tests/com/chrisfolger/needsmoredojo/testutil/MockJSExpressionStatement.java
@@ -3,6 +3,7 @@
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.impl.JSExpressionStatementImpl;
+import com.intellij.psi.tree.IElementType;
 
 import static org.mockito.Mockito.mock;
 
@@ -11,7 +12,7 @@ public class MockJSExpressionStatement extends JSExpressionStatementImpl
     private JSExpression expression;
 
     public MockJSExpressionStatement(JSExpression expression) {
-        super(mock(ASTNode.class));
+        super(mock(IElementType.class));
 
         this.expression = expression;
     }
diff --git a/tests/com/chrisfolger/needsmoredojo/testutil/MockJSIndexedPropertyAccessExpression.java b/tests/com/chrisfolger/needsmoredojo/testutil/MockJSIndexedPropertyAccessExpression.java
index ec6b396..3c990d2 100644
--- a/tests/com/chrisfolger/needsmoredojo/testutil/MockJSIndexedPropertyAccessExpression.java
+++ b/tests/com/chrisfolger/needsmoredojo/testutil/MockJSIndexedPropertyAccessExpression.java
@@ -3,6 +3,7 @@
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.JSExpression;
 import com.intellij.lang.javascript.psi.impl.JSIndexedPropertyAccessExpressionImpl;
+import com.intellij.psi.tree.IElementType;
 
 import static org.mockito.Mockito.mock;
 
@@ -11,7 +12,7 @@ public class MockJSIndexedPropertyAccessExpression extends JSIndexedPropertyAcce
     private String value;
 
     public MockJSIndexedPropertyAccessExpression(String propertyValue) {
-        super(mock(ASTNode.class));
+        super(mock(IElementType.class));
 
         this.value = propertyValue;
     }
diff --git a/tests/com/chrisfolger/needsmoredojo/testutil/MockJSReferenceExpression.java b/tests/com/chrisfolger/needsmoredojo/testutil/MockJSReferenceExpression.java
index 6d38e8d..003781d 100644
--- a/tests/com/chrisfolger/needsmoredojo/testutil/MockJSReferenceExpression.java
+++ b/tests/com/chrisfolger/needsmoredojo/testutil/MockJSReferenceExpression.java
@@ -2,6 +2,7 @@
 
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.javascript.psi.impl.JSReferenceExpressionImpl;
+import com.intellij.psi.tree.IElementType;
 
 import static org.mockito.Mockito.mock;
 
@@ -10,7 +11,7 @@ public class MockJSReferenceExpression extends JSReferenceExpressionImpl
     private String referencedName;
 
     public MockJSReferenceExpression(String referencedName) {
-        super(mock(ASTNode.class));
+        super(mock(IElementType.class));
 
         this.referencedName = referencedName;
     }
diff --git a/tests/com/chrisfolger/needsmoredojo/testutil/MockPsiFile.java b/tests/com/chrisfolger/needsmoredojo/testutil/MockPsiFile.java
index 5d852a8..5078d4d 100644
--- a/tests/com/chrisfolger/needsmoredojo/testutil/MockPsiFile.java
+++ b/tests/com/chrisfolger/needsmoredojo/testutil/MockPsiFile.java
@@ -18,8 +18,8 @@ public class MockPsiFile extends PsiFileImpl
     private String path;
     private MockPsiDirectory directory;
 
-    public MockPsiFile(String fileName, String path) {
-        super(mock(FileViewProvider.class));
+    public MockPsiFile(String fileName, String path, FileViewProvider fileViewProviderMock) {
+        super(fileViewProviderMock);
 
         this.name = fileName;
         this.path = path;
