diff --git a/confluence-plugin/pom.xml b/confluence-plugin/pom.xml
index b16328e..6d27071 100644
--- a/confluence-plugin/pom.xml
+++ b/confluence-plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>git4c</artifactId>
         <groupId>com.networkedassets.git4c</groupId>
-        <version>1.6.2-BETA1</version>
+        <version>1.6.2-BETA2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -28,6 +28,18 @@
     <description>Git4C macro displaying documentation in various forms on pages</description>
     <packaging>atlassian-plugin</packaging>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>com.atlassian.confluence</groupId>
+                <artifactId>confluence-plugins-platform-pom</artifactId>
+                <version>${confluence.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <dependency>
             <groupId>junit</groupId>
@@ -46,12 +58,19 @@
                 </exclusion>
             </exclusions>
         </dependency>
+
         <!-- WIRED TEST RUNNER DEPENDENCIES -->
         <dependency>
             <groupId>com.atlassian.plugins</groupId>
             <artifactId>atlassian-plugins-osgi-testrunner</artifactId>
             <version>${plugin.testrunner.version}</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <artifactId>upm-api</artifactId>
+                    <groupId>com.atlassian.upm</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>javax.inject</groupId>
@@ -74,7 +93,7 @@
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>1.6.6</version>
+            <version>1.7.25</version>
             <scope>provided</scope>
         </dependency>
 
@@ -94,13 +113,11 @@
         <dependency>
             <groupId>com.atlassian.activeobjects</groupId>
             <artifactId>activeobjects-plugin</artifactId>
-            <version>1.2.3</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.atlassian.sal</groupId>
             <artifactId>sal-api</artifactId>
-            <version>2.7.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -118,13 +135,11 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-context</artifactId>
-            <version>2.5.6.SEC02</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>11.0.2-atlassian-01</version>
             <scope>runtime</scope>
         </dependency>
         <dependency>
@@ -166,6 +181,12 @@
             <groupId>com.fasterxml.jackson.module</groupId>
             <artifactId>jackson-module-kotlin</artifactId>
             <version>2.9.0</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>kotlin-reflect</artifactId>
+                    <groupId>org.jetbrains.kotlin</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jasypt</groupId>
@@ -182,7 +203,13 @@
         <dependency>
             <groupId>com.github.kittinunf.result</groupId>
             <artifactId>result</artifactId>
-            <version>1.1.0</version>
+            <version>1.2.0</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>kotlin-stdlib</artifactId>
+                    <groupId>org.jetbrains.kotlin</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
@@ -205,6 +232,16 @@
             <artifactId>kotlintest</artifactId>
             <version>2.0.7</version>
             <scope>test</scope>
+            <exclusions>
+                <exclusion>
+                    <artifactId>kotlin-stdlib</artifactId>
+                    <groupId>org.jetbrains.kotlin</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>kotlin-reflect</artifactId>
+                    <groupId>org.jetbrains.kotlin</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>hsqldb</groupId>
@@ -215,13 +252,11 @@
         <dependency>
             <groupId>net.java.dev.activeobjects</groupId>
             <artifactId>activeobjects-test</artifactId>
-            <version>1.2.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.atlassian.activeobjects</groupId>
             <artifactId>activeobjects-test</artifactId>
-            <version>1.2.3</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -246,6 +281,16 @@
             <groupId>uy.kohesive.klutter</groupId>
             <artifactId>klutter-core</artifactId>
             <version>2.2.0</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>kotlin-stdlib-jre8</artifactId>
+                    <groupId>org.jetbrains.kotlin</groupId>
+                </exclusion>
+                <exclusion>
+                    <artifactId>kotlin-stdlib</artifactId>
+                    <groupId>org.jetbrains.kotlin</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>com.atlassian.confluence.plugins</groupId>
@@ -253,6 +298,11 @@
             <version>${confluence-extractor-api-plugin.version}</version>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>com.atlassian.cache</groupId>
+            <artifactId>atlassian-cache-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>com.atlassian.labs</groupId>
             <artifactId>lucene-compat-plugin</artifactId>
@@ -307,10 +357,14 @@
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
-            <artifactId>commons-text</artifactId>
-            <version>1.4</version>
+            <artifactId>commons-lang3</artifactId>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-text</artifactId>
+            <version>1.6</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -365,13 +419,18 @@
                 <version>${amps.version}</version>
                 <extensions>true</extensions>
                 <configuration>
+                    <jvmArgs>-Xms1g -Xmx2g -XX:MaxPermSize=1g -XX:-UseGCOverheadLimit -server</jvmArgs>
                     <productVersion>${confluence.version}</productVersion>
                     <productDataVersion>${confluence.data.version}</productDataVersion>
                     <enableQuickReload>true</enableQuickReload>
-                    <enableFastdev>false</enableFastdev>
                     <extractDependencies>false</extractDependencies>
                     <compressResources>false</compressResources>
                     <allowGoogleTracking>false</allowGoogleTracking>
+                    <compressJs>false</compressJs>
+                    <systemPropertyVariables>
+                        <webdriver.browser>chrome</webdriver.browser>
+                        <atlassian.dev.mode>false</atlassian.dev.mode>
+                    </systemPropertyVariables>
                     <instructions>
                         <Import-Package>
                             com.atlassian.confluence.plugins.index.api,
@@ -487,4 +546,4 @@
             </plugin>
         </plugins>
     </build>
-</project>
\ No newline at end of file
+</project>
diff --git a/confluence-plugin/src/main/java/com/networkedassets/git4c/interfaces/callback/SingleFileMacroView.kt b/confluence-plugin/src/main/java/com/networkedassets/git4c/interfaces/callback/SingleFileMacroView.kt
index 9552611..4828a42 100644
--- a/confluence-plugin/src/main/java/com/networkedassets/git4c/interfaces/callback/SingleFileMacroView.kt
+++ b/confluence-plugin/src/main/java/com/networkedassets/git4c/interfaces/callback/SingleFileMacroView.kt
@@ -41,7 +41,7 @@ class SingleFileMacroView(
         //Yes, it can be null in some cases
         val macroUuid = params["uuid"] ?: return ""
 
-        val user = userManager.remoteUsername
+        val user  = userManager.remoteUser?.username!!
 
         if (conversionContext.outputType == "pdf" || conversionContext.outputType == "word") {
 
@@ -176,4 +176,4 @@ class SingleFileMacroView(
     override fun getOutputType(): Macro.OutputType {
         return Macro.OutputType.BLOCK
     }
-}
\ No newline at end of file
+}
diff --git a/confluence-plugin/src/main/resources/atlassian-plugin.xml b/confluence-plugin/src/main/resources/atlassian-plugin.xml
index d9eba7e..111cdb9 100644
--- a/confluence-plugin/src/main/resources/atlassian-plugin.xml
+++ b/confluence-plugin/src/main/resources/atlassian-plugin.xml
@@ -22,6 +22,7 @@
     <resource key="icons" name="icons/" type="download" location="images"/>
 
     <web-resource key="ace-${timestamp}" name="Ace editor">
+        <dependency>com.atlassian.auiplugin:ajs</dependency>
         <resource type="download" name="ace.js" location="lib/ace/ace.js"/>
         <context>com.networkedassets.git4c.ace</context>
     </web-resource>
@@ -199,6 +200,7 @@
     <web-resource key="multi-file-dialog-${timestamp}" name="DoC macro parameter autocompletion">
         <dependency>com.atlassian.auiplugin:aui-experimental-tooltips</dependency>
         <dependency>com.atlassian.auiplugin:aui-select2</dependency>
+        <dependency>com.atlassian.auiplugin:ajs</dependency>
         <dependency>com.networkedassets.git4c.confluence-plugin:git4c-api-${timestamp}</dependency>
         <dependency>com.networkedassets.git4c.confluence-plugin:select2single-${timestamp}</dependency>
         <dependency>com.networkedassets.git4c.confluence-plugin:custom-repository-dialog-${timestamp}</dependency>
@@ -212,6 +214,7 @@
     <web-resource key="single-file-dialog-${timestamp}" name="Create Single file dialog">
         <dependency>com.atlassian.auiplugin:aui-experimental-iconfont</dependency>
         <dependency>confluence.editor.actions:editor-macro-browser</dependency>
+        <dependency>com.atlassian.auiplugin:ajs</dependency>
         <dependency>com.networkedassets.git4c.confluence-plugin:git4c-api-${timestamp}</dependency>
         <dependency>com.networkedassets.git4c.confluence-plugin:nouislider-${timestamp}</dependency>
         <dependency>com.networkedassets.git4c.confluence-plugin:vuejs-${timestamp}</dependency>
@@ -241,6 +244,7 @@
     </web-resource>
 
     <web-resource key="macro-resources-${timestamp}" name="Macro web resources">
+        <dependency>com.atlassian.auiplugin:ajs</dependency>
         <resource name="polyfill.js" type="download" location="js/polyfill.js"/>
 
         <resource type="download" name="macroResources/"
@@ -296,6 +300,7 @@
 
     <web-resource key="single-file-macro-resources-${timestamp}" name="Single file macro web resources">
         <dependency>com.atlassian.auiplugin:aui-experimental-tooltips</dependency>
+        <dependency>com.atlassian.auiplugin:ajs</dependency>
         <resource type="download" name="images/" location="/images"/>
         <resource name="polyfill.js" type="download" location="js/polyfill.js"/>
         <resource type="download" name="singleFile/" location="/singleFile/"/>
@@ -305,7 +310,6 @@
                   location="singleFile/services/url-service.js"/>
         <resource type="download" name="topbartoggler.js" location="singleFile/components/topbartoggler.js"/>
         <resource type="download" name="topbar.js" location="singleFile/components/topbar.js"/>
-        <resource type="download" name="filecontent.js" location="singleFile/components/filecontent.js"/>
         <resource type="download" name="infodialog.js" location="singleFile/components/infodialog.js"/>
         <resource type="download" name="app.css" location="singleFile/app.css"/>
         <resource type="download" name="app.js" location="singleFile/app.js"/>
diff --git a/confluence-plugin/src/main/resources/components/tableofcontent/toc.js b/confluence-plugin/src/main/resources/components/tableofcontent/toc.js
index 2c3bc8c..9c873be 100644
--- a/confluence-plugin/src/main/resources/components/tableofcontent/toc.js
+++ b/confluence-plugin/src/main/resources/components/tableofcontent/toc.js
@@ -42,7 +42,7 @@ var Git4CToc = {
                 '       </span>' +
                 '    </li>' +
                 '    <ol v-show="data.children.length > 0 && open" style="margin: 0; padding-left: 15px;" v-bind:class="{ \'git4c-toc-first-ul\': level === 0 }">' +
-                '        <toc @anchor="anchor" v-for="t in data.children" :parent="parent" :data="t" :level="level+1" ></toc>' +
+                '        <toc @anchor="anchor" v-for="t in data.children" :parent="parent" :data="t" :level="level+1" v-bind:key="t.anchorName"></toc>' +
                 '    </ol>' +
                 '</div>'
             ,
@@ -97,4 +97,4 @@ var Git4CToc = {
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/confluence-plugin/src/main/resources/macroResources/index.html b/confluence-plugin/src/main/resources/macroResources/index.html
index 081d421..73e904a 100644
--- a/confluence-plugin/src/main/resources/macroResources/index.html
+++ b/confluence-plugin/src/main/resources/macroResources/index.html
@@ -214,4 +214,4 @@ <h3 class="header" style="display: inline-block">Files</h3>
     <script src="app.js"></script>
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/confluence-plugin/src/main/resources/macroResources/macro.vm b/confluence-plugin/src/main/resources/macroResources/macro.vm
index 3db197b..3f0c4dc 100644
--- a/confluence-plugin/src/main/resources/macroResources/macro.vm
+++ b/confluence-plugin/src/main/resources/macroResources/macro.vm
@@ -22,7 +22,4 @@
 #requireResourcesForContext("com.networkedassets.git4c.macroResources")
 #requireResourcesForContext("com.networkedassets.git4c.sourcedialog")
 
-<script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.9/ace.js" integrity="sha256-U//RSeH3TR3773Rk+1lAufJnRjEaG5LcdbvGV72kHEM=" crossorigin="anonymous"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.9/ext-modelist.js" integrity="sha256-i0OqQaptcaStnjDX8HR+vkkvOLXoAUBAquwMvnqmLTU=" crossorigin="anonymous"></script>
-
-$macroSectionHtml
\ No newline at end of file
+$macroSectionHtml
diff --git a/confluence-plugin/src/main/resources/singleFile/macro.vm b/confluence-plugin/src/main/resources/singleFile/macro.vm
index 958233d..47b9081 100644
--- a/confluence-plugin/src/main/resources/singleFile/macro.vm
+++ b/confluence-plugin/src/main/resources/singleFile/macro.vm
@@ -5,6 +5,7 @@
 #requireResource("com.atlassian.auiplugin:aui-experimental-iconfont")
 #requireResource("com.atlassian.auiplugin:aui-experimental-tooltips")
 #requireResource("com.atlassian.auiplugin:aui-spinner")
+#requireResourcesForContext('editor-v4,editor')
 #requireResourcesForContext("com.networkedassets.git4c.vuejs")
 #requireResourcesForContext("com.networkedassets.git4c.api")
 #requireResourcesForContext("com.networkedassets.git4c.ajscompat")
@@ -34,9 +35,6 @@
     <git4cinfodialog :edit-branch="editBranch" :original-branch-name="originalBranchName" :branch-name="branchName" :file-location="locationPath" :repository-name="repositoryName" ref="infodialog"></git4cinfodialog>
 </div>
 
-<script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.9/ace.js" integrity="sha256-U//RSeH3TR3773Rk+1lAufJnRjEaG5LcdbvGV72kHEM=" crossorigin="anonymous"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.2.9/ext-modelist.js" integrity="sha256-i0OqQaptcaStnjDX8HR+vkkvOLXoAUBAquwMvnqmLTU=" crossorigin="anonymous"></script>
-
 <script type="text/javascript">
 
 AJS.toInit(function () {
@@ -52,4 +50,4 @@ AJS.toInit(function () {
 })
 
 
-</script>
\ No newline at end of file
+</script>
diff --git a/confluence-plugin/src/main/resources/singleFileDialog/main.js b/confluence-plugin/src/main/resources/singleFileDialog/main.js
index 24dfbae..e932564 100644
--- a/confluence-plugin/src/main/resources/singleFileDialog/main.js
+++ b/confluence-plugin/src/main/resources/singleFileDialog/main.js
@@ -1207,8 +1207,8 @@
                 },
                 mounted: function () {
                     const vm = this
-                    this.init()
-                    this.getRepositoryList()
+                    vm.init()
+                    vm.getRepositoryList()
                     Bus.$on("closeCustomRepositoryDialog", function() {vm.closeCustomRepositoryDialog()})
                     Bus.$on("repositoryDefined", function(repository) {vm.processRepository(repository)})
                 }
diff --git a/pom.xml b/pom.xml
index ab3fa94..b74e86e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,7 @@
     <groupId>com.networkedassets.git4c</groupId>
     <artifactId>git4c</artifactId>
     <packaging>pom</packaging>
-    <version>1.6.2-BETA1</version>
+    <version>1.6.2-BETA2</version>
 
     <modules>
         <module>confluence-plugin</module>
@@ -20,13 +20,13 @@
         <logbackVersion>1.0.13</logbackVersion>
         <jerseyVersion>2.24</jerseyVersion>
         <jackson.version>2.8.4</jackson.version>
-        <confluence.version>7.0.0</confluence.version>
-        <confluence.data.version>7.0.0</confluence.data.version>
+        <confluence.version>7.4.6</confluence.version>
+        <confluence.data.version>7.4.6</confluence.data.version>
         <atlassian.spring.scanner.version>1.2.6</atlassian.spring.scanner.version>
         <!-- This key is used to keep the consistency between the key in atlassian-plugin.xml and the key to generate bundle. -->
         <atlassian.plugin.key>${project.groupId}.${project.artifactId}</atlassian.plugin.key>
-        <amps.version>8.1.0</amps.version>
-        <plugin.testrunner.version>1.2.3</plugin.testrunner.version>
+        <amps.version>8.2.0</amps.version>
+        <plugin.testrunner.version>2.0.2</plugin.testrunner.version>
         <kotlin.version>1.1.60</kotlin.version>
     </properties>
 
@@ -134,4 +134,4 @@
     </build>
 
 
-</project>
\ No newline at end of file
+</project>
diff --git a/seleniumtests/pom.xml b/seleniumtests/pom.xml
index 8e465ba..05bc79e 100644
--- a/seleniumtests/pom.xml
+++ b/seleniumtests/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <artifactId>git4c</artifactId>
         <groupId>com.networkedassets.git4c</groupId>
-        <version>1.6.2-BETA1</version>
+        <version>1.6.2-BETA2</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>