diff --git a/roles/fedora-web/alt/files/languages.conf b/roles/fedora-web/alt/files/languages.conf
index 4f4c5f3999..b372a8d209 100644
--- a/roles/fedora-web/alt/files/languages.conf
+++ b/roles/fedora-web/alt/files/languages.conf
@@ -3,70 +3,41 @@ AddType text/html .bn
 AddType text/html .el
 AddType text/html .nb
 AddType text/html .pl
-AddType text/html .tr
 AddType text/html .es
+AddType text/html .tr
  
-AddLanguage af .af
 AddLanguage ar .ar
-AddLanguage as .as
-AddLanguage ast .ast
-AddLanguage bal .bal
 AddLanguage bg .bg
 AddLanguage bn .bn
 AddLanguage bn-in .bn_IN
-AddLanguage br .br
 AddLanguage ca .ca
 AddLanguage cs .cs
 AddLanguage da .da
 AddLanguage de .de
-AddLanguage de-ch .de_CH
-AddLanguage el .el
 AddLanguage en .en
-AddLanguage en-gb .en_GB
 AddLanguage es .es
-AddLanguage eu .eu
 AddLanguage fa .fa
 AddLanguage fi .fi
 AddLanguage fr .fr
 AddLanguage fur .fur
-AddLanguage gl .gl
 AddLanguage gu .gu
 AddLanguage he .he
-AddLanguage hi .hi
 AddLanguage hu .hu
-AddLanguage ia .ia
 AddLanguage id .id
-AddLanguage is .is
 AddLanguage it .it
 AddLanguage ja .ja
-AddLanguage ka .ka
-AddLanguage kn .kn
+AddLanguage km .km
 AddLanguage ko .ko
-AddLanguage lv .lv
-AddLanguage ml .ml
-AddLanguage mr .mr
-AddLanguage nb .nb
-AddLanguage nl .nl
-AddLanguage or .or
-AddLanguage pa .pa
+AddLanguage ne .ne
 AddLanguage pl .pl
 AddLanguage pt .pt
 AddLanguage pt-br .pt_BR
-AddLanguage ro .ro
-AddLanguage ru .ru
+AddLanguage si .si
 AddLanguage sk .sk
-AddLanguage sq .sq
-AddLanguage sr .sr
 AddLanguage sv .sv
-AddLanguage ta .ta
-AddLanguage te .te
-AddLanguage tg .tg
-AddLanguage th .th
 AddLanguage tr .tr
 AddLanguage uk .uk
-AddLanguage vi .vi
-AddLanguage zh-cn .zh_CN
-AddLanguage zh-tw .zh_TW
+AddLanguage zh-cn .zh_Hans_CN
 
 LanguagePriority en
 ForceLanguagePriority Prefer Fallback
@@ -75,72 +46,43 @@ AddDefaultCharset utf-8
 
 RewriteEngine on
 
-RewriteCond %{QUERY_STRING} ^lang=(af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB|es|eu|fa|fi|fr|fur|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW)$
-RewriteRule ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB|es|eu|fa|fi|fr|fur|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW))?(/.*)$ /%1$1? [R=301]
-AliasMatch ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB|es|eu|fa|fi|fr|fur|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW))(/.*)?$ /srv/web/alt.fedoraproject.org$1
+RewriteCond %{QUERY_STRING} ^lang=(ar|bg|bn|bn_IN|ca|cs|da|de|en|es|fa|fi|fr|fur|gu|he|hu|id|it|ja|km|ko|ne|pl|pt|pt_BR|si|sk|sv|tr|uk|zh_Hans_CN)$
+RewriteRule ^(?:/(?:ar|bg|bn|bn_IN|ca|cs|da|de|en|es|fa|fi|fr|fur|gu|he|hu|id|it|ja|km|ko|ne|pl|pt|pt_BR|si|sk|sv|tr|uk|zh_Hans_CN))?(/.*)$ /%1$1? [R=301]
+AliasMatch ^(?:/(?:ar|bg|bn|bn_IN|ca|cs|da|de|en|es|fa|fi|fr|fur|gu|he|hu|id|it|ja|km|ko|ne|pl|pt|pt_BR|si|sk|sv|tr|uk|zh_Hans_CN))(/.*)?$ /srv/web/alt.fedoraproject.org$1
 
 <Directory /srv/web/alt.fedoraproject.org>
   Options MultiViews
 
-  SetEnvIf Request_URI ^/af/ prefer-language=af
   SetEnvIf Request_URI ^/ar/ prefer-language=ar
-  SetEnvIf Request_URI ^/as/ prefer-language=as
-  SetEnvIf Request_URI ^/ast/ prefer-language=ast
-  SetEnvIf Request_URI ^/bal/ prefer-language=bal
   SetEnvIf Request_URI ^/bg/ prefer-language=bg
   SetEnvIf Request_URI ^/bn/ prefer-language=bn
   SetEnvIf Request_URI ^/bn_IN/ prefer-language=bn-in
-  SetEnvIf Request_URI ^/br/ prefer-language=br
   SetEnvIf Request_URI ^/ca/ prefer-language=ca
   SetEnvIf Request_URI ^/cs/ prefer-language=cs
   SetEnvIf Request_URI ^/da/ prefer-language=da
   SetEnvIf Request_URI ^/de/ prefer-language=de
-  SetEnvIf Request_URI ^/de_CH/ prefer-language=de-ch
-  SetEnvIf Request_URI ^/el/ prefer-language=el
   SetEnvIf Request_URI ^/en/ prefer-language=en
-  SetEnvIf Request_URI ^/en_GB/ prefer-language=en-gb
   SetEnvIf Request_URI ^/es/ prefer-language=es
-  SetEnvIf Request_URI ^/eu/ prefer-language=eu
   SetEnvIf Request_URI ^/fa/ prefer-language=fa
   SetEnvIf Request_URI ^/fi/ prefer-language=fi
   SetEnvIf Request_URI ^/fr/ prefer-language=fr
   SetEnvIf Request_URI ^/fur/ prefer-language=fur
-  SetEnvIf Request_URI ^/gl/ prefer-language=gl
   SetEnvIf Request_URI ^/gu/ prefer-language=gu
   SetEnvIf Request_URI ^/he/ prefer-language=he
-  SetEnvIf Request_URI ^/hi/ prefer-language=hi
   SetEnvIf Request_URI ^/hu/ prefer-language=hu
-  SetEnvIf Request_URI ^/ia/ prefer-language=ia
   SetEnvIf Request_URI ^/id/ prefer-language=id
