diff --git a/README.md b/README.md
index d0fd4da84..a9e87c980 100644
--- a/README.md
+++ b/README.md
@@ -44,6 +44,7 @@ mail/rspamd -- Protect your network from spam
 misc/theme-cicada -- The cicada theme - dark grey
 misc/theme-rebellion -- A suitably dark theme
 misc/theme-tukan -- The tukan theme - blue/white
+misc/theme-vicuna -- The vicuna theme - dark anthrazit
 net-mgmt/collectd -- Collect system and application performance metrics periodically
 net-mgmt/lldpd -- LLDP allows you to know exactly on which port is a server
 net-mgmt/net-snmp -- Net-SNMP is a daemon for the SNMP protocol
diff --git a/misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/main.css b/misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/main.css
index dc7bdbce2..5106d03a8 100644
--- a/misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/main.css
+++ b/misc/theme-cicada/src/opnsense/www/themes/cicada/build/css/main.css
@@ -2949,20 +2949,20 @@ select[multiple].input-lg,
     filter: alpha(opacity=30);
     -webkit-box-shadow: none;
     box-shadow: none; }
-  
+
   .act_flush:hover, .act_flush:focus {
 	color: #fff;
     background-color: #2d2d2d;
     border-color: 1px solid #1d1d1d;
 	outline:0; }
-  
+
   .btn-default:active, .btn-default.active, .open > .btn-default.dropdown-toggle {
 	background-color: #dd630d;
 	color: #FFF;
 	text-decoration: none;
 	border: 1px solid #191919;
 	outline:0; }
-  
+
   .btn-default.disabled, .btn-default.disabled:hover, .btn-default.disabled:focus, .btn-default.disabled:active, .btn-default.disabled.active, .btn-default[disabled], .btn-default[disabled]:hover, .btn-default[disabled]:focus, .btn-default[disabled]:active, .btn-default[disabled].active, fieldset[disabled] .btn-default, fieldset[disabled] .btn-default:hover, fieldset[disabled] .btn-default:focus, fieldset[disabled] .btn-default:active, fieldset[disabled] .btn-default.active {
     background-color: #FFFFFF;
     border-color: 1px solid #1d1d1d;
@@ -3370,7 +3370,7 @@ tbody.collapse.in {
 .btn-group > .btn-lg + .dropdown-toggle, .btn-group-lg.btn-group > .btn + .dropdown-toggle {
   padding-left: 12px;
   padding-right: 12px; }
-  
+
   .btn-group.open .dropdown-toggle.btn-link {
     -webkit-box-shadow: none;
     box-shadow: none; }
@@ -4218,7 +4218,7 @@ tbody.collapse.in {
 a.label:hover, a.label:focus {
   color: #fff;
   text-decoration: none;
-  cursor: pointer; 
+  cursor: pointer;
 }
 
 .label-default {
@@ -4454,7 +4454,7 @@ a.thumbnail.active {
   box-shadow: inset 0 20px 0 rgba(0, 0, 0, 0.15);
   -webkit-transition: width 0.6s ease;
   -o-transition: width 0.6s ease;
-  transition: width 0.6s ease; 
+  transition: width 0.6s ease;
   margin: 1px 0 0 0 !important;
 }
 
@@ -5120,7 +5120,7 @@ button.close {
 @media (min-width: 768px) {
   .modal-dialog {
     width: 600px;
-    margin: 82px auto 30px auto; 
+    margin: 82px auto 30px auto;
     -webkit-box-shadow: 5px 5px 5px rgb(17, 17, 17);
     box-shadow: 5px 5px 5px rgb(17, 17, 17);}
     .modal-sm {
@@ -5797,7 +5797,7 @@ body {
   border: 1px solid #191919;
   -webkit-box-shadow: 0 3px 3px rgba(17, 17, 17, 0.8);
   box-shadow: 5px 5px 5px rgba(17, 17, 17, 0.8)  }
-  
+
 .content-box hr {
 	border:none; }
   .content-box-main {
diff --git a/misc/theme-vicuna/src/opnsense/www/themes/vicuna/build/css/main.css b/misc/theme-vicuna/src/opnsense/www/themes/vicuna/build/css/main.css
index 3e6a3a8bf..5b774ffc6 100644
--- a/misc/theme-vicuna/src/opnsense/www/themes/vicuna/build/css/main.css
+++ b/misc/theme-vicuna/src/opnsense/www/themes/vicuna/build/css/main.css
@@ -1082,7 +1082,7 @@ p {
 
 small,
 .small {
-  font-size: 85%; 
+  font-size: 85%;
   color: #B9B9B9; }
 
 cite {
@@ -4425,7 +4425,7 @@ a.thumbnail.active {
   box-shadow: inset 0 20px 0 rgba(0, 0, 0, 0.15);
   -webkit-transition: width 0.6s ease;
   -o-transition: width 0.6s ease;
-  transition: width 0.6s ease; 
+  transition: width 0.6s ease;
   margin: 1px 0 0 0 !important;
 }
 
@@ -6024,7 +6024,7 @@ main.page-content.col-lg-12 {
 }
 .list-group-item.active-menu-title {
   color: #D77610 !important; }
-  
+
 button.toggle-sidebar {
   color:#FFF;
   background-color:transparent;
@@ -6190,7 +6190,7 @@ padding-right: 15px; }
   .active-menu-title:before, .active-menu a:before {
     width: 3px; }
   .active-menu-title.active, .active-menu a.active {
-	background-color: #131C22; 
+	background-color: #131C22;
   color: #d77610; }
 
 .active-menu a:before {
diff --git a/net/freeradius/src/opnsense/service/templates/OPNsense/Freeradius/users b/net/freeradius/src/opnsense/service/templates/OPNsense/Freeradius/users
index b865ed447..163ab828c 100644
--- a/net/freeradius/src/opnsense/service/templates/OPNsense/Freeradius/users
+++ b/net/freeradius/src/opnsense/service/templates/OPNsense/Freeradius/users
@@ -64,9 +64,9 @@
 {%       if user_list.linkedAVPair|default("") != "" %}
 {%         for avlist in user_list.linkedAVPair.split(",") %}
 {%           set avlistdetail = helpers.getUUID(avlist) %}
-{%           if avlistdetail != {} and avlistdetail.enabled == '1' %} 
+{%           if avlistdetail != {} and avlistdetail.enabled == '1' %}
        {{ avlistdetail.name }} {{ avlistdetail.operator }} {{ avlistdetail.value }},
-{%           endif %}       
+{%           endif %}
 {%         endfor %}
 {%       endif %}
        Framed-Protocol = PPP