diff --git a/.eslintrc.yml b/.eslintrc.yml
index 3504314..81b1f52 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -8,13 +8,12 @@ plugins:
   - sort-imports-es6-autofix
 
 parserOptions:
-  ecmaVersion: 8
+  ecmaVersion: 9
   sourceType: module
+  experimentalObjectRestSpread: true
 
 globals:
-  pageState: writable
   pageContent: writable
-  realPages: writable
   module: writable
 
 
diff --git a/src/pages/Login.js b/src/pages/Login.js
index e3476e8..1441d25 100644
--- a/src/pages/Login.js
+++ b/src/pages/Login.js
@@ -4,6 +4,7 @@ import { Page } from "../types/Page.js";
 import { changePage, setErrorText, setPageContent } from "../pageUtils.js";
 import { lookupSelf, usernameLogin } from "../api.js";
 import { makeElement } from "../htmlUtils.js";
+import { pageState } from "../globalPageState.js";
 import i18next from 'i18next';
 
 export class LoginPage extends Page {
diff --git a/src/pages/SetVaultURL.js b/src/pages/SetVaultURL.js
index 0b457b7..2fbd2c9 100644
--- a/src/pages/SetVaultURL.js
+++ b/src/pages/SetVaultURL.js
@@ -1,6 +1,7 @@
 import { Page } from "../types/Page.js";
 import { changePage, setPageContent } from "../pageUtils.js";
 import { makeElement } from "../htmlUtils.js";
+import { pageState } from "../globalPageState.js";
 
 export class SetVaultURLPage extends Page {
   constructor() {