-  SetEnvIf Request_URI ^/is/ prefer-language=is
   SetEnvIf Request_URI ^/it/ prefer-language=it
   SetEnvIf Request_URI ^/ja/ prefer-language=ja
-  SetEnvIf Request_URI ^/ka/ prefer-language=ka
-  SetEnvIf Request_URI ^/kn/ prefer-language=kn
+  SetEnvIf Request_URI ^/km/ prefer-language=km
   SetEnvIf Request_URI ^/ko/ prefer-language=ko
-  SetEnvIf Request_URI ^/lv/ prefer-language=lv
-  SetEnvIf Request_URI ^/ml/ prefer-language=ml
-  SetEnvIf Request_URI ^/mr/ prefer-language=mr
-  SetEnvIf Request_URI ^/nb/ prefer-language=nb
-  SetEnvIf Request_URI ^/nl/ prefer-language=nl
-  SetEnvIf Request_URI ^/or/ prefer-language=or
-  SetEnvIf Request_URI ^/pa/ prefer-language=pa
+  SetEnvIf Request_URI ^/ne/ prefer-language=ne
   SetEnvIf Request_URI ^/pl/ prefer-language=pl
   SetEnvIf Request_URI ^/pt/ prefer-language=pt
   SetEnvIf Request_URI ^/pt_BR/ prefer-language=pt-br
-  SetEnvIf Request_URI ^/ro/ prefer-language=ro
-  SetEnvIf Request_URI ^/ru/ prefer-language=ru
+  SetEnvIf Request_URI ^/si/ prefer-language=si
   SetEnvIf Request_URI ^/sk/ prefer-language=sk
-  SetEnvIf Request_URI ^/sq/ prefer-language=sq
-  SetEnvIf Request_URI ^/sr/ prefer-language=sr
   SetEnvIf Request_URI ^/sv/ prefer-language=sv
-  SetEnvIf Request_URI ^/ta/ prefer-language=ta
-  SetEnvIf Request_URI ^/te/ prefer-language=te
-  SetEnvIf Request_URI ^/tg/ prefer-language=tg
-  SetEnvIf Request_URI ^/th/ prefer-language=th
   SetEnvIf Request_URI ^/tr/ prefer-language=tr
   SetEnvIf Request_URI ^/uk/ prefer-language=uk
-  SetEnvIf Request_URI ^/vi/ prefer-language=vi
-  SetEnvIf Request_URI ^/zh_CN/ prefer-language=zh-cn
-  SetEnvIf Request_URI ^/zh_TW/ prefer-language=zh-tw
+  SetEnvIf Request_URI ^/zh_Hans_CN/ prefer-language=zh-cn
 </Directory>
diff --git a/roles/fedora-web/arm/files/languages.conf b/roles/fedora-web/arm/files/languages.conf
index 3bb251f2b0..287271351a 100644
--- a/roles/fedora-web/arm/files/languages.conf
+++ b/roles/fedora-web/arm/files/languages.conf
@@ -3,70 +3,36 @@ AddType text/html .bn
 AddType text/html .el
 AddType text/html .nb
 AddType text/html .pl
-AddType text/html .tr
 AddType text/html .es
+AddType text/html .tr
  
-AddLanguage af .af
 AddLanguage ar .ar
-AddLanguage as .as
-AddLanguage ast .ast
-AddLanguage bal .bal
-AddLanguage bg .bg
-AddLanguage bn .bn
 AddLanguage bn-in .bn_IN
-AddLanguage br .br
 AddLanguage ca .ca
 AddLanguage cs .cs
 AddLanguage da .da
 AddLanguage de .de
-AddLanguage de-ch .de_CH
-AddLanguage el .el
 AddLanguage en .en
-AddLanguage en-gb .en_GB
 AddLanguage es .es
-AddLanguage eu .eu
-AddLanguage fa .fa
 AddLanguage fi .fi
 AddLanguage fr .fr
-AddLanguage fur .fur
-AddLanguage gl .gl
-AddLanguage gu .gu
-AddLanguage he .he
-AddLanguage hi .hi
 AddLanguage hu .hu
-AddLanguage ia .ia
 AddLanguage id .id
-AddLanguage is .is
 AddLanguage it .it
 AddLanguage ja .ja
-AddLanguage ka .ka
-AddLanguage kn .kn
+AddLanguage km .km
 AddLanguage ko .ko
-AddLanguage lv .lv
-AddLanguage ml .ml
-AddLanguage mr .mr
-AddLanguage nb .nb
-AddLanguage nl .nl
-AddLanguage or .or
-AddLanguage pa .pa
 AddLanguage pl .pl
 AddLanguage pt .pt
 AddLanguage pt-br .pt_BR
-AddLanguage ro .ro
 AddLanguage ru .ru
+AddLanguage si .si
 AddLanguage sk .sk
-AddLanguage sq .sq
 AddLanguage sr .sr
 AddLanguage sv .sv
-AddLanguage ta .ta
-AddLanguage te .te
-AddLanguage tg .tg
-AddLanguage th .th
 AddLanguage tr .tr
 AddLanguage uk .uk
-AddLanguage vi .vi
-AddLanguage zh-cn .zh_CN
-AddLanguage zh-tw .zh_TW
+AddLanguage zh-cn .zh_Hans_CN
 
 LanguagePriority en
 ForceLanguagePriority Prefer Fallback
@@ -75,72 +41,38 @@ AddDefaultCharset utf-8
 
 RewriteEngine on
 
-RewriteCond %{QUERY_STRING} ^lang=(af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB|es|eu|fa|fi|fr|fur|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW)$
-RewriteRule ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB|es|eu|fa|fi|fr|fur|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW))?(/.*)$ /%1$1? [R=301]
-AliasMatch ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB|es|eu|fa|fi|fr|fur|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW))(/.*)?$ /srv/web/arm.fedoraproject.org$1
+RewriteCond %{QUERY_STRING} ^lang=(ar|bn_IN|ca|cs|da|de|en|es|fi|fr|hu|id|it|ja|km|ko|pl|pt|pt_BR|ru|si|sk|sr|sv|tr|uk|zh_Hans_CN)$
+RewriteRule ^(?:/(?:ar|bn_IN|ca|cs|da|de|en|es|fi|fr|hu|id|it|ja|km|ko|pl|pt|pt_BR|ru|si|sk|sr|sv|tr|uk|zh_Hans_CN))?(/.*)$ /%1$1? [R=301]
+AliasMatch ^(?:/(?:ar|bn_IN|ca|cs|da|de|en|es|fi|fr|hu|id|it|ja|km|ko|pl|pt|pt_BR|ru|si|sk|sr|sv|tr|uk|zh_Hans_CN))(/.*)?$ /srv/web/arm.fedoraproject.org$1
 
 <Directory /srv/web/arm.fedoraproject.org>
   Options MultiViews
 
