diff --git a/src/awk/releases.awk b/src/awk/releases.awk
index e43cfbc..abf1ebc 100644
--- a/src/awk/releases.awk
+++ b/src/awk/releases.awk
@@ -19,14 +19,14 @@ BEGIN {
   title = $9
   artist = $10
   switch (status) {
-    case "Official": line_status=release_official; break
-    case "Promotion": line_status=release_promotion; break
-    case "Bootleg": line_status=release_bootleg; break
-    case "Pseudo-release": line_status=release_pseudo; break
-    case "Withdrawn": line_status=release_withdrawn; break
-    case "Expunged": line_status=release_expunged; break
-    case "Cancelled": line_status=release_cancelled; break
-    default: line_status=""
+    case "Official": line_status = release_official; break
+    case "Promotion": line_status = release_promotion; break
+    case "Bootleg": line_status = release_bootleg; break
+    case "Pseudo-release": line_status = release_pseudo; break
+    case "Withdrawn": line_status = release_withdrawn; break
+    case "Expunged": line_status = release_expunged; break
+    case "Cancelled": line_status = release_cancelled; break
+    default: line_status = ""
   }
   line = release_format
   if (artist != rg_artist && title != rg_title)
@@ -37,8 +37,6 @@ BEGIN {
     line = line "\t" release_format_title
   else
     line = line "\t"
-  if (local_releases[id])
-    line = format_local line
 
   sub("<<status>>", line_status, line)
   sub("<<year>>", year, line)
@@ -52,5 +50,7 @@ BEGIN {
   sub("<<artist>>", artist, line)
   sub("<<country>>", country, line)
   sortk = year ? year : 0
+  if (local_releases[id])
+    line = format_local line
   print sortk, line, id
 }
diff --git a/src/sh/theme.sh b/src/sh/theme.sh
index 547af7d..4e36e4c 100644
--- a/src/sh/theme.sh
+++ b/src/sh/theme.sh
@@ -18,14 +18,14 @@ ARTIST_PROMPT="${ARTIST_PROMPT:-"🎤 ${CARTIST}%s$OFF 〉"}"
 FULL_PROMPT="${FULL_PROMPT:-"🎤 ${CARTIST}%s$OFF 》${CTITLE}%s$OFF 〉"}"
 
 # Artist view
-AV_PERSON="${AV_PERSON:-"🧑‍🎤 $CARTIST<<name>>${OFF}"}"
-AV_GROUP="${AV_GROUP:-"🧑‍🤝‍🧑 $CARTIST<<name>>${OFF}"}"
-AV_DISAMBIGUATION="${AV_DISAMBIGUATION:-"$CDISAMB(<<disambiguation>>)${OFF}"}"
+AV_PERSON="${AV_PERSON:-"🧑‍🎤 $CARTIST<<name>>$OFF"}"
+AV_GROUP="${AV_GROUP:-"🧑‍🤝‍🧑 $CARTIST<<name>>$OFF"}"
+AV_DISAMBIGUATION="${AV_DISAMBIGUATION:-"$CDISAMB(<<disambiguation>>)$OFF"}"
 
 # Release group view
-RGV_RELEASE="${RGV_RELEASE:-"${CTITLE}<<title>>$OFF"}"
-RGV_RELEASE_W_ARTIST="${RGV_RELEASE_W_ARTIST:-"${CTITLE}<<title>>$OFF — ${CARTIST}<<artist>>$OFF"}"
-RGV_YEAR="${RGV_YEAR:-"${CYEAR}(<<year>>)${OFF}"}"
+RGV_RELEASE="${RGV_RELEASE:-"${CTITLE}<<title>>"}"
+RGV_RELEASE_W_ARTIST="${RGV_RELEASE_W_ARTIST:-"${CTITLE}<<title>> — ${CARTIST}<<artist>>"}"
+RGV_YEAR="${RGV_YEAR:-"${CYEAR}(<<year>>)$OFF"}"
 
 # Types
 FORMAT_TYPE_ALBUM="${FORMAT_TYPE_ALBUM:-"LP 💽"}"
@@ -34,7 +34,7 @@ FORMAT_TYPE_SINGLE="${FORMAT_TYPE_SINGLE:-"SI 🎶"}"
 FORMAT_TYPE_BROADCAST="${FORMAT_TYPE_BROADCAST:-"BR 📻"}"
 FORMAT_TYPE_OTHER="${FORMAT_TYPE_OTHER:-"OT ❔"}"
 FORMAT_TYPE_HAS_SECONDARY="${FORMAT_TYPE_HAS_SECONDARY:-"%s☼"}"
-FORMAT_TYPE_SECONDARY="${FORMAT_TYPE_SECONDARY:-"${CNOTE}[☼: %s]$OFF"}"
+FORMAT_TYPE_SECONDARY="${FORMAT_TYPE_SECONDARY:-"${CNOTE}[☼: %s]"}"
 FORMAT_TYPE_SECONDARY_COMPILATION="${FORMAT_TYPE_SECONDARY_COMPILATION:-"🧩 compilation"}"
 FORMAT_TYPE_SECONDARY_SOUNDTRACK="${FORMAT_TYPE_SECONDARY_SOUNDTRACK:-"🎬 soundtrack"}"
 FORMAT_TYPE_SECONDARY_SPOKENWORD="${FORMAT_TYPE_SECONDARY_SPOKENWORD:-"📖 spokenword"}"
@@ -66,10 +66,10 @@ FORMAT_STATUS_EXPUNGED="${FORMAT_STATUS_EXPUNGED:-"🧹 expunged"}"
 FORMAT_STATUS_CANCELLED="${FORMAT_STATUS_CANCELLED:-"❌ cancelled"}"
 
 # Release view
-RV_FORMAT="<<status>>\t${CXXX}<<tracks>> tracks\t<<media>>${OFF}\t${CYEAR}<<year>>\t<<country>>${OFF}\t${CARTIST}<<label>>$OFF"
-RV_TITLE_ARTIST="${FAINT}as ${CTITLE}<<title>>$OFF by ${FAINT}${CARTIST}<<artist>>$OFF"
+RV_FORMAT="<<status>>\t${CXXX}<<tracks>> tracks\t<<media>>\t${CYEAR}<<year>>\t<<country>>\t${CARTIST}<<label>>$OFF"
+RV_TITLE_ARTIST="${FAINT}as ${CTITLE}<<title>> by ${FAINT}${CARTIST}<<artist>>$OFF"
 RV_TITLE="${FAINT}as ${CTITLE}<<title>>$OFF"
 RV_ARTIST="${FAINT}by ${CARTIST}<<artist>>$OFF"
 
 # Recording view
-REC_FORMAT="${CNOTE}${FAINT}<<med>>$OFF\t${CNOTE}<<nr>>$OFF\t${CTITLE}<<title>>$OFF\t${CARTIST}<<artist>>$OFF\t${CXXX}<<duration>>$OFF"
+REC_FORMAT="${CNOTE}${FAINT}<<med>>\t${CNOTE}<<nr>>\t${CTITLE}<<title>>\t${CARTIST}<<artist>>\t${CXXX}<<duration>>$OFF"