diff --git a/Wonky.Client/Components/CustomerInventoryListComponent.razor b/Wonky.Client/Components/CustomerInventoryListComponent.razor
index 61ed1809..d53e9da2 100644
--- a/Wonky.Client/Components/CustomerInventoryListComponent.razor
+++ b/Wonky.Client/Components/CustomerInventoryListComponent.razor
@@ -15,6 +15,7 @@
 
 @using Wonky.Client.Models
 @using System.ComponentModel.Design
+@using Wonky.Client.Enums
 <div class="row">
 
     @if (Inventory.Any())
diff --git a/Wonky.Client/Components/CustomerInventoryListComponent.razor.cs b/Wonky.Client/Components/CustomerInventoryListComponent.razor.cs
index 5fc8a79c..ba7082d7 100644
--- a/Wonky.Client/Components/CustomerInventoryListComponent.razor.cs
+++ b/Wonky.Client/Components/CustomerInventoryListComponent.razor.cs
@@ -15,6 +15,7 @@
 
 using Blazored.LocalStorage;
 using Microsoft.AspNetCore.Components;
+using Wonky.Client.Enums;
 using Wonky.Client.Models;
 using Wonky.Entity.Views;
 
diff --git a/Wonky.Client/Components/CustomerProductCheckListComponent.razor b/Wonky.Client/Components/CustomerProductCheckListComponent.razor
index 28f6aec8..c811e6ae 100644
--- a/Wonky.Client/Components/CustomerProductCheckListComponent.razor
+++ b/Wonky.Client/Components/CustomerProductCheckListComponent.razor
@@ -14,6 +14,7 @@
 *@
 @using Wonky.Client.Models
 @using System.ComponentModel.Design
+@using Wonky.Client.Enums
 <div class="row">
 
     @if (Inventory.Any())
diff --git a/Wonky.Client/Components/CustomerProductCheckListComponent.razor.cs b/Wonky.Client/Components/CustomerProductCheckListComponent.razor.cs
index 97d350ab..71f84b6f 100644
--- a/Wonky.Client/Components/CustomerProductCheckListComponent.razor.cs
+++ b/Wonky.Client/Components/CustomerProductCheckListComponent.razor.cs
@@ -15,6 +15,7 @@
 
 using Blazored.LocalStorage;
 using Microsoft.AspNetCore.Components;
+using Wonky.Client.Enums;
 using Wonky.Client.Models;
 using Wonky.Entity.Views;
 #pragma warning disable CS8618
diff --git a/Wonky.Client/Components/OfficeCountryCustomerListComponent.razor.cs b/Wonky.Client/Components/OfficeCountryCustomerListComponent.razor.cs
index 41ee66d9..710ba07d 100644
--- a/Wonky.Client/Components/OfficeCountryCustomerListComponent.razor.cs
+++ b/Wonky.Client/Components/OfficeCountryCustomerListComponent.razor.cs
@@ -16,6 +16,7 @@
 using System.Reflection.Metadata.Ecma335;
 using Microsoft.AspNetCore.Components;
 using Microsoft.VisualBasic.CompilerServices;
+using Wonky.Client.Enums;
 using Wonky.Client.OverlayOffice;
 using Wonky.Entity.DTO;
 using Wonky.Entity.Views;
diff --git a/Wonky.Client/Components/OfficeInventoryListComponent.razor b/Wonky.Client/Components/OfficeInventoryListComponent.razor
index 93d359c2..20c37187 100644
--- a/Wonky.Client/Components/OfficeInventoryListComponent.razor
+++ b/Wonky.Client/Components/OfficeInventoryListComponent.razor
@@ -16,6 +16,7 @@
 
 @using Wonky.Client.Models
 @using System.ComponentModel.Design
+@using Wonky.Client.Enums
 <div class="row">
 
     @if (Inventory.Any())
diff --git a/Wonky.Client/Components/OfficeInventoryListComponent.razor.cs b/Wonky.Client/Components/OfficeInventoryListComponent.razor.cs
index f8464fdb..a3a81c7b 100644
--- a/Wonky.Client/Components/OfficeInventoryListComponent.razor.cs
+++ b/Wonky.Client/Components/OfficeInventoryListComponent.razor.cs
@@ -15,6 +15,7 @@
 
 using Blazored.LocalStorage;
 using Microsoft.AspNetCore.Components;
+using Wonky.Client.Enums;
 using Wonky.Client.Models;
 using Wonky.Entity.Views;
 
diff --git a/Wonky.Client/Components/QuoteListComponent.razor b/Wonky.Client/Components/QuoteListComponent.razor
index b13c0b31..bbf8a94d 100644
--- a/Wonky.Client/Components/QuoteListComponent.razor
+++ b/Wonky.Client/Components/QuoteListComponent.razor
@@ -16,6 +16,7 @@
 
 @using Wonky.Entity.Views
 @using Wonky.Client.Models
+@using Wonky.Client.Enums
 
 <div class="list-group list-group-flush">
     <div class="list-group-item bg-dark text-white">
diff --git a/Wonky.Client/Components/QuoteListComponent.razor.cs b/Wonky.Client/Components/QuoteListComponent.razor.cs
index 6b964760..a3724d00 100644
--- a/Wonky.Client/Components/QuoteListComponent.razor.cs
+++ b/Wonky.Client/Components/QuoteListComponent.razor.cs
@@ -14,6 +14,7 @@
 //
 
 using Microsoft.AspNetCore.Components;
+using Wonky.Client.Enums;
 using Wonky.Client.Models;
 using Wonky.Entity.Views;
 
diff --git a/Wonky.Client/Components/WarehouseListComponent.razor b/Wonky.Client/Components/WarehouseListComponent.razor
index 1929d2d0..594043dc 100644
--- a/Wonky.Client/Components/WarehouseListComponent.razor
+++ b/Wonky.Client/Components/WarehouseListComponent.razor
@@ -15,6 +15,7 @@
 
 
 @using Wonky.Client.Models