-  SetEnvIf Request_URI ^/af/ prefer-language=af
   SetEnvIf Request_URI ^/ar/ prefer-language=ar
-  SetEnvIf Request_URI ^/as/ prefer-language=as
-  SetEnvIf Request_URI ^/ast/ prefer-language=ast
-  SetEnvIf Request_URI ^/bal/ prefer-language=bal
-  SetEnvIf Request_URI ^/bg/ prefer-language=bg
-  SetEnvIf Request_URI ^/bn/ prefer-language=bn
   SetEnvIf Request_URI ^/bn_IN/ prefer-language=bn-in
-  SetEnvIf Request_URI ^/br/ prefer-language=br
   SetEnvIf Request_URI ^/ca/ prefer-language=ca
   SetEnvIf Request_URI ^/cs/ prefer-language=cs
   SetEnvIf Request_URI ^/da/ prefer-language=da
   SetEnvIf Request_URI ^/de/ prefer-language=de
-  SetEnvIf Request_URI ^/de_CH/ prefer-language=de-ch
-  SetEnvIf Request_URI ^/el/ prefer-language=el
   SetEnvIf Request_URI ^/en/ prefer-language=en
-  SetEnvIf Request_URI ^/en_GB/ prefer-language=en-gb
   SetEnvIf Request_URI ^/es/ prefer-language=es
-  SetEnvIf Request_URI ^/eu/ prefer-language=eu
-  SetEnvIf Request_URI ^/fa/ prefer-language=fa
   SetEnvIf Request_URI ^/fi/ prefer-language=fi
   SetEnvIf Request_URI ^/fr/ prefer-language=fr
-  SetEnvIf Request_URI ^/fur/ prefer-language=fur
-  SetEnvIf Request_URI ^/gl/ prefer-language=gl
-  SetEnvIf Request_URI ^/gu/ prefer-language=gu
-  SetEnvIf Request_URI ^/he/ prefer-language=he
-  SetEnvIf Request_URI ^/hi/ prefer-language=hi
   SetEnvIf Request_URI ^/hu/ prefer-language=hu
-  SetEnvIf Request_URI ^/ia/ prefer-language=ia
   SetEnvIf Request_URI ^/id/ prefer-language=id
-  SetEnvIf Request_URI ^/is/ prefer-language=is
   SetEnvIf Request_URI ^/it/ prefer-language=it
   SetEnvIf Request_URI ^/ja/ prefer-language=ja
-  SetEnvIf Request_URI ^/ka/ prefer-language=ka
-  SetEnvIf Request_URI ^/kn/ prefer-language=kn
+  SetEnvIf Request_URI ^/km/ prefer-language=km
   SetEnvIf Request_URI ^/ko/ prefer-language=ko
-  SetEnvIf Request_URI ^/lv/ prefer-language=lv
-  SetEnvIf Request_URI ^/ml/ prefer-language=ml
-  SetEnvIf Request_URI ^/mr/ prefer-language=mr
-  SetEnvIf Request_URI ^/nb/ prefer-language=nb
-  SetEnvIf Request_URI ^/nl/ prefer-language=nl
-  SetEnvIf Request_URI ^/or/ prefer-language=or
-  SetEnvIf Request_URI ^/pa/ prefer-language=pa
   SetEnvIf Request_URI ^/pl/ prefer-language=pl
   SetEnvIf Request_URI ^/pt/ prefer-language=pt
   SetEnvIf Request_URI ^/pt_BR/ prefer-language=pt-br
-  SetEnvIf Request_URI ^/ro/ prefer-language=ro
   SetEnvIf Request_URI ^/ru/ prefer-language=ru
+  SetEnvIf Request_URI ^/si/ prefer-language=si
   SetEnvIf Request_URI ^/sk/ prefer-language=sk
-  SetEnvIf Request_URI ^/sq/ prefer-language=sq
   SetEnvIf Request_URI ^/sr/ prefer-language=sr
   SetEnvIf Request_URI ^/sv/ prefer-language=sv
-  SetEnvIf Request_URI ^/ta/ prefer-language=ta
-  SetEnvIf Request_URI ^/te/ prefer-language=te
-  SetEnvIf Request_URI ^/tg/ prefer-language=tg
-  SetEnvIf Request_URI ^/th/ prefer-language=th
   SetEnvIf Request_URI ^/tr/ prefer-language=tr
   SetEnvIf Request_URI ^/uk/ prefer-language=uk
-  SetEnvIf Request_URI ^/vi/ prefer-language=vi
-  SetEnvIf Request_URI ^/zh_CN/ prefer-language=zh-cn
-  SetEnvIf Request_URI ^/zh_TW/ prefer-language=zh-tw
+  SetEnvIf Request_URI ^/zh_Hans_CN/ prefer-language=zh-cn
 </Directory>
diff --git a/roles/fedora-web/community/files/languages.conf b/roles/fedora-web/community/files/languages.conf
index 24db85673b..c39773d8cb 100644
--- a/roles/fedora-web/community/files/languages.conf
+++ b/roles/fedora-web/community/files/languages.conf
@@ -3,8 +3,8 @@ AddType text/html .bn
 AddType text/html .el
 AddType text/html .nb
 AddType text/html .pl
-AddType text/html .tr
 AddType text/html .es
+AddType text/html .tr
  
 AddLanguage af .af
 AddLanguage ar .ar
@@ -19,7 +19,6 @@ AddLanguage ca .ca
 AddLanguage cs .cs
 AddLanguage da .da
 AddLanguage de .de
-AddLanguage de-ch .de_CH
 AddLanguage el .el
 AddLanguage en .en
 AddLanguage en-gb .en_GB
@@ -28,6 +27,7 @@ AddLanguage eu .eu
 AddLanguage fa .fa
 AddLanguage fi .fi
 AddLanguage fr .fr
+AddLanguage fur .fur
 AddLanguage gl .gl
 AddLanguage gu .gu
 AddLanguage he .he
@@ -39,6 +39,7 @@ AddLanguage is .is
 AddLanguage it .it
 AddLanguage ja .ja
 AddLanguage ka .ka
+AddLanguage km .km
 AddLanguage kn .kn
 AddLanguage ko .ko
 AddLanguage lv .lv
@@ -53,6 +54,7 @@ AddLanguage pt .pt
 AddLanguage pt-br .pt_BR
 AddLanguage ro .ro
 AddLanguage ru .ru
