diff --git a/config/_default/params.toml b/config/_default/params.toml
index 5f1ccf9..49d3e3b 100644
--- a/config/_default/params.toml
+++ b/config/_default/params.toml
@@ -139,7 +139,7 @@ date_format = "Jan 2, 2006"
 #   Examples: "3:04 pm" or "15:04"
 time_format = "3:04 PM"
 
-# Address format (choose from the [address_formats] list below or add you own to the list).
+# Address format (en-us, en-gb, de, fr-fr, zh).
 address_format = "en-us"
 
 ############################
@@ -186,14 +186,6 @@ plugins_js  = []
   # Choose a shape for avatar images. Options: circle, square.
   shape = "circle"
 
-# Available address formats.
-[address_formats]
-  en-us = {order = ['street', 'city', 'region', 'postcode'], delimiters = [', ', ', ', ' ', '']}
-  en-gb = {order = ['street', 'city', 'region', 'postcode'], delimiters = [', ', ', ', ', ', '']}
-  de = {order = ['street', 'postcode', 'city'], delimiters = ['<br>', ' ', '']}
-  fr-fr = {order = ['street', 'postcode', 'city'], delimiters = ['<br>', ' ', '']}
-  zh = {order = ['postcode', 'region', 'city', 'street'], delimiters = [' ', ' ', ' ', '']}
-
 # Configuration of publication pages.
 [publications]
   # Date format (refer to https://sourcethemes.com/academic/docs/customization/#date-format )
diff --git a/static/admin/config.yml b/static/admin/config.yml
index 4c62dd1..00a9e06 100644
--- a/static/admin/config.yml
+++ b/static/admin/config.yml
@@ -1,8 +1,8 @@
 backend:
   name: git-gateway
   branch: master
-media_folder: 'static/img/'
-public_folder: 'img'
+media_folder: 'static/media/'
+public_folder: 'media'
 collections:
   - name: authors
     label: Authors
diff --git a/themes/academic b/themes/academic
index 7108eef..c0f0326 160000
--- a/themes/academic
+++ b/themes/academic
@@ -1 +1 @@
-Subproject commit 7108eefac11bda75a0859bd428fd147476f390a4
+Subproject commit c0f0326de7e4fb3f3d5e6f59d930870933672659