--- a/src/main/webapp/WEB-INF/jsp/site.jsp	Tue Jan 05 19:19:31 2021 +0100
+++ b/src/main/webapp/WEB-INF/jsp/site.jsp	Wed Jan 06 15:39:56 2021 +0100
@@ -1,7 +1,7 @@
 <%-- 
 DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 
-Copyright 2020 Mike Becker. All rights reserved.
+Copyright 2021 Mike Becker. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
@@ -48,23 +48,19 @@
 <%-- Define an alias for the additional stylesheet --%>
 <c:set scope="page" var="extraCss" value="${requestScope[Constants.REQ_ATTR_STYLESHEET]}"/>
 
-<%-- Define an alias for the bundle name --%>
-<c:set scope="page" var="bundleName" value="${requestScope[Constants.REQ_ATTR_RESOURCE_BUNDLE]}"/>
-
 <%-- Apply the session locale (should always be present, but check nevertheless) --%>
 <c:if test="${not empty sessionScope[Constants.SESSION_ATTR_LANGUAGE]}">
     <fmt:setLocale scope="request" value="${sessionScope[Constants.SESSION_ATTR_LANGUAGE]}"/>
 </c:if>
 
-<%-- Load resource bundles --%>
-<fmt:setBundle scope="request" basename="${bundleName}"/>
-<fmt:setBundle scope="request" var="lightpit_bundle" basename="localization.lightpit"/>
+<%-- Load resource bundle --%>
+<fmt:setBundle scope="request" basename="localization.strings"/>
 
 <!DOCTYPE html>
 <html>
 <head>
     <base href="${baseHref}">
-    <title>LightPIT - <fmt:message key="pageTitle"/></title>
+    <title><fmt:message key="app.title"/></title>
     <meta charset="UTF-8">
     <c:if test="${not empty redirectLocation}">
         <meta http-equiv="refresh" content="0; URL=${redirectLocation}">
@@ -80,17 +76,17 @@
 <div id="mainMenu">
     <div class="menuEntry" <c:if test="${fn:startsWith(requestPath, '/projects/')}">data-active</c:if> >
         <a href="projects/">
-            <fmt:message bundle="${lightpit_bundle}" key="menu.projects"/>
+            <fmt:message key="menu.projects"/>
         </a>
     </div>
     <div class="menuEntry" <c:if test="${fn:startsWith(requestPath, '/teams/')}">data-active</c:if> >
         <a href="teams/">
-            <fmt:message bundle="${lightpit_bundle}" key="menu.users"/>
+            <fmt:message key="menu.users"/>
         </a>
     </div>
     <div class="menuEntry" <c:if test="${fn:startsWith(requestPath, '/language/')}">data-active</c:if> >
         <a href="language/">
-            <fmt:message bundle="${lightpit_bundle}" key="menu.languages"/>
+            <fmt:message key="menu.languages"/>
         </a>
     </div>
 </div>