+AddLanguage si .si
 AddLanguage sk .sk
 AddLanguage sq .sq
 AddLanguage sr .sr
@@ -63,9 +65,10 @@ AddLanguage tg .tg
 AddLanguage th .th
 AddLanguage tr .tr
 AddLanguage uk .uk
+AddLanguage ur .ur
 AddLanguage vi .vi
-AddLanguage zh-cn .zh_CN
-AddLanguage zh-tw .zh_TW
+AddLanguage zh-cn .zh_Hans_CN
+AddLanguage zh-tw .zh_Hant_TW
 
 LanguagePriority en
 ForceLanguagePriority Prefer Fallback
@@ -74,9 +77,9 @@ AddDefaultCharset utf-8
 
 RewriteEngine on
 
-RewriteCond %{QUERY_STRING} ^lang=(af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW)$
-RewriteRule ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW))?(/.*)$ /%1$1? [R=301]
-AliasMatch ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW))(/.*)?$ /srv/web/fedoracommunity.org$1
+RewriteCond %{QUERY_STRING} ^lang=(af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|el|en|en_GB|es|eu|fa|fi|fr|fur|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|km|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|si|sk|sq|sr|sv|ta|te|tg|th|tr|uk|ur|vi|zh_Hans_CN|zh_Hant_TW)$
+RewriteRule ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|el|en|en_GB|es|eu|fa|fi|fr|fur|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|km|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|si|sk|sq|sr|sv|ta|te|tg|th|tr|uk|ur|vi|zh_Hans_CN|zh_Hant_TW))?(/.*)$ /%1$1? [R=301]
+AliasMatch ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|el|en|en_GB|es|eu|fa|fi|fr|fur|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|km|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|si|sk|sq|sr|sv|ta|te|tg|th|tr|uk|ur|vi|zh_Hans_CN|zh_Hant_TW))(/.*)?$ /srv/web/fedoracommunity.org$1
 
 <Directory /srv/web/fedoracommunity.org>
   Options MultiViews
@@ -94,7 +97,6 @@ AliasMatch ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB
   SetEnvIf Request_URI ^/cs/ prefer-language=cs
   SetEnvIf Request_URI ^/da/ prefer-language=da
   SetEnvIf Request_URI ^/de/ prefer-language=de
-  SetEnvIf Request_URI ^/de_CH/ prefer-language=de-ch
   SetEnvIf Request_URI ^/el/ prefer-language=el
   SetEnvIf Request_URI ^/en/ prefer-language=en
   SetEnvIf Request_URI ^/en_GB/ prefer-language=en-gb
@@ -103,6 +105,7 @@ AliasMatch ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB
   SetEnvIf Request_URI ^/fa/ prefer-language=fa
   SetEnvIf Request_URI ^/fi/ prefer-language=fi
   SetEnvIf Request_URI ^/fr/ prefer-language=fr
+  SetEnvIf Request_URI ^/fur/ prefer-language=fur
   SetEnvIf Request_URI ^/gl/ prefer-language=gl
   SetEnvIf Request_URI ^/gu/ prefer-language=gu
   SetEnvIf Request_URI ^/he/ prefer-language=he
@@ -114,6 +117,7 @@ AliasMatch ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB
   SetEnvIf Request_URI ^/it/ prefer-language=it
   SetEnvIf Request_URI ^/ja/ prefer-language=ja
   SetEnvIf Request_URI ^/ka/ prefer-language=ka
+  SetEnvIf Request_URI ^/km/ prefer-language=km
   SetEnvIf Request_URI ^/kn/ prefer-language=kn
   SetEnvIf Request_URI ^/ko/ prefer-language=ko
   SetEnvIf Request_URI ^/lv/ prefer-language=lv
@@ -128,6 +132,7 @@ AliasMatch ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB
   SetEnvIf Request_URI ^/pt_BR/ prefer-language=pt-br
   SetEnvIf Request_URI ^/ro/ prefer-language=ro
   SetEnvIf Request_URI ^/ru/ prefer-language=ru
+  SetEnvIf Request_URI ^/si/ prefer-language=si
   SetEnvIf Request_URI ^/sk/ prefer-language=sk
   SetEnvIf Request_URI ^/sq/ prefer-language=sq
   SetEnvIf Request_URI ^/sr/ prefer-language=sr
@@ -138,7 +143,8 @@ AliasMatch ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB
   SetEnvIf Request_URI ^/th/ prefer-language=th
   SetEnvIf Request_URI ^/tr/ prefer-language=tr
   SetEnvIf Request_URI ^/uk/ prefer-language=uk
+  SetEnvIf Request_URI ^/ur/ prefer-language=ur
   SetEnvIf Request_URI ^/vi/ prefer-language=vi
-  SetEnvIf Request_URI ^/zh_CN/ prefer-language=zh-cn
-  SetEnvIf Request_URI ^/zh_TW/ prefer-language=zh-tw
+  SetEnvIf Request_URI ^/zh_Hans_CN/ prefer-language=zh-cn
+  SetEnvIf Request_URI ^/zh_Hant_TW/ prefer-language=zh-tw
 </Directory>
diff --git a/roles/fedora-web/labs/files/languages.conf b/roles/fedora-web/labs/files/languages.conf
index 0ccb65f1b1..343ac90c74 100644
--- a/roles/fedora-web/labs/files/languages.conf
+++ b/roles/fedora-web/labs/files/languages.conf
@@ -3,70 +3,44 @@ AddType text/html .bn
 AddType text/html .el
 AddType text/html .nb
 AddType text/html .pl
-AddType text/html .tr
 AddType text/html .es
+AddType text/html .tr
  
-AddLanguage af .af
 AddLanguage ar .ar
-AddLanguage as .as
-AddLanguage ast .ast
-AddLanguage bal .bal
-AddLanguage bg .bg
-AddLanguage bn .bn
 AddLanguage bn-in .bn_IN
-AddLanguage br .br
 AddLanguage ca .ca
 AddLanguage cs .cs
 AddLanguage da .da
 AddLanguage de .de
-AddLanguage de-ch .de_CH
-AddLanguage el .el
 AddLanguage en .en
-AddLanguage en-gb .en_GB
 AddLanguage es .es
-AddLanguage eu .eu
 AddLanguage fa .fa
 AddLanguage fi .fi
 AddLanguage fr .fr
 AddLanguage fur .fur
-AddLanguage gl .gl
-AddLanguage gu .gu
 AddLanguage he .he
 AddLanguage hi .hi
 AddLanguage hu .hu
