diff --git a/.env.TEMPLATE b/.env.TEMPLATE
index 89fa715e..4759cf07 100644
--- a/.env.TEMPLATE
+++ b/.env.TEMPLATE
@@ -5,7 +5,9 @@
#
# wger instance
-REACT_APP_API_SERVER=https://wger.de
+VITE_API_SERVER=https://wger.de
# API token for the user
-REACT_APP_API_KEY=your-api-token-here
\ No newline at end of file
+VITE_API_KEY=your-api-token-here
+
+VITE_TIME_ZONE=Europe/Berlin
\ No newline at end of file
diff --git a/.env.production b/.env.production
index 1cbd3e8b..7ca5b4d3 100644
--- a/.env.production
+++ b/.env.production
@@ -1,6 +1,6 @@
# During production the wger instance is the same server from which the scripts
# are executed.
-REACT_APP_API_SERVER=
+VITE_API_SERVER=
# Don't generate source maps for production
GENERATE_SOURCEMAP=false
\ No newline at end of file
diff --git a/.env.test b/.env.test
deleted file mode 100644
index 2bf98c3d..00000000
--- a/.env.test
+++ /dev/null
@@ -1,5 +0,0 @@
-# wger instance
-REACT_APP_API_SERVER=https://example.com
-
-# API token for the user
-REACT_APP_API_KEY=122333444455555666666
diff --git a/__mocks__/fileMock.js b/__mocks__/fileMock.js
new file mode 100644
index 00000000..85d4e538
--- /dev/null
+++ b/__mocks__/fileMock.js
@@ -0,0 +1 @@
+module.exports = 'test-file-stub'
\ No newline at end of file
diff --git a/__mocks__/styleMock.js b/__mocks__/styleMock.js
new file mode 100644
index 00000000..7c6d6c73
--- /dev/null
+++ b/__mocks__/styleMock.js
@@ -0,0 +1 @@
+module.exports = {}
\ No newline at end of file
diff --git a/public/index.html b/index.html
similarity index 74%
rename from public/index.html
rename to index.html
index 39cfbb6e..29acd9f2 100644
--- a/public/index.html
+++ b/index.html
@@ -2,34 +2,34 @@
-
-
-
+
+
+
-
+
-
+