diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 8e50095..9b566e7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        java: [ 11, 12, 13, 14 ]
+        java: [ 11, 17, 21 ]
     name: Java ${{ matrix.java }} compile
     steps:
       - uses: actions/checkout@master
diff --git a/pom.xml b/pom.xml
index 50455f4..f3bd8c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
     <description></description>
 
     <properties>
-        <java.version>1.8</java.version>
+        <java.version>11</java.version>
     </properties>
 
     <dependencies>
diff --git a/src/main/java/org/elpuentesearcy/configuration/Properties.java b/src/main/java/org/elpuentesearcy/configuration/Properties.java
index c2a9511..a4e5f83 100644
--- a/src/main/java/org/elpuentesearcy/configuration/Properties.java
+++ b/src/main/java/org/elpuentesearcy/configuration/Properties.java
@@ -4,12 +4,9 @@
 import lombok.NoArgsConstructor;
 import org.elpuentesearcy.ElPuenteBoot;
 import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.core.Ordered;
-import org.springframework.core.annotation.Order;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
@@ -55,20 +52,6 @@ public class Properties
     private List<Employee> board;
     private List<Employee> staff;
 
-    private static Properties instance;
-
-    @PostConstruct
-    @Order( Ordered.HIGHEST_PRECEDENCE )
-    public void postConstruct()
-    {
-        instance = this;
-    }
-
-    public static Properties get()
-    {
-        return instance;
-    }
-
     @Data
     public static class Google
     {
diff --git a/src/main/resources/templates/about.html b/src/main/resources/templates/about.html
index 68693d9..36be7cc 100644
--- a/src/main/resources/templates/about.html
+++ b/src/main/resources/templates/about.html
@@ -2,7 +2,7 @@
 <html th:lang="${#locale.language}"
       xmlns:th="http://www.thymeleaf.org" xmlns="http://www.w3.org/1999/xhtml"
       xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
-      th:with="properties=${T(org.elpuentesearcy.configuration.Properties).get()}, uri=${T(org.elpuentesearcy.controller.AboutController).URL_BASE}">
+      th:with="uri=${@aboutController.URL_BASE}">
 <head>
    <th:block th:include="fragments/includes::head(${uri})"></th:block>
 
@@ -10,7 +10,7 @@
    <!--<meta property="og:url" content="">-->
    <meta property="og:title" th:content="#{about.title}">
    <meta property="og:description" th:content="#{about.aboutUs.content}">
-   <link rel="stylesheet" th:href="@{'/css/about.css?v='+__${properties.version}__}">
+   <link rel="stylesheet" th:href="@{'/css/about.css?v='+__${@properties.version}__}">
 </head>
 <body>
 <i th:replace="fragments/navbar::header(#{about.navlink})"></i>
diff --git a/src/main/resources/templates/changes.html b/src/main/resources/templates/changes.html
index 6130258..406411a 100644
--- a/src/main/resources/templates/changes.html
+++ b/src/main/resources/templates/changes.html
@@ -3,17 +3,17 @@
       xmlns:th="http://www.thymeleaf.org"
       xmlns="http://www.w3.org/1999/xhtml"
       xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
-      th:with="properties=${T(org.elpuentesearcy.configuration.Properties).get()}, uri=${T(org.elpuentesearcy.controller.ChangesController).URL_BASE}">
+      th:with="uri=${@changesController.URL_BASE}">
 <head>
    <th:block th:include="fragments/includes::head(${uri})"></th:block>
 
    <title th:text="#{changes.title}">Title</title>
-   <link rel="stylesheet" th:href="@{'/css/changes.css?v='+__${properties.version}__}">
+   <link rel="stylesheet" th:href="@{'/css/changes.css?v='+__${@properties.version}__}">
 </head>
 <body>
 <i th:replace="fragments/navbar::header(#{changes.navlink})"></i>
 <main role="main">
-   <i th:replace="fragments/sectionHeader::header(#{changes.changes}+' ('+${properties.version}+')')"></i>
+   <i th:replace="fragments/sectionHeader::header(#{changes.changes}+' ('+${@properties.version}+')')"></i>
 
    <div class="container">
       <th:block th:if="${#lists.isEmpty(trelloCards)}">
@@ -47,6 +47,6 @@
 </main>
 
 <!--/*/ <th:block th:include="fragments/includes::scripts"></th:block> /*/-->
-<script th:src="@{'/js/changes.js?v='+__${properties.version}__}"></script>
+<script th:src="@{'/js/changes.js?v='+__${@properties.version}__}"></script>
 <script src="https://p.trellocdn.com/embed.min.js"></script>
 </body>
\ No newline at end of file
diff --git a/src/main/resources/templates/contact.html b/src/main/resources/templates/contact.html
index 8ba03d0..3c99c22 100644
--- a/src/main/resources/templates/contact.html
+++ b/src/main/resources/templates/contact.html
@@ -2,10 +2,10 @@
 <html th:lang="${#locale.language}"
       xmlns:th="http://www.thymeleaf.org" xmlns="http://www.w3.org/1999/xhtml"
       xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
-      th:with="properties=${T(org.elpuentesearcy.configuration.Properties).get()}, uri=${T(org.elpuentesearcy.controller.ContactController).URL_BASE}">
+      th:with="uri=${@contactController.URL_BASE}">
 <head>
    <th:block th:include="fragments/includes::head(${uri})"></th:block>
-   <link rel="stylesheet" th:href="@{'/css/contact.css?v='+__${properties.version}__}">
+   <link rel="stylesheet" th:href="@{'/css/contact.css?v='+__${@properties.version}__}">
 
    <title th:text="#{contact.title}">Title</title>
    <!--<meta property="og:url" content="">-->
@@ -13,7 +13,7 @@
    <meta property="og:description" th:content="#{contact.contactUs}">
 </head>
 <body>
-<th:block th:if="${!#strings.isEmpty( properties.facebookUrl )}">
+<th:block th:if="${!#strings.isEmpty( @properties.facebookUrl )}">
    <div id="fb-root"></div>
    <script async defer crossorigin="anonymous" th:src="'https://connect.facebook.net/'+${#locale.language + (#locale.language == 'es' ? '_LA' : '_US' )}+'/sdk.js#xfbml=1&version=v3.3'"></script>
 </th:block>
@@ -26,10 +26,10 @@
          <div class="col-12 col-md-6 mb-3">
             <div layout:insert="~{layouts/info::card}">
                <div layout:fragment="content" th:remove="tag">
-                  <th:block th:if="${!#lists.isEmpty(properties.physicalAddress)}">
+                  <th:block th:if="${!#lists.isEmpty(@properties.physicalAddress)}">
                      <div layout:insert="~{layouts/info::icon('fa-map-marker-alt')}" class="hoverPointer" th:attr="addressUrlLine=${addressUrlLine}" onclick="mapsSelector( this )">
                         <span layout:fragment="label" class="text-dark">
-                           <th:block th:each="line:${properties.physicalAddress}">
+                           <th:block th:each="line:${@properties.physicalAddress}">
                               <strong th:text="${line}">Line</strong>
                               <br/>
                            </th:block>
@@ -39,46 +39,46 @@
                         </span>
                      </div>
                   </th:block>
-                  <th:block th:if="${!#lists.isEmpty(properties.mailingAddress)}">
-                     <hr th:if="${!#lists.isEmpty(properties.physicalAddress)}"/>
+                  <th:block th:if="${!#lists.isEmpty(@properties.mailingAddress)}">
+                     <hr th:if="${!#lists.isEmpty(@properties.physicalAddress)}"/>
                      <div layout:insert="~{layouts/info::icon('fa-envelope-square')}">
                         <strong layout:fragment="label" class="text-dark">
-                           <th:block th:each="line:${properties.mailingAddress}">
+                           <th:block th:each="line:${@properties.mailingAddress}">
                               <span th:text="${line}">Line</span>
                               <br/>
                            </th:block>
                         </strong>
                      </div>
                   </th:block>
-                  <th:block th:if="${!#strings.isEmpty(properties.phone)}">
+                  <th:block th:if="${!#strings.isEmpty(@properties.phone)}">
                      <hr/>
-                     <div layout:insert="~{layouts/info::icon('fa-phone-square')}" th:with="href=${ 'tel:'+properties.phone }">
+                     <div layout:insert="~{layouts/info::icon('fa-phone-square')}" th:with="href=${ 'tel:'+@properties.phone }">
                         <strong layout:fragment="label" class="text-dark">
                            <span th:text="#{contact.phone}+':'" class="text-capitalize">
                               Phone:
                            </span>
                            <br/>
-                           <span th:text="${properties.formattedPhone}">
+                           <span th:text="${@properties.formattedPhone}">
                               (123) 456-7890
                            </span>
                         </strong>
                      </div>
                   </th:block>
-                  <th:block th:if="${!#strings.isEmpty(properties.email)}">
+                  <th:block th:if="${!#strings.isEmpty(@properties.email)}">
                      <hr/>
-                     <div layout:insert="~{layouts/info::icon('fa-at')}" th:with="href=${ 'mailto:'+properties.email }">
+                     <div layout:insert="~{layouts/info::icon('fa-at')}" th:with="href=${ 'mailto:'+@properties.email }">
                         <strong layout:fragment="label" class="text-dark">
                            <span th:text="#{contact.email}+':'" class="text-capitalize">
                               Email:
                            </span>
                            <br/>
-                           <span th:text="${properties.email}">
+                           <span th:text="${@properties.email}">
                               test@abc.com
                            </span>
                         </strong>
                      </div>
                   </th:block>
-                  <th:block th:if="${!#lists.isEmpty(properties.physicalAddress)}">
+                  <th:block th:if="${!#lists.isEmpty(@properties.physicalAddress)}">
                      <hr/>
                      <div layout:insert="~{layouts/info::icon('fa-clock')}">
                         <span layout:fragment="label" class="text-dark">
@@ -90,14 +90,14 @@
                               Call before you come
                            </small>
                            <br/>
-                           <th:block th:if="${!#strings.isEmpty(properties.officeHoursWeekday)}">
+                           <th:block th:if="${!#strings.isEmpty(@properties.officeHoursWeekday)}">
                               <small th:text="#{contact.hours.weekday}+':'">M-F</small>
-                              <strong class="float-right" th:text="${properties.officeHoursWeekday}">9:00am - 11:00pm</strong>
+                              <strong class="float-right" th:text="${@properties.officeHoursWeekday}">9:00am - 11:00pm</strong>
                               <br/>
                            </th:block>
-                           <th:block th:if="${!#strings.isEmpty(properties.officeHoursWeekend)}">
+                           <th:block th:if="${!#strings.isEmpty(@properties.officeHoursWeekend)}">
                               <small th:text="#{contact.hours.weekend}+':'">Saturday</small>
-                              <strong class="float-right" th:text="${properties.officeHoursWeekend}">9:00am - 11:00pm</strong>
+                              <strong class="float-right" th:text="${@properties.officeHoursWeekend}">9:00am - 11:00pm</strong>
                               <br/>
                            </th:block>
                         </span>
@@ -107,9 +107,9 @@
             </div>
          </div>
          <div class="col-12 col-md-6 mb-3">
-            <div th:if="${!#strings.isEmpty( properties.facebookUrl )}" class="fb-page d-block" th:attr="data-href=${properties.facebookUrl}" data-tabs="messages" data-width="" data-height="500" data-small-header="true" data-adapt-container-width="true" data-hide-cover="false" data-show-facepile="true">
-               <blockquote th:cite="${properties.facebookUrl}" class="fb-xfbml-parse-ignore">
-                  <a th:href="${properties.facebookUrl}">
+            <div th:if="${!#strings.isEmpty( @properties.facebookUrl )}" class="fb-page d-block" th:attr="data-href=${@properties.facebookUrl}" data-tabs="messages" data-width="" data-height="500" data-small-header="true" data-adapt-container-width="true" data-hide-cover="false" data-show-facepile="true">
+               <blockquote th:cite="${@properties.facebookUrl}" class="fb-xfbml-parse-ignore">
+                  <a th:href="${@properties.facebookUrl}">
                      El Puente Hispanic Services Center
                   </a>
                </blockquote>
@@ -118,7 +118,7 @@
       </div>
 
       <iframe th:if="${!#strings.isEmpty(addressUrlLine)}"
-              th:src="'https://www.google.com/maps/embed/v1/place?q='+${addressUrlLine}+'&key='+${properties.google.maps.apiKey}+'&language='+${#locale.language}"
+              th:src="'https://www.google.com/maps/embed/v1/place?q='+${addressUrlLine}+'&key='+${@properties.google.maps.apiKey}+'&language='+${#locale.language}"
               class="mx-auto d-block border-0 mb-3"
               width="100%"
               allowfullscreen>
@@ -129,7 +129,7 @@
 </main>
 
 <!--/*/ <th:block th:include="fragments/includes::scripts"></th:block> /*/-->
-<script th:src="@{'/js/contact.js?v='+__${properties.version}__}"></script>
-<script th:src="@{'/js/facebookEmbed.js?v='+__${properties.version}__}"></script>
+<script th:src="@{'/js/contact.js?v='+__${@properties.version}__}"></script>
+<script th:src="@{'/js/facebookEmbed.js?v='+__${@properties.version}__}"></script>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/events.html b/src/main/resources/templates/events.html
index 4770f17..f6c85c1 100644
--- a/src/main/resources/templates/events.html
+++ b/src/main/resources/templates/events.html
@@ -2,10 +2,10 @@
 <html th:lang="${#locale.language}"
       xmlns:th="http://www.thymeleaf.org" xmlns="http://www.w3.org/1999/xhtml"
       xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
-      th:with="properties=${T(org.elpuentesearcy.configuration.Properties).get()}, uri=${T(org.elpuentesearcy.controller.EventsController).URL_BASE}">
+      th:with="uri=${@eventsController.URL_BASE}">
 <head>
   <th:block th:include="fragments/includes::head(${uri})"></th:block>
-  <link rel="stylesheet" th:href="@{'/css/cardColumns.css?v='+__${properties.version}__}">
+  <link rel="stylesheet" th:href="@{'/css/cardColumns.css?v='+__${@properties.version}__}">
 
   <title th:text="#{events.title}">Title</title>
   <!--<meta property="og:url" content="">-->
diff --git a/src/main/resources/templates/fragments/includes.html b/src/main/resources/templates/fragments/includes.html
index 29f9c66..61f8a0f 100644
--- a/src/main/resources/templates/fragments/includes.html
+++ b/src/main/resources/templates/fragments/includes.html
@@ -1,11 +1,11 @@
 <!DOCTYPE html>
 <html lang="en" xmlns:th="http://www.thymeleaf.org">
-<head th:fragment="head(currentURI)" th:with="properties=${T(org.elpuentesearcy.configuration.Properties).get()}">
+<head th:fragment="head(currentURI)">
    <meta charset="UTF-8">
    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
    <meta http-equiv="content-language" th:content="${#locale.language}">
 
-   <th:block th:if="${!#strings.isEmpty(properties.google.analytics.trackingId)}" th:with="trackingId=${properties.google.analytics.trackingId}">
+   <th:block th:if="${!#strings.isEmpty(@properties.google.analytics.trackingId)}" th:with="trackingId=${@properties.google.analytics.trackingId}">
       <script async th:src="'https://www.googletagmanager.com/gtag/js?id='+${trackingId}"></script>
       <script th:inline="javascript">
          /*<![CDATA[*/
@@ -25,7 +25,7 @@
       <script async src='https://www.google-analytics.com/analytics.js'></script>
    </th:block>
 
-   <th:block th:unless="${properties.testMode}">
+   <th:block th:unless="${@properties.testMode}">
       <link rel="apple-touch-icon" sizes="57x57" href="/apple-icon-57x57.png">
       <link rel="apple-touch-icon" sizes="60x60" href="/apple-icon-60x60.png">
       <link rel="apple-touch-icon" sizes="72x72" href="/apple-icon-72x72.png">
@@ -40,13 +40,13 @@
       <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
       <link rel="icon" type="image/png" sizes="96x96" href="/favicon-96x96.png">
       <link rel="manifest" href="/manifest.json">
-      <link rel="canonical" th:href="'https://'+${properties.domain + currentURI}">
-      <link rel="alternate" th:href="'https://'+${properties.domain + currentURI}" hreflang="x-default">
+      <link rel="canonical" th:href="'https://'+${@properties.domain + currentURI}">
+      <link rel="alternate" th:href="'https://'+${@properties.domain + currentURI}" hreflang="x-default">
       <th:block th:each="language:${T(org.elpuentesearcy.configuration.UrlLocaleResolver.ElPuenteLanguage).values()}">
-         <link rel="alternate" th:hreflang="${language.subdomain}" th:href="'https://'+${language.subdomain +'.'+ properties.domain + currentURI}">
+         <link rel="alternate" th:hreflang="${language.subdomain}" th:href="'https://'+${language.subdomain +'.'+ @properties.domain + currentURI}">
       </th:block>
    </th:block>
-   <th:block th:if="${properties.testMode}">
+   <th:block th:if="${@properties.testMode}">
       <link rel="apple-touch-icon" sizes="180x180" href="/apple-icon-beta-180x180.png">
       <link rel="icon" type="image/png" sizes="192x192" href="/android-icon-beta-192x192.png">
       <link rel="manifest" href="/manifest-beta.json">
@@ -54,27 +54,27 @@
 
    <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#6ba6cb">
    <meta name="apple-mobile-web-app-capable" content="no">
-   <meta name="apple-mobile-web-app-title" th:content="'El Puente'+${properties.testMode?' BETA':''}">
-   <meta name="application-name" th:content="'El Puente'+${properties.testMode?' BETA':''}">
+   <meta name="apple-mobile-web-app-title" th:content="'El Puente'+${@properties.testMode?' BETA':''}">
+   <meta name="application-name" th:content="'El Puente'+${@properties.testMode?' BETA':''}">
    <meta name="msapplication-config" content="browserconfig.xml">
-   <meta name="msapplication-TileColor" th:content="'#'+${properties.testMode?'E07F52':'6ba6cb'}">
+   <meta name="msapplication-TileColor" th:content="'#'+${@properties.testMode?'E07F52':'6ba6cb'}">
    <meta name="msapplication-TileImage" content="/ms-icon-144x144.png">
    <meta name="theme-color" content="#ffffff">
 
    <meta property="og:type" content="website">
-   <meta property="og:image" th:content="'http://'+${properties.domain}+'/apple-icon-180x180.png'">
-   <meta property="og:site_name" th:content="${properties.domain}">
+   <meta property="og:image" th:content="'http://'+${@properties.domain}+'/apple-icon-180x180.png'">
+   <meta property="og:site_name" th:content="${@properties.domain}">
 <!--   <meta property="fb:app_id" content="">-->
 
    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/css/bootstrap.min.css" integrity="sha384-GJzZqFGwb1QTTN6wy59ffF1BuGJpLSa9DkKMp0DgiMDm4iYMj70gZWKYbI706tWS" crossorigin="anonymous">
    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css">
-   <link rel="stylesheet" th:href="@{'/css/bootstrap-overrides.css?v='+__${properties.version}__}">
-   <link rel="stylesheet" th:href="@{'/css/common.css?v='+__${properties.version}__}">
+   <link rel="stylesheet" th:href="@{'/css/bootstrap-overrides.css?v='+__${@properties.version}__}">
+   <link rel="stylesheet" th:href="@{'/css/common.css?v='+__${@properties.version}__}">
 </head>
-<body th:fragment="scripts" th:with="properties=${T(org.elpuentesearcy.configuration.Properties).get()}">
+<body th:fragment="scripts">
    <script src="/webjars/jquery/jquery.min.js"></script>
    <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.6/umd/popper.min.js" integrity="sha384-wHAiFfRlMFy6i5SRaxvfOCifBUQy1xHdJ/yoi7FRNXMRBu5WHdZYu1hA6ZOblgut" crossorigin="anonymous"></script>
    <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.2.1/js/bootstrap.min.js" integrity="sha384-B0UglyR+jN6CkvvICOB2joaf5I4l3gm9GU6Hc1og6Ls7i6U/mkkaduKaBhlAXv9k" crossorigin="anonymous"></script>
-   <script th:src="@{'/js/common.js?v='+__${properties.version}__}"></script>
+   <script th:src="@{'/js/common.js?v='+__${@properties.version}__}"></script>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/fragments/navbar.html b/src/main/resources/templates/fragments/navbar.html
index d5ae05b..ae8ea98 100644
--- a/src/main/resources/templates/fragments/navbar.html
+++ b/src/main/resources/templates/fragments/navbar.html
@@ -1,12 +1,12 @@
 <!DOCTYPE html>
 <html xmlns:th="http://www.thymeleaf.org">
 <body>
-<div id="navContainer" th:fragment="header(activeTab)" th:with="footer=${footer ?: false}, properties=${T(org.elpuentesearcy.configuration.Properties).get()}" th:class="${footer ? '' : 'fixed-top bg-white decoratedNav'}">
+<div id="navContainer" th:fragment="header(activeTab)" th:with="footer=${footer ?: false}" th:class="${footer ? '' : 'fixed-top bg-white decoratedNav'}">
    <div th:class="${footer ? '' : 'container'}">
       <nav class="navbar navbar-light p-0 navbar-expand-lg">
          <a class="navbar-brand pb-0" th:href="@{/}">
-            <img th:unless="${footer}" id="navLogo" th:src="${'/images/logo_'+(#locale.language == 'es' ? 'es' : 'en')+(properties.testMode?'_beta':'')+'.png'}" th:alt="${'EL PUENTE'+(properties.testMode?' BETA':'')}">
-            <img th:if="${footer}" th:src="${'/images/logo-small'+(properties.testMode?'-beta':'')+'.png'}" th:alt="${'EL PUENTE'+(properties.testMode?' BETA':'')}" width="50px">
+            <img th:unless="${footer}" id="navLogo" th:src="${'/images/logo_'+(#locale.language == 'es' ? 'es' : 'en')+(@properties.testMode?'_beta':'')+'.png'}" th:alt="${'EL PUENTE'+(@properties.testMode?' BETA':'')}">
+            <img th:if="${footer}" th:src="${'/images/logo-small'+(@properties.testMode?'-beta':'')+'.png'}" th:alt="${'EL PUENTE'+(@properties.testMode?' BETA':'')}" width="50px">
          </a>
          <button class="navbar-toggler text-danger border-0" style="font-size: 2em; outline: none;" type="button" data-toggle="collapse" th:attr="data-target='#navbarSupportedContent'+${footer},aria-controls='navbarSupportedContent'+${footer}" aria-expanded="false" aria-label="Toggle navigation">
             <i class="fas fa-ellipsis-v"></i>
@@ -17,31 +17,31 @@
                   <i th:replace="fragments/navlink::link( #{home.navlink}, ${activeTab}, '/' )">Home</i>
                </li>
                <li class="nav-item">
-                  <i th:replace="fragments/navlink::link( #{about.navlink}, ${activeTab}, ${T(org.elpuentesearcy.controller.AboutController).URL_BASE} )">About Us</i>
+                  <i th:replace="fragments/navlink::link( #{about.navlink}, ${activeTab}, ${@aboutController.URL_BASE} )">About Us</i>
                </li>
                <li class="nav-item">
-                  <i th:replace="fragments/navlink::link( #{services.navlink}, ${activeTab}, ${T(org.elpuentesearcy.controller.ServicesController).URL_BASE} )">Services</i>
+                  <i th:replace="fragments/navlink::link( #{services.navlink}, ${activeTab}, ${@servicesController.URL_BASE} )">Services</i>
                </li>
                <li class="nav-item">
-                  <i th:replace="fragments/navlink::link( #{programs.navlink}, ${activeTab}, ${T(org.elpuentesearcy.controller.ProgramsController).URL_BASE} )">Programs</i>
+                  <i th:replace="fragments/navlink::link( #{programs.navlink}, ${activeTab}, ${@programsController.URL_BASE} )">Programs</i>
                </li>
-               <li class="nav-item" th:if="${!#strings.isEmpty(properties.facebookUrl)}" th:with="target='_blank'">
-                  <i th:replace="fragments/navlink::link( #{news.navlink}, ${activeTab}, ${properties.facebookUrl} )">News</i>
+               <li class="nav-item" th:if="${!#strings.isEmpty(@properties.facebookUrl)}" th:with="target='_blank'">
+                  <i th:replace="fragments/navlink::link( #{news.navlink}, ${activeTab}, ${@properties.facebookUrl} )">News</i>
                </li>
                <li class="nav-item">
-                  <i th:replace="fragments/navlink::link( #{involvement.navlink}, ${activeTab}, ${T(org.elpuentesearcy.controller.InvolvementController).URL_BASE} )">Get Involved</i>
+                  <i th:replace="fragments/navlink::link( #{involvement.navlink}, ${activeTab}, ${@involvementController.URL_BASE} )">Get Involved</i>
                </li>
                <li class="nav-item">
-                  <i th:replace="fragments/navlink::link( #{resources.navlink}, ${activeTab}, ${T(org.elpuentesearcy.controller.ResourcesController).URL_BASE} )">Resources</i>
+                  <i th:replace="fragments/navlink::link( #{resources.navlink}, ${activeTab}, ${@resourcesController.URL_BASE} )">Resources</i>
                </li>
                <li class="nav-item">
-                  <i th:replace="fragments/navlink::link( #{events.navlink}, ${activeTab}, ${T(org.elpuentesearcy.controller.EventsController).URL_BASE} )">Events</i>
+                  <i th:replace="fragments/navlink::link( #{events.navlink}, ${activeTab}, ${@eventsController.URL_BASE} )">Events</i>
                </li>
                <li class="nav-item">
-                  <i th:replace="fragments/navlink::link( #{contact.navlink}, ${activeTab}, ${T(org.elpuentesearcy.controller.ContactController).URL_BASE} )">Contact Us</i>
+                  <i th:replace="fragments/navlink::link( #{contact.navlink}, ${activeTab}, ${@contactController.URL_BASE} )">Contact Us</i>
                </li>
-               <th:block th:if="${properties.testMode}">
-                  <i th:replace="fragments/navlink::betaLink( #{changes.navlink}, ${activeTab}, ${T(org.elpuentesearcy.controller.ChangesController).URL_BASE} )">Changes</i>
+               <th:block th:if="${@properties.testMode}">
+                  <i th:replace="fragments/navlink::betaLink( #{changes.navlink}, ${activeTab}, ${@changesController.URL_BASE} )">Changes</i>
                </th:block>
             </ul>
          </div>
diff --git a/src/main/resources/templates/fragments/socialMedia.html b/src/main/resources/templates/fragments/socialMedia.html
index 8dd2afe..75e4bc6 100644
--- a/src/main/resources/templates/fragments/socialMedia.html
+++ b/src/main/resources/templates/fragments/socialMedia.html
@@ -2,14 +2,14 @@
 <html xmlns:th="http://www.thymeleaf.org">
 <body>
 </body>
-<span th:fragment="buttons" th:with="properties=${T(org.elpuentesearcy.configuration.Properties).get()}">
-   <a th:if="${!#strings.isEmpty(properties.facebookUrl)}" th:href="${properties.facebookUrl}" th:class="'facebook '+${colorClass ?: 'text-primary'}" target="_blank" th:title="#{social.facebook}">
+<span th:fragment="buttons">
+   <a th:if="${!#strings.isEmpty(@properties.facebookUrl)}" th:href="${@properties.facebookUrl}" th:class="'facebook '+${colorClass ?: 'text-primary'}" target="_blank" th:title="#{social.facebook}">
       <i class="fab fa-facebook-square"></i>
    </a>
-   <a th:if="${!#strings.isEmpty(properties.twitterUrl)}" th:href="${properties.twitterUrl}" th:class="'twitter '+${colorClass ?: 'text-primary'}" target="_blank" th:title="#{social.twitter}">
+   <a th:if="${!#strings.isEmpty(@properties.twitterUrl)}" th:href="${@properties.twitterUrl}" th:class="'twitter '+${colorClass ?: 'text-primary'}" target="_blank" th:title="#{social.twitter}">
       <i class="fab fa-twitter-square"></i>
    </a>
-   <a th:if="${!#strings.isEmpty(properties.instagramUrl)}" th:href="${properties.instagramUrl}" th:class="'instagram '+${colorClass ?: 'text-primary'}" target="_blank" th:title="#{social.instagram}">
+   <a th:if="${!#strings.isEmpty(@properties.instagramUrl)}" th:href="${@properties.instagramUrl}" th:class="'instagram '+${colorClass ?: 'text-primary'}" target="_blank" th:title="#{social.instagram}">
       <i class="fab fa-instagram"></i>
    </a>
 </span>
diff --git a/src/main/resources/templates/involvement.html b/src/main/resources/templates/involvement.html
index d63af26..5625efb 100644
--- a/src/main/resources/templates/involvement.html
+++ b/src/main/resources/templates/involvement.html
@@ -4,16 +4,16 @@
       xmlns:th="http://www.thymeleaf.org"
       xmlns="http://www.w3.org/1999/xhtml"
       xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
-      th:with="properties=${T(org.elpuentesearcy.configuration.Properties).get()}, uri=${T(org.elpuentesearcy.controller.InvolvementController).URL_BASE}">
+      th:with="uri=${@involvementController.URL_BASE}">
 <head>
    <th:block th:include="fragments/includes::head(${uri})"></th:block>
-   <link rel="stylesheet" th:href="@{'/css/involvement.css?v='+__${properties.version}__}">
+   <link rel="stylesheet" th:href="@{'/css/involvement.css?v='+__${@properties.version}__}">
 
    <title th:text="#{involvement.title}">Title</title>
    <!--<meta property="og:url" content="">-->
    <meta property="og:title" th:content="#{involvement.title}">
    <meta property="og:description" th:content="#{involvement.involvement.content}">
-   <link rel="stylesheet" th:href="@{'/css/cardColumns.css?v='+__${properties.version}__}">
+   <link rel="stylesheet" th:href="@{'/css/cardColumns.css?v='+__${@properties.version}__}">
 </head>
 <body>
 <i th:replace="fragments/navbar::header(#{involvement.navlink})"></i>
@@ -21,20 +21,20 @@
    <i layout:replace="~{layouts/info::banner(#{involvement.involvement.header},${uri})}"></i>
    <p class="container mb-5" th:utext="#{involvement.involvement.content}"></p>
    <div class="container text-center" th:with="fontawesomeClass='fa-share', target='_blank'">
-      <i th:replace="fragments/button::action(${properties.volunteerFormUrl_en}, 'Volunteer Form (English)')"></i>
-      <i th:replace="fragments/button::action(${properties.volunteerFormUrl_es}, 'Formulario de Voluntariado (Español)')"></i>
+      <i th:replace="fragments/button::action(${@properties.volunteerFormUrl_en}, 'Volunteer Form (English)')"></i>
+      <i th:replace="fragments/button::action(${@properties.volunteerFormUrl_es}, 'Formulario de Voluntariado (Español)')"></i>
    </div>
 
    <i th:replace="fragments/sectionHeader::header(#{involvement.donations.header})"></i>
 
-   <div class="container" th:if="${properties.showGivingTuesdayWidget}">
+   <div class="container" th:if="${@properties.showGivingTuesdayWidget}">
       <!-- Begin Give Lively Fundraising Widget -->
       <script>gl=document.createElement('script');gl.src='https://secure.givelively.org/widgets/branded_donation/el-puente-hispanic-services-center/giving-tuesday.js';document.getElementsByTagName('head')[0].appendChild(gl);</script><div data-widget-src='https://secure.givelively.org/donate/el-puente-hispanic-services-center/giving-tuesday?ref=sd_widget' id="give-lively-widget" class="gl-branded-donation-widget"></div>
       <!-- End Give Lively Fundraising Widget -->
       <i th:replace="fragments/sectionHeader::bannerText(#{involvement.donations.content})"></i>
    </div>
 
-   <div class="container" th:if="${!properties.showGivingTuesdayWidget}">
+   <div class="container" th:if="${!@properties.showGivingTuesdayWidget}">
 <!--      <div class="row mb-1">-->
 <!--         <div class="col"></div>-->
 <!--         <div class="col-xs-10 col-md-8 col-lg-6">-->
@@ -72,11 +72,11 @@
 
    <i layout:replace="~{layouts/info::cardView}">
       <div layout:fragment="cards">
-         <div th:if="${!#strings.isEmpty(properties.giveLivelyUrl)}"
+         <div th:if="${!#strings.isEmpty(@properties.giveLivelyUrl)}"
               class="pt-1" layout:insert="~{layouts/info::card}" th:with="fontawesomeClass='fa-hand-holding-usd', label=#{involvement.donations.online.label}, description=#{involvement.donations.online.content},
-              actionButtonURL=${properties.giveLivelyUrl}, actionButtonText=#{involvement.donations.online.button}"></div>
-         <div th:if="${!#strings.isEmpty(properties.cashtag)}"
-              class="pt-1" layout:insert="~{layouts/info::card}" th:with="fontawesomeClass='fa-dollar-sign', label=#{involvement.donations.cashapp.label}, description=#{involvement.donations.cashapp.content(${'<strong><a href=&quot;https://cash.me/'+properties.cashtag+'&quot; target=&quot;_blank&quot;>'+properties.cashtag+'</a></strong>'})}"></div>
+              actionButtonURL=${@properties.giveLivelyUrl}, actionButtonText=#{involvement.donations.online.button}"></div>
+         <div th:if="${!#strings.isEmpty(@properties.cashtag)}"
+              class="pt-1" layout:insert="~{layouts/info::card}" th:with="fontawesomeClass='fa-dollar-sign', label=#{involvement.donations.cashapp.label}, description=#{involvement.donations.cashapp.content(${'<strong><a href=&quot;https://cash.me/'+@properties.cashtag+'&quot; target=&quot;_blank&quot;>'+properties.cashtag+'</a></strong>'})}"></div>
          <div th:if="${!#strings.isEmpty(mailingAddress)}"
               class="pt-1" layout:insert="~{layouts/info::card}" th:with="fontawesomeClass='fa-envelope-open-text', label=#{involvement.donations.mail.label}, description=#{involvement.donations.mail.content(${'<strong>'+mailingAddress+'</strong>'})}"></div>
          <div class="pt-1" layout:insert="~{layouts/info::card}" th:with="fontawesomeClass='fa-monument', label=#{involvement.donations.memorial.label}, description=#{involvement.donations.memorial.content}"></div>
@@ -90,8 +90,8 @@
    <i th:replace="fragments/sectionHeader::header(#{involvement.volunteers.header})"></i>
    <p class="container mb-5" th:utext="#{involvement.volunteers.content}"></p>
    <div class="container text-center" th:with="fontawesomeClass='fa-share', target='_blank'">
-      <i th:replace="fragments/button::action(${properties.volunteerFormUrl_en}, 'Volunteer Form (English)')"></i>
-      <i th:replace="fragments/button::action(${properties.volunteerFormUrl_es}, 'Formulario de Voluntariado (Español)')"></i>
+      <i th:replace="fragments/button::action(${@properties.volunteerFormUrl_en}, 'Volunteer Form (English)')"></i>
+      <i th:replace="fragments/button::action(${@properties.volunteerFormUrl_es}, 'Formulario de Voluntariado (Español)')"></i>
    </div>
 
    <i th:replace="fragments/sectionHeader::header(#{involvement.sponsors.header})"></i>
@@ -101,6 +101,6 @@
 </main>
 
 <!--/*/ <th:block th:include="fragments/includes::scripts"></th:block> /*/-->
-<script th:src="@{'/js/cardView.js?v='+__${properties.version}__}"></script>
+<script th:src="@{'/js/cardView.js?v='+__${@properties.version}__}"></script>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/main.html b/src/main/resources/templates/main.html
index 8ff317a..7dc1ffa 100644
--- a/src/main/resources/templates/main.html
+++ b/src/main/resources/templates/main.html
@@ -1,8 +1,7 @@
 <!DOCTYPE html>
 <html th:lang="${#locale.language}"
       xmlns:th="http://www.thymeleaf.org" xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
-      th:with="properties=${T(org.elpuentesearcy.configuration.Properties).get()}">
+      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout">
 <head>
    <th:block th:include="fragments/includes::head('/')"></th:block>
 
@@ -10,8 +9,8 @@
    <!--<meta property="og:url" content="">-->
    <meta property="og:title" th:content="#{home.title}">
    <meta property="og:description" th:content="#{home.missionStatement}">
-   <link rel="stylesheet" th:href="@{'/css/main.css?v='+__${properties.version}__}">
-   <link rel="stylesheet" th:href="@{'/css/testimonial.css?v='+__${properties.version}__}">
+   <link rel="stylesheet" th:href="@{'/css/main.css?v='+__${@properties.version}__}">
+   <link rel="stylesheet" th:href="@{'/css/testimonial.css?v='+__${@properties.version}__}">
 
    <!-- Mailchimp styling -->
    <link href="//cdn-images.mailchimp.com/embedcode/classic-10_7.css" rel="stylesheet" type="text/css">
@@ -41,14 +40,14 @@
          </div>
       </i>
 
-      <div class="container text-center" th:if="${properties.showHispanicHeritageCelebrationDinner}">
+      <div class="container text-center" th:if="${@properties.showHispanicHeritageCelebrationDinner}">
          <div th:if="${#locale.language == 'es'}">
             <img class="mb-5" th:src="@{'/images/HHMCD-Spanish-Ticket-Sales.jpg'}" width="75%" />
          </div>
          <div th:if="${#locale.language != 'es'}">
             <img class="mb-5" th:src="@{'/images/HHMCD-Individual-ticket-sales.jpg'}" width="75%" />
             <div class="mb-5" th:with="fontawesomeClass='fa-share', target='_blank', isLarge=true">
-               <i th:replace="fragments/button::action(${properties.hispanicHeritageMonthCelebrationDinnerTicketsUrl}, 'Buy Tickets')"></i>
+               <i th:replace="fragments/button::action(${@properties.hispanicHeritageMonthCelebrationDinnerTicketsUrl}, 'Buy Tickets')"></i>
             </div>
             <p>
                El Puente Clients may purchase $10 tickets in person on Tuesdays and Thursdays, 3-6pm, at El Puente.  <a th:href="${#httpServletRequest.getRequestURL().toString().replaceFirst('://','://es.')}">Click here for more information.</a>
@@ -78,12 +77,12 @@
          <hr style="margin: 60px auto;">
       </div>
 
-      <div class="container mb-5" th:if="${properties.showGivingTuesdayWidget}">
+      <div class="container mb-5" th:if="${@properties.showGivingTuesdayWidget}">
          <!-- Begin Give Lively Fundraising Widget -->
          <script>gl=document.createElement('script');gl.src='https://secure.givelively.org/widgets/branded_donation/el-puente-hispanic-services-center/giving-tuesday.js';document.getElementsByTagName('head')[0].appendChild(gl);</script><div data-widget-src='https://secure.givelively.org/donate/el-puente-hispanic-services-center/giving-tuesday?ref=sd_widget' id="give-lively-widget" class="gl-branded-donation-widget"></div>
          <!-- End Give Lively Fundraising Widget -->
       </div>
-      <div class="container mb-5" th:if="${!properties.showGivingTuesdayWidget}">
+      <div class="container mb-5" th:if="${!@properties.showGivingTuesdayWidget}">
          <!-- Begin Give Lively Fundraising Widget -->
          <script>gl=document.createElement('script');gl.src='https://secure.givelively.org/widgets/simple_donation/el-puente-hispanic-services-center/website-donations.js?show_suggested_amount_buttons=false&show_in_honor_of=false&address_required=false&has_required_custom_question=false&prefilled_donation_amount=100';document.getElementsByTagName('head')[0].appendChild(gl);</script><div id="give-lively-widget" class="gl-simple-donation-widget"></div>
          <!-- End Give Lively Fundraising Widget -->
@@ -92,12 +91,12 @@
       <div class="container my-3">
          <div class="row">
             <div class="col-12 col-md-6 col-lg-6 col-xl-5 mb-3">
-               <th:block th:if="${!#strings.isEmpty( properties.facebookUrl )}">
+               <th:block th:if="${!#strings.isEmpty( @properties.facebookUrl )}">
                   <div layout:insert="~{layouts/info::card}">
                      <div layout:fragment="content" th:remove="tag">
                         <h5 class="card-title" th:text="#{social.facebook}"></h5>
                         <div class="fb-page d-block"
-                             th:attr="data-href=${properties.facebookUrl}"
+                             th:attr="data-href=${@properties.facebookUrl}"
                              data-tabs="timeline, events"
                              data-width=""
                              data-height="950"
@@ -105,8 +104,8 @@ <h5 class="card-title" th:text="#{social.facebook}"></h5>
                              data-adapt-container-width="true"
                              data-hide-cover="false"
                              data-show-facepile="true">
-                           <blockquote th:cite="${properties.facebookUrl}" class="fb-xfbml-parse-ignore">
-                              <a th:href="${properties.facebookUrl}">
+                           <blockquote th:cite="${@properties.facebookUrl}" class="fb-xfbml-parse-ignore">
+                              <a th:href="${@properties.facebookUrl}">
                                  El Puente Hispanic Services Center
                               </a>
                            </blockquote>
@@ -124,7 +123,7 @@ <h5 class="card-title" th:text="#{social.facebook}"></h5>
                      <div class="text-center">
                         <p th:utext="#{home.donationText}"></p>
                         <th:block th:with="fontawesomeClass='fa-hand-holding-heart',isLarge=true">
-                           <i th:replace="fragments/button::action(${T(org.elpuentesearcy.controller.InvolvementController).URL_BASE}, #{home.donationOptionsButton})"></i>
+                           <i th:replace="fragments/button::action(${@involvementController.URL_BASE}, #{home.donationOptionsButton})"></i>
                         </th:block>
                      </div>
                   </div>
@@ -151,6 +150,6 @@ <h5 class="card-title" th:text="#{social.facebook}"></h5>
       <i th:replace="fragments/footer::footer('')"></i>
 </main>
    <!--/*/ <th:block th:include="fragments/includes::scripts"></th:block> /*/-->
-   <script th:src="@{'/js/facebookEmbed.js?v='+__${properties.version}__}"></script>
+   <script th:src="@{'/js/facebookEmbed.js?v='+__${@properties.version}__}"></script>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/programs.html b/src/main/resources/templates/programs.html
index 5ff3117..724600a 100644
--- a/src/main/resources/templates/programs.html
+++ b/src/main/resources/templates/programs.html
@@ -3,11 +3,11 @@
       xmlns:th="http://www.thymeleaf.org"
       xmlns="http://www.w3.org/1999/xhtml"
       xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
-      th:with="properties=${T(org.elpuentesearcy.configuration.Properties).get()}, uri=${T(org.elpuentesearcy.controller.ProgramsController).URL_BASE}">
+      th:with="uri=${@programsController.URL_BASE}">
 <head>
    <th:block th:include="fragments/includes::head(${uri})"></th:block>
-   <link rel="stylesheet" th:href="@{'/css/cardColumns.css?v='+__${properties.version}__}">
-   <link rel="stylesheet" th:href="@{'/css/cardView.css?v='+__${properties.version}__}">
+   <link rel="stylesheet" th:href="@{'/css/cardColumns.css?v='+__${@properties.version}__}">
+   <link rel="stylesheet" th:href="@{'/css/cardView.css?v='+__${@properties.version}__}">
 
    <title th:text="#{programs.title}">Title</title>
    <!--<meta property="og:url" content="">-->
@@ -21,7 +21,7 @@
    <i th:replace="fragments/sectionHeader::bannerText(#{programs.description})"></i>
 
    <i layout:replace="~{layouts/info::cardView}">
-      <div layout:fragment="cards" th:with="phoneLink=${#strings.isEmpty(properties.phone) ? '' : '<a href=&quot;tel:'+properties.phone+'&quot;><strong>'+properties.formattedPhone+'</strong></a>'}">
+      <div layout:fragment="cards" th:with="phoneLink=${#strings.isEmpty(@properties.phone) ? '' : '<a href=&quot;tel:'+@properties.phone+'&quot;><strong>'+@properties.formattedPhone+'</strong></a>'}">
          <div th:if="${!#strings.isEmpty(phoneLink)}"
               class="pt-1" layout:insert="~{layouts/info::card}" th:with="fontawesomeClass='fa-chalkboard-teacher', label=#{programs.english.label}, description=#{programs.english.description(${phoneLink})}, imageUrl=@{/images/20230110_194411.jpg}"></div>
          <div class="pt-1" layout:insert="~{layouts/info::card}" th:with="fontawesomeClass='fa-chalkboard-teacher', label=#{programs.spanish.label}, description=#{programs.spanish.description(${phoneLink})}, imageUrl=@{/images/20220222_160030.jpg}"></div>
@@ -39,6 +39,6 @@
 </main>
 
 <!--/*/ <th:block th:include="fragments/includes::scripts"></th:block> /*/-->
-<script th:src="@{'/js/cardView.js?v='+__${properties.version}__}"></script>
+<script th:src="@{'/js/cardView.js?v='+__${@properties.version}__}"></script>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/resources.html b/src/main/resources/templates/resources.html
index c8e1a26..3ee1d08 100644
--- a/src/main/resources/templates/resources.html
+++ b/src/main/resources/templates/resources.html
@@ -2,12 +2,12 @@
 <html th:lang="${#locale.language}"
       xmlns:th="http://www.thymeleaf.org" xmlns="http://www.w3.org/1999/xhtml"
       xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
-      th:with="properties=${T(org.elpuentesearcy.configuration.Properties).get()}, uri=${T(org.elpuentesearcy.controller.ResourcesController).URL_BASE}">
+      th:with="uri=${@resourcesController.URL_BASE}">
 <head>
    <th:block th:include="fragments/includes::head(${uri})"></th:block>
-   <link rel="stylesheet" th:href="@{'/css/cardColumns.css?v='+__${properties.version}__}">
-   <link rel="stylesheet" th:href="@{'/css/cardView.css?v='+__${properties.version}__}">
-   <link rel="stylesheet" th:href="@{'/css/resources.css?v='+__${properties.version}__}">
+   <link rel="stylesheet" th:href="@{'/css/cardColumns.css?v='+__${@properties.version}__}">
+   <link rel="stylesheet" th:href="@{'/css/cardView.css?v='+__${@properties.version}__}">
+   <link rel="stylesheet" th:href="@{'/css/resources.css?v='+__${@properties.version}__}">
 
    <title th:text="#{resources.title}">Title</title>
    <!--<meta property="og:url" content="">-->
@@ -73,6 +73,6 @@
 </main>
 
 <!--/*/ <th:block th:include="fragments/includes::scripts"></th:block> /*/-->
-<script th:src="@{'/js/cardView.js?v='+__${properties.version}__}"></script>
+<script th:src="@{'/js/cardView.js?v='+__${@properties.version}__}"></script>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/resources/templates/services.html b/src/main/resources/templates/services.html
index f3bd754..26eae26 100644
--- a/src/main/resources/templates/services.html
+++ b/src/main/resources/templates/services.html
@@ -3,11 +3,11 @@
       xmlns:th="http://www.thymeleaf.org"
       xmlns="http://www.w3.org/1999/xhtml"
       xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
-      th:with="properties=${T(org.elpuentesearcy.configuration.Properties).get()}, uri=${T(org.elpuentesearcy.controller.ServicesController).URL_BASE}">
+      th:with="uri=${@servicesController.URL_BASE}">
 <head>
    <th:block th:include="fragments/includes::head(${uri})"></th:block>
-   <link rel="stylesheet" th:href="@{'/css/cardColumns.css?v='+__${properties.version}__}">
-   <link rel="stylesheet" th:href="@{'/css/cardView.css?v='+__${properties.version}__}">
+   <link rel="stylesheet" th:href="@{'/css/cardColumns.css?v='+__${@properties.version}__}">
+   <link rel="stylesheet" th:href="@{'/css/cardView.css?v='+__${@properties.version}__}">
 
    <title th:text="#{services.title}">Title</title>
    <!--<meta property="og:url" content="">-->
@@ -38,6 +38,6 @@
 </main>
 
 <!--/*/ <th:block th:include="fragments/includes::scripts"></th:block> /*/-->
-<script th:src="@{'/js/cardView.js?v='+__${properties.version}__}"></script>
+<script th:src="@{'/js/cardView.js?v='+__${@properties.version}__}"></script>
 </body>
 </html>
\ No newline at end of file