-AddLanguage ia .ia
 AddLanguage id .id
-AddLanguage is .is
 AddLanguage it .it
 AddLanguage ja .ja
-AddLanguage ka .ka
-AddLanguage kn .kn
+AddLanguage km .km
 AddLanguage ko .ko
-AddLanguage lv .lv
-AddLanguage ml .ml
-AddLanguage mr .mr
-AddLanguage nb .nb
-AddLanguage nl .nl
+AddLanguage ne .ne
 AddLanguage or .or
-AddLanguage pa .pa
 AddLanguage pl .pl
 AddLanguage pt .pt
 AddLanguage pt-br .pt_BR
-AddLanguage ro .ro
 AddLanguage ru .ru
+AddLanguage si .si
 AddLanguage sk .sk
 AddLanguage sq .sq
 AddLanguage sr .sr
 AddLanguage sv .sv
-AddLanguage ta .ta
-AddLanguage te .te
-AddLanguage tg .tg
-AddLanguage th .th
 AddLanguage tr .tr
 AddLanguage uk .uk
-AddLanguage vi .vi
-AddLanguage zh-cn .zh_CN
-AddLanguage zh-tw .zh_TW
+AddLanguage ur-pk .ur_PK
+AddLanguage zh-cn .zh_Hans_CN
 
 LanguagePriority en
 ForceLanguagePriority Prefer Fallback
@@ -75,72 +49,46 @@ AddDefaultCharset utf-8
 
 RewriteEngine on
 
-RewriteCond %{QUERY_STRING} ^lang=(af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB|es|eu|fa|fi|fr|fur|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW)$
-RewriteRule ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB|es|eu|fa|fi|fr|fur|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW))?(/.*)$ /%1$1? [R=301]
-AliasMatch ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB|es|eu|fa|fi|fr|fur|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW))(/.*)?$ /srv/web/labs.fedoraproject.org$1
+RewriteCond %{QUERY_STRING} ^lang=(ar|bn_IN|ca|cs|da|de|en|es|fa|fi|fr|fur|he|hi|hu|id|it|ja|km|ko|ne|or|pl|pt|pt_BR|ru|si|sk|sq|sr|sv|tr|uk|ur_PK|zh_Hans_CN)$
+RewriteRule ^(?:/(?:ar|bn_IN|ca|cs|da|de|en|es|fa|fi|fr|fur|he|hi|hu|id|it|ja|km|ko|ne|or|pl|pt|pt_BR|ru|si|sk|sq|sr|sv|tr|uk|ur_PK|zh_Hans_CN))?(/.*)$ /%1$1? [R=301]
+AliasMatch ^(?:/(?:ar|bn_IN|ca|cs|da|de|en|es|fa|fi|fr|fur|he|hi|hu|id|it|ja|km|ko|ne|or|pl|pt|pt_BR|ru|si|sk|sq|sr|sv|tr|uk|ur_PK|zh_Hans_CN))(/.*)?$ /srv/web/labs.fedoraproject.org$1
 
 <Directory /srv/web/labs.fedoraproject.org>
   Options MultiViews
 
-  SetEnvIf Request_URI ^/af/ prefer-language=af
   SetEnvIf Request_URI ^/ar/ prefer-language=ar
-  SetEnvIf Request_URI ^/as/ prefer-language=as
-  SetEnvIf Request_URI ^/ast/ prefer-language=ast
-  SetEnvIf Request_URI ^/bal/ prefer-language=bal
-  SetEnvIf Request_URI ^/bg/ prefer-language=bg
-  SetEnvIf Request_URI ^/bn/ prefer-language=bn
   SetEnvIf Request_URI ^/bn_IN/ prefer-language=bn-in
-  SetEnvIf Request_URI ^/br/ prefer-language=br
   SetEnvIf Request_URI ^/ca/ prefer-language=ca
   SetEnvIf Request_URI ^/cs/ prefer-language=cs
   SetEnvIf Request_URI ^/da/ prefer-language=da
   SetEnvIf Request_URI ^/de/ prefer-language=de
-  SetEnvIf Request_URI ^/de_CH/ prefer-language=de-ch
-  SetEnvIf Request_URI ^/el/ prefer-language=el
   SetEnvIf Request_URI ^/en/ prefer-language=en
-  SetEnvIf Request_URI ^/en_GB/ prefer-language=en-gb
   SetEnvIf Request_URI ^/es/ prefer-language=es
-  SetEnvIf Request_URI ^/eu/ prefer-language=eu
   SetEnvIf Request_URI ^/fa/ prefer-language=fa
   SetEnvIf Request_URI ^/fi/ prefer-language=fi
   SetEnvIf Request_URI ^/fr/ prefer-language=fr
   SetEnvIf Request_URI ^/fur/ prefer-language=fur
-  SetEnvIf Request_URI ^/gl/ prefer-language=gl
-  SetEnvIf Request_URI ^/gu/ prefer-language=gu
   SetEnvIf Request_URI ^/he/ prefer-language=he
   SetEnvIf Request_URI ^/hi/ prefer-language=hi
   SetEnvIf Request_URI ^/hu/ prefer-language=hu
-  SetEnvIf Request_URI ^/ia/ prefer-language=ia
   SetEnvIf Request_URI ^/id/ prefer-language=id
-  SetEnvIf Request_URI ^/is/ prefer-language=is
   SetEnvIf Request_URI ^/it/ prefer-language=it
   SetEnvIf Request_URI ^/ja/ prefer-language=ja
-  SetEnvIf Request_URI ^/ka/ prefer-language=ka
-  SetEnvIf Request_URI ^/kn/ prefer-language=kn
+  SetEnvIf Request_URI ^/km/ prefer-language=km
   SetEnvIf Request_URI ^/ko/ prefer-language=ko
-  SetEnvIf Request_URI ^/lv/ prefer-language=lv
-  SetEnvIf Request_URI ^/ml/ prefer-language=ml
-  SetEnvIf Request_URI ^/mr/ prefer-language=mr
-  SetEnvIf Request_URI ^/nb/ prefer-language=nb
-  SetEnvIf Request_URI ^/nl/ prefer-language=nl
+  SetEnvIf Request_URI ^/ne/ prefer-language=ne
   SetEnvIf Request_URI ^/or/ prefer-language=or
-  SetEnvIf Request_URI ^/pa/ prefer-language=pa
   SetEnvIf Request_URI ^/pl/ prefer-language=pl
   SetEnvIf Request_URI ^/pt/ prefer-language=pt
   SetEnvIf Request_URI ^/pt_BR/ prefer-language=pt-br