+@using Wonky.Client.Enums
 
 @if (OrderList != null)
 {
diff --git a/Wonky.Client/Components/WarehouseListComponent.razor.cs b/Wonky.Client/Components/WarehouseListComponent.razor.cs
index b3861b6e..128baf16 100644
--- a/Wonky.Client/Components/WarehouseListComponent.razor.cs
+++ b/Wonky.Client/Components/WarehouseListComponent.razor.cs
@@ -14,6 +14,7 @@
 //
 
 using Microsoft.AspNetCore.Components;
+using Wonky.Client.Enums;
 using Wonky.Client.Models;
 using Wonky.Entity.Views;
 
diff --git a/Wonky.Client/Enums/DocumentSection.cs b/Wonky.Client/Enums/DocumentSection.cs
new file mode 100644
index 00000000..c25e1255
--- /dev/null
+++ b/Wonky.Client/Enums/DocumentSection.cs
@@ -0,0 +1,38 @@
+namespace Wonky.Client.Enums;
+
+public enum DocumentSection
+{
+    None,
+    EmergencyLabel,
+    EmergencyText,
+    FirstAidLabel,
+    FirstAidText,
+    SignatureLabel,
+    FooterText,
+    WasteLabel,
+    WasteText,
+    ProductLabel,
+    ProductText,
+    ProtectionLabel,
+    KapvLabel,
+    HRiskPhrase,
+    ERiskPhrase,
+    PRiskPhrase,
+    Section0,
+    Section1,
+    Section2,
+    Section3,
+    Section4,
+    Section5,
+    Section6,
+    Section7,
+    Section8,
+    Section9,
+    PrintDoc,
+    ClpPictogram,
+    ProductCategory,
+    KapvDefaultText,
+    QuoteLabel,
+    QuoteText,
+    QuoteMailText
+}
\ No newline at end of file
diff --git a/Wonky.Client/Models/PrintTarget.cs b/Wonky.Client/Enums/PrintTarget.cs
similarity index 96%
rename from Wonky.Client/Models/PrintTarget.cs
rename to Wonky.Client/Enums/PrintTarget.cs
index d52ca9d4..c3378bbd 100644
--- a/Wonky.Client/Models/PrintTarget.cs
+++ b/Wonky.Client/Enums/PrintTarget.cs
@@ -13,7 +13,7 @@
 //    along with this program.  If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
 //
 
-namespace Wonky.Client.Models;
+namespace Wonky.Client.Enums;
 
 public enum PrintTarget
 {
diff --git a/Wonky.Client/Models/ProcessStatus.cs b/Wonky.Client/Enums/ProcessStatus.cs
similarity index 96%
rename from Wonky.Client/Models/ProcessStatus.cs
rename to Wonky.Client/Enums/ProcessStatus.cs
index 13ef7d3f..e0c7d0c6 100644
--- a/Wonky.Client/Models/ProcessStatus.cs
+++ b/Wonky.Client/Enums/ProcessStatus.cs
@@ -14,7 +14,7 @@
 //
 
 
-namespace Wonky.Client.Models;
+namespace Wonky.Client.Enums;
 
 public enum ProcessStatus
 {
diff --git a/Wonky.Client/Models/ProductSort.cs b/Wonky.Client/Enums/ProductSort.cs
similarity index 96%
rename from Wonky.Client/Models/ProductSort.cs
rename to Wonky.Client/Enums/ProductSort.cs
index 5d658d88..3fd7dba0 100644
--- a/Wonky.Client/Models/ProductSort.cs
+++ b/Wonky.Client/Enums/ProductSort.cs
@@ -14,7 +14,7 @@
 //
 
 
-namespace Wonky.Client.Models;
+namespace Wonky.Client.Enums;
 
 public enum ProductSort
 {
diff --git a/Wonky.Client/Models/QuoteStatus.cs b/Wonky.Client/Enums/QuoteStatus.cs
similarity index 96%
rename from Wonky.Client/Models/QuoteStatus.cs
rename to Wonky.Client/Enums/QuoteStatus.cs
index 892da094..468bd104 100644
--- a/Wonky.Client/Models/QuoteStatus.cs
+++ b/Wonky.Client/Enums/QuoteStatus.cs
@@ -14,7 +14,7 @@
 //
 
 
-namespace Wonky.Client.Models;
+namespace Wonky.Client.Enums;
 
 public enum QuoteStatus
 {
diff --git a/Wonky.Client/Models/ValidateType.cs b/Wonky.Client/Enums/ValidateType.cs
similarity index 96%
rename from Wonky.Client/Models/ValidateType.cs
rename to Wonky.Client/Enums/ValidateType.cs
index d65376b4..0db12be8 100644
--- a/Wonky.Client/Models/ValidateType.cs
+++ b/Wonky.Client/Enums/ValidateType.cs
@@ -13,7 +13,7 @@
 //    along with this program.  If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
 //
 
-namespace Wonky.Client.Models;
+namespace Wonky.Client.Enums;
 
 public enum ValidateType
 {
diff --git a/Wonky.Client/Helpers/Utils.cs b/Wonky.Client/Helpers/Utils.cs
index 3a4985ae..685ab1eb 100644
--- a/Wonky.Client/Helpers/Utils.cs
+++ b/Wonky.Client/Helpers/Utils.cs
@@ -15,6 +15,7 @@
 
 using System.Net.Mail;
 using System.Text.RegularExpressions;
+using Wonky.Client.Enums;
 using Wonky.Client.Models;
 using Wonky.Entity.DTO;
 
diff --git a/Wonky.Client/HttpRepository/AdvisorCustomerHistoryRepository.cs b/Wonky.Client/HttpRepository/AdvisorCustomerHistoryRepository.cs
index aec2e5d5..ff8cbd17 100644
--- a/Wonky.Client/HttpRepository/AdvisorCustomerHistoryRepository.cs
+++ b/Wonky.Client/HttpRepository/AdvisorCustomerHistoryRepository.cs
@@ -127,10 +127,9 @@ public class AdvisorCustomerHistoryRepository : IAdvisorCustomerHistoryRepositor
     /// <returns></returns>
     public async Task<string> InvoiceErpToCrmRpc(string companyId, string syncDate)
     {
-        var x = await _client.GetAsync($"{_api.SyncRpc}/companies/{companyId}/{_api.SyncRpcInvoiceExt}/{syncDate}");
+        var x = await _client.GetAsync($"{_api.SyncRpc}/companies/{companyId}/invoices/{syncDate}");
         if (!x.IsSuccessStatusCode)
             return string.Empty;
-        var content = await x.Content.ReadAsStringAsync();
-        return content.Replace("\"", "");
+        return await x.Content.ReadAsStringAsync();
     }
 }
\ No newline at end of file
diff --git a/Wonky.Client/HttpRepository/ISystemTextsRepository.cs b/Wonky.Client/HttpRepository/ISystemTextsRepository.cs
index 2627f947..7f8be615 100644
--- a/Wonky.Client/HttpRepository/ISystemTextsRepository.cs
+++ b/Wonky.Client/HttpRepository/ISystemTextsRepository.cs
@@ -1,9 +1,13 @@
+using System.Collections.Specialized;
 using Wonky.Entity.DTO;
 
 namespace Wonky.Client.HttpRepository;
 
 public interface ISystemTextsRepository
 {
+    // Task<NameValueCollection> GetTexts(string countryCode, string textType, string textSection);
+    // Task PutTexts(string countryCode, string textType, string textSection, NameValueCollection texts);
+    
     Task<KrvEmergencyTexts> GetKrvEmergencyTexts();
     Task UpdateKrvEmergencyTexts(KrvEmergencyTexts model);
     
diff --git a/Wonky.Client/HttpRepository/SystemTextsRepository.cs b/Wonky.Client/HttpRepository/SystemTextsRepository.cs
index ed5a9c1a..da23f9da 100644
--- a/Wonky.Client/HttpRepository/SystemTextsRepository.cs
+++ b/Wonky.Client/HttpRepository/SystemTextsRepository.cs
@@ -1,3 +1,4 @@
+using System.Collections.Specialized;
 using System.Net.Http.Json;
 using System.Text.Json;
 using Microsoft.AspNetCore.Components;
@@ -28,6 +29,17 @@ public class SystemTextsRepository : ISystemTextsRepository
         _api = configuration.Value;
     }
 
+    // public async Task<NameValueCollection> GetTexts(string countryCode, string textType, string textSection)
+    // {
+    //     var result = await _client.GetFromJsonAsync<NameValueCollection>($"{_api.SystemDocStringUrl}/{textType}/{textSection}", _options);
+    //     return result ?? new NameValueCollection();
+    // }
+    //
+    // public async Task PutTexts(string countryCode, string textType, string textSection, NameValueCollection texts)
+    // {
+    //     throw new NotImplementedException();
+    // }
+
     public async Task<KrvEmergencyTexts> GetKrvEmergencyTexts()
     {
         var result = await _client.GetFromJsonAsync<KrvEmergencyTexts>($"{_api.SystemTexts}/emergency", _options);
diff --git a/Wonky.Client/Models/QuoteCallbackArgs.cs b/Wonky.Client/Models/QuoteCallbackArgs.cs
index 19f501fd..24abbdf4 100644
--- a/Wonky.Client/Models/QuoteCallbackArgs.cs
+++ b/Wonky.Client/Models/QuoteCallbackArgs.cs
@@ -14,6 +14,8 @@
 //
 
 
+using Wonky.Client.Enums;
+
 namespace Wonky.Client.Models;
 
 public class QuoteCallbackArgs
@@ -22,6 +24,7 @@ public class QuoteCallbackArgs
     /// ESalesNumber
     /// </summary>
     public string ESalesNumber { get; set; } = "";
+
     /// <summary>
     /// QStatus
     /// </summary>
diff --git a/Wonky.Client/Models/SelectedSku.cs b/Wonky.Client/Models/SelectedSku.cs
index 7846ceba..d5b83e32 100644
--- a/Wonky.Client/Models/SelectedSku.cs
+++ b/Wonky.Client/Models/SelectedSku.cs
@@ -22,10 +22,12 @@ public class SelectedSku
     /// ItemId
     /// </summary>
     public string ItemId { get; set; } = "";
+
     /// <summary>
     /// Quantity
     /// </summary>
     public string Quantity { get; set; } = "";
+
     /// <summary>
     /// Rate
     /// </summary>
diff --git a/Wonky.Client/OverlayOffice/OfficeCustomerProductListOverlay.razor b/Wonky.Client/OverlayOffice/OfficeCustomerProductListOverlay.razor
index 270f9a1e..db64be2a 100644
--- a/Wonky.Client/OverlayOffice/OfficeCustomerProductListOverlay.razor
+++ b/Wonky.Client/OverlayOffice/OfficeCustomerProductListOverlay.razor
@@ -14,6 +14,7 @@
 *@
 
 @using Wonky.Client.Models
+@using Wonky.Client.Enums
 
 <div class="modal" tabindex="-1" role="dialog" style="display:@_modalDisplay">
     <div class="modal-dialog modal-dialog-scrollable modal-fullscreen">
diff --git a/Wonky.Client/OverlayOffice/OfficeCustomerProductListOverlay.razor.cs b/Wonky.Client/OverlayOffice/OfficeCustomerProductListOverlay.razor.cs
index 29b723fa..695e23d0 100644
--- a/Wonky.Client/OverlayOffice/OfficeCustomerProductListOverlay.razor.cs
+++ b/Wonky.Client/OverlayOffice/OfficeCustomerProductListOverlay.razor.cs
@@ -15,6 +15,7 @@
 
 
 using Microsoft.AspNetCore.Components;
+using Wonky.Client.Enums;
 using Wonky.Client.HttpInterceptors;
 using Wonky.Client.HttpRepository;
 using Wonky.Client.Models;
diff --git a/Wonky.Client/Pages/AdvisorCustomerActivityListPage.razor.cs b/Wonky.Client/Pages/AdvisorCustomerActivityListPage.razor.cs
index c34beff0..e4795de5 100644
--- a/Wonky.Client/Pages/AdvisorCustomerActivityListPage.razor.cs
+++ b/Wonky.Client/Pages/AdvisorCustomerActivityListPage.razor.cs
@@ -26,10 +26,15 @@ namespace Wonky.Client.Pages;
 
 public partial class AdvisorCustomerActivityListPage : IDisposable
 {
-    [Parameter] public string CompanyId { get; set; } = "";
+    // ######################################################################
     [Inject] public HttpInterceptorService Interceptor { get; set; }
     [Inject] public IAdvisorActivityRepository AdvisorActivityRepo { get; set; }
     [Inject] public IAdvisorCustomerRepository CompanyRepo { get; set; }
+
+    // ######################################################################
+    [Parameter] public string CompanyId { get; set; } = "";
+    
+    // ######################################################################
     private List<ReportItemView> ActivityList { get; set; } = new();
     private CompanyDto Company { get; set; } = new();
     private bool Working { get; set; } = true;
@@ -40,17 +45,17 @@ public partial class AdvisorCustomerActivityListPage : IDisposable
         Interceptor.RegisterBeforeSendEvent();
 
         Company = await CompanyRepo.GetCompanyById(CompanyId);
+        
         await GetActivities();
+        
         Working = false;
     }
 
     private async Task GetActivities()
     {
-        Working = true;
         ActivityList = await AdvisorActivityRepo.GetCustomerActivities(CompanyId);
         if (ActivityList.Any())
             ActivityList = ActivityList.OrderByDescending(x => x.OrderDate).ToList();
-        Working = false;
     }
 
     public void Dispose()
diff --git a/Wonky.Client/Pages/AdvisorCustomerInventoryListPage.razor.cs b/Wonky.Client/Pages/AdvisorCustomerInventoryListPage.razor.cs
index ca8efaf4..183f7a1e 100644
--- a/Wonky.Client/Pages/AdvisorCustomerInventoryListPage.razor.cs
+++ b/Wonky.Client/Pages/AdvisorCustomerInventoryListPage.razor.cs
@@ -15,6 +15,7 @@
 
 
 using System.Text.Json;
+using System.Xml;
 using Blazored.LocalStorage;
 using Blazored.Toast.Services;
 using Microsoft.AspNetCore.Components;
@@ -53,11 +54,20 @@ public partial class AdvisorCustomerInventoryListPage : IDisposable
 
     protected override async Task OnInitializedAsync()
     {
+
         Interceptor.RegisterEvent();
         Interceptor.RegisterBeforeSendEvent();
 
         Company = await CustomerRepo.GetCompanyById(CompanyId);
         
+        while (string.IsNullOrWhiteSpace(Company.HistorySync))
+            await Task.Delay(250);
+        
+        var x = await HistoryRepo.InvoiceErpToCrmRpc(CompanyId, Company.HistorySync);
+
+        while(string.IsNullOrWhiteSpace(x))
+            await Task.Delay(500);
+        
         // fetch product inventory
         await FetchProductInventory();
         
@@ -83,29 +93,10 @@ public partial class AdvisorCustomerInventoryListPage : IDisposable
     private async Task FetchProductInventory()
     {
         Inventory = new List<ProductInventoryView>();
-        
-        var pStorage = await Storage.GetItemAsStringAsync($"{Company.CompanyId}-products");
-        var pDate = await Storage.GetItemAsStringAsync($"{Company.CompanyId}-pDate");
-        var local = !string.IsNullOrWhiteSpace(pStorage) && !string.IsNullOrWhiteSpace(pDate);
-        // if we have a list and pDate was today return the list
-        if (local && pDate.Replace("\"", "") == $"{DateTime.Now:yyyy-MM-dd}")
-        {
-            Inventory = JsonSerializer.Deserialize<List<ProductInventoryView>>(pStorage);
-            Logger.LogDebug("CustomerProductListCrmPage => Inventory <= {}", JsonSerializer.Serialize(Inventory, _options));
-        }
-        Logger.LogDebug("pulling products from backend");
-        // fetch product history
         Inventory = await HistoryRepo.FetchInventory(CompanyId);
-        
-        // default sort order by description
         if (Inventory.Any())
             Inventory = Inventory.OrderBy(x => x.Description).ToList();
         
-        // send products to storage
-        await Storage.SetItemAsync($"{Company.CompanyId}-products", Inventory);
-        await Storage.SetItemAsync($"{Company.CompanyId}-pDate", $"{DateTime.Now:yyyy-MM-dd}");
-        Logger.LogDebug("Loaded products from backend");
-        Logger.LogDebug("CustomerProductListCrmPage => Inventory <= {}", JsonSerializer.Serialize(Inventory, _options));
     }
     
     public void Dispose()
diff --git a/Wonky.Client/Pages/AdvisorCustomerInvoiceListPage.razor b/Wonky.Client/Pages/AdvisorCustomerInvoiceListPage.razor
index 10a3b257..b2c7ea48 100644
--- a/Wonky.Client/Pages/AdvisorCustomerInvoiceListPage.razor
+++ b/Wonky.Client/Pages/AdvisorCustomerInvoiceListPage.razor
@@ -32,7 +32,7 @@
             <a class="btn btn-primary d-block" href="/advisor/customers/@Company.CompanyId/activities/new"><i class="bi-arrow-right"></i> Besøg</a>
         </div>
     </div>
-    <CustomerInvoiceListComponent OnShowInvoice="CallInvoiceModal" CompanyId="@_companyId" InvoiceList="@CompanyInvoices.Invoices"/>
+    <CustomerInvoiceListComponent OnShowInvoice="CallInvoiceModal" CompanyId="@CompanyId" InvoiceList="@CompanyInvoices.Invoices"/>
 }
 
 @if (Working)
@@ -40,4 +40,4 @@
     <WorkingThreeDots />
 }
 
-<CustomerInvoiceViewOverlay CompanyId="@_companyId" InvoiceId="@InvoiceId" @ref="CustomerInvoiceView" />
\ No newline at end of file
+<CustomerInvoiceViewOverlay CompanyId="@CompanyId" InvoiceId="@InvoiceId" @ref="CustomerInvoiceView" />
\ No newline at end of file
diff --git a/Wonky.Client/Pages/AdvisorCustomerViewEditPage.razor.cs b/Wonky.Client/Pages/AdvisorCustomerViewEditPage.razor.cs
index 686ecc44..f50e0bb2 100644
--- a/Wonky.Client/Pages/AdvisorCustomerViewEditPage.razor.cs
+++ b/Wonky.Client/Pages/AdvisorCustomerViewEditPage.razor.cs
@@ -96,15 +96,16 @@ public partial class AdvisorCustomerViewEditPage : IDisposable
         Logger.LogDebug("companyId => {}", CompanyId);
 
         Company = await CustomerRepo.GetCompanyById(CompanyId);
-
-        if (Company.Account.StartsWith("KANVAS"))
-            Kanvas = true;
         
         // internal flag
         EnableActivity = Company.ValidVat;
         // override if canvas which has account property as empty string or "NY"
         if (Company.Account == "NY" || Company.Account.StartsWith("KANVAS") || string.IsNullOrWhiteSpace(Company.Account))
             EnableActivity = 1;
+
+        if (Company.Account.StartsWith("KANVAS"))
+            Kanvas = true;
+        
         // action link passed to activity button component
         ActionLink = $"/advisor/customers/{CompanyId}/activities/new"; // used when drawing visit button
         // only execute if the company a 'real' customer
diff --git a/Wonky.Client/Pages/AdvisorQuoteListPage.razor b/Wonky.Client/Pages/AdvisorQuoteListPage.razor
index b35053d7..28f56272 100644
--- a/Wonky.Client/Pages/AdvisorQuoteListPage.razor
+++ b/Wonky.Client/Pages/AdvisorQuoteListPage.razor
@@ -16,6 +16,7 @@
 @using Wonky.Client.Components
 @using Wonky.Client.Models
 @using Microsoft.AspNetCore.Authorization
+@using Wonky.Client.Enums
 @attribute [Authorize(Roles = "Advisor")]
 @page "/advisor/agreements"
 <PageTitle>Aftaler og Tilbud - Oversigt</PageTitle>
diff --git a/Wonky.Client/Pages/AdvisorQuoteListPage.razor.cs b/Wonky.Client/Pages/AdvisorQuoteListPage.razor.cs
index ee9f8bc3..4b900784 100644
--- a/Wonky.Client/Pages/AdvisorQuoteListPage.razor.cs
+++ b/Wonky.Client/Pages/AdvisorQuoteListPage.razor.cs
@@ -17,6 +17,7 @@
 using Blazored.LocalStorage;
 using Blazored.Toast.Services;
 using Microsoft.AspNetCore.Components;
+using Wonky.Client.Enums;
 using Wonky.Client.Helpers;
 using Wonky.Client.HttpInterceptors;
 using Wonky.Client.HttpRepository;
diff --git a/Wonky.Client/Pages/AdvisorReportViewPage.razor b/Wonky.Client/Pages/AdvisorReportViewPage.razor
index 990771e6..c69db585 100644
--- a/Wonky.Client/Pages/AdvisorReportViewPage.razor
+++ b/Wonky.Client/Pages/AdvisorReportViewPage.razor
@@ -16,6 +16,7 @@
 
 @using Wonky.Client.Components
 @using Microsoft.AspNetCore.Authorization
+@using Wonky.Client.Enums
 @using Wonky.Client.Models
 @attribute [Authorize(Roles = "Advisor")]
 @page "/advisor/reports/view/{ReportDate}"
diff --git a/Wonky.Client/Pages/AdvisorReportViewPage.razor.cs b/Wonky.Client/Pages/AdvisorReportViewPage.razor.cs
index f1ce8843..32080ebc 100644
--- a/Wonky.Client/Pages/AdvisorReportViewPage.razor.cs
+++ b/Wonky.Client/Pages/AdvisorReportViewPage.razor.cs
@@ -16,6 +16,7 @@
 
 using Blazored.LocalStorage;
 using Microsoft.AspNetCore.Components;
+using Wonky.Client.Enums;
 using Wonky.Client.HttpInterceptors;
 using Wonky.Client.HttpRepository;
 using Wonky.Client.Local.Services;
diff --git a/Wonky.Client/Pages/CommonReportPrintOrderPage.razor.cs b/Wonky.Client/Pages/CommonReportPrintOrderPage.razor.cs
index a132163d..da83055d 100644
--- a/Wonky.Client/Pages/CommonReportPrintOrderPage.razor.cs
+++ b/Wonky.Client/Pages/CommonReportPrintOrderPage.razor.cs
@@ -18,6 +18,7 @@ using Blazored.LocalStorage;
 using Blazored.Toast.Services;
 using Microsoft.AspNetCore.Components;
 using Microsoft.JSInterop;
+using Wonky.Client.Enums;
 using Wonky.Client.Helpers;
 using Wonky.Client.HttpRepository;
 using Wonky.Client.Models;
diff --git a/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor b/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor
index 433f7547..c2a69fd2 100644
--- a/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor
+++ b/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor
@@ -15,6 +15,7 @@
 
 @using Wonky.Client.Components
 @using Microsoft.AspNetCore.Authorization
+@using Wonky.Client.Enums
 @using Wonky.Client.Models
 @attribute [Authorize(Roles = "Admin,Office,Supervisor")]
 @page "/office/users/advisors/{CountryCode}/{UserId}/reports/{ReportDate}"
diff --git a/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor.cs b/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor.cs
index 9cdb7904..d9dfe0b0 100644
--- a/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor.cs
+++ b/Wonky.Client/Pages/OfficeAdvisorReportViewPage.razor.cs
@@ -19,6 +19,7 @@ using Blazored.LocalStorage;
 using Blazored.Toast.Services;
 using Microsoft.AspNetCore.Components;
 using Microsoft.JSInterop;
+using Wonky.Client.Enums;
 using Wonky.Client.Helpers;
 using Wonky.Client.HttpInterceptors;
 using Wonky.Client.HttpRepository;
diff --git a/Wonky.Client/Pages/SysDocumentTextsViewEditPage.razor b/Wonky.Client/Pages/SysDocumentTextsViewEditPage.razor
new file mode 100644
index 00000000..32f88ac4
--- /dev/null
+++ b/Wonky.Client/Pages/SysDocumentTextsViewEditPage.razor
@@ -0,0 +1,54 @@
+@*    Copyright (C) 2022 FCS Frede's Computer Services.
+//    This program is free software: you can redistribute it and/or modify
+//    it under the terms of the GNU Affero General Public License as
+//    published by the Free Software Foundation, either version 3 of the
+//    License, or (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU Affero General Public License for more details.
+//
+//    You should have received a copy of the GNU Affero General Public License
+//    along with this program.  If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
+*@
+
+@using Microsoft.AspNetCore.Authorization
+@attribute [Authorize(Roles = "Admin")]
+
+@page "/system/doc/texts/{CountryCode}/{TextType}/{SectionName}"
+
+<PageTitle>Tekster for '@TextType @SectionName'</PageTitle>
+<div class="card">
+    <div class="card-header">
+        <div class="card-title">
+            <h3>Faremærkning CLP</h3>    
+        </div>
+    </div>
+    <div class="card-body">
+        @if (TextProps.Any())
+        {
+            <table class="table table-striped">
+                <thead>
+                <tr>
+                    <td>Navn</td>
+                    <td>Tekst</td>
+                </tr>
+                </thead>
+                <tbody>
+                @foreach (var textProp in TextProps)
+                {
+                    <tr>
+                        <td>@textProp.Name</td>
+                        <td><input type="text" class="form-control" name="@textProp.Name" value="@textProp.GetValue(Section, null)"/></td>
+                    </tr>
+                }
+                </tbody>
+            </table>
+        }
+        else
+        {
+            <div>Ingen data!</div>
+        }
+    </div>
+</div>
diff --git a/Wonky.Client/Pages/SysDocumentTextsViewEditPage.razor.cs b/Wonky.Client/Pages/SysDocumentTextsViewEditPage.razor.cs
new file mode 100644
index 00000000..06e10a60
--- /dev/null
+++ b/Wonky.Client/Pages/SysDocumentTextsViewEditPage.razor.cs
@@ -0,0 +1,40 @@
+//    Copyright (C) 2022 FCS Frede's Computer Services.
+//    This program is free software: you can redistribute it and/or modify
+//    it under the terms of the GNU Affero General Public License as
+//    published by the Free Software Foundation, either version 3 of the
+//    License, or (at your option) any later version.
+//
+//    This program is distributed in the hope that it will be useful,
+//    but WITHOUT ANY WARRANTY; without even the implied warranty of
+//    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//    GNU Affero General Public License for more details.
+//
+//    You should have received a copy of the GNU Affero General Public License
+//    along with this program.  If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
+//
+
+using System.Reflection;
+using Microsoft.AspNetCore.Components;
+using Wonky.Client.HttpRepository;
+using Wonky.Entity.DTO;
+
+#pragma warning disable CS8618
+
+namespace Wonky.Client.Pages;
+
+public partial class SysDocumentTextsViewEditPage
+{
+    [Inject] public ISystemTextsRepository TextsRepo { get; set; }
+
+    [Parameter] public string CountryCode { get; set; } = "dk";
+    [Parameter] public string TextType { get; set; } = "";
+    [Parameter] public string SectionName { get; set; } = "";
+    
+    private KrvClpPictogramTexts Section { get; set; } = new();
+    private PropertyInfo[] TextProps { get; set; }
+    protected override async Task OnInitializedAsync()
+    {
+        Section = await TextsRepo.GetKrvClpPictogramTexts();
+        TextProps = Section.GetType().GetProperties();
+    }    
+}
\ No newline at end of file
diff --git a/Wonky.Client/Pages/SystemClpPictogramTextsViewEditPage.razor b/Wonky.Client/Pages/SystemDocumentClpPictogramTextsViewEditPage.razor
similarity index 100%
rename from Wonky.Client/Pages/SystemClpPictogramTextsViewEditPage.razor
rename to Wonky.Client/Pages/SystemDocumentClpPictogramTextsViewEditPage.razor
diff --git a/Wonky.Client/Pages/SystemClpPictogramTextsViewEditPage.razor.cs b/Wonky.Client/Pages/SystemDocumentClpPictogramTextsViewEditPage.razor.cs
similarity index 95%
rename from Wonky.Client/Pages/SystemClpPictogramTextsViewEditPage.razor.cs
rename to Wonky.Client/Pages/SystemDocumentClpPictogramTextsViewEditPage.razor.cs
index f1c41051..e09a5808 100644
--- a/Wonky.Client/Pages/SystemClpPictogramTextsViewEditPage.razor.cs
+++ b/Wonky.Client/Pages/SystemDocumentClpPictogramTextsViewEditPage.razor.cs
@@ -22,7 +22,7 @@ using Wonky.Entity.DTO;
 
 namespace Wonky.Client.Pages;
 
-public partial class SystemClpPictogramTextsViewEditPage
+public partial class SystemDocumentClpPictogramTextsViewEditPage
 {
     [Inject] public ISystemTextsRepository TextsRepo { get; set; }
     private KrvClpPictogramTexts Section { get; set; } = new();
diff --git a/Wonky.Client/Pages/SystemCommonPrintTextsiewEditPage.razor b/Wonky.Client/Pages/SystemDocumentCommonPrintTextsViewEditPage.razor
similarity index 100%
rename from Wonky.Client/Pages/SystemCommonPrintTextsiewEditPage.razor
rename to Wonky.Client/Pages/SystemDocumentCommonPrintTextsViewEditPage.razor
diff --git a/Wonky.Client/Pages/SystemCommonPrintTextsiewEditPage.razor.cs b/Wonky.Client/Pages/SystemDocumentCommonPrintTextsViewEditPage.razor.cs
similarity index 95%
rename from Wonky.Client/Pages/SystemCommonPrintTextsiewEditPage.razor.cs
rename to Wonky.Client/Pages/SystemDocumentCommonPrintTextsViewEditPage.razor.cs
index d3ca027c..6cbefbd6 100644
--- a/Wonky.Client/Pages/SystemCommonPrintTextsiewEditPage.razor.cs
+++ b/Wonky.Client/Pages/SystemDocumentCommonPrintTextsViewEditPage.razor.cs
@@ -22,7 +22,7 @@ using Wonky.Entity.DTO;
 
 namespace Wonky.Client.Pages;
 
-public partial class SystemCommonPrintTextsiewEditPage
+public partial class SystemDocumentCommonPrintTextsViewEditPage
 {
     [Inject] public ISystemTextsRepository TextsRepo { get; set; }
     private KrvCommonPrintTexts Section { get; set; } = new();
diff --git a/Wonky.Client/Pages/SystemDocumentLabelsAdminPage.razor b/Wonky.Client/Pages/SystemDocumentLabelsAdminPage.razor
index f51eade4..8f7b930b 100644
--- a/Wonky.Client/Pages/SystemDocumentLabelsAdminPage.razor
+++ b/Wonky.Client/Pages/SystemDocumentLabelsAdminPage.razor
@@ -13,6 +13,8 @@
 //    along with this program.  If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
 *@
 
+@using Microsoft.AspNetCore.Authorization
+@attribute [Authorize(Roles = "Admin")]
 
 @page "/system/labels/"
 <div class="card">
diff --git a/Wonky.Client/Pages/SystemDocumentProductListPage.razor b/Wonky.Client/Pages/SystemDocumentProductListPage.razor
index 6afcee41..c470a566 100644
--- a/Wonky.Client/Pages/SystemDocumentProductListPage.razor
+++ b/Wonky.Client/Pages/SystemDocumentProductListPage.razor
@@ -13,6 +13,8 @@
 //    along with this program.  If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
 *@
 
+@using Microsoft.AspNetCore.Authorization
+@attribute [Authorize(Roles = "Admin")]
 
 @page "/system/products"
 
diff --git a/Wonky.Client/Pages/SystemDocumentProtectionListPage.razor b/Wonky.Client/Pages/SystemDocumentProtectionListPage.razor
index 2fa9502e..6481b49d 100644
--- a/Wonky.Client/Pages/SystemDocumentProtectionListPage.razor
+++ b/Wonky.Client/Pages/SystemDocumentProtectionListPage.razor
@@ -13,6 +13,8 @@
 //    along with this program.  If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
 *@
 
+@using Microsoft.AspNetCore.Authorization
+@attribute [Authorize(Roles = "Admin")]
 
 @page "/system/protections"
 <div class="card">
diff --git a/Wonky.Client/Pages/SystemDocumentSection0TextsViewEditPage.razor b/Wonky.Client/Pages/SystemDocumentSection0TextsViewEditPage.razor
index db728242..312f9543 100644
--- a/Wonky.Client/Pages/SystemDocumentSection0TextsViewEditPage.razor
+++ b/Wonky.Client/Pages/SystemDocumentSection0TextsViewEditPage.razor
@@ -14,7 +14,6 @@
 *@
 
 @using Microsoft.AspNetCore.Authorization
-
 @attribute [Authorize(Roles = "Admin")]
 
 @page "/system/texts/section0"
diff --git a/Wonky.Client/Pages/SystemDocumentTextsAdminPage.razor b/Wonky.Client/Pages/SystemDocumentTextsAdminPage.razor
index 4f7b5224..bdd089a3 100644
--- a/Wonky.Client/Pages/SystemDocumentTextsAdminPage.razor
+++ b/Wonky.Client/Pages/SystemDocumentTextsAdminPage.razor
@@ -13,6 +13,8 @@
 //    along with this program.  If not, see [https://www.gnu.org/licenses/agpl-3.0.en.html]
 *@
 
+@using Microsoft.AspNetCore.Authorization
+@attribute [Authorize(Roles = "Admin")]
 
 @page "/system/texts/"
 <div class="card">
diff --git a/Wonky.Client/Pages/SystemManagerLandingPage.razor b/Wonky.Client/Pages/SystemManagerLandingPage.razor
index 00402aa1..fe406f9f 100644
--- a/Wonky.Client/Pages/SystemManagerLandingPage.razor
+++ b/Wonky.Client/Pages/SystemManagerLandingPage.razor
@@ -16,6 +16,7 @@
 
 @using Microsoft.AspNetCore.Authorization
 @attribute [Authorize(Roles = "Admin")]
+
 @page "/system"
 <PageTitle>System Mmanager</PageTitle>
 
diff --git a/Wonky.Client/Pages/SystemShortMessagePage.razor b/Wonky.Client/Pages/SystemShortMessagePage.razor
index 9b5a5462..448944ec 100644
--- a/Wonky.Client/Pages/SystemShortMessagePage.razor
+++ b/Wonky.Client/Pages/SystemShortMessagePage.razor
@@ -14,10 +14,10 @@
 *@
 @using Microsoft.AspNetCore.Authorization
 @attribute [Authorize(Roles = "Admin")]
+
 @page "/system/sms"
 
-
-<div id="msg-box" style="display:@(MsgSent ? "none" : "block")">
+<div style="display:@(MsgSent ? "none" : "block")">
     <div class="row">
         <div class="h3 col-sm-10">
             Drift Meddelelse (SMS)
@@ -35,6 +35,9 @@
         <div class="col-sm-12 d-grid mx-auto">
             <textarea id="message" cols="50" rows="5" @bind-Value:event="oninput" @bind-Value="Message.Body"></textarea>
         </div>
+        <div class="col-sm-6">
+            <input type="checkbox" @bind-Value:event="onchange" @bind-Value="Message.Flash"/>
+        </div>
     </div>
     <div class="row ms-2">
         @foreach (var recipient in Recipients)
@@ -51,7 +54,7 @@
         </div>
     </div>
 </div>
-<div id="msg-box" style="display:@(MsgSent ? "block" : "none")">
+<div style="display:@(MsgSent ? "block" : "none")">
     <div class="row">
         <div class="col-10">
             <table class="table table-striped">
diff --git a/Wonky.Client/Pages/SystemShortMessagePage.razor.cs b/Wonky.Client/Pages/SystemShortMessagePage.razor.cs
index fed87e0e..e93069c4 100644
--- a/Wonky.Client/Pages/SystemShortMessagePage.razor.cs
+++ b/Wonky.Client/Pages/SystemShortMessagePage.razor.cs
@@ -67,7 +67,7 @@ public partial class SystemShortMessagePage : IDisposable
         }
         Message.From = "Innotec IT";
         Message.To = string.Join(",", recipients);
-        
+
         Logger.LogDebug("{}", JsonSerializer.Serialize(Message, _options));
         
         SmsResponse = await SmsService.SendSms(Message);
diff --git a/Wonky.Client/Pages/SystemSupervisorListPage.razor b/Wonky.Client/Pages/SystemSupervisorListPage.razor
index ea657404..73b610e7 100644
--- a/Wonky.Client/Pages/SystemSupervisorListPage.razor
+++ b/Wonky.Client/Pages/SystemSupervisorListPage.razor
@@ -16,6 +16,7 @@
 
 @using Microsoft.AspNetCore.Authorization
 @attribute [Authorize(Roles = "Admin")]
+
 @page "/system/supervisors"
 
 <PageTitle>Supervisor Oversigt</PageTitle>
diff --git a/Wonky.Client/Pages/SystemSupervisorViewEditPage.razor b/Wonky.Client/Pages/SystemSupervisorViewEditPage.razor
index d22b9a8c..eb6ed178 100644
--- a/Wonky.Client/Pages/SystemSupervisorViewEditPage.razor
+++ b/Wonky.Client/Pages/SystemSupervisorViewEditPage.razor
@@ -15,6 +15,7 @@
 
 @using Microsoft.AspNetCore.Authorization
 @attribute [Authorize(Roles = "Admin")]
+
 @page "/system/supervisors/{UserId}"
 
 <PageTitle>Supervisor Sælger Tilknytning</PageTitle>
diff --git a/Wonky.Client/Pages/SystemUserCreatePage.razor b/Wonky.Client/Pages/SystemUserCreatePage.razor
index 303db461..9cd60846 100644
--- a/Wonky.Client/Pages/SystemUserCreatePage.razor
+++ b/Wonky.Client/Pages/SystemUserCreatePage.razor
@@ -17,6 +17,7 @@
 @using Microsoft.AspNetCore.Authorization
 @using Wonky.Client.Components
 @attribute [Authorize(Roles = "Admin")]
+
 @page "/system/users/create"
 
 <div class="card">
diff --git a/Wonky.Client/Pages/SystemUserListPage.razor b/Wonky.Client/Pages/SystemUserListPage.razor
index 5fdebc04..e734aa6a 100644
--- a/Wonky.Client/Pages/SystemUserListPage.razor
+++ b/Wonky.Client/Pages/SystemUserListPage.razor
@@ -16,6 +16,7 @@
 
 @using Microsoft.AspNetCore.Authorization
 @attribute [Authorize(Roles = "Admin")]
+
 @page "/system/users"
 
 <PageTitle>System Bruger Oversigt</PageTitle>
diff --git a/Wonky.Client/Pages/SystemUserViewEditPage.razor b/Wonky.Client/Pages/SystemUserViewEditPage.razor
index 81279888..4074dec2 100644
--- a/Wonky.Client/Pages/SystemUserViewEditPage.razor
+++ b/Wonky.Client/Pages/SystemUserViewEditPage.razor
@@ -17,6 +17,7 @@
 @using Microsoft.AspNetCore.Authorization
 @using Wonky.Client.Components
 @attribute [Authorize(Roles = "Admin")]
+
 @page "/system/users/{UserId}"
 
 
diff --git a/Wonky.Client/Pages/WarehouseOrderListPage.razor b/Wonky.Client/Pages/WarehouseOrderListPage.razor
index 86ebc18e..dd2af8f5 100644
--- a/Wonky.Client/Pages/WarehouseOrderListPage.razor
+++ b/Wonky.Client/Pages/WarehouseOrderListPage.razor
@@ -17,6 +17,7 @@
 @using Wonky.Client.Components
 @using Microsoft.AspNetCore.Authorization
 @attribute [Authorize(Roles = "Admin,Office,Warehouse")]
+
 @page "/warehouse/orders/{Status}"
 
 <div class="row">
diff --git a/Wonky.Client/Pages/WarehouseOrderListPage.razor.cs b/Wonky.Client/Pages/WarehouseOrderListPage.razor.cs
index bce773c8..9dca7ea1 100644
--- a/Wonky.Client/Pages/WarehouseOrderListPage.razor.cs
+++ b/Wonky.Client/Pages/WarehouseOrderListPage.razor.cs
@@ -15,6 +15,7 @@
 
 
 using Microsoft.AspNetCore.Components;
+using Wonky.Client.Enums;
 using Wonky.Client.Helpers;
 using Wonky.Client.HttpInterceptors;
 using Wonky.Client.HttpRepository;
diff --git a/Wonky.Client/Pages/WarehouseOrderViewPage.razor b/Wonky.Client/Pages/WarehouseOrderViewPage.razor
index 03ab7762..460835f7 100644
--- a/Wonky.Client/Pages/WarehouseOrderViewPage.razor
+++ b/Wonky.Client/Pages/WarehouseOrderViewPage.razor
@@ -17,6 +17,7 @@
 @using Microsoft.AspNetCore.Authorization
 @using Wonky.Client.Components
 @attribute [Authorize(Roles = "Admin,Office,Warehouse")]
+
 @page "/warehouse/orders/process/{OrderId}"
 
 @if (!string.IsNullOrWhiteSpace(Order.OrderDate))
diff --git a/Wonky.Client/wwwroot/appsettings.json b/Wonky.Client/wwwroot/appsettings.json
index b2d0d273..00d2449c 100644
--- a/Wonky.Client/wwwroot/appsettings.json
+++ b/Wonky.Client/wwwroot/appsettings.json
@@ -1,7 +1,7 @@
 {
     "appInfo": {
         "name": "Wonky Online",
-        "version": "0.133.1",
+        "version": "0.134.2",
         "rc": true,
         "sandBox": false,
         "image": "grumpy-coder.png"
@@ -43,6 +43,7 @@
         "servicesAuth": "v2/token",
         "syncRpc": "api/v2/rpc",
         "syncRpcInvoiceExt": "invoices",
+        "systemDocStringUrl": "api/v2/admin/doc",
         "systemLabels": "api/v2/admin/doc/labels",
         "systemTexts": "api/v2/admin/doc/texts",
         "userData": "/api/v2/client/users",
diff --git a/Wonky.Entity/Configuration/ApiConfig.cs b/Wonky.Entity/Configuration/ApiConfig.cs
index a5974700..121d6bd9 100644
--- a/Wonky.Entity/Configuration/ApiConfig.cs
+++ b/Wonky.Entity/Configuration/ApiConfig.cs
@@ -137,6 +137,10 @@ public class ApiConfig
     /// </summary>
     public string SyncRpcInvoiceExt { get; set; } = "";
 
+    /// <summary>
+    /// Generic system string endpoint
+    /// </summary>
+    public string SystemDocStringUrl { get; set; } = "";
     /// <summary>
     /// Get system document labels for translation
     /// </summary>
diff --git a/Wonky.Entity/DTO/ShortMessage.cs b/Wonky.Entity/DTO/ShortMessage.cs
index b6c3c0c5..ae71703f 100644
--- a/Wonky.Entity/DTO/ShortMessage.cs
+++ b/Wonky.Entity/DTO/ShortMessage.cs
@@ -9,4 +9,5 @@ public class ShortMessage
     [Required] [MaxLength(1000)] public string To { get; set; } = "";
 
     [Required] [MaxLength(100)] public string Body { get; set; } = "";
+    public bool Flash { get; set; }
 }
\ No newline at end of file
diff --git a/Wonky.Entity/DTO/SystemQuoteLabels.cs b/Wonky.Entity/DTO/SystemQuoteLabels.cs
index 08171add..59cdfe66 100644
--- a/Wonky.Entity/DTO/SystemQuoteLabels.cs
+++ b/Wonky.Entity/DTO/SystemQuoteLabels.cs
@@ -2,17 +2,17 @@ namespace Wonky.Entity.DTO;
 
 public class SystemQuoteLabels
 {
-    public string DocumentDateLabel { get; set; } = "";
-    public string NameLabel { get; set; } = "";
-    public string EMailLabel { get; set; } = "";
-    public string PhoneLabel { get; set; } = "";
-    public string ConsultantLabel { get; set; } = "";
+    public string QuoteDocumentDateLabel { get; set; } = "";
+    public string QuoteNameLabel { get; set; } = "";
+    public string QuoteEMailLabel { get; set; } = "";
+    public string QuotePhoneLabel { get; set; } = "";
+    public string QuoteConsultantLabel { get; set; } = "";
 
-    public string ItemColumnLabel { get; set; } = "";
-    public string QuantityColumnLabel { get; set; } = "";
-    public string DescriptionColumnLabel { get; set; } = "";
-    public string PriceColumnLabel { get; set; } = "";
-    public string DiscountColumnLabel { get; set; } = "";
-    public string LineSumColumnLabel { get; set; } = "";
-    public string ConditionsLabel { get; set; } = "";    
+    public string QuoteItemColumnLabel { get; set; } = "";
+    public string QuoteQuantityColumnLabel { get; set; } = "";
+    public string QuoteDescriptionColumnLabel { get; set; } = "";
+    public string QuotePriceColumnLabel { get; set; } = "";
+    public string QuoteDiscountColumnLabel { get; set; } = "";
+    public string QuoteLineSumColumnLabel { get; set; } = "";
+    public string QuoteConditionsLabel { get; set; } = "";    
 }
\ No newline at end of file
diff --git a/Wonky.Entity/DTO/SystemQuoteMailTexts.cs b/Wonky.Entity/DTO/SystemQuoteMailTexts.cs
index 79341be4..c9eba276 100644
--- a/Wonky.Entity/DTO/SystemQuoteMailTexts.cs
+++ b/Wonky.Entity/DTO/SystemQuoteMailTexts.cs
@@ -2,15 +2,15 @@ namespace Wonky.Entity.DTO;
 
 public class SystemQuoteMailTexts
 {
-    public string MailGreeting1 { get; set; } = "";
-    public string MailGreeting2 { get; set; } = "";
-    public string MailText1 { get; set; } = "";
-    public string MailText2 { get; set; } = "";
-    public string MailLinkReference { get; set; } = "";
-    public string MailSalute { get; set; } = "";
-    public string MailSender { get; set; } = "";
-    public string MailFooter { get; set; } = "";
-    public string MailCopyHeader { get; set; } = "";
-    public string MailCopySalesNumber { get; set; } = "";
-    public string MailCopyCreatedBy { get; set; } = "";
+    public string QuoteMailGreeting1 { get; set; } = "";
+    public string QuoteMailGreeting2 { get; set; } = "";
+    public string QuoteMailText1 { get; set; } = "";
+    public string QuoteMailText2 { get; set; } = "";
+    public string QuoteMailLinkReference { get; set; } = "";
+    public string QuoteMailSalute { get; set; } = "";
+    public string QuoteMailSender { get; set; } = "";
+    public string QuoteMailFooter { get; set; } = "";
+    public string QuoteMailCopyHeader { get; set; } = "";
+    public string QuoteMailCopySalesNumber { get; set; } = "";
+    public string QuoteMailCopyCreatedBy { get; set; } = "";
 }
\ No newline at end of file
diff --git a/Wonky.Entity/DTO/SystemQuoteTexts.cs b/Wonky.Entity/DTO/SystemQuoteTexts.cs
index 5e931284..57336c05 100644
--- a/Wonky.Entity/DTO/SystemQuoteTexts.cs
+++ b/Wonky.Entity/DTO/SystemQuoteTexts.cs
@@ -2,27 +2,27 @@ namespace Wonky.Entity.DTO;
 
 public class SystemQuoteTexts
 {
-    public string HtmlTitle { get; set; } = "";
-    public string DocumentName { get; set; } = "";
-    public string DocumentNumber { get; set; } = "";
-    public string DocumentDate { get; set; } = "";
-    public string CustomerName { get; set; } = "";
-    public string CustomerPhone { get; set; } = "";
-    public string CustomerEMail { get; set; } = "";
-    public string ConsultantName { get; set; } = "";
-    public string ConsultantPhone { get; set; } = "";
-    public string ConsultantEMail { get; set; } = "";
-    public string TotalSum { get; set; } = "";
+    public string QuoteHtmlTitle { get; set; } = "";
+    public string QuoteDocumentName { get; set; } = "";
+    public string QuoteDocumentNumber { get; set; } = "";
+    public string QuoteDocumentDate { get; set; } = "";
+    public string QuoteCustomerName { get; set; } = "";
+    public string QuoteCustomerPhone { get; set; } = "";
+    public string QuoteCustomerEMail { get; set; } = "";
+    public string QuoteConsultantName { get; set; } = "";
+    public string QuoteConsultantPhone { get; set; } = "";
+    public string QuoteConsultantEMail { get; set; } = "";
+    public string QuoteTotalSum { get; set; } = "";
 
-    public string ConditionVatExclusive { get; set; } = "";
-    public string ConditionValidityPeriod { get; set; } = "";
-    public string ConditionValidityQuantity { get; set; } = "";
-    public string ConditionQuestion { get; set; } = "";
-    public string Greeting { get; set; } = "";
-    public string FooterCompanyName { get; set; } = "";
-    public string FooterCompanyPostalAddress { get; set; } = "";
-    public string FooterCompanyPhone { get; set; } = "";
-    public string FooterCompanyWeb { get; set; } = "";
-    public string FooterCompanyVat { get; set; } = "";
+    public string QuoteConditionVatExclusive { get; set; } = "";
+    public string QuoteConditionValidityPeriod { get; set; } = "";
+    public string QuoteConditionValidityQuantity { get; set; } = "";
+    public string QuoteConditionQuestion { get; set; } = "";
+    public string QuoteGreeting { get; set; } = "";
+    public string QuoteFooterCompanyName { get; set; } = "";
+    public string QuoteFooterCompanyPostalAddress { get; set; } = "";
+    public string QuoteFooterCompanyPhone { get; set; } = "";
+    public string QuoteFooterCompanyWeb { get; set; } = "";
+    public string QuoteFooterCompanyVat { get; set; } = "";
     
 }
\ No newline at end of file