diff --git a/Albumart/AlbumartProviders.lua b/Albumart/AlbumartProviders.lua
index cdd0ea4..f7fbff2 100644
--- a/Albumart/AlbumartProviders.lua
+++ b/Albumart/AlbumartProviders.lua
@@ -13,13 +13,13 @@ local p_coverartarchive = {
 local p_fanart_tv = {
     name = "Fanart.tv",
     get = function(song, out)
-        if not mympd_env.var_fanart_tv_api_key or
+        if not mympd_env.var.fanart_tv_api_key or
            not song.MUSICBRAINZ_ARTISTID or
            not song.MUSICBRAINZ_RELEASEGROUPID
         then
             return 1
         end
-        local uri = "http://webservice.fanart.tv/v3/music/" .. song.MUSICBRAINZ_ARTISTID[1] .. "?api_key=" .. mympd_env.var_fanart_tv_api_key
+        local uri = "http://webservice.fanart.tv/v3/music/" .. song.MUSICBRAINZ_ARTISTID[1] .. "?api_key=" .. mympd_env.var.fanart_tv_api_key
         local rc, code, header, body = mympd.http_client("GET", uri, "", "")
         if rc == 1 then
             return 1
diff --git a/Jukebox/JukeboxBlissify.lua b/Jukebox/JukeboxBlissify.lua
index 3cc334c..bc73e86 100644
--- a/Jukebox/JukeboxBlissify.lua
+++ b/Jukebox/JukeboxBlissify.lua
@@ -1,10 +1,10 @@
 -- {"name": "JukeboxBlissify", "file": "Jukebox/JukeboxBlissify.lua", "version": 7, "desc": "Uses blissify-rs to populate the jukebox queue.", "order":0,"arguments":["addToQueue"]}
-local blissify_path = mympd_env.var_blissify_path
+local blissify_path = mympd_env.var.blissify_path
 local blissify_config = ""
-if mympd_env.var_blissify_config ~= nil and
-   mympd_env.var_blissify_config ~= ""
+if mympd_env.var.blissify_config ~= nil and
+   mympd_env.var.blissify_config ~= ""
 then
-    blissify_config = "-c " .. mympd_env.var_blissify_config
+    blissify_config = "-c " .. mympd_env.var.blissify_config
 end
 local addSongs = 1
 local min_jukebox_length = 50
diff --git a/ListenBrainz/ListenBrainzFeedback.lua b/ListenBrainz/ListenBrainzFeedback.lua
index 218f7d4..e244b6a 100644
--- a/ListenBrainz/ListenBrainzFeedback.lua
+++ b/ListenBrainz/ListenBrainzFeedback.lua
@@ -1,11 +1,11 @@
 -- {"name": "ListenBrainzFeedback", "file": "ListenBrainz/ListenBrainzFeedback.lua", "version": 1, "desc": "Sends feedback to ListenBrainz.", "order":0, "arguments":["uri","vote","type"]}
-if mympd_env.var_listenbrainz_token == nil then
+if mympd_env.var.listenbrainz_token == nil then
   return "No ListenBrainz token set"
 end
 
 local uri = "https://api.listenbrainz.org/1/feedback/recording-feedback"
 local extra_headers = "Content-type: application/json\r\n"..
-  "Authorization: Token " .. mympd_env.var_listenbrainz_token .. "\r\n"
+  "Authorization: Token " .. mympd_env.var.listenbrainz_token .. "\r\n"
 
 local vote
 if mympd_arguments.type == "like" then
diff --git a/ListenBrainz/ListenBrainzPlayer.lua b/ListenBrainz/ListenBrainzPlayer.lua
index ebdc7af..31cd396 100644
--- a/ListenBrainz/ListenBrainzPlayer.lua
+++ b/ListenBrainz/ListenBrainzPlayer.lua
@@ -1,11 +1,11 @@
 -- {"name": "ListenBrainzPlayer", "file": "ListenBrainz/ListenBrainzPlayer.lua", "version": 2, "desc": "Sends the now playing info to ListenBrainz.", "order":0, "arguments":[]}
-if mympd_env.var_listenbrainz_token == nil then
+if mympd_env.var.listenbrainz_token == nil then
   return "No ListenBrainz token set"
 end
 
 local uri = "https://api.listenbrainz.org/1/feedback/recording-feedback"
 local extra_headers = "Content-type: application/json\r\n"..
-  "Authorization: Token " .. mympd_env.var_listenbrainz_token .. "\r\n"
+  "Authorization: Token " .. mympd_env.var.listenbrainz_token .. "\r\n"
 
 mympd.init()
 
diff --git a/ListenBrainz/ListenBrainzPlaylistImport.lua b/ListenBrainz/ListenBrainzPlaylistImport.lua
index 8f0b184..6e10abf 100644
--- a/ListenBrainz/ListenBrainzPlaylistImport.lua
+++ b/ListenBrainz/ListenBrainzPlaylistImport.lua
@@ -1,10 +1,10 @@
 -- {"name": "ListenBrainzPlaylistImport", "file": "ListenBrainz/ListenBrainzPlaylistImport.lua", "version": 2, "desc": "Imports generated playlists from ListenBrainz.", "order":1, "arguments":[]}
 
-local extra_headers = "Authorization: Token " .. mympd_env.var_listenbrainz_token .. "\r\n"
+local extra_headers = "Authorization: Token " .. mympd_env.var.listenbrainz_token .. "\r\n"
 
 local function fetch_playlists()
     local uri = "https://api.listenbrainz.org/1/user/" ..
-        mympd_env.var_listenbrainz_username .. "/playlists/createdfor"
+        mympd_env.var.listenbrainz_username .. "/playlists/createdfor"
     local rc, code, headers, body = mympd.http_client("GET", uri, extra_headers, "")
     if rc == 1 then
         return "Failure fetching playlists"
diff --git a/ListenBrainz/ListenBrainzScrobbler.lua b/ListenBrainz/ListenBrainzScrobbler.lua
index f0038d5..7100e94 100644
--- a/ListenBrainz/ListenBrainzScrobbler.lua
+++ b/ListenBrainz/ListenBrainzScrobbler.lua
@@ -1,11 +1,11 @@
 -- {"name": "ListenBrainzScrobbler", "file": "ListenBrainz/ListenBrainzScrobbler.lua", "version": 2, "desc": "Scrobbles songs to ListenBrainz.", "order":0, "arguments":[]}
-if mympd_env.var_listenbrainz_token == nil then
+if mympd_env.var.listenbrainz_token == nil then
   return "No ListenBrainz token set"
 end
 
 local uri = "https://api.listenbrainz.org/1/submit-listens"
 local extra_headers = "Content-type: application/json\r\n"..
-  "Authorization: Token " .. mympd_env.var_listenbrainz_token .. "\r\n"
+  "Authorization: Token " .. mympd_env.var.listenbrainz_token .. "\r\n"
 
 mympd.init()
 
diff --git a/ListenBrainz/ListenBrainzSetPin.lua b/ListenBrainz/ListenBrainzSetPin.lua
index 9d033d1..c4a88d1 100644
--- a/ListenBrainz/ListenBrainzSetPin.lua
+++ b/ListenBrainz/ListenBrainzSetPin.lua
@@ -1,12 +1,12 @@
 -- {"name": "ListenBrainzSetPin", "file": "ListenBrainz/ListenBrainzSetPin.lua", "version": 1, "desc": "Sets or unsets the pin on ListenBrainz.", "order":1, "arguments":["uri","blurb_content","pinned_until"]}
-if mympd_env.var_listenbrainz_token == nil then
+if mympd_env.var.listenbrainz_token == nil then
   return "No ListenBrainz token set"
 end
 
 local pin_uri = "https://api.listenbrainz.org/1/pin"
 local unpin_uri = "https://api.listenbrainz.org/1/pin/unpin"
 local extra_headers = "Content-type: application/json\r\n"..
-  "Authorization: Token " .. mympd_env.var_listenbrainz_token .. "\r\n"
+  "Authorization: Token " .. mympd_env.var.listenbrainz_token .. "\r\n"
 local payload = ""
 local uri = ""
 
diff --git a/Maloja/MalojaScrobbler.lua b/Maloja/MalojaScrobbler.lua
index d2e51e6..177f0ff 100644
--- a/Maloja/MalojaScrobbler.lua
+++ b/Maloja/MalojaScrobbler.lua
@@ -1,9 +1,9 @@
 -- {"name": "MalojaScrobbler", "file": "Maloja/MalojaScrobbler.lua", "version": 2, "desc": "Scrobbles songs to your Maloja server.", "order":0, "arguments":[]}
-if mympd_env.var_maloja_token == nil then
+if mympd_env.var.maloja_token == nil then
     return "No Maloja token set"
 end
 
-if mympd_env.var_maloja_uri == nil then
+if mympd_env.var.maloja_uri == nil then
     return "No Maloja URI set"
 end
 
@@ -17,7 +17,7 @@ then
     return
 end
 
-local uri = mympd_env.var_maloja_host .. "/apis/mlj_1/newscrobble?key=" .. mympd_env.var_maloja_token
+local uri = mympd_env.var.maloja_host .. "/apis/mlj_1/newscrobble?key=" .. mympd_env.var.maloja_token
 local extra_headers = "Content-type: application/json\r\n"
 
 local payload = json.encode({
diff --git a/Tagart/TagartProviders.lua b/Tagart/TagartProviders.lua
index 792ee86..8f2e6b6 100644
--- a/Tagart/TagartProviders.lua
+++ b/Tagart/TagartProviders.lua
@@ -7,7 +7,7 @@ local p_fanart_tv = {
         AlbumArtist = true
     },
     get = function(tag, value, out)
-        if not mympd_env.var_fanart_tv_api_key
+        if not mympd_env.var.fanart_tv_api_key
         then
             return 1
         end
@@ -33,7 +33,7 @@ local p_fanart_tv = {
             return 1
         end
 
-        local uri = "http://webservice.fanart.tv/v3/music/" .. song.data[1].MUSICBRAINZ_ARTISTID[1] .. "?api_key=" .. mympd_env.var_fanart_tv_api_key
+        local uri = "http://webservice.fanart.tv/v3/music/" .. song.data[1].MUSICBRAINZ_ARTISTID[1] .. "?api_key=" .. mympd_env.var.fanart_tv_api_key
         rc, code, header, body = mympd.http_client("GET", uri, "", "")
         if rc == 1 then
             return 1
diff --git a/last.fm/lastfm.lua b/last.fm/lastfm.lua
index 5ef3ed8..bc49b06 100644
--- a/last.fm/lastfm.lua
+++ b/last.fm/lastfm.lua
@@ -27,7 +27,7 @@ end
 
 local function sendData(data)
   local extra_headers = 'Content-type: application/x-www-form-urlencoded\r\n'
-  local hash = hashRequest(data, mympd_env.var_lastfm_secret)
+  local hash = hashRequest(data, mympd_env.var.lastfm_secret)
   data["api_sig"] = hash
   data = urlencode_data(data)
   local rc, code, headers, body = mympd.http_client("POST", "https://ws.audioscrobbler.com/2.0/?format=json", extra_headers, data)
@@ -56,12 +56,12 @@ if mympd_arguments.trigger == "player" then
 
   local data = {
     method      = "track.updateNowPlaying",
-    api_key     = mympd_env.var_lastfm_api_key,
+    api_key     = mympd_env.var.lastfm_api_key,
     track       = mympd_state.current_song.Title,
     artist      = mympd_state.current_song.Artist[1],
     album       = mympd_state.current_song.Album,
     albumArtist = mympd_state.current_song.AlbumArtist[1],
-    sk          = mympd_env.var_lastfm_session_key,
+    sk          = mympd_env.var.lastfm_session_key,
   }
 
   local rc, body = sendData(data)
@@ -85,13 +85,13 @@ if mympd_arguments.trigger == "scrobble" then
 
   local data = {
     method      = "track.scrobble",
-    api_key     = mympd_env.var_lastfm_api_key,
+    api_key     = mympd_env.var.lastfm_api_key,
     timestamp   = tostring(mympd_state.start_time),
     track       = mympd_state.current_song.Title,
     artist      = mympd_state.current_song.Artist[1],
     album       = mympd_state.current_song.Album,
     albumArtist = mympd_state.current_song.AlbumArtist[1],
-    sk          = mympd_env.var_lastfm_session_key,
+    sk          = mympd_env.var.lastfm_session_key,
   }
 
   local rc, body = sendData(data)
@@ -125,10 +125,10 @@ if mympd_arguments.trigger == "feedback" then
 
   local data = {
     method      = "track.love",
-    api_key     = mympd_env.var_lastfm_api_key,
+    api_key     = mympd_env.var.lastfm_api_key,
     track       = mympd_state.current_song.Title,
     artist      = mympd_state.current_song.Artist[1],
-    sk          = mympd_env.var_lastfm_session_key,
+    sk          = mympd_env.var.lastfm_session_key,
   }
 
   local rc, body = sendData(data)
@@ -153,7 +153,7 @@ if mympd_arguments.trigger == "fetchkey" then
     method   = "auth.getMobileSession",
     username = mympd_arguments.Username,
     password = mympd_arguments.Password,
-    api_key  = mympd_env.var_lastfm_api_key,
+    api_key  = mympd_env.var.lastfm_api_key,
   }
 
   local rc, body = sendData(data)