-  SetEnvIf Request_URI ^/ro/ prefer-language=ro
   SetEnvIf Request_URI ^/ru/ prefer-language=ru
+  SetEnvIf Request_URI ^/si/ prefer-language=si
   SetEnvIf Request_URI ^/sk/ prefer-language=sk
   SetEnvIf Request_URI ^/sq/ prefer-language=sq
   SetEnvIf Request_URI ^/sr/ prefer-language=sr
   SetEnvIf Request_URI ^/sv/ prefer-language=sv
-  SetEnvIf Request_URI ^/ta/ prefer-language=ta
-  SetEnvIf Request_URI ^/te/ prefer-language=te
-  SetEnvIf Request_URI ^/tg/ prefer-language=tg
-  SetEnvIf Request_URI ^/th/ prefer-language=th
   SetEnvIf Request_URI ^/tr/ prefer-language=tr
   SetEnvIf Request_URI ^/uk/ prefer-language=uk
-  SetEnvIf Request_URI ^/vi/ prefer-language=vi
-  SetEnvIf Request_URI ^/zh_CN/ prefer-language=zh-cn
-  SetEnvIf Request_URI ^/zh_TW/ prefer-language=zh-tw
+  SetEnvIf Request_URI ^/ur_PK/ prefer-language=ur-pk
+  SetEnvIf Request_URI ^/zh_Hans_CN/ prefer-language=zh-cn
 </Directory>
diff --git a/roles/fedora-web/spins/files/languages.conf b/roles/fedora-web/spins/files/languages.conf
index 11d5ca8539..5946f59811 100644
--- a/roles/fedora-web/spins/files/languages.conf
+++ b/roles/fedora-web/spins/files/languages.conf
@@ -3,14 +3,14 @@ AddType text/html .bn
 AddType text/html .el
 AddType text/html .nb
 AddType text/html .pl
-AddType text/html .tr
 AddType text/html .es
+AddType text/html .tr
  
 AddLanguage af .af
 AddLanguage ar .ar
 AddLanguage as .as
 AddLanguage ast .ast
-AddLanguage bal .bal
+AddLanguage az .az
 AddLanguage bg .bg
 AddLanguage bn .bn
 AddLanguage bn-in .bn_IN
@@ -19,16 +19,13 @@ AddLanguage ca .ca
 AddLanguage cs .cs
 AddLanguage da .da
 AddLanguage de .de
-AddLanguage de-ch .de_CH
 AddLanguage el .el
 AddLanguage en .en
-AddLanguage en-gb .en_GB
 AddLanguage es .es
 AddLanguage eu .eu
 AddLanguage fa .fa
 AddLanguage fi .fi
 AddLanguage fr .fr
-AddLanguage fur .fur
 AddLanguage gl .gl
 AddLanguage gu .gu
 AddLanguage he .he
@@ -40,20 +37,20 @@ AddLanguage is .is
 AddLanguage it .it
 AddLanguage ja .ja
 AddLanguage ka .ka
-AddLanguage kn .kn
+AddLanguage km .km
 AddLanguage ko .ko
 AddLanguage lv .lv
 AddLanguage ml .ml
 AddLanguage mr .mr
 AddLanguage nb .nb
 AddLanguage nl .nl
-AddLanguage or .or
 AddLanguage pa .pa
 AddLanguage pl .pl
 AddLanguage pt .pt
 AddLanguage pt-br .pt_BR
 AddLanguage ro .ro
 AddLanguage ru .ru
+AddLanguage si .si
 AddLanguage sk .sk
 AddLanguage sq .sq
 AddLanguage sr .sr
@@ -61,12 +58,11 @@ AddLanguage sv .sv
 AddLanguage ta .ta
 AddLanguage te .te
 AddLanguage tg .tg
-AddLanguage th .th
 AddLanguage tr .tr
 AddLanguage uk .uk
 AddLanguage vi .vi
-AddLanguage zh-cn .zh_CN
-AddLanguage zh-tw .zh_TW
+AddLanguage zh-cn .zh_Hans_CN
+AddLanguage zh-tw .zh_Hant_TW
 
 LanguagePriority en
 ForceLanguagePriority Prefer Fallback
@@ -75,9 +71,9 @@ AddDefaultCharset utf-8
 
 RewriteEngine on
 
-RewriteCond %{QUERY_STRING} ^lang=(af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB|es|eu|fa|fi|fr|fur|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW)$
-RewriteRule ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB|es|eu|fa|fi|fr|fur|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW))?(/.*)$ /%1$1? [R=301]
-AliasMatch ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB|es|eu|fa|fi|fr|fur|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW))(/.*)?$ /srv/web/spins.fedoraproject.org$1
+RewriteCond %{QUERY_STRING} ^lang=(af|ar|as|ast|az|bg|bn|bn_IN|br|ca|cs|da|de|el|en|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|km|ko|lv|ml|mr|nb|nl|pa|pl|pt|pt_BR|ro|ru|si|sk|sq|sr|sv|ta|te|tg|tr|uk|vi|zh_Hans_CN|zh_Hant_TW)$
+RewriteRule ^(?:/(?:af|ar|as|ast|az|bg|bn|bn_IN|br|ca|cs|da|de|el|en|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|km|ko|lv|ml|mr|nb|nl|pa|pl|pt|pt_BR|ro|ru|si|sk|sq|sr|sv|ta|te|tg|tr|uk|vi|zh_Hans_CN|zh_Hant_TW))?(/.*)$ /%1$1? [R=301]
+AliasMatch ^(?:/(?:af|ar|as|ast|az|bg|bn|bn_IN|br|ca|cs|da|de|el|en|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|km|ko|lv|ml|mr|nb|nl|pa|pl|pt|pt_BR|ro|ru|si|sk|sq|sr|sv|ta|te|tg|tr|uk|vi|zh_Hans_CN|zh_Hant_TW))(/.*)?$ /srv/web/spins.fedoraproject.org$1
 
 <Directory /srv/web/spins.fedoraproject.org>
   Options MultiViews
@@ -86,7 +82,7 @@ AliasMatch ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB
   SetEnvIf Request_URI ^/ar/ prefer-language=ar
   SetEnvIf Request_URI ^/as/ prefer-language=as
   SetEnvIf Request_URI ^/ast/ prefer-language=ast
-  SetEnvIf Request_URI ^/bal/ prefer-language=bal
+  SetEnvIf Request_URI ^/az/ prefer-language=az
   SetEnvIf Request_URI ^/bg/ prefer-language=bg
   SetEnvIf Request_URI ^/bn/ prefer-language=bn
   SetEnvIf Request_URI ^/bn_IN/ prefer-language=bn-in
@@ -95,16 +91,13 @@ AliasMatch ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB
   SetEnvIf Request_URI ^/cs/ prefer-language=cs
   SetEnvIf Request_URI ^/da/ prefer-language=da
   SetEnvIf Request_URI ^/de/ prefer-language=de
-  SetEnvIf Request_URI ^/de_CH/ prefer-language=de-ch
   SetEnvIf Request_URI ^/el/ prefer-language=el
   SetEnvIf Request_URI ^/en/ prefer-language=en
-  SetEnvIf Request_URI ^/en_GB/ prefer-language=en-gb
   SetEnvIf Request_URI ^/es/ prefer-language=es
   SetEnvIf Request_URI ^/eu/ prefer-language=eu
   SetEnvIf Request_URI ^/fa/ prefer-language=fa
   SetEnvIf Request_URI ^/fi/ prefer-language=fi
   SetEnvIf Request_URI ^/fr/ prefer-language=fr
-  SetEnvIf Request_URI ^/fur/ prefer-language=fur
   SetEnvIf Request_URI ^/gl/ prefer-language=gl
   SetEnvIf Request_URI ^/gu/ prefer-language=gu
   SetEnvIf Request_URI ^/he/ prefer-language=he
@@ -116,20 +109,20 @@ AliasMatch ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB
   SetEnvIf Request_URI ^/it/ prefer-language=it
   SetEnvIf Request_URI ^/ja/ prefer-language=ja
   SetEnvIf Request_URI ^/ka/ prefer-language=ka
-  SetEnvIf Request_URI ^/kn/ prefer-language=kn
+  SetEnvIf Request_URI ^/km/ prefer-language=km
   SetEnvIf Request_URI ^/ko/ prefer-language=ko
   SetEnvIf Request_URI ^/lv/ prefer-language=lv
   SetEnvIf Request_URI ^/ml/ prefer-language=ml
   SetEnvIf Request_URI ^/mr/ prefer-language=mr
   SetEnvIf Request_URI ^/nb/ prefer-language=nb
   SetEnvIf Request_URI ^/nl/ prefer-language=nl
-  SetEnvIf Request_URI ^/or/ prefer-language=or
   SetEnvIf Request_URI ^/pa/ prefer-language=pa
   SetEnvIf Request_URI ^/pl/ prefer-language=pl
   SetEnvIf Request_URI ^/pt/ prefer-language=pt
   SetEnvIf Request_URI ^/pt_BR/ prefer-language=pt-br
   SetEnvIf Request_URI ^/ro/ prefer-language=ro
   SetEnvIf Request_URI ^/ru/ prefer-language=ru
+  SetEnvIf Request_URI ^/si/ prefer-language=si
   SetEnvIf Request_URI ^/sk/ prefer-language=sk
   SetEnvIf Request_URI ^/sq/ prefer-language=sq
   SetEnvIf Request_URI ^/sr/ prefer-language=sr
@@ -137,10 +130,9 @@ AliasMatch ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB
   SetEnvIf Request_URI ^/ta/ prefer-language=ta
   SetEnvIf Request_URI ^/te/ prefer-language=te
   SetEnvIf Request_URI ^/tg/ prefer-language=tg
-  SetEnvIf Request_URI ^/th/ prefer-language=th
   SetEnvIf Request_URI ^/tr/ prefer-language=tr
   SetEnvIf Request_URI ^/uk/ prefer-language=uk
   SetEnvIf Request_URI ^/vi/ prefer-language=vi
-  SetEnvIf Request_URI ^/zh_CN/ prefer-language=zh-cn
-  SetEnvIf Request_URI ^/zh_TW/ prefer-language=zh-tw
+  SetEnvIf Request_URI ^/zh_Hans_CN/ prefer-language=zh-cn
+  SetEnvIf Request_URI ^/zh_Hant_TW/ prefer-language=zh-tw
 </Directory>
diff --git a/roles/fedora-web/start/files/languages.conf b/roles/fedora-web/start/files/languages.conf
index db31ca9dbb..aa63fb6d2a 100644
--- a/roles/fedora-web/start/files/languages.conf
+++ b/roles/fedora-web/start/files/languages.conf
@@ -3,14 +3,16 @@ AddType text/html .bn
 AddType text/html .el
 AddType text/html .nb
 AddType text/html .pl
-AddType text/html .tr
 AddType text/html .es
+AddType text/html .tr
  
 AddLanguage af .af
 AddLanguage ar .ar
 AddLanguage as .as
 AddLanguage ast .ast
+AddLanguage az .az
 AddLanguage bal .bal
+AddLanguage be .be
 AddLanguage bg .bg
 AddLanguage bn .bn
 AddLanguage bn-in .bn_IN
@@ -19,7 +21,6 @@ AddLanguage ca .ca
 AddLanguage cs .cs
 AddLanguage da .da
 AddLanguage de .de
-AddLanguage de-ch .de_CH
 AddLanguage el .el
 AddLanguage en .en
 AddLanguage en-gb .en_GB
@@ -28,6 +29,7 @@ AddLanguage eu .eu
 AddLanguage fa .fa
 AddLanguage fi .fi
 AddLanguage fr .fr
+AddLanguage fur .fur
 AddLanguage gl .gl
 AddLanguage gu .gu
 AddLanguage he .he
@@ -39,6 +41,7 @@ AddLanguage is .is
 AddLanguage it .it
 AddLanguage ja .ja
 AddLanguage ka .ka
+AddLanguage km .km
 AddLanguage kn .kn
 AddLanguage ko .ko
 AddLanguage lv .lv
@@ -46,6 +49,7 @@ AddLanguage ml .ml
 AddLanguage mr .mr
 AddLanguage nb .nb
 AddLanguage nl .nl
+AddLanguage nn .nn
 AddLanguage or .or
 AddLanguage pa .pa
 AddLanguage pl .pl
@@ -53,6 +57,7 @@ AddLanguage pt .pt
 AddLanguage pt-br .pt_BR
 AddLanguage ro .ro
 AddLanguage ru .ru
+AddLanguage si .si
 AddLanguage sk .sk
 AddLanguage sq .sq
 AddLanguage sr .sr
@@ -64,8 +69,8 @@ AddLanguage th .th
 AddLanguage tr .tr
 AddLanguage uk .uk
 AddLanguage vi .vi
-AddLanguage zh-cn .zh_CN
-AddLanguage zh-tw .zh_TW
+AddLanguage zh-cn .zh_Hans_CN
+AddLanguage zh-tw .zh_Hant_TW
 
 LanguagePriority en
 ForceLanguagePriority Prefer Fallback
@@ -74,9 +79,9 @@ AddDefaultCharset utf-8
 
 RewriteEngine on
 
-RewriteCond %{QUERY_STRING} ^lang=(af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW)$
-RewriteRule ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW))?(/.*)$ /%1$1? [R=301]
-AliasMatch ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB|es|eu|fa|fi|fr|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|kn|ko|lv|ml|mr|nb|nl|or|pa|pl|pt|pt_BR|ro|ru|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_CN|zh_TW))(/.*)?$ /srv/web/start.fedoraproject.org$1
+RewriteCond %{QUERY_STRING} ^lang=(af|ar|as|ast|az|bal|be|bg|bn|bn_IN|br|ca|cs|da|de|el|en|en_GB|es|eu|fa|fi|fr|fur|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|km|kn|ko|lv|ml|mr|nb|nl|nn|or|pa|pl|pt|pt_BR|ro|ru|si|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_Hans_CN|zh_Hant_TW)$
+RewriteRule ^(?:/(?:af|ar|as|ast|az|bal|be|bg|bn|bn_IN|br|ca|cs|da|de|el|en|en_GB|es|eu|fa|fi|fr|fur|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|km|kn|ko|lv|ml|mr|nb|nl|nn|or|pa|pl|pt|pt_BR|ro|ru|si|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_Hans_CN|zh_Hant_TW))?(/.*)$ /%1$1? [R=301]
+AliasMatch ^(?:/(?:af|ar|as|ast|az|bal|be|bg|bn|bn_IN|br|ca|cs|da|de|el|en|en_GB|es|eu|fa|fi|fr|fur|gl|gu|he|hi|hu|ia|id|is|it|ja|ka|km|kn|ko|lv|ml|mr|nb|nl|nn|or|pa|pl|pt|pt_BR|ro|ru|si|sk|sq|sr|sv|ta|te|tg|th|tr|uk|vi|zh_Hans_CN|zh_Hant_TW))(/.*)?$ /srv/web/start.fedoraproject.org$1
 
 <Directory /srv/web/start.fedoraproject.org>
   Options MultiViews
@@ -85,7 +90,9 @@ AliasMatch ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB
   SetEnvIf Request_URI ^/ar/ prefer-language=ar
   SetEnvIf Request_URI ^/as/ prefer-language=as
   SetEnvIf Request_URI ^/ast/ prefer-language=ast
+  SetEnvIf Request_URI ^/az/ prefer-language=az
   SetEnvIf Request_URI ^/bal/ prefer-language=bal
+  SetEnvIf Request_URI ^/be/ prefer-language=be
   SetEnvIf Request_URI ^/bg/ prefer-language=bg
   SetEnvIf Request_URI ^/bn/ prefer-language=bn
   SetEnvIf Request_URI ^/bn_IN/ prefer-language=bn-in
@@ -94,7 +101,6 @@ AliasMatch ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB
   SetEnvIf Request_URI ^/cs/ prefer-language=cs
   SetEnvIf Request_URI ^/da/ prefer-language=da
   SetEnvIf Request_URI ^/de/ prefer-language=de
-  SetEnvIf Request_URI ^/de_CH/ prefer-language=de-ch
   SetEnvIf Request_URI ^/el/ prefer-language=el
   SetEnvIf Request_URI ^/en/ prefer-language=en
   SetEnvIf Request_URI ^/en_GB/ prefer-language=en-gb
@@ -103,6 +109,7 @@ AliasMatch ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB
   SetEnvIf Request_URI ^/fa/ prefer-language=fa
   SetEnvIf Request_URI ^/fi/ prefer-language=fi
   SetEnvIf Request_URI ^/fr/ prefer-language=fr
+  SetEnvIf Request_URI ^/fur/ prefer-language=fur
   SetEnvIf Request_URI ^/gl/ prefer-language=gl
   SetEnvIf Request_URI ^/gu/ prefer-language=gu
   SetEnvIf Request_URI ^/he/ prefer-language=he
@@ -114,6 +121,7 @@ AliasMatch ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB
   SetEnvIf Request_URI ^/it/ prefer-language=it
   SetEnvIf Request_URI ^/ja/ prefer-language=ja
   SetEnvIf Request_URI ^/ka/ prefer-language=ka
+  SetEnvIf Request_URI ^/km/ prefer-language=km
   SetEnvIf Request_URI ^/kn/ prefer-language=kn
   SetEnvIf Request_URI ^/ko/ prefer-language=ko
   SetEnvIf Request_URI ^/lv/ prefer-language=lv
@@ -121,6 +129,7 @@ AliasMatch ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB
   SetEnvIf Request_URI ^/mr/ prefer-language=mr
   SetEnvIf Request_URI ^/nb/ prefer-language=nb
   SetEnvIf Request_URI ^/nl/ prefer-language=nl
+  SetEnvIf Request_URI ^/nn/ prefer-language=nn
   SetEnvIf Request_URI ^/or/ prefer-language=or
   SetEnvIf Request_URI ^/pa/ prefer-language=pa
   SetEnvIf Request_URI ^/pl/ prefer-language=pl
@@ -128,6 +137,7 @@ AliasMatch ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB
   SetEnvIf Request_URI ^/pt_BR/ prefer-language=pt-br
   SetEnvIf Request_URI ^/ro/ prefer-language=ro
   SetEnvIf Request_URI ^/ru/ prefer-language=ru
+  SetEnvIf Request_URI ^/si/ prefer-language=si
   SetEnvIf Request_URI ^/sk/ prefer-language=sk
   SetEnvIf Request_URI ^/sq/ prefer-language=sq
   SetEnvIf Request_URI ^/sr/ prefer-language=sr
@@ -139,6 +149,6 @@ AliasMatch ^(?:/(?:af|ar|as|ast|bal|bg|bn|bn_IN|br|ca|cs|da|de|de_CH|el|en|en_GB
   SetEnvIf Request_URI ^/tr/ prefer-language=tr
   SetEnvIf Request_URI ^/uk/ prefer-language=uk
   SetEnvIf Request_URI ^/vi/ prefer-language=vi
-  SetEnvIf Request_URI ^/zh_CN/ prefer-language=zh-cn
-  SetEnvIf Request_URI ^/zh_TW/ prefer-language=zh-tw
+  SetEnvIf Request_URI ^/zh_Hans_CN/ prefer-language=zh-cn
+  SetEnvIf Request_URI ^/zh_Hant_TW/ prefer-language=zh-tw
 </Directory>