diff --git a/.github/workflows/actions/app-build/Set-Version.ps1 b/.github/workflows/actions/app-build/Set-Version.ps1
index d72409e2..c3a8f4af 100644
--- a/.github/workflows/actions/app-build/Set-Version.ps1
+++ b/.github/workflows/actions/app-build/Set-Version.ps1
@@ -1,3 +1,17 @@
+<#
+.Synopsis
+   Sets the assembly version of all assemblies in the source directory.
+.DESCRIPTION
+   A build script that can be included in TFS 2015 or Visual Studio Online (VSO) vNevt builds that update the version of all assemblies in a workspace.
+   It uses the name of the build to extract the version number and updates all AssemblyInfo.cs files to use the new version.
+.EXAMPLE
+   Set-AssemblyVersion
+.EXAMPLE
+   Set-AssemblyVersion -SourceDirectory $Env:BUILD_SOURCESDIRECTORY -BuildNumber $Env:BUILD_BUILDNUMBER
+.EXAMPLE
+   Set-AssemblyVersion -SourceDirectory ".\SourceDir" -BuildNumber "Dev_1.0.20150922.01" -VersionFormat "\d+\.\d+\.\d+\.\d+"
+#>
+
 [CmdletBinding(SupportsShouldProcess=$true, ConfirmImpact='Medium')]
 [Alias()]
 [OutputType([int])]
@@ -32,6 +46,19 @@ Param
 	[string]$VersionFormat = "\d+\.\d+\.\d+\.\d+"
 )
 
+<#
+.Synopsis
+   Sets the assembly version of all assemblies in the source directory.
+.DESCRIPTION
+   A build script that can be included in TFS 2015 or Visual Studio Online (VSO) vNevt builds that update the version of all assemblies in a workspace.
+   It uses the name of the build to extract the version number and updates all AssemblyInfo.cs files to use the new version.
+.EXAMPLE
+   Set-AssemblyVersion
+.EXAMPLE
+   Set-AssemblyVersion -SourceDirectory $Env:BUILD_SOURCESDIRECTORY -BuildNumber $Env:BUILD_BUILDNUMBER
+.EXAMPLE
+   Set-AssemblyVersion -SourceDirectory ".\SourceDir" -BuildNumber "Dev_1.0.20150922.01" -VersionFormat "\d+\.\d+\.\d+\.\d+"
+#>
 function Set-AssemblyVersion
 {
 	[CmdletBinding(SupportsShouldProcess=$true, ConfirmImpact='Medium')]
@@ -92,12 +119,18 @@ function Set-AssemblyVersion
 	}
 
 	Write-Host "Update BUILD_BUILDNUMBER to $($UpdatedVersion.ToString())"
-	Write-Host "BUILD_NUMBER=$($UpdatedVersion.ToString())" >> $GITHUB_ENV
+	echo "BUILD_NUMBER=$($UpdatedVersion.ToString())" >> $GITHUB_ENV
 
-	if($SetVersion.IsPresent){
+	if(-not $SetVersion.IsPresent){
+		Write-Host "Not able to parse version number."
+		return
+	}
+	
+	if($files -and $files.Length -lt 0){
 		Set-FileContent -Files $files -Version $UpdatedVersion -VersionFormat $VersionFormat
-		Set-AppManifest -Files $appFiles -Version $UpdatedVersion
-	}  
+	}
+		
+	Set-AppManifest -Files $appFiles -Version $UpdatedVersion
 }
 
 function Create-NewVersionNumber{
diff --git a/.github/workflows/actions/app-build/action.yml b/.github/workflows/actions/app-build/action.yml
index 409c3704..7ca73cb5 100644
--- a/.github/workflows/actions/app-build/action.yml
+++ b/.github/workflows/actions/app-build/action.yml
@@ -52,4 +52,4 @@ runs:
         SONAR_TOKEN: ${{inputs.SONAR_TOKEN}}
       run: |
           Write-Host "==== Build app package ====" -ForegroundColor Green
-          msbuild.exe ${{github.workspace}}\repo\OpenHAB.Windows.sln /p:Platform="x86" /p:AppxBundlePlatforms="${{inputs. bundle_Platforms}}" /p:AppxPackageDir="${{inputs.output_directory}}" /p:AppxBundle=Always /p:UapAppxPackageBuildMode=StoreUpload /p:configuration="${{inputs.build_configuration}}" /t:rebuild
\ No newline at end of file
+          msbuild.exe ${{github.workspace}}\repo\OpenHAB.Windows.sln /p:Platform="x86" /p:AppxBundlePlatforms="${{inputs.bundle_Platforms}}" /p:AppxPackageDir="${{inputs.output_directory}}" /p:AppxBundle=Always /p:UapAppxPackageBuildMode=StoreUpload /p:configuration="${{inputs.build_configuration}}" /t:rebuild
\ No newline at end of file
diff --git a/.github/workflows/app-release.yml b/.github/workflows/app-release.yml
deleted file mode 100644
index ea244077..00000000
--- a/.github/workflows/app-release.yml
+++ /dev/null
@@ -1,97 +0,0 @@
-name: App Release
-
-env:
-  BUILD_NUMBER: '1970.1.1'
-  BuildDirectory: '${{github.workspace}}\build'
-  ReleaseName: 'N/A'
-  IsBetaRelease: ${{ contains(github.event.inputs.BetaRelease, 'true') }}
-
-on: 
-  workflow_dispatch:
-    inputs:
-      BetaRelease:
-        description: 'Specifices if a beta release should be created.'
-        default: 'false'
-        required: false
-      BuildConfiguration:
-        description: 'Specifices if a release or debug package should be created.'
-        default: 'release'
-        required: false
-    
-jobs:
-  build:
-    name: 'Build openHAB Windows App'
-    runs-on: windows-latest
-
-    steps:
-    - name: Checkout main code
-      uses: actions/checkout@v2
-      with:
-        path: repo
-        clean: true 
-
-    - name: Setup NuGet.exe for use with actions
-      uses: NuGet/setup-nuget@v1.0.5
-      with:
-        nuget-version: 'latest'
-
-    - name: setup-msbuild
-      uses: microsoft/setup-msbuild@v1
-
-    - name: Build App
-      id: create_app_package
-      uses: ./repo/.github/workflows/actions/app-build
-      with:
-        build_configuration: ${{github.event.inputs.BuildConfiguration}}
-        output_directory: '${{env.BuildDirectory}}'
-
-    - name: Upload build assets
-      id: app_package_upload
-      uses: actions/upload-artifact@v2.2.2
-      with:
-        name: app
-        path: '${{env.BuildDirectory}}'
-      
-  release:
-      name: 'Creates an app release'
-      runs-on: ubuntu-latest
-      needs: build
-      if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/releases/beta'
-      steps:
-          - name: Set build number and release name
-            id: set-buildnumbe
-            run: |
-                CURRENTDATE=`date +"%Y.%m.%d"`
-                echo "BUILD_NUMBER=${CURRENTDATE}.${{github.run_number}}" >> $GITHUB_ENV
-
-                IS_BETA_RELEASE= ${{ env.IsBetaRelease }}
-                if[$IS_BETA_RELEASE]; then
-                   echo "ReleaseName=Beta:${CURRENTDATE}.${{github.run_number}}" >> $GITHUB_ENV
-                else:
-                   echo "ReleaseName=${CURRENTDATE}.${{github.run_number}}" >> $GITHUB_ENV
-                fi
-
-          - name: Create a Release
-            id: create_release
-            uses: actions/create-release@v1.1.4
-            env:
-                GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-            with:
-               tag_name: ${{env.BUILD_NUMBER}}
-               release_name: ${{env.ReleaseName}}
-
-          - name: Download a App Package from Build Artifacts
-            uses: actions/download-artifact@v2.0.8
-            with:
-              name: app
-              path: '${{env.BuildDirectory}}'
-
-          - name: Upload Release App Package
-            id: upload-release-package 
-            uses: actions/upload-release-asset@v1.0.2
-            env:
-                GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-            with:
-              upload_url: ${{steps.create_release.outputs.upload_url}} 
-              asset_path: '${{env.BuildDirectory}}'
-              asset_name: OpenHab UWP App
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 00000000..58960bf2
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,125 @@
+name: 'Build App Package'
+
+on:
+  workflow_call:
+    inputs:
+      build_configuration:
+        description: 'The build configuration to use'
+        type: string
+        required: true
+        default: 'Release'
+      bundle_Platforms:
+        type: string
+        description: 'Defines the platforms for the app package.'
+        required: false
+        default: ' x86|x64|arm64'
+      build_number:
+        type: string
+        description: 'The build number to use'
+        required: true
+
+jobs:
+  build:
+    name: 'Build App Package'
+    runs-on: windows-latest
+    env:
+      output_directory: ${{github.workspace}}\build
+    steps:
+    - name: Checkout main code
+      uses: actions/checkout@v2
+      with:
+        path: repo
+        clean: true
+
+    - name: Update Version Number in app files
+      id: update-packageverion
+      shell: pwsh
+      run: |
+            $version = [System.Version]::Parse('${{inputs.build_number}}')
+            ${{github.workspace}}\repo\.github\workflows\scripts\Set-Version.ps1 -SourceDirectory '${{github.workspace}}/repo/src/' -Major $version.Major -Minor $version.Minor -Build  $version.Build -Revision 0 -SetVersion
+
+    - name: Setup NuGet.exe for use with actions
+      uses: NuGet/setup-nuget@v1.0.5
+      with:
+        nuget-version: 'latest'
+
+    - name: setup-msbuild
+      uses: microsoft/setup-msbuild@v2
+
+    - name: Setup dotnet
+      uses: actions/setup-dotnet@v3
+      with:
+        dotnet-version: '8.x.x'
+
+    - name: Set up JDK 17
+      uses: actions/setup-java@v3
+      with:
+        java-version: 17
+        distribution: 'zulu'
+
+    - name: Cache SonarQube Cloud packages
+      uses: actions/cache@v4
+      with:
+        path: ~\sonar\cache
+        key: ${{ runner.os }}-sonar
+        restore-keys: ${{ runner.os }}-sonar
+
+    - name: Cache SonarCloud scanner
+      id: cache-sonar-scanner
+      uses: actions/cache@v3
+      with:
+        path: .\.sonar\scanner
+        key: ${{ runner.os }}-sonar-scanner
+        restore-keys: ${{ runner.os }}-sonar-scanner
+
+    - name: Install SonarQube Cloud scanner
+      if: steps.cache-sonar-scanner.outputs.cache-hit != 'true'
+      shell: powershell
+      run: |
+        New-Item -Path .\.sonar\scanner -ItemType Directory
+        dotnet tool update dotnet-sonarscanner --tool-path .\.sonar\scanner
+
+    - name: Begin SonarQube analyze
+      env:
+        GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+        SONAR_TOKEN: ${{secrets.SONAR_TOKEN}}
+      shell: pwsh
+      run: |
+        .\.sonar\scanner\dotnet-sonarscanner begin /k:"openhab_openhab-windows" /o:"openhab" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io"
+
+    - name: Restore nuget packages
+      shell: pwsh
+      run: |
+            dotnet restore ${{github.workspace}}\repo\OpenHAB.Windows.sln --force --no-cache
+
+    - name: Build OpenHab Windows App
+      shell: pwsh
+      run: |
+          msbuild.exe ${{github.workspace}}\repo\OpenHAB.Windows.sln `
+              /p:Platform="x86" `
+              /p:AppxBundlePlatforms="${{inputs.bundle_Platforms}}" `
+              /p:AppxPackageDir="${{env.output_directory}}" `
+              /p:AppxBundle=Always `
+              /p:UapAppxPackageBuildMode=StoreUpload `
+              /p:Configuration="${{inputs.build_configuration}}" `
+              /t:Rebuild
+
+    - name: End SonarQube analyze
+      env:
+        GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+        SONAR_TOKEN: ${{secrets.SONAR_TOKEN}}
+      shell: pwsh
+      run: |
+        .\.sonar\scanner\dotnet-sonarscanner end /d:sonar.token="${{ secrets.SONAR_TOKEN }}"
+
+    - name: List files in output directory
+      shell: pwsh
+      working-directory: ${{env.output_directory}}
+      run: |
+        Get-ChildItem -Path ${{env.output_directory}}
+
+    - name: Upload App Package
+      uses: actions/upload-artifact@v4
+      with:
+        name: app
+        path: ${{env.output_directory}}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 2316b11c..cfe5e4ae 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,85 +1,65 @@
-name: 'CI Build'
+name: 'openHAB Build CI Build'
+run-name: app-ci-${{github.run_id }}
 
 env:
-  BUILD_NUMBER: '1970.1.1'
   BuildDirectory: '${{github.workspace}}\build'
-  ACTIONS_RUNNER_DEBUG: true
 
-on: [push, pull_request]
+on:
+  pull_request:
+    branches:
+      - main
 
 jobs:
-  build:
-    name: 'Build openHAB Windows App'
-    runs-on: windows-latest
-
+  configure:
+    name: Configure Build
+    runs-on: ubuntu-latest
+    outputs:
+      buildConfiguration: ${{ steps.configuration.outputs.BuildConfiguration }}
+      bundlePlatforms: ${{ steps.configuration.outputs.BundlePlatforms }}
+      buildNumber: ${{ steps.buildnumber.outputs.BUILD_NUMBER }}
+      releaseName: ${{ steps.buildnumber.outputs.RELEASE_NAME }}
     steps:
-    - name: Checkout main code
-      uses: actions/checkout@v2
-      with:
-        path: repo
-        clean: true
-
-    - name: Setup NuGet.exe for use with actions
-      uses: NuGet/setup-nuget@v1.0.5
-      with:
-        nuget-version: 'latest'
-    
-    - name: setup-msbuild
-      uses: microsoft/setup-msbuild@v1
+      - name: Checkout repository
+        uses: actions/checkout@v2
 
-    - name: Set up JDK 11
-      uses: actions/setup-java@v1
-      with:
-        java-version: 1.11
+      - name: Detect Build Configuration
+        id: configuration
+        shell: pwsh
+        run: |
+          if ($env:github.ref -eq 'refs/heads/main') {
+            Write-Host  "Set build configuration to release"
 
-    - name: Cache SonarCloud packages
-      uses: actions/cache@v1
-      with:
-        path: ~\sonar\cache
-        key: ${{runner.os}}-sonar
-        restore-keys: ${{runner.os}}-sonar
+            Write-Output  "BuildConfiguration=release" | Out-File -FilePath $Env:GITHUB_OUTPUT -Encoding utf8 -Append
+            Write-Output  "BundlePlatforms=x86|x64|arm64" | Out-File -FilePath $Env:GITHUB_OUTPUT -Encoding utf8 -Append
+          } else {
+            Write-Host  "Set build configuration to debug"
 
-    - name: Cache SonarCloud scanner
-      id: cache-sonar-scanner
-      uses: actions/cache@v1
-      with:
-        path: .\.sonar\scanner
-        key: ${{runner.os}}-sonar-scanner-msbuild
-        restore-keys: ${{runner.os}}-sonar-scanner-msbuild
+            Write-Output  "BuildConfiguration=debug" | Out-File -FilePath $Env:GITHUB_OUTPUT -Encoding utf8 -Append
+            Write-Output  "BundlePlatforms=x86|x64|arm64" | Out-File -FilePath $Env:GITHUB_OUTPUT -Encoding utf8 -Append
+          }
 
-    - name: Install SonarCloud scanner
-      if: steps.cache-sonar-scanner.outputs.cache-hit != 'true'
-      shell: pwsh
-      run: |
-        $directory = New-Item -Path .\.sonar\scanner -ItemType Directory
-        # dotnet tool update dotnet-sonarscanner --tool-path .\.sonar\scanner
+      - name: Set build number and release name
+        id: buildnumber
+        shell: pwsh
+        run: |
+          $CURRENTDATE = Get-Date -Format "yyyy.MM.dd"
+          Write-Output  "BUILD_NUMBER=$CURRENTDATE" | Out-File -FilePath $Env:GITHUB_OUTPUT -Encoding utf8 -Append
 
-        $file = Join-Path $directory.FullName "sonar-scanner.zip"
-        Invoke-WebRequest -Uri "https://github.com/SonarSource/sonar-scanner-msbuild/releases/download/5.2.1.31210/sonar-scanner-msbuild-5.2.1.31210-net46.zip" -OutFile $file
-        Expand-Archive -LiteralPath $file -DestinationPath "$($directory.FullName)"
+          $IS_BETA_RELEASE = '${{ inputs.IsBetaRelease }}'
+          if ($IS_BETA_RELEASE -eq 'true') {
+            Write-Host  "Set release name to Beta:$CURRENTDATE.${{github.run_number}}"
+            Write-Output  "RELEASE_NAME=Beta:$CURRENTDATE.${{github.run_number}}" | Out-File -FilePath $Env:GITHUB_OUTPUT -Encoding utf8 -Append
+          } else {
+            Write-Host  "Set release name to $CURRENTDATE"
+            Write-Output  "RELEASE_NAME=$CURRENTDATE" | Out-File -FilePath $Env:GITHUB_OUTPUT -Encoding utf8 -Append
+          }
 
-    - name: Begin SonarQube analyze
-      env:
-        GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
-        SONAR_TOKEN: ${{secrets.SONAR_TOKE }}
-      shell: pwsh
-      run: |
-          .\.sonar\scanner\SonarScanner.MSBuild.exe begin /k:"openhab_openhab-windows" /o:"openhab" /d:sonar.login="${{secrets.SONAR_TOKEN}}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.projectBaseDir="${{github.workspace}}/repo/src/" /d:sonar.verbose="true"
-
-    - name: Build App
-      id: create_app_package
-      uses: ./repo/.github/workflows/actions/app-build
-      with:
-        build_configuration: 'debug'
-        output_directory: '${{env.BuildDirectory}}'
-        bundle_Platforms: 'x86'
-        GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
-        SONAR_TOKEN: ${{secrets.SONAR_TOKEN}}
-    
-    - name: End SonarQube analyze
-      env:
-        GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
-        SONAR_TOKEN: ${{secrets.SONAR_TOKEN}}
-      shell: pwsh
-      run: |
-          .\.sonar\scanner\SonarScanner.MSBuild.exe end /d:sonar.login="${{secrets.SONAR_TOKEN}}"
\ No newline at end of file
+  build:
+    uses: ./.github/workflows/build.yml
+    name: Build
+    needs: configure
+    with:
+      build_configuration: ${{needs.configure.outputs.buildConfiguration}}
+      bundle_Platforms: ${{ needs.configure.outputs.bundlePlatforms}}
+      build_number: ${{ needs.configure.outputs.buildNumber}}
+    secrets: inherit
diff --git a/.github/workflows/openhab.yml b/.github/workflows/openhab.yml
new file mode 100644
index 00000000..f97a1d2b
--- /dev/null
+++ b/.github/workflows/openhab.yml
@@ -0,0 +1,117 @@
+name: "openHAB Build and Release app"
+run-name: run-${{github.head_ref || github.ref_name}}-${{github.run_number}}
+
+env:
+  BuildDirectory: '${{github.workspace}}\build'
+  ACTIONS_RUNNER_DEBUG: true
+
+on:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+    inputs:
+      BuildConfiguration:
+        description: "Specifies if a release or debug package should be created."
+        type: choice
+        options: ["release", "debug"]
+        default: "release"
+      IsBetaRelease:
+        description: "Create store beta release."
+        type: "boolean"
+        default: false
+      create_release:
+        description: "Create release for non-main branch."
+        type: "boolean"
+        default: false
+      releaseName:
+        description: "The release name to use."
+        type: "string"
+        default: ""
+
+jobs:
+  configure:
+    name: Configure Build
+    runs-on: ubuntu-latest
+    outputs:
+      buildConfiguration: ${{ steps.configuration.outputs.BuildConfiguration }}
+      bundlePlatforms: ${{ steps.configuration.outputs.BundlePlatforms }}
+      buildNumber: ${{ steps.buildnumber.outputs.BUILD_NUMBER }}
+      releaseName: ${{ steps.buildnumber.outputs.RELEASE_NAME }}
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      - name: Detect Build Configuration
+        id: configuration
+        shell: pwsh
+        run: |
+          if ($env:github.ref -eq 'refs/heads/main') {
+            Write-Host  "Set build configuration to release"
+
+            #Write-Output  "BuildConfiguration=release" | Out-File -FilePath $Env:GITHUB_OUTPUT -Encoding utf8 -Append
+            Write-Output  "BundlePlatforms=x86|x64|arm64" | Out-File -FilePath $Env:GITHUB_OUTPUT -Encoding utf8 -Append
+          } else {
+            Write-Host  "Set build configuration to debug"
+
+            #Write-Output  "BuildConfiguration=debug" | Out-File -FilePath $Env:GITHUB_OUTPUT -Encoding utf8 -Append
+            Write-Output  "BundlePlatforms=x86|x64|arm64" | Out-File -FilePath $Env:GITHUB_OUTPUT -Encoding utf8 -Append
+          }
+
+      - name: Set build number and release name
+        id: buildnumber
+        shell: pwsh
+        run: |
+          $CURRENTDATE = Get-Date -Format "yyyy.MM.dd"
+          Write-Output  "BUILD_NUMBER=$CURRENTDATE" | Out-File -FilePath $Env:GITHUB_OUTPUT -Encoding utf8 -Append
+
+          $IS_BETA_RELEASE = '${{ inputs.IsBetaRelease }}'
+          if ($IS_BETA_RELEASE -eq 'true') {
+            Write-Host  "Set release name to Beta:$CURRENTDATE.${{github.run_number}}"
+            Write-Output  "RELEASE_NAME=Beta:$CURRENTDATE.${{github.run_number}}" | Out-File -FilePath $Env:GITHUB_OUTPUT -Encoding utf8 -Append
+          } else {
+            Write-Host  "Set release name to $CURRENTDATE"
+            Write-Output  "RELEASE_NAME=$CURRENTDATE" | Out-File -FilePath $Env:GITHUB_OUTPUT -Encoding utf8 -Append
+          }
+
+  build:
+    uses: ./.github/workflows/build.yml
+    name: Build
+    needs: configure
+    with:
+      build_configuration: ${{ inputs.BuildConfiguration }} #${{needs.configure.outputs.buildConfiguration}}
+      bundle_Platforms: ${{ needs.configure.outputs.bundlePlatforms}}
+      build_number: ${{ needs.configure.outputs.buildNumber}}
+    secrets: inherit
+
+  create_release:
+    name: Create Release
+    uses: ./.github/workflows/release.yml
+    needs:
+      - build
+      - configure
+    with:
+      force_release: ${{ inputs.create_release }}
+      beta_release: ${{ inputs.IsBetaRelease }}
+      build_number: ${{ needs.configure.outputs.buildNumber }}
+      releaseName: ${{ inputs.releaseName }}
+
+  # publish_beta:
+  #   uses: ./.github/workflows/publish.yml
+  #   needs:
+  #     - build
+  #     - configure
+  #   with:
+  #     environment: BETA
+  #     package_name: "openHAB.Windows_${{needs.configure.outputs.buildNumber}}_x86_x64_arm_bundle"
+  #   secrets: inherit
+
+  # publish_prod:
+  #   uses: ./.github/workflows/publish.yml
+  #   needs:
+  #     - publish_beta
+  #     - configure
+  #   with:
+  #     environment: PROD
+  #     package_name: "openHAB.Windows_${{needs.configure.outputs.buildNumber}}_x86_x64_arm_bundle"
+  #   secrets: inherit
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
new file mode 100644
index 00000000..a6407fdc
--- /dev/null
+++ b/.github/workflows/publish.yml
@@ -0,0 +1,46 @@
+name: 'Deploy App Package'
+run-name: 'Deploy App Package: ${{ github.event.inputs.environment }}'
+
+env:
+  BuildDirectory: '${{github.workspace}}\build'
+
+on:
+  workflow_call:
+    inputs:
+      environment:
+        type: string
+        description: 'Defines the environment for the app package'
+        required: true
+      package_name:
+        type: string
+        description: 'The name of the app package'
+        required: true  
+      artifact_name: 
+        type: string
+        description: 'The name of the artifact to download'
+        default: 'app'
+      artifact_directory:
+        type: string
+        description: 'Defines the output directory for the app package'
+        default: '${{github.workspace}}/packages/'
+     
+jobs:
+  deploy:
+    name: 'Deploy App Package to ${{ github.event.inputs.environment }} channel'
+    runs-on: ubuntu-latest
+    environment: ${{ github.event.inputs.environment }}
+    steps:
+      - name: Download a App Package from Build Artifacts
+        uses: actions/download-artifact@v2.0.8
+        with:
+          name: ${{inputs.artifact_name}}
+          path: '${{env.BuildDirectory}}/${{inputs.artifact_directory}}/'
+
+      - uses: isaacrlevin/windows-store-action
+        name: Publish to Store
+        with:
+          tenant-id: ${{ secrets.AZURE_AD_TENANT_ID }}
+          client-id: ${{ secrets.AZURE_AD_APPLICATION_CLIENT_ID }}
+          client-secret: ${{ secrets.AZURE_AD_APPLICATION_SECRET }}
+          app-id: ${{ secrets.STORE_APP_ID }}
+          package-path: "${{ github.workspace }}/${{inputs.artifact_directory}}/${{inputs.package_name}}.msixupload"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 00000000..ec8e1125
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,80 @@
+name: App Release
+
+env:
+  BuildDirectory: '${{github.workspace}}/build'
+
+on:
+  workflow_call:
+    inputs:
+      force_release:
+        description: 'Specifies if a release should be created even if the branch is not main.'
+        type: boolean
+        default: false
+        required: false
+      beta_release:
+        description: 'Specifies if a beta release should be created.'
+        type: boolean
+        default: false
+        required: false
+      build_number:
+        type: string
+        description: 'The build number to use'
+        required: true
+      releaseName:
+        type: string
+        description: 'The release name to use'
+        required: true
+
+permissions:
+  id-token: "write"
+  contents: "write"
+  packages: "write"
+  pull-requests: "read"
+
+jobs:
+  release:
+      name: 'App release creation for ${{inputs.build_number}}'
+      runs-on: ubuntu-latest
+      if: github.ref == 'refs/heads/main' || github.ref == 'refs/heads/releases/beta' || inputs.force_release == true
+      steps:
+        - name: Download a App Package from Build Artifacts
+          uses: actions/download-artifact@v4
+          with:
+            name: app
+            path: '${{env.BuildDirectory}}'
+
+        - name: Display structure of downloaded files
+          run: ls -la
+          working-directory: '${{env.BuildDirectory}}'
+
+        - name: Set release name
+          run: |
+            if [ -z "${releaseName}" ]; then
+              echo "No release name provided, using build number"
+              release_name="${{ inputs.build_number }}"
+            else
+              echo "Using provided release name"
+              release_name="${releaseName}"
+            fi
+
+            if [ "${beta_release}" == "true" ]; then
+              echo "Beta release requested"
+              release_name="Beta: ${release_name}"
+            fi
+
+            echo "releaseName=${release_name}" >> $GITHUB_ENV
+          env:
+            releaseName: ${{ inputs.releaseName }}
+            beta_release: ${{ inputs.beta_release }}
+
+        - name: Create a Release
+          id: create_release
+          uses: marvinpinto/action-automatic-releases@latest
+          with:
+            repo_token: "${{ secrets.GITHUB_TOKEN }}"
+            prerelease: ${{inputs.beta_release}}
+            automatic_release_tag: ${{inputs.build_number}}
+            title: ${{env.releaseName}}
+            files: |
+              ${{env.BuildDirectory}}/**/*.msixbundle
+              ${{env.BuildDirectory}}/**/*.msixupload
diff --git a/.github/workflows/scripts/Set-Version.ps1 b/.github/workflows/scripts/Set-Version.ps1
index 08225aff..c3a8f4af 100644
--- a/.github/workflows/scripts/Set-Version.ps1
+++ b/.github/workflows/scripts/Set-Version.ps1
@@ -121,10 +121,16 @@ function Set-AssemblyVersion
 	Write-Host "Update BUILD_BUILDNUMBER to $($UpdatedVersion.ToString())"
 	echo "BUILD_NUMBER=$($UpdatedVersion.ToString())" >> $GITHUB_ENV
 
-	if($SetVersion.IsPresent){
+	if(-not $SetVersion.IsPresent){
+		Write-Host "Not able to parse version number."
+		return
+	}
+	
+	if($files -and $files.Length -lt 0){
 		Set-FileContent -Files $files -Version $UpdatedVersion -VersionFormat $VersionFormat
-		Set-AppManifest -Files $appFiles -Version $UpdatedVersion
-	}  
+	}
+		
+	Set-AppManifest -Files $appFiles -Version $UpdatedVersion
 }
 
 function Create-NewVersionNumber{
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 00000000..a99bcac8
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,19 @@
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+default_install_hook_types:
+  - pre-commit
+  - commit-msg
+  - pre-push
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v5.0.0
+    hooks:
+      - id: trailing-whitespace
+      - id: end-of-file-fixer
+      - id: check-yaml
+      - id: check-added-large-files
+  - repo: https://github.com/openhab/openhab-windows
+    rev: 98df98f04814a30ba4df438744d5f68ebcf5d815
+    hooks:
+      - id: sign-off
+        stages: [commit-msg]
diff --git a/.pre-commit-hooks.yaml b/.pre-commit-hooks.yaml
new file mode 100644
index 00000000..a7f3e6d3
--- /dev/null
+++ b/.pre-commit-hooks.yaml
@@ -0,0 +1,5 @@
+- id: sign-off
+  name: Sign-off commits
+  entry: "pwsh -c 'git interpret-trailers --in-place --trailer \"Signed-off-by: $(git config user.name) <$(git config user.email)>\" .git/COMMIT_EDITMSG'"
+  language: system
+  stages: [commit-msg]
diff --git a/.sonarlint/OpenHAB.Windows.json b/.sonarlint/OpenHAB.Windows.json
new file mode 100644
index 00000000..53391710
--- /dev/null
+++ b/.sonarlint/OpenHAB.Windows.json
@@ -0,0 +1,4 @@
+{
+  "SonarCloudOrganization": "openhab",
+  "ProjectKey": "openhab_openhab-windows"
+}
\ No newline at end of file
diff --git a/.sonarlint/OpenHAB.Windows.slconfig b/.sonarlint/OpenHAB.Windows.slconfig
deleted file mode 100644
index 704efb31..00000000
--- a/.sonarlint/OpenHAB.Windows.slconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "ServerUri": "https://sonarcloud.io/",
-  "Organization": {
-    "Key": "openhab",
-    "Name": "openHAB"
-  },
-  "ProjectKey": "openhab_openhab-windows",
-  "ProjectName": "openhab-windows",
-  "Profiles": {
-    "CSharp": {
-      "ProfileKey": "AXflIL33YGfeNt47qUY1",
-      "ProfileTimestamp": "2021-11-22T10:44:23Z"
-    }
-  }
-}
\ No newline at end of file
diff --git a/.sonarlint/openhab_openhab-windows/CSharp/SonarLint.xml b/.sonarlint/openhab_openhab-windows/CSharp/SonarLint.xml
deleted file mode 100644
index 90bc98df..00000000
--- a/.sonarlint/openhab_openhab-windows/CSharp/SonarLint.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<AnalysisInput xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <Settings>
-    <Setting>
-      <Key>sonar.cs.analyzeGeneratedCode</Key>
-      <Value>false</Value>
-    </Setting>
-    <Setting>
-      <Key>sonar.cs.file.suffixes</Key>
-      <Value>.cs</Value>
-    </Setting>
-    <Setting>
-      <Key>sonar.cs.ignoreHeaderComments</Key>
-      <Value>true</Value>
-    </Setting>
-    <Setting>
-      <Key>sonar.cs.roslyn.ignoreIssues</Key>
-      <Value>false</Value>
-    </Setting>
-  </Settings>
-  <Rules>
-    <Rule>
-      <Key>S107</Key>
-      <Parameters>
-        <Parameter>
-          <Key>max</Key>
-          <Value>7</Value>
-        </Parameter>
-      </Parameters>
-    </Rule>
-    <Rule>
-      <Key>S110</Key>
-      <Parameters>
-        <Parameter>
-          <Key>max</Key>
-          <Value>5</Value>
-        </Parameter>
-      </Parameters>
-    </Rule>
-    <Rule>
-      <Key>S1479</Key>
-      <Parameters>
-        <Parameter>
-          <Key>maximum</Key>
-          <Value>30</Value>
-        </Parameter>
-      </Parameters>
-    </Rule>
-    <Rule>
-      <Key>S2342</Key>
-      <Parameters>
-        <Parameter>
-          <Key>flagsAttributeFormat</Key>
-          <Value>^([A-Z]{1,3}[a-z0-9]+)*([A-Z]{2})?s$</Value>
-        </Parameter>
-        <Parameter>
-          <Key>format</Key>
-          <Value>^([A-Z]{1,3}[a-z0-9]+)*([A-Z]{2})?$</Value>
-        </Parameter>
-      </Parameters>
-    </Rule>
-    <Rule>
-      <Key>S2436</Key>
-      <Parameters>
-        <Parameter>
-          <Key>max</Key>
-          <Value>2</Value>
-        </Parameter>
-        <Parameter>
-          <Key>maxMethod</Key>
-          <Value>3</Value>
-        </Parameter>
-      </Parameters>
-    </Rule>
-    <Rule>
-      <Key>S3776</Key>
-      <Parameters>
-        <Parameter>
-          <Key>propertyThreshold</Key>
-          <Value>3</Value>
-        </Parameter>
-        <Parameter>
-          <Key>threshold</Key>
-          <Value>15</Value>
-        </Parameter>
-      </Parameters>
-    </Rule>
-  </Rules>
-</AnalysisInput>
\ No newline at end of file
diff --git a/.sonarlint/openhab_openhab-windowscsharp.ruleset b/.sonarlint/openhab_openhab-windowscsharp.ruleset
deleted file mode 100644
index 79df8173..00000000
--- a/.sonarlint/openhab_openhab-windowscsharp.ruleset
+++ /dev/null
@@ -1,370 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RuleSet xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" Name="SonarQube - openhab-windows Sonar way" Description="This rule set was automatically generated from SonarQube https://sonarcloud.io/profiles/show?key=AXflIL33YGfeNt47qUY1" ToolsVersion="14.0">
-  <Rules AnalyzerId="SonarAnalyzer.CSharp" RuleNamespace="SonarAnalyzer.CSharp">
-    <Rule Id="S100" Action="None" />
-    <Rule Id="S1006" Action="Warning" />
-    <Rule Id="S101" Action="Info" />
-    <Rule Id="S103" Action="None" />
-    <Rule Id="S104" Action="None" />
-    <Rule Id="S1048" Action="Warning" />
-    <Rule Id="S105" Action="None" />
-    <Rule Id="S106" Action="None" />
-    <Rule Id="S1066" Action="Warning" />
-    <Rule Id="S1067" Action="None" />
-    <Rule Id="S107" Action="Warning" />
-    <Rule Id="S1075" Action="Info" />
-    <Rule Id="S108" Action="Warning" />
-    <Rule Id="S109" Action="None" />
-    <Rule Id="S110" Action="Warning" />
-    <Rule Id="S1104" Action="Info" />
-    <Rule Id="S1109" Action="None" />
-    <Rule Id="S1110" Action="Warning" />
-    <Rule Id="S1116" Action="Info" />
-    <Rule Id="S1117" Action="Warning" />
-    <Rule Id="S1118" Action="Warning" />
-    <Rule Id="S112" Action="Warning" />
-    <Rule Id="S1121" Action="Warning" />
-    <Rule Id="S1123" Action="Warning" />
-    <Rule Id="S1125" Action="Info" />
-    <Rule Id="S1128" Action="None" />
-    <Rule Id="S113" Action="None" />
-    <Rule Id="S1134" Action="Warning" />
-    <Rule Id="S1135" Action="Info" />
-    <Rule Id="S1144" Action="Warning" />
-    <Rule Id="S1147" Action="None" />
-    <Rule Id="S1151" Action="None" />
-    <Rule Id="S1155" Action="Info" />
-    <Rule Id="S1163" Action="Warning" />
-    <Rule Id="S1168" Action="Warning" />
-    <Rule Id="S1172" Action="Warning" />
-    <Rule Id="S1185" Action="Info" />
-    <Rule Id="S1186" Action="Warning" />
-    <Rule Id="S1192" Action="None" />
-    <Rule Id="S1199" Action="Info" />
-    <Rule Id="S1200" Action="None" />
-    <Rule Id="S1206" Action="Info" />
-    <Rule Id="S121" Action="None" />
-    <Rule Id="S1210" Action="Info" />
-    <Rule Id="S1215" Action="Warning" />
-    <Rule Id="S122" Action="None" />
-    <Rule Id="S1226" Action="None" />
-    <Rule Id="S1227" Action="None" />
-    <Rule Id="S1244" Action="None" />
-    <Rule Id="S125" Action="Warning" />
-    <Rule Id="S126" Action="None" />
-    <Rule Id="S1264" Action="Info" />
-    <Rule Id="S127" Action="None" />
-    <Rule Id="S1301" Action="None" />
-    <Rule Id="S1309" Action="None" />
-    <Rule Id="S131" Action="None" />
-    <Rule Id="S134" Action="None" />
-    <Rule Id="S138" Action="None" />
-    <Rule Id="S1449" Action="None" />
-    <Rule Id="S1450" Action="Info" />
-    <Rule Id="S1451" Action="None" />
-    <Rule Id="S1479" Action="Warning" />
-    <Rule Id="S1481" Action="Info" />
-    <Rule Id="S1541" Action="None" />
-    <Rule Id="S1607" Action="Warning" />
-    <Rule Id="S1643" Action="Info" />
-    <Rule Id="S1656" Action="Warning" />
-    <Rule Id="S1659" Action="None" />
-    <Rule Id="S1694" Action="None" />
-    <Rule Id="S1696" Action="None" />
-    <Rule Id="S1698" Action="None" />
-    <Rule Id="S1699" Action="Warning" />
-    <Rule Id="S1751" Action="Warning" />
-    <Rule Id="S1764" Action="Warning" />
-    <Rule Id="S1821" Action="None" />
-    <Rule Id="S1848" Action="Warning" />
-    <Rule Id="S1854" Action="Warning" />
-    <Rule Id="S1858" Action="None" />
-    <Rule Id="S1862" Action="Warning" />
-    <Rule Id="S1871" Action="Warning" />
-    <Rule Id="S1905" Action="Info" />
-    <Rule Id="S1939" Action="Info" />
-    <Rule Id="S1940" Action="Info" />
-    <Rule Id="S1944" Action="Warning" />
-    <Rule Id="S1994" Action="None" />
-    <Rule Id="S2053" Action="Warning" />
-    <Rule Id="S2114" Action="Warning" />
-    <Rule Id="S2115" Action="Warning" />
-    <Rule Id="S2123" Action="Warning" />
-    <Rule Id="S2148" Action="None" />
-    <Rule Id="S2156" Action="None" />
-    <Rule Id="S2178" Action="Warning" />
-    <Rule Id="S2183" Action="Info" />
-    <Rule Id="S2184" Action="Info" />
-    <Rule Id="S2187" Action="Warning" />
-    <Rule Id="S2190" Action="Warning" />
-    <Rule Id="S2197" Action="None" />
-    <Rule Id="S2201" Action="Warning" />
-    <Rule Id="S2219" Action="Info" />
-    <Rule Id="S2221" Action="None" />
-    <Rule Id="S2222" Action="None" />
-    <Rule Id="S2223" Action="Warning" />
-    <Rule Id="S2225" Action="Warning" />
-    <Rule Id="S2228" Action="None" />
-    <Rule Id="S2234" Action="Warning" />
-    <Rule Id="S2251" Action="Warning" />
-    <Rule Id="S2252" Action="Warning" />
-    <Rule Id="S2259" Action="Warning" />
-    <Rule Id="S2275" Action="Warning" />
-    <Rule Id="S2290" Action="Warning" />
-    <Rule Id="S2291" Action="Warning" />
-    <Rule Id="S2292" Action="Info" />
-    <Rule Id="S2302" Action="None" />
-    <Rule Id="S2306" Action="Warning" />
-    <Rule Id="S2325" Action="None" />
-    <Rule Id="S2326" Action="Warning" />
-    <Rule Id="S2327" Action="None" />
-    <Rule Id="S2328" Action="Info" />
-    <Rule Id="S2330" Action="None" />
-    <Rule Id="S2333" Action="None" />
-    <Rule Id="S2339" Action="None" />
-    <Rule Id="S2342" Action="Info" />
-    <Rule Id="S2344" Action="Info" />
-    <Rule Id="S2345" Action="Info" />
-    <Rule Id="S2346" Action="Warning" />
-    <Rule Id="S2357" Action="None" />
-    <Rule Id="S2360" Action="None" />
-    <Rule Id="S2365" Action="Warning" />
-    <Rule Id="S2368" Action="Warning" />
-    <Rule Id="S2372" Action="Warning" />
-    <Rule Id="S2376" Action="Warning" />
-    <Rule Id="S2386" Action="Info" />
-    <Rule Id="S2387" Action="None" />
-    <Rule Id="S2436" Action="Warning" />
-    <Rule Id="S2437" Action="Warning" />
-    <Rule Id="S2479" Action="Warning" />
-    <Rule Id="S2486" Action="Info" />
-    <Rule Id="S2551" Action="Warning" />
-    <Rule Id="S2583" Action="Warning" />
-    <Rule Id="S2589" Action="Warning" />
-    <Rule Id="S2674" Action="None" />
-    <Rule Id="S2681" Action="Warning" />
-    <Rule Id="S2688" Action="Warning" />
-    <Rule Id="S2692" Action="Warning" />
-    <Rule Id="S2696" Action="Warning" />
-    <Rule Id="S2699" Action="Warning" />
-    <Rule Id="S2701" Action="None" />
-    <Rule Id="S2737" Action="Info" />
-    <Rule Id="S2743" Action="Warning" />
-    <Rule Id="S2755" Action="Warning" />
-    <Rule Id="S2757" Action="Warning" />
-    <Rule Id="S2760" Action="None" />
-    <Rule Id="S2761" Action="Warning" />
-    <Rule Id="S2857" Action="Warning" />
-    <Rule Id="S2930" Action="Warning" />
-    <Rule Id="S2931" Action="None" />
-    <Rule Id="S2933" Action="Warning" />
-    <Rule Id="S2934" Action="Info" />
-    <Rule Id="S2952" Action="None" />
-    <Rule Id="S2953" Action="Warning" />
-    <Rule Id="S2955" Action="None" />
-    <Rule Id="S2971" Action="Warning" />
-    <Rule Id="S2995" Action="Warning" />
-    <Rule Id="S2996" Action="Warning" />
-    <Rule Id="S2997" Action="Warning" />
-    <Rule Id="S3005" Action="Warning" />
-    <Rule Id="S3010" Action="Warning" />
-    <Rule Id="S3011" Action="Warning" />
-    <Rule Id="S3052" Action="None" />
-    <Rule Id="S3059" Action="None" />
-    <Rule Id="S3060" Action="Warning" />
-    <Rule Id="S3168" Action="Warning" />
-    <Rule Id="S3169" Action="Warning" />
-    <Rule Id="S3172" Action="Warning" />
-    <Rule Id="S3215" Action="None" />
-    <Rule Id="S3216" Action="None" />
-    <Rule Id="S3217" Action="Warning" />
-    <Rule Id="S3218" Action="Warning" />
-    <Rule Id="S3220" Action="Info" />
-    <Rule Id="S3234" Action="None" />
-    <Rule Id="S3235" Action="None" />
-    <Rule Id="S3236" Action="Info" />
-    <Rule Id="S3237" Action="Warning" />
-    <Rule Id="S3240" Action="None" />
-    <Rule Id="S3241" Action="Info" />
-    <Rule Id="S3242" Action="None" />
-    <Rule Id="S3244" Action="Warning" />
-    <Rule Id="S3246" Action="Warning" />
-    <Rule Id="S3247" Action="Info" />
-    <Rule Id="S3249" Action="Warning" />
-    <Rule Id="S3251" Action="Info" />
-    <Rule Id="S3253" Action="None" />
-    <Rule Id="S3254" Action="None" />
-    <Rule Id="S3256" Action="Info" />
-    <Rule Id="S3257" Action="None" />
-    <Rule Id="S3260" Action="Info" />
-    <Rule Id="S3261" Action="Info" />
-    <Rule Id="S3262" Action="Warning" />
-    <Rule Id="S3263" Action="Warning" />
-    <Rule Id="S3264" Action="Warning" />
-    <Rule Id="S3265" Action="Warning" />
-    <Rule Id="S3267" Action="Info" />
-    <Rule Id="S3329" Action="Warning" />
-    <Rule Id="S3343" Action="Warning" />
-    <Rule Id="S3346" Action="Warning" />
-    <Rule Id="S3353" Action="None" />
-    <Rule Id="S3358" Action="Warning" />
-    <Rule Id="S3366" Action="None" />
-    <Rule Id="S3376" Action="Info" />
-    <Rule Id="S3397" Action="Info" />
-    <Rule Id="S3400" Action="Info" />
-    <Rule Id="S3415" Action="Warning" />
-    <Rule Id="S3427" Action="Warning" />
-    <Rule Id="S3431" Action="None" />
-    <Rule Id="S3433" Action="Warning" />
-    <Rule Id="S3440" Action="Info" />
-    <Rule Id="S3441" Action="None" />
-    <Rule Id="S3442" Action="Warning" />
-    <Rule Id="S3443" Action="Warning" />
-    <Rule Id="S3444" Action="Info" />
-    <Rule Id="S3445" Action="Warning" />
-    <Rule Id="S3447" Action="Warning" />
-    <Rule Id="S3449" Action="Warning" />
-    <Rule Id="S3450" Action="Info" />
-    <Rule Id="S3451" Action="Warning" />
-    <Rule Id="S3453" Action="Warning" />
-    <Rule Id="S3456" Action="Info" />
-    <Rule Id="S3457" Action="Warning" />
-    <Rule Id="S3458" Action="Info" />
-    <Rule Id="S3459" Action="Info" />
-    <Rule Id="S3464" Action="Warning" />
-    <Rule Id="S3466" Action="Warning" />
-    <Rule Id="S3532" Action="None" />
-    <Rule Id="S3597" Action="Warning" />
-    <Rule Id="S3598" Action="Warning" />
-    <Rule Id="S3600" Action="Warning" />
-    <Rule Id="S3603" Action="Warning" />
-    <Rule Id="S3604" Action="Info" />
-    <Rule Id="S3610" Action="Warning" />
-    <Rule Id="S3626" Action="Info" />
-    <Rule Id="S3655" Action="Warning" />
-    <Rule Id="S3717" Action="None" />
-    <Rule Id="S3776" Action="Warning" />
-    <Rule Id="S3869" Action="Warning" />
-    <Rule Id="S3871" Action="Warning" />
-    <Rule Id="S3872" Action="None" />
-    <Rule Id="S3874" Action="None" />
-    <Rule Id="S3875" Action="Warning" />
-    <Rule Id="S3876" Action="None" />
-    <Rule Id="S3877" Action="Warning" />
-    <Rule Id="S3880" Action="None" />
-    <Rule Id="S3881" Action="Warning" />
-    <Rule Id="S3884" Action="Warning" />
-    <Rule Id="S3885" Action="Warning" />
-    <Rule Id="S3887" Action="Info" />
-    <Rule Id="S3889" Action="Warning" />
-    <Rule Id="S3897" Action="Info" />
-    <Rule Id="S3898" Action="None" />
-    <Rule Id="S3900" Action="None" />
-    <Rule Id="S3902" Action="None" />
-    <Rule Id="S3903" Action="Warning" />
-    <Rule Id="S3904" Action="Warning" />
-    <Rule Id="S3906" Action="None" />
-    <Rule Id="S3908" Action="None" />
-    <Rule Id="S3909" Action="None" />
-    <Rule Id="S3923" Action="Warning" />
-    <Rule Id="S3925" Action="Warning" />
-    <Rule Id="S3926" Action="Warning" />
-    <Rule Id="S3927" Action="Warning" />
-    <Rule Id="S3928" Action="Warning" />
-    <Rule Id="S3937" Action="None" />
-    <Rule Id="S3949" Action="None" />
-    <Rule Id="S3956" Action="None" />
-    <Rule Id="S3962" Action="None" />
-    <Rule Id="S3963" Action="Info" />
-    <Rule Id="S3966" Action="Warning" />
-    <Rule Id="S3967" Action="None" />
-    <Rule Id="S3971" Action="Warning" />
-    <Rule Id="S3972" Action="Warning" />
-    <Rule Id="S3973" Action="Warning" />
-    <Rule Id="S3981" Action="Warning" />
-    <Rule Id="S3984" Action="Warning" />
-    <Rule Id="S3990" Action="None" />
-    <Rule Id="S3992" Action="None" />
-    <Rule Id="S3993" Action="None" />
-    <Rule Id="S3994" Action="None" />
-    <Rule Id="S3995" Action="None" />
-    <Rule Id="S3996" Action="None" />
-    <Rule Id="S3997" Action="None" />
-    <Rule Id="S3998" Action="Warning" />
-    <Rule Id="S4000" Action="None" />
-    <Rule Id="S4002" Action="None" />
-    <Rule Id="S4004" Action="None" />
-    <Rule Id="S4005" Action="None" />
-    <Rule Id="S4015" Action="Warning" />
-    <Rule Id="S4016" Action="None" />
-    <Rule Id="S4017" Action="None" />
-    <Rule Id="S4018" Action="None" />
-    <Rule Id="S4019" Action="Warning" />
-    <Rule Id="S4022" Action="None" />
-    <Rule Id="S4023" Action="None" />
-    <Rule Id="S4025" Action="None" />
-    <Rule Id="S4026" Action="None" />
-    <Rule Id="S4027" Action="None" />
-    <Rule Id="S4035" Action="Warning" />
-    <Rule Id="S4039" Action="None" />
-    <Rule Id="S4040" Action="None" />
-    <Rule Id="S4041" Action="None" />
-    <Rule Id="S4047" Action="None" />
-    <Rule Id="S4049" Action="None" />
-    <Rule Id="S4050" Action="None" />
-    <Rule Id="S4052" Action="None" />
-    <Rule Id="S4055" Action="None" />
-    <Rule Id="S4056" Action="None" />
-    <Rule Id="S4057" Action="None" />
-    <Rule Id="S4058" Action="None" />
-    <Rule Id="S4059" Action="None" />
-    <Rule Id="S4060" Action="None" />
-    <Rule Id="S4061" Action="Info" />
-    <Rule Id="S4069" Action="None" />
-    <Rule Id="S4070" Action="Warning" />
-    <Rule Id="S4136" Action="Info" />
-    <Rule Id="S4143" Action="Warning" />
-    <Rule Id="S4144" Action="Warning" />
-    <Rule Id="S4158" Action="Info" />
-    <Rule Id="S4159" Action="Warning" />
-    <Rule Id="S4200" Action="Warning" />
-    <Rule Id="S4201" Action="Info" />
-    <Rule Id="S4210" Action="Warning" />
-    <Rule Id="S4211" Action="Warning" />
-    <Rule Id="S4212" Action="None" />
-    <Rule Id="S4214" Action="Warning" />
-    <Rule Id="S4220" Action="Warning" />
-    <Rule Id="S4225" Action="None" />
-    <Rule Id="S4226" Action="None" />
-    <Rule Id="S4260" Action="Warning" />
-    <Rule Id="S4261" Action="None" />
-    <Rule Id="S4275" Action="Warning" />
-    <Rule Id="S4277" Action="Warning" />
-    <Rule Id="S4423" Action="Warning" />
-    <Rule Id="S4426" Action="Warning" />
-    <Rule Id="S4428" Action="Warning" />
-    <Rule Id="S4433" Action="Warning" />
-    <Rule Id="S4456" Action="Warning" />
-    <Rule Id="S4457" Action="Warning" />
-    <Rule Id="S4462" Action="None" />
-    <Rule Id="S4487" Action="Warning" />
-    <Rule Id="S4524" Action="Warning" />
-    <Rule Id="S4564" Action="None" />
-    <Rule Id="S4581" Action="Warning" />
-    <Rule Id="S4583" Action="Warning" />
-    <Rule Id="S4586" Action="Warning" />
-    <Rule Id="S4635" Action="Warning" />
-    <Rule Id="S4830" Action="Warning" />
-    <Rule Id="S5034" Action="Warning" />
-    <Rule Id="S5445" Action="Warning" />
-    <Rule Id="S5542" Action="Warning" />
-    <Rule Id="S5547" Action="Warning" />
-    <Rule Id="S5659" Action="Warning" />
-    <Rule Id="S5773" Action="Warning" />
-    <Rule Id="S6354" Action="None" />
-    <Rule Id="S818" Action="Info" />
-    <Rule Id="S881" Action="None" />
-    <Rule Id="S907" Action="Warning" />
-    <Rule Id="S927" Action="Warning" />
-  </Rules>
-</RuleSet>
\ No newline at end of file
diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 00000000..9751e827
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,38 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "PowerShell Launch Current File",
+            "type": "PowerShell",
+            "request": "launch",
+            "script": "${file}",
+            "cwd": "${file}",
+            "args": [
+                "-SourceDirectory", "${workspaceFolder}/src",
+                "-Major", "2022",
+                "-Minor","9", 
+                "-Build","12",
+                "-Revision", "0",
+                "-SetVersion"
+            ]
+        },
+        {
+            "name": "Build: Launch Version Script",
+            "type": "PowerShell",
+            "request": "launch",
+            "script": "./Set-Version.ps1",
+            "cwd": "${workspaceFolder}/.github/workflows/scripts/",
+            "args": [
+                "-SourceDirectory", "${workspaceFolder}/src",
+                "-Major", "2022",
+                "-Minor","9", 
+                "-Build","12",
+                "-Revision", "0",
+                "-SetVersion"
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/OpenHAB.Windows.sln b/OpenHAB.Windows.sln
index 7824d181..d8f8265b 100644
--- a/OpenHAB.Windows.sln
+++ b/OpenHAB.Windows.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29409.12
+# Visual Studio Version 17
+VisualStudioVersion = 17.3.32825.248
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libaries", "libaries", "{6D9E45E3-F3C1-4A9D-A62D-72DDBA11C31B}"
 	ProjectSection(SolutionItems) = preProject
@@ -13,50 +13,118 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.editorconfig = .editorconfig
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Openhab.Core", "src\openHAB.Core\Openhab.Core.csproj", "{2A8FD10E-4EE5-4E25-B47C-2296E071F482}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "openHAB.Core", "src\openHAB.Core\openHAB.Core.csproj", "{2A8FD10E-4EE5-4E25-B47C-2296E071F482}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "openHAB.Windows", "src\openHAB.Windows\openHAB.Windows.csproj", "{D65E41CE-1AE7-403A-B178-D69E8DAFB08B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "openHAB.Windows", "src\openHAB.Windows\openHAB.Windows.csproj", "{D65E41CE-1AE7-403A-B178-D69E8DAFB08B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "openHAB.Core.Client", "src\openHAB.Core.Client\openHAB.Core.Client.csproj", "{3B8F31DD-1AF2-47CF-B7DB-3B732FE4EC5A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "openHAB.Common", "src\openHAB.Common\openHAB.Common.csproj", "{E53B599D-4BDB-40B1-86E4-47FB90420138}"
+EndProject
+Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "openHAB.Windows.Package", "src\openHAB.Windows.Package\openHAB.Windows.Package.wapproj", "{4E463E63-604D-4C3D-8A13-273B787C99B2}"
+EndProject
+Project("{C7167F0D-BC9F-4E6E-AFE1-012C56B48DB5}") = "openHAB.Windows.Package.Beta", "src\openHAB.Windows.Package.Beta\openHAB.Windows.Package.Beta.wapproj", "{DC801784-7226-423E-AB0D-C34DFC8AB938}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|ARM = Debug|ARM
+		Debug|arm64 = Debug|arm64
 		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
-		Release|ARM = Release|ARM
+		Release|arm64 = Release|arm64
 		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Debug|ARM.ActiveCfg = Debug|ARM
-		{2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Debug|ARM.Build.0 = Debug|ARM
+		{2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Debug|arm64.ActiveCfg = Debug|arm64
+		{2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Debug|arm64.Build.0 = Debug|arm64
 		{2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Debug|x64.ActiveCfg = Debug|x64
 		{2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Debug|x64.Build.0 = Debug|x64
 		{2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Debug|x86.ActiveCfg = Debug|x86
 		{2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Debug|x86.Build.0 = Debug|x86
-		{2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Release|ARM.ActiveCfg = Release|ARM
-		{2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Release|ARM.Build.0 = Release|ARM
+		{2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Release|arm64.ActiveCfg = Release|arm64
+		{2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Release|arm64.Build.0 = Release|arm64
 		{2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Release|x64.ActiveCfg = Release|x64
 		{2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Release|x64.Build.0 = Release|x64
 		{2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Release|x86.ActiveCfg = Release|x86
 		{2A8FD10E-4EE5-4E25-B47C-2296E071F482}.Release|x86.Build.0 = Release|x86
-		{D65E41CE-1AE7-403A-B178-D69E8DAFB08B}.Debug|ARM.ActiveCfg = Debug|ARM
-		{D65E41CE-1AE7-403A-B178-D69E8DAFB08B}.Debug|ARM.Build.0 = Debug|ARM
-		{D65E41CE-1AE7-403A-B178-D69E8DAFB08B}.Debug|ARM.Deploy.0 = Debug|ARM
+		{D65E41CE-1AE7-403A-B178-D69E8DAFB08B}.Debug|arm64.ActiveCfg = Debug|arm64
+		{D65E41CE-1AE7-403A-B178-D69E8DAFB08B}.Debug|arm64.Build.0 = Debug|arm64
+		{D65E41CE-1AE7-403A-B178-D69E8DAFB08B}.Debug|arm64.Deploy.0 = Debug|arm64
 		{D65E41CE-1AE7-403A-B178-D69E8DAFB08B}.Debug|x64.ActiveCfg = Debug|x64
 		{D65E41CE-1AE7-403A-B178-D69E8DAFB08B}.Debug|x64.Build.0 = Debug|x64
 		{D65E41CE-1AE7-403A-B178-D69E8DAFB08B}.Debug|x64.Deploy.0 = Debug|x64
 		{D65E41CE-1AE7-403A-B178-D69E8DAFB08B}.Debug|x86.ActiveCfg = Debug|x86
 		{D65E41CE-1AE7-403A-B178-D69E8DAFB08B}.Debug|x86.Build.0 = Debug|x86
 		{D65E41CE-1AE7-403A-B178-D69E8DAFB08B}.Debug|x86.Deploy.0 = Debug|x86
-		{D65E41CE-1AE7-403A-B178-D69E8DAFB08B}.Release|ARM.ActiveCfg = Release|ARM
-		{D65E41CE-1AE7-403A-B178-D69E8DAFB08B}.Release|ARM.Build.0 = Release|ARM
-		{D65E41CE-1AE7-403A-B178-D69E8DAFB08B}.Release|ARM.Deploy.0 = Release|ARM
+		{D65E41CE-1AE7-403A-B178-D69E8DAFB08B}.Release|arm64.ActiveCfg = Release|arm64
+		{D65E41CE-1AE7-403A-B178-D69E8DAFB08B}.Release|arm64.Build.0 = Release|arm64
+		{D65E41CE-1AE7-403A-B178-D69E8DAFB08B}.Release|arm64.Deploy.0 = Release|arm64
 		{D65E41CE-1AE7-403A-B178-D69E8DAFB08B}.Release|x64.ActiveCfg = Release|x64
 		{D65E41CE-1AE7-403A-B178-D69E8DAFB08B}.Release|x64.Build.0 = Release|x64
 		{D65E41CE-1AE7-403A-B178-D69E8DAFB08B}.Release|x64.Deploy.0 = Release|x64
 		{D65E41CE-1AE7-403A-B178-D69E8DAFB08B}.Release|x86.ActiveCfg = Release|x86
 		{D65E41CE-1AE7-403A-B178-D69E8DAFB08B}.Release|x86.Build.0 = Release|x86
 		{D65E41CE-1AE7-403A-B178-D69E8DAFB08B}.Release|x86.Deploy.0 = Release|x86
+		{3B8F31DD-1AF2-47CF-B7DB-3B732FE4EC5A}.Debug|arm64.ActiveCfg = Debug|arm64
+		{3B8F31DD-1AF2-47CF-B7DB-3B732FE4EC5A}.Debug|arm64.Build.0 = Debug|arm64
+		{3B8F31DD-1AF2-47CF-B7DB-3B732FE4EC5A}.Debug|x64.ActiveCfg = Debug|x64
+		{3B8F31DD-1AF2-47CF-B7DB-3B732FE4EC5A}.Debug|x64.Build.0 = Debug|x64
+		{3B8F31DD-1AF2-47CF-B7DB-3B732FE4EC5A}.Debug|x86.ActiveCfg = Debug|x86
+		{3B8F31DD-1AF2-47CF-B7DB-3B732FE4EC5A}.Debug|x86.Build.0 = Debug|x86
+		{3B8F31DD-1AF2-47CF-B7DB-3B732FE4EC5A}.Release|arm64.ActiveCfg = Release|arm64
+		{3B8F31DD-1AF2-47CF-B7DB-3B732FE4EC5A}.Release|arm64.Build.0 = Release|arm64
+		{3B8F31DD-1AF2-47CF-B7DB-3B732FE4EC5A}.Release|x64.ActiveCfg = Release|x64
+		{3B8F31DD-1AF2-47CF-B7DB-3B732FE4EC5A}.Release|x64.Build.0 = Release|x64
+		{3B8F31DD-1AF2-47CF-B7DB-3B732FE4EC5A}.Release|x86.ActiveCfg = Release|x86
+		{3B8F31DD-1AF2-47CF-B7DB-3B732FE4EC5A}.Release|x86.Build.0 = Release|x86
+		{E53B599D-4BDB-40B1-86E4-47FB90420138}.Debug|arm64.ActiveCfg = Debug|arm64
+		{E53B599D-4BDB-40B1-86E4-47FB90420138}.Debug|arm64.Build.0 = Debug|arm64
+		{E53B599D-4BDB-40B1-86E4-47FB90420138}.Debug|x64.ActiveCfg = Debug|x64
+		{E53B599D-4BDB-40B1-86E4-47FB90420138}.Debug|x64.Build.0 = Debug|x64
+		{E53B599D-4BDB-40B1-86E4-47FB90420138}.Debug|x86.ActiveCfg = Debug|x86
+		{E53B599D-4BDB-40B1-86E4-47FB90420138}.Debug|x86.Build.0 = Debug|x86
+		{E53B599D-4BDB-40B1-86E4-47FB90420138}.Release|arm64.ActiveCfg = Release|arm64
+		{E53B599D-4BDB-40B1-86E4-47FB90420138}.Release|arm64.Build.0 = Release|arm64
+		{E53B599D-4BDB-40B1-86E4-47FB90420138}.Release|x64.ActiveCfg = Release|x64
+		{E53B599D-4BDB-40B1-86E4-47FB90420138}.Release|x64.Build.0 = Release|x64
+		{E53B599D-4BDB-40B1-86E4-47FB90420138}.Release|x86.ActiveCfg = Release|x86
+		{E53B599D-4BDB-40B1-86E4-47FB90420138}.Release|x86.Build.0 = Release|x86
+		{4E463E63-604D-4C3D-8A13-273B787C99B2}.Debug|arm64.ActiveCfg = Debug|arm64
+		{4E463E63-604D-4C3D-8A13-273B787C99B2}.Debug|arm64.Build.0 = Debug|arm64
+		{4E463E63-604D-4C3D-8A13-273B787C99B2}.Debug|arm64.Deploy.0 = Debug|arm64
+		{4E463E63-604D-4C3D-8A13-273B787C99B2}.Debug|x64.ActiveCfg = Debug|x64
+		{4E463E63-604D-4C3D-8A13-273B787C99B2}.Debug|x64.Build.0 = Debug|x64
+		{4E463E63-604D-4C3D-8A13-273B787C99B2}.Debug|x64.Deploy.0 = Debug|x64
+		{4E463E63-604D-4C3D-8A13-273B787C99B2}.Debug|x86.ActiveCfg = Debug|x86
+		{4E463E63-604D-4C3D-8A13-273B787C99B2}.Debug|x86.Build.0 = Debug|x86
+		{4E463E63-604D-4C3D-8A13-273B787C99B2}.Debug|x86.Deploy.0 = Debug|x86
+		{4E463E63-604D-4C3D-8A13-273B787C99B2}.Release|arm64.ActiveCfg = Release|arm64
+		{4E463E63-604D-4C3D-8A13-273B787C99B2}.Release|arm64.Build.0 = Release|arm64
+		{4E463E63-604D-4C3D-8A13-273B787C99B2}.Release|arm64.Deploy.0 = Release|arm64
+		{4E463E63-604D-4C3D-8A13-273B787C99B2}.Release|x64.ActiveCfg = Release|x64
+		{4E463E63-604D-4C3D-8A13-273B787C99B2}.Release|x64.Build.0 = Release|x64
+		{4E463E63-604D-4C3D-8A13-273B787C99B2}.Release|x64.Deploy.0 = Release|x64
+		{4E463E63-604D-4C3D-8A13-273B787C99B2}.Release|x86.ActiveCfg = Release|x86
+		{4E463E63-604D-4C3D-8A13-273B787C99B2}.Release|x86.Build.0 = Release|x86
+		{4E463E63-604D-4C3D-8A13-273B787C99B2}.Release|x86.Deploy.0 = Release|x86
+		{DC801784-7226-423E-AB0D-C34DFC8AB938}.Debug|arm64.ActiveCfg = Debug|ARM64
+		{DC801784-7226-423E-AB0D-C34DFC8AB938}.Debug|arm64.Build.0 = Debug|ARM64
+		{DC801784-7226-423E-AB0D-C34DFC8AB938}.Debug|arm64.Deploy.0 = Debug|ARM64
+		{DC801784-7226-423E-AB0D-C34DFC8AB938}.Debug|x64.ActiveCfg = Debug|x64
+		{DC801784-7226-423E-AB0D-C34DFC8AB938}.Debug|x64.Build.0 = Debug|x64
+		{DC801784-7226-423E-AB0D-C34DFC8AB938}.Debug|x64.Deploy.0 = Debug|x64
+		{DC801784-7226-423E-AB0D-C34DFC8AB938}.Debug|x86.ActiveCfg = Debug|x86
+		{DC801784-7226-423E-AB0D-C34DFC8AB938}.Debug|x86.Build.0 = Debug|x86
+		{DC801784-7226-423E-AB0D-C34DFC8AB938}.Debug|x86.Deploy.0 = Debug|x86
+		{DC801784-7226-423E-AB0D-C34DFC8AB938}.Release|arm64.ActiveCfg = Release|ARM64
+		{DC801784-7226-423E-AB0D-C34DFC8AB938}.Release|arm64.Build.0 = Release|ARM64
+		{DC801784-7226-423E-AB0D-C34DFC8AB938}.Release|arm64.Deploy.0 = Release|ARM64
+		{DC801784-7226-423E-AB0D-C34DFC8AB938}.Release|x64.ActiveCfg = Release|x64
+		{DC801784-7226-423E-AB0D-C34DFC8AB938}.Release|x64.Build.0 = Release|x64
+		{DC801784-7226-423E-AB0D-C34DFC8AB938}.Release|x64.Deploy.0 = Release|x64
+		{DC801784-7226-423E-AB0D-C34DFC8AB938}.Release|x86.ActiveCfg = Release|x86
+		{DC801784-7226-423E-AB0D-C34DFC8AB938}.Release|x86.Build.0 = Release|x86
+		{DC801784-7226-423E-AB0D-C34DFC8AB938}.Release|x86.Deploy.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/README.md b/README.md
index ba1ec8a1..ee721452 100644
--- a/README.md
+++ b/README.md
@@ -1,41 +1,59 @@
 ## Introduction
-openHAB Windows application is a native client for openHAB 2 & 3. It uses REST API of openHAB to render
-sitemaps of your openHAB.
+The openHAB Windows application is a native client for openHAB 3 & 4, leveraging the REST API to render sitemaps and provide a seamless interface for managing your smart home devices.
+
+openHAB (open Home Automation Bus) is an open-source, technology-agnostic home automation platform that integrates various smart home systems and technologies into one solution. It is designed to be flexible and scalable, allowing users to automate their homes with ease. openHAB supports a wide range of devices and protocols, making it a versatile choice for home automation enthusiasts.
+
+### Key Features
+- **Extensibility**: With a modular architecture, openHAB can be extended with add-ons to support new devices and technologies.
+- **Community-Driven**: Maintained by a vibrant community of developers and users who contribute to its continuous improvement.
+- **Cross-Platform**: Runs on various operating systems, including Windows, macOS, Linux, and Raspberry Pi.
+- **User-Friendly Interfaces**: Offers multiple user interfaces, such as web-based UIs, mobile apps, and voice control, to manage and monitor your smart home.
+
+For more information, visit the [official openHAB website](https://www.openhab.org/).
 
 ## Builds
+[![openHAB Build and Release app](https://github.com/openhab/openhab-windows/actions/workflows/openhab.yml/badge.svg)](https://github.com/openhab/openhab-windows/actions/workflows/openhab.yml)
+
+## Microsoft App Store
+
+### Beta App
+The beta app offers early access to upcoming features and fixes, allowing users to test and provide feedback before these updates are officially released in the main application. This helps ensure a stable and polished experience for all users.
+
+[![Link to Windows Store](/docs/get_microsoft_store.png)](https://www.microsoft.com/store/apps/9N140MD0NJ6T)
+
+### Production App
+The production app is the stable version of the openHAB Windows application, providing a reliable and tested experience for managing your smart home devices. It includes all the latest features and improvements that have been thoroughly vetted by the community and developers.
 
-[![CI Build](https://github.com/openhab/openhab-windows/actions/workflows/ci.yml/badge.svg)](https://github.com/openhab/openhab-windows/actions/workflows/ci.yml)
-[![Latest App Release Build](https://github.com/openhab/openhab-windows/actions/workflows/app-release.yml/badge.svg)](https://github.com/openhab/openhab-windows/actions/workflows/app-release.yml)
+[![Link to Windows Store](/docs/get_microsoft_store.png)](https://www.microsoft.com/store/apps/9NMQ39CTWXGT)
 
 ## Code Analysis
-The app project is using SonarQube hosted by SonarCloud to analyse the code for issues and code quality.
+The project utilizes SonarQube, hosted by SonarCloud, to analyze the code for potential issues and ensure high code quality.
 
 [![SonarCloud](https://sonarcloud.io/images/project_badges/sonarcloud-white.svg)](https://sonarcloud.io/dashboard?id=openhab_openhab-windows)
 
 ### Quality Status
 
-| Branch | Quality Gate Status | Bugs |Code Smells
-|--------|---------------------|------ |------------|
-| beta ||||
-| main | [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=openhab_openhab-windows&metric=alert_status)](https://sonarcloud.io/dashboard?id=openhab_openhab-windows)| [![Bugs](https://sonarcloud.io/api/project_badges/measure?project=openhab_openhab-windows&metric=bugs)](https://sonarcloud.io/dashboard?id=openhab_openhab-windows)|[![Code Smells](https://sonarcloud.io/api/project_badges/measure?project=openhab_openhab-windows&metric=code_smells)](https://sonarcloud.io/dashboard?id=openhab_openhab-windows)|
+| Branch | Quality Gate Status | Bugs | Code Smells |
+|--------|---------------------|------|-------------|
+| beta   |                     |      |             |
+| main   | [![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=openhab_openhab-windows&metric=alert_status)](https://sonarcloud.io/dashboard?id=openhab_openhab-windows) | [![Bugs](https://sonarcloud.io/api/project_badges/measure?project=openhab_openhab-windows&metric=bugs)](https://sonarcloud.io/dashboard?id=openhab_openhab-windows) | [![Code Smells](https://sonarcloud.io/api/project_badges/measure?project=openhab_openhab-windows&metric=code_smells)](https://sonarcloud.io/dashboard?id=openhab_openhab-windows) |
 
-## Setting up development environment
+## Setting up the Development Environment
 
-If you want to contribute to the Windows application we are here to help you to set up
-development environment. openHAB Windows app is developed using Visual Studio 2019 and later.
+If you want to contribute to the Windows application, we are here to help you set up your development environment. The openHAB Windows app is developed using Visual Studio 2019 and later versions.
 
-- Download and install [Visual Studio Community Edition](https://www.visualstudio.com/downloads/)
-- During install, make sure to select UWP SDK 17763 and SDK 19041
-- Check out the latest code from github
-- Open the project in Visual Studio (File -> Open, Project/Solution)
-- Rebuild the solution to fetch all missing NuGet packages
+### Steps to Set Up:
+1. Download and install [Visual Studio Community Edition](https://www.visualstudio.com/downloads/).
+2. During installation, ensure to select Windows 10 SDK 10.0.20348.0 and Windows 11 SDK 10.0.26100.0.
+3. Check out the latest code from GitHub.
+4. Install pre-commit hook tooling by executing `setup_pre-commit.ps1`
+4. Open the project in Visual Studio (File -> Open -> Project/Solution).
+5. Rebuild the solution to fetch all missing NuGet packages.
 
-You are ready to contribute!
+You are now ready to contribute!
 
-Before producing any amount of code please have a look at [contribution guidelines](https://github.com/openhab/openhab.windows/blob/master/CONTRIBUTING.md)
+Before writing any code, please review our [contribution guidelines](https://github.com/openhab/openhab.windows/blob/master/CONTRIBUTING.md).
 
 ## Trademark Disclaimer
 
-Product names, logos, brands and other trademarks referred to within the openHAB website are the
-property of their respective trademark holders. These trademark holders are not affiliated with
-openHAB or our website. They do not sponsor or endorse our materials.
+Product names, logos, brands, and other trademarks referred to within the openHAB website are the property of their respective trademark holders. These trademark holders are not affiliated with openHAB or our website. They do not sponsor or endorse our materials.
diff --git a/docs/get_microsoft_store.png b/docs/get_microsoft_store.png
new file mode 100644
index 00000000..a5f827bf
Binary files /dev/null and b/docs/get_microsoft_store.png differ
diff --git a/docs/screenshots/screenshot1.png b/docs/screenshots/screenshot1.png
deleted file mode 100644
index 24144484..00000000
Binary files a/docs/screenshots/screenshot1.png and /dev/null differ
diff --git a/docs/screenshots/screenshot2.png b/docs/screenshots/screenshot2.png
deleted file mode 100644
index 3bc8a1a3..00000000
Binary files a/docs/screenshots/screenshot2.png and /dev/null differ
diff --git a/docs/screenshots/screenshot3.png b/docs/screenshots/screenshot3.png
deleted file mode 100644
index 0b7cf09d..00000000
Binary files a/docs/screenshots/screenshot3.png and /dev/null differ
diff --git a/docs/screenshots/screenshot4.png b/docs/screenshots/screenshot4.png
deleted file mode 100644
index 33de7dee..00000000
Binary files a/docs/screenshots/screenshot4.png and /dev/null differ
diff --git a/setup_pre-commit.ps1 b/setup_pre-commit.ps1
new file mode 100644
index 00000000..afd9ee63
--- /dev/null
+++ b/setup_pre-commit.ps1
@@ -0,0 +1,18 @@
+# setup_pre-commit.ps
+# This script initializes pre-commit hooks for the repository
+
+# Ensure pre-commit is installed
+if (-not (Get-Command pre-commit -ErrorAction SilentlyContinue)) {
+    Write-Host "pre-commit is not installed. Installing..."
+    pip install pre-commit
+}
+
+# Navigate to the repository root
+$repoRoot = Split-Path -Parent $MyInvocation.MyCommand.Path
+Set-Location $repoRoot
+
+# Install pre-commit hooks
+Write-Host "Installing pre-commit hooks..."
+pre-commit install --hook-type pre-commit --hook-type pre-push --hook-type commit-msg
+
+Write-Host "Pre-commit hooks installed successfully."
diff --git a/src/openHAB.Common/AppResources.cs b/src/openHAB.Common/AppResources.cs
new file mode 100644
index 00000000..6ba1874e
--- /dev/null
+++ b/src/openHAB.Common/AppResources.cs
@@ -0,0 +1,44 @@
+using Microsoft.Windows.ApplicationModel.Resources;
+
+namespace openHAB.Common;
+
+/// <summary>
+///   Resources.
+/// </summary>
+public static class AppResources
+{
+    private static ResourceLoader _resourceLoader;
+    private static ResourceLoader _errorResourceLoader;
+
+    /// <summary>
+    ///   Gets the localized UI values.
+    /// </summary>
+    public static ResourceLoader Values
+    {
+        get
+        {
+            if (_resourceLoader == null)
+            {
+                _resourceLoader = new ResourceLoader(ResourceLoader.GetDefaultResourceFilePath());
+            }
+
+            return _resourceLoader;
+        }
+    }
+
+    /// <summary>
+    ///   Gets the localized error strings.
+    /// </summary>
+    public static ResourceLoader Errors
+    {
+        get
+        {
+            if (_errorResourceLoader == null)
+            {
+                _errorResourceLoader = new ResourceLoader(ResourceLoader.GetDefaultResourceFilePath());
+            }
+
+            return _errorResourceLoader;
+        }
+    }
+}
diff --git a/src/openHAB.Common/openHAB.Common.csproj b/src/openHAB.Common/openHAB.Common.csproj
new file mode 100644
index 00000000..1abdd938
--- /dev/null
+++ b/src/openHAB.Common/openHAB.Common.csproj
@@ -0,0 +1,15 @@
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<TargetFramework>net8.0-windows10.0.26100.0</TargetFramework>
+		<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+		<RootNamespace>openHAB.Common</RootNamespace>
+		<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
+		<UseWinUI>true</UseWinUI>
+		<SupportedOSPlatformVersion>10.0.20348.0</SupportedOSPlatformVersion>
+		<Platforms>x86;x64;arm64</Platforms>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.241114003" />
+	</ItemGroup>
+</Project>
diff --git a/src/openHAB.Core.Client/AutoNumberToStringConverter.cs b/src/openHAB.Core.Client/AutoNumberToStringConverter.cs
new file mode 100644
index 00000000..c7b05ac8
--- /dev/null
+++ b/src/openHAB.Core.Client/AutoNumberToStringConverter.cs
@@ -0,0 +1,38 @@
+using System;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace openHAB.Core.Client;
+
+public class AutoNumberToStringConverter : JsonConverter<object>
+{
+    public override bool CanConvert(Type typeToConvert)
+    {
+        return typeof(string) == typeToConvert;
+    }
+
+    public override object Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        if (reader.TokenType == JsonTokenType.Number)
+        {
+            return reader.TryGetInt64(out long l) ?
+                l.ToString() :
+                reader.GetDouble().ToString();
+        }
+
+        if (reader.TokenType == JsonTokenType.String)
+        {
+            return reader.GetString();
+        }
+
+        using (JsonDocument document = JsonDocument.ParseValue(ref reader))
+        {
+            return document.RootElement.Clone().ToString();
+        }
+    }
+
+    public override void Write(Utf8JsonWriter writer, object value, JsonSerializerOptions options)
+    {
+        writer.WriteStringValue(value.ToString());
+    }
+}
diff --git a/src/openHAB.Core.Client/Common/HttpResponseResult.cs b/src/openHAB.Core.Client/Common/HttpResponseResult.cs
new file mode 100644
index 00000000..2c2eca0c
--- /dev/null
+++ b/src/openHAB.Core.Client/Common/HttpResponseResult.cs
@@ -0,0 +1,55 @@
+using System;
+using System.Net;
+
+namespace openHAB.Core.Client.Common;
+
+/// <summary>HTTP response result.</summary>
+/// <typeparam name="T">Content Type.</typeparam>
+public class HttpResponseResult<T>
+{
+    /// <summary>Initializes a new instance of the <see cref="HttpResponseResult{T}" /> class.</summary>
+    /// <param name="content">The content.</param>
+    /// <param name="statusCode">The status code.</param>
+    public HttpResponseResult(T content, HttpStatusCode? statusCode)
+        : this(content, statusCode, null)
+    {
+    }
+
+    /// <summary>Initializes a new instance of the <see cref="HttpResponseResult{T}" /> class.</summary>
+    /// <param name="content">The content.</param>
+    /// <param name="statusCode">The status code.</param>
+    /// <param name="exception">The exception.</param>
+    public HttpResponseResult(T content, HttpStatusCode? statusCode, Exception exception)
+    {
+        Content = content;
+        StatusCode = statusCode;
+        Exception = exception;
+    }
+
+    /// <summary>Gets the deserailized HTTP response content.</summary>
+    /// <value>Deserailized HTTP response content.</value>
+    public T Content
+    {
+        get;
+        private set;
+    }
+
+    /// <summary>
+    /// Gets the exception when available.
+    /// </summary>
+    /// <value>
+    /// The exception.
+    /// </value>
+    public Exception Exception
+    {
+        get;
+        private set;
+    }
+
+    /// <summary>Gets the http status code.</summary>
+    /// <value>The status code.</value>
+    public HttpStatusCode? StatusCode
+    {
+        get; private set;
+    }
+}
diff --git a/src/openHAB.Core.Client/Connection/ConnectionService.cs b/src/openHAB.Core.Client/Connection/ConnectionService.cs
new file mode 100644
index 00000000..651de9c5
--- /dev/null
+++ b/src/openHAB.Core.Client/Connection/ConnectionService.cs
@@ -0,0 +1,175 @@
+using System;
+using System.Net.Http;
+using System.Text.Json;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.Messaging;
+using CommunityToolkit.WinUI.Helpers;
+using Microsoft.Extensions.Logging;
+using openHAB.Common;
+using openHAB.Core.Client.Common;
+using openHAB.Core.Client.Connection.Contracts;
+using openHAB.Core.Client.Connection.Models;
+using openHAB.Core.Client.Messages;
+using openHAB.Core.Client.Models;
+
+namespace openHAB.Core.Client.Connection;
+
+
+/// <summary>
+/// <inheritdoc/>
+public class ConnectionService : IConnectionService
+{
+    private readonly ILogger<ConnectionService> _logger;
+    private readonly IHttpClientFactory _httpClientFactory;
+    private Models.Connection _connection;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ConnectionService"/> class.
+    /// </summary>
+    /// <param name="openHABHttpClient">The OpenHAB HTTP client.</param>
+    /// <param name="logger">The logger.</param>
+    public ConnectionService(IHttpClientFactory httpClientFactory, ILogger<ConnectionService> logger)
+    {
+        _logger = logger;
+        _httpClientFactory = httpClientFactory;
+    }
+
+    /// <inheritdoc/>
+    public Models.Connection CurrentConnection => _connection;
+
+    /// <inheritdoc/>
+    public async Task<HttpResponseResult<bool>> CheckUrlReachability(Models.Connection connection)
+    {
+        if (string.IsNullOrWhiteSpace(connection?.Url))
+        {
+            return new HttpResponseResult<bool>(false, null);
+        }
+
+        if (!connection.Url.EndsWith("/", StringComparison.InvariantCultureIgnoreCase))
+        {
+            connection.Url += "/";
+        }
+
+        HttpResponseResult<ServerInfo> result = await GetOpenHABServerInfo(connection).ConfigureAwait(false);
+        return result.Content == null
+            ? new HttpResponseResult<bool>(false, null, result.Exception)
+            : new HttpResponseResult<bool>(true, result.StatusCode);
+    }
+
+    /// <inheritdoc/>
+    public async Task<Models.Connection> DetectAndRetrieveConnection(Models.Connection localConnection, Models.Connection remoteConnection, bool isRunningInDemoMode)
+    {
+        _logger.LogInformation("Validate Connection");
+        _logger.LogInformation("APP is running in demo mode: {IsRunningInDemoMode}", isRunningInDemoMode);
+
+        if (string.IsNullOrWhiteSpace(localConnection?.Url) &&
+            string.IsNullOrWhiteSpace(remoteConnection?.Url) &&
+            !isRunningInDemoMode)
+        {
+            return null;
+        }
+
+        if (isRunningInDemoMode)
+        {
+            _connection = new DemoConnectionProfile().CreateConnection();
+            return _connection;
+        }
+
+        bool meteredConnection = NetworkHelper.Instance.ConnectionInformation.IsInternetOnMeteredConnection;
+        _logger.LogInformation("Metered Connection Type: {MeteredConnection}", meteredConnection);
+
+        if (meteredConnection)
+        {
+            if (string.IsNullOrEmpty(remoteConnection?.Url))
+            {
+                _logger.LogWarning("No remote url configured");
+                return null;
+            }
+
+            _connection = remoteConnection;
+            return _connection;
+        }
+
+        HttpResponseResult<bool> result = await CheckUrlReachability(localConnection).ConfigureAwait(false);
+        _logger.LogInformation("OpenHab server is reachable: {IsReachable}", result.Content);
+
+        if (result.Content)
+        {
+            _connection = localConnection;
+            return _connection;
+        }
+
+        if (string.IsNullOrWhiteSpace(remoteConnection?.Url))
+        {
+            StrongReferenceMessenger.Default.Send(new ConnectionErrorMessage(AppResources.Errors.GetString("ConnectionTestFailed")));
+            _logger.LogWarning("OpenHab server url is not valid");
+            return null;
+        }
+
+        result = await CheckUrlReachability(remoteConnection).ConfigureAwait(false);
+        if (!result.Content)
+        {
+            StrongReferenceMessenger.Default.Send(new ConnectionErrorMessage(AppResources.Errors.GetString("ConnectionTestFailed")));
+            _logger.LogWarning("OpenHab server url is not valid");
+            return null;
+        }
+
+        _connection = remoteConnection;
+        return _connection;
+    }
+
+    /// <inheritdoc />
+    public async Task<HttpResponseResult<ServerInfo>> GetOpenHABServerInfo(Models.Connection connection)
+    {
+        try
+        {
+            HttpClient httpClient = connection.Type switch
+            {
+                HttpClientType.Local => _httpClientFactory.CreateClient("local"),
+                HttpClientType.Remote => _httpClientFactory.CreateClient("remote"),
+                _ => throw new OpenHABException("Invalid connection type")
+            };
+
+            HttpResponseMessage result = await httpClient.GetAsync(Constants.API.ServerInformation).ConfigureAwait(false);
+            if (!result.IsSuccessStatusCode)
+            {
+                _logger.LogError("HTTP request get OpenHab version failed, ErrorCode:'{StatusCode}'", result.StatusCode);
+                throw new OpenHABException($"{result.StatusCode} received from server");
+            }
+
+            string responseBody = await result.Content.ReadAsStringAsync();
+            APIInfo apiInfo = JsonSerializer.Deserialize<APIInfo>(responseBody);
+
+            if (int.TryParse(apiInfo.Version, out int apiVersion) && apiVersion < 4)
+            {
+                return new HttpResponseResult<ServerInfo>(new ServerInfo { Version = OpenHABVersion.Two }, result.StatusCode);
+            }
+
+            string runtimeversion = Regex.Replace(apiInfo?.RuntimeInfo.Version, "[^.0-9]", string.Empty, RegexOptions.CultureInvariant, TimeSpan.FromSeconds(1));
+            if (!Version.TryParse(runtimeversion, out Version serverVersion))
+            {
+                string message = "Not able to parse runtime version from openHAB server";
+                _logger.LogError(message);
+                throw new OpenHABException(message);
+            }
+
+            return new HttpResponseResult<ServerInfo>(new ServerInfo
+            {
+                Version = (OpenHABVersion)serverVersion.Major,
+                RuntimeVersion = apiInfo?.RuntimeInfo.Version,
+                Build = apiInfo.RuntimeInfo.BuildString
+            }, result.StatusCode);
+        }
+        catch (Exception ex) when (ex is ArgumentNullException or InvalidOperationException or HttpRequestException)
+        {
+            _logger.LogError(ex, "GetOpenHABServerInfo failed");
+            return new HttpResponseResult<ServerInfo>(null, null, ex);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "GetOpenHABServerInfo failed.");
+            return new HttpResponseResult<ServerInfo>(null, null, ex);
+        }
+    }
+}
diff --git a/src/openHAB.Core.Client/Connection/Contracts/IConnectionProfile.cs b/src/openHAB.Core.Client/Connection/Contracts/IConnectionProfile.cs
new file mode 100644
index 00000000..9d663780
--- /dev/null
+++ b/src/openHAB.Core.Client/Connection/Contracts/IConnectionProfile.cs
@@ -0,0 +1,70 @@
+using openHAB.Core.Client.Connection.Models;
+
+namespace openHAB.Core.Client.Connection.Contracts;
+
+/// <summary>
+/// Interface for connection profiles.
+/// </summary>
+public interface IConnectionProfile
+{
+    /// <summary>Gets a value indicating whether [host URL] value can be modified.</summary>
+    /// <value>
+    ///   <c>true</c> if [host URL configuration] can be modified; otherwise, <c>false</c>.</value>
+    bool AllowHostUrlConfiguration
+    {
+        get;
+    }
+
+    /// <summary>Gets a value indicating whether [allow ignore SSL certificate] issues option is available.</summary>
+    /// <value>
+    ///   <c>true</c> if [allow ignore SSL certificate] is available; otherwise, <c>false</c>.</value>
+    bool AllowIgnoreSSLCertificate
+    {
+        get;
+    }
+
+    /// <summary>Gets a value indicating whether [allow ignore SSL hostname] issue option is available.</summary>
+    /// <value>
+    /// <c>true.</c> if [allow ignore SSL hostname] can be enabled; otherwise, <c>false</c>.</value>
+    bool AllowIgnoreSSLHostname
+    {
+        get;
+    }
+
+    /// <summary>Gets the connection profile id.</summary>
+    /// <value>The id.</value>
+    int Id
+    {
+        get;
+    }
+
+    /// <summary>Gets the connection profile name.</summary>
+    /// <value>The profile name.</value>
+    string Name
+    {
+        get;
+    }
+
+    /// <summary>Gets the profile type.</summary>
+    /// <value>The type.</value>
+    HttpClientType Type
+    {
+        get;
+    }
+    /// <summary>Gets the main UI URL.</summary>
+    /// <value>The main UI URL.</value>
+    string MainUIUrl
+    {
+        get;
+    }
+    /// <summary>Gets the URL.</summary>
+    /// <value>The URL.</value>
+    string Url
+    {
+        get;
+    }
+
+    /// <summary>Creates the connection based on the profile.</summary>
+    /// <returns>Preconfigured connection.</returns>
+    Models.Connection CreateConnection();
+}
diff --git a/src/openHAB.Core.Client/Connection/Contracts/IConnectionService.cs b/src/openHAB.Core.Client/Connection/Contracts/IConnectionService.cs
new file mode 100644
index 00000000..a9cc451d
--- /dev/null
+++ b/src/openHAB.Core.Client/Connection/Contracts/IConnectionService.cs
@@ -0,0 +1,36 @@
+using System.Threading.Tasks;
+using openHAB.Core.Client.Common;
+using openHAB.Core.Client.Models;
+
+namespace openHAB.Core.Client.Connection.Contracts;
+
+/// <summary>
+/// Service for connection management.
+/// </summary>
+public interface IConnectionService
+{
+    /// <summary>
+    /// Gets or sets the current connection to openHAB instance.
+    /// </summary>
+    Models.Connection CurrentConnection
+    {
+        get;
+    }
+
+    /// <summary>Checks the URL reachability.</summary>
+    /// <param name="connection">Defines settings for local or remote connections.</param>
+    /// <returns>>A <see cref="Task"/> representing the asynchronous operation.</returns>
+    Task<HttpResponseResult<bool>> CheckUrlReachability(Models.Connection connection);
+
+    /// <summary>Detects if connection is local or remote and provides the connection information.</summary>
+    /// <param name="settings">The app settings.</param>
+    /// <returns>Return the connection information for local/remote.</returns>
+    Task<Models.Connection> DetectAndRetrieveConnection(Models.Connection localConnection, Models.Connection remoteConnection, bool isRunningInDemoMode);
+
+    /// <summary>
+    /// Gets information about the openHAB server.
+    /// </summary>
+    /// <param name="connection">Connection information.</param>
+    /// <returns>Server information about openHAB instance.</returns>
+    Task<HttpResponseResult<ServerInfo>> GetOpenHABServerInfo(Models.Connection connection);
+}
diff --git a/src/openHAB.Core.Client/Connection/Models/CloudConnectionProfile.cs b/src/openHAB.Core.Client/Connection/Models/CloudConnectionProfile.cs
new file mode 100644
index 00000000..af46bb30
--- /dev/null
+++ b/src/openHAB.Core.Client/Connection/Models/CloudConnectionProfile.cs
@@ -0,0 +1,62 @@
+using openHAB.Common;
+using openHAB.Core.Client.Connection.Contracts;
+
+namespace openHAB.Core.Client.Connection.Models;
+
+/// <summary>Connection profile for for local custom connection to OpenHab server.</summary>
+/// <seealso cref="IConnectionProfile" />
+public class CloudConnectionProfile : IConnectionProfile
+{
+    /// <inheritdoc/>
+    public bool AllowHostUrlConfiguration
+    {
+        get => false;
+    }
+
+    /// <inheritdoc/>
+    public bool AllowIgnoreSSLCertificate
+    {
+        get => false;
+    }
+
+    /// <inheritdoc/>
+    public bool AllowIgnoreSSLHostname
+    {
+        get => false;
+    }
+
+    /// <inheritdoc/>
+    public int Id
+    {
+        get => 4;
+    }
+
+    /// <inheritdoc/>
+    public string Name
+    {
+        get => AppResources.Values.GetString("RemoteDefaultConnection");
+    }
+
+    /// <inheritdoc/>
+    public HttpClientType Type
+    {
+        get => HttpClientType.Remote;
+    }
+
+    public string MainUIUrl
+    {
+        get => "https://home.myopenhab.org/";
+    }
+
+    public string Url => "https://myopenhab.org/";
+
+    /// <inheritdoc/>
+    public Connection CreateConnection()
+    {
+        return new Connection()
+        {
+            Type = HttpClientType.Remote,
+            Url = Url
+        };
+    }
+}
diff --git a/src/openHAB.Core.Client/Connection/Models/Connection.cs b/src/openHAB.Core.Client/Connection/Models/Connection.cs
new file mode 100644
index 00000000..75bb0dde
--- /dev/null
+++ b/src/openHAB.Core.Client/Connection/Models/Connection.cs
@@ -0,0 +1,120 @@
+using System.Text.Json.Serialization;
+using openHAB.Core.Client.Connection.Contracts;
+
+namespace openHAB.Core.Client.Connection.Models;
+
+
+/// <summary>
+/// Connection configuration for OpenHAB service or cloud instance.
+/// </summary>
+public class Connection
+{
+    /// <summary>Gets or sets the connection profile.</summary>
+    /// <value>The profile.</value>
+    [JsonIgnore]
+    public IConnectionProfile Profile
+    {
+        get;
+        set;
+    }
+
+    /// <summary>
+    /// Gets or sets the connection profile identifier.
+    /// </summary>
+    /// <value>The identifier of the connection profile.</value>
+    public int ProfileId
+    {
+        get
+        {
+            return this.Profile.Id;
+        }
+        set
+        {
+            Profile = ConnectionProfiles.GetProfile(value);
+        }
+    }
+
+    /// <summary>Gets or sets the type of the connection.</summary>
+    /// <value>The type of the connection.</value>
+    public HttpClientType Type
+    {
+        get;
+        set;
+    }
+
+    /// <summary>
+    /// Gets or sets the URL to the OpenHAB server.
+    /// </summary>
+    public string Url
+    {
+        get;
+        set;
+    }
+
+    /// <summary>
+    /// Gets or sets the username for the OpenHAB server connection.
+    /// </summary>
+    public string Username
+    {
+        get;
+        set;
+    }
+
+    /// <summary>
+    /// Gets or sets the password for the OpenHAB connection.
+    /// </summary>
+    public string Password
+    {
+        get;
+        set;
+    }
+
+    /// <summary>
+    ///  Gets or sets a value indicating whether the application will ignore the SSL certificate.
+    /// </summary>
+    public bool? WillIgnoreSSLCertificate
+    {
+        get;
+        set;
+    }
+
+    /// <summary>
+    ///  Gets or sets a value indicating whether the application will ignore the SSL hostname.
+    /// </summary>
+    public bool? WillIgnoreSSLHostname
+    {
+        get;
+        set;
+    }
+
+    /// <summary>
+    /// Gets or sets for openHAB MainUI URL.
+    /// </summary>
+    [JsonIgnore]
+    public string MainUIUrl
+    {
+        get
+        {
+            if (Profile is LocalConnectionProfile)
+            {
+                return Url;
+            }
+            else if (Profile is RemoteConnectionProfile)
+            {
+                return Url;
+            }
+            else if (Profile is CloudConnectionProfile)
+            {
+                return Profile.MainUIUrl;
+            }
+            else if (Profile is DefaultConnectionProfile)
+            {
+                return Profile.MainUIUrl;
+            }
+            else
+            {
+                return Url;
+            }
+        }
+    }
+}
diff --git a/src/openHAB.Core.Client/Connection/Models/ConnectionProfile.cs b/src/openHAB.Core.Client/Connection/Models/ConnectionProfile.cs
new file mode 100644
index 00000000..0416778e
--- /dev/null
+++ b/src/openHAB.Core.Client/Connection/Models/ConnectionProfile.cs
@@ -0,0 +1,28 @@
+using System;
+
+namespace openHAB.Core.Client.Connection.Models;
+
+/// <summary>Specifies the current connection profile.</summary>
+public class ConnectionProfile
+{
+    /// <summary>Gets or sets the connection name.</summary>
+    /// <value>The name.</value>
+    public string Name
+    {
+        get; set;
+    }
+
+    /// <summary>Gets or sets the URL.</summary>
+    /// <value>The URL.</value>
+    public Uri Url
+    {
+        get; set;
+    }
+
+    /// <summary>Gets or sets the type of the connection.</summary>
+    /// <value>The type of the connection.</value>
+    public ConnectionType ConnectionType
+    {
+        get; set;
+    }
+}
diff --git a/src/openHAB.Core.Client/Connection/Models/ConnectionProfiles.cs b/src/openHAB.Core.Client/Connection/Models/ConnectionProfiles.cs
new file mode 100644
index 00000000..295afa70
--- /dev/null
+++ b/src/openHAB.Core.Client/Connection/Models/ConnectionProfiles.cs
@@ -0,0 +1,37 @@
+using System.Collections.Generic;
+using openHAB.Core.Client.Connection.Contracts;
+
+namespace openHAB.Core.Client.Connection.Models;
+
+/// <summary>
+/// Manages connection profiles.
+/// </summary>
+public class ConnectionProfiles
+{
+    private static readonly Dictionary<int, IConnectionProfile> _profiles = new Dictionary<int, IConnectionProfile>()
+        {
+            { 1, new DefaultConnectionProfile() },
+            { 2, new LocalConnectionProfile() },
+            { 3, new RemoteConnectionProfile() },
+            { 4, new CloudConnectionProfile() }
+        };
+
+    /// <summary>
+    /// Gets the connection profile by the specified identifier.
+    /// </summary>
+    /// <param name="id">The identifier of the connection profile.</param>
+    /// <returns>The connection profile associated with the specified identifier.</returns>
+    public static IConnectionProfile GetProfile(int id)
+    {
+        return _profiles[id];
+    }
+
+    /// <summary>
+    /// Gets all connection profiles.
+    /// </summary>
+    /// <returns>A list of all connection profiles.</returns>
+    public static List<IConnectionProfile> GetProfiles()
+    {
+        return new List<IConnectionProfile>(_profiles.Values);
+    }
+}
diff --git a/src/openHAB.Core.Client/Connection/Models/ConnectionState.cs b/src/openHAB.Core.Client/Connection/Models/ConnectionState.cs
new file mode 100644
index 00000000..34c80453
--- /dev/null
+++ b/src/openHAB.Core.Client/Connection/Models/ConnectionState.cs
@@ -0,0 +1,22 @@
+namespace openHAB.Core.Client.Connection.Models;
+
+/// <summary>
+/// Reflects the State for an connection.
+/// </summary>
+public enum ConnectionState
+{
+    /// <summary>
+    /// OpenHAB instance is reachable via url
+    /// </summary>
+    OK,
+
+    /// <summary>
+    /// OpenHAB instance can not reach via check url
+    /// </summary>
+    Failed,
+
+    /// <summary>
+    /// State is unknown
+    /// </summary>
+    Unknown,
+}
diff --git a/src/openHAB.Core.Client/Connection/Models/ConnectionType.cs b/src/openHAB.Core.Client/Connection/Models/ConnectionType.cs
new file mode 100644
index 00000000..b8c051f2
--- /dev/null
+++ b/src/openHAB.Core.Client/Connection/Models/ConnectionType.cs
@@ -0,0 +1,11 @@
+namespace openHAB.Core.Client.Connection.Models;
+
+/// <summary>Defines connection types for OpenHAB instance.</summary>
+public enum ConnectionType
+{
+    /// <summary> Local connection to OpenHAB instance.</summary>
+    Local = 0,
+
+    /// <summary>  Remote connection to OpenHAB instance.</summary>
+    Remote = 1,
+}
diff --git a/src/openHAB.Core.Client/Connection/Models/DefaultConnectionProfile.cs b/src/openHAB.Core.Client/Connection/Models/DefaultConnectionProfile.cs
new file mode 100644
index 00000000..8f2af68a
--- /dev/null
+++ b/src/openHAB.Core.Client/Connection/Models/DefaultConnectionProfile.cs
@@ -0,0 +1,63 @@
+using openHAB.Common;
+using openHAB.Core.Client.Connection.Contracts;
+
+namespace openHAB.Core.Client.Connection.Models;
+
+/// <summary>Connection profile for local default connection to OpenHab server.</summary>
+/// <seealso cref="IConnectionProfile" />
+public class DefaultConnectionProfile : IConnectionProfile
+{
+    /// <inheritdoc/>
+    public bool AllowHostUrlConfiguration
+    {
+        get => false;
+    }
+
+    /// <inheritdoc/>
+    public bool AllowIgnoreSSLCertificate
+    {
+        get => true;
+    }
+
+    /// <inheritdoc/>
+    public bool AllowIgnoreSSLHostname
+    {
+        get => true;
+    }
+
+    /// <inheritdoc/>
+    public int Id
+    {
+        get => 1;
+    }
+
+    /// <inheritdoc/>
+    public string Name
+    {
+        get => AppResources.Values.GetString("LocalDefaultConnection");
+    }
+
+    /// <inheritdoc/>
+    public HttpClientType Type
+    {
+        get => HttpClientType.Local;
+    }
+
+    /// <inheritdoc/>
+    public string Url => "https://openhab:8443";
+
+    /// <inheritdoc/>
+    public string MainUIUrl => Url;
+
+    /// <inheritdoc/>
+    public Connection CreateConnection()
+    {
+        return new Connection()
+        {
+            Url = Url,
+            Type = Type,
+            WillIgnoreSSLCertificate = true,
+            WillIgnoreSSLHostname = true,
+        };
+    }
+}
diff --git a/src/openHAB.Core.Client/Connection/Models/DemoConnectionProfile.cs b/src/openHAB.Core.Client/Connection/Models/DemoConnectionProfile.cs
new file mode 100644
index 00000000..40aee30b
--- /dev/null
+++ b/src/openHAB.Core.Client/Connection/Models/DemoConnectionProfile.cs
@@ -0,0 +1,63 @@
+using openHAB.Common;
+using openHAB.Core.Client.Connection.Contracts;
+
+namespace openHAB.Core.Client.Connection.Models;
+
+/// <summary>Connection profile for for local custom connection to OpenHab server.</summary>
+/// <seealso cref="IConnectionProfile" />
+public class DemoConnectionProfile : IConnectionProfile
+{
+    /// <inheritdoc/>
+    public bool AllowHostUrlConfiguration
+    {
+        get => false;
+    }
+
+    /// <inheritdoc/>
+    public bool AllowIgnoreSSLCertificate
+    {
+        get => false;
+    }
+
+    /// <inheritdoc/>
+    public bool AllowIgnoreSSLHostname
+    {
+        get => false;
+    }
+
+    /// <inheritdoc/>
+    public int Id
+    {
+        get => 4;
+    }
+
+    /// <inheritdoc/>
+    public string Name
+    {
+        get => AppResources.Values.GetString("DemoConnection");
+    }
+
+    /// <inheritdoc/>
+    public HttpClientType Type
+    {
+        get => HttpClientType.Remote;
+    }
+
+    /// <inheritdoc/>
+    public string MainUIUrl => Url;
+
+    /// <inheritdoc/>
+    public string Url => Constants.API.DemoModeUrl;
+
+    /// <inheritdoc/>
+    public Connection CreateConnection()
+    {
+        return new Connection()
+        {
+            Type = HttpClientType.Remote,
+            Url = Url,
+            Username = Constants.API.DemoModeUser,
+            Password = Constants.API.DemoModeUserPwd
+        };
+    }
+}
diff --git a/src/openHAB.Core.Client/Connection/Models/HttpClientType.cs b/src/openHAB.Core.Client/Connection/Models/HttpClientType.cs
new file mode 100644
index 00000000..330d889b
--- /dev/null
+++ b/src/openHAB.Core.Client/Connection/Models/HttpClientType.cs
@@ -0,0 +1,17 @@
+namespace openHAB.Core.Client.Connection.Models;
+
+/// <summary>
+/// Defines the connection type to a local or remote openHAB instance.
+/// </summary>
+public enum HttpClientType
+{
+    /// <summary>
+    /// Local openHab http connection.
+    /// </summary>
+    Local,
+
+    /// <summary>
+    /// Remote openHab http connection.
+    /// </summary>
+    Remote,
+}
diff --git a/src/openHAB.Core.Client/Connection/Models/LocalConnectionProfile.cs b/src/openHAB.Core.Client/Connection/Models/LocalConnectionProfile.cs
new file mode 100644
index 00000000..27374c58
--- /dev/null
+++ b/src/openHAB.Core.Client/Connection/Models/LocalConnectionProfile.cs
@@ -0,0 +1,59 @@
+using openHAB.Common;
+using openHAB.Core.Client.Connection.Contracts;
+
+namespace openHAB.Core.Client.Connection.Models;
+
+/// <summary>Connection profile for local custom connection to OpenHab server.</summary>
+/// <seealso cref="IConnectionProfile" />
+public class LocalConnectionProfile : IConnectionProfile
+{
+    /// <inheritdoc/>
+    public bool AllowHostUrlConfiguration
+    {
+        get => true;
+    }
+
+    /// <inheritdoc/>
+    public bool AllowIgnoreSSLCertificate
+    {
+        get => true;
+    }
+
+    /// <inheritdoc/>
+    public bool AllowIgnoreSSLHostname
+    {
+        get => true;
+    }
+
+    /// <summary>Gets the connection profile îd.</summary>
+    /// <value>The îd.</value>
+    public int Id
+    {
+        get => 2;
+    }
+
+    /// <inheritdoc/>
+    public string Name
+    {
+        get => AppResources.Values.GetString("LocalCustomConnection");
+    }
+
+    /// <inheritdoc/>
+    public HttpClientType Type
+    {
+        get => HttpClientType.Local;
+    }
+
+    public string MainUIUrl => null;
+
+    public string Url => null;
+
+    /// <inheritdoc/>
+    public Connection CreateConnection()
+    {
+        return new Connection()
+        {
+            Type = HttpClientType.Local,
+        };
+    }
+}
diff --git a/src/openHAB.Core.Client/Connection/Models/RemoteConnectionProfile.cs b/src/openHAB.Core.Client/Connection/Models/RemoteConnectionProfile.cs
new file mode 100644
index 00000000..aab9b469
--- /dev/null
+++ b/src/openHAB.Core.Client/Connection/Models/RemoteConnectionProfile.cs
@@ -0,0 +1,60 @@
+using openHAB.Common;
+using openHAB.Core.Client.Connection.Contracts;
+
+namespace openHAB.Core.Client.Connection.Models;
+
+/// <summary>Connection profile for for local custom connection to OpenHab server.</summary>
+/// <seealso cref="IConnectionProfile" />
+public class RemoteConnectionProfile : IConnectionProfile
+{
+    /// <inheritdoc/>
+    public bool AllowHostUrlConfiguration
+    {
+        get => true;
+    }
+
+    /// <inheritdoc/>
+    public bool AllowIgnoreSSLCertificate
+    {
+        get => true;
+    }
+
+    /// <inheritdoc/>
+    public bool AllowIgnoreSSLHostname
+    {
+        get => true;
+    }
+
+    /// <inheritdoc/>
+    public int Id
+    {
+        get => 3;
+    }
+
+    /// <inheritdoc/>
+    public string Name
+    {
+        get => AppResources.Values.GetString("RemoteCustomConnection");
+    }
+
+    /// <inheritdoc/>
+    public HttpClientType Type
+    {
+        get => HttpClientType.Remote;
+    }
+
+    /// <inheritdoc/>
+    public string MainUIUrl => "https://home.myopenhab.org/";
+
+    /// <inheritdoc/>
+    public string Url => null;
+
+    /// <inheritdoc/>
+    public Connection CreateConnection()
+    {
+        return new Connection()
+        {
+            Type = HttpClientType.Remote,
+        };
+    }
+}
diff --git a/src/openHAB.Core.Client/Constants.cs b/src/openHAB.Core.Client/Constants.cs
new file mode 100644
index 00000000..30bcef59
--- /dev/null
+++ b/src/openHAB.Core.Client/Constants.cs
@@ -0,0 +1,48 @@
+namespace openHAB.Core.Client;
+
+/// <summary>
+/// A class that holds all the constants for the app.
+/// </summary>
+public sealed class Constants
+{
+    /// <summary>
+    /// Holds the constants used in server calls.
+    /// </summary>
+    public sealed class API
+    {
+        /// <summary>
+        /// Url used for Demo mode.
+        /// </summary>
+        public const string DemoModeUrl = "https://demo.openhab.org/";
+
+        /// <summary>
+        /// Username for demo system.
+        /// </summary>
+        public const string DemoModeUser = "demo";
+
+        /// <summary>
+        /// User password for demo system.
+        /// </summary>
+        public const string DemoModeUserPwd = "demo";
+
+        /// <summary>
+        /// The call to get information about OpenHAB instance.
+        /// </summary>
+        public const string ServerInformation = "rest/";
+
+        /// <summary>
+        /// The call to fetch the sitemaps.
+        /// </summary>
+        public const string Sitemaps = "rest/sitemaps";
+
+        /// <summary>
+        /// The call to get an event-stream.
+        /// </summary>
+        public const string Events = "rest/events";
+
+        /// <summary>
+        /// The call to get items.
+        /// </summary>
+        public const string Items = "rest/items";
+    }
+}
diff --git a/src/openHAB.Core.Client/Contracts/IOpenHABClient.cs b/src/openHAB.Core.Client/Contracts/IOpenHABClient.cs
new file mode 100644
index 00000000..5b582c80
--- /dev/null
+++ b/src/openHAB.Core.Client/Contracts/IOpenHABClient.cs
@@ -0,0 +1,64 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using openHAB.Core.Client.Common;
+using openHAB.Core.Client.Models;
+
+namespace openHAB.Core.Client.Contracts;
+
+/// <summary>
+/// The main SDK interface to OpenHAB.
+/// </summary>
+public interface IOpenHABClient
+{
+    /// <summary>
+    /// Gets information about the openHAB server.
+    /// </summary>
+    /// <returns>Server information about openHAB instance.</returns>
+    Task<HttpResponseResult<ServerInfo>> GetOpenHABServerInfo();
+
+    /// <summary>
+    /// Gets the openHAB item by name from Server.
+    /// </summary>
+    /// <param name="itemName">Name of the item.</param>
+    /// <returns>openHab item object. </returns>
+    Task<Item> GetItemByName(string itemName);
+
+    /// <summary>
+    /// Loads all the sitemaps.
+    /// </summary>
+    /// <param name="version">The version of OpenHAB running on the server.</param>
+    /// <param name="filters">Filters for sitemap list.</param>
+    /// <returns>A list of sitemaps.</returns>
+    Task<ICollection<Sitemap>> LoadSitemaps(OpenHABVersion version, List<Func<Sitemap, bool>> filters);
+
+
+    /// <summary>Loads the items from sitemap.</summary>
+    /// <param name="sitemapLink">The sitemap link.</param>
+    /// <param name="version">The openHab server version.</param>
+    /// <returns>Returns loaded sitemap</returns>
+    Task<ICollection<Widget>> LoadItemsFromSitemap(string sitemapLink, OpenHABVersion version);
+
+    /// <summary>
+    /// Sends a command to an item.
+    /// </summary>
+    /// <param name="item">The item.</param>
+    /// <param name="command">The Command.</param>
+    /// <returns>Operation result if the command was successful or not.</returns>
+    Task<HttpResponseResult<bool>> SendCommand(Item item, string command);
+
+    /// <summary>
+    /// Reset the connection to the OpenHAB server after changing the settings in the App.
+    /// </summary>
+    /// <param name="localConnection">The local connection to reset.</param>
+    /// <param name="remoteConnection">The remote connection to reset.</param>
+    /// <param name="isRunningInDemoMode">Indicates whether the App is running in demo mode.</param>
+    /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
+    Task<bool> ResetConnection(Connection.Models.Connection localConnection, Connection.Models.Connection remoteConnection, bool? isRunningInDemoMode);
+
+    /// <summary>
+    /// Starts listening to server events.
+    /// </summary>
+    void StartItemUpdates(System.Threading.CancellationToken token);
+    Task<Sitemap> GetSitemap(string sitemapLink, OpenHABVersion version);
+}
diff --git a/src/openHAB.Core.Client/Event/Contracts/IOpenHABEventParser.cs b/src/openHAB.Core.Client/Event/Contracts/IOpenHABEventParser.cs
new file mode 100644
index 00000000..32310124
--- /dev/null
+++ b/src/openHAB.Core.Client/Event/Contracts/IOpenHABEventParser.cs
@@ -0,0 +1,12 @@
+namespace openHAB.Core.Client.Event.Contracts;
+
+/// <summary>openHAB event parser.</summary>
+public interface IOpenHABEventParser
+{
+    /// <summary>Parses the openHAB event message.</summary>
+    /// <param name="message">The message.</param>
+    /// <returns>
+    ///   openHAB event object <see cref="OpenHABEvent"/>.
+    /// </returns>
+    OpenHABEvent Parse(string message);
+}
diff --git a/src/openHAB.Core.Client/Event/EventStreamData.cs b/src/openHAB.Core.Client/Event/EventStreamData.cs
new file mode 100644
index 00000000..e23e8bca
--- /dev/null
+++ b/src/openHAB.Core.Client/Event/EventStreamData.cs
@@ -0,0 +1,31 @@
+namespace openHAB.Core.Client.Event;
+
+/// <summary>
+/// Data coming from the eventstream.
+/// </summary>
+public class EventStreamData
+{
+    /// <summary>
+    /// Gets or sets the topic on which the event was fired.
+    /// </summary>
+    public string Topic
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets the payload of the event.
+    /// </summary>
+    public string Payload
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets the type of event.
+    /// </summary>
+    public string Type
+    {
+        get; set;
+    }
+}
diff --git a/src/openHAB.Core.Client/Event/EventStreamPayload.cs b/src/openHAB.Core.Client/Event/EventStreamPayload.cs
new file mode 100644
index 00000000..8959aa19
--- /dev/null
+++ b/src/openHAB.Core.Client/Event/EventStreamPayload.cs
@@ -0,0 +1,39 @@
+namespace openHAB.Core.Client.Event;
+
+/// <summary>
+/// The payload coming from the event service.
+/// </summary>
+public class EventStreamPayload
+{
+    /// <summary>
+    /// Gets or sets the type of event.
+    /// </summary>
+    public string Type
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets the value of the event.
+    /// </summary>
+    public string Value
+    {
+        get; set;
+    }
+
+    /// <summary>Gets or sets the old type of the event.</summary>
+    /// <value>The old type.</value>
+    public string OldType
+    {
+        get;
+        set;
+    }
+
+    /// <summary>Gets or sets the old value of the event.</summary>
+    /// <value>The old value.</value>
+    public string OldValue
+    {
+        get;
+        set;
+    }
+}
diff --git a/src/openHAB.Core.Client/Event/OpenHABEvent.cs b/src/openHAB.Core.Client/Event/OpenHABEvent.cs
new file mode 100644
index 00000000..3190e4ef
--- /dev/null
+++ b/src/openHAB.Core.Client/Event/OpenHABEvent.cs
@@ -0,0 +1,61 @@
+namespace openHAB.Core.Client.Event;
+
+/// <summary>OpenHAB event.</summary>
+public class OpenHABEvent
+{
+    /// <summary>Gets the type of the event.</summary>
+    /// <value>The type of the event.</value>
+    public OpenHABEventType EventType
+    {
+        get;
+        set;
+    }
+
+    /// <summary>Gets or sets the name of the item.</summary>
+    /// <value>The name of the item.</value>
+    public string ItemName
+    {
+        get;
+        set;
+    }
+
+    /// <summary>Gets or sets the old type.</summary>
+    /// <value>The old type.</value>
+    public string OldType
+    {
+        get;
+        set;
+    }
+
+    /// <summary>Gets or sets the old value.</summary>
+    /// <value>The old value.</value>
+    public string OldValue
+    {
+        get;
+        set;
+    }
+
+    /// <summary>Gets or sets the topic.</summary>
+    /// <value>The topic.</value>
+    public string Topic
+    {
+        get;
+        set;
+    }
+
+    /// <summary>Gets or sets the value.</summary>
+    /// <value>The value.</value>
+    public string Value
+    {
+        get;
+        set;
+    }
+
+    /// <summary>Gets or sets the type of the value.</summary>
+    /// <value>The type of the value.</value>
+    public string ValueType
+    {
+        get;
+        set;
+    }
+}
diff --git a/src/openHAB.Core.Client/Event/OpenHABEventType.cs b/src/openHAB.Core.Client/Event/OpenHABEventType.cs
new file mode 100644
index 00000000..2e36192b
--- /dev/null
+++ b/src/openHAB.Core.Client/Event/OpenHABEventType.cs
@@ -0,0 +1,26 @@
+namespace openHAB.Core.Client.Event;
+
+/// <summary>openHAB event types.</summary>
+public enum OpenHABEventType
+{
+    /// <summary>Item state event.</summary>
+    ItemStateEvent = 0,
+
+    /// <summary>Thing updated event.</summary>
+    ThingUpdatedEvent = 1,
+
+    /// <summary>Rule status information event.</summary>
+    RuleStatusInfoEvent = 2,
+
+    /// <summary>Item state predicted event.</summary>
+    ItemStatePredictedEvent = 3,
+
+    /// <summary>Group item state changed event.</summary>
+    GroupItemStateChangedEvent = 4,
+
+    /// <summary>Item state changed event.</summary>
+    ItemStateChangedEvent = 5,
+
+    /// <summary>Unknown event.</summary>
+    Unknown = 6
+}
diff --git a/src/openHAB.Core.Client/Extensions/OpenHabHttpClientExtension.cs b/src/openHAB.Core.Client/Extensions/OpenHabHttpClientExtension.cs
new file mode 100644
index 00000000..82201cc6
--- /dev/null
+++ b/src/openHAB.Core.Client/Extensions/OpenHabHttpClientExtension.cs
@@ -0,0 +1,103 @@
+using System;
+using System.Net.Http;
+using System.Net.Http.Headers;
+using System.Net.Security;
+using System.Text;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
+using openHAB.Core.Client.Connection.Models;
+using openHAB.Core.Client.Options;
+
+namespace openHAB.Core.Client.Extensions;
+
+/// <summary>
+/// Provides extension methods for adding OpenHAB HTTP clients to the service collection.
+/// </summary>
+public static class OpenHabHttpClientExtension
+{
+    /// <summary>
+    /// Adds the OpenHAB HTTP clients to the specified service collection.
+    /// </summary>
+    /// <param name="services">The service collection to add the HTTP clients to.</param>
+    public static void AddOpenHabHttpClients(this IServiceCollection services)
+    {
+        AddHttpClient(services, "local", options => options.LocalConnection);
+        AddHttpClient(services, "remote", options => options.RemoteConnection);
+    }
+
+    private static void AddHttpClient(IServiceCollection services, string name, Func<ConnectionOptions, Connection.Models.Connection> getConnection)
+    {
+        services.AddHttpClient<OpenHABClient>(name, (sp, client) =>
+        {
+            var options = sp.GetRequiredService<IOptions<ConnectionOptions>>().Value;
+            Connection.Models.Connection connection = CreateConnection(getConnection, options);
+
+            ConfigureHttpClient(client, connection);
+        }).ConfigurePrimaryHttpMessageHandler(sp =>
+        {
+            var options = sp.GetRequiredService<IOptions<ConnectionOptions>>().Value;
+            Connection.Models.Connection connection = CreateConnection(getConnection, options);
+            return CreateHttpClientHandler(connection);
+        });
+    }
+
+    private static Connection.Models.Connection CreateConnection(Func<ConnectionOptions, Connection.Models.Connection> getConnection, ConnectionOptions options)
+    {
+        Connection.Models.Connection connection;
+        if (options.IsRunningInDemoMode.GetValueOrDefault())
+        {
+            connection = new DemoConnectionProfile().CreateConnection();
+        }
+        else
+        {
+            connection = getConnection(options);
+        }
+
+        return connection;
+    }
+
+    private static void ConfigureHttpClient(HttpClient client, Connection.Models.Connection connection)
+    {
+        client.BaseAddress = new Uri(connection.Url);
+
+        if (!string.IsNullOrEmpty(connection.Username) && !string.IsNullOrEmpty(connection.Password))
+        {
+            string basicCredentials = Convert.ToBase64String(Encoding.UTF8.GetBytes($"{connection.Username}:{connection.Password}"));
+            client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", basicCredentials);
+        }
+
+        //client.DefaultRequestHeaders.Add("Accept", "application/json");
+    }
+
+    private static HttpClientHandler CreateHttpClientHandler(Connection.Models.Connection connection)
+    {
+        return new HttpClientHandler
+        {
+            ServerCertificateCustomValidationCallback = (message, cert, chain, errors) =>
+            {
+                if (errors == SslPolicyErrors.None)
+                {
+                    return true;
+                }
+
+                bool result = true;
+                if (errors.HasFlag(SslPolicyErrors.RemoteCertificateChainErrors))
+                {
+                    result &= connection.WillIgnoreSSLCertificate.GetValueOrDefault();
+                }
+
+                if (errors.HasFlag(SslPolicyErrors.RemoteCertificateNameMismatch))
+                {
+                    result &= connection.WillIgnoreSSLHostname.GetValueOrDefault();
+                }
+
+                if (errors.HasFlag(SslPolicyErrors.RemoteCertificateNotAvailable))
+                {
+                    result = false;
+                }
+
+                return result;
+            }
+        };
+    }
+}
diff --git a/src/openHAB.Core.Client/Messages/ConnectionErrorMessage.cs b/src/openHAB.Core.Client/Messages/ConnectionErrorMessage.cs
new file mode 100644
index 00000000..92db2ccd
--- /dev/null
+++ b/src/openHAB.Core.Client/Messages/ConnectionErrorMessage.cs
@@ -0,0 +1,25 @@
+namespace openHAB.Core.Client.Messages;
+
+/// <summary>
+/// Triggers a visual error on a connection issue.
+/// </summary>
+public class ConnectionErrorMessage
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ConnectionErrorMessage"/> class.
+    /// </summary>
+    /// <param name="errorMessage">The error message.</param>
+    public ConnectionErrorMessage(string errorMessage)
+    {
+        ErrorMessage = errorMessage;
+    }
+
+    /// <summary>
+    /// Gets or sets the error text.
+    /// </summary>
+    /// <value>The text.</value>
+    public string ErrorMessage
+    {
+        get; set;
+    }
+}
diff --git a/src/openHAB.Core.Client/Messages/ItemStateChangedMessage.cs b/src/openHAB.Core.Client/Messages/ItemStateChangedMessage.cs
new file mode 100644
index 00000000..ab2d66fe
--- /dev/null
+++ b/src/openHAB.Core.Client/Messages/ItemStateChangedMessage.cs
@@ -0,0 +1,45 @@
+namespace openHAB.Core.Client.Messages;
+
+/// <summary>
+/// A message to trigger an item update coming from a server event.
+/// </summary>
+public class ItemStateChangedMessage
+{
+    /// <summary>Initializes a new instance of the <see cref="ItemStateChangedMessage" /> class.</summary>
+    /// <param name="itemName">Name of the item.</param>
+    /// <param name="value">The value.</param>
+    /// <param name="oldValue">The old value.</param>
+    public ItemStateChangedMessage(string itemName, string value, string oldValue)
+    {
+        ItemName = itemName;
+        Value = value;
+        OldValue = oldValue;
+    }
+
+    /// <summary>
+    /// Gets or sets the name of the updated item.
+    /// </summary>
+    public string ItemName
+    {
+        get;
+        set;
+    }
+
+    /// <summary>
+    /// Gets or sets the old item value.
+    /// </summary>
+    public string OldValue
+    {
+        get;
+        set;
+    }
+
+    /// <summary>
+    /// Gets or sets the updated value.
+    /// </summary>
+    public string Value
+    {
+        get;
+        set;
+    }
+}
diff --git a/src/openHAB.Core.Client/Messages/TriggerCommandMessage.cs b/src/openHAB.Core.Client/Messages/TriggerCommandMessage.cs
new file mode 100644
index 00000000..292ab820
--- /dev/null
+++ b/src/openHAB.Core.Client/Messages/TriggerCommandMessage.cs
@@ -0,0 +1,48 @@
+using System;
+using openHAB.Core.Client.Models;
+
+namespace openHAB.Core.Client.Messages;
+
+/// <summary>
+/// Message that gets fired whenever a widget triggers a command.
+/// </summary>
+public class TriggerCommandMessage
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TriggerCommandMessage"/> class.
+    /// </summary>
+    /// <param name="item">The OpenHAB item that triggered the command.</param>
+    /// <param name="command">The command that was triggered.</param>
+    public TriggerCommandMessage(Item item, string command)
+    {
+        Id = Guid.NewGuid();
+        Item = item;
+        Command = command;
+    }
+
+    /// <summary>
+    /// Gets or sets the Command that was triggered.
+    /// </summary>
+    public string Command
+    {
+        get;
+        set;
+    }
+
+    /// <summary>Gets the unique message identifier.</summary>
+    /// <value>The identifier.</value>
+    public Guid Id
+    {
+        get;
+        private set;
+    }
+
+    /// <summary>
+    /// Gets or sets the OpenHAB item that triggered the command.
+    /// </summary>
+    public Item Item
+    {
+        get;
+        set;
+    }
+}
diff --git a/src/openHAB.Core.Client/Messages/UpdateItemMessage.cs b/src/openHAB.Core.Client/Messages/UpdateItemMessage.cs
new file mode 100644
index 00000000..29f5bfe6
--- /dev/null
+++ b/src/openHAB.Core.Client/Messages/UpdateItemMessage.cs
@@ -0,0 +1,33 @@
+namespace openHAB.Core.Client.Messages;
+
+/// <summary>
+/// A message to trigger an item update coming from a server event.
+/// </summary>
+public class UpdateItemMessage
+{
+    /// <summary>Initializes a new instance of the <see cref="UpdateItemMessage" /> class.</summary>
+    /// <param name="itemName">Name of the item.</param>
+    /// <param name="value">The value.</param>
+    public UpdateItemMessage(string itemName, string value)
+    {
+        ItemName = itemName;
+        Value = value;
+    }
+
+    /// <summary>
+    /// Gets or sets the name of the updated item.
+    /// </summary>
+    public string ItemName
+    {
+        get;
+        set;
+    }
+
+    /// <summary>
+    /// Gets or sets the updated value.
+    /// </summary>
+    public string Value
+    {
+        get; set;
+    }
+}
diff --git a/src/openHAB.Core.Client/Models/APIInfo.cs b/src/openHAB.Core.Client/Models/APIInfo.cs
new file mode 100644
index 00000000..c35666ab
--- /dev/null
+++ b/src/openHAB.Core.Client/Models/APIInfo.cs
@@ -0,0 +1,50 @@
+using System.Collections.Generic;
+using System.Text.Json.Serialization;
+
+namespace openHAB.Core.Client.Models;
+
+/// <summary>
+/// Response for REST Root call, which provides all information about openHAB instance.
+/// </summary>
+public class APIInfo
+{
+    /// <summary>Gets or sets the version.</summary>
+    /// <value>The version.</value>
+    [JsonPropertyName("version")]
+    public string Version
+    {
+        get; set;
+    }
+
+    /// <summary>Gets or sets the locale.</summary>
+    /// <value>The locale.</value>
+    [JsonPropertyName("locale")]
+    public string Locale
+    {
+        get; set;
+    }
+
+    /// <summary>Gets or sets the measurement system.</summary>
+    /// <value>The measurement system.</value>
+    [JsonPropertyName("measurementSystem")]
+    public string MeasurementSystem
+    {
+        get; set;
+    }
+
+    /// <summary>Gets or sets the runtime information.</summary>
+    /// <value>The runtime information.</value>
+    [JsonPropertyName("runtimeInfo")]
+    public RuntimeInfo RuntimeInfo
+    {
+        get; set;
+    }
+
+    /// <summary>Gets or sets the links.</summary>
+    /// <value>The links.</value>
+    [JsonPropertyName("links")]
+    public List<Link> Links
+    {
+        get; set;
+    }
+}
diff --git a/src/openHAB.Core.Client/Models/CommandDescription.cs b/src/openHAB.Core.Client/Models/CommandDescription.cs
new file mode 100644
index 00000000..a7b3493c
--- /dev/null
+++ b/src/openHAB.Core.Client/Models/CommandDescription.cs
@@ -0,0 +1,24 @@
+using System.Collections.Generic;
+
+namespace openHAB.Core.Client.Models;
+
+/// <summary>
+/// A mapping for an OpenHAB Widget.
+/// </summary>
+public class CommandDescription
+{
+    /// <summary>
+    /// Gets or sets the CommandOptions.
+    /// </summary>
+    public ICollection<CommandOptions> CommandOptions
+    {
+        get; set;
+    }
+
+    /// <summary>Initializes a new instance of the <see cref="CommandDescription" /> class.</summary>
+    /// <param name="commandOptions">The command options.</param>
+    public CommandDescription(ICollection<CommandOptions> commandOptions)
+    {
+        CommandOptions = commandOptions;
+    }
+}
diff --git a/src/openHAB.Core.Client/Models/CommandOptions.cs b/src/openHAB.Core.Client/Models/CommandOptions.cs
new file mode 100644
index 00000000..b801fca4
--- /dev/null
+++ b/src/openHAB.Core.Client/Models/CommandOptions.cs
@@ -0,0 +1,34 @@
+namespace openHAB.Core.Client.Models;
+
+/// <summary>
+/// A CommandOptions for commandDescription.
+/// </summary>
+public class CommandOptions
+{
+    /// <summary>
+    /// Gets or sets the Command of the mapping.
+    /// </summary>
+    public string Command
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets the Label of the mapping.
+    /// </summary>
+    public string Label
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="CommandOptions"/> class.
+    /// </summary>
+    /// <param name="command">A command.</param>
+    /// <param name="label">A label.</param>
+    public CommandOptions(string command, string label)
+    {
+        Command = command;
+        Label = label;
+    }
+}
diff --git a/src/openHAB.Core.Client/Models/Item.cs b/src/openHAB.Core.Client/Models/Item.cs
new file mode 100644
index 00000000..bd09ade9
--- /dev/null
+++ b/src/openHAB.Core.Client/Models/Item.cs
@@ -0,0 +1,261 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.Text.RegularExpressions;
+using System.Xml.Linq;
+using CommunityToolkit.Mvvm.ComponentModel;
+using CommunityToolkit.Mvvm.Messaging;
+using openHAB.Core.Client.Messages;
+
+namespace openHAB.Core.Client.Models;
+
+/// <summary>
+/// A class that represents an OpenHAB item.
+/// </summary>
+public class Item : ObservableObject
+{
+    private string _state;
+    private string _type;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="Item"/> class.
+    /// </summary>
+    public Item()
+    {
+        StrongReferenceMessenger.Default.Register<UpdateItemMessage>(this, HandleUpdateItemMessage);
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="Item"/> class.
+    /// </summary>
+    /// <param name="startNode">The XML from the OpenHAB server that represents this OpenHAB item.</param>
+    public Item(XElement startNode)
+    {
+        ParseNode(startNode);
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="Item"/> class.
+    /// </summary>
+    /// <param name="jsonObject">The JSON from the OpenHAB server that represents this OpenHAB item.</param>
+    public Item(string jsonObject)
+    {
+        Item item = JsonSerializer.Deserialize<Item>(jsonObject);
+        Name = item.Name;
+        Type = item.Type;
+        GroupType = item.GroupType;
+        State = item.State;
+        Link = item.Link;
+        CommandDescription = item.CommandDescription;
+    }
+
+    /// <summary>
+    /// Gets or sets the item category.
+    /// </summary>
+    /// <value>The category.</value>
+    [JsonPropertyName("category")]
+    public string Category
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets the CommandDescription of the OpenHAB item.
+    /// </summary>
+    [JsonPropertyName("commandDescription")]
+    public CommandDescription CommandDescription
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether the item is editable.
+    /// </summary>
+    [JsonPropertyName("editable")]
+    public bool Editable
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets the group names of the OpenHAB item.
+    /// </summary>
+    [JsonPropertyName("groupNames")]
+    public List<string> GroupNames
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets the grouptype of the OpenHAB item.
+    /// </summary>
+    public string GroupType
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets the item label with the display name.
+    /// </summary>
+    /// <value>The item label.</value>
+    [JsonPropertyName("label")]
+    public string Label
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets the unit of the OpenHAB item.
+    /// </summary>
+    [JsonPropertyName("link")]
+    public string Link
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets the metadata of the OpenHAB item.
+    /// </summary>
+    [JsonPropertyName("metadata")]
+    public Metadata Metadata
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets the name of the OpenHAB item.
+    /// </summary>
+    [JsonPropertyName("name")]
+    public string Name
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets the state of the OpenHAB item.
+    /// </summary>
+    [JsonPropertyName("state")]
+    public string State
+    {
+        get => _state;
+        set
+        {
+            if (_type != null && Unit == null && _type.Contains(":", StringComparison.OrdinalIgnoreCase) && value != null && value.Contains(" "))
+            {
+                int spaceIndex = value.LastIndexOf(' ');
+                Unit = value.Substring(spaceIndex, value.Length - spaceIndex);
+            }
+
+            SetProperty(ref _state, value);
+        }
+    }
+
+    [JsonPropertyName("stateDescription")]
+    public StateDescription StateDescription
+    {
+        get; set;
+    }
+
+    [JsonPropertyName("tags")]
+    public List<string> Tags
+    {
+        get; set;
+    }
+
+    [JsonPropertyName("transformedState")]
+    public string TransformedState
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets the type of the OpenHAB item.
+    /// </summary>
+    [JsonPropertyName("type")]
+    public string Type
+    {
+        get => _type;
+        set
+        {
+            if (value != null && value.Contains(":", StringComparison.OrdinalIgnoreCase) && _state != null)
+            {
+                int spaceIndex = _state.LastIndexOf(' ');
+                if (spaceIndex > 0)
+                {
+                    Unit = _state.Substring(spaceIndex, _state.Length - spaceIndex);
+                }
+            }
+
+            SetProperty(ref _type, value);
+        }
+    }
+
+    /// <summary>
+    /// Gets or sets the link of the OpenHAB item.
+    /// </summary>
+    public string Unit
+    {
+        get; set;
+    }
+
+    [JsonPropertyName("unitSymbol")]
+    public string UnitSymbol
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Convert state to double value.
+    /// </summary>
+    /// <returns>
+    /// State as double value.
+    /// </returns>
+    public double GetStateAsDoubleValue()
+    {
+        string newstate = Regex.Replace(_state, "[^0-9,.]", string.Empty, RegexOptions.None, TimeSpan.FromMilliseconds(100));
+        double value = 0;
+        double.TryParse(newstate, NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out value);
+
+        return value;
+    }
+
+    /// <summary>
+    /// Send update message to all subscribers.
+    /// </summary>
+    /// <param name="value">The value.</param>
+    public void UpdateValue(object value)
+    {
+        if (value != null)
+        {
+            string newValue = value.ToString() + Unit;
+            StrongReferenceMessenger.Default.Send(new TriggerCommandMessage(this, newValue));
+            _state = newValue;
+        }
+    }
+
+    private async void HandleUpdateItemMessage(object recipient, UpdateItemMessage message)
+    {
+        if (message.ItemName != Name)
+        {
+            return;
+        }
+
+        State = message.Value;
+    }
+
+    private void ParseNode(XElement startNode)
+    {
+        if (!startNode.HasElements)
+        {
+            return;
+        }
+
+        Name = startNode.Element("name")?.Value;
+        Type = startNode.Element("type")?.Value;
+        GroupType = startNode.Element("groupType")?.Value;
+        State = startNode.Element("state")?.Value;
+        Link = startNode.Element("link")?.Value;
+    }
+}
diff --git a/src/openHAB.Core.Client/Models/Link.cs b/src/openHAB.Core.Client/Models/Link.cs
new file mode 100644
index 00000000..b39f526f
--- /dev/null
+++ b/src/openHAB.Core.Client/Models/Link.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Text.Json.Serialization;
+
+namespace openHAB.Core.Client.Models;
+
+/// <summary>Use to serialize api information from openHAB server.</summary>
+public partial class Link
+{
+    /// <summary>Gets or sets the type.</summary>
+    /// <value>The type.</value>
+    [JsonPropertyName("type")]
+    public string Type
+    {
+        get; set;
+    }
+
+    /// <summary>Gets or sets the URL.</summary>
+    /// <value>The URL.</value>
+    [JsonPropertyName("url")]
+    public Uri Url
+    {
+        get; set;
+    }
+}
diff --git a/src/openHAB.Core.Client/Models/Metadata.cs b/src/openHAB.Core.Client/Models/Metadata.cs
new file mode 100644
index 00000000..1ecba4e5
--- /dev/null
+++ b/src/openHAB.Core.Client/Models/Metadata.cs
@@ -0,0 +1,36 @@
+using System.Text.Json.Serialization;
+
+namespace openHAB.Core.Client.Models;
+
+/// <summary>
+/// Represents the metadata for an object.
+/// </summary>
+public class Metadata
+{
+    /// <summary>
+    /// Gets or sets the value of additional property 1.
+    /// </summary>
+    [JsonPropertyName("additionalProp1")]
+    public object AdditionalProp1
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets the value of additional property 2.
+    /// </summary>
+    [JsonPropertyName("additionalProp2")]
+    public object AdditionalProp2
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets the value of additional property 3.
+    /// </summary>
+    [JsonPropertyName("additionalProp3")]
+    public object AdditionalProp3
+    {
+        get; set;
+    }
+}
diff --git a/src/openHAB.Core.Client/Models/OpenHABException.cs b/src/openHAB.Core.Client/Models/OpenHABException.cs
new file mode 100644
index 00000000..f67e36bd
--- /dev/null
+++ b/src/openHAB.Core.Client/Models/OpenHABException.cs
@@ -0,0 +1,35 @@
+using System;
+
+namespace openHAB.Core.Client.Models;
+
+/// <summary>
+/// An Exception class used to throw unexpected errors.
+/// </summary>
+public class OpenHABException : Exception
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="OpenHABException"/> class.
+    /// </summary>
+    /// <param name="message">The error message.</param>
+    public OpenHABException(string message)
+        : base(message)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="OpenHABException"/> class.
+    /// </summary>
+    /// <param name="message">The error message.</param>
+    /// <param name="exception">The original exception.</param>
+    public OpenHABException(string message, Exception exception)
+        : base(message, exception)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="OpenHABException"/> class.
+    /// </summary>
+    public OpenHABException()
+    {
+    }
+}
diff --git a/src/openHAB.Core.Client/Models/OpenHabVersion.cs b/src/openHAB.Core.Client/Models/OpenHabVersion.cs
new file mode 100644
index 00000000..011fcea3
--- /dev/null
+++ b/src/openHAB.Core.Client/Models/OpenHabVersion.cs
@@ -0,0 +1,32 @@
+namespace openHAB.Core.Client.Models;
+
+/// <summary>
+/// Enum to differentiate between OpenHAB 1, 2 and 3.
+/// </summary>
+public enum OpenHABVersion
+{
+    /// <summary>
+    /// OpenHAB V1
+    /// </summary>
+    One = 1,
+
+    /// <summary>
+    /// OpenHAB V2
+    /// </summary>
+    Two = 2,
+
+    /// <summary>
+    /// OpenHAB V3
+    /// </summary>
+    Three = 3,
+
+    /// <summary>
+    /// OpenHAB V4
+    /// </summary>
+    Four = 4,
+
+    /// <summary>
+    /// Used when no connection is available
+    /// </summary>
+    None,
+}
diff --git a/src/openHAB.Core.Client/Models/Option.cs b/src/openHAB.Core.Client/Models/Option.cs
new file mode 100644
index 00000000..3708d35e
--- /dev/null
+++ b/src/openHAB.Core.Client/Models/Option.cs
@@ -0,0 +1,27 @@
+using System.Text.Json.Serialization;
+
+namespace openHAB.Core.Client.Models;
+
+/// <summary>
+/// Represents an option with a value and label.
+/// </summary>
+public class Option
+{
+    /// <summary>
+    /// Gets or sets the value of the option.
+    /// </summary>
+    [JsonPropertyName("value")]
+    public string Value
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets the label of the option.
+    /// </summary>
+    [JsonPropertyName("label")]
+    public string Label
+    {
+        get; set;
+    }
+}
diff --git a/src/openHAB.Core.Client/Models/Page.cs b/src/openHAB.Core.Client/Models/Page.cs
new file mode 100644
index 00000000..363686c5
--- /dev/null
+++ b/src/openHAB.Core.Client/Models/Page.cs
@@ -0,0 +1,82 @@
+using System.Collections.Generic;
+using System.Text.Json.Serialization;
+
+namespace openHAB.Core.Client.Models;
+
+/// <summary>
+/// Represents a page in the openHAB application.
+/// </summary>
+public class Page
+{
+    /// <summary>
+    /// Gets or sets the ID of the page.
+    /// </summary>
+    [JsonPropertyName("id")]
+    public string Id
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets the title of the page.
+    /// </summary>
+    [JsonPropertyName("title")]
+    public string Title
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets the icon of the page.
+    /// </summary>
+    [JsonPropertyName("icon")]
+    public string Icon
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets the link of the page.
+    /// </summary>
+    [JsonPropertyName("link")]
+    public string Link
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets the parent page ID.
+    /// </summary>
+    [JsonPropertyName("parent")]
+    public string Parent
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether the page is a leaf page.
+    /// </summary>
+    [JsonPropertyName("leaf")]
+    public bool Leaf
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether the page has a timeout.
+    /// </summary>
+    [JsonPropertyName("timeout")]
+    public bool Timeout
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets the list of widgets on the page.
+    /// </summary>
+    [JsonPropertyName("widgets")]
+    public List<Widget> Widgets
+    {
+        get; set;
+    }
+}
diff --git a/src/openHAB.Core.Client/Models/RuntimeInfo.cs b/src/openHAB.Core.Client/Models/RuntimeInfo.cs
new file mode 100644
index 00000000..6c277721
--- /dev/null
+++ b/src/openHAB.Core.Client/Models/RuntimeInfo.cs
@@ -0,0 +1,25 @@
+
+
+using System.Text.Json.Serialization;
+
+namespace openHAB.Core.Client.Models;
+
+/// <summary>Used to serialize the service information from openHAB server.</summary>
+public partial class RuntimeInfo
+{
+    /// <summary>Gets or sets the server version.</summary>
+    /// <value>The version.</value>
+    [JsonPropertyName("version")]
+    public string Version
+    {
+        get; set;
+    }
+
+    /// <summary>Gets or sets the build version string.</summary>
+    /// <value>The build string.</value>
+    [JsonPropertyName("buildString")]
+    public string BuildString
+    {
+        get; set;
+    }
+}
diff --git a/src/openHAB.Core.Client/Models/ServerInfo.cs b/src/openHAB.Core.Client/Models/ServerInfo.cs
new file mode 100644
index 00000000..b71e8219
--- /dev/null
+++ b/src/openHAB.Core.Client/Models/ServerInfo.cs
@@ -0,0 +1,26 @@
+namespace openHAB.Core.Client.Models;
+
+/// <summary>Information about openHAB server.</summary>
+public class ServerInfo
+{
+    /// <summary>Gets the openHAB major version.</summary>
+    /// <value>The version.</value>
+    public OpenHABVersion Version
+    {
+        get; set;
+    }
+
+    /// <summary>Gets the build.</summary>
+    /// <value>The build.</value>
+    public string Build
+    {
+        get; set;
+    }
+
+    /// <summary>Gets the runtime version.</summary>
+    /// <value>The runtime version.</value>
+    public string RuntimeVersion
+    {
+        get; set;
+    }
+}
diff --git a/src/openHAB.Core.Client/Models/Sitemap.cs b/src/openHAB.Core.Client/Models/Sitemap.cs
new file mode 100644
index 00000000..2fc0c994
--- /dev/null
+++ b/src/openHAB.Core.Client/Models/Sitemap.cs
@@ -0,0 +1,55 @@
+using System.Text.Json.Serialization;
+
+namespace openHAB.Core.Client.Models;
+
+
+/// <summary>
+/// Represents an OpenHAB sitemap.
+/// </summary>
+public class Sitemap
+{
+    /// <summary>
+    /// Gets or sets the name of the sitemap.
+    /// </summary>
+    [JsonPropertyName("name")]
+    public string Name
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets the icon of the sitemap.
+    /// </summary>
+    [JsonPropertyName("icon")]
+    public string Icon
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets the label of the sitemap.
+    /// </summary>
+    [JsonPropertyName("label")]
+    public string Label
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets the link of the sitemap.
+    /// </summary>
+    [JsonPropertyName("link")]
+    public string Link
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets the homepage of the sitemap.
+    /// </summary>
+    [JsonPropertyName("homepage")]
+    public Page Homepage
+    {
+        get; set;
+    }
+}
diff --git a/src/openHAB.Core.Client/Models/StateDescription.cs b/src/openHAB.Core.Client/Models/StateDescription.cs
new file mode 100644
index 00000000..0a471161
--- /dev/null
+++ b/src/openHAB.Core.Client/Models/StateDescription.cs
@@ -0,0 +1,65 @@
+using System.Collections.Generic;
+using System.Text.Json.Serialization;
+
+namespace openHAB.Core.Client.Models;
+
+
+/// <summary>
+/// Represents the description of a state.
+/// </summary>
+public class StateDescription
+{
+    /// <summary>
+    /// Gets or sets the minimum value of the state.
+    /// </summary>
+    [JsonPropertyName("minimum")]
+    public float Minimum
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets the maximum value of the state.
+    /// </summary>
+    [JsonPropertyName("maximum")]
+    public float Maximum
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets the step value of the state.
+    /// </summary>
+    [JsonPropertyName("step")]
+    public float Step
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets the pattern of the state.
+    /// </summary>
+    [JsonPropertyName("pattern")]
+    public string Pattern
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether the state is read-only.
+    /// </summary>
+    [JsonPropertyName("readOnly")]
+    public bool ReadOnly
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets the list of options for the state.
+    /// </summary>
+    [JsonPropertyName("options")]
+    public List<Option> Options
+    {
+        get; set;
+    }
+}
diff --git a/src/openHAB.Core.Client/Models/Widget.cs b/src/openHAB.Core.Client/Models/Widget.cs
new file mode 100644
index 00000000..a2e57ad5
--- /dev/null
+++ b/src/openHAB.Core.Client/Models/Widget.cs
@@ -0,0 +1,358 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+using System.Text.Json.Serialization;
+
+namespace openHAB.Core.Client.Models;
+
+/// <summary>
+/// A class that represents an OpenHAB widget.
+/// </summary>
+public class Widget : INotifyPropertyChanged, IEquatable<Widget>
+{
+    private string _icon;
+    private string _label;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="Widget"/> class.
+    /// </summary>
+    public Widget()
+    {
+        Children = new List<Widget>();
+    }
+
+    /// <summary>Occurs when a property value changes.</summary>
+    /// <returns></returns>
+    public event PropertyChangedEventHandler PropertyChanged;
+
+    /// <summary>
+    /// Gets or sets the Children of the OpenHAB widget.
+    /// </summary>
+    [JsonPropertyName("widgets")]
+    public ICollection<Widget> Children
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets the Encoding of the OpenHAB widget.
+    /// </summary>
+    [JsonPropertyName("encoding")]
+    public string Encoding
+    {
+        get; set;
+    }
+
+    [JsonPropertyName("forceAsItem")]
+    public bool ForceAsItem
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets the Height of the OpenHAB widget.
+    /// </summary>
+    [JsonPropertyName("height")]
+    public int Height
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets the Icon of the OpenHAB widget.
+    /// </summary>
+    [JsonPropertyName("icon")]
+    public string Icon
+    {
+        get => _icon ?? string.Empty;
+        set => _icon = value;
+    }
+
+    /// <summary>
+    /// Gets or sets the IconColor of the OpenHAB widget.
+    /// </summary>
+    [JsonPropertyName("iconcolor")]
+    public string IconColor
+    {
+        get; set;
+    }
+
+    [JsonPropertyName("inputHint")]
+    public string InputHint
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets the Item of the OpenHAB widget.
+    /// </summary>
+    [JsonPropertyName("item")]
+    public Item Item
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets the Label of the OpenHAB widget.
+    /// </summary>
+    [JsonPropertyName("label")]
+    public string Label
+    {
+        get => _label;
+
+        set
+        {
+            if (string.IsNullOrEmpty(value.Trim()))
+            {
+                _label = value;
+                return;
+            }
+
+            var parts = value.Split(new[] { "[", "]" }, StringSplitOptions.RemoveEmptyEntries);
+            _label = parts[0];
+
+            if (parts.Length > 1)
+            {
+                State = parts[1];
+            }
+
+            OnPropertyChanged();
+        }
+    }
+
+    /// <summary>
+    /// Gets or sets the LabelColor of the OpenHAB widget.
+    /// </summary>
+    [JsonPropertyName("labelcolor")]
+    public string LabelColor
+    {
+        get; set;
+    }
+
+    [JsonPropertyName("labelSource")]
+    public string LabelSource
+    {
+        get; set;
+    }
+
+    [JsonPropertyName("legend")]
+    public bool Legend
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets the linked page when available.
+    /// </summary>
+    [JsonPropertyName("linkedPage")]
+    public Page LinkedPage
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets the Mapping of the OpenHAB widget.
+    /// </summary>
+    [JsonPropertyName("mappings")]
+    public ICollection<WidgetMapping> Mappings
+    {
+        get; set;
+    }
+
+    [JsonPropertyName("maxValue")]
+    public float MaxValue
+    {
+        get; set;
+    }
+
+    [JsonPropertyName("minValue")]
+    public float MinValue
+    {
+        get; set;
+    }
+
+    [JsonPropertyName("name")]
+    public string Name
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets the Parent of the OpenHAB widget.
+    /// </summary>
+    public Widget Parent
+    {
+        get; set;
+    }
+
+    [JsonPropertyName("pattern")]
+    public string Pattern
+    {
+        get; set;
+    }
+
+    [JsonPropertyName("period")]
+    public string Period
+    {
+        get; set;
+    }
+
+    [JsonPropertyName("refresh")]
+    public float Refresh
+    {
+        get; set;
+    }
+
+    [JsonPropertyName("sendFrequency")]
+    public float SendFrequency
+    {
+        get; set;
+    }
+
+    [JsonPropertyName("service")]
+    public string Service
+    {
+        get; set;
+    }
+
+    [JsonPropertyName("state")]
+    public string State
+    {
+        get; set;
+    }
+
+    [JsonPropertyName("staticIcon")]
+    public bool StaticIcon
+    {
+        get; set;
+    }
+
+    [JsonPropertyName("step")]
+    public float Step
+    {
+        get; set;
+    }
+
+    [JsonPropertyName("switchSupport")]
+    public bool SwitchSupport
+    {
+        get; set;
+    }
+
+    [JsonPropertyName("type")]
+    public string Type
+    {
+        get; set;
+    }
+
+    [JsonPropertyName("unit")]
+    public string Unit
+    {
+        get; set;
+    }
+
+    [JsonPropertyName("url")]
+    public string Url
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets the ValueColor of the OpenHAB widget.
+    /// </summary>
+    [JsonPropertyName("valuecolor")]
+    public string ValueColor
+    {
+        get; set;
+    }
+
+    [JsonPropertyName("visibility")]
+    public bool Visibility
+    {
+        get; set;
+    }
+
+    [JsonPropertyName("widgetId")]
+    public string WidgetId
+    {
+        get; set;
+    }
+
+    [JsonPropertyName("yAxisDecimalPattern")]
+    public string YAxisDecimalPattern
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Called when [property changed].
+    /// </summary>
+    /// <param name="propertyName">Name of the property.</param>
+    protected void OnPropertyChanged([CallerMemberName] string propertyName = null)
+    {
+        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+    }
+
+    #region IEquatable Implementation
+
+    /// <summary>Implements the operator !=.</summary>
+    /// <param name="widget1">The widget1.</param>
+    /// <param name="widget2">The widget2.</param>
+    /// <returns>The result of the operator.</returns>
+    public static bool operator !=(Widget widget1, Widget widget2)
+    {
+        if (ReferenceEquals(widget1, null))
+        {
+            return false;
+        }
+
+        return !widget1.Equals(widget2);
+    }
+
+    /// <summary>Implements the operator ==.</summary>
+    /// <param name="widget1">The widget1.</param>
+    /// <param name="widget2">The widget2.</param>
+    /// <returns>The result of the operator.</returns>
+    public static bool operator ==(Widget widget1, Widget widget2)
+    {
+        if (ReferenceEquals(widget1, null))
+        {
+            return ReferenceEquals(widget2, null);
+        }
+
+        return widget1.Equals(widget2);
+    }
+
+    /// <inheritdoc/>
+    public override bool Equals(object obj)
+    {
+        Widget widget = (Widget)obj;
+
+        if (widget == null)
+        {
+            return false;
+        }
+
+        return Equals(widget);
+    }
+
+    /// <inheritdoc/>
+    public bool Equals(Widget other)
+    {
+        if (string.IsNullOrEmpty(WidgetId) || ReferenceEquals(other, null))
+        {
+            return false;
+        }
+
+        return WidgetId.CompareTo(other.WidgetId) == 0;
+    }
+
+    /// <inheritdoc/>
+    public override int GetHashCode()
+    {
+        return WidgetId.GetHashCode();
+    }
+
+    #endregion IEquatable Implementation
+}
diff --git a/src/openHAB.Core.Client/Models/WidgetMapping.cs b/src/openHAB.Core.Client/Models/WidgetMapping.cs
new file mode 100644
index 00000000..385018cb
--- /dev/null
+++ b/src/openHAB.Core.Client/Models/WidgetMapping.cs
@@ -0,0 +1,34 @@
+namespace openHAB.Core.Client.Models;
+
+/// <summary>
+/// A mapping for an OpenHAB Widget.
+/// </summary>
+public class WidgetMapping
+{
+    /// <summary>
+    /// Gets or sets the Command of the mapping.
+    /// </summary>
+    public string Command
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets the Label of the mapping.
+    /// </summary>
+    public string Label
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="WidgetMapping"/> class.
+    /// </summary>
+    /// <param name="command">A command.</param>
+    /// <param name="label">A label.</param>
+    public WidgetMapping(string command, string label)
+    {
+        Command = command;
+        Label = label;
+    }
+}
diff --git a/src/openHAB.Core.Client/OpenHABClient.cs b/src/openHAB.Core.Client/OpenHABClient.cs
new file mode 100644
index 00000000..f2fdb23d
--- /dev/null
+++ b/src/openHAB.Core.Client/OpenHABClient.cs
@@ -0,0 +1,364 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net.Http;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.Messaging;
+using Microsoft.Extensions.Logging;
+using openHAB.Core.Client.Common;
+using openHAB.Core.Client.Connection.Contracts;
+using openHAB.Core.Client.Connection.Models;
+using openHAB.Core.Client.Contracts;
+using openHAB.Core.Client.Event;
+using openHAB.Core.Client.Event.Contracts;
+using openHAB.Core.Client.Messages;
+using openHAB.Core.Client.Models;
+
+namespace openHAB.Core.Client;
+
+
+/// <summary>
+/// The main SDK implementation of the connection to OpenHAB.
+/// </summary>
+public class OpenHABClient : IOpenHABClient
+{
+    private readonly IConnectionService _connectionService;
+    private readonly IOpenHABEventParser _eventParser;
+    private readonly IHttpClientFactory _httpClientFactory;
+    private readonly ILogger<OpenHABClient> _logger;
+    private readonly IMessenger _messenger;
+    private Connection.Models.Connection _connection;
+    private HttpClient _httpClient;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="OpenHABClient"/> class.
+    /// </summary>
+    /// <param name="settingsService">The service to fetch the settings.</param>
+    /// <param name="messenger">The messenger instance.</param>
+    /// <param name="eventParser">openHAB event parser.</param>
+    /// <param name="connectionService"></param>
+    /// <param name="logger">Logger class.</param>
+    /// <param name="openHABHttpClient">OpenHab HTTP client factory.</param>
+    public OpenHABClient(
+        IMessenger messenger,
+        IOpenHABEventParser eventParser,
+        IConnectionService connectionService,
+        ILogger<OpenHABClient> logger,
+        IHttpClientFactory httpClientFactory)
+    {
+        _messenger = messenger;
+        _logger = logger;
+        _httpClientFactory = httpClientFactory;
+        _eventParser = eventParser;
+        _connectionService = connectionService;
+    }
+
+    /// <inheritdoc />
+    public async Task<Item> GetItemByName(string itemName)
+    {
+        try
+        {
+            _logger.LogInformation("Load item by name '{ItemName}' from openHAB server", itemName);
+
+            Uri resourceUrl = new Uri($"{Constants.API.Items}/{itemName}", UriKind.Relative);
+
+            HttpResponseMessage result = await _httpClient.GetAsync(resourceUrl).ConfigureAwait(false);
+            if (!result.IsSuccessStatusCode)
+            {
+                _logger.LogError("HTTP request to fetch item '{ItemName}' failed, ErrorCode:'{StatusCode}'", itemName, result.StatusCode);
+                throw new OpenHABException($"{result.StatusCode} received from server");
+            }
+
+            string resultString = await result.Content.ReadAsStringAsync().ConfigureAwait(false);
+
+            JsonSerializerOptions serializerOptions = new JsonSerializerOptions
+            {
+                PropertyNameCaseInsensitive = true,
+                NumberHandling = JsonNumberHandling.AllowReadingFromString,
+            };
+            Item item = JsonSerializer.Deserialize<Item>(resultString, serializerOptions);
+
+            _logger.LogInformation("Loaded item '{ItemName}' from server", itemName);
+
+            return item;
+        }
+        catch (ArgumentNullException ex)
+        {
+            _logger.LogError(ex, "LoadItemsFromSitemap failed.");
+            throw new OpenHABException("Invalid call", ex);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "LoadItemsFromSitemap failed.");
+            throw new OpenHABException("Invalid call", ex);
+        }
+    }
+
+    /// <inheritdoc />
+    public async Task<HttpResponseResult<ServerInfo>> GetOpenHABServerInfo()
+    {
+        return await _connectionService.GetOpenHABServerInfo(_connection);
+    }
+
+    public async Task<Sitemap> GetSitemap(string sitemapLink, OpenHABVersion version)
+    {
+        try
+        {
+            _logger.LogInformation("Get sitemap by link '{SitemapLink}'", sitemapLink);
+
+            HttpResponseMessage result = await _httpClient.GetAsync(sitemapLink).ConfigureAwait(false);
+            if (!result.IsSuccessStatusCode)
+            {
+                _logger.LogError("HTTP request for loading sitemap failed, ErrorCode:'{StatusCode}'", result.StatusCode);
+                throw new OpenHABException($"{result.StatusCode} received from server");
+            }
+
+            string resultString = await result.Content.ReadAsStringAsync().ConfigureAwait(false);
+
+            Sitemap sitemap = null;
+            if (version == OpenHABVersion.Two || version == OpenHABVersion.Three || version == OpenHABVersion.Four)
+            {
+                JsonSerializerOptions serializerOptions = new JsonSerializerOptions
+                {
+                    PropertyNameCaseInsensitive = true,
+                    NumberHandling = JsonNumberHandling.AllowReadingFromString,
+                };
+
+                sitemap = JsonSerializer.Deserialize<Sitemap>(resultString, serializerOptions);
+            }
+            else
+            {
+                string message = "openHAB version is not supported.";
+                _logger.LogError(message);
+                throw new OpenHABException(message);
+            }
+
+            _logger.LogInformation("Loaded '{SitemapName}' sitemap successfully from server", sitemap.Name);
+
+            return sitemap;
+        }
+        catch (ArgumentNullException ex)
+        {
+            _logger.LogError(ex, "GetSitemap failed.");
+            throw new OpenHABException("Invalid call", ex);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "GetSitemap failed.");
+            throw new OpenHABException("Invalid call", ex);
+        }
+    }
+
+    /// <inheritdoc />
+    public async Task<ICollection<Widget>> LoadItemsFromSitemap(string sitemapLink, OpenHABVersion version)
+    {
+        try
+        {
+            _logger.LogInformation("Load site map items for site map '{SiteMapLink}'", sitemapLink);
+
+            HttpResponseMessage result = await _httpClient.GetAsync(sitemapLink).ConfigureAwait(false);
+            if (!result.IsSuccessStatusCode)
+            {
+                _logger.LogError("HTTP request for loading site map items failed, ErrorCode:'{StatusCode}'", result.StatusCode);
+                throw new OpenHABException($"{result.StatusCode} received from server");
+            }
+
+            string resultString = await result.Content.ReadAsStringAsync().ConfigureAwait(false);
+
+            if (version != OpenHABVersion.Two && version != OpenHABVersion.Three && version != OpenHABVersion.Four)
+            {
+                string message = "openHAB version is not supported.";
+                _logger.LogError(message);
+                throw new OpenHABException(message);
+            }
+
+            Sitemap sitemap = JsonSerializer.Deserialize<Sitemap>(resultString);
+            ICollection<Widget> items = sitemap?.Homepage?.Widgets ?? new List<Widget>();
+
+            _logger.LogInformation("Loaded '{ItemCount}' site map items from server", items.Count);
+
+            return items;
+        }
+        catch (ArgumentNullException ex)
+        {
+            _logger.LogError(ex, "LoadItemsFromSiteMap failed.");
+            throw new OpenHABException("Invalid call", ex);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "LoadItemsFromSiteMap failed.");
+            throw new OpenHABException("Invalid call", ex);
+        }
+    }
+
+    /// <inheritdoc />
+    public async Task<ICollection<Sitemap>> LoadSitemaps(OpenHABVersion version, List<Func<Sitemap, bool>> filters)
+    {
+        try
+        {
+            _logger.LogInformation("Load sitemaps for OpenHab server version '{Version}'", version.ToString());
+
+            HttpResponseMessage result = await _httpClient.GetAsync(Constants.API.Sitemaps).ConfigureAwait(false);
+            if (!result.IsSuccessStatusCode)
+            {
+                _logger.LogError("HTTP request for loading sitemaps failed, ErrorCode:'{StatusCode}'", result.StatusCode);
+                throw new OpenHABException($"{result.StatusCode} received from server");
+            }
+
+            string resultString = await result.Content.ReadAsStringAsync().ConfigureAwait(false);
+
+            List<Sitemap> sitemaps = JsonSerializer.Deserialize<List<Sitemap>>(resultString);
+            if (sitemaps == null)
+            {
+                _logger.LogError("Failed to load sitemaps from server");
+                return new List<Sitemap>();
+            }
+
+            _logger.LogInformation("Loaded '{SitemapsCount}' sitemaps from server", sitemaps.Count);
+            return sitemaps.Where(sitemap =>
+            {
+                bool isIncluded = true;
+                filters.ForEach(filter => isIncluded &= filter(sitemap));
+
+                return isIncluded;
+            }).ToList();
+        }
+        catch (ArgumentNullException ex)
+        {
+            _logger.LogError(ex, "LoadSitemaps failed.");
+            throw new OpenHABException("Invalid call", ex);
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "LoadSitemaps failed.");
+            throw new OpenHABException("Invalid call", ex);
+        }
+    }
+
+    /// <inheritdoc />
+    public async Task<bool> ResetConnection(Connection.Models.Connection localConnection, Connection.Models.Connection remoteConnection, bool? isRunningInDemoMode)
+    {
+        bool isDemoMode = isRunningInDemoMode.HasValue && isRunningInDemoMode.Value;
+        Connection.Models.Connection connection = await _connectionService.DetectAndRetrieveConnection(localConnection, remoteConnection, isDemoMode);
+        if (connection == null)
+        {
+            return false;
+        }
+
+        switch (connection.Type)
+        {
+            case HttpClientType.Local:
+                _logger.LogInformation("Initialize local connection to {Url}", connection.Url);
+                _httpClient = _httpClientFactory.CreateClient("local");
+                break;
+            case HttpClientType.Remote:
+                _logger.LogInformation("Initialize remote connection to {Url}", connection.Url);
+                _httpClient = _httpClientFactory.CreateClient("remote");
+                break;
+        }
+
+        _connection = connection;
+        return true;
+    }
+
+    /// <inheritdoc />
+    public async Task<HttpResponseResult<bool>> SendCommand(Item item, string command)
+    {
+        try
+        {
+            if (item == null)
+            {
+                _logger.LogInformation("Send command is canceled, because item is null (e.g. widget not linked to item)");
+                return new HttpResponseResult<bool>(false, null, null);
+            }
+
+            _logger.LogInformation("Send Command '{Command}' for item '{ItemName}' of type '{ItemType}'", command, item.Name, item.Type);
+            StringContent content = new StringContent(command);
+
+            var result = await _httpClient.PostAsync(item.Link, content).ConfigureAwait(false);
+            if (!result.IsSuccessStatusCode)
+            {
+                _logger.LogError("HTTP request for command failed, ErrorCode:'{StatusCode}'", result.StatusCode);
+            }
+
+            return new HttpResponseResult<bool>(result.IsSuccessStatusCode, result.StatusCode);
+        }
+        catch (HttpRequestException ex)
+        {
+            _logger.LogError(ex, "SendCommand failed.");
+            return new HttpResponseResult<bool>(false, null, ex);
+        }
+        catch (ArgumentNullException ex)
+        {
+            _logger.LogError(ex, "SendCommand failed.");
+            return new HttpResponseResult<bool>(false, null, ex);
+        }
+    }
+
+    /// <inheritdoc />
+    public async void StartItemUpdates(System.Threading.CancellationToken token)
+    {
+        string requestUri = Constants.API.Events;
+
+        _logger.LogInformation("Retrieve item updates from '{BaseAddress}'", _httpClient.BaseAddress.ToString());
+
+        try
+        {
+            Stream stream = await _httpClient.GetStreamAsync(requestUri).ConfigureAwait(false);
+
+            using (StreamReader reader = new StreamReader(stream))
+            {
+                while (!reader.EndOfStream)
+                {
+                    if (token.IsCancellationRequested)
+                    {
+                        return;
+                    }
+
+                    string updateEvent = await reader.ReadLineAsync().ConfigureAwait(false);
+                    if (updateEvent?.StartsWith("data:", StringComparison.InvariantCultureIgnoreCase) == true)
+                    {
+                        OpenHABEvent ohEvent = _eventParser.Parse(updateEvent);
+                        if (ohEvent == null)
+                        {
+                            continue;
+                        }
+
+                        switch (ohEvent.EventType)
+                        {
+                            case OpenHABEventType.ItemStateEvent:
+                                _messenger.Send(new UpdateItemMessage(ohEvent.ItemName, ohEvent.Value));
+                                break;
+                            case OpenHABEventType.ThingUpdatedEvent:
+                                break;
+                            case OpenHABEventType.RuleStatusInfoEvent:
+                                break;
+                            case OpenHABEventType.ItemStatePredictedEvent:
+                                break;
+                            case OpenHABEventType.GroupItemStateChangedEvent:
+                                break;
+                            case OpenHABEventType.ItemStateChangedEvent:
+                                _messenger.Send(new ItemStateChangedMessage(ohEvent.ItemName, ohEvent.Value, ohEvent.OldValue));
+                                break;
+                            case OpenHABEventType.Unknown:
+                                break;
+                            default:
+                                break;
+                        }
+                    }
+                }
+            }
+        }
+        catch (HttpRequestException ex)
+        {
+            _logger.LogError(ex, "StartItemUpdates failed.");
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "StartItemUpdates failed.");
+        }
+    }
+}
diff --git a/src/openHAB.Core.Client/Options/ConnectionOptions.cs b/src/openHAB.Core.Client/Options/ConnectionOptions.cs
new file mode 100644
index 00000000..bf65d430
--- /dev/null
+++ b/src/openHAB.Core.Client/Options/ConnectionOptions.cs
@@ -0,0 +1,78 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Text.Json;
+using openHAB.Core.Client.Connection.Contracts;
+
+namespace openHAB.Core.Client.Options;
+
+/// <summary>
+/// Represents the connection options for the OpenHAB application.
+/// </summary>
+public class ConnectionOptions
+{
+    private static readonly List<IConnectionProfile> _connectionProfiles = Connection.Models.ConnectionProfiles.GetProfiles();
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ConnectionOptions"/> class.
+    /// </summary>
+    public ConnectionOptions()
+    {
+        IsRunningInDemoMode = false;
+    }
+
+    /// <summary>
+    /// Gets the list of available connection profiles.
+    /// </summary>
+    /// <value>The connection profiles.</value>
+    public static List<IConnectionProfile> ConnectionProfiles => _connectionProfiles;
+
+    /// <summary>
+    /// Gets or sets a value indicating whether the application is currently running in demo mode.
+    /// </summary>
+    /// <value><c>true</c> if the application is running in demo mode; otherwise, <c>false</c>.</value>
+    public bool? IsRunningInDemoMode
+    {
+        get;
+        set;
+    }
+
+    /// <summary>
+    /// Gets or sets the configuration to the OpenHAB local instance.
+    /// </summary>
+    /// <value>The local connection configuration.</value>
+    public Connection.Models.Connection LocalConnection
+    {
+        get;
+        set;
+    }
+
+    /// <summary>
+    /// Gets or sets the configuration to the OpenHAB remote instance.
+    /// </summary>
+    /// <value>The remote connection configuration.</value>
+    public Connection.Models.Connection RemoteConnection
+    {
+        get;
+        set;
+    }
+
+    /// <summary>
+    /// Saves the current connection options to a file.
+    /// </summary>
+    /// <returns><c>true</c> if the save operation was successful; otherwise, <c>false</c>.</returns>
+    public bool Save(string filePath)
+    {
+        try
+        {
+            string connectionSettings = JsonSerializer.Serialize(this);
+            File.WriteAllText(filePath, connectionSettings, Encoding.UTF8);
+
+            return true;
+        }
+        catch (System.Exception)
+        {
+            return false;
+        }
+    }
+}
diff --git a/src/openHAB.Core.Client/Schema/openhab-schema.json b/src/openHAB.Core.Client/Schema/openhab-schema.json
new file mode 100644
index 00000000..a577f5a0
--- /dev/null
+++ b/src/openHAB.Core.Client/Schema/openhab-schema.json
@@ -0,0 +1,10150 @@
+{
+  "openapi": "3.0.1",
+  "info": {
+    "title": "openHAB REST API",
+    "contact": {
+      "name": "openHAB",
+      "url": "https://www.openhab.org/docs/"
+    },
+    "version": "6"
+  },
+  "servers": [
+    {
+      "url": "https://home.myopenhab.org/rest/"
+    }
+  ],
+  "paths": {
+    "/module-types": {
+      "get": {
+        "tags": [
+          "module-types"
+        ],
+        "summary": "Get all available module types.",
+        "operationId": "getModuleTypes",
+        "parameters": [
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "tags",
+            "in": "query",
+            "description": "tags for filtering",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "type",
+            "in": "query",
+            "description": "filtering by action, condition or trigger",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/ModuleTypeDTO"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/module-types/{moduleTypeUID}": {
+      "get": {
+        "tags": [
+          "module-types"
+        ],
+        "summary": "Gets a module type corresponding to the given UID.",
+        "operationId": "getModuleTypeById",
+        "parameters": [
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "moduleTypeUID",
+            "in": "path",
+            "description": "moduleTypeUID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ModuleTypeDTO"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Module Type corresponding to the given UID does not found."
+          }
+        }
+      }
+    },
+    "/rules": {
+      "get": {
+        "tags": [
+          "rules"
+        ],
+        "summary": "Get available rules, optionally filtered by tags and/or prefix.",
+        "operationId": "getRules",
+        "parameters": [
+          {
+            "name": "prefix",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "tags",
+            "in": "query",
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          {
+            "name": "summary",
+            "in": "query",
+            "description": "summary fields only",
+            "schema": {
+              "type": "boolean"
+            }
+          },
+          {
+            "name": "staticDataOnly",
+            "in": "query",
+            "description": "provides a cacheable list of values not expected to change regularly and honors the If-Modified-Since header, all other parameters are ignored",
+            "schema": {
+              "type": "boolean",
+              "default": false
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/EnrichedRuleDTO"
+                  }
+                }
+              }
+            }
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      },
+      "post": {
+        "tags": [
+          "rules"
+        ],
+        "summary": "Creates a rule.",
+        "operationId": "createRule",
+        "requestBody": {
+          "description": "rule data",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/RuleDTO"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "201": {
+            "description": "Created",
+            "headers": {
+              "Location": {
+                "description": "Newly created Rule",
+                "style": "simple",
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Creation of the rule is refused. Missing required parameter."
+          },
+          "409": {
+            "description": "Creation of the rule is refused. Rule with the same UID already exists."
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/rules/{ruleUID}/enable": {
+      "post": {
+        "tags": [
+          "rules"
+        ],
+        "summary": "Sets the rule enabled status.",
+        "operationId": "enableRule",
+        "parameters": [
+          {
+            "name": "ruleUID",
+            "in": "path",
+            "description": "ruleUID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "enable",
+          "content": {
+            "text/plain": {
+              "schema": {
+                "type": "string"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "404": {
+            "description": "Rule corresponding to the given UID does not found."
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/rules/{ruleUID}/actions": {
+      "get": {
+        "tags": [
+          "rules"
+        ],
+        "summary": "Gets the rule actions.",
+        "operationId": "getRuleActions",
+        "parameters": [
+          {
+            "name": "ruleUID",
+            "in": "path",
+            "description": "ruleUID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/ActionDTO"
+                  }
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Rule corresponding to the given UID does not found."
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/rules/{ruleUID}": {
+      "get": {
+        "tags": [
+          "rules"
+        ],
+        "summary": "Gets the rule corresponding to the given UID.",
+        "operationId": "getRuleById",
+        "parameters": [
+          {
+            "name": "ruleUID",
+            "in": "path",
+            "description": "ruleUID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/EnrichedRuleDTO"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Rule not found"
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      },
+      "put": {
+        "tags": [
+          "rules"
+        ],
+        "summary": "Updates an existing rule corresponding to the given UID.",
+        "operationId": "updateRule",
+        "parameters": [
+          {
+            "name": "ruleUID",
+            "in": "path",
+            "description": "ruleUID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "rule data",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/RuleDTO"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "404": {
+            "description": "Rule corresponding to the given UID does not found."
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      },
+      "delete": {
+        "tags": [
+          "rules"
+        ],
+        "summary": "Removes an existing rule corresponding to the given UID.",
+        "operationId": "deleteRule",
+        "parameters": [
+          {
+            "name": "ruleUID",
+            "in": "path",
+            "description": "ruleUID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "404": {
+            "description": "Rule corresponding to the given UID does not found."
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/rules/{ruleUID}/conditions": {
+      "get": {
+        "tags": [
+          "rules"
+        ],
+        "summary": "Gets the rule conditions.",
+        "operationId": "getRuleConditions",
+        "parameters": [
+          {
+            "name": "ruleUID",
+            "in": "path",
+            "description": "ruleUID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/ConditionDTO"
+                  }
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Rule corresponding to the given UID does not found."
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/rules/{ruleUID}/config": {
+      "get": {
+        "tags": [
+          "rules"
+        ],
+        "summary": "Gets the rule configuration values.",
+        "operationId": "getRuleConfiguration",
+        "parameters": [
+          {
+            "name": "ruleUID",
+            "in": "path",
+            "description": "ruleUID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Rule corresponding to the given UID does not found."
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      },
+      "put": {
+        "tags": [
+          "rules"
+        ],
+        "summary": "Sets the rule configuration values.",
+        "operationId": "updateRuleConfiguration",
+        "parameters": [
+          {
+            "name": "ruleUID",
+            "in": "path",
+            "description": "ruleUID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "config",
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "additionalProperties": {
+                  "type": "object"
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "404": {
+            "description": "Rule corresponding to the given UID does not found."
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/rules/{ruleUID}/{moduleCategory}/{id}": {
+      "get": {
+        "tags": [
+          "rules"
+        ],
+        "summary": "Gets the rule's module corresponding to the given Category and ID.",
+        "operationId": "getRuleModuleById",
+        "parameters": [
+          {
+            "name": "ruleUID",
+            "in": "path",
+            "description": "ruleUID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "moduleCategory",
+            "in": "path",
+            "description": "moduleCategory",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "id",
+            "in": "path",
+            "description": "id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ModuleDTO"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Rule corresponding to the given UID does not found or does not have a module with such Category and ID."
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/rules/{ruleUID}/{moduleCategory}/{id}/config": {
+      "get": {
+        "tags": [
+          "rules"
+        ],
+        "summary": "Gets the module's configuration.",
+        "operationId": "getRuleModuleConfig",
+        "parameters": [
+          {
+            "name": "ruleUID",
+            "in": "path",
+            "description": "ruleUID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "moduleCategory",
+            "in": "path",
+            "description": "moduleCategory",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "id",
+            "in": "path",
+            "description": "id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Rule corresponding to the given UID does not found or does not have a module with such Category and ID."
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/rules/{ruleUID}/{moduleCategory}/{id}/config/{param}": {
+      "get": {
+        "tags": [
+          "rules"
+        ],
+        "summary": "Gets the module's configuration parameter.",
+        "operationId": "getRuleModuleConfigParameter",
+        "parameters": [
+          {
+            "name": "ruleUID",
+            "in": "path",
+            "description": "ruleUID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "moduleCategory",
+            "in": "path",
+            "description": "moduleCategory",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "id",
+            "in": "path",
+            "description": "id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "param",
+            "in": "path",
+            "description": "param",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Rule corresponding to the given UID does not found or does not have a module with such Category and ID."
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      },
+      "put": {
+        "tags": [
+          "rules"
+        ],
+        "summary": "Sets the module's configuration parameter value.",
+        "operationId": "setRuleModuleConfigParameter",
+        "parameters": [
+          {
+            "name": "ruleUID",
+            "in": "path",
+            "description": "ruleUID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "moduleCategory",
+            "in": "path",
+            "description": "moduleCategory",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "id",
+            "in": "path",
+            "description": "id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "param",
+            "in": "path",
+            "description": "param",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "value",
+          "content": {
+            "text/plain": {
+              "schema": {
+                "type": "string"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "404": {
+            "description": "Rule corresponding to the given UID does not found or does not have a module with such Category and ID."
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/rules/{ruleUID}/triggers": {
+      "get": {
+        "tags": [
+          "rules"
+        ],
+        "summary": "Gets the rule triggers.",
+        "operationId": "getRuleTriggers",
+        "parameters": [
+          {
+            "name": "ruleUID",
+            "in": "path",
+            "description": "ruleUID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/TriggerDTO"
+                  }
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Rule corresponding to the given UID does not found."
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/rules/{ruleUID}/runnow": {
+      "post": {
+        "tags": [
+          "rules"
+        ],
+        "summary": "Executes actions of the rule.",
+        "operationId": "runRuleNow_1",
+        "parameters": [
+          {
+            "name": "ruleUID",
+            "in": "path",
+            "description": "ruleUID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "the context for running this rule",
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "additionalProperties": {
+                  "type": "object"
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "404": {
+            "description": "Rule corresponding to the given UID does not found."
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/rules/schedule/simulations": {
+      "get": {
+        "tags": [
+          "rules"
+        ],
+        "summary": "Simulates the executions of rules filtered by tag 'Schedule' within the given times.",
+        "operationId": "getScheduleRuleSimulations",
+        "parameters": [
+          {
+            "name": "from",
+            "in": "query",
+            "description": "Start time of the simulated rule executions. Will default to the current time. [yyyy-MM-dd'T'HH:mm:ss.SSSZ]",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "until",
+            "in": "query",
+            "description": "End time of the simulated rule executions. Will default to 30 days after the start time. Must be less than 180 days after the given start time. [yyyy-MM-dd'T'HH:mm:ss.SSSZ]",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/RuleExecution"
+                  }
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The max. simulation duration of 180 days is exceeded."
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/templates": {
+      "get": {
+        "tags": [
+          "templates"
+        ],
+        "summary": "Get all available templates.",
+        "operationId": "getTemplates",
+        "parameters": [
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/Template"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/templates/{templateUID}": {
+      "get": {
+        "tags": [
+          "templates"
+        ],
+        "summary": "Gets a template corresponding to the given UID.",
+        "operationId": "getTemplateById",
+        "parameters": [
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "templateUID",
+            "in": "path",
+            "description": "templateUID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Template"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Template corresponding to the given UID does not found."
+          }
+        }
+      }
+    },
+    "/actions/{thingUID}/{actionUid}": {
+      "post": {
+        "tags": [
+          "actions"
+        ],
+        "summary": "Executes a thing action.",
+        "operationId": "executeThingAction",
+        "parameters": [
+          {
+            "name": "thingUID",
+            "in": "path",
+            "description": "thingUID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "actionUid",
+            "in": "path",
+            "description": "action type UID (including scope, separated by '.')",
+            "required": true,
+            "schema": {
+              "pattern": "[a-zA-Z0-9]+\\.[a-zA-Z0-9]+",
+              "type": "string"
+            }
+          },
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "action inputs as map (parameter name as key / argument as value)",
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "additionalProperties": {
+                  "type": "object"
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Action not found"
+          },
+          "500": {
+            "description": "Creation of action handler or execution failed"
+          }
+        }
+      }
+    },
+    "/actions/{thingUID}": {
+      "get": {
+        "tags": [
+          "actions"
+        ],
+        "summary": "Get all available actions for provided thing UID",
+        "operationId": "getAvailableActionsForThing",
+        "parameters": [
+          {
+            "name": "thingUID",
+            "in": "path",
+            "description": "thingUID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "uniqueItems": true,
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/ThingActionDTO"
+                  }
+                }
+              }
+            }
+          },
+          "204": {
+            "description": "No actions found."
+          }
+        }
+      }
+    },
+    "/uuid": {
+      "get": {
+        "tags": [
+          "uuid"
+        ],
+        "summary": "A unified unique id.",
+        "operationId": "getUUID",
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/audio/defaultsink": {
+      "get": {
+        "tags": [
+          "audio"
+        ],
+        "summary": "Get the default sink if defined or the first available sink.",
+        "operationId": "getAudioDefaultSink",
+        "parameters": [
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/AudioSinkDTO"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Sink not found"
+          }
+        }
+      }
+    },
+    "/audio/defaultsource": {
+      "get": {
+        "tags": [
+          "audio"
+        ],
+        "summary": "Get the default source if defined or the first available source.",
+        "operationId": "getAudioDefaultSource",
+        "parameters": [
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/AudioSourceDTO"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Source not found"
+          }
+        }
+      }
+    },
+    "/audio/sinks": {
+      "get": {
+        "tags": [
+          "audio"
+        ],
+        "summary": "Get the list of all sinks.",
+        "operationId": "getAudioSinks",
+        "parameters": [
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/AudioSinkDTO"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/audio/sources": {
+      "get": {
+        "tags": [
+          "audio"
+        ],
+        "summary": "Get the list of all sources.",
+        "operationId": "getAudioSources",
+        "parameters": [
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/AudioSourceDTO"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/auth/logout": {
+      "post": {
+        "tags": [
+          "auth"
+        ],
+        "summary": "Delete the session associated with a refresh token.",
+        "operationId": "deleteSession",
+        "requestBody": {
+          "content": {
+            "application/x-www-form-urlencoded": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "refresh_token": {
+                    "type": "string"
+                  },
+                  "id": {
+                    "type": "string"
+                  }
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "401": {
+            "description": "User is not authenticated"
+          },
+          "404": {
+            "description": "User or refresh token not found"
+          }
+        }
+      }
+    },
+    "/auth/apitokens": {
+      "get": {
+        "tags": [
+          "auth"
+        ],
+        "summary": "List the API tokens associated to the authenticated user.",
+        "operationId": "getApiTokens",
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/UserApiTokenDTO"
+                  }
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "User is not authenticated"
+          },
+          "404": {
+            "description": "User not found"
+          }
+        }
+      }
+    },
+    "/auth/sessions": {
+      "get": {
+        "tags": [
+          "auth"
+        ],
+        "summary": "List the sessions associated to the authenticated user.",
+        "operationId": "getSessionsForCurrentUser",
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/UserSessionDTO"
+                  }
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "User is not authenticated"
+          },
+          "404": {
+            "description": "User not found"
+          }
+        }
+      }
+    },
+    "/auth/token": {
+      "post": {
+        "tags": [
+          "auth"
+        ],
+        "summary": "Get access and refresh tokens.",
+        "operationId": "getOAuthToken",
+        "parameters": [
+          {
+            "name": "useCookie",
+            "in": "query",
+            "schema": {
+              "type": "boolean"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/x-www-form-urlencoded": {
+              "schema": {
+                "type": "object",
+                "properties": {
+                  "grant_type": {
+                    "type": "string"
+                  },
+                  "code": {
+                    "type": "string"
+                  },
+                  "redirect_uri": {
+                    "type": "string"
+                  },
+                  "client_id": {
+                    "type": "string"
+                  },
+                  "refresh_token": {
+                    "type": "string"
+                  },
+                  "code_verifier": {
+                    "type": "string"
+                  }
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/TokenResponseDTO"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Invalid request parameters"
+          }
+        }
+      }
+    },
+    "/auth/apitokens/{name}": {
+      "delete": {
+        "tags": [
+          "auth"
+        ],
+        "summary": "Revoke a specified API token associated to the authenticated user.",
+        "operationId": "removeApiToken",
+        "parameters": [
+          {
+            "name": "name",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "401": {
+            "description": "User is not authenticated"
+          },
+          "404": {
+            "description": "User or API token not found"
+          }
+        }
+      }
+    },
+    "/addons": {
+      "get": {
+        "tags": [
+          "addons"
+        ],
+        "summary": "Get all add-ons.",
+        "operationId": "getAddons",
+        "parameters": [
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "serviceId",
+            "in": "query",
+            "description": "service ID",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/Addon"
+                  }
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Service not found"
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/addons/{addonId}": {
+      "get": {
+        "tags": [
+          "addons"
+        ],
+        "summary": "Get add-on with given ID.",
+        "operationId": "getAddonById",
+        "parameters": [
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "addonId",
+            "in": "path",
+            "description": "addon ID",
+            "required": true,
+            "schema": {
+              "pattern": "[a-zA-Z_0-9-:]+",
+              "type": "string"
+            }
+          },
+          {
+            "name": "serviceId",
+            "in": "query",
+            "description": "service ID",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Addon"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not found"
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/addons/{addonId}/config": {
+      "get": {
+        "tags": [
+          "addons"
+        ],
+        "summary": "Get add-on configuration for given add-on ID.",
+        "operationId": "getAddonConfiguration",
+        "parameters": [
+          {
+            "name": "addonId",
+            "in": "path",
+            "description": "addon ID",
+            "required": true,
+            "schema": {
+              "pattern": "[a-zA-Z_0-9-:]+",
+              "type": "string"
+            }
+          },
+          {
+            "name": "serviceId",
+            "in": "query",
+            "description": "service ID",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Add-on does not exist"
+          },
+          "500": {
+            "description": "Configuration can not be read due to internal error"
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      },
+      "put": {
+        "tags": [
+          "addons"
+        ],
+        "summary": "Updates an add-on configuration for given ID and returns the old configuration.",
+        "operationId": "updateAddonConfiguration",
+        "parameters": [
+          {
+            "name": "addonId",
+            "in": "path",
+            "description": "Add-on id",
+            "required": true,
+            "schema": {
+              "pattern": "[a-zA-Z_0-9-:]+",
+              "type": "string"
+            }
+          },
+          {
+            "name": "serviceId",
+            "in": "query",
+            "description": "service ID",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "additionalProperties": {
+                  "type": "object"
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "204": {
+            "description": "No old configuration"
+          },
+          "404": {
+            "description": "Add-on does not exist"
+          },
+          "500": {
+            "description": "Configuration can not be updated due to internal error"
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/addons/services": {
+      "get": {
+        "tags": [
+          "addons"
+        ],
+        "summary": "Get all add-on types.",
+        "operationId": "getAddonTypes",
+        "parameters": [
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/AddonType"
+                  }
+                }
+              }
+            }
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/addons/suggestions": {
+      "get": {
+        "tags": [
+          "addons"
+        ],
+        "summary": "Get suggested add-ons to be installed.",
+        "operationId": "getSuggestedAddons",
+        "parameters": [
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/Addon"
+                  }
+                }
+              }
+            }
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/addons/types": {
+      "get": {
+        "tags": [
+          "addons"
+        ],
+        "summary": "Get add-on services.",
+        "operationId": "getAddonServices",
+        "parameters": [
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "serviceId",
+            "in": "query",
+            "description": "service ID",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/AddonType"
+                  }
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Service not found"
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/addons/{addonId}/install": {
+      "post": {
+        "tags": [
+          "addons"
+        ],
+        "summary": "Installs the add-on with the given ID.",
+        "operationId": "installAddonById",
+        "parameters": [
+          {
+            "name": "addonId",
+            "in": "path",
+            "description": "addon ID",
+            "required": true,
+            "schema": {
+              "pattern": "[a-zA-Z_0-9-:]+",
+              "type": "string"
+            }
+          },
+          {
+            "name": "serviceId",
+            "in": "query",
+            "description": "service ID",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "404": {
+            "description": "Not found"
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/addons/url/{url}/install": {
+      "post": {
+        "tags": [
+          "addons"
+        ],
+        "summary": "Installs the add-on from the given URL.",
+        "operationId": "installAddonFromURL",
+        "parameters": [
+          {
+            "name": "url",
+            "in": "path",
+            "description": "addon install URL",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "400": {
+            "description": "The given URL is malformed or not valid."
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/addons/{addonId}/uninstall": {
+      "post": {
+        "tags": [
+          "addons"
+        ],
+        "summary": "Uninstalls the add-on with the given ID.",
+        "operationId": "uninstallAddon",
+        "parameters": [
+          {
+            "name": "addonId",
+            "in": "path",
+            "description": "addon ID",
+            "required": true,
+            "schema": {
+              "pattern": "[a-zA-Z_0-9-:]+",
+              "type": "string"
+            }
+          },
+          {
+            "name": "serviceId",
+            "in": "query",
+            "description": "service ID",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "404": {
+            "description": "Not found"
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/channel-types": {
+      "get": {
+        "tags": [
+          "channel-types"
+        ],
+        "summary": "Gets all available channel types.",
+        "operationId": "getChannelTypes",
+        "parameters": [
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "prefixes",
+            "in": "query",
+            "description": "filter UIDs by prefix (multiple comma-separated prefixes allowed, for example: 'system,mqtt')",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "uniqueItems": true,
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/ChannelTypeDTO"
+                  }
+                }
+              }
+            }
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/channel-types/{channelTypeUID}": {
+      "get": {
+        "tags": [
+          "channel-types"
+        ],
+        "summary": "Gets channel type by UID.",
+        "operationId": "getChannelTypeByUID",
+        "parameters": [
+          {
+            "name": "channelTypeUID",
+            "in": "path",
+            "description": "channelTypeUID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Channel type with provided channelTypeUID does not exist.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ChannelTypeDTO"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "No content"
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/channel-types/{channelTypeUID}/linkableItemTypes": {
+      "get": {
+        "tags": [
+          "channel-types"
+        ],
+        "summary": "Gets the item types the given trigger channel type UID can be linked to.",
+        "operationId": "getLinkableItemTypesByChannelTypeUID",
+        "parameters": [
+          {
+            "name": "channelTypeUID",
+            "in": "path",
+            "description": "channelTypeUID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "uniqueItems": true,
+                  "type": "array",
+                  "items": {
+                    "type": "string"
+                  }
+                }
+              }
+            }
+          },
+          "204": {
+            "description": "No content: channel type has no linkable items or is no trigger channel."
+          },
+          "404": {
+            "description": "Given channel type UID not found."
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/config-descriptions": {
+      "get": {
+        "tags": [
+          "config-descriptions"
+        ],
+        "summary": "Gets all available config descriptions.",
+        "operationId": "getConfigDescriptions",
+        "parameters": [
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "scheme",
+            "in": "query",
+            "description": "scheme filter",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/ConfigDescriptionDTO"
+                  }
+                }
+              }
+            }
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/config-descriptions/{uri}": {
+      "get": {
+        "tags": [
+          "config-descriptions"
+        ],
+        "summary": "Gets a config description by URI.",
+        "operationId": "getConfigDescriptionByURI",
+        "parameters": [
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "uri",
+            "in": "path",
+            "description": "uri",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ConfigDescriptionDTO"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Invalid URI syntax"
+          },
+          "404": {
+            "description": "Not found"
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/discovery": {
+      "get": {
+        "tags": [
+          "discovery"
+        ],
+        "summary": "Gets all bindings that support discovery.",
+        "operationId": "getBindingsWithDiscoverySupport",
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "uniqueItems": true,
+                  "type": "array",
+                  "items": {
+                    "type": "string"
+                  }
+                }
+              }
+            }
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/discovery/bindings/{bindingId}/scan": {
+      "post": {
+        "tags": [
+          "discovery"
+        ],
+        "summary": "Starts asynchronous discovery process for a binding and returns the timeout in seconds of the discovery operation.",
+        "operationId": "scan",
+        "parameters": [
+          {
+            "name": "bindingId",
+            "in": "path",
+            "description": "bindingId",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "integer",
+                  "format": "int32"
+                }
+              }
+            }
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/inbox/{thingUID}/approve": {
+      "post": {
+        "tags": [
+          "inbox"
+        ],
+        "summary": "Approves the discovery result by adding the thing to the registry.",
+        "operationId": "approveInboxItemById",
+        "parameters": [
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "thingUID",
+            "in": "path",
+            "description": "thingUID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "newThingId",
+            "in": "query",
+            "description": "new thing ID",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "thing label",
+          "content": {
+            "text/plain": {
+              "schema": {
+                "type": "string"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "400": {
+            "description": "Invalid new thing ID."
+          },
+          "404": {
+            "description": "Thing unable to be approved."
+          },
+          "409": {
+            "description": "No binding found that supports this thing."
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/inbox/{thingUID}": {
+      "delete": {
+        "tags": [
+          "inbox"
+        ],
+        "summary": "Removes the discovery result from the inbox.",
+        "operationId": "removeItemFromInbox",
+        "parameters": [
+          {
+            "name": "thingUID",
+            "in": "path",
+            "description": "thingUID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "404": {
+            "description": "Discovery result not found in the inbox."
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/inbox": {
+      "get": {
+        "tags": [
+          "inbox"
+        ],
+        "summary": "Get all discovered things.",
+        "operationId": "getDiscoveredInboxItems",
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/DiscoveryResultDTO"
+                  }
+                }
+              }
+            }
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/inbox/{thingUID}/ignore": {
+      "post": {
+        "tags": [
+          "inbox"
+        ],
+        "summary": "Flags a discovery result as ignored for further processing.",
+        "operationId": "flagInboxItemAsIgnored",
+        "parameters": [
+          {
+            "name": "thingUID",
+            "in": "path",
+            "description": "thingUID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/inbox/{thingUID}/unignore": {
+      "post": {
+        "tags": [
+          "inbox"
+        ],
+        "summary": "Removes ignore flag from a discovery result.",
+        "operationId": "removeIgnoreFlagOnInboxItem",
+        "parameters": [
+          {
+            "name": "thingUID",
+            "in": "path",
+            "description": "thingUID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/items/{itemName}/members/{memberItemName}": {
+      "put": {
+        "tags": [
+          "items"
+        ],
+        "summary": "Adds a new member to a group item.",
+        "operationId": "addMemberToGroupItem",
+        "parameters": [
+          {
+            "name": "itemName",
+            "in": "path",
+            "description": "item name",
+            "required": true,
+            "schema": {
+              "pattern": "[a-zA-Z_0-9]+",
+              "type": "string"
+            }
+          },
+          {
+            "name": "memberItemName",
+            "in": "path",
+            "description": "member item name",
+            "required": true,
+            "schema": {
+              "pattern": "[a-zA-Z_0-9]+",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "404": {
+            "description": "Item or member item not found or item is not of type group item."
+          },
+          "405": {
+            "description": "Member item is not editable."
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      },
+      "delete": {
+        "tags": [
+          "items"
+        ],
+        "summary": "Removes an existing member from a group item.",
+        "operationId": "removeMemberFromGroupItem",
+        "parameters": [
+          {
+            "name": "itemName",
+            "in": "path",
+            "description": "item name",
+            "required": true,
+            "schema": {
+              "pattern": "[a-zA-Z_0-9]+",
+              "type": "string"
+            }
+          },
+          {
+            "name": "memberItemName",
+            "in": "path",
+            "description": "member item name",
+            "required": true,
+            "schema": {
+              "pattern": "[a-zA-Z_0-9]+",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "404": {
+            "description": "Item or member item not found or item is not of type group item."
+          },
+          "405": {
+            "description": "Member item is not editable."
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/items/{itemname}/metadata/{namespace}": {
+      "put": {
+        "tags": [
+          "items"
+        ],
+        "summary": "Adds metadata to an item.",
+        "operationId": "addMetadataToItem",
+        "parameters": [
+          {
+            "name": "itemname",
+            "in": "path",
+            "description": "item name",
+            "required": true,
+            "schema": {
+              "pattern": "[a-zA-Z_0-9]+",
+              "type": "string"
+            }
+          },
+          {
+            "name": "namespace",
+            "in": "path",
+            "description": "namespace",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "metadata",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/MetadataDTO"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "201": {
+            "description": "Created"
+          },
+          "400": {
+            "description": "Metadata value empty."
+          },
+          "404": {
+            "description": "Item not found."
+          },
+          "405": {
+            "description": "Metadata not editable."
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      },
+      "delete": {
+        "tags": [
+          "items"
+        ],
+        "summary": "Removes metadata from an item.",
+        "operationId": "removeMetadataFromItem",
+        "parameters": [
+          {
+            "name": "itemname",
+            "in": "path",
+            "description": "item name",
+            "required": true,
+            "schema": {
+              "pattern": "[a-zA-Z_0-9]+",
+              "type": "string"
+            }
+          },
+          {
+            "name": "namespace",
+            "in": "path",
+            "description": "namespace",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "404": {
+            "description": "Item not found."
+          },
+          "405": {
+            "description": "Meta data not editable."
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/items/{itemname}/tags/{tag}": {
+      "put": {
+        "tags": [
+          "items"
+        ],
+        "summary": "Adds a tag to an item.",
+        "operationId": "addTagToItem",
+        "parameters": [
+          {
+            "name": "itemname",
+            "in": "path",
+            "description": "item name",
+            "required": true,
+            "schema": {
+              "pattern": "[a-zA-Z_0-9]+",
+              "type": "string"
+            }
+          },
+          {
+            "name": "tag",
+            "in": "path",
+            "description": "tag",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "404": {
+            "description": "Item not found."
+          },
+          "405": {
+            "description": "Item not editable."
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      },
+      "delete": {
+        "tags": [
+          "items"
+        ],
+        "summary": "Removes a tag from an item.",
+        "operationId": "removeTagFromItem",
+        "parameters": [
+          {
+            "name": "itemname",
+            "in": "path",
+            "description": "item name",
+            "required": true,
+            "schema": {
+              "pattern": "[a-zA-Z_0-9]+",
+              "type": "string"
+            }
+          },
+          {
+            "name": "tag",
+            "in": "path",
+            "description": "tag",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "404": {
+            "description": "Item not found."
+          },
+          "405": {
+            "description": "Item not editable."
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/items/{itemname}": {
+      "get": {
+        "tags": [
+          "items"
+        ],
+        "summary": "Gets a single item.",
+        "operationId": "getItemByName",
+        "parameters": [
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "metadata",
+            "in": "query",
+            "description": "metadata selector - a comma separated list or a regular expression (returns all if no value given)",
+            "schema": {
+              "type": "string",
+              "default": ".*"
+            }
+          },
+          {
+            "name": "recursive",
+            "in": "query",
+            "description": "get member items if the item is a group item",
+            "schema": {
+              "type": "boolean",
+              "default": true
+            }
+          },
+          {
+            "name": "itemname",
+            "in": "path",
+            "description": "item name",
+            "required": true,
+            "schema": {
+              "pattern": "[a-zA-Z_0-9]+",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/EnrichedItemDTO"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Item not found"
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "items"
+        ],
+        "summary": "Adds a new item to the registry or updates the existing item.",
+        "operationId": "addOrUpdateItemInRegistry",
+        "parameters": [
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "itemname",
+            "in": "path",
+            "description": "item name",
+            "required": true,
+            "schema": {
+              "pattern": "[a-zA-Z_0-9]+",
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "item data",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/GroupItemDTO"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/EnrichedItemDTO"
+                }
+              }
+            }
+          },
+          "201": {
+            "description": "Item created."
+          },
+          "400": {
+            "description": "Payload invalid."
+          },
+          "404": {
+            "description": "Item not found or name in path invalid."
+          },
+          "405": {
+            "description": "Item not editable."
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      },
+      "post": {
+        "tags": [
+          "items"
+        ],
+        "summary": "Sends a command to an item.",
+        "operationId": "sendItemCommand",
+        "parameters": [
+          {
+            "name": "itemname",
+            "in": "path",
+            "description": "item name",
+            "required": true,
+            "schema": {
+              "pattern": "[a-zA-Z_0-9]+",
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "valid item command (e.g. ON, OFF, UP, DOWN, REFRESH)",
+          "content": {
+            "text/plain": {
+              "schema": {
+                "type": "string"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "400": {
+            "description": "Item command null"
+          },
+          "404": {
+            "description": "Item not found"
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "items"
+        ],
+        "summary": "Removes an item from the registry.",
+        "operationId": "removeItemFromRegistry",
+        "parameters": [
+          {
+            "name": "itemname",
+            "in": "path",
+            "description": "item name",
+            "required": true,
+            "schema": {
+              "pattern": "[a-zA-Z_0-9]+",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "404": {
+            "description": "Item not found or item is not editable."
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/items": {
+      "get": {
+        "tags": [
+          "items"
+        ],
+        "summary": "Get all available items.",
+        "operationId": "getItems",
+        "parameters": [
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "type",
+            "in": "query",
+            "description": "item type filter",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "tags",
+            "in": "query",
+            "description": "item tag filter",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "metadata",
+            "in": "query",
+            "description": "metadata selector - a comma separated list or a regular expression (returns all if no value given)",
+            "schema": {
+              "type": "string",
+              "default": ".*"
+            }
+          },
+          {
+            "name": "recursive",
+            "in": "query",
+            "description": "get member items recursively",
+            "schema": {
+              "type": "boolean",
+              "default": false
+            }
+          },
+          {
+            "name": "fields",
+            "in": "query",
+            "description": "limit output to the given fields (comma separated)",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "staticDataOnly",
+            "in": "query",
+            "description": "provides a cacheable list of values not expected to change regularly and checks the If-Modified-Since header, all other parameters are ignored except \"metadata\"",
+            "schema": {
+              "type": "boolean",
+              "default": false
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/EnrichedItemDTO"
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "items"
+        ],
+        "summary": "Adds a list of items to the registry or updates the existing items.",
+        "operationId": "addOrUpdateItemsInRegistry",
+        "requestBody": {
+          "description": "array of item data",
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "array",
+                "items": {
+                  "$ref": "#/components/schemas/GroupItemDTO"
+                }
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Payload is invalid."
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/items/{itemname}/state": {
+      "get": {
+        "tags": [
+          "items"
+        ],
+        "summary": "Gets the state of an item.",
+        "operationId": "getItemState_1",
+        "parameters": [
+          {
+            "name": "itemname",
+            "in": "path",
+            "description": "item name",
+            "required": true,
+            "schema": {
+              "pattern": "[a-zA-Z_0-9]+",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "text/plain": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Item not found"
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "items"
+        ],
+        "summary": "Updates the state of an item.",
+        "operationId": "updateItemState",
+        "parameters": [
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "itemname",
+            "in": "path",
+            "description": "item name",
+            "required": true,
+            "schema": {
+              "pattern": "[a-zA-Z_0-9]+",
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "valid item state (e.g. ON, OFF)",
+          "content": {
+            "text/plain": {
+              "schema": {
+                "type": "string"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "202": {
+            "description": "Accepted"
+          },
+          "400": {
+            "description": "Item state null"
+          },
+          "404": {
+            "description": "Item not found"
+          }
+        }
+      }
+    },
+    "/items/{itemname}/metadata/namespaces": {
+      "get": {
+        "tags": [
+          "items"
+        ],
+        "summary": "Gets the namespace of an item.",
+        "operationId": "getItemNamespaces",
+        "parameters": [
+          {
+            "name": "itemname",
+            "in": "path",
+            "description": "item name",
+            "required": true,
+            "schema": {
+              "pattern": "[a-zA-Z_0-9]+",
+              "type": "string"
+            }
+          },
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Item not found"
+          }
+        }
+      }
+    },
+    "/items/{itemName}/semantic/{semanticClass}": {
+      "get": {
+        "tags": [
+          "items"
+        ],
+        "summary": "Gets the item which defines the requested semantics of an item.",
+        "operationId": "getSemanticItem",
+        "parameters": [
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "itemName",
+            "in": "path",
+            "description": "item name",
+            "required": true,
+            "schema": {
+              "pattern": "\\w+",
+              "type": "string"
+            }
+          },
+          {
+            "name": "semanticClass",
+            "in": "path",
+            "description": "semantic class",
+            "required": true,
+            "schema": {
+              "pattern": "\\w+",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "404": {
+            "description": "Item not found"
+          }
+        }
+      }
+    },
+    "/items/metadata/purge": {
+      "post": {
+        "tags": [
+          "items"
+        ],
+        "summary": "Remove unused/orphaned metadata.",
+        "operationId": "purgeDatabase",
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/links": {
+      "get": {
+        "tags": [
+          "links"
+        ],
+        "summary": "Gets all available links.",
+        "operationId": "getItemLinks",
+        "parameters": [
+          {
+            "name": "channelUID",
+            "in": "query",
+            "description": "filter by channel UID",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "itemName",
+            "in": "query",
+            "description": "filter by item name",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/EnrichedItemChannelLinkDTO"
+                  }
+                }
+              }
+            }
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/links/{itemName}/{channelUID}": {
+      "get": {
+        "tags": [
+          "links"
+        ],
+        "summary": "Retrieves an individual link.",
+        "operationId": "getItemLink",
+        "parameters": [
+          {
+            "name": "itemName",
+            "in": "path",
+            "description": "item name",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "channelUID",
+            "in": "path",
+            "description": "channel UID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/EnrichedItemChannelLinkDTO"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Content does not match the path"
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      },
+      "put": {
+        "tags": [
+          "links"
+        ],
+        "summary": "Links an item to a channel.",
+        "operationId": "linkItemToChannel",
+        "parameters": [
+          {
+            "name": "itemName",
+            "in": "path",
+            "description": "itemName",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "channelUID",
+            "in": "path",
+            "description": "channelUID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "link data",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ItemChannelLinkDTO"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "400": {
+            "description": "Content does not match the path"
+          },
+          "405": {
+            "description": "Link is not editable"
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      },
+      "delete": {
+        "tags": [
+          "links"
+        ],
+        "summary": "Unlinks an item from a channel.",
+        "operationId": "unlinkItemFromChannel",
+        "parameters": [
+          {
+            "name": "itemName",
+            "in": "path",
+            "description": "itemName",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "channelUID",
+            "in": "path",
+            "description": "channelUID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "404": {
+            "description": "Link not found."
+          },
+          "405": {
+            "description": "Link not editable."
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/links/purge": {
+      "post": {
+        "tags": [
+          "links"
+        ],
+        "summary": "Remove unused/orphaned links.",
+        "operationId": "purgeDatabase_1",
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/links/{object}": {
+      "delete": {
+        "tags": [
+          "links"
+        ],
+        "summary": "Delete all links that refer to an item or thing.",
+        "operationId": "removeAllLinksForObject",
+        "parameters": [
+          {
+            "name": "object",
+            "in": "path",
+            "description": "item name or thing UID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/persistence/{serviceId}": {
+      "get": {
+        "tags": [
+          "persistence"
+        ],
+        "summary": "Gets a persistence service configuration.",
+        "operationId": "getPersistenceServiceConfiguration",
+        "parameters": [
+          {
+            "name": "serviceId",
+            "in": "path",
+            "description": "Id of the persistence service.",
+            "required": true,
+            "schema": {
+              "pattern": "[a-zA-Z0-9]+",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/PersistenceServiceConfigurationDTO"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Service configuration not found."
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      },
+      "put": {
+        "tags": [
+          "persistence"
+        ],
+        "summary": "Sets a persistence service configuration.",
+        "operationId": "putPersistenceServiceConfiguration",
+        "parameters": [
+          {
+            "name": "serviceId",
+            "in": "path",
+            "description": "Id of the persistence service.",
+            "required": true,
+            "schema": {
+              "pattern": "[a-zA-Z0-9]+",
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "service configuration",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/PersistenceServiceConfigurationDTO"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/PersistenceServiceConfigurationDTO"
+                }
+              }
+            }
+          },
+          "201": {
+            "description": "PersistenceServiceConfiguration created."
+          },
+          "400": {
+            "description": "Payload invalid."
+          },
+          "405": {
+            "description": "PersistenceServiceConfiguration not editable."
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      },
+      "delete": {
+        "tags": [
+          "persistence"
+        ],
+        "summary": "Deletes a persistence service configuration.",
+        "operationId": "deletePersistenceServiceConfiguration",
+        "parameters": [
+          {
+            "name": "serviceId",
+            "in": "path",
+            "description": "Id of the persistence service.",
+            "required": true,
+            "schema": {
+              "pattern": "[a-zA-Z0-9]+",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "404": {
+            "description": "Persistence service configuration not found."
+          },
+          "405": {
+            "description": "Persistence service configuration not editable."
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/persistence/items/{itemname}": {
+      "get": {
+        "tags": [
+          "persistence"
+        ],
+        "summary": "Gets item persistence data from the persistence service.",
+        "operationId": "getItemDataFromPersistenceService",
+        "parameters": [
+          {
+            "name": "serviceId",
+            "in": "query",
+            "description": "Id of the persistence service. If not provided the default service will be used",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "itemname",
+            "in": "path",
+            "description": "The item name",
+            "required": true,
+            "schema": {
+              "pattern": "[a-zA-Z_0-9]+",
+              "type": "string"
+            }
+          },
+          {
+            "name": "starttime",
+            "in": "query",
+            "description": "Start time of the data to return. Will default to 1 day before endtime. [yyyy-MM-dd'T'HH:mm:ss.SSSZ]",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "endtime",
+            "in": "query",
+            "description": "End time of the data to return. Will default to current time. [yyyy-MM-dd'T'HH:mm:ss.SSSZ]",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "page",
+            "in": "query",
+            "description": "Page number of data to return. This parameter will enable paging.",
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          },
+          {
+            "name": "pagelength",
+            "in": "query",
+            "description": "The length of each page.",
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          },
+          {
+            "name": "boundary",
+            "in": "query",
+            "description": "Gets one value before and after the requested period.",
+            "schema": {
+              "type": "boolean"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ItemHistoryDTO"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Unknown Item or persistence service"
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "persistence"
+        ],
+        "summary": "Stores item persistence data into the persistence service.",
+        "operationId": "storeItemDataInPersistenceService",
+        "parameters": [
+          {
+            "name": "serviceId",
+            "in": "query",
+            "description": "Id of the persistence service. If not provided the default service will be used",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "itemname",
+            "in": "path",
+            "description": "The item name.",
+            "required": true,
+            "schema": {
+              "pattern": "[a-zA-Z_0-9]+",
+              "type": "string"
+            }
+          },
+          {
+            "name": "time",
+            "in": "query",
+            "description": "Time of the data to be stored. Will default to current time. [yyyy-MM-dd'T'HH:mm:ss.SSSZ]",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "state",
+            "in": "query",
+            "description": "The state to store.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "404": {
+            "description": "Unknown Item or persistence service"
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      },
+      "delete": {
+        "tags": [
+          "persistence"
+        ],
+        "summary": "Deletes item persistence data from a specific persistence service in a given time range.",
+        "operationId": "deleteItemFromPersistenceService",
+        "parameters": [
+          {
+            "name": "serviceId",
+            "in": "query",
+            "description": "Id of the persistence service.",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "itemname",
+            "in": "path",
+            "description": "The item name.",
+            "required": true,
+            "schema": {
+              "pattern": "[a-zA-Z_0-9]+",
+              "type": "string"
+            }
+          },
+          {
+            "name": "starttime",
+            "in": "query",
+            "description": "Start of the time range to be deleted. [yyyy-MM-dd'T'HH:mm:ss.SSSZ]",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "endtime",
+            "in": "query",
+            "description": "End of the time range to be deleted. [yyyy-MM-dd'T'HH:mm:ss.SSSZ]",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "type": "string"
+                  }
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Invalid filter parameters"
+          },
+          "404": {
+            "description": "Unknown persistence service"
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/persistence/items": {
+      "get": {
+        "tags": [
+          "persistence"
+        ],
+        "summary": "Gets a list of items available via a specific persistence service.",
+        "operationId": "getItemsForPersistenceService",
+        "parameters": [
+          {
+            "name": "serviceId",
+            "in": "query",
+            "description": "Id of the persistence service. If not provided the default service will be used",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "uniqueItems": true,
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/PersistenceItemInfo"
+                  }
+                }
+              }
+            }
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/persistence": {
+      "get": {
+        "tags": [
+          "persistence"
+        ],
+        "summary": "Gets a list of persistence services.",
+        "operationId": "getPersistenceServices",
+        "parameters": [
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/PersistenceServiceDTO"
+                  }
+                }
+              }
+            }
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/profile-types": {
+      "get": {
+        "tags": [
+          "profile-types"
+        ],
+        "summary": "Gets all available profile types.",
+        "operationId": "getProfileTypes",
+        "parameters": [
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "channelTypeUID",
+            "in": "query",
+            "description": "channel type filter",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "itemType",
+            "in": "query",
+            "description": "item type filter",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "uniqueItems": true,
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/ProfileTypeDTO"
+                  }
+                }
+              }
+            }
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/services/{serviceId}/config": {
+      "get": {
+        "tags": [
+          "services"
+        ],
+        "summary": "Get service configuration for given service ID.",
+        "operationId": "getServiceConfig",
+        "parameters": [
+          {
+            "name": "serviceId",
+            "in": "path",
+            "description": "service ID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "Configuration can not be read due to internal error"
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      },
+      "put": {
+        "tags": [
+          "services"
+        ],
+        "summary": "Updates a service configuration for given service ID and returns the old configuration.",
+        "operationId": "updateServiceConfig",
+        "parameters": [
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "serviceId",
+            "in": "path",
+            "description": "service ID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "additionalProperties": {
+                  "type": "object"
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "204": {
+            "description": "No old configuration"
+          },
+          "500": {
+            "description": "Configuration can not be updated due to internal error"
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      },
+      "delete": {
+        "tags": [
+          "services"
+        ],
+        "summary": "Deletes a service configuration for given service ID and returns the old configuration.",
+        "operationId": "deleteServiceConfig",
+        "parameters": [
+          {
+            "name": "serviceId",
+            "in": "path",
+            "description": "service ID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "204": {
+            "description": "No old configuration"
+          },
+          "500": {
+            "description": "Configuration can not be deleted due to internal error"
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/services": {
+      "get": {
+        "tags": [
+          "services"
+        ],
+        "summary": "Get all configurable services.",
+        "operationId": "getServices",
+        "parameters": [
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/ConfigurableServiceDTO"
+                  }
+                }
+              }
+            }
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/services/{serviceId}": {
+      "get": {
+        "tags": [
+          "services"
+        ],
+        "summary": "Get configurable service for given service ID.",
+        "operationId": "getServicesById",
+        "parameters": [
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "serviceId",
+            "in": "path",
+            "description": "service ID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ConfigurableServiceDTO"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not found"
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/services/{serviceId}/contexts": {
+      "get": {
+        "tags": [
+          "services"
+        ],
+        "summary": "Get existing multiple context service configurations for the given factory PID.",
+        "operationId": "getServiceContext",
+        "parameters": [
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "serviceId",
+            "in": "path",
+            "description": "service ID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/ConfigurableServiceDTO"
+                  }
+                }
+              }
+            }
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/tags": {
+      "get": {
+        "tags": [
+          "tags"
+        ],
+        "summary": "Get all available semantic tags.",
+        "operationId": "getSemanticTags",
+        "parameters": [
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/EnrichedSemanticTagDTO"
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      "post": {
+        "tags": [
+          "tags"
+        ],
+        "summary": "Creates a new semantic tag and adds it to the registry.",
+        "operationId": "createSemanticTag",
+        "parameters": [
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "tag data",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/EnrichedSemanticTagDTO"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "201": {
+            "description": "Created",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/EnrichedSemanticTagDTO"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "The tag identifier is invalid or the tag label is missing."
+          },
+          "409": {
+            "description": "A tag with the same identifier already exists."
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/tags/{tagId}": {
+      "get": {
+        "tags": [
+          "tags"
+        ],
+        "summary": "Gets a semantic tag and its sub tags.",
+        "operationId": "getSemanticTagAndSubTags",
+        "parameters": [
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "tagId",
+            "in": "path",
+            "description": "tag id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/EnrichedSemanticTagDTO"
+                  }
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Semantic tag not found."
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "tags"
+        ],
+        "summary": "Updates a semantic tag.",
+        "operationId": "updateSemanticTag",
+        "parameters": [
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "tagId",
+            "in": "path",
+            "description": "tag id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "tag data",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/EnrichedSemanticTagDTO"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/EnrichedSemanticTagDTO"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Semantic tag not found."
+          },
+          "405": {
+            "description": "Semantic tag not editable."
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      },
+      "delete": {
+        "tags": [
+          "tags"
+        ],
+        "summary": "Removes a semantic tag and its sub tags from the registry.",
+        "operationId": "removeSemanticTag",
+        "parameters": [
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "tagId",
+            "in": "path",
+            "description": "tag id",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK, was deleted."
+          },
+          "404": {
+            "description": "Semantic tag not found."
+          },
+          "405": {
+            "description": "Semantic tag not removable."
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/things": {
+      "get": {
+        "tags": [
+          "things"
+        ],
+        "summary": "Get all available things.",
+        "operationId": "getThings",
+        "parameters": [
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "summary",
+            "in": "query",
+            "description": "summary fields only",
+            "schema": {
+              "type": "boolean"
+            }
+          },
+          {
+            "name": "staticDataOnly",
+            "in": "query",
+            "description": "provides a cacheable list of values not expected to change regularly and checks the If-Modified-Since header",
+            "schema": {
+              "type": "boolean",
+              "default": false
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "uniqueItems": true,
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/EnrichedThingDTO"
+                  }
+                }
+              }
+            }
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      },
+      "post": {
+        "tags": [
+          "things"
+        ],
+        "summary": "Creates a new thing and adds it to the registry.",
+        "operationId": "createThingInRegistry",
+        "parameters": [
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "thing data",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ThingDTO"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "201": {
+            "description": "Created",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/EnrichedThingDTO"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "A uid must be provided, if no binding can create a thing of this type."
+          },
+          "409": {
+            "description": "A thing with the same uid already exists."
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/things/{thingUID}": {
+      "get": {
+        "tags": [
+          "things"
+        ],
+        "summary": "Gets thing by UID.",
+        "operationId": "getThingById",
+        "parameters": [
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "thingUID",
+            "in": "path",
+            "description": "thingUID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/EnrichedThingDTO"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Thing not found."
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      },
+      "put": {
+        "tags": [
+          "things"
+        ],
+        "summary": "Updates a thing.",
+        "operationId": "updateThing",
+        "parameters": [
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "thingUID",
+            "in": "path",
+            "description": "thingUID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "thing",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/ThingDTO"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/EnrichedThingDTO"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Thing not found."
+          },
+          "409": {
+            "description": "Thing could not be updated as it is not editable."
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      },
+      "delete": {
+        "tags": [
+          "things"
+        ],
+        "summary": "Removes a thing from the registry. Set 'force' to __true__ if you want the thing to be removed immediately.",
+        "operationId": "removeThingById",
+        "parameters": [
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "thingUID",
+            "in": "path",
+            "description": "thingUID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "force",
+            "in": "query",
+            "description": "force",
+            "schema": {
+              "type": "boolean",
+              "default": false
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK, was deleted."
+          },
+          "202": {
+            "description": "ACCEPTED for asynchronous deletion."
+          },
+          "404": {
+            "description": "Thing not found."
+          },
+          "409": {
+            "description": "Thing could not be deleted because it's not editable."
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/things/{thingUID}/config/status": {
+      "get": {
+        "tags": [
+          "things"
+        ],
+        "summary": "Gets thing config status.",
+        "operationId": "getThingConfigStatus",
+        "parameters": [
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "thingUID",
+            "in": "path",
+            "description": "thing",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/ConfigStatusMessage"
+                  }
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Thing not found."
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/things/{thingUID}/firmware/status": {
+      "get": {
+        "tags": [
+          "things"
+        ],
+        "summary": "Gets thing's firmware status.",
+        "operationId": "getThingFirmwareStatus",
+        "parameters": [
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "thingUID",
+            "in": "path",
+            "description": "thing",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/FirmwareStatusDTO"
+                }
+              }
+            }
+          },
+          "204": {
+            "description": "No firmware status provided by this Thing."
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/things/{thingUID}/firmwares": {
+      "get": {
+        "tags": [
+          "things"
+        ],
+        "summary": "Get all available firmwares for provided thing UID",
+        "operationId": "getAvailableFirmwaresForThing",
+        "parameters": [
+          {
+            "name": "thingUID",
+            "in": "path",
+            "description": "thingUID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "uniqueItems": true,
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/FirmwareDTO"
+                  }
+                }
+              }
+            }
+          },
+          "204": {
+            "description": "No firmwares found."
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/things/{thingUID}/status": {
+      "get": {
+        "tags": [
+          "things"
+        ],
+        "summary": "Gets thing status.",
+        "operationId": "getThingStatus",
+        "parameters": [
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "thingUID",
+            "in": "path",
+            "description": "thing",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ThingStatusInfo"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Thing not found."
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/things/{thingUID}/enable": {
+      "put": {
+        "tags": [
+          "things"
+        ],
+        "summary": "Sets the thing enabled status.",
+        "operationId": "enableThing",
+        "parameters": [
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "thingUID",
+            "in": "path",
+            "description": "thing",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "enabled",
+          "content": {
+            "text/plain": {
+              "schema": {
+                "type": "string"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/EnrichedThingDTO"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Thing not found."
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/things/{thingUID}/config": {
+      "put": {
+        "tags": [
+          "things"
+        ],
+        "summary": "Updates thing's configuration.",
+        "operationId": "updateThingConfig",
+        "parameters": [
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "thingUID",
+            "in": "path",
+            "description": "thing",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "configuration parameters",
+          "content": {
+            "application/json": {
+              "schema": {
+                "type": "object",
+                "additionalProperties": {
+                  "type": "object"
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/EnrichedThingDTO"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Configuration of the thing is not valid."
+          },
+          "404": {
+            "description": "Thing not found"
+          },
+          "409": {
+            "description": "Thing could not be updated as it is not editable."
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/things/{thingUID}/firmware/{firmwareVersion}": {
+      "put": {
+        "tags": [
+          "things"
+        ],
+        "summary": "Update thing firmware.",
+        "operationId": "updateThingFirmware",
+        "parameters": [
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "thingUID",
+            "in": "path",
+            "description": "thing",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "firmwareVersion",
+            "in": "path",
+            "description": "version",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "400": {
+            "description": "Firmware update preconditions not satisfied."
+          },
+          "404": {
+            "description": "Thing not found."
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/thing-types": {
+      "get": {
+        "tags": [
+          "thing-types"
+        ],
+        "summary": "Gets all available thing types without config description, channels and properties.",
+        "operationId": "getThingTypes",
+        "parameters": [
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "bindingId",
+            "in": "query",
+            "description": "filter by binding Id",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "uniqueItems": true,
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/StrippedThingTypeDTO"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/thing-types/{thingTypeUID}": {
+      "get": {
+        "tags": [
+          "thing-types"
+        ],
+        "summary": "Gets thing type by UID.",
+        "operationId": "getThingTypeById",
+        "parameters": [
+          {
+            "name": "thingTypeUID",
+            "in": "path",
+            "description": "thingTypeUID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Thing type with provided thingTypeUID does not exist.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ThingTypeDTO"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "No content"
+          }
+        }
+      }
+    },
+    "/": {
+      "get": {
+        "tags": [
+          "root"
+        ],
+        "summary": "Gets information about the runtime, the API version and links to resources.",
+        "operationId": "getRoot",
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/RootBean"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/systeminfo": {
+      "get": {
+        "tags": [
+          "systeminfo"
+        ],
+        "summary": "Gets information about the system.",
+        "operationId": "getSystemInformation",
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SystemInfoBean"
+                }
+              }
+            }
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/systeminfo/uom": {
+      "get": {
+        "tags": [
+          "systeminfo"
+        ],
+        "summary": "Get all supported dimensions and their system units.",
+        "operationId": "getUoMInformation",
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UoMInfoBean"
+                }
+              }
+            }
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/sitemaps/events/subscribe": {
+      "post": {
+        "tags": [
+          "sitemaps"
+        ],
+        "summary": "Creates a sitemap event subscription.",
+        "operationId": "createSitemapEventSubscription",
+        "responses": {
+          "201": {
+            "description": "Subscription created."
+          },
+          "503": {
+            "description": "Subscriptions limit reached."
+          }
+        }
+      }
+    },
+    "/sitemaps/{sitemapname}/{pageid}": {
+      "get": {
+        "tags": [
+          "sitemaps"
+        ],
+        "summary": "Polls the data for a sitemap.",
+        "operationId": "pollDataForSitemap",
+        "parameters": [
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "sitemapname",
+            "in": "path",
+            "description": "sitemap name",
+            "required": true,
+            "schema": {
+              "pattern": "[a-zA-Z_0-9]+",
+              "type": "string"
+            }
+          },
+          {
+            "name": "pageid",
+            "in": "path",
+            "description": "page id",
+            "required": true,
+            "schema": {
+              "pattern": "[a-zA-Z_0-9]+",
+              "type": "string"
+            }
+          },
+          {
+            "name": "subscriptionid",
+            "in": "query",
+            "description": "subscriptionid",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "includeHidden",
+            "in": "query",
+            "description": "include hidden widgets",
+            "schema": {
+              "type": "boolean"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/PageDTO"
+                }
+              }
+            }
+          },
+          "400": {
+            "description": "Invalid subscription id has been provided."
+          },
+          "404": {
+            "description": "Sitemap with requested name does not exist or page does not exist, or page refers to a non-linkable widget"
+          }
+        }
+      }
+    },
+    "/sitemaps/{sitemapname}": {
+      "get": {
+        "tags": [
+          "sitemaps"
+        ],
+        "summary": "Get sitemap by name.",
+        "operationId": "getSitemapByName",
+        "parameters": [
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "sitemapname",
+            "in": "path",
+            "description": "sitemap name",
+            "required": true,
+            "schema": {
+              "pattern": "[a-zA-Z_0-9]+",
+              "type": "string"
+            }
+          },
+          {
+            "name": "type",
+            "in": "query",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "jsoncallback",
+            "in": "query",
+            "schema": {
+              "type": "string",
+              "default": "callback"
+            }
+          },
+          {
+            "name": "includeHidden",
+            "in": "query",
+            "description": "include hidden widgets",
+            "schema": {
+              "type": "boolean"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/SitemapDTO"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/sitemaps/events/{subscriptionid}": {
+      "get": {
+        "tags": [
+          "sitemaps"
+        ],
+        "summary": "Get sitemap events.",
+        "operationId": "getSitemapEvents",
+        "parameters": [
+          {
+            "name": "subscriptionid",
+            "in": "path",
+            "description": "subscription id",
+            "required": true,
+            "schema": {
+              "pattern": "[a-zA-Z_0-9-]+",
+              "type": "string"
+            }
+          },
+          {
+            "name": "sitemap",
+            "in": "query",
+            "description": "sitemap name",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "pageid",
+            "in": "query",
+            "description": "page id",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "400": {
+            "description": "Page not linked to the subscription."
+          },
+          "404": {
+            "description": "Subscription not found."
+          }
+        }
+      }
+    },
+    "/sitemaps": {
+      "get": {
+        "tags": [
+          "sitemaps"
+        ],
+        "summary": "Get all available sitemaps.",
+        "operationId": "getSitemaps",
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/SitemapDTO"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/events/states": {
+      "get": {
+        "tags": [
+          "events"
+        ],
+        "summary": "Initiates a new item state tracker connection",
+        "operationId": "initNewStateTacker",
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/events": {
+      "get": {
+        "tags": [
+          "events"
+        ],
+        "summary": "Get all events.",
+        "operationId": "getEvents",
+        "parameters": [
+          {
+            "name": "topics",
+            "in": "query",
+            "description": "topics",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "400": {
+            "description": "Topic is empty or contains invalid characters"
+          }
+        }
+      }
+    },
+    "/events/states/{connectionId}": {
+      "post": {
+        "tags": [
+          "events"
+        ],
+        "summary": "Changes the list of items a SSE connection will receive state updates to.",
+        "operationId": "updateItemListForStateUpdates",
+        "parameters": [
+          {
+            "name": "connectionId",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "items",
+          "content": {
+            "application/json": {
+              "schema": {
+                "uniqueItems": true,
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "404": {
+            "description": "Unknown connectionId"
+          }
+        }
+      }
+    },
+    "/transformations/{uid}": {
+      "get": {
+        "tags": [
+          "transformations"
+        ],
+        "summary": "Get a single transformation",
+        "operationId": "getTransformation",
+        "parameters": [
+          {
+            "name": "uid",
+            "in": "path",
+            "description": "Transformation UID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Transformation"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Not found"
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      },
+      "put": {
+        "tags": [
+          "transformations"
+        ],
+        "summary": "Put a single transformation",
+        "operationId": "putTransformation",
+        "parameters": [
+          {
+            "name": "uid",
+            "in": "path",
+            "description": "Transformation UID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "transformation",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/TransformationDTO"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "400": {
+            "description": "Bad Request (content missing or invalid)"
+          },
+          "405": {
+            "description": "Transformation not editable"
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      },
+      "delete": {
+        "tags": [
+          "transformations"
+        ],
+        "summary": "Get a single transformation",
+        "operationId": "deleteTransformation",
+        "parameters": [
+          {
+            "name": "uid",
+            "in": "path",
+            "description": "Transformation UID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "404": {
+            "description": "UID not found"
+          },
+          "405": {
+            "description": "Transformation not editable"
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/transformations/services": {
+      "get": {
+        "tags": [
+          "transformations"
+        ],
+        "summary": "Get all transformation services",
+        "operationId": "getTransformationServices",
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "type": "string"
+                  }
+                }
+              }
+            }
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/transformations": {
+      "get": {
+        "tags": [
+          "transformations"
+        ],
+        "summary": "Get a list of all transformations",
+        "operationId": "getTransformations",
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/TransformationDTO"
+                  }
+                }
+              }
+            }
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/ui/components/{namespace}": {
+      "get": {
+        "tags": [
+          "ui"
+        ],
+        "summary": "Get all registered UI components in the specified namespace.",
+        "operationId": "getRegisteredUIComponentsInNamespace",
+        "parameters": [
+          {
+            "name": "namespace",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "summary",
+            "in": "query",
+            "description": "summary fields only",
+            "schema": {
+              "type": "boolean"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/RootUIComponent"
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      "post": {
+        "tags": [
+          "ui"
+        ],
+        "summary": "Add a UI component in the specified namespace.",
+        "operationId": "addUIComponentToNamespace",
+        "parameters": [
+          {
+            "name": "namespace",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/RootUIComponent"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/RootUIComponent"
+                }
+              }
+            }
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/ui/components/{namespace}/{componentUID}": {
+      "get": {
+        "tags": [
+          "ui"
+        ],
+        "summary": "Get a specific UI component in the specified namespace.",
+        "operationId": "getUIComponentInNamespace",
+        "parameters": [
+          {
+            "name": "namespace",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "componentUID",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/RootUIComponent"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Component not found"
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "ui"
+        ],
+        "summary": "Update a specific UI component in the specified namespace.",
+        "operationId": "updateUIComponentInNamespace",
+        "parameters": [
+          {
+            "name": "namespace",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "componentUID",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/RootUIComponent"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/RootUIComponent"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Component not found"
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      },
+      "delete": {
+        "tags": [
+          "ui"
+        ],
+        "summary": "Remove a specific UI component in the specified namespace.",
+        "operationId": "removeUIComponentFromNamespace",
+        "parameters": [
+          {
+            "name": "namespace",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "componentUID",
+            "in": "path",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "404": {
+            "description": "Component not found"
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/ui/tiles": {
+      "get": {
+        "tags": [
+          "ui"
+        ],
+        "summary": "Get all registered UI tiles.",
+        "operationId": "getUITiles",
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/TileDTO"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/voice/defaultvoice": {
+      "get": {
+        "tags": [
+          "voice"
+        ],
+        "summary": "Gets the default voice.",
+        "operationId": "getDefaultVoice",
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/VoiceDTO"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "No default voice was found."
+          }
+        }
+      }
+    },
+    "/voice/interpreters/{id}": {
+      "get": {
+        "tags": [
+          "voice"
+        ],
+        "summary": "Gets a single interpreter.",
+        "operationId": "getVoiceInterpreterByUID",
+        "parameters": [
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "id",
+            "in": "path",
+            "description": "interpreter id",
+            "required": true,
+            "schema": {
+              "pattern": "[a-zA-Z_0-9]+",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/HumanLanguageInterpreterDTO"
+                  }
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Interpreter not found"
+          }
+        }
+      }
+    },
+    "/voice/interpreters": {
+      "get": {
+        "tags": [
+          "voice"
+        ],
+        "summary": "Get the list of all interpreters.",
+        "operationId": "getVoiceInterpreters",
+        "parameters": [
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/HumanLanguageInterpreterDTO"
+                  }
+                }
+              }
+            }
+          }
+        }
+      },
+      "post": {
+        "tags": [
+          "voice"
+        ],
+        "summary": "Sends a text to the default human language interpreter.",
+        "operationId": "interpretTextByDefaultInterpreter",
+        "parameters": [
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "text to interpret",
+          "content": {
+            "text/plain": {
+              "schema": {
+                "type": "string"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "400": {
+            "description": "interpretation exception occurs"
+          },
+          "404": {
+            "description": "No human language interpreter was found."
+          }
+        }
+      }
+    },
+    "/voice/voices": {
+      "get": {
+        "tags": [
+          "voice"
+        ],
+        "summary": "Get the list of all voices.",
+        "operationId": "getVoices",
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/VoiceDTO"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/voice/interpreters/{ids}": {
+      "post": {
+        "tags": [
+          "voice"
+        ],
+        "summary": "Sends a text to a given human language interpreter(s).",
+        "operationId": "interpretText",
+        "parameters": [
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "ids",
+            "in": "path",
+            "description": "comma separated list of interpreter ids",
+            "required": true,
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "text to interpret",
+          "content": {
+            "text/plain": {
+              "schema": {
+                "type": "string"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "400": {
+            "description": "interpretation exception occurs"
+          },
+          "404": {
+            "description": "No human language interpreter was found."
+          }
+        }
+      }
+    },
+    "/voice/listenandanswer": {
+      "post": {
+        "tags": [
+          "voice"
+        ],
+        "summary": "Executes a simple dialog sequence without keyword spotting for a given audio source.",
+        "operationId": "listenAndAnswer",
+        "parameters": [
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "sourceId",
+            "in": "query",
+            "description": "source ID",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "sttId",
+            "in": "query",
+            "description": "Speech-to-Text ID",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "ttsId",
+            "in": "query",
+            "description": "Text-to-Speech ID",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "voiceId",
+            "in": "query",
+            "description": "voice ID",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "hliIds",
+            "in": "query",
+            "description": "interpreter IDs",
+            "schema": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              }
+            }
+          },
+          {
+            "name": "sinkId",
+            "in": "query",
+            "description": "audio sink ID",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "listeningItem",
+            "in": "query",
+            "description": "listening item",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "400": {
+            "description": "Services are missing or language is not supported by services or dialog processing is already started for the audio source."
+          },
+          "404": {
+            "description": "One of the given ids is wrong."
+          }
+        }
+      }
+    },
+    "/voice/say": {
+      "post": {
+        "tags": [
+          "voice"
+        ],
+        "summary": "Speaks a given text with a given voice through the given audio sink.",
+        "operationId": "textToSpeech",
+        "parameters": [
+          {
+            "name": "voiceid",
+            "in": "query",
+            "description": "voice id",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "sinkid",
+            "in": "query",
+            "description": "audio sink id",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "volume",
+            "in": "query",
+            "description": "volume level",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "text to speak",
+          "content": {
+            "text/plain": {
+              "schema": {
+                "type": "string"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        }
+      }
+    },
+    "/voice/dialog/start": {
+      "post": {
+        "tags": [
+          "voice"
+        ],
+        "summary": "Start dialog processing for a given audio source.",
+        "operationId": "startDialog",
+        "parameters": [
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "sourceId",
+            "in": "query",
+            "description": "source ID",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "ksId",
+            "in": "query",
+            "description": "keywork spotter ID",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "sttId",
+            "in": "query",
+            "description": "Speech-to-Text ID",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "ttsId",
+            "in": "query",
+            "description": "Text-to-Speech ID",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "voiceId",
+            "in": "query",
+            "description": "voice ID",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "hliIds",
+            "in": "query",
+            "description": "comma separated list of interpreter IDs",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "sinkId",
+            "in": "query",
+            "description": "audio sink ID",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "keyword",
+            "in": "query",
+            "description": "keyword",
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "listeningItem",
+            "in": "query",
+            "description": "listening item",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "400": {
+            "description": "Services are missing or language is not supported by services or dialog processing is already started for the audio source."
+          },
+          "404": {
+            "description": "One of the given ids is wrong."
+          }
+        }
+      }
+    },
+    "/voice/dialog/stop": {
+      "post": {
+        "tags": [
+          "voice"
+        ],
+        "summary": "Stop dialog processing for a given audio source.",
+        "operationId": "stopDialog",
+        "parameters": [
+          {
+            "name": "sourceId",
+            "in": "query",
+            "description": "source ID",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "400": {
+            "description": "No dialog processing is started for the audio source."
+          },
+          "404": {
+            "description": "No audio source was found."
+          }
+        }
+      }
+    },
+    "/logging/{loggerName}": {
+      "get": {
+        "tags": [
+          "logging"
+        ],
+        "summary": "Get a single logger.",
+        "operationId": "getLogger",
+        "parameters": [
+          {
+            "name": "loggerName",
+            "in": "path",
+            "description": "logger name",
+            "required": true,
+            "schema": {
+              "pattern": "[a-zA-Z0-9.]+",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/LoggerInfo"
+                }
+              }
+            }
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      },
+      "put": {
+        "tags": [
+          "logging"
+        ],
+        "summary": "Modify or add logger",
+        "operationId": "putLogger",
+        "parameters": [
+          {
+            "name": "loggerName",
+            "in": "path",
+            "description": "logger name",
+            "required": true,
+            "schema": {
+              "pattern": "[a-zA-Z0-9.]+",
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "logger",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/LoggerInfo"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "400": {
+            "description": "Payload is invalid."
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      },
+      "delete": {
+        "tags": [
+          "logging"
+        ],
+        "summary": "Remove a single logger.",
+        "operationId": "removeLogger",
+        "parameters": [
+          {
+            "name": "loggerName",
+            "in": "path",
+            "description": "logger name",
+            "required": true,
+            "schema": {
+              "pattern": "[a-zA-Z0-9.]+",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/logging": {
+      "get": {
+        "tags": [
+          "logging"
+        ],
+        "summary": "Get all loggers",
+        "operationId": "getLogger_1",
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/LoggerBean"
+                }
+              }
+            }
+          }
+        },
+        "security": [
+          {
+            "oauth2": [
+              "admin"
+            ]
+          }
+        ]
+      }
+    },
+    "/iconsets": {
+      "get": {
+        "tags": [
+          "iconsets"
+        ],
+        "summary": "Gets all icon sets.",
+        "operationId": "getIconSets",
+        "parameters": [
+          {
+            "name": "Accept-Language",
+            "in": "header",
+            "description": "language",
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/IconSet"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    "/habot/chat": {
+      "post": {
+        "tags": [
+          "habot"
+        ],
+        "summary": "Send a query to HABot to interpret.",
+        "operationId": "chat",
+        "requestBody": {
+          "description": "human language query",
+          "content": {
+            "text/plain": {
+              "schema": {
+                "type": "string"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ChatReply"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An interpretation error occurred"
+          }
+        }
+      }
+    },
+    "/habot/compat/cards": {
+      "post": {
+        "tags": [
+          "habot"
+        ],
+        "summary": "Creates a new card in the card deck (compatibility endpoint).",
+        "operationId": "createCard",
+        "requestBody": {
+          "description": "card",
+          "content": {
+            "text/plain": {
+              "schema": {
+                "type": "string"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "The card was created",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Card"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An error occured"
+          }
+        }
+      }
+    },
+    "/habot/cards": {
+      "get": {
+        "tags": [
+          "habot"
+        ],
+        "summary": "Gets all cards of the card deck.",
+        "operationId": "getAllCards",
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/Card"
+                  }
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An error occured"
+          }
+        }
+      },
+      "post": {
+        "tags": [
+          "habot"
+        ],
+        "summary": "Creates a new card in the card deck.",
+        "operationId": "createCard_1",
+        "requestBody": {
+          "description": "card",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/Card"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "The card was created",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Card"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An error occured"
+          }
+        }
+      }
+    },
+    "/habot/cards/{cardUID}": {
+      "get": {
+        "tags": [
+          "habot"
+        ],
+        "summary": "Gets a card from the card deck by its UID.",
+        "operationId": "getCardByUid",
+        "parameters": [
+          {
+            "name": "cardUID",
+            "in": "path",
+            "description": "cardUID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Card"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "The card with the provided UID doesn't exist"
+          },
+          "500": {
+            "description": "An error occured"
+          }
+        }
+      },
+      "put": {
+        "tags": [
+          "habot"
+        ],
+        "summary": "Updates a card in the card deck.",
+        "operationId": "updateCard_1",
+        "parameters": [
+          {
+            "name": "cardUID",
+            "in": "path",
+            "description": "cardUID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "card",
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/Card"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "The card was updated",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Card"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An error occured"
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "habot"
+        ],
+        "summary": "Deletes a card from the card deck.",
+        "operationId": "deleteCard",
+        "parameters": [
+          {
+            "name": "cardUID",
+            "in": "path",
+            "description": "cardUID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The card was deleted"
+          },
+          "500": {
+            "description": "An error occured"
+          }
+        }
+      }
+    },
+    "/habot/compat/cards/{cardUID}/delete": {
+      "post": {
+        "tags": [
+          "habot"
+        ],
+        "summary": "Deletes a card from the card deck (compatibility endpoint).",
+        "operationId": "deleteCardPost",
+        "parameters": [
+          {
+            "name": "cardUID",
+            "in": "path",
+            "description": "cardUID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The card was updated",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Card"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An error occured"
+          }
+        }
+      }
+    },
+    "/habot/attributes": {
+      "get": {
+        "tags": [
+          "habot"
+        ],
+        "summary": "Gets all item named attributes.",
+        "operationId": "getAttributes",
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ChatReply"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An error occurred"
+          }
+        }
+      }
+    },
+    "/habot/greet": {
+      "get": {
+        "tags": [
+          "habot"
+        ],
+        "summary": "Retrieves a first greeting message from the bot in the specified or configured language.",
+        "operationId": "greet",
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/ChatReply"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "There is no support for the configured language"
+          }
+        }
+      }
+    },
+    "/habot/cards/recent": {
+      "get": {
+        "tags": [
+          "habot"
+        ],
+        "summary": "Gets the most recent cards from the card deck",
+        "operationId": "recentCards",
+        "parameters": [
+          {
+            "name": "skip",
+            "in": "query",
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          },
+          {
+            "name": "count",
+            "in": "query",
+            "schema": {
+              "type": "integer",
+              "format": "int32"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The most recent cards",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "array",
+                  "items": {
+                    "$ref": "#/components/schemas/Card"
+                  }
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An error occured"
+          }
+        }
+      }
+    },
+    "/habot/cards/{cardUID}/bookmark": {
+      "put": {
+        "tags": [
+          "habot"
+        ],
+        "summary": "Sets a bookmark on a card.",
+        "operationId": "setCardBookmark",
+        "parameters": [
+          {
+            "name": "cardUID",
+            "in": "path",
+            "description": "cardUID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "404": {
+            "description": "The card with the provided UID doesn't exist"
+          },
+          "500": {
+            "description": "An error occured"
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "habot"
+        ],
+        "summary": "Removes the bookmark on a card.",
+        "operationId": "unsetCardBookmark",
+        "parameters": [
+          {
+            "name": "cardUID",
+            "in": "path",
+            "description": "cardUID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "404": {
+            "description": "The card with the provided UID doesn't exist"
+          },
+          "500": {
+            "description": "An error occured"
+          }
+        }
+      }
+    },
+    "/habot/compat/cards/{cardUID}/unbookmark": {
+      "post": {
+        "tags": [
+          "habot"
+        ],
+        "summary": "Removes the bookmark on a card (compatibility endpoint).",
+        "operationId": "unsetCardBookmarkCompat",
+        "parameters": [
+          {
+            "name": "cardUID",
+            "in": "path",
+            "description": "cardUID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "404": {
+            "description": "The card with the provided UID doesn't exist"
+          },
+          "500": {
+            "description": "An error occured"
+          }
+        }
+      }
+    },
+    "/habot/compat/cards/{cardUID}": {
+      "post": {
+        "tags": [
+          "habot"
+        ],
+        "summary": "Updates a card in the card deck (compatibility endpoint).",
+        "operationId": "updateCard",
+        "parameters": [
+          {
+            "name": "cardUID",
+            "in": "path",
+            "description": "cardUID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "description": "card",
+          "content": {
+            "text/plain": {
+              "schema": {
+                "type": "string"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "The card was updated",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/Card"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An error occured"
+          }
+        }
+      }
+    },
+    "/habot/cards/{cardUID}/timestamp": {
+      "put": {
+        "tags": [
+          "habot"
+        ],
+        "summary": "Updates the timestamp on a card to the current time",
+        "operationId": "updateCardTimestamp",
+        "parameters": [
+          {
+            "name": "cardUID",
+            "in": "path",
+            "description": "cardUID",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "404": {
+            "description": "The card with the provided UID doesn't exist"
+          },
+          "500": {
+            "description": "An error occured"
+          }
+        }
+      }
+    },
+    "/habot/notifications/vapid": {
+      "get": {
+        "tags": [
+          "habot"
+        ],
+        "summary": "Gets or generates the public VAPID key used for push notifications.",
+        "operationId": "webPushConfig",
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "An error occured"
+          }
+        }
+      }
+    },
+    "/habot/notifications/subscribe": {
+      "post": {
+        "tags": [
+          "habot"
+        ],
+        "summary": "Subscribes a new client for push notifications.",
+        "operationId": "webPushSubscribe",
+        "requestBody": {
+          "content": {
+            "text/plain": {
+              "schema": {
+                "type": "string"
+              }
+            }
+          }
+        },
+        "responses": {
+          "200": {
+            "description": "OK"
+          },
+          "500": {
+            "description": "An error occured"
+          }
+        }
+      }
+    }
+  },
+  "components": {
+    "schemas": {
+      "ConfigDescriptionParameterDTO": {
+        "type": "object",
+        "properties": {
+          "context": {
+            "type": "string"
+          },
+          "defaultValue": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "label": {
+            "type": "string"
+          },
+          "name": {
+            "type": "string"
+          },
+          "required": {
+            "type": "boolean"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "TEXT",
+              "INTEGER",
+              "DECIMAL",
+              "BOOLEAN"
+            ]
+          },
+          "min": {
+            "type": "number"
+          },
+          "max": {
+            "type": "number"
+          },
+          "stepsize": {
+            "type": "number"
+          },
+          "pattern": {
+            "type": "string"
+          },
+          "readOnly": {
+            "type": "boolean"
+          },
+          "multiple": {
+            "type": "boolean"
+          },
+          "multipleLimit": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "groupName": {
+            "type": "string"
+          },
+          "advanced": {
+            "type": "boolean"
+          },
+          "verify": {
+            "type": "boolean"
+          },
+          "limitToOptions": {
+            "type": "boolean"
+          },
+          "unit": {
+            "type": "string"
+          },
+          "unitLabel": {
+            "type": "string"
+          },
+          "options": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ParameterOptionDTO"
+            }
+          },
+          "filterCriteria": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/FilterCriteriaDTO"
+            }
+          }
+        }
+      },
+      "FilterCriteriaDTO": {
+        "type": "object",
+        "properties": {
+          "value": {
+            "type": "string"
+          },
+          "name": {
+            "type": "string"
+          }
+        }
+      },
+      "ModuleTypeDTO": {
+        "type": "object",
+        "properties": {
+          "uid": {
+            "type": "string"
+          },
+          "visibility": {
+            "type": "string",
+            "enum": [
+              "VISIBLE",
+              "HIDDEN",
+              "EXPERT"
+            ]
+          },
+          "tags": {
+            "uniqueItems": true,
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "label": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "configDescriptions": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ConfigDescriptionParameterDTO"
+            }
+          }
+        }
+      },
+      "ParameterOptionDTO": {
+        "type": "object",
+        "properties": {
+          "label": {
+            "type": "string"
+          },
+          "value": {
+            "type": "string"
+          }
+        }
+      },
+      "ActionDTO": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "label": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "configuration": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "object"
+            }
+          },
+          "type": {
+            "type": "string"
+          },
+          "inputs": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "string"
+            }
+          }
+        }
+      },
+      "ConditionDTO": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "label": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "configuration": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "object"
+            }
+          },
+          "type": {
+            "type": "string"
+          },
+          "inputs": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "string"
+            }
+          }
+        }
+      },
+      "RuleDTO": {
+        "type": "object",
+        "properties": {
+          "triggers": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/TriggerDTO"
+            }
+          },
+          "conditions": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ConditionDTO"
+            }
+          },
+          "actions": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ActionDTO"
+            }
+          },
+          "configuration": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "object"
+            }
+          },
+          "configDescriptions": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ConfigDescriptionParameterDTO"
+            }
+          },
+          "templateUID": {
+            "type": "string"
+          },
+          "uid": {
+            "type": "string"
+          },
+          "name": {
+            "type": "string"
+          },
+          "tags": {
+            "uniqueItems": true,
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "visibility": {
+            "type": "string",
+            "enum": [
+              "VISIBLE",
+              "HIDDEN",
+              "EXPERT"
+            ]
+          },
+          "description": {
+            "type": "string"
+          }
+        }
+      },
+      "TriggerDTO": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "label": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "configuration": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "object"
+            }
+          },
+          "type": {
+            "type": "string"
+          }
+        }
+      },
+      "EnrichedRuleDTO": {
+        "type": "object",
+        "properties": {
+          "triggers": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/TriggerDTO"
+            }
+          },
+          "conditions": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ConditionDTO"
+            }
+          },
+          "actions": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ActionDTO"
+            }
+          },
+          "configuration": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "object"
+            }
+          },
+          "configDescriptions": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ConfigDescriptionParameterDTO"
+            }
+          },
+          "templateUID": {
+            "type": "string"
+          },
+          "uid": {
+            "type": "string"
+          },
+          "name": {
+            "type": "string"
+          },
+          "tags": {
+            "uniqueItems": true,
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "visibility": {
+            "type": "string",
+            "enum": [
+              "VISIBLE",
+              "HIDDEN",
+              "EXPERT"
+            ]
+          },
+          "description": {
+            "type": "string"
+          },
+          "status": {
+            "$ref": "#/components/schemas/RuleStatusInfo"
+          },
+          "editable": {
+            "type": "boolean"
+          }
+        }
+      },
+      "RuleStatusInfo": {
+        "type": "object",
+        "properties": {
+          "status": {
+            "type": "string",
+            "enum": [
+              "UNINITIALIZED",
+              "INITIALIZING",
+              "IDLE",
+              "RUNNING"
+            ]
+          },
+          "statusDetail": {
+            "type": "string",
+            "enum": [
+              "NONE",
+              "HANDLER_MISSING_ERROR",
+              "HANDLER_INITIALIZING_ERROR",
+              "CONFIGURATION_ERROR",
+              "TEMPLATE_MISSING_ERROR",
+              "INVALID_RULE",
+              "DISABLED"
+            ]
+          },
+          "description": {
+            "type": "string"
+          }
+        }
+      },
+      "ModuleDTO": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "label": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "configuration": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "object"
+            }
+          },
+          "type": {
+            "type": "string"
+          }
+        }
+      },
+      "Action": {
+        "type": "object",
+        "properties": {
+          "inputs": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "string"
+            }
+          },
+          "description": {
+            "type": "string"
+          },
+          "label": {
+            "type": "string"
+          },
+          "typeUID": {
+            "type": "string"
+          },
+          "configuration": {
+            "$ref": "#/components/schemas/Configuration"
+          },
+          "id": {
+            "type": "string"
+          }
+        }
+      },
+      "Condition": {
+        "type": "object",
+        "properties": {
+          "inputs": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "string"
+            }
+          },
+          "description": {
+            "type": "string"
+          },
+          "label": {
+            "type": "string"
+          },
+          "typeUID": {
+            "type": "string"
+          },
+          "configuration": {
+            "$ref": "#/components/schemas/Configuration"
+          },
+          "id": {
+            "type": "string"
+          }
+        }
+      },
+      "ConfigDescriptionParameter": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "TEXT",
+              "INTEGER",
+              "DECIMAL",
+              "BOOLEAN"
+            ]
+          },
+          "groupName": {
+            "type": "string"
+          },
+          "pattern": {
+            "type": "string"
+          },
+          "required": {
+            "type": "boolean"
+          },
+          "readOnly": {
+            "type": "boolean"
+          },
+          "multiple": {
+            "type": "boolean"
+          },
+          "multipleLimit": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "unit": {
+            "type": "string"
+          },
+          "unitLabel": {
+            "type": "string"
+          },
+          "context": {
+            "type": "string"
+          },
+          "label": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "options": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ParameterOption"
+            }
+          },
+          "filterCriteria": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/FilterCriteria"
+            }
+          },
+          "limitToOptions": {
+            "type": "boolean"
+          },
+          "advanced": {
+            "type": "boolean"
+          },
+          "minimum": {
+            "type": "number"
+          },
+          "maximum": {
+            "type": "number"
+          },
+          "stepSize": {
+            "type": "number"
+          },
+          "verifyable": {
+            "type": "boolean"
+          },
+          "default": {
+            "type": "string"
+          }
+        }
+      },
+      "Configuration": {
+        "type": "object",
+        "properties": {
+          "properties": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "object"
+            }
+          }
+        }
+      },
+      "FilterCriteria": {
+        "type": "object",
+        "properties": {
+          "value": {
+            "type": "string"
+          },
+          "name": {
+            "type": "string"
+          }
+        }
+      },
+      "Module": {
+        "type": "object",
+        "properties": {
+          "description": {
+            "type": "string"
+          },
+          "label": {
+            "type": "string"
+          },
+          "typeUID": {
+            "type": "string"
+          },
+          "configuration": {
+            "$ref": "#/components/schemas/Configuration"
+          },
+          "id": {
+            "type": "string"
+          }
+        }
+      },
+      "ParameterOption": {
+        "type": "object",
+        "properties": {
+          "label": {
+            "type": "string"
+          },
+          "value": {
+            "type": "string"
+          }
+        }
+      },
+      "Rule": {
+        "type": "object",
+        "properties": {
+          "description": {
+            "type": "string"
+          },
+          "templateUID": {
+            "type": "string"
+          },
+          "triggers": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Trigger"
+            }
+          },
+          "configurationDescriptions": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ConfigDescriptionParameter"
+            }
+          },
+          "tags": {
+            "uniqueItems": true,
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "uid": {
+            "type": "string"
+          },
+          "visibility": {
+            "type": "string",
+            "enum": [
+              "VISIBLE",
+              "HIDDEN",
+              "EXPERT"
+            ]
+          },
+          "configuration": {
+            "$ref": "#/components/schemas/Configuration"
+          },
+          "modules": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Module"
+            }
+          },
+          "conditions": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Condition"
+            }
+          },
+          "name": {
+            "type": "string"
+          },
+          "actions": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Action"
+            }
+          }
+        }
+      },
+      "RuleExecution": {
+        "type": "object",
+        "properties": {
+          "date": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "rule": {
+            "$ref": "#/components/schemas/Rule"
+          }
+        }
+      },
+      "Trigger": {
+        "type": "object",
+        "properties": {
+          "description": {
+            "type": "string"
+          },
+          "label": {
+            "type": "string"
+          },
+          "typeUID": {
+            "type": "string"
+          },
+          "configuration": {
+            "$ref": "#/components/schemas/Configuration"
+          },
+          "id": {
+            "type": "string"
+          }
+        }
+      },
+      "Template": {
+        "type": "object",
+        "properties": {
+          "description": {
+            "type": "string"
+          },
+          "label": {
+            "type": "string"
+          },
+          "tags": {
+            "uniqueItems": true,
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "uid": {
+            "type": "string"
+          },
+          "visibility": {
+            "type": "string",
+            "enum": [
+              "VISIBLE",
+              "HIDDEN",
+              "EXPERT"
+            ]
+          }
+        }
+      },
+      "Input": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "type": {
+            "type": "string"
+          },
+          "label": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "required": {
+            "type": "boolean"
+          },
+          "tags": {
+            "uniqueItems": true,
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "reference": {
+            "type": "string"
+          },
+          "defaultValue": {
+            "type": "string"
+          }
+        }
+      },
+      "Output": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "type": {
+            "type": "string"
+          },
+          "tags": {
+            "uniqueItems": true,
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "label": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "reference": {
+            "type": "string"
+          },
+          "defaultValue": {
+            "type": "string"
+          }
+        }
+      },
+      "ThingActionDTO": {
+        "type": "object",
+        "properties": {
+          "actionUid": {
+            "type": "string"
+          },
+          "label": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "inputs": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Input"
+            }
+          },
+          "outputs": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Output"
+            }
+          }
+        }
+      },
+      "AudioSinkDTO": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "label": {
+            "type": "string"
+          }
+        }
+      },
+      "AudioSourceDTO": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "label": {
+            "type": "string"
+          }
+        }
+      },
+      "UserApiTokenDTO": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "createdTime": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "scope": {
+            "type": "string"
+          }
+        }
+      },
+      "UserSessionDTO": {
+        "type": "object",
+        "properties": {
+          "sessionId": {
+            "type": "string"
+          },
+          "createdTime": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "lastRefreshTime": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "clientId": {
+            "type": "string"
+          },
+          "scope": {
+            "type": "string"
+          }
+        }
+      },
+      "TokenResponseDTO": {
+        "type": "object",
+        "properties": {
+          "access_token": {
+            "type": "string"
+          },
+          "token_type": {
+            "type": "string"
+          },
+          "expires_in": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "refresh_token": {
+            "type": "string"
+          },
+          "scope": {
+            "type": "string"
+          },
+          "user": {
+            "$ref": "#/components/schemas/UserDTO"
+          }
+        }
+      },
+      "UserDTO": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "roles": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          }
+        }
+      },
+      "Addon": {
+        "type": "object",
+        "properties": {
+          "uid": {
+            "type": "string"
+          },
+          "id": {
+            "type": "string"
+          },
+          "label": {
+            "type": "string"
+          },
+          "version": {
+            "type": "string"
+          },
+          "maturity": {
+            "type": "string"
+          },
+          "compatible": {
+            "type": "boolean"
+          },
+          "contentType": {
+            "type": "string"
+          },
+          "link": {
+            "type": "string"
+          },
+          "author": {
+            "type": "string"
+          },
+          "verifiedAuthor": {
+            "type": "boolean"
+          },
+          "installed": {
+            "type": "boolean"
+          },
+          "type": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "detailedDescription": {
+            "type": "string"
+          },
+          "configDescriptionURI": {
+            "type": "string"
+          },
+          "keywords": {
+            "type": "string"
+          },
+          "countries": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "license": {
+            "type": "string"
+          },
+          "connection": {
+            "type": "string"
+          },
+          "backgroundColor": {
+            "type": "string"
+          },
+          "imageLink": {
+            "type": "string"
+          },
+          "properties": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "object"
+            }
+          },
+          "loggerPackages": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          }
+        }
+      },
+      "AddonType": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "label": {
+            "type": "string"
+          }
+        }
+      },
+      "ChannelTypeDTO": {
+        "type": "object",
+        "properties": {
+          "parameters": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ConfigDescriptionParameterDTO"
+            }
+          },
+          "parameterGroups": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ConfigDescriptionParameterGroupDTO"
+            }
+          },
+          "description": {
+            "type": "string"
+          },
+          "label": {
+            "type": "string"
+          },
+          "category": {
+            "type": "string"
+          },
+          "itemType": {
+            "type": "string"
+          },
+          "kind": {
+            "type": "string"
+          },
+          "stateDescription": {
+            "$ref": "#/components/schemas/StateDescription"
+          },
+          "tags": {
+            "uniqueItems": true,
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "UID": {
+            "type": "string"
+          },
+          "advanced": {
+            "type": "boolean"
+          },
+          "commandDescription": {
+            "$ref": "#/components/schemas/CommandDescription"
+          }
+        }
+      },
+      "CommandDescription": {
+        "type": "object",
+        "properties": {
+          "commandOptions": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/CommandOption"
+            }
+          }
+        }
+      },
+      "CommandOption": {
+        "type": "object",
+        "properties": {
+          "command": {
+            "type": "string"
+          },
+          "label": {
+            "type": "string"
+          }
+        }
+      },
+      "ConfigDescriptionParameterGroupDTO": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "context": {
+            "type": "string"
+          },
+          "advanced": {
+            "type": "boolean"
+          },
+          "label": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          }
+        }
+      },
+      "StateDescription": {
+        "type": "object",
+        "properties": {
+          "minimum": {
+            "type": "number"
+          },
+          "maximum": {
+            "type": "number"
+          },
+          "step": {
+            "type": "number"
+          },
+          "pattern": {
+            "type": "string"
+          },
+          "readOnly": {
+            "type": "boolean"
+          },
+          "options": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/StateOption"
+            }
+          }
+        }
+      },
+      "StateOption": {
+        "type": "object",
+        "properties": {
+          "value": {
+            "type": "string"
+          },
+          "label": {
+            "type": "string"
+          }
+        }
+      },
+      "ConfigDescriptionDTO": {
+        "type": "object",
+        "properties": {
+          "uri": {
+            "type": "string"
+          },
+          "parameters": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ConfigDescriptionParameterDTO"
+            }
+          },
+          "parameterGroups": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ConfigDescriptionParameterGroupDTO"
+            }
+          }
+        }
+      },
+      "DiscoveryResultDTO": {
+        "type": "object",
+        "properties": {
+          "bridgeUID": {
+            "type": "string"
+          },
+          "flag": {
+            "type": "string",
+            "enum": [
+              "NEW",
+              "IGNORED"
+            ]
+          },
+          "label": {
+            "type": "string"
+          },
+          "properties": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "object"
+            }
+          },
+          "representationProperty": {
+            "type": "string"
+          },
+          "thingUID": {
+            "type": "string"
+          },
+          "thingTypeUID": {
+            "type": "string"
+          }
+        }
+      },
+      "MetadataDTO": {
+        "type": "object",
+        "properties": {
+          "value": {
+            "type": "string"
+          },
+          "config": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "object"
+            }
+          }
+        }
+      },
+      "EnrichedItemDTO": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string"
+          },
+          "name": {
+            "type": "string"
+          },
+          "label": {
+            "type": "string"
+          },
+          "category": {
+            "type": "string"
+          },
+          "tags": {
+            "uniqueItems": true,
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "groupNames": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "link": {
+            "type": "string"
+          },
+          "state": {
+            "type": "string"
+          },
+          "transformedState": {
+            "type": "string"
+          },
+          "stateDescription": {
+            "$ref": "#/components/schemas/StateDescription"
+          },
+          "unitSymbol": {
+            "type": "string"
+          },
+          "commandDescription": {
+            "$ref": "#/components/schemas/CommandDescription"
+          },
+          "metadata": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "object"
+            }
+          },
+          "editable": {
+            "type": "boolean"
+          }
+        }
+      },
+      "GroupFunctionDTO": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "params": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          }
+        }
+      },
+      "GroupItemDTO": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string"
+          },
+          "name": {
+            "type": "string"
+          },
+          "label": {
+            "type": "string"
+          },
+          "category": {
+            "type": "string"
+          },
+          "tags": {
+            "uniqueItems": true,
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "groupNames": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "groupType": {
+            "type": "string"
+          },
+          "function": {
+            "$ref": "#/components/schemas/GroupFunctionDTO"
+          }
+        }
+      },
+      "EnrichedItemChannelLinkDTO": {
+        "type": "object",
+        "properties": {
+          "itemName": {
+            "type": "string"
+          },
+          "channelUID": {
+            "type": "string"
+          },
+          "configuration": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "object"
+            }
+          },
+          "editable": {
+            "type": "boolean"
+          }
+        }
+      },
+      "ItemChannelLinkDTO": {
+        "type": "object",
+        "properties": {
+          "itemName": {
+            "type": "string"
+          },
+          "channelUID": {
+            "type": "string"
+          },
+          "configuration": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "object"
+            }
+          }
+        }
+      },
+      "HistoryDataBean": {
+        "type": "object",
+        "properties": {
+          "time": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "state": {
+            "type": "string"
+          }
+        }
+      },
+      "ItemHistoryDTO": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "totalrecords": {
+            "type": "string"
+          },
+          "datapoints": {
+            "type": "string"
+          },
+          "data": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/HistoryDataBean"
+            }
+          }
+        }
+      },
+      "PersistenceCronStrategyDTO": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "cronExpression": {
+            "type": "string"
+          }
+        }
+      },
+      "PersistenceFilterDTO": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "value": {
+            "type": "number"
+          },
+          "relative": {
+            "type": "boolean"
+          },
+          "unit": {
+            "type": "string"
+          },
+          "lower": {
+            "type": "number"
+          },
+          "upper": {
+            "type": "number"
+          },
+          "values": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "inverted": {
+            "type": "boolean"
+          }
+        }
+      },
+      "PersistenceItemConfigurationDTO": {
+        "type": "object",
+        "properties": {
+          "items": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "strategies": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "filters": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "alias": {
+            "type": "string"
+          }
+        }
+      },
+      "PersistenceServiceConfigurationDTO": {
+        "type": "object",
+        "properties": {
+          "serviceId": {
+            "type": "string"
+          },
+          "configs": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/PersistenceItemConfigurationDTO"
+            }
+          },
+          "defaults": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "cronStrategies": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/PersistenceCronStrategyDTO"
+            }
+          },
+          "thresholdFilters": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/PersistenceFilterDTO"
+            }
+          },
+          "timeFilters": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/PersistenceFilterDTO"
+            }
+          },
+          "equalsFilters": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/PersistenceFilterDTO"
+            }
+          },
+          "includeFilters": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/PersistenceFilterDTO"
+            }
+          },
+          "editable": {
+            "type": "boolean"
+          }
+        }
+      },
+      "PersistenceItemInfo": {
+        "type": "object",
+        "properties": {
+          "earliest": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "latest": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "count": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "name": {
+            "type": "string"
+          }
+        }
+      },
+      "PersistenceServiceDTO": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "label": {
+            "type": "string"
+          },
+          "type": {
+            "type": "string"
+          }
+        }
+      },
+      "ProfileTypeDTO": {
+        "type": "object",
+        "properties": {
+          "uid": {
+            "type": "string"
+          },
+          "label": {
+            "type": "string"
+          },
+          "kind": {
+            "type": "string"
+          },
+          "supportedItemTypes": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          }
+        }
+      },
+      "ConfigurableServiceDTO": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "label": {
+            "type": "string"
+          },
+          "category": {
+            "type": "string"
+          },
+          "configDescriptionURI": {
+            "type": "string"
+          },
+          "multiple": {
+            "type": "boolean"
+          }
+        }
+      },
+      "EnrichedSemanticTagDTO": {
+        "type": "object"
+      },
+      "EnrichedChannelDTO": {
+        "type": "object",
+        "properties": {
+          "uid": {
+            "type": "string"
+          },
+          "id": {
+            "type": "string"
+          },
+          "channelTypeUID": {
+            "type": "string"
+          },
+          "itemType": {
+            "type": "string"
+          },
+          "kind": {
+            "type": "string"
+          },
+          "label": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "defaultTags": {
+            "uniqueItems": true,
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "properties": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "string"
+            }
+          },
+          "configuration": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "object"
+            }
+          },
+          "autoUpdatePolicy": {
+            "type": "string"
+          },
+          "linkedItems": {
+            "uniqueItems": true,
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          }
+        }
+      },
+      "EnrichedThingDTO": {
+        "type": "object",
+        "properties": {
+          "label": {
+            "type": "string"
+          },
+          "bridgeUID": {
+            "type": "string"
+          },
+          "configuration": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "object"
+            }
+          },
+          "properties": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "string"
+            }
+          },
+          "UID": {
+            "type": "string"
+          },
+          "thingTypeUID": {
+            "type": "string"
+          },
+          "location": {
+            "type": "string"
+          },
+          "channels": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/EnrichedChannelDTO"
+            }
+          },
+          "statusInfo": {
+            "$ref": "#/components/schemas/ThingStatusInfo"
+          },
+          "firmwareStatus": {
+            "$ref": "#/components/schemas/FirmwareStatusDTO"
+          },
+          "editable": {
+            "type": "boolean"
+          }
+        }
+      },
+      "FirmwareStatusDTO": {
+        "type": "object",
+        "properties": {
+          "status": {
+            "type": "string"
+          },
+          "updatableVersion": {
+            "type": "string"
+          }
+        }
+      },
+      "ThingStatusInfo": {
+        "type": "object",
+        "properties": {
+          "status": {
+            "type": "string",
+            "enum": [
+              "UNINITIALIZED",
+              "INITIALIZING",
+              "UNKNOWN",
+              "ONLINE",
+              "OFFLINE",
+              "REMOVING",
+              "REMOVED"
+            ]
+          },
+          "statusDetail": {
+            "type": "string",
+            "enum": [
+              "NONE",
+              "NOT_YET_READY",
+              "HANDLER_MISSING_ERROR",
+              "HANDLER_REGISTERING_ERROR",
+              "HANDLER_INITIALIZING_ERROR",
+              "HANDLER_CONFIGURATION_PENDING",
+              "CONFIGURATION_PENDING",
+              "COMMUNICATION_ERROR",
+              "CONFIGURATION_ERROR",
+              "BRIDGE_OFFLINE",
+              "FIRMWARE_UPDATING",
+              "DUTY_CYCLE",
+              "BRIDGE_UNINITIALIZED",
+              "GONE",
+              "DISABLED"
+            ]
+          },
+          "description": {
+            "type": "string"
+          }
+        }
+      },
+      "ChannelDTO": {
+        "type": "object",
+        "properties": {
+          "uid": {
+            "type": "string"
+          },
+          "id": {
+            "type": "string"
+          },
+          "channelTypeUID": {
+            "type": "string"
+          },
+          "itemType": {
+            "type": "string"
+          },
+          "kind": {
+            "type": "string"
+          },
+          "label": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "defaultTags": {
+            "uniqueItems": true,
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "properties": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "string"
+            }
+          },
+          "configuration": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "object"
+            }
+          },
+          "autoUpdatePolicy": {
+            "type": "string"
+          }
+        }
+      },
+      "ThingDTO": {
+        "type": "object",
+        "properties": {
+          "label": {
+            "type": "string"
+          },
+          "bridgeUID": {
+            "type": "string"
+          },
+          "configuration": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "object"
+            }
+          },
+          "properties": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "string"
+            }
+          },
+          "UID": {
+            "type": "string"
+          },
+          "thingTypeUID": {
+            "type": "string"
+          },
+          "location": {
+            "type": "string"
+          },
+          "channels": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ChannelDTO"
+            }
+          }
+        }
+      },
+      "ConfigStatusMessage": {
+        "type": "object",
+        "properties": {
+          "parameterName": {
+            "type": "string"
+          },
+          "type": {
+            "type": "string",
+            "enum": [
+              "INFORMATION",
+              "WARNING",
+              "ERROR",
+              "PENDING"
+            ]
+          },
+          "message": {
+            "type": "string"
+          },
+          "statusCode": {
+            "type": "integer",
+            "format": "int32"
+          }
+        }
+      },
+      "FirmwareDTO": {
+        "type": "object",
+        "properties": {
+          "thingTypeUID": {
+            "type": "string"
+          },
+          "vendor": {
+            "type": "string"
+          },
+          "model": {
+            "type": "string"
+          },
+          "modelRestricted": {
+            "type": "boolean"
+          },
+          "description": {
+            "type": "string"
+          },
+          "version": {
+            "type": "string"
+          },
+          "changelog": {
+            "type": "string"
+          },
+          "prerequisiteVersion": {
+            "type": "string"
+          }
+        }
+      },
+      "StrippedThingTypeDTO": {
+        "type": "object",
+        "properties": {
+          "UID": {
+            "type": "string"
+          },
+          "label": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "category": {
+            "type": "string"
+          },
+          "listed": {
+            "type": "boolean"
+          },
+          "supportedBridgeTypeUIDs": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "bridge": {
+            "type": "boolean"
+          }
+        }
+      },
+      "ChannelDefinitionDTO": {
+        "type": "object",
+        "properties": {
+          "description": {
+            "type": "string"
+          },
+          "id": {
+            "type": "string"
+          },
+          "label": {
+            "type": "string"
+          },
+          "tags": {
+            "uniqueItems": true,
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "properties": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "string"
+            }
+          },
+          "category": {
+            "type": "string"
+          },
+          "stateDescription": {
+            "$ref": "#/components/schemas/StateDescription"
+          },
+          "advanced": {
+            "type": "boolean"
+          },
+          "typeUID": {
+            "type": "string"
+          }
+        }
+      },
+      "ChannelGroupDefinitionDTO": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "label": {
+            "type": "string"
+          },
+          "channels": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ChannelDefinitionDTO"
+            }
+          }
+        }
+      },
+      "ThingTypeDTO": {
+        "type": "object",
+        "properties": {
+          "UID": {
+            "type": "string"
+          },
+          "label": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "category": {
+            "type": "string"
+          },
+          "listed": {
+            "type": "boolean"
+          },
+          "supportedBridgeTypeUIDs": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "bridge": {
+            "type": "boolean"
+          },
+          "channels": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ChannelDefinitionDTO"
+            }
+          },
+          "channelGroups": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ChannelGroupDefinitionDTO"
+            }
+          },
+          "configParameters": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ConfigDescriptionParameterDTO"
+            }
+          },
+          "parameterGroups": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/ConfigDescriptionParameterGroupDTO"
+            }
+          },
+          "properties": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "string"
+            }
+          },
+          "extensibleChannelTypeIds": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          }
+        }
+      },
+      "Links": {
+        "type": "object",
+        "properties": {
+          "type": {
+            "type": "string"
+          },
+          "url": {
+            "type": "string"
+          }
+        }
+      },
+      "RootBean": {
+        "type": "object",
+        "properties": {
+          "version": {
+            "type": "string"
+          },
+          "locale": {
+            "type": "string"
+          },
+          "measurementSystem": {
+            "type": "string"
+          },
+          "runtimeInfo": {
+            "$ref": "#/components/schemas/RuntimeInfo"
+          },
+          "links": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/Links"
+            }
+          }
+        }
+      },
+      "RuntimeInfo": {
+        "type": "object",
+        "properties": {
+          "version": {
+            "type": "string"
+          },
+          "buildString": {
+            "type": "string"
+          }
+        }
+      },
+      "SystemInfo": {
+        "type": "object",
+        "properties": {
+          "configFolder": {
+            "type": "string"
+          },
+          "userdataFolder": {
+            "type": "string"
+          },
+          "logFolder": {
+            "type": "string"
+          },
+          "javaVersion": {
+            "type": "string"
+          },
+          "javaVendor": {
+            "type": "string"
+          },
+          "javaVendorVersion": {
+            "type": "string"
+          },
+          "osName": {
+            "type": "string"
+          },
+          "osVersion": {
+            "type": "string"
+          },
+          "osArchitecture": {
+            "type": "string"
+          },
+          "availableProcessors": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "freeMemory": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "totalMemory": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "uptime": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "startLevel": {
+            "type": "integer",
+            "format": "int32"
+          }
+        }
+      },
+      "SystemInfoBean": {
+        "type": "object",
+        "properties": {
+          "systemInfo": {
+            "$ref": "#/components/schemas/SystemInfo"
+          }
+        }
+      },
+      "DimensionInfo": {
+        "type": "object",
+        "properties": {
+          "dimension": {
+            "type": "string"
+          },
+          "systemUnit": {
+            "type": "string"
+          }
+        }
+      },
+      "UoMInfo": {
+        "type": "object",
+        "properties": {
+          "dimensions": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/DimensionInfo"
+            }
+          }
+        }
+      },
+      "UoMInfoBean": {
+        "type": "object",
+        "properties": {
+          "uomInfo": {
+            "$ref": "#/components/schemas/UoMInfo"
+          }
+        }
+      },
+      "MappingDTO": {
+        "type": "object",
+        "properties": {
+          "row": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "column": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "command": {
+            "type": "string"
+          },
+          "label": {
+            "type": "string"
+          },
+          "icon": {
+            "type": "string"
+          }
+        }
+      },
+      "PageDTO": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "title": {
+            "type": "string"
+          },
+          "icon": {
+            "type": "string"
+          },
+          "link": {
+            "type": "string"
+          },
+          "parent": {
+            "$ref": "#/components/schemas/PageDTO"
+          },
+          "leaf": {
+            "type": "boolean"
+          },
+          "timeout": {
+            "type": "boolean"
+          },
+          "widgets": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/WidgetDTO"
+            }
+          }
+        }
+      },
+      "WidgetDTO": {
+        "type": "object",
+        "properties": {
+          "widgetId": {
+            "type": "string"
+          },
+          "type": {
+            "type": "string"
+          },
+          "name": {
+            "type": "string"
+          },
+          "visibility": {
+            "type": "boolean"
+          },
+          "label": {
+            "type": "string"
+          },
+          "labelSource": {
+            "type": "string"
+          },
+          "icon": {
+            "type": "string"
+          },
+          "staticIcon": {
+            "type": "boolean"
+          },
+          "labelcolor": {
+            "type": "string"
+          },
+          "valuecolor": {
+            "type": "string"
+          },
+          "iconcolor": {
+            "type": "string"
+          },
+          "pattern": {
+            "type": "string"
+          },
+          "unit": {
+            "type": "string"
+          },
+          "mappings": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/MappingDTO"
+            }
+          },
+          "switchSupport": {
+            "type": "boolean"
+          },
+          "sendFrequency": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "refresh": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "height": {
+            "type": "integer",
+            "format": "int32"
+          },
+          "minValue": {
+            "type": "number"
+          },
+          "maxValue": {
+            "type": "number"
+          },
+          "step": {
+            "type": "number"
+          },
+          "inputHint": {
+            "type": "string"
+          },
+          "url": {
+            "type": "string"
+          },
+          "encoding": {
+            "type": "string"
+          },
+          "service": {
+            "type": "string"
+          },
+          "period": {
+            "type": "string"
+          },
+          "yAxisDecimalPattern": {
+            "type": "string"
+          },
+          "legend": {
+            "type": "boolean"
+          },
+          "forceAsItem": {
+            "type": "boolean"
+          },
+          "state": {
+            "type": "string"
+          },
+          "item": {
+            "$ref": "#/components/schemas/EnrichedItemDTO"
+          },
+          "linkedPage": {
+            "$ref": "#/components/schemas/PageDTO"
+          }
+        }
+      },
+      "SitemapDTO": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "icon": {
+            "type": "string"
+          },
+          "label": {
+            "type": "string"
+          },
+          "link": {
+            "type": "string"
+          },
+          "homepage": {
+            "$ref": "#/components/schemas/PageDTO"
+          }
+        }
+      },
+      "Transformation": {
+        "type": "object",
+        "properties": {
+          "uid": {
+            "type": "string"
+          },
+          "label": {
+            "type": "string"
+          },
+          "type": {
+            "type": "string"
+          },
+          "configuration": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "string"
+            }
+          }
+        }
+      },
+      "TransformationDTO": {
+        "type": "object",
+        "properties": {
+          "uid": {
+            "type": "string"
+          },
+          "label": {
+            "type": "string"
+          },
+          "type": {
+            "type": "string"
+          },
+          "configuration": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "string"
+            }
+          },
+          "editable": {
+            "type": "boolean"
+          }
+        }
+      },
+      "RootUIComponent": {
+        "type": "object",
+        "properties": {
+          "component": {
+            "type": "string"
+          },
+          "config": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "object"
+            }
+          },
+          "slots": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "array",
+              "items": {
+                "$ref": "#/components/schemas/UIComponent"
+              }
+            }
+          },
+          "uid": {
+            "type": "string"
+          },
+          "tags": {
+            "uniqueItems": true,
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "props": {
+            "$ref": "#/components/schemas/ConfigDescriptionDTO"
+          },
+          "timestamp": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "type": {
+            "type": "string"
+          }
+        }
+      },
+      "UIComponent": {
+        "type": "object",
+        "properties": {
+          "component": {
+            "type": "string"
+          },
+          "config": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "object"
+            }
+          },
+          "type": {
+            "type": "string"
+          }
+        }
+      },
+      "TileDTO": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "url": {
+            "type": "string"
+          },
+          "overlay": {
+            "type": "string"
+          },
+          "imageUrl": {
+            "type": "string"
+          }
+        }
+      },
+      "VoiceDTO": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "label": {
+            "type": "string"
+          },
+          "locale": {
+            "type": "string"
+          }
+        }
+      },
+      "HumanLanguageInterpreterDTO": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "label": {
+            "type": "string"
+          },
+          "locales": {
+            "uniqueItems": true,
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          }
+        }
+      },
+      "LoggerInfo": {
+        "type": "object",
+        "properties": {
+          "loggerName": {
+            "type": "string"
+          },
+          "level": {
+            "type": "string"
+          }
+        }
+      },
+      "LoggerBean": {
+        "type": "object",
+        "properties": {
+          "loggers": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/LoggerInfo"
+            }
+          }
+        }
+      },
+      "IconSet": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "string"
+          },
+          "label": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "formats": {
+            "uniqueItems": true,
+            "type": "array",
+            "items": {
+              "type": "string",
+              "enum": [
+                "PNG",
+                "SVG"
+              ]
+            }
+          }
+        }
+      },
+      "Card": {
+        "type": "object",
+        "properties": {
+          "config": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "object"
+            }
+          },
+          "slots": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "array",
+              "items": {
+                "$ref": "#/components/schemas/Component"
+              }
+            }
+          },
+          "uid": {
+            "type": "string"
+          },
+          "title": {
+            "type": "string"
+          },
+          "subtitle": {
+            "type": "string"
+          },
+          "tags": {
+            "uniqueItems": true,
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "bookmarked": {
+            "type": "boolean"
+          },
+          "notReuseableInChat": {
+            "type": "boolean"
+          },
+          "addToDeckDenied": {
+            "type": "boolean"
+          },
+          "ephemeral": {
+            "type": "boolean"
+          },
+          "timestamp": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "objectAttributes": {
+            "uniqueItems": true,
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "locationAttributes": {
+            "uniqueItems": true,
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "bookmark": {
+            "type": "boolean",
+            "writeOnly": true
+          },
+          "name": {
+            "type": "string"
+          }
+        }
+      },
+      "ChatReply": {
+        "type": "object",
+        "properties": {
+          "language": {
+            "type": "string"
+          },
+          "query": {
+            "type": "string"
+          },
+          "answer": {
+            "type": "string"
+          },
+          "hint": {
+            "type": "string"
+          },
+          "intent": {
+            "$ref": "#/components/schemas/Intent"
+          },
+          "matchedItemNames": {
+            "type": "array",
+            "items": {
+              "type": "string"
+            }
+          },
+          "card": {
+            "$ref": "#/components/schemas/Card"
+          },
+          "matchedItems": {
+            "type": "array",
+            "writeOnly": true,
+            "items": {
+              "type": "string"
+            }
+          }
+        }
+      },
+      "Component": {
+        "type": "object",
+        "properties": {
+          "config": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "object"
+            }
+          },
+          "name": {
+            "type": "string"
+          }
+        }
+      },
+      "Intent": {
+        "type": "object",
+        "properties": {
+          "name": {
+            "type": "string"
+          },
+          "entities": {
+            "type": "object",
+            "additionalProperties": {
+              "type": "string"
+            }
+          }
+        }
+      }
+    },
+    "securitySchemes": {
+      "oauth2": {
+        "type": "oauth2",
+        "flows": {
+          "authorizationCode": {
+            "authorizationUrl": "/auth/authorize",
+            "tokenUrl": "/rest/auth/token",
+            "scopes": {
+              "admin": "Administration operations"
+            }
+          }
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/openHAB.Core.Client/openHAB.Core.Client.csproj b/src/openHAB.Core.Client/openHAB.Core.Client.csproj
index 8b0d67ab..6e8417da 100644
--- a/src/openHAB.Core.Client/openHAB.Core.Client.csproj
+++ b/src/openHAB.Core.Client/openHAB.Core.Client.csproj
@@ -1,16 +1,44 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="5.0.3">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Rest.ClientRuntime" Version="2.3.23" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
-  </ItemGroup>
-
+	<PropertyGroup>
+		<TargetFramework>net8.0-windows10.0.26100.0</TargetFramework>
+		<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+		<RootNamespace>openHAB.Core.Client</RootNamespace>
+		<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
+		<UseWinUI>true</UseWinUI>
+		<SupportedOSPlatformVersion>10.0.20348.0</SupportedOSPlatformVersion>
+		<Platforms>x86;x64;arm64</Platforms>
+	</PropertyGroup>
+	<ItemGroup>
+	  <Content Include="Schema\openhab-schema.json" />
+	</ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.0" />
+		<PackageReference Include="CommunityToolkit.WinUI.Helpers" Version="8.1.240916" />
+		<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
+		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.241114003" />
+		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
+		<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers">
+			<Version>8.0.0</Version>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+			<PrivateAssets>all</PrivateAssets>
+		</PackageReference>
+	</ItemGroup>
+	<ItemGroup>
+		<PRIResource Include="..\Openhab.Core\Strings\de-DE\Resources.resw">
+			<Link>Strings\de-DE\Resources.resw</Link>
+		</PRIResource>
+		<PRIResource Include="..\Openhab.Core\Strings\en-US\Resources.resw">
+			<Link>Strings\en-US\Resources.resw</Link>
+		</PRIResource>
+		<PRIResource Include="..\Openhab.Core\Strings\de-DE\Errors.resw">
+			<Link>Strings\de-DE\Errors.resw</Link>
+		</PRIResource>
+		<PRIResource Include="..\Openhab.Core\Strings\en-US\Errors.resw">
+			<Link>Strings\en-US\Errors.resw</Link>
+		</PRIResource>
+	</ItemGroup>
+	<ItemGroup>
+	  <ProjectReference Include="..\openHAB.Common\openHAB.Common.csproj" />
+	</ItemGroup>
 </Project>
diff --git a/src/openHAB.Core/AppPaths.cs b/src/openHAB.Core/AppPaths.cs
new file mode 100644
index 00000000..ef75f831
--- /dev/null
+++ b/src/openHAB.Core/AppPaths.cs
@@ -0,0 +1,38 @@
+using System;
+using System.IO;
+using Windows.ApplicationModel;
+
+namespace openHAB.Core;
+
+/// <summary>
+/// Represents the paths used by the application.
+/// </summary>
+public class AppPaths
+{
+    private static readonly string _applicationName = AppInfo.Current.DisplayInfo.DisplayName;
+
+    /// <summary>
+    /// Gets the directory path for application data.
+    /// </summary>
+    public static string ApplicationDataDirectory => Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), _applicationName);
+
+    /// <summary>
+    /// Gets the directory path for icon cache.
+    /// </summary>
+    public static string IconCacheDirectory => Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), _applicationName, "icons");
+
+    /// <summary>
+    /// Gets the directory path for logs.
+    /// </summary>
+    public static string LogsDirectory => Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), _applicationName, "logs");
+
+    /// <summary>
+    /// Gets the file path for settings.
+    /// </summary>
+    public static string SettingsFilePath => Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), _applicationName, "settings.json");
+
+    /// <summary>
+    /// Gets the file path for connection settings.
+    /// </summary>
+    public static string ConnectionFilePath => Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), _applicationName, "connection.json");
+}
diff --git a/src/openHAB.Core/AppResources.cs b/src/openHAB.Core/AppResources.cs
deleted file mode 100644
index 2c745cae..00000000
--- a/src/openHAB.Core/AppResources.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using Windows.ApplicationModel.Resources;
-
-namespace OpenHAB.Core
-{
-    /// <summary>
-    ///   Resources.
-    /// </summary>
-    public class AppResources
-    {
-        private static ResourceLoader _resourceLoader;
-        private static ResourceLoader _errorResourceLoader;
-
-        /// <summary>
-        ///   Gets the localized UI values.
-        /// </summary>
-        public static ResourceLoader Values
-        {
-            get
-            {
-                if (_resourceLoader == null)
-                {
-                    _resourceLoader = ResourceLoader.GetForViewIndependentUse("Resources");
-                }
-
-                return _resourceLoader;
-            }
-        }
-
-        /// <summary>
-        ///   Gets the localized error strings.
-        /// </summary>
-        public static ResourceLoader Errors
-        {
-            get
-            {
-                if (_errorResourceLoader == null)
-                {
-                    _errorResourceLoader = ResourceLoader.GetForViewIndependentUse("Errors");
-                }
-
-                return _errorResourceLoader;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/openHAB.Core/Common/ActionCommand.cs b/src/openHAB.Core/Common/ActionCommand.cs
index d2f27e4c..7ddee4e7 100644
--- a/src/openHAB.Core/Common/ActionCommand.cs
+++ b/src/openHAB.Core/Common/ActionCommand.cs
@@ -1,74 +1,73 @@
-using System;
+using System;
 using System.Windows.Input;
 
-namespace OpenHAB.Core.Common
+namespace openHAB.Core.Common;
+
+/// <summary>
+///   Action Command for MVVM.
+/// </summary>
+public class ActionCommand : ICommand
 {
+    private readonly Func<object, bool> _canExecuteHandler;
+    private readonly Action<object> _executeHandler;
+
     /// <summary>
-    ///   Action Command for MVVM.
+    ///   Initializes a new instance of the <see cref = "ActionCommand" /> class.
     /// </summary>
-    public class ActionCommand : ICommand
+    /// <param name = "execute">The execute.</param>
+    /// <param name = "canExecute">The can execute.</param>
+    public ActionCommand(Action<object> execute, Func<object, bool> canExecute)
+        : this(execute)
     {
-        private readonly Func<object, bool> _canExecuteHandler;
-        private readonly Action<object> _executeHandler;
+        _canExecuteHandler = canExecute;
+    }
 
-        /// <summary>
-        ///   Initializes a new instance of the <see cref = "ActionCommand" /> class.
-        /// </summary>
-        /// <param name = "execute">The execute.</param>
-        /// <param name = "canExecute">The can execute.</param>
-        public ActionCommand(Action<object> execute, Func<object, bool> canExecute)
-            : this(execute)
-        {
-            _canExecuteHandler = canExecute;
-        }
+    /// <summary>
+    ///   Initializes a new instance of the <see cref = "ActionCommand" /> class.
+    /// </summary>
+    /// <param name = "execute">The execute.</param>
+    public ActionCommand(Action<object> execute)
+    {
+        _executeHandler = execute;
+    }
 
-        /// <summary>
-        ///   Initializes a new instance of the <see cref = "ActionCommand" /> class.
-        /// </summary>
-        /// <param name = "execute">The execute.</param>
-        public ActionCommand(Action<object> execute)
-        {
-            _executeHandler = execute;
-        }
+    /// <summary>
+    /// Occurs when changes occur that affect whether or not the command should execute.
+    /// </summary>
+    public event EventHandler CanExecuteChanged;
 
-        /// <summary>
-        /// Occurs when changes occur that affect whether or not the command should execute.
-        /// </summary>
-        public event EventHandler CanExecuteChanged;
+    /// <summary>
+    /// Invokes the can execute changed.
+    /// </summary>
+    /// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
+    public void InvokeCanExecuteChanged(EventArgs e)
+    {
+        CanExecuteChanged?.Invoke(this, e);
+    }
 
-        /// <summary>
-        /// Invokes the can execute changed.
-        /// </summary>
-        /// <param name="e">The <see cref="System.EventArgs"/> instance containing the event data.</param>
-        public void InvokeCanExecuteChanged(EventArgs e)
-        {
-            CanExecuteChanged?.Invoke(this, e);
-        }
+    /// <summary>
+    ///   Defines the method to be called when the command is invoked.
+    /// </summary>
+    /// <param name = "parameter">Data used by the command.  If the command does not require data to be passed, this object can be set to null.</param>
+    public void Execute(object parameter)
+    {
+        _executeHandler(parameter);
+    }
 
-        /// <summary>
-        ///   Defines the method to be called when the command is invoked.
-        /// </summary>
-        /// <param name = "parameter">Data used by the command.  If the command does not require data to be passed, this object can be set to null.</param>
-        public void Execute(object parameter)
+    /// <summary>
+    ///   Defines the method that determines whether the command can execute in its current state.
+    /// </summary>
+    /// <param name = "parameter">Data used by the command.  If the command does not require data to be passed, this object can be set to null.</param>
+    /// <returns>
+    ///   true if this command can be executed; otherwise, false.
+    /// </returns>
+    public bool CanExecute(object parameter)
+    {
+        if (_canExecuteHandler == null)
         {
-            _executeHandler(parameter);
+            return true;
         }
 
-        /// <summary>
-        ///   Defines the method that determines whether the command can execute in its current state.
-        /// </summary>
-        /// <param name = "parameter">Data used by the command.  If the command does not require data to be passed, this object can be set to null.</param>
-        /// <returns>
-        ///   true if this command can be executed; otherwise, false.
-        /// </returns>
-        public bool CanExecute(object parameter)
-        {
-            if (_canExecuteHandler == null)
-            {
-                return true;
-            }
-
-            return _canExecuteHandler(parameter);
-        }
+        return _canExecuteHandler(parameter);
     }
-}
\ No newline at end of file
+}
diff --git a/src/openHAB.Core/Common/ColorChangedEventArgs.cs b/src/openHAB.Core/Common/ColorChangedEventArgs.cs
index 6f3d4019..8530e983 100644
--- a/src/openHAB.Core/Common/ColorChangedEventArgs.cs
+++ b/src/openHAB.Core/Common/ColorChangedEventArgs.cs
@@ -1,25 +1,27 @@
-using System;
+using System;
 using Windows.UI;
 
-namespace OpenHAB.Core.Common
+namespace openHAB.Core.Common;
+
+/// <summary>
+/// Event arguments for a color changed event.
+/// </summary>
+public class ColorChangedEventArgs : EventArgs
 {
     /// <summary>
-    /// Event arguments for a color changed event.
+    /// Initializes a new instance of the <see cref="ColorChangedEventArgs"/> class.
     /// </summary>
-    public class ColorChangedEventArgs : EventArgs
+    /// <param name="selectedColor">The color that was just selected.</param>
+    public ColorChangedEventArgs(Color selectedColor)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ColorChangedEventArgs"/> class.
-        /// </summary>
-        /// <param name="selectedColor">The color that was just selected.</param>
-        public ColorChangedEventArgs(Color selectedColor)
-        {
-            SelectedColor = selectedColor;
-        }
+        SelectedColor = selectedColor;
+    }
 
-        /// <summary>
-        /// Gets or sets the newly selected color.
-        /// </summary>
-        public Color SelectedColor { get; set; }
+    /// <summary>
+    /// Gets or sets the newly selected color.
+    /// </summary>
+    public Color SelectedColor
+    {
+        get; set;
     }
 }
diff --git a/src/openHAB.Core/Common/ColorHelper.cs b/src/openHAB.Core/Common/ColorHelper.cs
index a1ef9ea6..e8fe131a 100644
--- a/src/openHAB.Core/Common/ColorHelper.cs
+++ b/src/openHAB.Core/Common/ColorHelper.cs
@@ -1,210 +1,209 @@
-using System;
+using System;
 using System.Numerics;
 using Windows.UI;
 
-namespace OpenHAB.Core.Common
+namespace openHAB.Core.Common;
+
+/// <summary>
+/// Helper methods for Color.
+/// http://stackoverflow.com/a/19338652/62857.
+/// </summary>
+public static class ColorHelper
 {
     /// <summary>
-    /// Helper methods for Color.
-    /// http://stackoverflow.com/a/19338652/62857.
+    /// Converts an HSL color value to RGB.
+    /// Input: Vector4 ( X: [0.0, 1.0], Y: [0.0, 1.0], Z: [0.0, 1.0], W: [0.0, 1.0] )
+    /// Output: Color ( R: [0, 255], G: [0, 255], B: [0, 255], A: [0, 255] ).
     /// </summary>
-    public static class ColorHelper
+    /// <param name="hsl">Vector4 defining X = h, Y = s, Z = l, W = a. Ranges [0, 1.0].</param>
+    /// <returns>RGBA Color. Ranges [0, 255].</returns>
+    public static Color FromHSL(Vector4 hsl)
     {
-        /// <summary>
-        /// Converts an HSL color value to RGB.
-        /// Input: Vector4 ( X: [0.0, 1.0], Y: [0.0, 1.0], Z: [0.0, 1.0], W: [0.0, 1.0] )
-        /// Output: Color ( R: [0, 255], G: [0, 255], B: [0, 255], A: [0, 255] ).
-        /// </summary>
-        /// <param name="hsl">Vector4 defining X = h, Y = s, Z = l, W = a. Ranges [0, 1.0].</param>
-        /// <returns>RGBA Color. Ranges [0, 255].</returns>
-        public static Color FromHSL(Vector4 hsl)
+        float r, g, b;
+
+        if (hsl.Y == 0.0f)
         {
-            float r, g, b;
+            r = g = b = hsl.Z;
+        }
+        else
+        {
+            var q = hsl.Z < 0.5f ? hsl.Z * (1.0f + hsl.Y) : hsl.Z + hsl.Y - (hsl.Z * hsl.Y);
+            var p = (2.0f * hsl.Z) - q;
+            r = HueToRgb(p, q, hsl.X + (1.0f / 3.0f));
+            g = HueToRgb(p, q, hsl.X);
+            b = HueToRgb(p, q, hsl.X - (1.0f / 3.0f));
+        }
 
-            if (hsl.Y == 0.0f)
-            {
-                r = g = b = hsl.Z;
-            }
-            else
-            {
-                var q = hsl.Z < 0.5f ? hsl.Z * (1.0f + hsl.Y) : hsl.Z + hsl.Y - (hsl.Z * hsl.Y);
-                var p = (2.0f * hsl.Z) - q;
-                r = HueToRgb(p, q, hsl.X + (1.0f / 3.0f));
-                g = HueToRgb(p, q, hsl.X);
-                b = HueToRgb(p, q, hsl.X - (1.0f / 3.0f));
-            }
+        return Color.FromArgb((byte)(hsl.W * 255), (byte)(r * 255), (byte)(g * 255), (byte)(b * 255));
+    }
 
-            return Color.FromArgb((byte)(hsl.W * 255), (byte)(r * 255), (byte)(g * 255), (byte)(b * 255));
+    // Helper for HslToRgba
+    private static float HueToRgb(float p, float q, float t)
+    {
+        if (t < 0.0f)
+        {
+            t += 1.0f;
         }
 
-        // Helper for HslToRgba
-        private static float HueToRgb(float p, float q, float t)
+        if (t > 1.0f)
         {
-            if (t < 0.0f)
-            {
-                t += 1.0f;
-            }
+            t -= 1.0f;
+        }
 
-            if (t > 1.0f)
-            {
-                t -= 1.0f;
-            }
+        if (t < 1.0f / 6.0f)
+        {
+            return p + ((q - p) * 6.0f * t);
+        }
 
-            if (t < 1.0f / 6.0f)
-            {
-                return p + ((q - p) * 6.0f * t);
-            }
+        if (t < 1.0f / 2.0f)
+        {
+            return q;
+        }
 
-            if (t < 1.0f / 2.0f)
-            {
-                return q;
-            }
+        if (t < 2.0f / 3.0f)
+        {
+            return p + ((q - p) * ((2.0f / 3.0f) - t) * 6.0f);
+        }
 
-            if (t < 2.0f / 3.0f)
-            {
-                return p + ((q - p) * ((2.0f / 3.0f) - t) * 6.0f);
-            }
+        return p;
+    }
 
-            return p;
-        }
+    /// <summary>
+    /// Converts an RGB color value to HSL.
+    /// Input: Color ( R: [0, 255], G: [0, 255], B: [0, 255], A: [0, 255] )
+    /// Output: Vector4 ( X: [0.0, 1.0], Y: [0.0, 1.0], Z: [0.0, 1.0], W: [0.0, 1.0] ).
+    /// </summary>
+    /// <param name="rgba">Color as RGBA value.</param>
+    /// <returns>RGBA color as hex code.</returns>
+    public static Vector4 ToHSL(Color rgba)
+    {
+        float r = rgba.R / 255.0f;
+        float g = rgba.G / 255.0f;
+        float b = rgba.B / 255.0f;
 
-        /// <summary>
-        /// Converts an RGB color value to HSL.
-        /// Input: Color ( R: [0, 255], G: [0, 255], B: [0, 255], A: [0, 255] )
-        /// Output: Vector4 ( X: [0.0, 1.0], Y: [0.0, 1.0], Z: [0.0, 1.0], W: [0.0, 1.0] ).
-        /// </summary>
-        /// <param name="rgba">Color as RGBA value.</param>
-        /// <returns>RGBA color as hex code.</returns>
-        public static Vector4 ToHSL(Color rgba)
-        {
-            float r = rgba.R / 255.0f;
-            float g = rgba.G / 255.0f;
-            float b = rgba.B / 255.0f;
+        float max = (r > g && r > b) ? r : (g > b) ? g : b;
+        float min = (r < g && r < b) ? r : (g < b) ? g : b;
 
-            float max = (r > g && r > b) ? r : (g > b) ? g : b;
-            float min = (r < g && r < b) ? r : (g < b) ? g : b;
+        float h, s, l;
+        h = s = l = (max + min) / 2.0f;
 
-            float h, s, l;
-            h = s = l = (max + min) / 2.0f;
+        if (max == min)
+        {
+            h = s = 0.0f;
+        }
+        else
+        {
+            float delta = max - min;
+            s = (l > 0.5f) ? delta / (2.0f - max - min) : delta / (max + min);
 
-            if (max == min)
+            if (r > g && r > b)
             {
-                h = s = 0.0f;
+                h = (g - b) / delta;
             }
-            else
+            else if (g > b)
             {
-                float delta = max - min;
-                s = (l > 0.5f) ? delta / (2.0f - max - min) : delta / (max + min);
-
-                if (r > g && r > b)
-                {
-                    h = (g - b) / delta;
-                }
-                else if (g > b)
-                {
-                    h = ((b - r) / delta) + 2.0f;
-                }
-                else
-                {
-                    h = ((r - g) / delta) + 4.0f;
-                }
-
-                h /= 6.0f;
+                h = ((b - r) / delta) + 2.0f;
             }
-
-            if (h < 0)
+            else
             {
-                h += 1f;
+                h = ((r - g) / delta) + 4.0f;
             }
 
-            return new Vector4(h, s, l, rgba.A / 255.0f);
+            h /= 6.0f;
         }
 
-        /// <summary>
-        /// Converts to color enum to HSV value.
-        /// from http://stackoverflow.com/a/1626175/62857.
-        /// </summary>
-        /// <param name="color">The color.</param>
-        /// <returns>
-        ///   <br />
-        /// </returns>
-        public static Vector4 ToHSV(Color color)
+        if (h < 0)
         {
-            double hue;
-            double saturation;
-            double value;
-            ToHSV(color, out hue, out saturation, out value);
-            return new Vector4((byte)(hue * 255), (byte)(saturation * 255), (byte)(value * 255), color.A / 255.0f);
+            h += 1f;
         }
 
-        private static void ToHSV(Color rgba, out double hue, out double saturation, out double value)
-        {
-            int max = Math.Max(rgba.R, Math.Max(rgba.G, rgba.B));
-            int min = Math.Min(rgba.R, Math.Min(rgba.G, rgba.B));
+        return new Vector4(h, s, l, rgba.A / 255.0f);
+    }
 
-            var hsl = ToHSL(rgba);
-            hue = hsl.X;
+    /// <summary>
+    /// Converts to color enum to HSV value.
+    /// from http://stackoverflow.com/a/1626175/62857.
+    /// </summary>
+    /// <param name="color">The color.</param>
+    /// <returns>
+    ///   <br />
+    /// </returns>
+    public static Vector4 ToHSV(Color color)
+    {
+        double hue;
+        double saturation;
+        double value;
+        ToHSV(color, out hue, out saturation, out value);
+        return new Vector4((byte)(hue * 255), (byte)(saturation * 255), (byte)(value * 255), color.A / 255.0f);
+    }
 
-            saturation = (max == 0) ? 0 : 1d - (1d * min / max);
-            value = max / 255d;
-        }
+    private static void ToHSV(Color rgba, out double hue, out double saturation, out double value)
+    {
+        int max = Math.Max(rgba.R, Math.Max(rgba.G, rgba.B));
+        int min = Math.Min(rgba.R, Math.Min(rgba.G, rgba.B));
 
-        /// <summary>Converts HSV color to color enum value.</summary>
-        /// <param name="hsv">The HSV.</param>
-        /// <returns>
-        ///   <br />
-        /// </returns>
-        public static Color FromHSV(Vector4 hsv)
-        {
-            var c = FromHSV(hsv.X, hsv.Y, hsv.Z);
-            c.A = (byte)(hsv.W * 255);
-            return c;
-        }
+        var hsl = ToHSL(rgba);
+        hue = hsl.X;
 
-        /// <summary>Convert the HSV value to color enum value.</summary>
-        /// <param name="hue">The hue.</param>
-        /// <param name="saturation">The saturation.</param>
-        /// <param name="value">The value.</param>
-        /// <returns>
-        ///   <br />
-        /// </returns>
-        public static Color FromHSV(double hue, double saturation, double value)
-        {
-            int hi = Convert.ToInt32(Math.Floor(hue / 60)) % 6;
-            double f = (hue / 60) - Math.Floor(hue / 60);
+        saturation = (max == 0) ? 0 : 1d - (1d * min / max);
+        value = max / 255d;
+    }
 
-            value = value * 255;
-            byte v = (byte)value;
-            byte p = (byte)(value * (1 - saturation));
-            byte q = (byte)(value * (1 - (f * saturation)));
-            byte t = (byte)(value * (1 - ((1 - f) * saturation)));
+    /// <summary>Converts HSV color to color enum value.</summary>
+    /// <param name="hsv">The HSV.</param>
+    /// <returns>
+    ///   <br />
+    /// </returns>
+    public static Color FromHSV(Vector4 hsv)
+    {
+        var c = FromHSV(hsv.X, hsv.Y, hsv.Z);
+        c.A = (byte)(hsv.W * 255);
+        return c;
+    }
 
-            if (hi == 0)
-            {
-                return Color.FromArgb(255, v, t, p);
-            }
+    /// <summary>Convert the HSV value to color enum value.</summary>
+    /// <param name="hue">The hue.</param>
+    /// <param name="saturation">The saturation.</param>
+    /// <param name="value">The value.</param>
+    /// <returns>
+    ///   <br />
+    /// </returns>
+    public static Color FromHSV(double hue, double saturation, double value)
+    {
+        int hi = Convert.ToInt32(Math.Floor(hue / 60)) % 6;
+        double f = (hue / 60) - Math.Floor(hue / 60);
 
-            if (hi == 1)
-            {
-                return Color.FromArgb(255, q, v, p);
-            }
+        value = value * 255;
+        byte v = (byte)value;
+        byte p = (byte)(value * (1 - saturation));
+        byte q = (byte)(value * (1 - (f * saturation)));
+        byte t = (byte)(value * (1 - ((1 - f) * saturation)));
 
-            if (hi == 2)
-            {
-                return Color.FromArgb(255, p, v, t);
-            }
+        if (hi == 0)
+        {
+            return Color.FromArgb(255, v, t, p);
+        }
 
-            if (hi == 3)
-            {
-                return Color.FromArgb(255, p, q, v);
-            }
+        if (hi == 1)
+        {
+            return Color.FromArgb(255, q, v, p);
+        }
 
-            if (hi == 4)
-            {
-                return Color.FromArgb(255, t, p, v);
-            }
+        if (hi == 2)
+        {
+            return Color.FromArgb(255, p, v, t);
+        }
 
-            return Color.FromArgb(255, v, p, q);
+        if (hi == 3)
+        {
+            return Color.FromArgb(255, p, q, v);
         }
+
+        if (hi == 4)
+        {
+            return Color.FromArgb(255, t, p, v);
+        }
+
+        return Color.FromArgb(255, v, p, q);
     }
 }
diff --git a/src/openHAB.Core/Common/Constants.cs b/src/openHAB.Core/Common/Constants.cs
deleted file mode 100644
index efeba2eb..00000000
--- a/src/openHAB.Core/Common/Constants.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-namespace OpenHAB.Core.Common
-{
-    /// <summary>
-    /// A class that holds all the constants for the app.
-    /// </summary>
-    public sealed class Constants
-    {
-        /// <summary>
-        /// Holds the constants that are used for in-app stuff.
-        /// </summary>
-        public sealed class Local
-        {
-            /// <summary>
-            /// The key that is used to persist settings to the Windows settings store.
-            /// </summary>
-            public const string SettingsKey = "UserSettingsKey";
-
-            /// <summary>
-            /// The key used to store the last opened sitemap.
-            /// </summary>
-            public const string SitemapKey = "SitemapKey";
-        }
-
-        /// <summary>
-        /// Holds the constants used in server calls.
-        /// </summary>
-        public sealed class API
-        {
-            /// <summary>
-            /// Url used for Demo mode.
-            /// </summary>
-            public const string DemoModeUrl = "https://demo.openhab.org/";
-
-            /// <summary>
-            /// Username for demo system.
-            /// </summary>
-            public const string DemoModeUser = "demo";
-
-            /// <summary>
-            /// User password for demo system.
-            /// </summary>
-            public const string DemoModeUserPwd = "demo";
-
-            /// <summary>
-            /// The call to get information about OpenHAB instance.
-            /// </summary>
-            public const string ServerInformation = "rest/";
-
-            /// <summary>
-            /// The call to fetch the sitemaps.
-            /// </summary>
-            public const string Sitemaps = "rest/sitemaps";
-
-            /// <summary>
-            /// The call to get an event-stream.
-            /// </summary>
-            public const string Events = "rest/events";
-
-            /// <summary>
-            /// The call to get items.
-            /// </summary>
-            public const string Items = "rest/items";
-        }
-    }
-}
diff --git a/src/openHAB.Core/Common/DataErrorInfo.cs b/src/openHAB.Core/Common/DataErrorInfo.cs
index eee58b7d..0eaa0b33 100644
--- a/src/openHAB.Core/Common/DataErrorInfo.cs
+++ b/src/openHAB.Core/Common/DataErrorInfo.cs
@@ -1,121 +1,120 @@
-using System;
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
 
-namespace OpenHAB.Core.Common
+namespace openHAB.Core.Common;
+
+/// <summary>
+///   Implementation of INotifyDataErrorInfo.
+/// </summary>
+public class DataErrorInfo : INotifyDataErrorInfo
 {
+    private readonly Dictionary<string, List<string>> _errors;
+
     /// <summary>
-    ///   Implementation of INotifyDataErrorInfo.
+    /// Initializes a new instance of the <see cref="DataErrorInfo"/> class.
     /// </summary>
-    public class DataErrorInfo : INotifyDataErrorInfo
+    public DataErrorInfo()
     {
-        private readonly Dictionary<string, List<string>> _errors;
+        _errors = new Dictionary<string, List<string>>();
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DataErrorInfo"/> class.
-        /// </summary>
-        public DataErrorInfo()
+    /// <summary>
+    ///   Adds the specified error to the errors collection if it is not
+    ///   already present, inserting it in the first position if isWarning is
+    ///   false. Raises the ErrorsChanged event if the collection changes.
+    /// </summary>
+    /// <param name = "propertyName">Name of the property.</param>
+    /// <param name = "error">The error.</param>
+    /// <param name = "isWarning">if set to <c>true</c> [is warning].</param>
+    public void AddError(string propertyName, string error, bool isWarning)
+    {
+        if (!_errors.ContainsKey(propertyName))
         {
-            _errors = new Dictionary<string, List<string>>();
+            _errors[propertyName] = new List<string>();
         }
 
-        /// <summary>
-        ///   Adds the specified error to the errors collection if it is not
-        ///   already present, inserting it in the first position if isWarning is
-        ///   false. Raises the ErrorsChanged event if the collection changes.
-        /// </summary>
-        /// <param name = "propertyName">Name of the property.</param>
-        /// <param name = "error">The error.</param>
-        /// <param name = "isWarning">if set to <c>true</c> [is warning].</param>
-        public void AddError(string propertyName, string error, bool isWarning)
+        if (!_errors[propertyName].Contains(error))
         {
-            if (!_errors.ContainsKey(propertyName))
+            if (isWarning)
             {
-                _errors[propertyName] = new List<string>();
+                _errors[propertyName].Add(error);
             }
-
-            if (!_errors[propertyName].Contains(error))
+            else
             {
-                if (isWarning)
-                {
-                    _errors[propertyName].Add(error);
-                }
-                else
-                {
-                    _errors[propertyName].Insert(0, error);
-                }
-
-                InvokeErrorsChanged(propertyName);
+                _errors[propertyName].Insert(0, error);
             }
+
+            InvokeErrorsChanged(propertyName);
         }
+    }
 
-        /// <summary>
-        ///   Removes the specified error from the errors collection if it is
-        ///   present. Raises the ErrorsChanged event if the collection changes.
-        /// </summary>
-        /// <param name = "propertyName">Name of the property.</param>
-        /// <param name = "error">The error.</param>
-        public void RemoveError(string propertyName, string error)
+    /// <summary>
+    ///   Removes the specified error from the errors collection if it is
+    ///   present. Raises the ErrorsChanged event if the collection changes.
+    /// </summary>
+    /// <param name = "propertyName">Name of the property.</param>
+    /// <param name = "error">The error.</param>
+    public void RemoveError(string propertyName, string error)
+    {
+        if (_errors.ContainsKey(propertyName) && _errors[propertyName].Contains(error))
         {
-            if (_errors.ContainsKey(propertyName) && _errors[propertyName].Contains(error))
-            {
-                _errors[propertyName].Remove(error);
-
-                if (_errors[propertyName].Count == 0)
-                {
-                    _errors.Remove(propertyName);
-                }
+            _errors[propertyName].Remove(error);
 
-                InvokeErrorsChanged(propertyName);
+            if (_errors[propertyName].Count == 0)
+            {
+                _errors.Remove(propertyName);
             }
+
+            InvokeErrorsChanged(propertyName);
         }
+    }
 
-        /// <summary>
-        ///   Raises the errors changed.
-        /// </summary>
-        /// <param name = "propertyName">Name of the property.</param>
-        public void InvokeErrorsChanged(string propertyName)
+    /// <summary>
+    ///   Raises the errors changed.
+    /// </summary>
+    /// <param name = "propertyName">Name of the property.</param>
+    public void InvokeErrorsChanged(string propertyName)
+    {
+        if (ErrorsChanged != null)
         {
-            if (ErrorsChanged != null)
-            {
-                ErrorsChanged(this, new DataErrorsChangedEventArgs(propertyName));
-            }
+            ErrorsChanged(this, new DataErrorsChangedEventArgs(propertyName));
         }
+    }
 
-        /// <summary>
-        ///   Occurs when the validation errors have changed for a property or for the entire object.
-        /// </summary>
-        public event EventHandler<DataErrorsChangedEventArgs> ErrorsChanged;
+    /// <summary>
+    ///   Occurs when the validation errors have changed for a property or for the entire object.
+    /// </summary>
+    public event EventHandler<DataErrorsChangedEventArgs> ErrorsChanged;
 
-        /// <summary>
-        ///   Gets the validation errors for a specified property or for the entire object.
-        /// </summary>
-        /// <param name = "propertyName">The name of the property to retrieve validation errors for, or null or <see
-        ///    cref = "string.Empty" /> to retrieve errors for the entire object.</param>
-        /// <returns>
-        ///   The validation errors for the property or object.
-        /// </returns>
-        public IEnumerable GetErrors(string propertyName)
+    /// <summary>
+    ///   Gets the validation errors for a specified property or for the entire object.
+    /// </summary>
+    /// <param name = "propertyName">The name of the property to retrieve validation errors for, or null or <see
+    ///    cref = "string.Empty" /> to retrieve errors for the entire object.</param>
+    /// <returns>
+    ///   The validation errors for the property or object.
+    /// </returns>
+    public IEnumerable GetErrors(string propertyName)
+    {
+        if (string.IsNullOrEmpty(propertyName) || !_errors.ContainsKey(propertyName))
         {
-            if (string.IsNullOrEmpty(propertyName) || !_errors.ContainsKey(propertyName))
-            {
-                return null;
-            }
-
-            return _errors[propertyName];
+            return new Dictionary<string, List<string>>();
         }
 
-        /// <summary>
-        ///   Gets a value indicating whether gets a value that indicates whether the object has validation errors.
-        /// </summary>
-        /// <returns>true if the object currently has validation errors; otherwise, false.</returns>
-        public bool HasErrors
+        return _errors[propertyName];
+    }
+
+    /// <summary>
+    ///   Gets a value indicating whether gets a value that indicates whether the object has validation errors.
+    /// </summary>
+    /// <returns>true if the object currently has validation errors; otherwise, false.</returns>
+    public bool HasErrors
+    {
+        get
         {
-            get
-            {
-                return _errors.Count > 0;
-            }
+            return _errors.Count > 0;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/openHAB.Core/Common/DeviceFamily.cs b/src/openHAB.Core/Common/DeviceFamily.cs
index 7e7c6210..6e0e2c8b 100644
--- a/src/openHAB.Core/Common/DeviceFamily.cs
+++ b/src/openHAB.Core/Common/DeviceFamily.cs
@@ -1,27 +1,26 @@
-namespace OpenHAB.Core.Common
+namespace openHAB.Core.Common;
+
+/// <summary>Specifies Device Platform.</summary>
+public enum DeviceFamily
 {
-    /// <summary>Specifies Device Platform.</summary>
-    public enum DeviceFamily
-    {
-        /// <summary> Unidentified platform.</summary>
-        Unidentified,
+    /// <summary> Unidentified platform.</summary>
+    Unidentified,
 
-        /// <summary>Desktop platform.</summary>
-        Desktop,
+    /// <summary>Desktop platform.</summary>
+    Desktop,
 
-        /// <summary>Mobile platform.</summary>
-        Mobile,
+    /// <summary>Mobile platform.</summary>
+    Mobile,
 
-        /// <summary>Xbox console.</summary>
-        Xbox,
+    /// <summary>Xbox console.</summary>
+    Xbox,
 
-        /// <summary>Hololense Device.</summary>
-        Holographic,
+    /// <summary>Hololense Device.</summary>
+    Holographic,
 
-        /// <summary>Windows Core platform.</summary>
-        IoT,
+    /// <summary>Windows Core platform.</summary>
+    IoT,
 
-        /// <summary>Teams Room platform.</summary>
-        Team,
-    }
+    /// <summary>Teams Room platform.</summary>
+    Team,
 }
diff --git a/src/openHAB.Core/Common/DeviceTypeHelper.cs b/src/openHAB.Core/Common/DeviceTypeHelper.cs
index e388a168..9a8e4230 100644
--- a/src/openHAB.Core/Common/DeviceTypeHelper.cs
+++ b/src/openHAB.Core/Common/DeviceTypeHelper.cs
@@ -1,50 +1,50 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using Windows.System.Profile;
-using Windows.UI.ViewManagement;
-
-namespace OpenHAB.Core.Common
+namespace openHAB.Core.Common;
+
+/// <summary>
+/// Helper class to get the target platform the app is running on.
+/// </summary>
+public class DeviceTypeHelper
 {
-    /// <summary>Helper class to get the target platform the app is running on.</summary>
-    public class DeviceTypeHelper
+
+    /// <summary>
+    /// Initializes static members of the <see cref="DeviceTypeHelper"/> class.
+    /// </summary>
+    static DeviceTypeHelper()
     {
-        /// <summary>
-        /// Initializes static members of the <see cref="DeviceTypeHelper"/> class.
-        /// </summary>
-        static DeviceTypeHelper()
-        {
-            DeviceFamily = RecognizeDeviceFamily(Windows.System.Profile.AnalyticsInfo.VersionInfo.DeviceFamily);
-        }
+        DeviceFamily = RecognizeDeviceFamily(global::Windows.System.Profile.AnalyticsInfo.VersionInfo.DeviceFamily);
+    }
 
-        /// <summary>Gets the device family.</summary>
-        /// <value>The device family.</value>
-        public static DeviceFamily DeviceFamily
-        {
-            get;
-        }
+    /// <summary>Gets the device family.</summary>
+    /// <value>The device family.</value>
+    public static DeviceFamily DeviceFamily
+    {
+        get;
+    }
 
-        private static DeviceFamily RecognizeDeviceFamily(string deviceFamily)
+    private static DeviceFamily RecognizeDeviceFamily(string deviceFamily)
+    {
+        switch (deviceFamily)
         {
-            switch (deviceFamily)
-            {
-                case "Windows.Mobile":
-                    return DeviceFamily.Mobile;
-                case "Windows.Desktop":
-                    return DeviceFamily.Desktop;
-                case "Windows.Xbox":
-                    return DeviceFamily.Xbox;
-                case "Windows.Holographic":
-                    return DeviceFamily.Holographic;
-                case "Windows.IoT":
-                    return DeviceFamily.IoT;
-                case "Windows.Team":
-                    return DeviceFamily.Team;
-                default:
-                    return DeviceFamily.Unidentified;
-            }
+            case "Windows.Mobile":
+                return DeviceFamily.Mobile;
+
+            case "Windows.Desktop":
+                return DeviceFamily.Desktop;
+
+            case "Windows.Xbox":
+                return DeviceFamily.Xbox;
+
+            case "Windows.Holographic":
+                return DeviceFamily.Holographic;
+
+            case "Windows.IoT":
+                return DeviceFamily.IoT;
+
+            case "Windows.Team":
+                return DeviceFamily.Team;
+
+            default:
+                return DeviceFamily.Unidentified;
         }
     }
 }
diff --git a/src/openHAB.Core/Common/Enum.cs b/src/openHAB.Core/Common/Enum.cs
index 2ecf301f..b4c08ded 100644
--- a/src/openHAB.Core/Common/Enum.cs
+++ b/src/openHAB.Core/Common/Enum.cs
@@ -1,25 +1,24 @@
-using System;
+using System;
 
-namespace OpenHAB.Core.Common
+namespace openHAB.Core.Common;
+
+/// <summary>
+/// Now you can use Generics to have cleaner code when enum parsing!.
+/// </summary>
+/// <typeparam name="T">Enum type.</typeparam>
+/// <example>
+/// CT.Organ organNewParse = Enum.Parse("LENS");.
+/// </example>
+public static class Enum<T>
 {
-    /// <summary>
-    /// Now you can use Generics to have cleaner code when enum parsing!.
-    /// </summary>
-    /// <typeparam name="T">Enum type.</typeparam>
-    /// <example>
-    /// CT.Organ organNewParse = Enum.Parse("LENS");.
-    /// </example>
-    public static class Enum<T>
+    /// <summary>Parses the text to enum value.</summary>
+    /// <param name="value">The value.</param>
+    /// <param name="ignoreCase">if set to <c>true</c> [ignore case].</param>
+    /// <returns>
+    ///   <br />
+    /// </returns>
+    public static T Parse(string value, bool ignoreCase = true)
     {
-        /// <summary>Parses the text to enum value.</summary>
-        /// <param name="value">The value.</param>
-        /// <param name="ignoreCase">if set to <c>true</c> [ignore case].</param>
-        /// <returns>
-        ///   <br />
-        /// </returns>
-        public static T Parse(string value, bool ignoreCase = true)
-        {
-            return (T)Enum.Parse(typeof(T), value, ignoreCase);
-        }
+        return (T)Enum.Parse(typeof(T), value, ignoreCase);
     }
 }
diff --git a/src/openHAB.Core/Common/HttpResponseResult.cs b/src/openHAB.Core/Common/HttpResponseResult.cs
deleted file mode 100644
index 85c28bd3..00000000
--- a/src/openHAB.Core/Common/HttpResponseResult.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-using System;
-using System.Net;
-
-namespace OpenHAB.Core.Common
-{
-    /// <summary>HTTP response result.</summary>
-    /// <typeparam name="T">Content Type.</typeparam>
-    public class HttpResponseResult<T>
-    {
-        /// <summary>Initializes a new instance of the <see cref="HttpResponseResult{T}" /> class.</summary>
-        /// <param name="content">The content.</param>
-        /// <param name="statusCode">The status code.</param>
-        public HttpResponseResult(T content, HttpStatusCode? statusCode)
-            : this(content, statusCode, null)
-        {
-        }
-
-        /// <summary>Initializes a new instance of the <see cref="HttpResponseResult{T}" /> class.</summary>
-        /// <param name="content">The content.</param>
-        /// <param name="statusCode">The status code.</param>
-        /// <param name="exception">The exception.</param>
-        public HttpResponseResult(T content, HttpStatusCode? statusCode, Exception exception)
-        {
-            Content = content;
-            StatusCode = statusCode;
-            Exception = exception;
-        }
-
-        /// <summary>Gets the deserailized HTTP response content.</summary>
-        /// <value>Deserailized HTTP response content.</value>
-        public T Content
-        {
-            get;
-            private set;
-        }
-
-        /// <summary>
-        /// Gets the exception when available.
-        /// </summary>
-        /// <value>
-        /// The exception.
-        /// </value>
-        public Exception Exception
-        {
-            get;
-            private set;
-        }
-
-        /// <summary>Gets the http status code.</summary>
-        /// <value>The status code.</value>
-        public HttpStatusCode? StatusCode
-        {
-            get; private set;
-        }
-    }
-}
diff --git a/src/openHAB.Core/Common/ObservableCollectionExtensions.cs b/src/openHAB.Core/Common/ObservableCollectionExtensions.cs
index 1ed74519..4f3c3f01 100644
--- a/src/openHAB.Core/Common/ObservableCollectionExtensions.cs
+++ b/src/openHAB.Core/Common/ObservableCollectionExtensions.cs
@@ -1,33 +1,33 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
 
 // ReSharper disable once CheckNamespace
-namespace System.Collections.ObjectModel
+namespace openHAB.Core.Common;
+
+/// <summary>
+/// Collection of extensions for the ObservableCollection class.
+/// </summary>
+public static class ObservableCollectionExtensions
 {
     /// <summary>
-    /// Collection of extensions for the ObservableCollection class.
+    /// Adds a range of items to the observable collection.
     /// </summary>
-    public static class ObservableCollectionExtensions
+    /// <param name="target">The ObservableCollection.</param>
+    /// <param name="range">List of items to add.</param>
+    /// <typeparam name="T">Type of items.</typeparam>
+    /// <returns>The ObservableCollection, including the new range of items.</returns>
+    public static ObservableCollection<T> AddRange<T>(this ObservableCollection<T> target, IEnumerable<T> range)
     {
-        /// <summary>
-        /// Adds a range of items to the observable collection.
-        /// </summary>
-        /// <param name="target">The ObservableCollection.</param>
-        /// <param name="range">List of items to add.</param>
-        /// <typeparam name="T">Type of items.</typeparam>
-        /// <returns>The ObservableCollection, including the new range of items.</returns>
-        public static ObservableCollection<T> AddRange<T>(this ObservableCollection<T> target, IEnumerable<T> range)
+        if (range == null)
         {
-            if (range == null)
-            {
-                return target;
-            }
-
-            foreach (var item in range)
-            {
-                target.Add(item);
-            }
-
             return target;
         }
+
+        foreach (var item in range)
+        {
+            target.Add(item);
+        }
+
+        return target;
     }
 }
diff --git a/src/openHAB.Core/Common/OpenHABHttpClient.cs b/src/openHAB.Core/Common/OpenHABHttpClient.cs
deleted file mode 100644
index 606a5d47..00000000
--- a/src/openHAB.Core/Common/OpenHABHttpClient.cs
+++ /dev/null
@@ -1,136 +0,0 @@
-using System;
-using System.Net;
-using System.Net.Http;
-using System.Net.Security;
-using System.Security.Cryptography.X509Certificates;
-using Microsoft.Extensions.Logging;
-using OpenHAB.Core.Model;
-using OpenHAB.Core.Model.Connection;
-using OpenHAB.Core.Services;
-
-namespace OpenHAB.Core.Common
-{
-    /// <summary>
-    /// A sealed class that holds the instance of HttpClient for this lifetimescope.
-    /// </summary>
-    public sealed class OpenHABHttpClient
-    {
-        private static HttpClient _client;
-        private static Settings _settings;
-        private static ILogger<OpenHABHttpClient> _logger;
-        private OpenHABConnection _connection;
-
-        /// <summary>Initializes a new instance of the <see cref="OpenHABHttpClient"/> class.</summary>
-        /// <param name="logger">The logger.</param>
-        public OpenHABHttpClient(ILogger<OpenHABHttpClient> logger)
-        {
-            _logger = logger;
-        }
-
-        /// <summary>
-        /// Gets or sets the connection URL.
-        /// </summary>
-        public static string BaseUrl
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// Fetch the HttpClient instance.
-        /// </summary>
-        /// <returns>The HttpClient instance.</returns>
-        public HttpClient Client(OpenHABConnection connection, Settings settings)
-        {
-            _settings = settings;
-
-            return _client ?? (_client = InitClient(connection));
-        }
-
-        /// <summary>
-        /// Create an HttpClient instance for one-time use.
-        /// </summary>
-        /// <returns>The HttpClient instance.</returns>
-        public HttpClient DisposableClient(OpenHABConnection connection, Settings settings)
-        {
-            _settings = settings;
-            return InitClient(connection, true);
-        }
-
-        /// <summary>
-        /// Forces creation of a new client, for example when the settings in the app are updated.
-        /// </summary>
-        public void ResetClient()
-        {
-            _client = null;
-        }
-
-        private HttpClient InitClient(OpenHABConnection connection, bool disposable = false)
-        {
-            _logger.LogInformation($"Initialize http client for connection type '{connection.Type.ToString()}'");
-
-            if (string.IsNullOrWhiteSpace(BaseUrl) && !disposable)
-            {
-                return null;
-            }
-
-            var handler = new HttpClientHandler();
-
-            if (connection.WillIgnoreSSLCertificate.HasValue && connection.WillIgnoreSSLHostname.HasValue)
-            {
-                _connection = connection;
-                handler.ServerCertificateCustomValidationCallback = CheckValidationResult;
-            }
-
-            var credentials = GetCredentials(connection);
-
-            if (credentials != null)
-            {
-                handler.Credentials = credentials;
-            }
-
-            var client = new HttpClient(handler);
-            if (!disposable)
-            {
-                client.BaseAddress = new Uri(BaseUrl);
-            }
-
-            return client;
-        }
-
-        private NetworkCredential GetCredentials(OpenHABConnection connection)
-        {
-            if (!string.IsNullOrWhiteSpace(connection.Username) && !string.IsNullOrWhiteSpace(connection.Password))
-            {
-                return new NetworkCredential(connection.Username, connection.Password);
-            }
-
-            return null;
-        }
-
-        private bool CheckValidationResult(HttpRequestMessage message, X509Certificate2 certificate, X509Chain chain, SslPolicyErrors sslPolicyErrors)
-        {
-            bool result = true;
-            if (sslPolicyErrors == SslPolicyErrors.None)
-            {
-                return result;
-            }
-
-            if (sslPolicyErrors.HasFlag(SslPolicyErrors.RemoteCertificateChainErrors))
-            {
-                result &= _connection.WillIgnoreSSLCertificate.Value;
-            }
-
-            if (sslPolicyErrors.HasFlag(SslPolicyErrors.RemoteCertificateNameMismatch))
-            {
-                result &= _connection.WillIgnoreSSLHostname.Value;
-            }
-
-            if (sslPolicyErrors.HasFlag(SslPolicyErrors.RemoteCertificateNotAvailable))
-            {
-                result = false;
-            }
-
-            return result;
-        }
-    }
-}
diff --git a/src/openHAB.Core/Contracts/IConnectionProfile.cs b/src/openHAB.Core/Contracts/IConnectionProfile.cs
deleted file mode 100644
index a9cf7a74..00000000
--- a/src/openHAB.Core/Contracts/IConnectionProfile.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using OpenHAB.Core.Model.Connection;
-
-namespace OpenHAB.Core.Contracts
-{
-    /// <summary>Interface for connection profiles.</summary>
-    public interface IConnectionProfile
-    {
-        /// <summary>Gets a value indicating whether [host URL] value can be modified.</summary>
-        /// <value>
-        ///   <c>true</c> if [host URL configuration] can be modified; otherwise, <c>false</c>.</value>
-        bool AllowHostUrlConfiguration
-        {
-            get;
-        }
-
-        /// <summary>Gets a value indicating whether [allow ignore SSL certificate] issues option is available.</summary>
-        /// <value>
-        ///   <c>true</c> if [allow ignore SSL certificate] is available; otherwise, <c>false</c>.</value>
-        bool AllowIgnoreSSLCertificate
-        {
-            get;
-        }
-
-        /// <summary>Gets a value indicating whether [allow ignore SSL hostname] issue option is available.</summary>
-        /// <value>
-        /// <c>true.</c> if [allow ignore SSL hostname] can be enabled; otherwise, <c>false</c>.</value>
-        bool AllowIgnoreSSLHostname
-        {
-            get;
-        }
-
-        /// <summary>Gets the connection profile îd.</summary>
-        /// <value>The îd.</value>
-        int Id
-        {
-            get;
-        }
-
-        /// <summary>Gets the connection profile name.</summary>
-        /// <value>The profile name.</value>
-        string Name
-        {
-            get;
-        }
-
-        /// <summary>Gets the profile type.</summary>
-        /// <value>The type.</value>
-        OpenHABHttpClientType Type
-        {
-            get;
-        }
-
-        /// <summary>Creates the connection based on the profile.</summary>
-        /// <returns>Preconfigured connection.</returns>
-        OpenHABConnection CreateConnection();
-    }
-}
\ No newline at end of file
diff --git a/src/openHAB.Core/Contracts/Services/IDependencyInjectionService.cs b/src/openHAB.Core/Contracts/Services/IDependencyInjectionService.cs
deleted file mode 100644
index 6664902c..00000000
--- a/src/openHAB.Core/Contracts/Services/IDependencyInjectionService.cs
+++ /dev/null
@@ -1,19 +0,0 @@
-using Microsoft.Extensions.DependencyInjection;
-
-namespace OpenHAB.Core.Contracts.Services
-{
-    /// <summary>
-    /// Interface for Dependency Injection service.
-    /// </summary>
-    public interface IDependencyInjectionService
-    {
-        /// <summary>
-        /// Gets the service instance.
-        /// </summary>
-        /// <value>The instance.</value>
-        ServiceProvider Services
-        {
-            get;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/openHAB.Core/Contracts/Services/ISettingsService.cs b/src/openHAB.Core/Contracts/Services/ISettingsService.cs
deleted file mode 100644
index 78bc1f5c..00000000
--- a/src/openHAB.Core/Contracts/Services/ISettingsService.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-using OpenHAB.Core.Model;
-
-namespace OpenHAB.Core.Contracts.Services
-{
-    /// <summary>
-    /// Service to fetch / save user-defined settings.
-    /// </summary>
-    public interface ISettingsService
-    {
-        /// <summary>
-        /// Gets or sets the version of openHAB that's running on the server.
-        /// </summary>
-        OpenHABVersion ServerVersion { get; set; }
-
-        /// <summary>
-        /// Persists the current settings.
-        /// </summary>
-        /// <param name="settings">Current settings.</param>
-        /// <returns>true when settings stored successful to disk.</returns>
-        bool Save(Settings settings);
-
-        /// <summary>
-        /// Load the settings.
-        /// </summary>
-        /// <returns>Previously saved settings.</returns>
-        Settings Load();
-
-        /// <summary>
-        /// Save the name of the last opened sitemap.
-        /// </summary>
-        /// <param name="name">Name of the sitemap.</param>
-        void SaveCurrentSitemap(string name);
-
-        /// <summary>
-        /// Loads the name of the last opened sitemap.
-        /// </summary>
-        /// <returns>The name of the sitemap.</returns>
-        string LoadLastSitemap();
-
-        /// <summary>
-        ///   Sets the program language.
-        /// </summary>
-        /// <param name="langcode">Language code e.g. en-us.</param>
-        void SetProgramLanguage(string langcode);
-    }
-}
diff --git a/src/openHAB.Core/GlobalSuppressions.cs b/src/openHAB.Core/GlobalSuppressions.cs
new file mode 100644
index 00000000..8cce9464
--- /dev/null
+++ b/src/openHAB.Core/GlobalSuppressions.cs
@@ -0,0 +1,8 @@
+// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("StyleCop.CSharp.NamingRules", "SA1300:Element should begin with upper-case letter", Justification = "Correct spelling of openHab", Scope = "namespaceanddescendants", Target = "~N:openHAB.Core")]
diff --git a/src/openHAB.Core/Messages/ConnectionStatusChanged.cs b/src/openHAB.Core/Messages/ConnectionStatusChanged.cs
index 43775079..854ce4b8 100644
--- a/src/openHAB.Core/Messages/ConnectionStatusChanged.cs
+++ b/src/openHAB.Core/Messages/ConnectionStatusChanged.cs
@@ -1,25 +1,23 @@
-using OpenHAB.Core.Common;
-using OpenHAB.Core.Model;
+using openHAB.Core.Client.Connection.Models;
 
-namespace OpenHAB.Core.Messages
+namespace openHAB.Core.Messages;
+
+/// <summary>
+/// Event for connection state updates.
+/// </summary>
+public class ConnectionStatusChanged
 {
-    /// <summary>
-    /// Event for connection state updates.
-    /// </summary>
-    public class ConnectionStatusChanged
+    /// <summary>Initializes a new instance of the <see cref="ConnectionStatusChanged" /> class.</summary>
+    /// <param name="state">The connection state.</param>
+    public ConnectionStatusChanged(ConnectionState state)
     {
-        /// <summary>Initializes a new instance of the <see cref="ConnectionStatusChanged" /> class.</summary>
-        /// <param name="state">The connection state.</param>
-        public ConnectionStatusChanged(ConnectionState state)
-        {
-            State = state;
-        }
+        State = state;
+    }
 
-        /// <summary>Gets or sets the state.</summary>
-        /// <value>The state.</value>
-        public ConnectionState State
-        {
-            get; set;
-        }
+    /// <summary>Gets or sets the state.</summary>
+    /// <value>The state.</value>
+    public ConnectionState State
+    {
+        get; set;
     }
 }
diff --git a/src/openHAB.Core/Messages/DataOperation.cs b/src/openHAB.Core/Messages/DataOperation.cs
new file mode 100644
index 00000000..9cb0b8f9
--- /dev/null
+++ b/src/openHAB.Core/Messages/DataOperation.cs
@@ -0,0 +1,45 @@
+namespace openHAB.Core.Messages;
+
+/// <summary>
+/// Represents the state of a data operation.
+/// </summary>
+public enum OperationState
+{
+    /// <summary>
+    /// Represents no operation state.
+    /// </summary>
+    None,
+
+    /// <summary>
+    /// Represents the start of a data operation.
+    /// </summary>
+    Started,
+
+    /// <summary>
+    /// Represents the completion of a data operation.
+    /// </summary>
+    Completed
+}
+
+/// <summary>
+/// Represents a data operation.
+/// </summary>
+public class DataOperation
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="DataOperation"/> class with the specified state.
+    /// </summary>
+    /// <param name="state">The state of the data operation.</param>
+    public DataOperation(OperationState state = OperationState.None)
+    {
+        State = state;
+    }
+
+    /// <summary>
+    /// Gets or sets the state of the data operation.
+    /// </summary>
+    public OperationState State
+    {
+        get; set;
+    }
+}
diff --git a/src/openHAB.Core/Messages/EventTriggerSource.cs b/src/openHAB.Core/Messages/EventTriggerSource.cs
new file mode 100644
index 00000000..6f1d30e5
--- /dev/null
+++ b/src/openHAB.Core/Messages/EventTriggerSource.cs
@@ -0,0 +1,22 @@
+namespace openHAB.Core.Messages;
+
+/// <summary>
+/// Represents the source of the navigation trigger.
+/// </summary>
+public enum EventTriggerSource
+{
+    /// <summary>
+    /// The navigation trigger is from a breadcrumb.
+    /// </summary>
+    Breadcrumb,
+
+    /// <summary>
+    /// The navigation trigger is from a widget.
+    /// </summary>
+    Widget,
+
+    /// <summary>
+    /// The navigation trigger is from the root.
+    /// </summary>
+    Root
+}
diff --git a/src/openHAB.Core/Messages/FireErrorMessage.cs b/src/openHAB.Core/Messages/FireErrorMessage.cs
deleted file mode 100644
index 54b3c7b8..00000000
--- a/src/openHAB.Core/Messages/FireErrorMessage.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using OpenHAB.Core.Common;
-
-namespace OpenHAB.Core.Messages
-{
-    /// <summary>
-    /// Triggers a visual error message.
-    /// </summary>
-    public class FireErrorMessage
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FireErrorMessage"/> class.
-        /// </summary>
-        /// <param name="errorMessage">The error message.</param>
-        public FireErrorMessage(string errorMessage)
-        {
-            ErrorMessage = errorMessage;
-        }
-
-        /// <summary>
-        /// Gets or sets the error text.
-        /// </summary>
-        /// <value>The text.</value>
-        public string ErrorMessage
-        {
-            get; set;
-        }
-    }
-}
diff --git a/src/openHAB.Core/Messages/FireInfoMessage.cs b/src/openHAB.Core/Messages/FireInfoMessage.cs
deleted file mode 100644
index eaf90bf9..00000000
--- a/src/openHAB.Core/Messages/FireInfoMessage.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-namespace OpenHAB.Core.Messages
-{
-    /// <summary>Object for notification with information level.</summary>
-    public class FireInfoMessage
-    {
-        /// <summary>Initializes a new instance of the <see cref="FireInfoMessage" /> class.</summary>
-        /// <param name="messageType">Type of the message.</param>
-        public FireInfoMessage(MessageType messageType)
-        {
-            MessageType = messageType;
-        }
-
-        /// <summary>Gets the type of the message.</summary>
-        /// <value>The type of the message.</value>
-        public MessageType MessageType
-        {
-            get;
-            private set;
-        }
-    }
-}
diff --git a/src/openHAB.Core/Messages/ItemStateChangedMessage.cs b/src/openHAB.Core/Messages/ItemStateChangedMessage.cs
deleted file mode 100644
index c0883a43..00000000
--- a/src/openHAB.Core/Messages/ItemStateChangedMessage.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-namespace OpenHAB.Core.Messages
-{
-    /// <summary>
-    /// A message to trigger an item update coming from a server event.
-    /// </summary>
-    public class ItemStateChangedMessage
-    {
-        /// <summary>Initializes a new instance of the <see cref="ItemStateChangedMessage" /> class.</summary>
-        /// <param name="itemName">Name of the item.</param>
-        /// <param name="value">The value.</param>
-        /// <param name="oldValue">The old value.</param>
-        public ItemStateChangedMessage(string itemName, string value, string oldValue)
-        {
-            ItemName = itemName;
-            Value = value;
-            OldValue = oldValue;
-        }
-
-        /// <summary>
-        /// Gets or sets the name of the updated item.
-        /// </summary>
-        public string ItemName
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// Gets or sets the old item value.
-        /// </summary>
-        public string OldValue
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// Gets or sets the updated value.
-        /// </summary>
-        public string Value
-        {
-            get;
-            set;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/openHAB.Core/Messages/MessageSeverity.cs b/src/openHAB.Core/Messages/MessageSeverity.cs
new file mode 100644
index 00000000..a2c79da4
--- /dev/null
+++ b/src/openHAB.Core/Messages/MessageSeverity.cs
@@ -0,0 +1,27 @@
+namespace openHAB.Core.Messages;
+
+/// <summary>
+/// Represents the severity level of a message.
+/// </summary>
+public enum MessageSeverity
+{
+    /// <summary>
+    /// Informational message.
+    /// </summary>
+    Informational,
+
+    /// <summary>
+    /// Success message.
+    /// </summary>
+    Success,
+
+    /// <summary>
+    /// Warning message.
+    /// </summary>
+    Warning,
+
+    /// <summary>
+    /// Error message.
+    /// </summary>
+    Error,
+}
diff --git a/src/openHAB.Core/Messages/MessageType.cs b/src/openHAB.Core/Messages/MessageType.cs
deleted file mode 100644
index 8120231d..00000000
--- a/src/openHAB.Core/Messages/MessageType.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-namespace OpenHAB.Core
-{
-    /// <summary>
-    /// Notification Message Type.
-    /// </summary>
-    public enum MessageType
-    {
-        /// <summary>
-        /// Shows message that OpenHAB connection is not configured.
-        /// </summary>
-        NotConfigured,
-
-        /// <summary>
-        /// Shows message that OpenHAB instance is not configurable.
-        /// </summary>
-        NotReachable,
-    }
-}
\ No newline at end of file
diff --git a/src/openHAB.Core/Messages/SettingsUpdatedMessage.cs b/src/openHAB.Core/Messages/SettingsUpdatedMessage.cs
deleted file mode 100644
index 24a82995..00000000
--- a/src/openHAB.Core/Messages/SettingsUpdatedMessage.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-namespace OpenHAB.Core.Messages
-{
-    /// <summary>
-    /// A message object that triggers a refresh of data after changing the settings.
-    /// </summary>
-    public class SettingsUpdatedMessage
-    {
-        /// <summary>Initializes a new instance of the <see cref="SettingsUpdatedMessage"/> class.</summary>
-        /// <param name="isSettingsValid">if set to <c>true</c> [is settings valid].</param>
-        /// <param name="settingsPersisted">Indicates settings changes are persisted.</param>
-        public SettingsUpdatedMessage(bool isSettingsValid, bool settingsPersisted)
-        {
-            SettingsPersisted = settingsPersisted;
-            IsSettingsValid = isSettingsValid;
-        }
-
-        /// <summary>Gets a value indicating whether settings update valid.</summary>
-        /// <value>
-        ///   <c>true</c> if this settings changes are valid; otherwise, <c>false</c>.</value>
-        public bool IsSettingsValid
-        {
-            get;
-        }
-
-        /// <summary>Gets or sets a value indicating whether [settings was persisted] to disk.</summary>
-        /// <value>
-        ///   <c>true</c> if [settings persisted]; otherwise, <c>false</c>.</value>
-        public bool SettingsPersisted
-        {
-            get; set;
-        }
-    }
-}
diff --git a/src/openHAB.Core/Messages/SettingsValidationMessage.cs b/src/openHAB.Core/Messages/SettingsValidationMessage.cs
deleted file mode 100644
index 1d7a7b7c..00000000
--- a/src/openHAB.Core/Messages/SettingsValidationMessage.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace OpenHAB.Core.Messages
-{
-    /// <summary>
-    /// A message object that triggers a refresh of data after changing the settings.
-    /// </summary>
-    public class SettingsValidationMessage
-    {
-        /// <summary>Initializes a new instance of the <see cref="SettingsValidationMessage"/> class.</summary>
-        /// <param name="isSettingsValid">if set to <c>true</c> [is settings valid].</param>
-        public SettingsValidationMessage(bool isSettingsValid)
-        {
-            IsSettingsValid = isSettingsValid;
-        }
-
-        /// <summary>Gets a value indicating whether settings update valid.</summary>
-        /// <value>
-        ///   <c>true</c> if this settings changes are valid; otherwise, <c>false</c>.</value>
-        public bool IsSettingsValid
-        {
-            get;
-        }
-    }
-}
diff --git a/src/openHAB.Core/Messages/SitemapChanged.cs b/src/openHAB.Core/Messages/SitemapChanged.cs
new file mode 100644
index 00000000..f3f3708c
--- /dev/null
+++ b/src/openHAB.Core/Messages/SitemapChanged.cs
@@ -0,0 +1,17 @@
+using openHAB.Core.Client.Models;
+
+namespace openHAB.Core.Messages;
+
+public class SitemapChanged
+{
+    public SitemapChanged(Sitemap sitemap)
+    {
+        sitemap = sitemap;
+    }
+
+    public Sitemap Sitemap
+    {
+        get;
+        private set;
+    }
+}
diff --git a/src/openHAB.Core/Messages/TriggerAction.cs b/src/openHAB.Core/Messages/TriggerAction.cs
new file mode 100644
index 00000000..1689cd71
--- /dev/null
+++ b/src/openHAB.Core/Messages/TriggerAction.cs
@@ -0,0 +1,51 @@
+namespace openHAB.Core.Messages;
+
+
+/// <summary>
+/// Specifies the action to be taken.
+/// </summary>
+public enum Action
+{
+    /// <summary>
+    /// Reload the data.
+    /// </summary>
+    Reload,
+
+    /// <summary>
+    /// No action.
+    /// </summary>
+    None
+}
+
+/// <summary>
+/// Represents a trigger action.
+/// </summary>
+public class TriggerAction
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TriggerAction"/> class with the specified action and state.
+    /// </summary>
+    /// <param name="action">The action to be taken.</param>
+    /// <param name="state">The state of the trigger action.</param>
+    public TriggerAction(Action action = Action.None, object state = null)
+    {
+        Action = action;
+        State = state;
+    }
+
+    /// <summary>
+    /// Gets or sets the action to be taken.
+    /// </summary>
+    public Action Action
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets the state of the trigger action.
+    /// </summary>
+    public object? State
+    {
+        get; set;
+    }
+}
diff --git a/src/openHAB.Core/Messages/TriggerCommandMessage.cs b/src/openHAB.Core/Messages/TriggerCommandMessage.cs
deleted file mode 100644
index 664a8dd9..00000000
--- a/src/openHAB.Core/Messages/TriggerCommandMessage.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System;
-using OpenHAB.Core.Model;
-
-namespace OpenHAB.Core.Messages
-{
-    /// <summary>
-    /// Message that gets fired whenever a widget triggers a command.
-    /// </summary>
-    public class TriggerCommandMessage
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TriggerCommandMessage"/> class.
-        /// </summary>
-        /// <param name="item">The OpenHAB item that triggered the command.</param>
-        /// <param name="command">The command that was triggered.</param>
-        public TriggerCommandMessage(OpenHABItem item, string command)
-        {
-            Id = Guid.NewGuid();
-            Item = item;
-            Command = command;
-        }
-
-        /// <summary>
-        /// Gets or sets the Command that was triggered.
-        /// </summary>
-        public string Command
-        {
-            get;
-            set;
-        }
-
-        /// <summary>Gets the unique message identifier.</summary>
-        /// <value>The identifier.</value>
-        public Guid Id
-        {
-            get;
-            private set;
-        }
-
-        /// <summary>
-        /// Gets or sets the OpenHAB item that triggered the command.
-        /// </summary>
-        public OpenHABItem Item
-        {
-            get;
-            set;
-        }
-    }
-}
diff --git a/src/openHAB.Core/Messages/TriggerInfoMessage.cs b/src/openHAB.Core/Messages/TriggerInfoMessage.cs
new file mode 100644
index 00000000..1a83029e
--- /dev/null
+++ b/src/openHAB.Core/Messages/TriggerInfoMessage.cs
@@ -0,0 +1,36 @@
+namespace openHAB.Core.Messages;
+
+/// <summary>
+/// Represents a message containing information about a trigger event.
+/// </summary>
+public class TriggerInfoMessage
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="TriggerInfoMessage"/> class.
+    /// </summary>
+    /// <param name="messageType">The severity level of the message.</param>
+    /// <param name="message">The content of the message.</param>
+    public TriggerInfoMessage(MessageSeverity messageType, string message)
+    {
+        Severity = messageType;
+        Message = message;
+    }
+
+    /// <summary>
+    /// Gets the severity level of the message.
+    /// </summary>
+    public MessageSeverity Severity
+    {
+        get;
+        private set;
+    }
+
+    /// <summary>
+    /// Gets the content of the message.
+    /// </summary>
+    public string Message
+    {
+        get;
+        private set;
+    }
+}
diff --git a/src/openHAB.Core/Messages/UpdateItemMessage.cs b/src/openHAB.Core/Messages/UpdateItemMessage.cs
deleted file mode 100644
index 30bb61ed..00000000
--- a/src/openHAB.Core/Messages/UpdateItemMessage.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-namespace OpenHAB.Core.Messages
-{
-    /// <summary>
-    /// A message to trigger an item update coming from a server event.
-    /// </summary>
-    public class UpdateItemMessage
-    {
-        /// <summary>Initializes a new instance of the <see cref="UpdateItemMessage" /> class.</summary>
-        /// <param name="itemName">Name of the item.</param>
-        /// <param name="value">The value.</param>
-        public UpdateItemMessage(string itemName, string value)
-        {
-            ItemName = itemName;
-            Value = value;
-        }
-
-        /// <summary>
-        /// Gets or sets the name of the updated item.
-        /// </summary>
-        public string ItemName
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// Gets or sets the updated value.
-        /// </summary>
-        public string Value
-        {
-            get; set;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/openHAB.Core/Messages/WidgetClickedMessage.cs b/src/openHAB.Core/Messages/WidgetClickedMessage.cs
deleted file mode 100644
index 6b1dd133..00000000
--- a/src/openHAB.Core/Messages/WidgetClickedMessage.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using OpenHAB.Core.Model;
-
-namespace OpenHAB.Core.Messages
-{
-    /// <summary>
-    /// A message that fires whenever a widget is clicked on a sitemap.
-    /// </summary>
-    public class WidgetClickedMessage
-    {
-        /// <summary>
-        /// Gets or sets the Widget property.
-        /// </summary>
-        public OpenHABWidget Widget { get; set; }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="WidgetClickedMessage"/> class.
-        /// </summary>
-        /// <param name="widget">The widget that was clicked.</param>
-        public WidgetClickedMessage(OpenHABWidget widget)
-        {
-            Widget = widget;
-        }
-    }
-}
diff --git a/src/openHAB.Core/Model/AppTheme.cs b/src/openHAB.Core/Model/AppTheme.cs
new file mode 100644
index 00000000..63ca1eda
--- /dev/null
+++ b/src/openHAB.Core/Model/AppTheme.cs
@@ -0,0 +1,42 @@
+using System.ComponentModel;
+using Microsoft.UI.Xaml;
+
+namespace openHAB.Core.Model;
+
+/// <summary>
+/// Specifies the application theme.
+/// </summary>
+public enum AppTheme
+{
+    /// <summary>
+    /// Light theme.
+    /// </summary>
+    Light = ApplicationTheme.Light,
+
+    /// <summary>
+    /// Dark theme.
+    /// </summary>
+    Dark = ApplicationTheme.Dark,
+
+    /// <summary>
+    /// System default theme.
+    /// </summary>
+    System = 2
+}
+
+public static class AppThemeExtension
+{
+    public static ApplicationTheme ConvertToApplicationTheme(this AppTheme theme)
+    {
+        switch (theme)
+        {
+            case AppTheme.Light:
+                return ApplicationTheme.Light;
+            case AppTheme.Dark:
+                return ApplicationTheme.Dark;
+            case AppTheme.System:
+            default:
+                throw new InvalidEnumArgumentException(nameof(theme));
+        }
+    }
+}
diff --git a/src/openHAB.Core/Model/Connection/CloudConnectionProfile.cs b/src/openHAB.Core/Model/Connection/CloudConnectionProfile.cs
deleted file mode 100644
index 525e8cc6..00000000
--- a/src/openHAB.Core/Model/Connection/CloudConnectionProfile.cs
+++ /dev/null
@@ -1,55 +0,0 @@
-using OpenHAB.Core.Contracts;
-
-namespace OpenHAB.Core.Model.Connection
-{
-    /// <summary>Connection profile for for local custom connection to OpenHab server.</summary>
-    /// <seealso cref="OpenHAB.Core.Contracts.IConnectionProfile" />
-    public class CloudConnectionProfile : IConnectionProfile
-    {
-        /// <inheritdoc/>
-        public bool AllowHostUrlConfiguration
-        {
-            get => false;
-        }
-
-        /// <inheritdoc/>
-        public bool AllowIgnoreSSLCertificate
-        {
-            get => false;
-        }
-
-        /// <inheritdoc/>
-        public bool AllowIgnoreSSLHostname
-        {
-            get => false;
-        }
-
-        /// <inheritdoc/>
-        public int Id
-        {
-            get => 4;
-        }
-
-        /// <inheritdoc/>
-        public string Name
-        {
-            get => AppResources.Values.GetString("RemoteDefaultConnection");
-        }
-
-        /// <inheritdoc/>
-        public OpenHABHttpClientType Type
-        {
-            get => OpenHABHttpClientType.Remote;
-        }
-
-        /// <inheritdoc/>
-        public OpenHABConnection CreateConnection()
-        {
-            return new OpenHABConnection()
-            {
-                Type = OpenHABHttpClientType.Remote,
-                Url = "https://myopenhab.org/",
-            };
-        }
-    }
-}
diff --git a/src/openHAB.Core/Model/Connection/DefaultConnectionProfile.cs b/src/openHAB.Core/Model/Connection/DefaultConnectionProfile.cs
deleted file mode 100644
index 57dd7a89..00000000
--- a/src/openHAB.Core/Model/Connection/DefaultConnectionProfile.cs
+++ /dev/null
@@ -1,59 +0,0 @@
-using System;
-using OpenHAB.Core.Common;
-using OpenHAB.Core.Contracts;
-
-namespace OpenHAB.Core.Model.Connection
-{
-    /// <summary>Connection profile for local default connection to OpenHab server.</summary>
-    /// <seealso cref="OpenHAB.Core.Contracts.IConnectionProfile" />
-    public class DefaultConnectionProfile : IConnectionProfile
-    {
-        /// <inheritdoc/>
-        public bool AllowHostUrlConfiguration
-        {
-            get => false;
-        }
-
-        /// <inheritdoc/>
-        public bool AllowIgnoreSSLCertificate
-        {
-            get => true;
-        }
-
-        /// <inheritdoc/>
-        public bool AllowIgnoreSSLHostname
-        {
-            get => true;
-        }
-
-        /// <inheritdoc/>
-        public int Id
-        {
-            get => 1;
-        }
-
-        /// <inheritdoc/>
-        public string Name
-        {
-            get => AppResources.Values.GetString("LocalDefaultConnection");
-        }
-
-        /// <inheritdoc/>
-        public OpenHABHttpClientType Type
-        {
-            get => OpenHABHttpClientType.Local;
-        }
-
-        /// <inheritdoc/>
-        public OpenHABConnection CreateConnection()
-        {
-            return new OpenHABConnection()
-            {
-                Url = "https://openhab:8443",
-                Type = OpenHABHttpClientType.Local,
-                WillIgnoreSSLCertificate = true,
-                WillIgnoreSSLHostname = true,
-            };
-        }
-    }
-}
diff --git a/src/openHAB.Core/Model/Connection/DemoConnectionProfile.cs b/src/openHAB.Core/Model/Connection/DemoConnectionProfile.cs
deleted file mode 100644
index 5c9a88bc..00000000
--- a/src/openHAB.Core/Model/Connection/DemoConnectionProfile.cs
+++ /dev/null
@@ -1,58 +0,0 @@
-using OpenHAB.Core.Common;
-using OpenHAB.Core.Contracts;
-
-namespace OpenHAB.Core.Model.Connection
-{
-    /// <summary>Connection profile for for local custom connection to OpenHab server.</summary>
-    /// <seealso cref="OpenHAB.Core.Contracts.IConnectionProfile" />
-    public class DemoConnectionProfile : IConnectionProfile
-    {
-        /// <inheritdoc/>
-        public bool AllowHostUrlConfiguration
-        {
-            get => false;
-        }
-
-        /// <inheritdoc/>
-        public bool AllowIgnoreSSLCertificate
-        {
-            get => false;
-        }
-
-        /// <inheritdoc/>
-        public bool AllowIgnoreSSLHostname
-        {
-            get => false;
-        }
-
-        /// <inheritdoc/>
-        public int Id
-        {
-            get => 4;
-        }
-
-        /// <inheritdoc/>
-        public string Name
-        {
-            get => AppResources.Values.GetString("DemoConnection");
-        }
-
-        /// <inheritdoc/>
-        public OpenHABHttpClientType Type
-        {
-            get => OpenHABHttpClientType.Remote;
-        }
-
-        /// <inheritdoc/>
-        public OpenHABConnection CreateConnection()
-        {
-            return new OpenHABConnection()
-            {
-                Type = OpenHABHttpClientType.Remote,
-                Url = Constants.API.DemoModeUrl,
-                Username = Constants.API.DemoModeUser,
-                Password = Constants.API.DemoModeUserPwd
-            };
-        }
-    }
-}
diff --git a/src/openHAB.Core/Model/Connection/LocalConnectionProfile.cs b/src/openHAB.Core/Model/Connection/LocalConnectionProfile.cs
deleted file mode 100644
index 166f36e9..00000000
--- a/src/openHAB.Core/Model/Connection/LocalConnectionProfile.cs
+++ /dev/null
@@ -1,57 +0,0 @@
-using System;
-using OpenHAB.Core.Common;
-using OpenHAB.Core.Contracts;
-
-namespace OpenHAB.Core.Model.Connection
-{
-    /// <summary>Connection profile for local custom connection to OpenHab server.</summary>
-    /// <seealso cref="OpenHAB.Core.Contracts.IConnectionProfile" />
-    public class LocalConnectionProfile : IConnectionProfile
-    {
-        /// <inheritdoc/>
-        public bool AllowHostUrlConfiguration
-        {
-            get => true;
-        }
-
-        /// <inheritdoc/>
-        public bool AllowIgnoreSSLCertificate
-        {
-            get => true;
-        }
-
-        /// <inheritdoc/>
-        public bool AllowIgnoreSSLHostname
-        {
-            get => true;
-        }
-
-        /// <summary>Gets the connection profile îd.</summary>
-        /// <value>The îd.</value>
-        public int Id
-        {
-            get => 2;
-        }
-
-        /// <inheritdoc/>
-        public string Name
-        {
-            get => AppResources.Values.GetString("LocalCustomConnection");
-        }
-
-        /// <inheritdoc/>
-        public OpenHABHttpClientType Type
-        {
-            get => OpenHABHttpClientType.Local;
-        }
-
-        /// <inheritdoc/>
-        public OpenHABConnection CreateConnection()
-        {
-            return new OpenHABConnection()
-            {
-                Type = OpenHABHttpClientType.Local,
-            };
-        }
-    }
-}
diff --git a/src/openHAB.Core/Model/Connection/OpenHABConnection.cs b/src/openHAB.Core/Model/Connection/OpenHABConnection.cs
deleted file mode 100644
index 8eedda52..00000000
--- a/src/openHAB.Core/Model/Connection/OpenHABConnection.cs
+++ /dev/null
@@ -1,72 +0,0 @@
-using OpenHAB.Core.Common;
-using OpenHAB.Core.Contracts;
-
-namespace OpenHAB.Core.Model.Connection
-{
-    /// <summary>
-    /// Connection configuration for OpenHAB service or cloud instance.
-    /// </summary>
-    public class OpenHABConnection
-    {
-        /// <summary>Gets or sets the connection profile.</summary>
-        /// <value>The profile.</value>
-        public IConnectionProfile Profile
-        {
-            get;
-            set;
-        }
-
-        /// <summary>Gets or sets the type of the connection.</summary>
-        /// <value>The type of the connection.</value>
-        public OpenHABHttpClientType Type
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// Gets or sets the URL to the OpenHAB server.
-        /// </summary>
-        public string Url
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// Gets or sets the username for the OpenHAB server connection.
-        /// </summary>
-        public string Username
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// Gets or sets the password for the OpenHAB connection.
-        /// </summary>
-        public string Password
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        ///  Gets or sets a value indicating whether the application will ignore the SSL certificate.
-        /// </summary>
-        public bool? WillIgnoreSSLCertificate
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        ///  Gets or sets a value indicating whether the application will ignore the SSL hostname.
-        /// </summary>
-        public bool? WillIgnoreSSLHostname
-        {
-            get;
-            set;
-        }
-    }
-}
diff --git a/src/openHAB.Core/Model/Connection/OpenHABHttpClientType.cs b/src/openHAB.Core/Model/Connection/OpenHABHttpClientType.cs
deleted file mode 100644
index 5378f01a..00000000
--- a/src/openHAB.Core/Model/Connection/OpenHABHttpClientType.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-namespace OpenHAB.Core.Model.Connection
-{
-    /// <summary>
-    /// Defines the connection type to a local or remote openHAB instance.
-    /// </summary>
-    public enum OpenHABHttpClientType
-    {
-        /// <summary>
-        /// Local openHab http connection.
-        /// </summary>
-        Local,
-
-        /// <summary>
-        /// Remote openHab http connection.
-        /// </summary>
-        Remote,
-    }
-}
diff --git a/src/openHAB.Core/Model/Connection/RemoteConnectionProfile.cs b/src/openHAB.Core/Model/Connection/RemoteConnectionProfile.cs
deleted file mode 100644
index e00c43fa..00000000
--- a/src/openHAB.Core/Model/Connection/RemoteConnectionProfile.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-using System;
-using OpenHAB.Core.Common;
-using OpenHAB.Core.Contracts;
-
-namespace OpenHAB.Core.Model.Connection
-{
-    /// <summary>Connection profile for for local custom connection to OpenHab server.</summary>
-    /// <seealso cref="OpenHAB.Core.Contracts.IConnectionProfile" />
-    public class RemoteConnectionProfile : IConnectionProfile
-    {
-        /// <inheritdoc/>
-        public bool AllowHostUrlConfiguration
-        {
-            get => true;
-        }
-
-        /// <inheritdoc/>
-        public bool AllowIgnoreSSLCertificate
-        {
-            get => true;
-        }
-
-        /// <inheritdoc/>
-        public bool AllowIgnoreSSLHostname
-        {
-            get => true;
-        }
-
-        /// <inheritdoc/>
-        public int Id
-        {
-            get => 3;
-        }
-
-        /// <inheritdoc/>
-        public string Name
-        {
-            get => AppResources.Values.GetString("RemoteCustomConnection");
-        }
-
-        /// <inheritdoc/>
-        public OpenHABHttpClientType Type
-        {
-            get => OpenHABHttpClientType.Remote;
-        }
-
-        /// <inheritdoc/>
-        public OpenHABConnection CreateConnection()
-        {
-            return new OpenHABConnection()
-            {
-                Type = OpenHABHttpClientType.Remote,
-            };
-        }
-    }
-}
diff --git a/src/openHAB.Core/Model/ConnectionState.cs b/src/openHAB.Core/Model/ConnectionState.cs
deleted file mode 100644
index b3a07a46..00000000
--- a/src/openHAB.Core/Model/ConnectionState.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace OpenHAB.Core.Model
-{
-    /// <summary>
-    /// Reflects the State for an connection.
-    /// </summary>
-    public enum ConnectionState
-    {
-        /// <summary>
-        /// OpenHAB instance is reachable via url
-        /// </summary>
-        OK,
-
-        /// <summary>
-        /// OpenHAB instance can not reach via check url
-        /// </summary>
-        Failed,
-
-        /// <summary>
-        /// State is unknown
-        /// </summary>
-        Unknown,
-    }
-}
diff --git a/src/openHAB.Core/Model/Event/EventStreamData.cs b/src/openHAB.Core/Model/Event/EventStreamData.cs
deleted file mode 100644
index 6910d9b0..00000000
--- a/src/openHAB.Core/Model/Event/EventStreamData.cs
+++ /dev/null
@@ -1,23 +0,0 @@
-namespace OpenHAB.Core.Model.Event
-{
-    /// <summary>
-    /// Data coming from the eventstream.
-    /// </summary>
-    public class EventStreamData
-    {
-        /// <summary>
-        /// Gets or sets the topic on which the event was fired.
-        /// </summary>
-        public string Topic { get; set; }
-
-        /// <summary>
-        /// Gets or sets the payload of the event.
-        /// </summary>
-        public string Payload { get; set; }
-
-        /// <summary>
-        /// Gets or sets the type of event.
-        /// </summary>
-        public string Type { get; set; }
-    }
-}
\ No newline at end of file
diff --git a/src/openHAB.Core/Model/Event/EventStreamPayload.cs b/src/openHAB.Core/Model/Event/EventStreamPayload.cs
deleted file mode 100644
index 4fe292d8..00000000
--- a/src/openHAB.Core/Model/Event/EventStreamPayload.cs
+++ /dev/null
@@ -1,34 +0,0 @@
-namespace OpenHAB.Core.Model.Event
-{
-    /// <summary>
-    /// The payload coming from the event service.
-    /// </summary>
-    public class EventStreamPayload
-    {
-        /// <summary>
-        /// Gets or sets the type of event.
-        /// </summary>
-        public string Type { get; set; }
-
-        /// <summary>
-        /// Gets or sets the value of the event.
-        /// </summary>
-        public string Value { get; set; }
-
-        /// <summary>Gets or sets the old type of the event.</summary>
-        /// <value>The old type.</value>
-        public string OldType
-        {
-            get;
-            set;
-        }
-
-        /// <summary>Gets or sets the old value of the event.</summary>
-        /// <value>The old value.</value>
-        public string OldValue
-        {
-            get;
-            set;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/openHAB.Core/Model/Event/OpenHABEvent.cs b/src/openHAB.Core/Model/Event/OpenHABEvent.cs
deleted file mode 100644
index a4fe67d8..00000000
--- a/src/openHAB.Core/Model/Event/OpenHABEvent.cs
+++ /dev/null
@@ -1,62 +0,0 @@
-namespace OpenHAB.Core.Model.Event
-{
-    /// <summary>OpenHAB event.</summary>
-    public class OpenHABEvent
-    {
-        /// <summary>Gets the type of the event.</summary>
-        /// <value>The type of the event.</value>
-        public OpenHABEventType EventType
-        {
-            get;
-            internal set;
-        }
-
-        /// <summary>Gets or sets the name of the item.</summary>
-        /// <value>The name of the item.</value>
-        public string ItemName
-        {
-            get;
-            set;
-        }
-
-        /// <summary>Gets or sets the old type.</summary>
-        /// <value>The old type.</value>
-        public string OldType
-        {
-            get;
-            set;
-        }
-
-        /// <summary>Gets or sets the old value.</summary>
-        /// <value>The old value.</value>
-        public string OldValue
-        {
-            get;
-            set;
-        }
-
-        /// <summary>Gets or sets the topic.</summary>
-        /// <value>The topic.</value>
-        public string Topic
-        {
-            get;
-            set;
-        }
-
-        /// <summary>Gets or sets the value.</summary>
-        /// <value>The value.</value>
-        public string Value
-        {
-            get;
-            set;
-        }
-
-        /// <summary>Gets or sets the type of the value.</summary>
-        /// <value>The type of the value.</value>
-        public string ValueType
-        {
-            get;
-            set;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/openHAB.Core/Model/Event/OpenHABEventType.cs b/src/openHAB.Core/Model/Event/OpenHABEventType.cs
deleted file mode 100644
index 8a1551b1..00000000
--- a/src/openHAB.Core/Model/Event/OpenHABEventType.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-namespace OpenHAB.Core.Model.Event
-{
-    /// <summary>openHAB event types.</summary>
-    public enum OpenHABEventType
-    {
-        /// <summary>Item state event.</summary>
-        ItemStateEvent = 0,
-
-        /// <summary>Thing updated event.</summary>
-        ThingUpdatedEvent = 1,
-
-        /// <summary>Rule status information event.</summary>
-        RuleStatusInfoEvent = 2,
-
-        /// <summary>Item state predicted event.</summary>
-        ItemStatePredictedEvent = 3,
-
-        /// <summary>Group item state changed event.</summary>
-        GroupItemStateChangedEvent = 4,
-
-        /// <summary>Item state changed event.</summary>
-        ItemStateChangedEvent = 5,
-
-        /// <summary>Unknown event.</summary>
-        Unknown = 6
-    }
-}
\ No newline at end of file
diff --git a/src/openHAB.Core/Model/Link.cs b/src/openHAB.Core/Model/Link.cs
deleted file mode 100644
index b4ef75a0..00000000
--- a/src/openHAB.Core/Model/Link.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-using Newtonsoft.Json;
-
-namespace OpenHAB.Core.Model
-{
-    /// <summary>Use to serialize api information from openHAB server.</summary>
-    public partial class Link
-    {
-        /// <summary>Gets or sets the type.</summary>
-        /// <value>The type.</value>
-        [JsonProperty("type")]
-        public string Type
-        {
-            get; set;
-        }
-
-        /// <summary>Gets or sets the URL.</summary>
-        /// <value>The URL.</value>
-        [JsonProperty("url")]
-        public Uri Url
-        {
-            get; set;
-        }
-    }
-}
diff --git a/src/openHAB.Core/Model/OpenHABAPIInfo.cs b/src/openHAB.Core/Model/OpenHABAPIInfo.cs
deleted file mode 100644
index 8d85d69b..00000000
--- a/src/openHAB.Core/Model/OpenHABAPIInfo.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-using System.Collections.Generic;
-using Newtonsoft.Json;
-
-namespace OpenHAB.Core.Model
-{
-    /// <summary>
-    /// Response for REST Root call, which provides all information about openHAB instance.
-    /// </summary>
-    public class OpenHABAPIInfo
-    {
-        /// <summary>Gets or sets the version.</summary>
-        /// <value>The version.</value>
-        [JsonProperty("version")]
-        public int Version
-        {
-            get; set;
-        }
-
-        /// <summary>Gets or sets the locale.</summary>
-        /// <value>The locale.</value>
-        [JsonProperty("locale")]
-        public string Locale
-        {
-            get; set;
-        }
-
-        /// <summary>Gets or sets the measurement system.</summary>
-        /// <value>The measurement system.</value>
-        [JsonProperty("measurementSystem")]
-        public string MeasurementSystem
-        {
-            get; set;
-        }
-
-        /// <summary>Gets or sets the runtime information.</summary>
-        /// <value>The runtime information.</value>
-        [JsonProperty("runtimeInfo")]
-        public RuntimeInfo RuntimeInfo
-        {
-            get; set;
-        }
-
-        /// <summary>Gets or sets the links.</summary>
-        /// <value>The links.</value>
-        [JsonProperty("links")]
-        public List<Link> Links
-        {
-            get; set;
-        }
-    }
-}
diff --git a/src/openHAB.Core/Model/OpenHABCommandDescription.cs b/src/openHAB.Core/Model/OpenHABCommandDescription.cs
deleted file mode 100644
index 893e421b..00000000
--- a/src/openHAB.Core/Model/OpenHABCommandDescription.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System.Collections.Generic;
-
-namespace OpenHAB.Core.Model
-{
-    /// <summary>
-    /// A mapping for an OpenHAB Widget.
-    /// </summary>
-    public class OpenHABCommandDescription
-    {
-        /// <summary>
-        /// Gets or sets the CommandOptions.
-        /// </summary>
-        public ICollection<OpenHABCommandOptions> CommandOptions { get; set; }
-
-        /// <summary>Initializes a new instance of the <see cref="OpenHABCommandDescription" /> class.</summary>
-        /// <param name="commandOptions">The command options.</param>
-        public OpenHABCommandDescription(ICollection<OpenHABCommandOptions> commandOptions)
-        {
-            CommandOptions = commandOptions;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/openHAB.Core/Model/OpenHABCommandOptions.cs b/src/openHAB.Core/Model/OpenHABCommandOptions.cs
deleted file mode 100644
index b209864a..00000000
--- a/src/openHAB.Core/Model/OpenHABCommandOptions.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-namespace OpenHAB.Core.Model
-{
-    /// <summary>
-    /// A CommandOptions for commandDescription.
-    /// </summary>
-    public class OpenHABCommandOptions
-    {
-        /// <summary>
-        /// Gets or sets the Command of the mapping.
-        /// </summary>
-        public string Command { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Label of the mapping.
-        /// </summary>
-        public string Label { get; set; }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="OpenHABCommandOptions"/> class.
-        /// </summary>
-        /// <param name="command">A command.</param>
-        /// <param name="label">A label.</param>
-        public OpenHABCommandOptions(string command, string label)
-        {
-            Command = command;
-            Label = label;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/openHAB.Core/Model/OpenHABCommands.cs b/src/openHAB.Core/Model/OpenHABCommands.cs
index 0ebcece9..2e391d5f 100644
--- a/src/openHAB.Core/Model/OpenHABCommands.cs
+++ b/src/openHAB.Core/Model/OpenHABCommands.cs
@@ -1,33 +1,32 @@
-namespace OpenHAB.Core.Model
+namespace openHAB.Core.Model;
+
+/// <summary>
+/// A list of constants used for sending commands to OpenHAB.
+/// </summary>
+public sealed class OpenHABCommands
 {
     /// <summary>
-    /// A list of constants used for sending commands to OpenHAB.
+    /// The command to toggle a switch ON.
     /// </summary>
-    public sealed class OpenHABCommands
-    {
-        /// <summary>
-        /// The command to toggle a switch ON.
-        /// </summary>
-        public const string OnCommand = "ON";
+    public const string OnCommand = "ON";
 
-        /// <summary>
-        /// The command to toggle a switch OFF.
-        /// </summary>
-        public const string OffCommand = "OFF";
+    /// <summary>
+    /// The command to toggle a switch OFF.
+    /// </summary>
+    public const string OffCommand = "OFF";
 
-        /// <summary>
-        /// The command to make a rollershutter go up.
-        /// </summary>
-        public const string UpCommand = "UP";
+    /// <summary>
+    /// The command to make a rollershutter go up.
+    /// </summary>
+    public const string UpCommand = "UP";
 
-        /// <summary>
-        /// The command to make a rollershutter go down.
-        /// </summary>
-        public const string DownCommand = "DOWN";
+    /// <summary>
+    /// The command to make a rollershutter go down.
+    /// </summary>
+    public const string DownCommand = "DOWN";
 
-        /// <summary>
-        /// The command to make a rollershutter stop.
-        /// </summary>
-        public const string StopCommand = "STOP";
-    }
+    /// <summary>
+    /// The command to make a rollershutter stop.
+    /// </summary>
+    public const string StopCommand = "STOP";
 }
diff --git a/src/openHAB.Core/Model/OpenHABConnectionType.cs b/src/openHAB.Core/Model/OpenHABConnectionType.cs
deleted file mode 100644
index 8aea4448..00000000
--- a/src/openHAB.Core/Model/OpenHABConnectionType.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-namespace OpenHAB.Core
-{
-    /// <summary>Defines connection types for OpenHAB instance.</summary>
-    public enum OpenHABConnectionType
-    {
-        /// <summary> Local connection to OpenHAB instance.</summary>
-        Local = 0,
-
-        /// <summary>  Remote connection to OpenHAB instance.</summary>
-        Remote = 1,
-    }
-}
\ No newline at end of file
diff --git a/src/openHAB.Core/Model/OpenHABException.cs b/src/openHAB.Core/Model/OpenHABException.cs
deleted file mode 100644
index 275728cd..00000000
--- a/src/openHAB.Core/Model/OpenHABException.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System;
-
-namespace OpenHAB.Core.Model
-{
-    /// <summary>
-    /// An Exception class used to throw unexpected errors.
-    /// </summary>
-    public class OpenHABException : Exception
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="OpenHABException"/> class.
-        /// </summary>
-        /// <param name="message">The error message.</param>
-        public OpenHABException(string message)
-            : base(message)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="OpenHABException"/> class.
-        /// </summary>
-        /// <param name="message">The error message.</param>
-        /// <param name="exception">The original exception.</param>
-        public OpenHABException(string message, Exception exception)
-            : base(message, exception)
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="OpenHABException"/> class.
-        /// </summary>
-        public OpenHABException()
-        {
-        }
-    }
-}
diff --git a/src/openHAB.Core/Model/OpenHABItem.cs b/src/openHAB.Core/Model/OpenHABItem.cs
deleted file mode 100644
index cbf47601..00000000
--- a/src/openHAB.Core/Model/OpenHABItem.cs
+++ /dev/null
@@ -1,197 +0,0 @@
-using System;
-using System.Globalization;
-using System.Text.RegularExpressions;
-using System.Xml.Linq;
-using CommunityToolkit.Mvvm.ComponentModel;
-using CommunityToolkit.Mvvm.Messaging;
-using Microsoft.Toolkit.Uwp.Helpers;
-using Newtonsoft.Json;
-using OpenHAB.Core.Messages;
-
-namespace OpenHAB.Core.Model
-{
-    /// <summary>
-    /// A class that represents an OpenHAB item.
-    /// </summary>
-    public class OpenHABItem : ObservableObject
-    {
-        private string _state;
-        private string _type;
-
-        /// <summary>Gets or sets the item category.</summary>
-        /// <value>The category.</value>
-        public string Category
-        {
-            get; set;
-        }
-
-        /// <summary>Gets or sets the item label with the display name.</summary>
-        /// <value>The item label.</value>
-        public string Label
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// Gets or sets the name of the OpenHAB item.
-        /// </summary>
-        public string Name
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// Gets or sets the type of the OpenHAB item.
-        /// </summary>
-        public string Type
-        {
-            get => _type;
-            set
-            {
-                if (value != null && value.Contains(":", System.StringComparison.OrdinalIgnoreCase) && _state != null)
-                {
-                    int spaceIndex = _state.LastIndexOf(' ');
-                    if (spaceIndex > 0)
-                    {
-                        Unit = _state.Substring(spaceIndex, _state.Length - spaceIndex);
-                    }
-                }
-
-                SetProperty(ref _type, value);
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the grouptype of the OpenHAB item.
-        /// </summary>
-        public string GroupType
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// Gets or sets the state of the OpenHAB item.
-        /// </summary>
-        public string State
-        {
-            get => _state;
-            set
-            {
-                if ((_type != null) && (Unit == null) && _type.Contains(":", System.StringComparison.OrdinalIgnoreCase) && value != null && value.Contains(" "))
-                {
-                    int spaceIndex = value.LastIndexOf(' ');
-                    Unit = value.Substring(spaceIndex, value.Length - spaceIndex);
-                }
-
-                SetProperty(ref _state, value);
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the link of the OpenHAB item.
-        /// </summary>
-        public string Unit
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// Gets or sets the unit of the OpenHAB item.
-        /// </summary>
-        public string Link
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// Gets or sets the CommandDescription of the OpenHAB item.
-        /// </summary>
-        ///
-        public OpenHABCommandDescription CommandDescription
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="OpenHABItem"/> class.
-        /// </summary>
-        public OpenHABItem()
-        {
-            StrongReferenceMessenger.Default.Register<UpdateItemMessage>(this, HandleUpdateItemMessage);
-        }
-
-        private void HandleUpdateItemMessage(object recipient, UpdateItemMessage message)
-        {
-            if (message.ItemName != Name)
-            {
-                return;
-            }
-
-            DispatcherHelper.ExecuteOnUIThreadAsync(() =>
-            {
-                State = message.Value;
-            });
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="OpenHABItem"/> class.
-        /// </summary>
-        /// <param name="startNode">The XML from the OpenHAB server that represents this OpenHAB item.</param>
-        public OpenHABItem(XElement startNode)
-        {
-            ParseNode(startNode);
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="OpenHABItem"/> class.
-        /// </summary>
-        /// <param name="jsonObject">The JSON from the OpenHAB server that represents this OpenHAB item.</param>
-        public OpenHABItem(string jsonObject)
-        {
-            var item = JsonConvert.DeserializeObject<OpenHABItem>(jsonObject);
-            Name = item.Name;
-            Type = item.Type;
-            GroupType = item.GroupType;
-            State = item.State;
-            Link = item.Link;
-            CommandDescription = item.CommandDescription;
-        }
-
-        private void ParseNode(XElement startNode)
-        {
-            if (!startNode.HasElements)
-            {
-                return;
-            }
-
-            Name = startNode.Element("name")?.Value;
-            Type = startNode.Element("type")?.Value;
-            GroupType = startNode.Element("groupType")?.Value;
-            State = startNode.Element("state")?.Value;
-            Link = startNode.Element("link")?.Value;
-        }
-
-        /// <summary>Sned update message to all subscriber.</summary>
-        /// <param name="value">The value.</param>
-        public void UpdateValue(object value)
-        {
-            if (value != null)
-            {
-                string newValue = value.ToString() + this.Unit;
-                StrongReferenceMessenger.Default.Send(new TriggerCommandMessage(this, newValue));
-                _state = newValue;
-            }
-        }
-
-        /// <summary>Convert state to double value.</summary>
-        /// <returns>State as double value.</returns>
-        public double GetStateAsDoubleValue()
-        {
-            string newstate = Regex.Replace(_state, "[^0-9,.]", string.Empty);
-            double value = 0;
-            double.TryParse(newstate, NumberStyles.AllowDecimalPoint, CultureInfo.InvariantCulture, out value);
-
-            return value;
-        }
-    }
-}
diff --git a/src/openHAB.Core/Model/OpenHABSitemap.cs b/src/openHAB.Core/Model/OpenHABSitemap.cs
deleted file mode 100644
index ab20ac08..00000000
--- a/src/openHAB.Core/Model/OpenHABSitemap.cs
+++ /dev/null
@@ -1,107 +0,0 @@
-using System.Collections.Generic;
-using System.Xml.Linq;
-
-namespace OpenHAB.Core.Model
-{
-    /// <summary>
-    /// A class that represents an OpenHAB sitemap.
-    /// </summary>
-    public class OpenHABSitemap
-    {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="OpenHABSitemap"/> class.
-        /// </summary>
-        public OpenHABSitemap()
-        {
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="OpenHABSitemap"/> class.
-        /// </summary>
-        /// <param name="startNode">The XML from the OpenHAB server that represents this OpenHAB item.</param>
-        public OpenHABSitemap(XElement startNode)
-        {
-            ParseNode(startNode);
-        }
-
-        /// <summary>
-        /// Gets or sets the name of the OpenHAB sitemap.
-        /// </summary>
-        public string Name
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// Gets or sets the label of the OpenHAB sitemap.
-        /// </summary>
-        public string Label
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// Gets or sets the link of the OpenHAB sitemap.
-        /// </summary>
-        public string Link
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// Gets or sets the icon of the OpenHAB sitemap.
-        /// </summary>
-        public string Icon
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// Gets or sets the url of the OpenHAB sitemap.
-        /// </summary>
-        public string HomepageLink
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the sitemap is a leaf.
-        /// </summary>
-        public bool Leaf
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// Gets or sets the title of the sitemap.
-        /// </summary>
-        public string Title
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// Gets or sets a collection of widgets of the OpenHAB sitemap.
-        /// </summary>
-        public ICollection<OpenHABWidget> Widgets
-        {
-            get;
-            set;
-        }
-
-        private void ParseNode(XElement startNode)
-        {
-            if (startNode.HasElements)
-            {
-                Name = startNode.Element("name")?.Value;
-                Label = startNode.Element("label")?.Value;
-                Link = startNode.Element("link")?.Value;
-                Icon = startNode.Element("icon")?.Value;
-
-                var homePage = startNode.Element("homepage");
-                HomepageLink = homePage?.Element("link")?.Value;
-                Leaf = homePage?.Element("leaf")?.Value == "true";
-            }
-        }
-    }
-}
diff --git a/src/openHAB.Core/Model/OpenHABWidget.cs b/src/openHAB.Core/Model/OpenHABWidget.cs
deleted file mode 100644
index 999420d1..00000000
--- a/src/openHAB.Core/Model/OpenHABWidget.cs
+++ /dev/null
@@ -1,315 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Runtime.CompilerServices;
-using System.Xml.Linq;
-using Newtonsoft.Json;
-
-namespace OpenHAB.Core.Model
-{
-    /// <summary>
-    /// A class that represents an OpenHAB widget.
-    /// </summary>
-    public class OpenHABWidget : INotifyPropertyChanged, IEquatable<OpenHABWidget>
-    {
-        private string _icon;
-        private string _label;
-
-        /// <summary>Occurs when a property value changes.</summary>
-        /// <returns></returns>
-        public event PropertyChangedEventHandler PropertyChanged;
-
-        /// <summary>
-        /// Called when [property changed].
-        /// </summary>
-        /// <param name="propertyName">Name of the property.</param>
-        protected void OnPropertyChanged([CallerMemberName] string propertyName = null)
-        {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="OpenHABWidget"/> class.
-        /// </summary>
-        public OpenHABWidget()
-        {
-            Children = new List<OpenHABWidget>();
-        }
-
-        /// <summary>
-        /// Gets or sets the ID of the OpenHAB widget.
-        /// </summary>
-        public string WidgetId
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// Gets or sets the Label of the OpenHAB widget.
-        /// </summary>
-        public string Label
-        {
-            get => _label;
-
-            set
-            {
-                if (string.IsNullOrEmpty(value.Trim()))
-                {
-                    _label = value;
-                    return;
-                }
-
-                var parts = value.Split(new[] { "[", "]" }, StringSplitOptions.RemoveEmptyEntries);
-                _label = parts[0];
-
-                if (parts.Length > 1)
-                {
-                    Value = parts[1];
-                }
-
-                OnPropertyChanged();
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets the Value of the widget.
-        /// </summary>
-        public string Value
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// Gets or sets the Icon of the OpenHAB widget.
-        /// </summary>
-        public string Icon
-        {
-            get => _icon ?? string.Empty;
-            set => _icon = value;
-        }
-
-        /// <summary>
-        /// Gets or sets the Type of the OpenHAB widget.
-        /// </summary>
-        public string Type
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// Gets or sets the Url of the OpenHAB widget.
-        /// </summary>
-        public string Url
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// Gets or sets the Period of the OpenHAB widget.
-        /// </summary>
-        public string Period
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// Gets or sets the Service of the OpenHAB widget.
-        /// </summary>
-        public string Service
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// Gets or sets the MinValue of the OpenHAB widget.
-        /// </summary>
-        public float MinValue
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// Gets or sets the MaxValue of the OpenHAB widget.
-        /// </summary>
-        public float MaxValue
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// Gets or sets the Step of the OpenHAB widget.
-        /// </summary>
-        public float Step
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// Gets or sets the Refresh of the OpenHAB widget.
-        /// </summary>
-        public int Refresh
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// Gets or sets the Height of the OpenHAB widget.
-        /// </summary>
-        public int Height
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// Gets or sets the State of the OpenHAB widget.
-        /// </summary>
-        public string State
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// Gets or sets the IconColor of the OpenHAB widget.
-        /// </summary>
-        public string IconColor
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// Gets or sets the LabelColor of the OpenHAB widget.
-        /// </summary>
-        public string LabelColor
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// Gets or sets the ValueColor of the OpenHAB widget.
-        /// </summary>
-        public string ValueColor
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// Gets or sets the Encoding of the OpenHAB widget.
-        /// </summary>
-        public string Encoding
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// Gets or sets the Item of the OpenHAB widget.
-        /// </summary>
-        public OpenHABItem Item
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// Gets or sets the Parent of the OpenHAB widget.
-        /// </summary>
-        public OpenHABWidget Parent
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// Gets or sets the Children of the OpenHAB widget.
-        /// </summary>
-        [JsonProperty(PropertyName = "widgets")]
-        public ICollection<OpenHABWidget> Children
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// Gets or sets the Mapping of the OpenHAB widget.
-        /// </summary>
-        public ICollection<OpenHABWidgetMapping> Mappings
-        {
-            get; set;
-        }
-
-        /// <summary>
-        /// Gets or sets the linked page when available.
-        /// </summary>
-        public OpenHABSitemap LinkedPage
-        {
-            get; set;
-        }
-
-        /// <summary>Gets or sets a value indicating whether this <see cref="OpenHABWidget" /> is visibility.</summary>
-        /// <value>
-        ///   <c>true</c> if visibility; otherwise, <c>false</c>.</value>
-        public bool Visibility
-        {
-            get;
-            set;
-        }
-
-        #region IEquatable Implementation
-
-        /// <inheritdoc/>
-        public override int GetHashCode()
-        {
-            return WidgetId.GetHashCode();
-        }
-
-        /// <inheritdoc/>
-        public override bool Equals(object obj)
-        {
-            OpenHABWidget widget = (OpenHABWidget)obj;
-
-            if (widget == null)
-            {
-                return false;
-            }
-
-            return Equals(widget);
-        }
-
-        /// <inheritdoc/>
-        public bool Equals(OpenHABWidget other)
-        {
-            if (string.IsNullOrEmpty(WidgetId) || ReferenceEquals(other, null))
-            {
-                return false;
-            }
-
-            return WidgetId.CompareTo(other.WidgetId) == 0;
-        }
-
-        /// <summary>Implements the operator ==.</summary>
-        /// <param name="widget1">The widget1.</param>
-        /// <param name="widget2">The widget2.</param>
-        /// <returns>The result of the operator.</returns>
-        public static bool operator ==(OpenHABWidget widget1, OpenHABWidget widget2)
-        {
-            if (ReferenceEquals(widget1, null))
-            {
-                return ReferenceEquals(widget2, null);
-            }
-
-            return widget1.Equals(widget2);
-        }
-
-        /// <summary>Implements the operator !=.</summary>
-        /// <param name="widget1">The widget1.</param>
-        /// <param name="widget2">The widget2.</param>
-        /// <returns>The result of the operator.</returns>
-        public static bool operator !=(OpenHABWidget widget1, OpenHABWidget widget2)
-        {
-            if (ReferenceEquals(widget1, null))
-            {
-                return false;
-            }
-
-            return !widget1.Equals(widget2);
-        }
-
-        #endregion
-    }
-}
diff --git a/src/openHAB.Core/Model/OpenHABWidgetMapping.cs b/src/openHAB.Core/Model/OpenHABWidgetMapping.cs
deleted file mode 100644
index 899e433f..00000000
--- a/src/openHAB.Core/Model/OpenHABWidgetMapping.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-namespace OpenHAB.Core.Model
-{
-    /// <summary>
-    /// A mapping for an OpenHAB Widget.
-    /// </summary>
-    public class OpenHABWidgetMapping
-    {
-        /// <summary>
-        /// Gets or sets the Command of the mapping.
-        /// </summary>
-        public string Command { get; set; }
-
-        /// <summary>
-        /// Gets or sets the Label of the mapping.
-        /// </summary>
-        public string Label { get; set; }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="OpenHABWidgetMapping"/> class.
-        /// </summary>
-        /// <param name="command">A command.</param>
-        /// <param name="label">A label.</param>
-        public OpenHABWidgetMapping(string command, string label)
-        {
-            Command = command;
-            Label = label;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/openHAB.Core/Model/OpenHabVersion.cs b/src/openHAB.Core/Model/OpenHabVersion.cs
deleted file mode 100644
index 0944e3e2..00000000
--- a/src/openHAB.Core/Model/OpenHabVersion.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-namespace OpenHAB.Core.Model
-{
-    /// <summary>
-    /// Enum to differentiate between OpenHAB 1, 2 and 3.
-    /// </summary>
-    public enum OpenHABVersion
-    {
-        /// <summary>
-        /// OpenHAB V1
-        /// </summary>
-        One = 1,
-
-        /// <summary>
-        /// OpenHAB V2
-        /// </summary>
-        Two = 2,
-
-        /// <summary>
-        /// OpenHAB V3
-        /// </summary>
-        Three = 3,
-
-        /// <summary>
-        /// Used when no connection is available
-        /// </summary>
-        None,
-    }
-}
diff --git a/src/openHAB.Core/Model/OpenhabConnectionProfile.cs b/src/openHAB.Core/Model/OpenhabConnectionProfile.cs
deleted file mode 100644
index bc05da46..00000000
--- a/src/openHAB.Core/Model/OpenhabConnectionProfile.cs
+++ /dev/null
@@ -1,33 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace OpenHAB.Core.Model
-{
-    /// <summary>Specifies the current connection profile.</summary>
-    public class OpenHABConnectionProfile
-    {
-        /// <summary>Gets or sets the connection name.</summary>
-        /// <value>The name.</value>
-        public string Name
-        {
-            get; set;
-        }
-
-        /// <summary>Gets or sets the URL.</summary>
-        /// <value>The URL.</value>
-        public Uri Url
-        {
-            get; set;
-        }
-
-        /// <summary>Gets or sets the type of the connection.</summary>
-        /// <value>The type of the connection.</value>
-        public OpenHABConnectionType ConnectionType
-        {
-            get; set;
-        }
-    }
-}
diff --git a/src/openHAB.Core/Model/RuntimeInfo.cs b/src/openHAB.Core/Model/RuntimeInfo.cs
deleted file mode 100644
index e8e310e6..00000000
--- a/src/openHAB.Core/Model/RuntimeInfo.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using Newtonsoft.Json;
-
-namespace OpenHAB.Core.Model
-{
-    /// <summary>Used to serialize the service information from openHAB server.</summary>
-    public partial class RuntimeInfo
-    {
-        /// <summary>Gets or sets the server version.</summary>
-        /// <value>The version.</value>
-        [JsonProperty("version")]
-        public string Version
-        {
-            get; set;
-        }
-
-        /// <summary>Gets or sets the build version string.</summary>
-        /// <value>The build string.</value>
-        [JsonProperty("buildString")]
-        public string BuildString
-        {
-            get; set;
-        }
-    }
-}
diff --git a/src/openHAB.Core/Model/ServerInfo.cs b/src/openHAB.Core/Model/ServerInfo.cs
deleted file mode 100644
index 33562ba8..00000000
--- a/src/openHAB.Core/Model/ServerInfo.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-namespace OpenHAB.Core.Model
-{
-    /// <summary>Information about openHAB server.</summary>
-    public class ServerInfo
-    {
-        /// <summary>Gets the openHAB major version.</summary>
-        /// <value>The version.</value>
-        public OpenHABVersion Version { get; internal set; }
-
-        /// <summary>Gets the build.</summary>
-        /// <value>The build.</value>
-        public string Build { get; internal set; }
-
-        /// <summary>Gets the runtime version.</summary>
-        /// <value>The runtime version.</value>
-        public string RuntimeVersion { get; internal set; }
-    }
-}
\ No newline at end of file
diff --git a/src/openHAB.Core/Model/SettingOptions.cs b/src/openHAB.Core/Model/SettingOptions.cs
new file mode 100644
index 00000000..c711d5a7
--- /dev/null
+++ b/src/openHAB.Core/Model/SettingOptions.cs
@@ -0,0 +1,109 @@
+using System.IO;
+using System.Text;
+using System.Text.Json;
+
+namespace openHAB.Core.Model;
+
+/// <summary>
+/// Class that holds all the OpenHAB Windows app settings.
+/// </summary>
+public class SettingOptions
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="SettingOptions"/> class.
+    /// </summary>
+    public SettingOptions()
+    {
+        ShowDefaultSitemap = false;
+        UseSVGIcons = false;
+        NotificationsEnable = false;
+    }
+
+    /// <summary>
+    /// Gets or sets the application language.
+    /// </summary>
+    /// <value>The application language.</value>
+    public string? AppLanguage
+    {
+        get;
+        set;
+    }
+
+    /// <summary>
+    /// Gets or sets the last sitemap name in settings.
+    /// </summary>
+    /// <value>
+    /// The last sitemap.
+    /// </value>
+    public string LastSitemap
+    {
+        get; set;
+    }
+
+
+    /// <summary>
+    /// Gets or sets the setting to enable notifications.
+    /// </summary>
+    /// <value>The enable notifications.</value>
+    public bool? NotificationsEnable
+    {
+        get;
+        set;
+    }
+
+    /// <summary>
+    /// Gets or sets a value indicating whether the default sitemap should be visible.
+    /// </summary>
+    /// <value>The hide default sitemap.</value>
+    public bool ShowDefaultSitemap
+    {
+        get;
+        set;
+    }
+
+    /// <summary>Gets or sets the setting to start application minimized.</summary>
+    /// <value>The start application minimized.</value>
+    public bool? StartAppMinimized
+    {
+        get;
+        set;
+    }
+
+    /// <summary>Gets or sets a value indicating whether [use SVG icons].</summary>
+    /// <value>
+    ///   <c>true</c> if [use SVG icons]; otherwise, <c>false</c>.</value>
+    public bool UseSVGIcons
+    {
+        get;
+        set;
+    }
+
+    /// <summary>
+    /// Gets or sets the application theme.
+    /// </summary>
+    /// <value>The application theme.</value>
+    public AppTheme AppTheme
+    {
+        get;
+        set;
+    }
+
+    /// <summary>
+    /// Saves the current settings to a file.
+    /// </summary>
+    /// <returns><c>true</c> if the settings were saved successfully; otherwise, <c>false</c>.</returns>
+    public bool Save()
+    {
+        try
+        {
+            string settingsContent = JsonSerializer.Serialize(this);
+            File.WriteAllText(AppPaths.SettingsFilePath, settingsContent, Encoding.UTF8);
+
+            return true;
+        }
+        catch (System.Exception)
+        {
+            return false;
+        }
+    }
+}
diff --git a/src/openHAB.Core/Model/Settings.cs b/src/openHAB.Core/Model/Settings.cs
deleted file mode 100644
index 28f25c21..00000000
--- a/src/openHAB.Core/Model/Settings.cs
+++ /dev/null
@@ -1,117 +0,0 @@
-using System.Collections.Generic;
-using OpenHAB.Core.Contracts;
-using OpenHAB.Core.Model.Connection;
-
-namespace OpenHAB.Core.Model
-{
-    /// <summary>
-    /// Class that holds all the OpenHAB Windows app settings.
-    /// </summary>
-    [System.Runtime.InteropServices.Guid("6AF3A86A-9AAA-400B-AB7F-E42A780D5ECF")]
-    public class Settings
-    {
-        private static List<IConnectionProfile> _connectionProfiles;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="Settings"/> class.
-        /// </summary>
-        public Settings()
-        {
-            IsRunningInDemoMode = false;
-            ShowDefaultSitemap = false;
-            UseSVGIcons = false;
-            NotificationsEnable = false;
-        }
-
-        /// <summary>
-        /// Gets or sets the application language.
-        /// </summary>
-        /// <value>The application language.</value>
-        public string AppLanguage
-        {
-            get;
-            set;
-        }
-
-        /// <summary>Gets the list of available connection profiles.</summary>
-        /// <value>The connection profiles.</value>
-        public static List<IConnectionProfile> ConnectionProfiles
-        {
-            get
-            {
-                if (_connectionProfiles == null)
-                {
-                    _connectionProfiles = new List<IConnectionProfile>();
-                    _connectionProfiles.Add(new LocalConnectionProfile());
-                    _connectionProfiles.Add(new DefaultConnectionProfile());
-                    _connectionProfiles.Add(new RemoteConnectionProfile());
-                    _connectionProfiles.Add(new CloudConnectionProfile());
-                }
-
-                return _connectionProfiles;
-            }
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the application is currently running in demo mode.
-        /// </summary>
-        public bool? IsRunningInDemoMode
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// Gets or sets the configuration to the OpenHAB remote instance.
-        /// </summary>
-        public OpenHABConnection LocalConnection
-        {
-            get;
-            set;
-        }
-
-        /// <summary>Gets or sets the setting to enable notifications.</summary>
-        /// <value>The enable notifications.</value>
-        public bool? NotificationsEnable
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// Gets or sets the configuration to the OpenHAB remote instance.
-        /// </summary>
-        public OpenHABConnection RemoteConnection
-        {
-            get;
-            set;
-        }
-
-        /// <summary>
-        /// Gets or sets a value indicating whether the default sitemap should be visible.
-        /// </summary>
-        /// <value>The hide default sitemap.</value>
-        public bool ShowDefaultSitemap
-        {
-            get;
-            set;
-        }
-
-        /// <summary>Gets or sets the setting to start application minimized.</summary>
-        /// <value>The start application minimized.</value>
-        public bool? StartAppMinimized
-        {
-            get;
-            set;
-        }
-
-        /// <summary>Gets or sets a value indicating whether [use SVG icons].</summary>
-        /// <value>
-        ///   <c>true</c> if [use SVG icons]; otherwise, <c>false</c>.</value>
-        public bool UseSVGIcons
-        {
-            get;
-            set;
-        }
-    }
-}
diff --git a/src/openHAB.Core/Model/WidgetTypeEnum.cs b/src/openHAB.Core/Model/WidgetTypeEnum.cs
index 7b9478d9..e38ec4e5 100644
--- a/src/openHAB.Core/Model/WidgetTypeEnum.cs
+++ b/src/openHAB.Core/Model/WidgetTypeEnum.cs
@@ -1,103 +1,102 @@
-namespace OpenHAB.Core.Model
+namespace openHAB.Core.Model;
+
+/// <summary>
+/// All different Widget Types.
+/// </summary>
+public enum WidgetTypeEnum
 {
     /// <summary>
-    /// All different Widget Types.
-    /// </summary>
-    public enum WidgetTypeEnum
-    {
-        /// <summary>
-        /// Color
-        /// </summary>
-        ColorPicker,
-
-        /// <summary>
-        /// Group
-        /// </summary>
-        Group,
-
-        /// <summary>
-        /// Frame
-        /// </summary>
-        Frame,
-
-        /// <summary>
-        /// Switch
-        /// </summary>
-        Switch,
-
-        /// <summary>
-        /// SectionSwitch
-        /// </summary>
-        SectionSwitch,
-
-        /// <summary>
-        /// RollerShutter
-        /// </summary>
-        RollerShutter,
-
-        /// <summary>
-        /// Slider
-        /// </summary>
-        Slider,
-
-        /// <summary>
-        /// DateTime
-        /// </summary>
-        DateTime,
-
-        /// <summary>
-        /// Text
-        /// </summary>
-        Text,
-
-        /// <summary>
-        /// Image
-        /// </summary>
-        Image,
-
-        /// <summary>
-        /// Selection
-        /// </summary>
-        Selection,
-
-        /// <summary>
-        /// Setpoint
-        /// </summary>
-        Setpoint,
-
-        /// <summary>
-        /// Chart
-        /// </summary>
-        Chart,
-
-        /// <summary>
-        /// Video
-        /// </summary>
-        Video,
-
-        /// <summary>
-        /// VideoMjpeg
-        /// </summary>
-        VideoMjpeg,
-
-        /// <summary>
-        /// Webview
-        /// </summary>
-        Webview,
-
-        /// <summary>
-        /// Colorpicker
-        /// </summary>
-        Colorpicker,
-
-        /// <summary>
-        /// Mapview
-        /// </summary>
-        Mapview,
-
-        /// <summary>
-        /// Generic
-        /// </summary>
-        Generic,
-    }
+    /// Color
+    /// </summary>
+    ColorPicker,
+
+    /// <summary>
+    /// Group
+    /// </summary>
+    Group,
+
+    /// <summary>
+    /// Frame
+    /// </summary>
+    Frame,
+
+    /// <summary>
+    /// Switch
+    /// </summary>
+    Switch,
+
+    /// <summary>
+    /// SectionSwitch
+    /// </summary>
+    SectionSwitch,
+
+    /// <summary>
+    /// RollerShutter
+    /// </summary>
+    RollerShutter,
+
+    /// <summary>
+    /// Slider
+    /// </summary>
+    Slider,
+
+    /// <summary>
+    /// DateTime
+    /// </summary>
+    DateTime,
+
+    /// <summary>
+    /// Text
+    /// </summary>
+    Text,
+
+    /// <summary>
+    /// Image
+    /// </summary>
+    Image,
+
+    /// <summary>
+    /// Selection
+    /// </summary>
+    Selection,
+
+    /// <summary>
+    /// Setpoint
+    /// </summary>
+    Setpoint,
+
+    /// <summary>
+    /// Chart
+    /// </summary>
+    Chart,
+
+    /// <summary>
+    /// Video
+    /// </summary>
+    Video,
+
+    /// <summary>
+    /// VideoMjpeg
+    /// </summary>
+    VideoMjpeg,
+
+    /// <summary>
+    /// Webview
+    /// </summary>
+    Webview,
+
+    /// <summary>
+    /// Colorpicker
+    /// </summary>
+    Colorpicker,
+
+    /// <summary>
+    /// Mapview
+    /// </summary>
+    Mapview,
+
+    /// <summary>
+    /// Generic
+    /// </summary>
+    Generic,
 }
diff --git a/src/openHAB.Core/Notification/Contracts/INotificationManager.cs b/src/openHAB.Core/Notification/Contracts/INotificationManager.cs
new file mode 100644
index 00000000..12ec36e4
--- /dev/null
+++ b/src/openHAB.Core/Notification/Contracts/INotificationManager.cs
@@ -0,0 +1,6 @@
+namespace openHAB.Core.Notification.Contracts;
+
+/// <summary>Class handles toast and tile notifications.</summary>
+public interface INotificationManager
+{
+}
diff --git a/src/openHAB.Core/Notification/NotificationManager.cs b/src/openHAB.Core/Notification/NotificationManager.cs
new file mode 100644
index 00000000..a983475f
--- /dev/null
+++ b/src/openHAB.Core/Notification/NotificationManager.cs
@@ -0,0 +1,113 @@
+using System;
+using System.Globalization;
+using System.Web;
+using CommunityToolkit.Mvvm.Messaging;
+using Microsoft.Extensions.Options;
+using Microsoft.Toolkit.Uwp.Notifications;
+using openHAB.Common;
+using openHAB.Core.Client.Messages;
+using openHAB.Core.Client.Models;
+using openHAB.Core.Model;
+using openHAB.Core.Notification.Contracts;
+using openHAB.Core.Services.Contracts;
+
+namespace openHAB.Core.Notification;
+
+/// <inheritdoc/>
+public class NotificationManager : INotificationManager
+{
+    private readonly IItemManager _itemManager;
+    private readonly string _iconFormat;
+    private readonly IIconCaching _iconCaching;
+    private readonly IOptions<SettingOptions> _settingsOption;
+
+    /// <summary>Initializes a new instance of the <see cref="NotificationManager" /> class.</summary>
+    /// <param name="itemStateManager">The item state manager.</param>
+    /// <param name="iconCaching">Service for Icon caching.</param>
+    /// <param name="settings">Application Settings.</param>
+    public NotificationManager(IItemManager itemStateManager, IIconCaching iconCaching, IOptions<SettingOptions> settingsOption)
+    {
+        StrongReferenceMessenger.Default.Register<ItemStateChangedMessage>(this, HandleUpdateItemMessage);
+        _itemManager = itemStateManager;
+        _iconCaching = iconCaching;
+
+        _settingsOption = settingsOption;
+        SettingOptions settings = _settingsOption.Value;
+        _iconFormat = settings.UseSVGIcons ? "svg" : "svg";
+    }
+
+    private async void HandleUpdateItemMessage(object receipts, ItemStateChangedMessage obj)
+    {
+        SettingOptions settings = _settingsOption.Value;
+        if (settings.NotificationsEnable.HasValue && !settings.NotificationsEnable.Value)
+        {
+            return;
+        }
+
+        string itemName = obj.ItemName;
+        string itemImage = string.Empty;
+        string itemPath = string.Empty;
+        if (_itemManager.TryGetItem(obj.ItemName, out Item item))
+        {
+            itemName = item?.Label ?? "NA";
+            string state = item?.State ?? "ON";
+            state = HttpUtility.UrlEncode(state);
+
+            string icon = item?.Category?.ToLower();
+            itemImage = await _iconCaching.ResolveIconPath(icon, state, _iconFormat);
+        }
+
+        TriggerToastNotificationForItem(itemName, itemImage, obj.Value, obj.OldValue);
+    }
+
+    #region Toast Notification
+
+    private void TriggerToastNotificationForItem(string itemName, string itemImage, string value, string oldValue)
+    {
+        string message = GetMessage(itemName, value, oldValue, "NotificationToast", "NotificationToastSimple");
+        ToastContentBuilder contentBuilder = CreateToastMessage(itemName, message, itemImage);
+        contentBuilder.Show();
+    }
+
+    private ToastContentBuilder CreateToastMessage(string itemName, string message, string image)
+    {
+        ToastContentBuilder toastContentBuilder = new ToastContentBuilder()
+            .AddArgument("action", "show")
+            .AddArgument("item", itemName)
+            .AddText("openHAB for Windows")
+            .AddText(message);
+
+        if (string.IsNullOrEmpty(image))
+        {
+            image = "ms-appx:///Assets/openhab-logo-square.png";
+        }
+
+        toastContentBuilder = toastContentBuilder.AddAppLogoOverride(new Uri(image), ToastGenericAppLogoCrop.Circle);
+
+        return toastContentBuilder;
+    }
+
+    #endregion Toast Notification
+
+    private string GetMessage(
+        string itemName,
+        string itemValue,
+        string oldItemValue,
+        string valueChangedMessageRessource,
+        string stateChangedMessageRessource)
+    {
+        string message = string.Empty;
+        if (!string.IsNullOrEmpty(oldItemValue))
+        {
+            message = AppResources.Values.GetString(valueChangedMessageRessource);
+        }
+        else
+        {
+            message = AppResources.Values.GetString(stateChangedMessageRessource);
+        }
+
+        message = string.Format(CultureInfo.InvariantCulture, message, itemName, oldItemValue, itemValue);
+
+        return message;
+    }
+}
diff --git a/src/openHAB.Core/Notification/OpenHABEventParser.cs b/src/openHAB.Core/Notification/OpenHABEventParser.cs
new file mode 100644
index 00000000..415d4477
--- /dev/null
+++ b/src/openHAB.Core/Notification/OpenHABEventParser.cs
@@ -0,0 +1,65 @@
+using System;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+using openHAB.Core.Client.Event;
+using openHAB.Core.Client.Event.Contracts;
+
+namespace openHAB.Core.Notification;
+
+/// <inheritdoc/>
+public class OpenHABEventParser : IOpenHABEventParser
+{
+    private readonly ILogger<OpenHABEventParser> _logger;
+
+    /// <summary>Initializes a new instance of the <see cref="OpenHABEventParser" /> class.</summary>
+    /// <param name="logger">The logger.</param>
+    public OpenHABEventParser(ILogger<OpenHABEventParser> logger)
+    {
+        _logger = logger;
+    }
+
+    /// <inheritdoc/>
+    public OpenHABEvent Parse(string message)
+    {
+        try
+        {
+            var data = JsonConvert.DeserializeObject<EventStreamData>(message.Remove(0, 6));
+
+            if (data.Type == "ThingUpdatedEvent" || data.Type == "ThingStatusInfoChangedEvent" || data.Type == "ALIVE")
+            {
+                _logger.LogWarning($"Event type is not supported '{data.Type}'.");
+                return null;
+            }
+
+            var payload = JsonConvert.DeserializeObject<EventStreamPayload>(data.Payload);
+            string itemName = data.Topic
+                                    .Replace("openhab/items/", string.Empty) // openHAB V3
+                                    .Replace("smarthome/items/", string.Empty) // openHAB V2
+                                    .Replace("/statechanged", string.Empty).Replace("/state", string.Empty);
+
+            if (!Enum.TryParse(typeof(OpenHABEventType), data.Type, out object type))
+            {
+                type = OpenHABEventType.Unknown;
+            }
+
+            OpenHABEvent openHABevent = new OpenHABEvent()
+            {
+                ItemName = itemName,
+                ValueType = payload.Type,
+                Value = payload.Value,
+                Topic = data.Topic,
+                OldType = payload.OldType,
+                OldValue = payload.OldValue,
+                EventType = (OpenHABEventType)type,
+            };
+
+            return openHABevent;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Failed to parse openHAB event.");
+        }
+
+        return null;
+    }
+}
diff --git a/src/openHAB.Core/Services/Notification/TileNotificationSchema.xml b/src/openHAB.Core/Notification/TileNotificationSchema.xml
similarity index 69%
rename from src/openHAB.Core/Services/Notification/TileNotificationSchema.xml
rename to src/openHAB.Core/Notification/TileNotificationSchema.xml
index c2cfb117..23d9bc4f 100644
--- a/src/openHAB.Core/Services/Notification/TileNotificationSchema.xml
+++ b/src/openHAB.Core/Notification/TileNotificationSchema.xml
@@ -1 +1 @@
-<tile>
  <visual branding="nameAndLogo">
    <binding template="TileSmall" branding="name" hint-textStacking="center" hint-overlay="30">
      <text hint-style="body" hint-align="center">Mon</text>
      <text hint-style="base" hint-align="center">63°</text>
    </binding>

    <binding template="TileMedium" branding="name">
      <text hint-style="caption">9:50 AM, Wednesday</text>
      <text hint-style="captionSubtle" hint-wrap="true">263 Grove St, San Francisco, CA 94102</text>
    </binding>

    <binding template="TileWide">
      <group>
        <subgroup hint-weight="33">
          <image src="Assets/Apps/Hipstame/hipster.jpg" />
        </subgroup>
        <subgroup>
          <text hint-style="caption">9:50 AM, Wednesday</text>
          <text hint-style="captionSubtle" hint-wrap="true" hint-maxLines="3">263 Grove St, San Francisco, CA 94102</text>
        </subgroup>
      </group>
    </binding>

    <binding template="TileLarge">

  <group>
    <subgroup hint-weight="1"/>
    <subgroup hint-weight="2">
      <image src="Assets/Apps/Hipstame/hipster.jpg" />
    </subgroup>
    <subgroup hint-weight="1"/>
  </group>
<text/>
       <text hint-style="caption">9:50 AM, Wednesday</text>
       <text hint-style="captionSubtle" hint-wrap="true" hint-maxLines="3">263 Grove St, San Francisco, CA 94102</text>
    </binding>

  </visual>
</tile>
\ No newline at end of file
+<tile>
  <visual branding="nameAndLogo">
    <binding template="TileSmall" branding="name" hint-textStacking="center" hint-overlay="30">
      <text hint-style="body" hint-align="center">Mon</text>
      <text hint-style="base" hint-align="center">63°</text>
    </binding>

    <binding template="TileMedium" branding="name">
      <text hint-style="caption">9:50 AM, Wednesday</text>
      <text hint-style="captionSubtle" hint-wrap="true">263 Grove St, San Francisco, CA 94102</text>
    </binding>

    <binding template="TileWide">
      <group>
        <subgroup hint-weight="33">
          <image src="Assets/Apps/Hipstame/hipster.jpg" />
        </subgroup>
        <subgroup>
          <text hint-style="caption">9:50 AM, Wednesday</text>
          <text hint-style="captionSubtle" hint-wrap="true" hint-maxLines="3">263 Grove St, San Francisco, CA 94102</text>
        </subgroup>
      </group>
    </binding>

    <binding template="TileLarge">

  <group>
    <subgroup hint-weight="1" />
    <subgroup hint-weight="2">
      <image src="Assets/Apps/Hipstame/hipster.jpg" />
    </subgroup>
    <subgroup hint-weight="1" />
  </group>
<text />
       <text hint-style="caption">9:50 AM, Wednesday</text>
       <text hint-style="captionSubtle" hint-wrap="true" hint-maxLines="3">263 Grove St, San Francisco, CA 94102</text>
    </binding>

  </visual>
</tile>
diff --git a/src/openHAB.Core/Services/Notification/ToastNotificationSchema.xml b/src/openHAB.Core/Notification/ToastNotificationSchema.xml
similarity index 62%
rename from src/openHAB.Core/Services/Notification/ToastNotificationSchema.xml
rename to src/openHAB.Core/Notification/ToastNotificationSchema.xml
index c8ed5e16..6abe21dd 100644
--- a/src/openHAB.Core/Services/Notification/ToastNotificationSchema.xml
+++ b/src/openHAB.Core/Notification/ToastNotificationSchema.xml
@@ -1 +1 @@
-<toast>
    <visual>
        <binding template="ToastGeneric">
            <text hint-maxLines="1">openHAB for Windows</text>
            <text>Check out where we camped last weekend! It was incredible, wish you could have come on the backpacking trip!</text>
            <image placement="appLogoOverride" src="C:\Users\chrisho\AppData\Local\Packages\openHABFoundatione.V.openHAB_va1j9qbqnd8h6\LocalCache\icons\heating.png"/>
        </binding>
    </visual>

    <actions>
          
    <action
      content="Show Item"
      activationType="foreground"
      arguments="action=show"/>
</actions>
</toast>
\ No newline at end of file
+<toast>
    <visual>
        <binding template="ToastGeneric">
            <text hint-maxLines="1">openHAB for Windows</text>
            <text>Check out where we camped last weekend! It was incredible, wish you could have come on the backpacking trip!</text>
            <image placement="appLogoOverride" src="C:\Users\chrisho\AppData\Local\Packages\openHABFoundatione.V.openHAB_va1j9qbqnd8h6\LocalCache\icons\heating.png" />
        </binding>
    </visual>

    <actions>
          
    <action
      content="Show Item"
      activationType="foreground"
      arguments="action=show" />
</actions>
</toast>
diff --git a/src/openHAB.Core/Openhab.Core.csproj b/src/openHAB.Core/Openhab.Core.csproj
index 688edd88..42f1a49b 100644
--- a/src/openHAB.Core/Openhab.Core.csproj
+++ b/src/openHAB.Core/Openhab.Core.csproj
@@ -1,251 +1,51 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{2A8FD10E-4EE5-4E25-B47C-2296E071F482}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>OpenHAB.Core</RootNamespace>
-    <AssemblyName>OpenHAB.Core</AssemblyName>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-    <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <RuntimeIdentifiers>win10-arm;win10-arm-aot;win10-x86;win10-x86-aot;win10-x64;win10-x64-aot</RuntimeIdentifiers>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>..\..\.sonarlint\openhab_openhab-windowscsharp.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile>bin\x86\Debug\OpenHAB.Core.XML</DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <PlatformTarget>x86</PlatformTarget>
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>..\..\.sonarlint\openhab_openhab-windowscsharp.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
-    <PlatformTarget>ARM</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\ARM\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>ARM</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>..\..\.sonarlint\openhab_openhab-windowscsharp.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
-    <PlatformTarget>ARM</PlatformTarget>
-    <OutputPath>bin\ARM\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>ARM</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>..\..\.sonarlint\openhab_openhab-windowscsharp.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <PlatformTarget>x64</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>..\..\.sonarlint\openhab_openhab-windowscsharp.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <PlatformTarget>x64</PlatformTarget>
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>..\..\.sonarlint\openhab_openhab-windowscsharp.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
-    <PRIResource Include="Strings\en-us\Resources.resw" />
-    <PRIResource Include="Strings\de-de\Resources.resw" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AppResources.cs" />
-    <Compile Include="Common\ActionCommand.cs" />
-    <Compile Include="Common\ColorChangedEventArgs.cs" />
-    <Compile Include="Common\ColorHelper.cs" />
-    <Compile Include="Common\Constants.cs" />
-    <Compile Include="Common\DataErrorInfo.cs" />
-    <Compile Include="Common\DeviceFamily.cs" />
-    <Compile Include="Common\DeviceTypeHelper.cs" />
-    <Compile Include="Common\HttpResponseResult.cs" />
-    <Compile Include="Common\ObservableCollectionExtensions.cs" />
-    <Compile Include="Messages\ConnectionStatusChanged.cs" />
-    <Compile Include="Messages\ItemStateChangedMessage.cs" />
-    <Compile Include="Messages\SettingsValidationMessage.cs" />
-    <Compile Include="Model\Connection\CloudConnectionProfile.cs" />
-    <Compile Include="Model\Connection\DemoConnectionProfile.cs" />
-    <Compile Include="Model\Connection\RemoteConnectionProfile.cs" />
-    <Compile Include="Model\Connection\LocalConnectionProfile.cs" />
-    <Compile Include="Model\Connection\OpenHABHttpClientType.cs" />
-    <Compile Include="Contracts\IConnectionProfile.cs" />
-    <Compile Include="Contracts\Services\ISettingsService.cs" />
-    <Compile Include="Messages\FireErrorMessage.cs" />
-    <Compile Include="Messages\FireInfoMessage.cs" />
-    <Compile Include="Messages\MessageType.cs" />
-    <Compile Include="Messages\SettingsUpdatedMessage.cs" />
-    <Compile Include="Messages\TriggerCommandMessage.cs" />
-    <Compile Include="Messages\UpdateItemMessage.cs" />
-    <Compile Include="Messages\WidgetClickedMessage.cs" />
-    <Compile Include="Model\Connection\DefaultConnectionProfile.cs" />
-    <Compile Include="Common\Enum.cs" />
-    <Compile Include="Model\OpenHABAPIInfo.cs" />
-    <Compile Include="Model\OpenHABConnectionProfile.cs" />
-    <Compile Include="Model\OpenHABConnectionType.cs" />
-    <Compile Include="Model\Event\OpenHABEventType.cs" />
-    <Compile Include="Model\Link.cs" />
-    <Compile Include="Model\RuntimeInfo.cs" />
-    <Compile Include="Model\WidgetTypeEnum.cs" />
-    <Compile Include="Model\Event\EventStreamData.cs" />
-    <Compile Include="Model\Event\EventStreamPayload.cs" />
-    <Compile Include="Model\OpenHABCommandOptions.cs" />
-    <Compile Include="Model\Connection\OpenHABConnection.cs" />
-    <Compile Include="Model\OpenHABItem.cs" />
-    <Compile Include="Model\OpenHABSitemap.cs" />
-    <Compile Include="Model\ConnectionState.cs" />
-    <Compile Include="Model\OpenHABWidget.cs" />
-    <Compile Include="Model\OpenHABCommandDescription.cs" />
-    <Compile Include="Model\OpenHABWidgetMapping.cs" />
-    <Compile Include="Contracts\Services\IDependencyInjectionService.cs" />
-    <Compile Include="Model\Settings.cs" />
-    <Compile Include="Model\OpenHABCommands.cs" />
-    <Compile Include="Model\OpenHABException.cs" />
-    <Compile Include="Common\OpenHABHttpClient.cs" />
-    <Compile Include="Model\OpenHabVersion.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SDK\IOpenHAB.cs" />
-    <Compile Include="SDK\OpenHABClient.cs" />
-    <Compile Include="Model\ServerInfo.cs" />
-    <Compile Include="Services\AppManager.cs" />
-    <Compile Include="Model\Event\OpenHABEvent.cs" />
-    <Compile Include="Services\IItemManager.cs" />
-    <Compile Include="Services\ItemManager.cs" />
-    <Compile Include="Services\Notification\IOpenHABEventParser.cs" />
-    <Compile Include="Services\Notification\OpenHABEventParser.cs" />
-    <Compile Include="Services\IAppManager.cs" />
-    <Compile Include="Services\IconCaching.cs" />
-    <Compile Include="Services\IIconCaching.cs" />
-    <Compile Include="Services\Notification\INotificationManager.cs" />
-    <Compile Include="Services\Notification\NotificationManager.cs" />
-    <Compile Include="Services\SettingsService.cs" />
-    <Compile Include="Services\WidgetNavigationService.cs" />
-    <EmbeddedResource Include="Properties\OpenHAB.Core.rd.xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="CommunityToolkit.Mvvm">
-      <Version>7.1.2</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers">
-      <Version>6.0.0</Version>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection">
-      <Version>6.0.0</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.2.13</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Services.Store.Engagement">
-      <Version>10.1901.28001</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Toolkit.Uwp.Connectivity">
-      <Version>7.1.2</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications">
-      <Version>7.1.2</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.UI.Xaml">
-      <Version>2.6.0-prerelease.210129001</Version>
-    </PackageReference>
-    <PackageReference Include="Newtonsoft.Json">
-      <Version>13.0.1</Version>
-    </PackageReference>
-    <PackageReference Include="NLog.Extensions.Logging">
-      <Version>1.7.4</Version>
-    </PackageReference>
-    <PackageReference Include="StyleCop.Analyzers">
-      <Version>1.1.118</Version>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-  </ItemGroup>
-  <ItemGroup>
-    <SDKReference Include="Microsoft.Services.Store.Engagement, Version=10.0">
-      <Name>Microsoft Engagement Framework</Name>
-    </SDKReference>
-    <SDKReference Include="Microsoft.VCLibs, Version=14.0">
-      <Name>Visual C++ 2015 Runtime for Universal Windows Platform Apps</Name>
-    </SDKReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.UI.Xaml.Markup, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\XamlCompiler\Microsoft.UI.Xaml.Markup.winmd</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <PRIResource Include="Strings\en-us\Errors.resw" />
-  </ItemGroup>
-  <ItemGroup>
-    <PRIResource Include="Strings\de-de\Errors.resw" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\..\.sonarlint\openhab_openhab-windowscsharp.ruleset">
-      <Link>openhab_openhab-windowscsharp.ruleset</Link>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <AdditionalFiles Include="..\..\.sonarlint\openhab_openhab-windows\CSharp\SonarLint.xml">
-      <Link>SonarLint.xml</Link>
-    </AdditionalFiles>
-  </ItemGroup>
-  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
-    <VisualStudioVersion>14.0</VisualStudioVersion>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<TargetFramework>net8.0-windows10.0.26100.0</TargetFramework>
+		<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+		<RootNamespace>openHAB.Core</RootNamespace>
+		<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
+		<UseWinUI>true</UseWinUI>
+		<SupportedOSPlatformVersion>10.0.20348.0</SupportedOSPlatformVersion>
+		<Platforms>x86;x64;arm64</Platforms>
+	</PropertyGroup>
+	<ItemGroup>
+		<PackageReference Include="CommunityToolkit.Mvvm">
+			<Version>8.4.0</Version>
+		</PackageReference>
+		<PackageReference Include="CommunityToolkit.WinUI.Helpers" Version="8.1.240916" />
+		<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers">
+			<Version>8.0.0</Version>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+			<PrivateAssets>all</PrivateAssets>
+		</PackageReference>
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection">
+			<Version>8.0.1</Version>
+		</PackageReference>
+		<PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.3" />
+		<PackageReference Include="Microsoft.WindowsAppSDK">
+			<Version>1.6.241114003</Version>
+		</PackageReference>
+		<PackageReference Include="Newtonsoft.Json">
+			<Version>13.0.3</Version>
+		</PackageReference>
+		<PackageReference Include="NLog.Extensions.Logging">
+			<Version>5.3.15</Version>
+		</PackageReference>
+		<PackageReference Include="StyleCop.Analyzers">
+			<Version>1.1.118</Version>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+			<PrivateAssets>all</PrivateAssets>
+		</PackageReference>
+		<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.421302">
+			<PrivateAssets>all</PrivateAssets>
+		</PackageReference>
+		<PackageReference Include="Microsoft.Windows.Compatibility" Version="9.0.0" />
+	</ItemGroup>
+	<ItemGroup>
+		<Compile Remove="App.xaml.old.cs" />
+	</ItemGroup>
+	<ItemGroup>
+	  <ProjectReference Include="..\openHAB.Common\openHAB.Common.csproj" />
+	  <ProjectReference Include="..\openHAB.Core.Client\openHAB.Core.Client.csproj" />
+	</ItemGroup>
+</Project>
diff --git a/src/openHAB.Core/Properties/AssemblyInfo.cs b/src/openHAB.Core/Properties/AssemblyInfo.cs
deleted file mode 100644
index 5b58b526..00000000
--- a/src/openHAB.Core/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("OpenHAB.Core")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OpenHAB.Core")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/src/openHAB.Core/Properties/OpenHAB.Core.rd.xml b/src/openHAB.Core/Properties/OpenHAB.Core.rd.xml
deleted file mode 100644
index c0bbfbed..00000000
--- a/src/openHAB.Core/Properties/OpenHAB.Core.rd.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    This file contains Runtime Directives, specifications about types your application accesses
-    through reflection and other dynamic code patterns. Runtime Directives are used to control the
-    .NET Native optimizer and ensure that it does not remove code accessed by your library. If your
-    library does not do any reflection, then you generally do not need to edit this file. However,
-    if your library reflects over types, especially types passed to it or derived from its types,
-    then you should write Runtime Directives.
-
-    The most common use of reflection in libraries is to discover information about types passed
-    to the library. Runtime Directives have three ways to express requirements on types passed to
-    your library.
-
-    1.  Parameter, GenericParameter, TypeParameter, TypeEnumerableParameter
-        Use these directives to reflect over types passed as a parameter.
-
-    2.  SubTypes
-        Use a SubTypes directive to reflect over types derived from another type.
-
-    3.  AttributeImplies
-        Use an AttributeImplies directive to indicate that your library needs to reflect over
-        types or methods decorated with an attribute.
-
-    For more information on writing Runtime Directives for libraries, please visit
-    http://go.microsoft.com/fwlink/?LinkID=391919
--->
-<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
-  <Library Name="OpenHAB.Core">
-
-  	<!-- add directives for your library here -->
-
-  </Library>
-</Directives>
diff --git a/src/openHAB.Core/SDK/IOpenHAB.cs b/src/openHAB.Core/SDK/IOpenHAB.cs
deleted file mode 100644
index d7f194d0..00000000
--- a/src/openHAB.Core/SDK/IOpenHAB.cs
+++ /dev/null
@@ -1,75 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using OpenHAB.Core.Common;
-using OpenHAB.Core.Model;
-using OpenHAB.Core.Model.Connection;
-
-namespace OpenHAB.Core.SDK
-{
-    /// <summary>
-    /// The main SDK interface to OpenHAB.
-    /// </summary>
-    public interface IOpenHAB
-    {
-        /// <summary>
-        /// Gets information about the openHAB server.
-        /// </summary>
-        /// <returns>Server information about openHAB instance.</returns>
-        Task<HttpResponseResult<ServerInfo>> GetOpenHABServerInfo();
-
-        /// <summary>
-        /// Gets information about the openHAB server.
-        /// </summary>
-        /// <param name="connection">Connection information.</param>
-        /// <returns>Server information about openHAB instance.</returns>
-        Task<HttpResponseResult<ServerInfo>> GetOpenHABServerInfo(OpenHABConnection connection);
-
-        /// <summary>
-        /// Gets the openHAB item by name from Server.
-        /// </summary>
-        /// <param name="itemName">Name of the item.</param>
-        /// <returns>openHab item object. </returns>
-        Task<OpenHABItem> GetItemByName(string itemName);
-
-        /// <summary>
-        /// Loads all the sitemaps.
-        /// </summary>
-        /// <param name="version">The version of OpenHAB running on the server.</param>
-        /// <param name="filters">Filters for sitemap list.</param>
-        /// <returns>A list of sitemaps.</returns>
-        Task<ICollection<OpenHABSitemap>> LoadSiteMaps(OpenHABVersion version, List<Func<OpenHABSitemap, bool>> filters);
-
-        /// <summary>
-        /// Loads all the items in a sitemap.
-        /// </summary>
-        /// <param name="sitemap">The sitemap to load the items from.</param>
-        /// <param name="version">The version of OpenHAB running on the server.</param>
-        /// <returns>A list of items in the selected sitemap.</returns>
-        Task<ICollection<OpenHABWidget>> LoadItemsFromSitemap(OpenHABSitemap sitemap, OpenHABVersion version);
-
-        /// <summary>
-        /// Sends a command to an item.
-        /// </summary>
-        /// <param name="item">The item.</param>
-        /// <param name="command">The Command.</param>
-        /// <returns>Operation result if the command was successful or not.</returns>
-        Task<HttpResponseResult<bool>> SendCommand(OpenHABItem item, string command);
-
-        /// <summary>
-        /// Reset the connection to the OpenHAB server after changing the settings in the app.
-        /// </summary>
-        /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
-        Task<bool> ResetConnection();
-
-        /// <summary>
-        /// Starts listening to server events.
-        /// </summary>
-        void StartItemUpdates(System.Threading.CancellationToken token);
-
-        /// <summary>Checks the URL reachability.</summary>
-        /// <param name="connection">Defines settings for local or remote connections.</param>
-        /// <returns>>A <see cref="Task"/> representing the asynchronous operation.</returns>
-        Task<HttpResponseResult<bool>> CheckUrlReachability(OpenHABConnection connection);
-    }
-}
diff --git a/src/openHAB.Core/SDK/OpenHABClient.cs b/src/openHAB.Core/SDK/OpenHABClient.cs
deleted file mode 100644
index 74612028..00000000
--- a/src/openHAB.Core/SDK/OpenHABClient.cs
+++ /dev/null
@@ -1,480 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net.Http;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-using System.Xml.Linq;
-using CommunityToolkit.Mvvm.Messaging;
-using Microsoft.Extensions.Logging;
-using Microsoft.Toolkit.Uwp.Connectivity;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
-using OpenHAB.Core.Common;
-using OpenHAB.Core.Contracts.Services;
-using OpenHAB.Core.Messages;
-using OpenHAB.Core.Model;
-using OpenHAB.Core.Model.Connection;
-using OpenHAB.Core.Model.Event;
-using OpenHAB.Core.Services;
-
-namespace OpenHAB.Core.SDK
-{
-    /// <summary>
-    /// The main SDK implementation of the connection to OpenHAB.
-    /// </summary>
-    public class OpenHABClient : IOpenHAB
-    {
-        private readonly IMessenger _messenger;
-        private readonly ILogger<OpenHABClient> _logger;
-        private readonly ISettingsService _settingsService;
-        private OpenHABConnection _connection;
-        private OpenHABHttpClient _openHABHttpClient;
-        private IOpenHABEventParser _eventParser;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="OpenHABClient"/> class.
-        /// </summary>
-        /// <param name="settingsService">The service to fetch the settings.</param>
-        /// <param name="messenger">The messenger instance.</param>
-        /// <param name="eventParser">openHAB event parser.</param>
-        /// <param name="logger">Logger class.</param>
-        /// <param name="openHABHttpClient">OpenHab Http client factory.</param>
-        public OpenHABClient(
-            ISettingsService settingsService,
-            IMessenger messenger,
-            IOpenHABEventParser eventParser,
-            ILogger<OpenHABClient> logger,
-            OpenHABHttpClient openHABHttpClient)
-        {
-            _settingsService = settingsService;
-            _messenger = messenger;
-            _logger = logger;
-            _openHABHttpClient = openHABHttpClient;
-            _eventParser = eventParser;
-        }
-
-        /// <inheritdoc/>
-        public async Task<HttpResponseResult<bool>> CheckUrlReachability(OpenHABConnection connection)
-        {
-            if (string.IsNullOrWhiteSpace(connection?.Url))
-            {
-                return new HttpResponseResult<bool>(false, null);
-            }
-
-            if (!connection.Url.EndsWith("/", StringComparison.InvariantCultureIgnoreCase))
-            {
-                connection.Url = connection.Url + "/";
-            }
-
-            OpenHABHttpClient.BaseUrl = connection.Url;
-            HttpResponseResult<ServerInfo> result = await GetOpenHABServerInfo(connection).ConfigureAwait(false);
-            if (result.Content == null)
-            {
-                return new HttpResponseResult<bool>(false, null, result.Exception);
-            }
-            else
-            {
-                return new HttpResponseResult<bool>(true, result.StatusCode);
-            }
-        }
-
-        /// <inheritdoc />
-        public async Task<HttpResponseResult<ServerInfo>> GetOpenHABServerInfo()
-        {
-            return await GetOpenHABServerInfo(_connection);
-        }
-
-        /// <inheritdoc />
-        public async Task<HttpResponseResult<ServerInfo>> GetOpenHABServerInfo(OpenHABConnection connection)
-        {
-            try
-            {
-                var settings = _settingsService.Load();
-                var httpClient = _openHABHttpClient.DisposableClient(connection, settings);
-                httpClient.BaseAddress = new Uri(connection.Url);
-
-                ServerInfo serverInfo = new ServerInfo();
-
-                HttpResponseMessage result = await httpClient.GetAsync(Constants.API.ServerInformation).ConfigureAwait(false);
-                if (!result.IsSuccessStatusCode)
-                {
-                    _logger.LogError($"Http request get OpenHab version failed, ErrorCode:'{result.StatusCode}'");
-                    throw new OpenHABException($"{result.StatusCode} received from server");
-                }
-
-                string responseBody = await result.Content.ReadAsStringAsync();
-
-                OpenHABAPIInfo apiInfo = JsonConvert.DeserializeObject<OpenHABAPIInfo>(responseBody);
-                if (apiInfo.Version < 4)
-                {
-                    serverInfo.Version = OpenHABVersion.Two;
-                    return new HttpResponseResult<ServerInfo>(serverInfo, result.StatusCode);
-                }
-
-                string runtimeversion = Regex.Replace(apiInfo?.RuntimeInfo.Version, "[^.0-9]", string.Empty);
-                if (!Version.TryParse(runtimeversion, out Version serverVersion))
-                {
-                    string message = "Not able to parse runtime verion from openHAB server";
-                    _logger.LogError(message);
-
-                    throw new OpenHABException(message);
-                }
-
-                OpenHABVersion openHABVersion = (OpenHABVersion)serverVersion.Major;
-
-                serverInfo.Version = openHABVersion;
-                serverInfo.RuntimeVersion = apiInfo?.RuntimeInfo.Version;
-                serverInfo.Build = apiInfo.RuntimeInfo.BuildString;
-
-                return new HttpResponseResult<ServerInfo>(serverInfo, result.StatusCode);
-            }
-            catch (ArgumentNullException ex)
-            {
-                throw new OpenHABException("Invalid call", ex);
-            }
-            catch (InvalidOperationException ex)
-            {
-                _logger.LogError(ex, "GetOpenHABServerInfo failed");
-
-                return new HttpResponseResult<ServerInfo>(null, null, ex);
-            }
-            catch (HttpRequestException ex)
-            {
-                _logger.LogError(ex, "GetOpenHABServerInfo failed");
-
-                return new HttpResponseResult<ServerInfo>(null, null, ex);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "GetOpenHABServerInfo failed.");
-                return new HttpResponseResult<ServerInfo>(null, null, ex);
-            }
-        }
-
-        /// <inheritdoc />
-        public async Task<ICollection<OpenHABWidget>> LoadItemsFromSitemap(OpenHABSitemap sitemap, OpenHABVersion version)
-        {
-            try
-            {
-                _logger.LogInformation($"Load sitemaps items for sitemap '{sitemap.Name}'");
-
-                var settings = _settingsService.Load();
-                var result = await _openHABHttpClient.Client(_connection, settings).GetAsync(sitemap.Link).ConfigureAwait(false);
-                if (!result.IsSuccessStatusCode)
-                {
-                    _logger.LogError($"Http request for loading sitemaps items failed, ErrorCode:'{result.StatusCode}'");
-                    throw new OpenHABException($"{result.StatusCode} received from server");
-                }
-
-                string resultString = await result.Content.ReadAsStringAsync().ConfigureAwait(false);
-
-                ICollection<OpenHABWidget> items = null;
-                if (version == OpenHABVersion.Two || version == OpenHABVersion.Three)
-                {
-                    var jsonObject = JObject.Parse(resultString);
-                    items = JsonConvert.DeserializeObject<List<OpenHABWidget>>(jsonObject["homepage"]["widgets"].ToString());
-                }
-                else
-                {
-                    string message = "openHAB version is not supported.";
-                    _logger.LogError(message);
-                    throw new OpenHABException(message);
-                }
-
-                _logger.LogInformation($"Loaded '{items.Count}' sitemaps items from server");
-
-                return items;
-            }
-            catch (ArgumentNullException ex)
-            {
-                _logger.LogError(ex, "LoadItemsFromSitemap failed.");
-                throw new OpenHABException("Invalid call", ex);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "LoadItemsFromSitemap failed.");
-                throw new OpenHABException("Invalid call", ex);
-            }
-        }
-
-        /// <inheritdoc />
-        public async Task<OpenHABItem> GetItemByName(string itemName)
-        {
-            try
-            {
-                _logger.LogInformation($"Load item by name '{itemName}' from openHAB server");
-
-                var settings = _settingsService.Load();
-                Uri resourceUrl = new Uri($"{Constants.API.Items}/{itemName}", UriKind.Relative);
-
-                var result = await _openHABHttpClient.Client(_connection, settings).GetAsync(resourceUrl).ConfigureAwait(false);
-                if (!result.IsSuccessStatusCode)
-                {
-                    _logger.LogError($"Http request to fetch item '{itemName}' failed, ErrorCode:'{result.StatusCode}'");
-                    throw new OpenHABException($"{result.StatusCode} received from server");
-                }
-
-                string resultString = await result.Content.ReadAsStringAsync().ConfigureAwait(false);
-                OpenHABItem item = JsonConvert.DeserializeObject<OpenHABItem>(resultString);
-
-                _logger.LogInformation($"Loaded item '{itemName}' from server");
-
-                return item;
-            }
-            catch (ArgumentNullException ex)
-            {
-                _logger.LogError(ex, "LoadItemsFromSitemap failed.");
-                throw new OpenHABException("Invalid call", ex);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "LoadItemsFromSitemap failed.");
-                throw new OpenHABException("Invalid call", ex);
-            }
-        }
-
-        /// <inheritdoc />
-        public async Task<ICollection<OpenHABSitemap>> LoadSiteMaps(OpenHABVersion version, List<Func<OpenHABSitemap, bool>> filters)
-        {
-            try
-            {
-                _logger.LogInformation($"Load sitemaps for OpenHab server version '{version.ToString()}'");
-
-                var settings = _settingsService.Load();
-                var result = await _openHABHttpClient.Client(_connection, settings).GetAsync(Constants.API.Sitemaps).ConfigureAwait(false);
-                if (!result.IsSuccessStatusCode)
-                {
-                    _logger.LogError($"Http request for loading sitemaps failed, ErrorCode:'{result.StatusCode}'");
-                    throw new OpenHABException($"{result.StatusCode} received from server");
-                }
-
-                string resultString = await result.Content.ReadAsStringAsync().ConfigureAwait(false);
-
-                var sitemaps = new List<OpenHABSitemap>();
-                sitemaps = JsonConvert.DeserializeObject<List<OpenHABSitemap>>(resultString);
-
-                _logger.LogInformation($"Loaded '{sitemaps.Count}' sitemaps from server");
-                return sitemaps.Where(sitemap =>
-                {
-                    bool isIncluded = true;
-                    filters.ForEach(filter => isIncluded &= filter(sitemap));
-
-                    return isIncluded;
-                }).ToList();
-            }
-            catch (ArgumentNullException ex)
-            {
-                _logger.LogError(ex, "LoadSiteMaps failed.");
-                throw new OpenHABException("Invalid call", ex);
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "LoadSiteMaps failed.");
-                throw new OpenHABException("Invalid call", ex);
-            }
-        }
-
-        /// <inheritdoc />
-        public async Task<bool> ResetConnection()
-        {
-            var settings = _settingsService.Load();
-            bool isValid = await SetValidUrl(settings);
-
-            if (!isValid)
-            {
-                return false;
-            }
-
-            _openHABHttpClient.ResetClient();
-
-            return true;
-        }
-
-        /// <inheritdoc />
-        public async Task<HttpResponseResult<bool>> SendCommand(OpenHABItem item, string command)
-        {
-            try
-            {
-                if (item == null)
-                {
-                    _logger.LogInformation("Send command is canceled, because item is null (e.g. widget not linked to item)");
-                    return new HttpResponseResult<bool>(false, null, null);
-                }
-
-                _logger.LogInformation($"Send Command '{command}' for item '{item.Name} of type '{item.Type}'");
-
-                var settings = _settingsService.Load();
-                var client = _openHABHttpClient.Client(_connection, settings);
-                var content = new StringContent(command);
-
-                var result = await client.PostAsync(item.Link, content);
-                if (!result.IsSuccessStatusCode)
-                {
-                    _logger.LogError($"Http request for command failed, ErrorCode:'{result.StatusCode}'");
-                }
-
-                return new HttpResponseResult<bool>(result.IsSuccessStatusCode, result.StatusCode);
-            }
-            catch (HttpRequestException ex)
-            {
-                _logger.LogError(ex, "SendCommand failed.");
-                return new HttpResponseResult<bool>(false, null, ex);
-            }
-            catch (ArgumentNullException ex)
-            {
-                _logger.LogError(ex, "SendCommand failed.");
-                return new HttpResponseResult<bool>(false, null, ex);
-            }
-        }
-
-        /// <inheritdoc />
-        public async void StartItemUpdates(System.Threading.CancellationToken token)
-        {
-            await Task.Run((Func<Task>)(async () =>
-            {
-                var settings = _settingsService.Load();
-                var client = _openHABHttpClient.Client(_connection, settings);
-                var requestUri = Constants.API.Events;
-
-                _logger.LogInformation($"Retrive item updates from '{client.BaseAddress.ToString()}'");
-
-                try
-                {
-                    var stream = await client.GetStreamAsync((string)requestUri).ConfigureAwait(false);
-
-                    using (var reader = new StreamReader((Stream)stream))
-                    {
-                        while (!reader.EndOfStream)
-                        {
-                            if (token.IsCancellationRequested)
-                            {
-                                return;
-                            }
-
-                            var updateEvent = reader.ReadLine();
-                            if (updateEvent?.StartsWith("data:", StringComparison.InvariantCultureIgnoreCase) == true)
-                            {
-                                OpenHABEvent ohEvent = _eventParser.Parse(updateEvent);
-                                if (ohEvent == null)
-                                {
-                                    continue;
-                                }
-
-                                switch (ohEvent.EventType)
-                                {
-                                    case OpenHABEventType.ItemStateEvent:
-                                        _messenger.Send(new UpdateItemMessage(ohEvent.ItemName, ohEvent.Value));
-                                        break;
-                                    case OpenHABEventType.ThingUpdatedEvent:
-                                        break;
-                                    case OpenHABEventType.RuleStatusInfoEvent:
-                                        break;
-                                    case OpenHABEventType.ItemStatePredictedEvent:
-                                        break;
-                                    case OpenHABEventType.GroupItemStateChangedEvent:
-                                        break;
-                                    case OpenHABEventType.ItemStateChangedEvent:
-                                        _messenger.Send(new ItemStateChangedMessage(ohEvent.ItemName, ohEvent.Value, ohEvent.OldValue));
-                                        break;
-                                    case OpenHABEventType.Unknown:
-                                        break;
-                                    default:
-                                        break;
-                                }
-                            }
-                        }
-                    }
-                }
-                catch (HttpRequestException ex)
-                {
-                    _logger.LogError(ex, "StartItemUpdates failed.");
-                }
-                catch (Exception ex)
-                {
-                    _logger.LogError(ex, "StartItemUpdates failed.");
-                }
-            })).ConfigureAwait(false);
-        }
-
-        private async Task<bool> SetValidUrl(Settings settings)
-        {
-            _logger.LogInformation("Validate Url");
-
-            var isRunningInDemoMode = settings.IsRunningInDemoMode != null && settings.IsRunningInDemoMode.Value;
-
-            _logger.LogInformation($"App is running in demo mode: {isRunningInDemoMode}");
-
-            // no url configured yet
-            if (string.IsNullOrWhiteSpace(settings.LocalConnection?.Url) &&
-                string.IsNullOrWhiteSpace(settings.RemoteConnection?.Url) &&
-                !isRunningInDemoMode)
-            {
-                return false;
-            }
-
-            if (isRunningInDemoMode)
-            {
-                _connection = new DemoConnectionProfile().CreateConnection();
-                OpenHABHttpClient.BaseUrl = Constants.API.DemoModeUrl;
-                return true;
-            }
-
-            bool meteredConnection = NetworkHelper.Instance.ConnectionInformation.IsInternetOnMeteredConnection;
-            _logger.LogInformation($"Metered Connection Type: {meteredConnection}");
-
-            if (meteredConnection)
-            {
-                if (string.IsNullOrEmpty(settings.RemoteConnection?.Url))
-                {
-                    string message = "No remote url configured";
-                    _logger.LogWarning(message);
-
-                    return false;
-                }
-
-                OpenHABHttpClient.BaseUrl = settings.RemoteConnection.Url;
-                _connection = settings.RemoteConnection;
-
-                return true;
-            }
-
-            HttpResponseResult<bool> result = await CheckUrlReachability(settings.LocalConnection).ConfigureAwait(false);
-            _logger.LogInformation($"OpenHab server is reachable: {result.Content}");
-
-            if (result.Content)
-            {
-                OpenHABHttpClient.BaseUrl = settings.LocalConnection.Url;
-                _connection = settings.LocalConnection;
-
-                return true;
-            }
-            else
-            {
-                // If remote URL is configured
-                if (string.IsNullOrWhiteSpace(settings.RemoteConnection?.Url))
-                {
-                    StrongReferenceMessenger.Default.Send<FireErrorMessage>(new FireErrorMessage(AppResources.Errors.GetString("ConnectionTestFailed")));
-                    _logger.LogWarning($"OpenHab server url is not valid");
-
-                    return false;
-                }
-
-                result = await CheckUrlReachability(settings.RemoteConnection).ConfigureAwait(false);
-                if (!result.Content)
-                {
-                    StrongReferenceMessenger.Default.Send<FireErrorMessage>(new FireErrorMessage(AppResources.Errors.GetString("ConnectionTestFailed")));
-                    _logger.LogWarning($"OpenHab server url is not valid");
-
-                    return false;
-                }
-
-                OpenHABHttpClient.BaseUrl = settings.RemoteConnection.Url;
-                _connection = settings.RemoteConnection;
-
-                return true;
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/openHAB.Core/Services/AppManager.cs b/src/openHAB.Core/Services/AppManager.cs
index f61565c3..2049f9c7 100644
--- a/src/openHAB.Core/Services/AppManager.cs
+++ b/src/openHAB.Core/Services/AppManager.cs
@@ -1,56 +1,123 @@
-using System;
+using System;
+using System.Globalization;
+using System.Runtime.InteropServices;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using Microsoft.UI.Xaml;
+using openHAB.Core.Client.Models;
+using openHAB.Core.Model;
+using openHAB.Core.Services.Contracts;
 using Windows.ApplicationModel;
+using Windows.System.UserProfile;
 
-namespace OpenHAB.Core.Services
+namespace openHAB.Core.Services;
+
+/// <inheritdoc/>
+public class AppManager : IAppManager
 {
+    private readonly ILogger<AppManager> _logger;
+    private readonly IOptions<SettingOptions> _options;
+    private readonly string _startupId = "openHABStartupId";
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="AppManager" /> class.
+    /// </summary>
+    /// <param name="options">The settings options.</param>
+    /// <param name="logger">The logger instance.</param>
+    public AppManager(IOptions<SettingOptions> options, ILogger<AppManager> logger)
+    {
+        _logger = logger;
+        _options = options;
+    }
+
+    /// <inheritdoc />
+    public OpenHABVersion ServerVersion
+    {
+        get; set;
+    }
+
+    /// <inheritdoc/>
+    public async Task<bool> CanEnableAutostart()
+    {
+        StartupTask startupTask = await StartupTask.GetAsync(_startupId);
+        return !(startupTask.State == StartupTaskState.DisabledByPolicy || startupTask.State == StartupTaskState.DisabledByUser);
+    }
+
     /// <inheritdoc/>
-    public class AppManager : IAppManager
+    public async Task<bool> IsStartupEnabled()
+    {
+        StartupTask startupTask = await StartupTask.GetAsync(_startupId);
+        return startupTask.State == StartupTaskState.Enabled || startupTask.State == StartupTaskState.EnabledByPolicy;
+    }
+
+    /// <inheritdoc />
+    public void SetProgramLanguage(string langcode)
     {
-        private string _startupId = "openHABStartupId";
-        private ILogger<AppManager> _logger;
+        if (string.IsNullOrEmpty(langcode))
+        {
+            SettingOptions settings = _options.Value;
+            langcode = settings.AppLanguage;
+        }
 
-        /// <summary>Initializes a new instance of the <see cref="AppManager" /> class.</summary>
-        public AppManager(ILogger<AppManager> logger)
+        if (!string.IsNullOrEmpty(langcode))
         {
-            _logger = logger;
+            CultureInfo.CurrentCulture = new CultureInfo(langcode);
         }
+        else
+        {
+            string userLanguage = GlobalizationPreferences.Languages[0];
+            CultureInfo.CurrentCulture = new CultureInfo(userLanguage);
+        }
+    }
 
-        /// <inheritdoc/>
-        public async Task<bool> IsStartupEnabled()
+    [DllImport("UXTheme.dll", SetLastError = true, EntryPoint = "#138")]
+    public static extern bool ShouldSystemUseDarkMode();
+
+    /// <inheritdoc />
+    public void SetAppTheme(UIElement content)
+    {
+        if (!(content is FrameworkElement frameworkElement))
         {
-            StartupTask startupTask = await StartupTask.GetAsync(_startupId);
-            return startupTask.State == StartupTaskState.Enabled || startupTask.State == StartupTaskState.EnabledByPolicy;
+            _logger.LogWarning("Unable to set app theme");
+            return;
         }
 
-        /// <inheritdoc/>
-        public async Task<bool> CanEnableAutostart()
+        SettingOptions settings = _options.Value;
+        switch (settings.AppTheme)
         {
-            StartupTask startupTask = await StartupTask.GetAsync(_startupId);
-            return !(startupTask.State == StartupTaskState.DisabledByPolicy || startupTask.State == StartupTaskState.DisabledByUser);
+            case AppTheme.Light:
+                frameworkElement.RequestedTheme = ElementTheme.Light;
+                break;
+            case AppTheme.Dark:
+                frameworkElement.RequestedTheme = ElementTheme.Dark;
+                break;
+            case AppTheme.System:
+                frameworkElement.RequestedTheme = ShouldSystemUseDarkMode() ? ElementTheme.Dark : ElementTheme.Light;
+                break;
+            default:
+                break;
         }
+    }
 
-        /// <inheritdoc/>
-        public async Task ToggleAutostart()
+    /// <inheritdoc/>
+    public async Task ToggleAutostart()
+    {
+        StartupTask startupTask = await StartupTask.GetAsync(_startupId);
+        switch (startupTask.State)
         {
-            StartupTask startupTask = await StartupTask.GetAsync(_startupId);
-            StartupTaskState newState = StartupTaskState.Disabled;
-
-            switch (startupTask.State)
-            {
-                case StartupTaskState.DisabledByPolicy:
-                case StartupTaskState.DisabledByUser:
-                case StartupTaskState.Disabled:
-                    newState = await startupTask.RequestEnableAsync();
-                    _logger.LogInformation($"App autostart: {newState.ToString()}");
-                    break;
-                case StartupTaskState.EnabledByPolicy:
-                case StartupTaskState.Enabled:
-                    startupTask.Disable();
-                    _logger.LogInformation($"App autostart: disabled");
-                    break;
-            }
+            case StartupTaskState.DisabledByPolicy:
+            case StartupTaskState.DisabledByUser:
+            case StartupTaskState.Disabled:
+                StartupTaskState newState = await startupTask.RequestEnableAsync();
+                _logger.LogInformation($"App autostart: {newState.ToString()}");
+                break;
+
+            case StartupTaskState.EnabledByPolicy:
+            case StartupTaskState.Enabled:
+                startupTask.Disable();
+                _logger.LogInformation($"App autostart: disabled");
+                break;
         }
     }
 }
diff --git a/src/openHAB.Core/Services/Contracts/IAppManager.cs b/src/openHAB.Core/Services/Contracts/IAppManager.cs
new file mode 100644
index 00000000..25fbbb93
--- /dev/null
+++ b/src/openHAB.Core/Services/Contracts/IAppManager.cs
@@ -0,0 +1,55 @@
+using System.Threading.Tasks;
+using Microsoft.UI.Xaml;
+using openHAB.Core.Client.Models;
+
+namespace openHAB.Core.Services.Contracts;
+
+/// <summary>
+/// Manages app behavior like autostart.
+/// </summary>
+public interface IAppManager
+{
+    /// <summary>
+    /// Gets or sets the version of openHAB that's running on the server.
+    /// </summary>
+    OpenHABVersion ServerVersion
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Determines if the autostart can be enabled on system logon.
+    /// </summary>
+    /// <returns>
+    /// A task that represents the asynchronous operation. The task result contains a boolean value indicating whether autostart can be enabled.
+    /// </returns>
+    Task<bool> CanEnableAutostart();
+
+    /// <summary>
+    /// Determines whether autostartup on system logon is enabled.
+    /// </summary>
+    /// <returns>
+    /// A task that represents the asynchronous operation. The task result contains a boolean value indicating whether autostart is enabled.
+    /// </returns>
+    Task<bool> IsStartupEnabled();
+
+
+    /// <summary>
+    /// Sets the application theme.
+    /// </summary>
+    void SetAppTheme(UIElement content);
+
+    /// <summary>
+    /// Sets the program language.
+    /// </summary>
+    /// <param name="langcode">The language code to set the program language to.</param>
+    void SetProgramLanguage(string langcode);
+
+    /// <summary>
+    /// Toggles the autostart.
+    /// </summary>
+    /// <returns>
+    /// A task that represents the asynchronous operation.
+    /// </returns>
+    Task ToggleAutostart();
+}
diff --git a/src/openHAB.Core/Services/Contracts/IIconCaching.cs b/src/openHAB.Core/Services/Contracts/IIconCaching.cs
new file mode 100644
index 00000000..b12780b7
--- /dev/null
+++ b/src/openHAB.Core/Services/Contracts/IIconCaching.cs
@@ -0,0 +1,22 @@
+using System.Threading.Tasks;
+
+namespace openHAB.Core.Services.Contracts;
+
+/// <summary>
+/// Caching mechanism for widget icons.
+/// </summary>
+public interface IIconCaching
+{
+    /// <summary>
+    /// Clears the icon cache directory.
+    /// </summary>
+    void ClearIconCache();
+
+    /// <summary>Resolves the path to local cached icon file.<br />
+    /// If the icon is not present in cache the file will be downloaded from OpenHAB server.</summary>
+    /// <param name="iconUrl">The icon URL.</param>
+    /// <param name="state"> Item state. </param>
+    /// <param name="iconFormat">The icon format.</param>
+    /// <returns>Path to icon file in local cache.</returns>
+    Task<string> ResolveIconPath(string iconUrl, string state, string iconFormat);
+}
diff --git a/src/openHAB.Core/Services/Contracts/IItemManager.cs b/src/openHAB.Core/Services/Contracts/IItemManager.cs
new file mode 100644
index 00000000..4d3d747b
--- /dev/null
+++ b/src/openHAB.Core/Services/Contracts/IItemManager.cs
@@ -0,0 +1,15 @@
+using openHAB.Core.Client.Models;
+
+namespace openHAB.Core.Services.Contracts;
+
+/// <summary>Stores and Fetches data about openHabItems.</summary>
+public interface IItemManager
+{
+    /// <summary>Tries to find openHabItem in dictionary, when not available queries data from openHab server.</summary>
+    /// <param name="itemName">Name of the item.</param>
+    /// <param name="item">The item.</param>
+    /// <returns>
+    ///   Is true if the item was found in the dictionary or was successfully downloaded from openHAB server, otherwise false.
+    /// </returns>
+    bool TryGetItem(string itemName, out Item item);
+}
diff --git a/src/openHAB.Core/Services/IAppManager.cs b/src/openHAB.Core/Services/IAppManager.cs
deleted file mode 100644
index 6da42370..00000000
--- a/src/openHAB.Core/Services/IAppManager.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-using System.Threading.Tasks;
-
-namespace OpenHAB.Core.Services
-{
-    /// <summary>Manages app behaviour like autostart.</summary>
-    public interface IAppManager
-    {
-        /// <summary>Determines if the autostart can be enabled on system logon.</summary>
-        /// <returns>
-        ///   <br />
-        /// </returns>
-        Task<bool> CanEnableAutostart();
-
-        /// <summary>Determines whether autostartup on system logon is enabled.</summary>
-        /// <returns>
-        ///   <br />
-        /// </returns>
-        Task<bool> IsStartupEnabled();
-
-        /// <summary>Toggles the autostart.</summary>
-        /// <returns>
-        ///   <br />
-        /// </returns>
-        Task ToggleAutostart();
-    }
-}
\ No newline at end of file
diff --git a/src/openHAB.Core/Services/IIconCaching.cs b/src/openHAB.Core/Services/IIconCaching.cs
deleted file mode 100644
index 8a7f8f20..00000000
--- a/src/openHAB.Core/Services/IIconCaching.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-using System.Threading.Tasks;
-
-namespace OpenHAB.Core.Services
-{
-    /// <summary>
-    /// Caching mechanism for widget icons.
-    /// </summary>
-    public interface IIconCaching
-    {
-        /// <summary>
-        /// Clears the icon cache directory.
-        /// </summary>
-        void ClearIconCache();
-
-        /// <summary>Resolves the path to local cached icon file.<br />
-        /// If the icon is not present in cache the file will be downloaded from OpenHAB server.</summary>
-        /// <param name="iconUrl">The icon URL.</param>
-        /// <param name="iconFormat">The icon format.</param>
-        /// <returns>Path to icon file in local cache.</returns>
-        Task<string> ResolveIconPath(string iconUrl, string iconFormat);
-    }
-}
\ No newline at end of file
diff --git a/src/openHAB.Core/Services/IItemManager.cs b/src/openHAB.Core/Services/IItemManager.cs
deleted file mode 100644
index 62cab7b1..00000000
--- a/src/openHAB.Core/Services/IItemManager.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using OpenHAB.Core.Model;
-
-namespace OpenHAB.Core.Services
-{
-    /// <summary>Stores and Fetches data about openHabItems.</summary>
-    public interface IItemManager
-    {
-        /// <summary>Tries to find openHabItem in dictionary, when not available queries data from openHab server.</summary>
-        /// <param name="itemName">Name of the item.</param>
-        /// <param name="item">The item.</param>
-        /// <returns>
-        ///   Is true if the item was found in the dictionary or was successfully downloaded from openHAB server, otherwise false.
-        /// </returns>
-        bool TryGetItem(string itemName, out OpenHABItem item);
-    }
-}
\ No newline at end of file
diff --git a/src/openHAB.Core/Services/IconCaching.cs b/src/openHAB.Core/Services/IconCaching.cs
index f4ef0898..716f6658 100644
--- a/src/openHAB.Core/Services/IconCaching.cs
+++ b/src/openHAB.Core/Services/IconCaching.cs
@@ -1,106 +1,152 @@
-using System;
+using System;
+using System.IO;
 using System.Net.Http;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
-using Microsoft.Toolkit.Uwp.Helpers;
-using OpenHAB.Core.Model;
-using Windows.Storage;
+using Microsoft.Extensions.Options;
+using openHAB.Core.Client.Connection.Contracts;
+using openHAB.Core.Client.Connection.Models;
+using openHAB.Core.Client.Models;
+using openHAB.Core.Client.Options;
+using openHAB.Core.Services.Contracts;
+using openHAB.Core.Services.Models;
 
-namespace OpenHAB.Core.Services
+using Connection = openHAB.Core.Client.Connection.Models.Connection;
+
+namespace openHAB.Core.Services;
+
+/// <inheritdoc/>
+public class IconCaching : IIconCaching
 {
+    private readonly IConnectionService _connectionService;
+    private readonly IAppManager _appManager;
+    private readonly IHttpClientFactory _httpClientFactory;
+    private readonly IOptions<ConnectionOptions> _connectionOptions;
+    private readonly ILogger<IconCaching> _logger;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="IconCaching" /> class.
+    /// </summary>
+    /// <param name="appPaths">Application default paths.</param>
+    /// <param name="connectionService">The connection service to retrieve the connection details.</param>
+    /// <param name="connectionOptions">The settings service to load settings.</param>
+    /// <param name="logger">The logger.</param>
+    public IconCaching(
+        IConnectionService connectionService,
+        IAppManager appManager,
+        IHttpClientFactory httpClientFactory,
+        IOptions<ConnectionOptions> connectionOptions,
+        ILogger<IconCaching> logger)
+    {
+        _logger = logger;
+        _connectionService = connectionService;
+        _connectionOptions = connectionOptions;
+        _appManager = appManager;
+        _httpClientFactory = httpClientFactory;
+    }
+
     /// <inheritdoc/>
-    public class IconCaching : IIconCaching
+    public async Task<string> ResolveIconPath(string icon, string state, string iconFormat)
     {
-        private string _iconCacheDirectory = "icons";
-        private StorageFolder _cacheFolder;
-        private ILogger<IconCaching> _logger;
+        string serverUrl = _connectionService.CurrentConnection.Url;
+        OpenHABVersion openHABVersion = _appManager.ServerVersion;
 
-        /// <summary>Initializes a new instance of the <see cref="IconCaching" /> class.</summary>
-        /// <param name="logger">The logger.</param>
-        public IconCaching(ILogger<IconCaching> logger)
-        {
-            _logger = logger;
-            _cacheFolder = ApplicationData.Current.LocalCacheFolder;
-        }
+        string iconUrl = openHABVersion == OpenHABVersion.Two || openHABVersion == OpenHABVersion.Three || openHABVersion == OpenHABVersion.Four ?
+                   $"{serverUrl}icon/{icon}?state={state}&format={iconFormat}&anyFormat=true&iconset=classic" :
+                   $"{serverUrl}images/{icon}.png";
 
-        /// <inheritdoc/>
-        public async Task<string> ResolveIconPath(string iconUrl, string iconFormat)
+        try
         {
-            try
-            {
-                Match iconName = Regex.Match(iconUrl, "icon/[0-9a-zA-Z]*");
-                Match iconState = Regex.Match(iconUrl, "state=[0-9a-zA-Z=]*");
-
-                if (!iconName.Success)
-                {
-                    throw new OpenHABException("Can not resolve icon name from url");
-                }
-
-                if (!iconState.Success)
-                {
-                    throw new OpenHABException("Can not resolve icon state from url");
-                }
+            Match iconName = Regex.Match(iconUrl, "icon/[0-9a-zA-Z]*", RegexOptions.None, TimeSpan.FromMilliseconds(1000));
+            Match iconState = Regex.Match(iconUrl, "state=[0-9a-zA-Z=]*", RegexOptions.None, TimeSpan.FromMilliseconds(1000));
 
-                if (!iconState.Success)
-                {
-                    throw new OpenHABException("Can not resolve icon state from url");
-                }
+            if (!iconName.Success)
+            {
+                throw new ServiceException("Can not resolve icon name from url");
+            }
 
-                StorageFolder storageFolder = await EnsureIconCacheFolder();
+            if (!iconState.Success)
+            {
+                throw new ServiceException("Can not resolve icon state from url");
+            }
 
-                string iconFileName = $"{iconName.Value.Replace("icon/", string.Empty)}{iconState.Value.Replace("state=", string.Empty)}.{iconFormat}";
-                string iconFilePath = $"{storageFolder.Path}\\{iconFileName}";
+            DirectoryInfo iconDirectory = EnsureIconCacheFolder();
 
-                if (await storageFolder.FileExistsAsync(iconFileName))
-                {
-                    return iconFilePath;
-                }
+            string iconFileName = $"{iconName.Value.Replace("icon/", string.Empty)}.{iconFormat}";
+            string iconFilePath = Path.Combine(iconDirectory.FullName, iconFileName).Replace("NULL", string.Empty);
 
-                await DownloadAndSaveIconToCache(iconUrl, iconFileName, storageFolder);
-                return iconFilePath;
-            }
-            catch (Exception ex)
+            if (File.Exists(iconFilePath))
             {
-                _logger.LogError(ex, "Failed to cache icon");
-                return iconUrl;
+                return iconFilePath;
             }
-        }
 
-        private async Task DownloadAndSaveIconToCache(string iconUrl, string iconFileName, StorageFolder storageFolder)
+            bool downloadSuccessfull = await DownloadAndSaveIconToCache(iconUrl, iconFilePath);
+
+            return downloadSuccessfull ? iconFilePath : iconUrl;
+        }
+        catch (Exception ex)
         {
-            using (HttpClient httpClient = new HttpClient())
-            {
-                HttpResponseMessage httpResponse = await httpClient.GetAsync(new Uri(iconUrl)).ConfigureAwait(false);
+            _logger.LogError(ex, "Failed to cache icon");
+            return iconUrl;
+        }
+    }
 
-                if (!httpResponse.IsSuccessStatusCode)
-                {
-                    return;
-                }
+    private async Task<bool> DownloadAndSaveIconToCache(string iconUrl, string iconFilePath)
+    {
+        ConnectionOptions settings = _connectionOptions.Value;
+        bool isRunningInDemoMode = settings.IsRunningInDemoMode.HasValue && settings.IsRunningInDemoMode.Value;
+        Connection connection = await _connectionService.DetectAndRetrieveConnection(settings.LocalConnection, settings.RemoteConnection, isRunningInDemoMode)
+            .ConfigureAwait(false);
 
-                byte[] iconContent = await httpResponse.Content.ReadAsByteArrayAsync();
-                StorageFile file = await storageFolder.CreateFileAsync(iconFileName, CreationCollisionOption.ReplaceExisting);
-                await FileIO.WriteBytesAsync(file, iconContent);
-            }
+        if (connection == null)
+        {
+            _logger.LogError("Failed to retrieve connection details to download icon");
+            return false;
         }
 
-        /// <inheritdoc/>
-        public async void ClearIconCache()
+        HttpClient httpClient = connection.Type switch
+        {
+            HttpClientType.Local => _httpClientFactory.CreateClient("local"),
+            HttpClientType.Remote => _httpClientFactory.CreateClient("remote"),
+            _ => throw new OpenHABException("Invalid connection type")
+        };
+
+        Uri uri = new Uri(iconUrl);
+        HttpResponseMessage httpResponse = await httpClient.GetAsync(uri).ConfigureAwait(false);
+        if (!httpResponse.IsSuccessStatusCode)
         {
-            StorageFolder storageFolder = await EnsureIconCacheFolder();
-            await storageFolder.DeleteAsync();
+            _logger.LogWarning("Failed to download icon from '{IconUrl}' with status code '{StatusCode}'", iconUrl, httpResponse.StatusCode);
         }
 
-        private async Task<StorageFolder> EnsureIconCacheFolder()
+        byte[] iconContent = await httpResponse.Content.ReadAsByteArrayAsync();
+        using (FileStream file = File.Open(iconFilePath, FileMode.OpenOrCreate))
         {
-            StorageFolder storageFolder = await _cacheFolder.TryGetItemAsync(_iconCacheDirectory) as StorageFolder;
+            await file.WriteAsync(iconContent, 0, iconContent.Length);
+        }
 
-            if (storageFolder == null)
-            {
-                storageFolder = await _cacheFolder.CreateFolderAsync(_iconCacheDirectory);
-            }
+        return true;
+    }
+
+    /// <inheritdoc/>
+    public void ClearIconCache()
+    {
+        DirectoryInfo iconDirectory = EnsureIconCacheFolder();
+        if (iconDirectory.Exists)
+        {
+            iconDirectory.Delete(true);
+        }
+    }
 
-            return storageFolder;
+    private DirectoryInfo EnsureIconCacheFolder()
+    {
+        if (!Directory.Exists(AppPaths.IconCacheDirectory))
+        {
+            DirectoryInfo directory = Directory.CreateDirectory(AppPaths.IconCacheDirectory);
+            _logger.LogInformation("Created icon cache directory '{Directory}'", directory.FullName);
+            return directory;
         }
+
+        return new DirectoryInfo(AppPaths.IconCacheDirectory);
     }
 }
diff --git a/src/openHAB.Core/Services/ItemManager.cs b/src/openHAB.Core/Services/ItemManager.cs
index 201e7cf3..37ba30e8 100644
--- a/src/openHAB.Core/Services/ItemManager.cs
+++ b/src/openHAB.Core/Services/ItemManager.cs
@@ -1,33 +1,32 @@
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using OpenHAB.Core.Model;
-using OpenHAB.Core.SDK;
+using System.Collections.Generic;
+using openHAB.Core.Client.Contracts;
+using openHAB.Core.Client.Models;
+using openHAB.Core.Services.Contracts;
 
-namespace OpenHAB.Core.Services
+namespace openHAB.Core.Services;
+
+/// <inheritdoc/>
+public class ItemManager : IItemManager
 {
-    /// <inheritdoc/>
-    public class ItemManager : IItemManager
+    private readonly Dictionary<string, Item> _nameToStateDictionary;
+    private readonly IOpenHABClient _openHABClient;
+
+    /// <summary>Initializes a new instance of the <see cref="ItemManager" /> class.</summary>
+    public ItemManager(IOpenHABClient openHABClient)
     {
-        private Dictionary<string, OpenHABItem> _nameToStateDictionary;
-        private IOpenHAB _openHABClient;
+        _nameToStateDictionary = new Dictionary<string, Item>();
+        _openHABClient = openHABClient;
+    }
 
-        /// <summary>Initializes a new instance of the <see cref="ItemManager" /> class.</summary>
-        public ItemManager(IOpenHAB openHABClient)
+    /// <inheritdoc/>
+    public bool TryGetItem(string itemName, out Item item)
+    {
+        if (!_nameToStateDictionary.TryGetValue(itemName, out item))
         {
-            _nameToStateDictionary = new Dictionary<string, OpenHABItem>();
-            _openHABClient = openHABClient;
+            item = _openHABClient.GetItemByName(itemName).Result;
+            return _nameToStateDictionary.TryAdd(itemName, item);
         }
 
-        /// <inheritdoc/>
-        public bool TryGetItem(string itemName, out OpenHABItem item)
-        {
-            if (!_nameToStateDictionary.TryGetValue(itemName, out item))
-            {
-                item = _openHABClient.GetItemByName(itemName).Result;
-                return _nameToStateDictionary.TryAdd(itemName, item);
-            }
-
-            return _nameToStateDictionary.TryGetValue(itemName, out item);
-        }
+        return _nameToStateDictionary.TryGetValue(itemName, out item);
     }
 }
diff --git a/src/openHAB.Core/Services/Models/OpenHABException.cs b/src/openHAB.Core/Services/Models/OpenHABException.cs
new file mode 100644
index 00000000..6c24db44
--- /dev/null
+++ b/src/openHAB.Core/Services/Models/OpenHABException.cs
@@ -0,0 +1,36 @@
+using System;
+using openHAB.Core.Client.Models;
+
+namespace openHAB.Core.Services.Models;
+
+/// <summary>
+/// An Exception class used to throw unexpected errors.
+/// </summary>
+public class ServiceException : Exception
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="OpenHABException"/> class.
+    /// </summary>
+    /// <param name="message">The error message.</param>
+    public ServiceException(string message)
+        : base(message)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="OpenHABException"/> class.
+    /// </summary>
+    /// <param name="message">The error message.</param>
+    /// <param name="exception">The original exception.</param>
+    public ServiceException(string message, Exception exception)
+        : base(message, exception)
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="OpenHABException"/> class.
+    /// </summary>
+    public ServiceException()
+    {
+    }
+}
diff --git a/src/openHAB.Core/Services/Notification/INotificationManager.cs b/src/openHAB.Core/Services/Notification/INotificationManager.cs
deleted file mode 100644
index 1d82429a..00000000
--- a/src/openHAB.Core/Services/Notification/INotificationManager.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-using OpenHAB.Core.Model;
-
-namespace OpenHAB.Core.Services
-{
-    /// <summary>Class handles toast and tile notifications.</summary>
-    public interface INotificationManager
-    {
-        /// <summary>
-        /// Resets the notification count on badge.
-        /// </summary>
-        void ResetBadgeCount();
-    }
-}
\ No newline at end of file
diff --git a/src/openHAB.Core/Services/Notification/IOpenHABEventParser.cs b/src/openHAB.Core/Services/Notification/IOpenHABEventParser.cs
deleted file mode 100644
index 137ffe75..00000000
--- a/src/openHAB.Core/Services/Notification/IOpenHABEventParser.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using OpenHAB.Core.Model.Event;
-
-namespace OpenHAB.Core.Services
-{
-    /// <summary>openHAB event parser.</summary>
-    public interface IOpenHABEventParser
-    {
-        /// <summary>Parses the openHAB evnet message.</summary>
-        /// <param name="message">The message.</param>
-        /// <returns>
-        ///   openHAB event object <see cref="OpenHABEvent"/>.
-        /// </returns>
-        OpenHABEvent Parse(string message);
-    }
-}
\ No newline at end of file
diff --git a/src/openHAB.Core/Services/Notification/NotificationManager.cs b/src/openHAB.Core/Services/Notification/NotificationManager.cs
deleted file mode 100644
index dc5b1e40..00000000
--- a/src/openHAB.Core/Services/Notification/NotificationManager.cs
+++ /dev/null
@@ -1,336 +0,0 @@
-using System.Globalization;
-using CommunityToolkit.Mvvm.Messaging;
-using Microsoft.Toolkit.Uwp.Notifications;
-using OpenHAB.Core.Common;
-using OpenHAB.Core.Contracts.Services;
-using OpenHAB.Core.Messages;
-using OpenHAB.Core.Model;
-using Windows.UI.Notifications;
-using XmlDocument = Windows.Data.Xml.Dom.XmlDocument;
-
-namespace OpenHAB.Core.Services
-{
-    /// <inheritdoc/>
-    public class NotificationManager : INotificationManager
-    {
-        private IItemManager _itemManager;
-        private string _iconFormat;
-        private ISettingsService _settingsService;
-        private int _notficationCounter;
-
-        /// <summary>Initializes a new instance of the <see cref="NotificationManager" /> class.</summary>
-        /// <param name="itemStateManager">The item state manager.</param>
-        /// <param name="settingsService">Setting service.</param>
-        /// <param name="settings">Application Settings.</param>
-        public NotificationManager(IItemManager itemStateManager, ISettingsService settingsService, Settings settings)
-        {
-            StrongReferenceMessenger.Default.Register<ItemStateChangedMessage>(this, HandleUpdateItemMessage);
-            _itemManager = itemStateManager;
-            _iconFormat = settings.UseSVGIcons ? "svg" : "png";
-            _settingsService = settingsService;
-            _notficationCounter = 0;
-        }
-
-        private void HandleUpdateItemMessage(object receipts, ItemStateChangedMessage obj)
-        {
-            Settings settings = _settingsService.Load();
-
-            _notficationCounter++;
-
-            string itemName = obj.ItemName;
-            string itemImage = string.Empty;
-            if (_itemManager.TryGetItem(obj.ItemName, out OpenHABItem item))
-            {
-                itemName = item.Label;
-                string state = item?.State ?? "ON";
-                itemImage = $"{OpenHABHttpClient.BaseUrl}icon/{item.Category}?state={state}&format={_iconFormat}";
-            }
-
-            TriggerTileNotificationForItem(itemName, itemImage, obj.Value, obj.OldValue);
-
-            if (settings.NotificationsEnable.HasValue && !settings.NotificationsEnable.Value)
-            {
-                return;
-            }
-
-            TriggerToastNotificationForItem(itemName, itemImage, obj.Value, obj.OldValue);
-            SetBadgeNumber(_notficationCounter);
-        }
-
-        #region Toast Notification
-
-        private void TriggerToastNotificationForItem(string itemName, string itemImage, string value, string oldValue)
-        {
-            string message = GetMessage(itemName, value, oldValue, "NotificationToast", "NotificationToastSimple");
-
-            var notifier = ToastNotificationManager.CreateToastNotifier();
-            var xmdock = CreateToastMessage(message, itemImage);
-            var toast = new ToastNotification(xmdock);
-
-            notifier.Show(toast);
-        }
-
-        private XmlDocument CreateToastMessage(string message, string image)
-        {
-            var toastContent = new ToastContent()
-            {
-                Visual = new ToastVisual()
-                {
-                    BindingGeneric = new ToastBindingGeneric()
-                    {
-                        Children =
-                        {
-                            new AdaptiveText()
-                            {
-                                Text = "openHAB for Windows",
-                                HintMaxLines = 1,
-                            },
-                            new AdaptiveText()
-                            {
-                                Text = message
-                            }
-                        },
-                        AppLogoOverride = new ToastGenericAppLogo()
-                        {
-                            Source = image
-                        }
-                    }
-                },
-                Actions = new ToastActionsCustom()
-                {
-                    Buttons =
-                    {
-                        new ToastButton("Show Item", "action=show")
-                        {
-                            ActivationType = ToastActivationType.Foreground,
-                        }
-                    }
-                }
-            };
-
-            return toastContent.GetXml();
-        }
-
-        #endregion
-
-        #region Tile Notification
-
-        private void TriggerTileNotificationForItem(string itemName, string itemImage, string value, string oldValue)
-        {
-            string message = GetMessage(itemName, value, oldValue, "NotificationTile", "NotificationTileSimple");
-
-            TileUpdater tileUpdater = TileUpdateManager.CreateTileUpdaterForApplication();
-            XmlDocument tileNotifcationXML = CreateTileNotificaiton(itemName, message, value, itemImage);
-            TileNotification tileNotif = new TileNotification(tileNotifcationXML);
-
-            tileUpdater.Update(tileNotif);
-        }
-
-        private XmlDocument CreateTileNotificaiton(string itemName, string message, string value, string itemImage)
-        {
-            var tileContent = new TileContent()
-            {
-                Visual = new TileVisual()
-                {
-                    Branding = TileBranding.NameAndLogo,
-                    TileSmall = new TileBinding()
-                    {
-                        Branding = TileBranding.Name,
-                        Content = new TileBindingContentAdaptive()
-                        {
-                            TextStacking = TileTextStacking.Center,
-                            Children =
-                {
-                    new AdaptiveText()
-                    {
-                        Text = itemName,
-                        HintStyle = AdaptiveTextStyle.Body,
-                        HintAlign = AdaptiveTextAlign.Center
-                    },
-                    new AdaptiveText()
-                    {
-                        Text = value,
-                        HintStyle = AdaptiveTextStyle.Base,
-                        HintAlign = AdaptiveTextAlign.Center
-                    }
-                }
-                        }
-                    },
-                    TileMedium = new TileBinding()
-                    {
-                        Branding = TileBranding.Name,
-                        Content = new TileBindingContentAdaptive()
-                        {
-                            Children =
-                            {
-                                new AdaptiveText()
-                                {
-                                    Text = itemName,
-                                    HintStyle = AdaptiveTextStyle.Caption
-                                },
-                                new AdaptiveText()
-                                {
-                                    Text = message,
-                                    HintStyle = AdaptiveTextStyle.CaptionSubtle,
-                                    HintWrap = true,
-                                    HintMaxLines = 3
-                                }
-                            }
-                        }
-                    },
-                    TileWide = new TileBinding()
-                    {
-                        Content = new TileBindingContentAdaptive()
-                        {
-                            Children =
-                            {
-                                new AdaptiveGroup()
-                                {
-                                    Children =
-                                    {
-                                        new AdaptiveSubgroup()
-                                        {
-                                            HintWeight = 33,
-                                            Children =
-                                            {
-                                                new AdaptiveImage()
-                                                {
-                                                    Source = itemImage
-                                                }
-                                            }
-                                        },
-                                        new AdaptiveSubgroup()
-                                        {
-                                            Children =
-                                            {
-                                                new AdaptiveText()
-                                                {
-                                                    Text = itemName,
-                                                    HintStyle = AdaptiveTextStyle.Caption
-                                                },
-                                                new AdaptiveText()
-                                                {
-                                                    Text = message,
-                                                    HintStyle = AdaptiveTextStyle.CaptionSubtle,
-                                                    HintWrap = true,
-                                                    HintMaxLines = 3
-                                                }
-                                            }
-                                        }
-                                    }
-                                }
-                            }
-                        }
-                    },
-                    TileLarge = new TileBinding()
-                    {
-                        Content = new TileBindingContentAdaptive()
-                        {
-                            Children =
-                            {
-                                new AdaptiveGroup()
-                                {
-                                    Children =
-                                    {
-                                        new AdaptiveSubgroup()
-                                        {
-                                            HintWeight = 1
-                                        },
-                                        new AdaptiveSubgroup()
-                                        {
-                                            HintWeight = 2,
-                                            Children =
-                                            {
-                                                new AdaptiveImage()
-                                                {
-                                                    Source = itemImage
-                                                }
-                                            }
-                                        },
-                                        new AdaptiveSubgroup()
-                                        {
-                                            HintWeight = 1
-                                        }
-                                    }
-                                },
-                                new AdaptiveText()
-                                {
-                                    Text = string.Empty
-                                },
-                                new AdaptiveText()
-                                {
-                                    Text = itemName,
-                                    HintStyle = AdaptiveTextStyle.Caption
-                                },
-                                new AdaptiveText()
-                                {
-                                    Text = message,
-                                    HintStyle = AdaptiveTextStyle.CaptionSubtle,
-                                    HintWrap = true,
-                                    HintMaxLines = 3
-                                }
-                            }
-                        }
-                    }
-                }
-            };
-
-            return tileContent.GetXml();
-        }
-
-        #endregion
-
-        #region Badge Notification
-
-        /// <inheritdoc/>
-        public void ResetBadgeCount()
-        {
-            BadgeUpdateManager.CreateBadgeUpdaterForApplication().Clear();
-        }
-
-        private void SetBadgeNumber(int num)
-        {
-            // Get the blank badge XML payload for a badge number
-            XmlDocument badgeXml =
-                BadgeUpdateManager.GetTemplateContent(BadgeTemplateType.BadgeNumber);
-
-            // Set the value of the badge in the XML to our number
-            Windows.Data.Xml.Dom.XmlElement badgeElement = badgeXml.SelectSingleNode("/badge") as Windows.Data.Xml.Dom.XmlElement;
-            badgeElement.SetAttribute("value", num.ToString());
-
-            // Create the badge notification
-            BadgeNotification badge = new BadgeNotification(badgeXml);
-
-            // Create the badge updater for the application
-            BadgeUpdater badgeUpdater =
-                BadgeUpdateManager.CreateBadgeUpdaterForApplication();
-
-            // And update the badge
-            badgeUpdater.Update(badge);
-        }
-
-        #endregion
-
-        private string GetMessage(
-            string itemName,
-            string itemValue,
-            string oldItemValue,
-            string valueChangedMessageRessource,
-            string stateChangedMessageRessource)
-        {
-            string message = string.Empty;
-            if (!string.IsNullOrEmpty(oldItemValue))
-            {
-                message = AppResources.Values.GetString(valueChangedMessageRessource);
-            }
-            else
-            {
-                message = AppResources.Values.GetString(stateChangedMessageRessource);
-            }
-
-            message = string.Format(CultureInfo.InvariantCulture, message, itemName, oldItemValue, itemValue);
-
-            return message;
-        }
-    }
-}
diff --git a/src/openHAB.Core/Services/Notification/OpenHABEventParser.cs b/src/openHAB.Core/Services/Notification/OpenHABEventParser.cs
deleted file mode 100644
index 8e9286c3..00000000
--- a/src/openHAB.Core/Services/Notification/OpenHABEventParser.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-using System;
-using Microsoft.Extensions.Logging;
-using Newtonsoft.Json;
-using OpenHAB.Core.Model.Event;
-
-namespace OpenHAB.Core.Services
-{
-    /// <inheritdoc/>
-    public class OpenHABEventParser : IOpenHABEventParser
-    {
-        private ILogger<OpenHABEventParser> _logger;
-
-        /// <summary>Initializes a new instance of the <see cref="OpenHABEventParser" /> class.</summary>
-        /// <param name="logger">The logger.</param>
-        public OpenHABEventParser(ILogger<OpenHABEventParser> logger)
-        {
-            _logger = logger;
-        }
-
-        /// <inheritdoc/>
-        public OpenHABEvent Parse(string message)
-        {
-            try
-            {
-                var data = JsonConvert.DeserializeObject<EventStreamData>(message.Remove(0, 6));
-
-                if (data.Type == "ThingUpdatedEvent" || data.Type == "ThingStatusInfoChangedEvent")
-                {
-                    _logger.LogWarning($"Event type is not supported '{data.Type}'.");
-                    return null;
-                }
-
-                var payload = JsonConvert.DeserializeObject<EventStreamPayload>(data.Payload);
-                string itemName = data.Topic
-                                        .Replace("openhab/items/", string.Empty) // openHAB V3
-                                        .Replace("smarthome/items/", string.Empty) // openHAB V2
-                                        .Replace("/statechanged", string.Empty).Replace("/state", string.Empty);
-
-                if (!Enum.TryParse(typeof(OpenHABEventType), data.Type, out object type))
-                {
-                    type = OpenHABEventType.Unknown;
-                }
-
-                OpenHABEvent openHABevent = new OpenHABEvent()
-                {
-                    ItemName = itemName,
-                    ValueType = payload.Type,
-                    Value = payload.Value,
-                    Topic = data.Topic,
-                    OldType = payload.OldType,
-                    OldValue = payload.OldValue,
-                    EventType = (OpenHABEventType)type,
-                };
-
-                return openHABevent;
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Failed to parse openHAB event.");
-            }
-
-            return null;
-        }
-    }
-}
diff --git a/src/openHAB.Core/Services/SettingsService.cs b/src/openHAB.Core/Services/SettingsService.cs
deleted file mode 100644
index 4517c7ca..00000000
--- a/src/openHAB.Core/Services/SettingsService.cs
+++ /dev/null
@@ -1,126 +0,0 @@
-using Microsoft.Extensions.Logging;
-using Newtonsoft.Json;
-using OpenHAB.Core.Common;
-using OpenHAB.Core.Contracts.Services;
-using OpenHAB.Core.Model;
-using Windows.Globalization;
-using Windows.Storage;
-using Windows.System.UserProfile;
-
-namespace OpenHAB.Core.Services
-{
-    /// <summary>
-    /// Service that handles all settings operations.
-    /// </summary>
-    public class SettingsService : ISettingsService
-    {
-        private ILogger<SettingsService> _logger;
-        private JsonSerializerSettings _serializerSettings = new JsonSerializerSettings()
-        {
-            TypeNameHandling = TypeNameHandling.Auto,
-        };
-
-        private ApplicationDataContainer _settingsContainer;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SettingsService"/> class.
-        /// </summary>
-        public SettingsService(ILogger<SettingsService> logger)
-        {
-            _logger = logger;
-        }
-
-        /// <inheritdoc />
-        public OpenHABVersion ServerVersion
-        {
-            get; set;
-        }
-
-        /// <inheritdoc />
-        public Settings Load()
-        {
-            EnsureSettingsContainer();
-
-            if (!_settingsContainer.Values.ContainsKey(Constants.Local.SettingsKey))
-            {
-                return new Settings();
-            }
-
-            string json = _settingsContainer.Values[Constants.Local.SettingsKey].ToString();
-
-            if (json == null)
-            {
-                return new Settings();
-            }
-
-            return JsonConvert.DeserializeObject<Settings>(json, _serializerSettings);
-        }
-
-        /// <inheritdoc />
-        public string LoadLastSitemap()
-        {
-            _logger.LogInformation("Load last selected sitemape from settings");
-
-            if (!_settingsContainer.Values.TryGetValue(Constants.Local.SitemapKey, out object sitemapKey))
-            {
-                return null;
-            }
-
-            return sitemapKey.ToString();
-        }
-
-        /// <inheritdoc />
-        public bool Save(Settings settings)
-        {
-            try
-            {
-                _logger.LogInformation("Save settings to disk");
-
-                EnsureSettingsContainer();
-                _settingsContainer.Values[Constants.Local.SettingsKey] = JsonConvert.SerializeObject(settings, _serializerSettings);
-
-                return true;
-            }
-            catch (System.Exception ex)
-            {
-                _logger.LogError(ex, "Failed to save settings.");
-                return false;
-            }
-        }
-
-        /// <inheritdoc />
-        public void SaveCurrentSitemap(string name)
-        {
-            _logger.LogInformation("Update selected sitemape in settings");
-
-            _settingsContainer.Values[Constants.Local.SitemapKey] = name;
-        }
-
-        /// <inheritdoc />
-        public void SetProgramLanguage(string langcode)
-        {
-            if (string.IsNullOrEmpty(langcode))
-            {
-                Settings settings = Load();
-                langcode = settings.AppLanguage;
-            }
-
-            if (!string.IsNullOrEmpty(langcode))
-            {
-                ApplicationLanguages.PrimaryLanguageOverride = langcode;
-            }
-            else
-            {
-                ApplicationLanguages.PrimaryLanguageOverride = GlobalizationPreferences.Languages[0];
-            }
-        }
-
-        private void EnsureSettingsContainer()
-        {
-            if (_settingsContainer == null)
-            {
-                _settingsContainer = ApplicationData.Current.RoamingSettings;
-            }
-        }
-    }
-}
diff --git a/src/openHAB.Core/Services/SitemapService.cs b/src/openHAB.Core/Services/SitemapService.cs
new file mode 100644
index 00000000..34681265
--- /dev/null
+++ b/src/openHAB.Core/Services/SitemapService.cs
@@ -0,0 +1,189 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.Messaging;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using openHAB.Common;
+using openHAB.Core.Client.Common;
+using openHAB.Core.Client.Contracts;
+using openHAB.Core.Client.Messages;
+using openHAB.Core.Client.Models;
+using openHAB.Core.Client.Options;
+using openHAB.Core.Messages;
+using openHAB.Core.Model;
+using openHAB.Core.Services.Contracts;
+
+namespace openHAB.Core.Services;
+
+/// <summary>
+/// Service for managing sitemaps in openHAB.
+/// </summary>
+public class SitemapService
+{
+    private readonly ILogger<SitemapService> _logger;
+    private readonly IAppManager _appManager;
+    private readonly IOpenHABClient _openHABClient;
+    private readonly IOptions<ConnectionOptions> _connectionOptions;
+    private readonly IOptions<SettingOptions> _settingOptions;
+    private ServerInfo _serverInfo;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="SitemapService"/> class.
+    /// </summary>
+    /// <param name="settingsService">The settings service.</param>
+    /// <param name="openHABClient">The openHAB client.</param>
+    /// <param name="logger">The logger.</param>
+    public SitemapService(
+        IOptions<ConnectionOptions> connectionOptions,
+        IOptions<SettingOptions> settingOptions,
+        IAppManager appManager,
+        IOpenHABClient openHABClient,
+        ILogger<SitemapService> logger)
+    {
+        _connectionOptions = connectionOptions;
+        _settingOptions = settingOptions;
+
+        _openHABClient = openHABClient;
+        _logger = logger;
+        _appManager = appManager;
+    }
+
+    /// <summary>
+    /// Gets the sitemap by URL.
+    /// </summary>
+    /// <param name="sitemapUrl">The sitemap URL.</param>
+    /// <returns>The <see cref="Sitemap"/> object representing the sitemap.</returns>
+    public async Task<Sitemap> GetSitemapByUrlAsync(string sitemapUrl)
+    {
+        try
+        {
+            _serverInfo = await InitalizeConnectionAsync();
+            if (_serverInfo == null)
+            {
+                return null;
+            }
+            _appManager.ServerVersion = _serverInfo.Version;
+
+            Sitemap sitemap = await _openHABClient.GetSitemap(sitemapUrl, _serverInfo.Version).ConfigureAwait(false);
+            return sitemap;
+        }
+        catch (OpenHABException ex)
+        {
+            _logger.LogError(ex, $"Loading sitemap {sitemapUrl} failed.");
+            StrongReferenceMessenger.Default.Send(new ConnectionErrorMessage(ex.Message));
+            throw;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Load sitemap data failed.");
+        }
+
+        return null;
+    }
+
+    /// <summary>
+    /// Gets the list of sitemaps.
+    /// </summary>
+    /// <param name="loadCancellationToken">The cancellation token for the load operation.</param>
+    /// <returns>The list of <see cref="Sitemap"/> objects representing the sitemaps.</returns>
+    public async Task<List<Sitemap>> GetSitemapsAsync(CancellationToken loadCancellationToken)
+    {
+        try
+        {
+            _serverInfo = await InitalizeConnectionAsync();
+            if (_serverInfo == null)
+            {
+                return null;
+            }
+
+            _appManager.ServerVersion = _serverInfo.Version;
+
+            if (loadCancellationToken.IsCancellationRequested)
+            {
+                return null;
+            }
+
+            Func<Sitemap, bool> defaultSitemapFilter = (sitemap) =>
+            {
+                return !sitemap.Name.Equals("_default", StringComparison.InvariantCultureIgnoreCase);
+            };
+
+            SettingOptions settings = _settingOptions.Value;
+            List<Func<Sitemap, bool>> filters = new List<Func<Sitemap, bool>>();
+            if (!settings.ShowDefaultSitemap)
+            {
+                filters.Add(defaultSitemapFilter);
+            }
+
+            ICollection<Sitemap> sitemaps = await _openHABClient.LoadSitemaps(_serverInfo.Version, filters).ConfigureAwait(false);
+            return new List<Sitemap>(sitemaps);
+        }
+        catch (OpenHABException ex)
+        {
+            _logger.LogError(ex, "Loading sitemaps failed.");
+            StrongReferenceMessenger.Default.Send(new ConnectionErrorMessage(ex.Message));
+            throw;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, "Load data failed.");
+        }
+
+        return null;
+    }
+
+    /// <summary>
+    /// Loads the items from a sitemap.
+    /// </summary>
+    /// <param name="model">The sitemap model.</param>
+    /// <returns>The collection of <see cref="Widget"/> objects representing the items.</returns>
+    public async Task<ICollection<Widget>> LoadItemsFromSitemapAsync(Sitemap model)
+    {
+        ICollection<Widget> widgetModels = await _openHABClient.LoadItemsFromSitemap(model.Link, _serverInfo.Version).ConfigureAwait(false);
+        return widgetModels;
+    }
+
+    /// <summary>
+    /// Sends a command to an item.
+    /// </summary>
+    /// <param name="item">The item to send the command to.</param>
+    /// <param name="command">The command to send.</param>
+    /// <returns>The <see cref="HttpResponseResult{T}"/> object representing the result of the command.</returns>
+    public async Task<HttpResponseResult<bool>> SendItemCommand(Item item, string command)
+    {
+        HttpResponseResult<bool> result = await _openHABClient.SendCommand(item, command).ConfigureAwait(false);
+        return result;
+    }
+
+    private async Task<ServerInfo> InitalizeConnectionAsync()
+    {
+        ConnectionOptions settings = _connectionOptions.Value;
+        if (settings.LocalConnection == null && settings.RemoteConnection == null &&
+            (!settings.IsRunningInDemoMode.HasValue || !settings.IsRunningInDemoMode.Value))
+        {
+            StrongReferenceMessenger.Default.Send(new TriggerInfoMessage(MessageSeverity.Error, AppResources.Values.GetString("MessageNotConfigured")));
+            return null;
+        }
+
+        bool isSuccessful = await _openHABClient.ResetConnection(settings.LocalConnection, settings.RemoteConnection, settings.IsRunningInDemoMode)
+            .ConfigureAwait(false);
+        if (!isSuccessful)
+        {
+            StrongReferenceMessenger.Default.Send(new TriggerInfoMessage(MessageSeverity.Error, AppResources.Values.GetString("MessageNotConfigured")));
+            return null;
+        }
+
+        HttpResponseResult<ServerInfo> result = await _openHABClient.GetOpenHABServerInfo().ConfigureAwait(false);
+        ServerInfo serverInfo = result?.Content;
+
+        if (serverInfo == null || serverInfo.Version == OpenHABVersion.None)
+        {
+            StrongReferenceMessenger.Default.Send(new TriggerInfoMessage(MessageSeverity.Error, AppResources.Values.GetString("MessageNotConfigured")));
+            return null;
+        }
+
+        return serverInfo;
+    }
+}
diff --git a/src/openHAB.Core/Services/WidgetNavigationService.cs b/src/openHAB.Core/Services/WidgetNavigationService.cs
deleted file mode 100644
index d2d8fb97..00000000
--- a/src/openHAB.Core/Services/WidgetNavigationService.cs
+++ /dev/null
@@ -1,61 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using OpenHAB.Core.Model;
-
-namespace OpenHAB.Core.Services
-{
-    /// <summary>
-    /// Service that keeps track of navigation between linkedpages.
-    /// </summary>
-    public class WidgetNavigationService
-    {
-        private static readonly Stack<OpenHABWidget> WidgetBackStack = new Stack<OpenHABWidget>();
-        private static OpenHABWidget _currentWidget;
-
-        /// <summary>
-        /// Gets a value indicating whether there is a previous widget on the backstack.
-        /// </summary>
-        public static bool CanGoBack => _currentWidget != null;
-
-        /// <summary>
-        /// Navigates the backstack to the passed in target.
-        /// </summary>
-        /// <param name="target">The openHAB widget to navigate to.</param>
-        public static void Navigate(OpenHABWidget target)
-        {
-            if (target == _currentWidget)
-            {
-                return;
-            }
-
-            WidgetBackStack.Push(target);
-            _currentWidget = target;
-        }
-
-        /// <summary>
-        /// Go back to the previous openHAB widget.
-        /// </summary>
-        /// <returns>The previous visted widget.</returns>
-        public static OpenHABWidget GoBack()
-        {
-            if (WidgetBackStack.Count == 0)
-            {
-                return null;
-            }
-
-            WidgetBackStack.Pop();
-            _currentWidget = WidgetBackStack.Count == 0 ? null : WidgetBackStack.Peek();
-
-            return _currentWidget;
-        }
-
-        /// <summary>
-        /// Clears and resets the widget navigation.
-        /// </summary>
-        public static void ClearWidgetNavigation()
-        {
-            _currentWidget = null;
-            WidgetBackStack.Clear();
-        }
-    }
-}
diff --git a/src/openHAB.Core/Strings/de-de/Resources.resw b/src/openHAB.Core/Strings/de-de/Resources.resw
index 7eb9ff47..cdfb4dc9 100644
--- a/src/openHAB.Core/Strings/de-de/Resources.resw
+++ b/src/openHAB.Core/Strings/de-de/Resources.resw
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
-    Microsoft ResX Schema 
-    
+  <!--
+    Microsoft ResX Schema
+
     Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
     associated with the data types.
-    
+
     Example:
-    
+
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
         <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
         <comment>This is a comment</comment>
     </data>
-                
-    There are any number of "resheader" rows that contain simple 
+
+    There are any number of "resheader" rows that contain simple
     name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
     mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
     extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
     read any of the formats listed below.
-    
+
     mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-    
+
     mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
             : and then encoded with base64 encoding.
 
     mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
+    value   : The object must be serialized into a byte array
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
@@ -126,10 +126,10 @@
   <data name="ConnectionCheck.Text" xml:space="preserve">
     <value>Verbindungscheck:</value>
   </data>
-  <data name="ConnectionSettings.Text" xml:space="preserve">
+  <data name="ConnectionSettingsSection.Text" xml:space="preserve">
     <value>Verbindungseinstellungen</value>
   </data>
-  <data name="DemoModeHeader.Text" xml:space="preserve">
+  <data name="DemoModeHeader.Header" xml:space="preserve">
     <value>Demomodus</value>
   </data>
   <data name="MessageError" xml:space="preserve">
@@ -144,7 +144,7 @@
   <data name="IgnoreSSLCertHostErrors.Text" xml:space="preserve">
     <value>Ignoriere SSL-Hostname-Fehler</value>
   </data>
-  <data name="LocalSettings.Text" xml:space="preserve">
+  <data name="LocalSettings.Header" xml:space="preserve">
     <value>Lokale Einstellungen</value>
   </data>
   <data name="LocalUrl.ToolTipService.ToolTip" xml:space="preserve">
@@ -163,7 +163,7 @@ Gehen Sie in die App-Einstellungen (Zahnrad-Icon) um die Verbindungseinstellunge
   <data name="PasswordHeader.Text" xml:space="preserve">
     <value>Passwort</value>
   </data>
-  <data name="RemoteSettings.Text" xml:space="preserve">
+  <data name="RemoteSettings.Header" xml:space="preserve">
     <value>Remote-Einstellungen</value>
   </data>
   <data name="RemoteUrl.ToolTipService.ToolTip" xml:space="preserve">
@@ -185,7 +185,7 @@ Gehen Sie in die App-Einstellungen (Zahnrad-Icon) um die Verbindungseinstellunge
     <value>Keine Sitemaps verfügbar</value>
   </data>
   <data name="AppSettings.Text" xml:space="preserve">
-    <value>App-Einstellungen</value>
+    <value>Anwendungseinstellungen</value>
   </data>
   <data name="HideDefaultSitemap.Text" xml:space="preserve">
     <value>Standard-Sitemap (_default) einblenden</value>
@@ -200,7 +200,7 @@ Gehen Sie in die App-Einstellungen (Zahnrad-Icon) um die Verbindungseinstellunge
     <value>Verbindungseinstellungen sind nicht korrekt.
 Bitte wählen Sie den Demomodus oder die Lokale-/Remote-Verbindungsinformation zu Ihrem openHAB-Server.</value>
   </data>
-  <data name="AppLanguage.Text" xml:space="preserve">
+  <data name="AppLanguage.Header" xml:space="preserve">
     <value>Anwendungssprache</value>
   </data>
   <data name="ConnectionDialog.PrimaryButtonText" xml:space="preserve">
@@ -225,7 +225,7 @@ Bitte wählen Sie den Demomodus oder die Lokale-/Remote-Verbindungsinformation z
     <value>Benutzerdefiniertes Verbindungsprofil</value>
   </data>
   <data name="LocalDefaultConnection" xml:space="preserve">
-    <value>Standard-Verbindungsprofil</value>
+    <value>Lokales-Verbindungsprofil</value>
   </data>
   <data name="RemoteCustomConnection" xml:space="preserve">
     <value>Benutzerdefiniertes Verbindungsprofil</value>
@@ -260,25 +260,22 @@ Bitte wählen Sie den Demomodus oder die Lokale-/Remote-Verbindungsinformation z
   <data name="MenuConnectionSettings.Content" xml:space="preserve">
     <value>Verbindungseinstellungen</value>
   </data>
-  <data name="ShowDefaultSitemap.Text" xml:space="preserve">
+  <data name="ShowDefaultSitemap.Description" xml:space="preserve">
     <value>Standard-Sitemaps einblenden</value>
   </data>
-  <data name="SVGIcons.Text" xml:space="preserve">
+  <data name="SVGIcons.Description" xml:space="preserve">
     <value>Verwenden von Icons mit hoher Auflösung für Sitemapkacheln</value>
   </data>
-  <data name="ClearIconCache.Text" xml:space="preserve">
-    <value>Lokalen Zwischenspeicher für Icons löschen</value>
-  </data>
   <data name="ClearIconCacheButton.Content" xml:space="preserve">
     <value>Löschen</value>
   </data>
-  <data name="AppAutostart.Text" xml:space="preserve">
+  <data name="AppAutostart.Description" xml:space="preserve">
     <value>Starte App beim Systemstart</value>
   </data>
   <data name="SitemapSetting.Text" xml:space="preserve">
     <value>Sitemap</value>
   </data>
-  <data name="StartAppMinimized.Text" xml:space="preserve">
+  <data name="StartAppMinimized.Header" xml:space="preserve">
     <value>Starte App minimiert</value>
   </data>
   <data name="NotificationTile" xml:space="preserve">
@@ -296,7 +293,7 @@ Bitte wählen Sie den Demomodus oder die Lokale-/Remote-Verbindungsinformation z
   <data name="InfoAppBarSettingsButton.Content" xml:space="preserve">
     <value>Einstellungen</value>
   </data>
-  <data name="EnableWindowsNotifications.Text" xml:space="preserve">
+  <data name="EnableWindowsNotifications.Description" xml:space="preserve">
     <value>Einschalten der Benachrichtigungen für openHAB-Events.</value>
   </data>
   <data name="NotificationSetting.Text" xml:space="preserve">
@@ -311,4 +308,55 @@ Bitte wählen Sie den Demomodus oder die Lokale-/Remote-Verbindungsinformation z
   <data name="VersionNumber.Text" xml:space="preserve">
     <value>Version:</value>
   </data>
-</root>
\ No newline at end of file
+  <data name="AppAutostart.Header" xml:space="preserve">
+    <value>Autostart</value>
+  </data>
+  <data name="ClearIconCache.Description" xml:space="preserve">
+    <value>Löschen des lokalen Icon Speichers.</value>
+  </data>
+  <data name="ClearIconCache.Header" xml:space="preserve">
+    <value>Icon Cache</value>
+  </data>
+  <data name="ConnectionSettings.Description" xml:space="preserve">
+    <value>Konfigurieration der lokalen und remote Verbindung zu openHAB Server.</value>
+  </data>
+  <data name="ConnectionSettings.Header" xml:space="preserve">
+    <value>Lokale und Remote Verbindung</value>
+  </data>
+  <data name="ConnectionSettingsButton.Content" xml:space="preserve">
+    <value>Bearbeiten</value>
+  </data>
+  <data name="DemoModeHeader.Description" xml:space="preserve">
+    <value>Verwende Beispieldaten der openHAB Demo Instanz.</value>
+  </data>
+  <data name="EnableWindowsNotifications.Header" xml:space="preserve">
+    <value>Benachrichtigungen</value>
+  </data>
+  <data name="ShowDefaultSitemap.Header" xml:space="preserve">
+    <value>Standard-Sitemaps</value>
+  </data>
+  <data name="SVGIcons.Header" xml:space="preserve">
+    <value>Hochauflösende Icons</value>
+  </data>
+  <data name="MenuItemMainUI.Content" xml:space="preserve">
+    <value>MainUI</value>
+  </data>
+  <data name="OpenLogViewerButton.Label" xml:space="preserve">
+    <value>Logs</value>
+  </data>
+  <data name="AppTheme.Header" xml:space="preserve">
+    <value>Design</value>
+  </data>
+  <data name="AppTheme.Description" xml:space="preserve">
+    <value>Choose the color for the app</value>
+  </data>
+  <data name="AppThemeSystem" xml:space="preserve">
+    <value>Benutze System Einstellung</value>
+  </data>
+  <data name="AppThemeLight" xml:space="preserve">
+    <value>Hell</value>
+  </data>
+  <data name="AppThemeDark" xml:space="preserve">
+    <value>Dunkel</value>
+  </data>
+</root>
diff --git a/src/openHAB.Core/Strings/en-us/Resources.resw b/src/openHAB.Core/Strings/en-us/Resources.resw
index 670fc53d..fda593e7 100644
--- a/src/openHAB.Core/Strings/en-us/Resources.resw
+++ b/src/openHAB.Core/Strings/en-us/Resources.resw
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!-- 
-    Microsoft ResX Schema 
-    
+  <!--
+    Microsoft ResX Schema
+
     Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
     associated with the data types.
-    
+
     Example:
-    
+
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
         <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
         <comment>This is a comment</comment>
     </data>
-                
-    There are any number of "resheader" rows that contain simple 
+
+    There are any number of "resheader" rows that contain simple
     name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
     mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
     extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
     read any of the formats listed below.
-    
+
     mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-    
+
     mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
+    value   : The object must be serialized with
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
             : and then encoded with base64 encoding.
 
     mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
+    value   : The object must be serialized into a byte array
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
@@ -126,10 +126,10 @@
   <data name="ConnectionCheck.Text" xml:space="preserve">
     <value>Connection Check:</value>
   </data>
-  <data name="ConnectionSettings.Text" xml:space="preserve">
+  <data name="ConnectionSettingsSection.Text" xml:space="preserve">
     <value>Connection Settings</value>
   </data>
-  <data name="DemoModeHeader.Text" xml:space="preserve">
+  <data name="DemoModeHeader.Header" xml:space="preserve">
     <value>Demo mode</value>
   </data>
   <data name="MessageError" xml:space="preserve">
@@ -144,11 +144,11 @@
   <data name="IgnoreSSLCertHostErrors.Text" xml:space="preserve">
     <value>Ignore SSL hostname errors</value>
   </data>
-  <data name="LocalSettings.Text" xml:space="preserve">
+  <data name="LocalSettings.Header" xml:space="preserve">
     <value>Local Settings</value>
   </data>
   <data name="LocalUrl.ToolTipService.ToolTip" xml:space="preserve">
-    <value>Local url to the OpenHab instance. Default url is http://openhab:8080</value>
+    <value>URL of the local openHAB instance. Default URL is http://openhab:8080</value>
   </data>
   <data name="LocalUrlHeader.Text" xml:space="preserve">
     <value>openHAB URL</value>
@@ -164,7 +164,7 @@ Go to app settings (gear icon) to check the connection configuration.</value>
   <data name="PasswordHeader.Text" xml:space="preserve">
     <value>Password</value>
   </data>
-  <data name="RemoteSettings.Text" xml:space="preserve">
+  <data name="RemoteSettings.Header" xml:space="preserve">
     <value>Remote Settings</value>
   </data>
   <data name="RemoteUrl.ToolTipService.ToolTip" xml:space="preserve">
@@ -186,7 +186,7 @@ Go to app settings (gear icon) to check the connection configuration.</value>
     <value>No sitemaps available</value>
   </data>
   <data name="AppSettings.Text" xml:space="preserve">
-    <value>App Settings</value>
+    <value>Application Settings</value>
   </data>
   <data name="HideDefaultSitemap.Text" xml:space="preserve">
     <value>Show default sitemap (_default)</value>
@@ -201,7 +201,7 @@ Go to app settings (gear icon) to check the connection configuration.</value>
     <value>Connection settings are invalid.
 Please select demo mode or configure local/remote connection.</value>
   </data>
-  <data name="AppLanguage.Text" xml:space="preserve">
+  <data name="AppLanguage.Header" xml:space="preserve">
     <value>App Language</value>
   </data>
   <data name="ConnectionDialog.PrimaryButtonText" xml:space="preserve">
@@ -213,15 +213,15 @@ Please select demo mode or configure local/remote connection.</value>
   <data name="ConnectionProfile.Text" xml:space="preserve">
     <value>Connection Profile</value>
   </data>
+  <data name="ConnectionNotConfigured" xml:space="preserve">
+    <value>Not configured</value>
+  </data>
   <data name="EncryptedConnection" xml:space="preserve">
     <value>Connected to</value>
   </data>
   <data name="UnencryptedConnection" xml:space="preserve">
     <value>Unsecured connected to</value>
   </data>
-  <data name="ConnectionNotConfigured" xml:space="preserve">
-    <value>Not configured</value>
-  </data>
   <data name="LocalDefaultConnection" xml:space="preserve">
     <value>Default Connection Profile</value>
   </data>
@@ -264,25 +264,25 @@ Please select demo mode or configure local/remote connection.</value>
   <data name="MenuConnectionSettings.Content" xml:space="preserve">
     <value>Connection Settings</value>
   </data>
-  <data name="ShowDefaultSitemap.Text" xml:space="preserve">
+  <data name="ShowDefaultSitemap.Description" xml:space="preserve">
     <value>Show default sitemaps</value>
   </data>
-  <data name="SVGIcons.Text" xml:space="preserve">
+  <data name="SVGIcons.Description" xml:space="preserve">
     <value>Use high resolution charts for sitemap tiles</value>
   </data>
-  <data name="ClearIconCache.Text" xml:space="preserve">
-    <value>Clear local chart cache</value>
+  <data name="ClearIconCache.Description" xml:space="preserve">
+    <value>Clear local icon cache</value>
   </data>
   <data name="ClearIconCacheButton.Content" xml:space="preserve">
     <value>Clear</value>
   </data>
-  <data name="AppAutostart.Text" xml:space="preserve">
+  <data name="AppAutostart.Description" xml:space="preserve">
     <value>Launch app when system starts</value>
   </data>
   <data name="SitemapSetting.Text" xml:space="preserve">
     <value>Sitemap</value>
   </data>
-  <data name="StartAppMinimized.Text" xml:space="preserve">
+  <data name="StartAppMinimized.Header" xml:space="preserve">
     <value>Start app minimized</value>
   </data>
   <data name="NotificationTile" xml:space="preserve">
@@ -300,7 +300,7 @@ Please select demo mode or configure local/remote connection.</value>
   <data name="InfoAppBarSettingsButton.Content" xml:space="preserve">
     <value>Settings</value>
   </data>
-  <data name="EnableWindowsNotifications.Text" xml:space="preserve">
+  <data name="EnableWindowsNotifications.Description" xml:space="preserve">
     <value>Enable notifications for openHAB events.</value>
   </data>
   <data name="NotificationSetting.Text" xml:space="preserve">
@@ -315,4 +315,55 @@ Please select demo mode or configure local/remote connection.</value>
   <data name="VersionNumber.Text" xml:space="preserve">
     <value>Version:</value>
   </data>
-</root>
\ No newline at end of file
+  <data name="AppAutostart.Header" xml:space="preserve">
+    <value>Autostart</value>
+  </data>
+  <data name="AppLanguage.Description" xml:space="preserve">
+    <value>Set the default app language.</value>
+  </data>
+  <data name="ClearIconCache.Header" xml:space="preserve">
+    <value>Icon Cache</value>
+  </data>
+  <data name="ConnectionSettings.Description" xml:space="preserve">
+    <value>Configuration of the local and remote connection to openHAB server.</value>
+  </data>
+  <data name="ConnectionSettings.Header" xml:space="preserve">
+    <value>Local and remote connection</value>
+  </data>
+  <data name="ConnectionSettingsButton.Content" xml:space="preserve">
+    <value>Edit</value>
+  </data>
+  <data name="DemoModeHeader.Description" xml:space="preserve">
+    <value>Use app with data from openHAB demo instance.</value>
+  </data>
+  <data name="EnableWindowsNotifications.Header" xml:space="preserve">
+    <value>Notifications</value>
+  </data>
+  <data name="ShowDefaultSitemap.Header" xml:space="preserve">
+    <value>Default sitemaps</value>
+  </data>
+  <data name="SVGIcons.Header" xml:space="preserve">
+    <value>High resolution icons</value>
+  </data>
+  <data name="MenuItemMainUI.Content" xml:space="preserve">
+    <value>MainUI</value>
+  </data>
+  <data name="OpenLogViewerButton.Label" xml:space="preserve">
+    <value>Logs</value>
+  </data>
+  <data name="AppTheme.Header" xml:space="preserve">
+    <value>Theme</value>
+  </data>
+  <data name="AppTheme.Description" xml:space="preserve">
+    <value>Choose the color theme for the app.</value>
+  </data>
+  <data name="AppThemeSystem" xml:space="preserve">
+    <value>Use system setting</value>
+  </data>
+  <data name="AppThemeLight" xml:space="preserve">
+    <value>Light</value>
+  </data>
+  <data name="AppThemeDark" xml:space="preserve">
+    <value>Dark</value>
+  </data>
+</root>
diff --git a/src/openHAB.Windows.Package.Beta/Package.StoreAssociation.xml b/src/openHAB.Windows.Package.Beta/Package.StoreAssociation.xml
new file mode 100644
index 00000000..1ce66cdf
--- /dev/null
+++ b/src/openHAB.Windows.Package.Beta/Package.StoreAssociation.xml
@@ -0,0 +1,368 @@
+<?xml version="1.0" encoding="utf-8"?>
+<StoreAssociation xmlns="http://schemas.microsoft.com/appx/2010/storeassociation">
+  <Publisher>CN=8A77D062-E996-4F32-9CC6-50568ABAFF8F</Publisher>
+  <PublisherDisplayName>openHAB Foundation e.V.</PublisherDisplayName>
+  <GeneratePackageHash>http://www.w3.org/2001/04/xmlenc#sha256</GeneratePackageHash>
+  <SupportedLocales>
+    <Language Code="af" InMinimumRequirementSet="true" />
+    <Language Code="af-za" InMinimumRequirementSet="true" />
+    <Language Code="am" InMinimumRequirementSet="true" />
+    <Language Code="am-et" InMinimumRequirementSet="true" />
+    <Language Code="ar" InMinimumRequirementSet="true" />
+    <Language Code="ar-ae" InMinimumRequirementSet="true" />
+    <Language Code="ar-bh" InMinimumRequirementSet="true" />
+    <Language Code="ar-dz" InMinimumRequirementSet="true" />
+    <Language Code="ar-eg" InMinimumRequirementSet="true" />
+    <Language Code="ar-iq" InMinimumRequirementSet="true" />
+    <Language Code="ar-jo" InMinimumRequirementSet="true" />
+    <Language Code="ar-kw" InMinimumRequirementSet="true" />
+    <Language Code="ar-lb" InMinimumRequirementSet="true" />
+    <Language Code="ar-ly" InMinimumRequirementSet="true" />
+    <Language Code="ar-ma" InMinimumRequirementSet="true" />
+    <Language Code="ar-om" InMinimumRequirementSet="true" />
+    <Language Code="ar-qa" InMinimumRequirementSet="true" />
+    <Language Code="ar-sa" InMinimumRequirementSet="true" />
+    <Language Code="ar-sy" InMinimumRequirementSet="true" />
+    <Language Code="ar-tn" InMinimumRequirementSet="true" />
+    <Language Code="ar-ye" InMinimumRequirementSet="true" />
+    <Language Code="as" InMinimumRequirementSet="true" />
+    <Language Code="as-in" InMinimumRequirementSet="true" />
+    <Language Code="az" InMinimumRequirementSet="true" />
+    <Language Code="az-arab" InMinimumRequirementSet="true" />
+    <Language Code="az-arab-az" InMinimumRequirementSet="true" />
+    <Language Code="az-cyrl" InMinimumRequirementSet="true" />
+    <Language Code="az-cyrl-az" InMinimumRequirementSet="true" />
+    <Language Code="az-latn" InMinimumRequirementSet="true" />
+    <Language Code="az-latn-az" InMinimumRequirementSet="true" />
+    <Language Code="be" InMinimumRequirementSet="true" />
+    <Language Code="be-by" InMinimumRequirementSet="true" />
+    <Language Code="bg" InMinimumRequirementSet="true" />
+    <Language Code="bg-bg" InMinimumRequirementSet="true" />
+    <Language Code="bn" InMinimumRequirementSet="true" />
+    <Language Code="bn-bd" InMinimumRequirementSet="true" />
+    <Language Code="bn-in" InMinimumRequirementSet="true" />
+    <Language Code="bs" InMinimumRequirementSet="true" />
+    <Language Code="bs-cyrl" InMinimumRequirementSet="true" />
+    <Language Code="bs-cyrl-ba" InMinimumRequirementSet="true" />
+    <Language Code="bs-latn" InMinimumRequirementSet="true" />
+    <Language Code="bs-latn-ba" InMinimumRequirementSet="true" />
+    <Language Code="ca" InMinimumRequirementSet="true" />
+    <Language Code="ca-es" InMinimumRequirementSet="true" />
+    <Language Code="ca-es-valencia" InMinimumRequirementSet="true" />
+    <Language Code="chr-cher" InMinimumRequirementSet="true" />
+    <Language Code="chr-cher-us" InMinimumRequirementSet="true" />
+    <Language Code="chr-latn" InMinimumRequirementSet="true" />
+    <Language Code="cs" InMinimumRequirementSet="true" />
+    <Language Code="cs-cz" InMinimumRequirementSet="true" />
+    <Language Code="cy" InMinimumRequirementSet="true" />
+    <Language Code="cy-gb" InMinimumRequirementSet="true" />
+    <Language Code="da" InMinimumRequirementSet="true" />
+    <Language Code="da-dk" InMinimumRequirementSet="true" />
+    <Language Code="de" InMinimumRequirementSet="true" />
+    <Language Code="de-at" InMinimumRequirementSet="true" />
+    <Language Code="de-ch" InMinimumRequirementSet="true" />
+    <Language Code="de-de" InMinimumRequirementSet="true" />
+    <Language Code="de-li" InMinimumRequirementSet="true" />
+    <Language Code="de-lu" InMinimumRequirementSet="true" />
+    <Language Code="el" InMinimumRequirementSet="true" />
+    <Language Code="el-gr" InMinimumRequirementSet="true" />
+    <Language Code="en" InMinimumRequirementSet="true" />
+    <Language Code="en-011" InMinimumRequirementSet="true" />
+    <Language Code="en-014" InMinimumRequirementSet="true" />
+    <Language Code="en-018" InMinimumRequirementSet="true" />
+    <Language Code="en-021" InMinimumRequirementSet="true" />
+    <Language Code="en-029" InMinimumRequirementSet="true" />
+    <Language Code="en-053" InMinimumRequirementSet="true" />
+    <Language Code="en-au" InMinimumRequirementSet="true" />
+    <Language Code="en-bz" InMinimumRequirementSet="true" />
+    <Language Code="en-ca" InMinimumRequirementSet="true" />
+    <Language Code="en-gb" InMinimumRequirementSet="true" />
+    <Language Code="en-hk" InMinimumRequirementSet="true" />
+    <Language Code="en-id" InMinimumRequirementSet="true" />
+    <Language Code="en-ie" InMinimumRequirementSet="true" />
+    <Language Code="en-in" InMinimumRequirementSet="true" />
+    <Language Code="en-jm" InMinimumRequirementSet="true" />
+    <Language Code="en-kz" InMinimumRequirementSet="true" />
+    <Language Code="en-mt" InMinimumRequirementSet="true" />
+    <Language Code="en-my" InMinimumRequirementSet="true" />
+    <Language Code="en-nz" InMinimumRequirementSet="true" />
+    <Language Code="en-ph" InMinimumRequirementSet="true" />
+    <Language Code="en-pk" InMinimumRequirementSet="true" />
+    <Language Code="en-sg" InMinimumRequirementSet="true" />
+    <Language Code="en-tt" InMinimumRequirementSet="true" />
+    <Language Code="en-us" InMinimumRequirementSet="true" />
+    <Language Code="en-vn" InMinimumRequirementSet="true" />
+    <Language Code="en-za" InMinimumRequirementSet="true" />
+    <Language Code="en-zw" InMinimumRequirementSet="true" />
+    <Language Code="es" InMinimumRequirementSet="true" />
+    <Language Code="es-019" InMinimumRequirementSet="true" />
+    <Language Code="es-419" InMinimumRequirementSet="true" />
+    <Language Code="es-ar" InMinimumRequirementSet="true" />
+    <Language Code="es-bo" InMinimumRequirementSet="true" />
+    <Language Code="es-cl" InMinimumRequirementSet="true" />
+    <Language Code="es-co" InMinimumRequirementSet="true" />
+    <Language Code="es-cr" InMinimumRequirementSet="true" />
+    <Language Code="es-do" InMinimumRequirementSet="true" />
+    <Language Code="es-ec" InMinimumRequirementSet="true" />
+    <Language Code="es-es" InMinimumRequirementSet="true" />
+    <Language Code="es-gt" InMinimumRequirementSet="true" />
+    <Language Code="es-hn" InMinimumRequirementSet="true" />
+    <Language Code="es-mx" InMinimumRequirementSet="true" />
+    <Language Code="es-ni" InMinimumRequirementSet="true" />
+    <Language Code="es-pa" InMinimumRequirementSet="true" />
+    <Language Code="es-pe" InMinimumRequirementSet="true" />
+    <Language Code="es-pr" InMinimumRequirementSet="true" />
+    <Language Code="es-py" InMinimumRequirementSet="true" />
+    <Language Code="es-sv" InMinimumRequirementSet="true" />
+    <Language Code="es-us" InMinimumRequirementSet="true" />
+    <Language Code="es-uy" InMinimumRequirementSet="true" />
+    <Language Code="es-ve" InMinimumRequirementSet="true" />
+    <Language Code="et" InMinimumRequirementSet="true" />
+    <Language Code="et-ee" InMinimumRequirementSet="true" />
+    <Language Code="eu" InMinimumRequirementSet="true" />
+    <Language Code="eu-es" InMinimumRequirementSet="true" />
+    <Language Code="fa" InMinimumRequirementSet="true" />
+    <Language Code="fa-ir" InMinimumRequirementSet="true" />
+    <Language Code="fi" InMinimumRequirementSet="true" />
+    <Language Code="fi-fi" InMinimumRequirementSet="true" />
+    <Language Code="fil" InMinimumRequirementSet="true" />
+    <Language Code="fil-latn" InMinimumRequirementSet="true" />
+    <Language Code="fil-ph" InMinimumRequirementSet="true" />
+    <Language Code="fr" InMinimumRequirementSet="true" />
+    <Language Code="fr-011" InMinimumRequirementSet="true" />
+    <Language Code="fr-015" InMinimumRequirementSet="true" />
+    <Language Code="fr-021" InMinimumRequirementSet="true" />
+    <Language Code="fr-029" InMinimumRequirementSet="true" />
+    <Language Code="fr-155" InMinimumRequirementSet="true" />
+    <Language Code="fr-be" InMinimumRequirementSet="true" />
+    <Language Code="fr-ca" InMinimumRequirementSet="true" />
+    <Language Code="fr-cd" InMinimumRequirementSet="true" />
+    <Language Code="fr-ch" InMinimumRequirementSet="true" />
+    <Language Code="fr-ci" InMinimumRequirementSet="true" />
+    <Language Code="fr-cm" InMinimumRequirementSet="true" />
+    <Language Code="fr-fr" InMinimumRequirementSet="true" />
+    <Language Code="fr-ht" InMinimumRequirementSet="true" />
+    <Language Code="fr-lu" InMinimumRequirementSet="true" />
+    <Language Code="fr-ma" InMinimumRequirementSet="true" />
+    <Language Code="fr-mc" InMinimumRequirementSet="true" />
+    <Language Code="fr-ml" InMinimumRequirementSet="true" />
+    <Language Code="fr-re" InMinimumRequirementSet="true" />
+    <Language Code="frc-latn" InMinimumRequirementSet="true" />
+    <Language Code="frp-latn" InMinimumRequirementSet="true" />
+    <Language Code="ga" InMinimumRequirementSet="true" />
+    <Language Code="ga-ie" InMinimumRequirementSet="true" />
+    <Language Code="gd-gb" InMinimumRequirementSet="true" />
+    <Language Code="gd-latn" InMinimumRequirementSet="true" />
+    <Language Code="gl" InMinimumRequirementSet="true" />
+    <Language Code="gl-es" InMinimumRequirementSet="true" />
+    <Language Code="gu" InMinimumRequirementSet="true" />
+    <Language Code="gu-in" InMinimumRequirementSet="true" />
+    <Language Code="ha" InMinimumRequirementSet="true" />
+    <Language Code="ha-latn" InMinimumRequirementSet="true" />
+    <Language Code="ha-latn-ng" InMinimumRequirementSet="true" />
+    <Language Code="he" InMinimumRequirementSet="true" />
+    <Language Code="he-il" InMinimumRequirementSet="true" />
+    <Language Code="hi" InMinimumRequirementSet="true" />
+    <Language Code="hi-in" InMinimumRequirementSet="true" />
+    <Language Code="hr" InMinimumRequirementSet="true" />
+    <Language Code="hr-ba" InMinimumRequirementSet="true" />
+    <Language Code="hr-hr" InMinimumRequirementSet="true" />
+    <Language Code="hu" InMinimumRequirementSet="true" />
+    <Language Code="hu-hu" InMinimumRequirementSet="true" />
+    <Language Code="hy" InMinimumRequirementSet="true" />
+    <Language Code="hy-am" InMinimumRequirementSet="true" />
+    <Language Code="id" InMinimumRequirementSet="true" />
+    <Language Code="id-id" InMinimumRequirementSet="true" />
+    <Language Code="ig-latn" InMinimumRequirementSet="true" />
+    <Language Code="ig-ng" InMinimumRequirementSet="true" />
+    <Language Code="is" InMinimumRequirementSet="true" />
+    <Language Code="is-is" InMinimumRequirementSet="true" />
+    <Language Code="it" InMinimumRequirementSet="true" />
+    <Language Code="it-ch" InMinimumRequirementSet="true" />
+    <Language Code="it-it" InMinimumRequirementSet="true" />
+    <Language Code="iu-cans" InMinimumRequirementSet="true" />
+    <Language Code="iu-latn" InMinimumRequirementSet="true" />
+    <Language Code="iu-latn-ca" InMinimumRequirementSet="true" />
+    <Language Code="ja" InMinimumRequirementSet="true" />
+    <Language Code="ja-jp" InMinimumRequirementSet="true" />
+    <Language Code="ka" InMinimumRequirementSet="true" />
+    <Language Code="ka-ge" InMinimumRequirementSet="true" />
+    <Language Code="kk" InMinimumRequirementSet="true" />
+    <Language Code="kk-kz" InMinimumRequirementSet="true" />
+    <Language Code="km" InMinimumRequirementSet="true" />
+    <Language Code="km-kh" InMinimumRequirementSet="true" />
+    <Language Code="kn" InMinimumRequirementSet="true" />
+    <Language Code="kn-in" InMinimumRequirementSet="true" />
+    <Language Code="ko" InMinimumRequirementSet="true" />
+    <Language Code="ko-kr" InMinimumRequirementSet="true" />
+    <Language Code="kok" InMinimumRequirementSet="true" />
+    <Language Code="kok-in" InMinimumRequirementSet="true" />
+    <Language Code="ku-arab" InMinimumRequirementSet="true" />
+    <Language Code="ku-arab-iq" InMinimumRequirementSet="true" />
+    <Language Code="ky-cyrl" InMinimumRequirementSet="true" />
+    <Language Code="ky-kg" InMinimumRequirementSet="true" />
+    <Language Code="lb" InMinimumRequirementSet="true" />
+    <Language Code="lb-lu" InMinimumRequirementSet="true" />
+    <Language Code="lo" InMinimumRequirementSet="true" />
+    <Language Code="lo-la" InMinimumRequirementSet="true" />
+    <Language Code="lt" InMinimumRequirementSet="true" />
+    <Language Code="lt-lt" InMinimumRequirementSet="true" />
+    <Language Code="lv" InMinimumRequirementSet="true" />
+    <Language Code="lv-lv" InMinimumRequirementSet="true" />
+    <Language Code="mi" InMinimumRequirementSet="true" />
+    <Language Code="mi-latn" InMinimumRequirementSet="true" />
+    <Language Code="mi-nz" InMinimumRequirementSet="true" />
+    <Language Code="mk" InMinimumRequirementSet="true" />
+    <Language Code="mk-mk" InMinimumRequirementSet="true" />
+    <Language Code="ml" InMinimumRequirementSet="true" />
+    <Language Code="ml-in" InMinimumRequirementSet="true" />
+    <Language Code="mn-cyrl" InMinimumRequirementSet="true" />
+    <Language Code="mn-mn" InMinimumRequirementSet="true" />
+    <Language Code="mn-mong" InMinimumRequirementSet="true" />
+    <Language Code="mn-phag" InMinimumRequirementSet="true" />
+    <Language Code="mr" InMinimumRequirementSet="true" />
+    <Language Code="mr-in" InMinimumRequirementSet="true" />
+    <Language Code="ms" InMinimumRequirementSet="true" />
+    <Language Code="ms-bn" InMinimumRequirementSet="true" />
+    <Language Code="ms-my" InMinimumRequirementSet="true" />
+    <Language Code="mt" InMinimumRequirementSet="true" />
+    <Language Code="mt-mt" InMinimumRequirementSet="true" />
+    <Language Code="nb" InMinimumRequirementSet="true" />
+    <Language Code="nb-no" InMinimumRequirementSet="true" />
+    <Language Code="ne" InMinimumRequirementSet="true" />
+    <Language Code="ne-np" InMinimumRequirementSet="true" />
+    <Language Code="nl" InMinimumRequirementSet="true" />
+    <Language Code="nl-be" InMinimumRequirementSet="true" />
+    <Language Code="nl-nl" InMinimumRequirementSet="true" />
+    <Language Code="nn" InMinimumRequirementSet="true" />
+    <Language Code="nn-no" InMinimumRequirementSet="true" />
+    <Language Code="no" InMinimumRequirementSet="true" />
+    <Language Code="no-no" InMinimumRequirementSet="true" />
+    <Language Code="nso" InMinimumRequirementSet="true" />
+    <Language Code="nso-za" InMinimumRequirementSet="true" />
+    <Language Code="or" InMinimumRequirementSet="true" />
+    <Language Code="or-in" InMinimumRequirementSet="true" />
+    <Language Code="pa" InMinimumRequirementSet="true" />
+    <Language Code="pa-arab" InMinimumRequirementSet="true" />
+    <Language Code="pa-arab-pk" InMinimumRequirementSet="true" />
+    <Language Code="pa-deva" InMinimumRequirementSet="true" />
+    <Language Code="pa-in" InMinimumRequirementSet="true" />
+    <Language Code="pl" InMinimumRequirementSet="true" />
+    <Language Code="pl-pl" InMinimumRequirementSet="true" />
+    <Language Code="prs" InMinimumRequirementSet="true" />
+    <Language Code="prs-af" InMinimumRequirementSet="true" />
+    <Language Code="prs-arab" InMinimumRequirementSet="true" />
+    <Language Code="pt" InMinimumRequirementSet="true" />
+    <Language Code="pt-br" InMinimumRequirementSet="true" />
+    <Language Code="pt-pt" InMinimumRequirementSet="true" />
+    <Language Code="quc-latn" InMinimumRequirementSet="true" />
+    <Language Code="qut-gt" InMinimumRequirementSet="true" />
+    <Language Code="qut-latn" InMinimumRequirementSet="true" />
+    <Language Code="quz" InMinimumRequirementSet="true" />
+    <Language Code="quz-bo" InMinimumRequirementSet="true" />
+    <Language Code="quz-ec" InMinimumRequirementSet="true" />
+    <Language Code="quz-pe" InMinimumRequirementSet="true" />
+    <Language Code="ro" InMinimumRequirementSet="true" />
+    <Language Code="ro-ro" InMinimumRequirementSet="true" />
+    <Language Code="ru" InMinimumRequirementSet="true" />
+    <Language Code="ru-ru" InMinimumRequirementSet="true" />
+    <Language Code="rw" InMinimumRequirementSet="true" />
+    <Language Code="rw-rw" InMinimumRequirementSet="true" />
+    <Language Code="sd-arab" InMinimumRequirementSet="true" />
+    <Language Code="sd-arab-pk" InMinimumRequirementSet="true" />
+    <Language Code="sd-deva" InMinimumRequirementSet="true" />
+    <Language Code="si" InMinimumRequirementSet="true" />
+    <Language Code="si-lk" InMinimumRequirementSet="true" />
+    <Language Code="sk" InMinimumRequirementSet="true" />
+    <Language Code="sk-sk" InMinimumRequirementSet="true" />
+    <Language Code="sl" InMinimumRequirementSet="true" />
+    <Language Code="sl-si" InMinimumRequirementSet="true" />
+    <Language Code="sq" InMinimumRequirementSet="true" />
+    <Language Code="sq-al" InMinimumRequirementSet="true" />
+    <Language Code="sr" InMinimumRequirementSet="true" />
+    <Language Code="sr-cyrl" InMinimumRequirementSet="true" />
+    <Language Code="sr-cyrl-ba" InMinimumRequirementSet="true" />
+    <Language Code="sr-cyrl-cs" InMinimumRequirementSet="true" />
+    <Language Code="sr-cyrl-me" InMinimumRequirementSet="true" />
+    <Language Code="sr-cyrl-rs" InMinimumRequirementSet="true" />
+    <Language Code="sr-latn" InMinimumRequirementSet="true" />
+    <Language Code="sr-latn-ba" InMinimumRequirementSet="true" />
+    <Language Code="sr-latn-cs" InMinimumRequirementSet="true" />
+    <Language Code="sr-latn-me" InMinimumRequirementSet="true" />
+    <Language Code="sr-latn-rs" InMinimumRequirementSet="true" />
+    <Language Code="sv" InMinimumRequirementSet="true" />
+    <Language Code="sv-fi" InMinimumRequirementSet="true" />
+    <Language Code="sv-se" InMinimumRequirementSet="true" />
+    <Language Code="sw" InMinimumRequirementSet="true" />
+    <Language Code="sw-ke" InMinimumRequirementSet="true" />
+    <Language Code="ta" InMinimumRequirementSet="true" />
+    <Language Code="ta-in" InMinimumRequirementSet="true" />
+    <Language Code="te" InMinimumRequirementSet="true" />
+    <Language Code="te-in" InMinimumRequirementSet="true" />
+    <Language Code="tg-arab" InMinimumRequirementSet="true" />
+    <Language Code="tg-cyrl" InMinimumRequirementSet="true" />
+    <Language Code="tg-cyrl-tj" InMinimumRequirementSet="true" />
+    <Language Code="tg-latn" InMinimumRequirementSet="true" />
+    <Language Code="th" InMinimumRequirementSet="true" />
+    <Language Code="th-th" InMinimumRequirementSet="true" />
+    <Language Code="ti" InMinimumRequirementSet="true" />
+    <Language Code="ti-et" InMinimumRequirementSet="true" />
+    <Language Code="tk-cyrl" InMinimumRequirementSet="true" />
+    <Language Code="tk-cyrl-tr" InMinimumRequirementSet="true" />
+    <Language Code="tk-latn" InMinimumRequirementSet="true" />
+    <Language Code="tk-latn-tr" InMinimumRequirementSet="true" />
+    <Language Code="tk-tm" InMinimumRequirementSet="true" />
+    <Language Code="tn" InMinimumRequirementSet="true" />
+    <Language Code="tn-bw" InMinimumRequirementSet="true" />
+    <Language Code="tn-za" InMinimumRequirementSet="true" />
+    <Language Code="tr" InMinimumRequirementSet="true" />
+    <Language Code="tr-tr" InMinimumRequirementSet="true" />
+    <Language Code="tt-arab" InMinimumRequirementSet="true" />
+    <Language Code="tt-cyrl" InMinimumRequirementSet="true" />
+    <Language Code="tt-latn" InMinimumRequirementSet="true" />
+    <Language Code="tt-ru" InMinimumRequirementSet="true" />
+    <Language Code="ug-arab" InMinimumRequirementSet="true" />
+    <Language Code="ug-cn" InMinimumRequirementSet="true" />
+    <Language Code="ug-cyrl" InMinimumRequirementSet="true" />
+    <Language Code="ug-latn" InMinimumRequirementSet="true" />
+    <Language Code="uk" InMinimumRequirementSet="true" />
+    <Language Code="uk-ua" InMinimumRequirementSet="true" />
+    <Language Code="ur" InMinimumRequirementSet="true" />
+    <Language Code="ur-pk" InMinimumRequirementSet="true" />
+    <Language Code="uz" InMinimumRequirementSet="true" />
+    <Language Code="uz-cyrl" InMinimumRequirementSet="true" />
+    <Language Code="uz-latn" InMinimumRequirementSet="true" />
+    <Language Code="uz-latn-uz" InMinimumRequirementSet="true" />
+    <Language Code="vi" InMinimumRequirementSet="true" />
+    <Language Code="vi-vn" InMinimumRequirementSet="true" />
+    <Language Code="wo" InMinimumRequirementSet="true" />
+    <Language Code="wo-sn" InMinimumRequirementSet="true" />
+    <Language Code="xh" InMinimumRequirementSet="true" />
+    <Language Code="xh-za" InMinimumRequirementSet="true" />
+    <Language Code="yo-latn" InMinimumRequirementSet="true" />
+    <Language Code="yo-ng" InMinimumRequirementSet="true" />
+    <Language Code="zh" InMinimumRequirementSet="true" />
+    <Language Code="zh-cn" InMinimumRequirementSet="true" />
+    <Language Code="zh-hans" InMinimumRequirementSet="true" />
+    <Language Code="zh-hans-cn" InMinimumRequirementSet="true" />
+    <Language Code="zh-hans-sg" InMinimumRequirementSet="true" />
+    <Language Code="zh-hant" InMinimumRequirementSet="true" />
+    <Language Code="zh-hant-hk" InMinimumRequirementSet="true" />
+    <Language Code="zh-hant-mo" InMinimumRequirementSet="true" />
+    <Language Code="zh-hant-tw" InMinimumRequirementSet="true" />
+    <Language Code="zh-hk" InMinimumRequirementSet="true" />
+    <Language Code="zh-mo" InMinimumRequirementSet="true" />
+    <Language Code="zh-sg" InMinimumRequirementSet="true" />
+    <Language Code="zh-tw" InMinimumRequirementSet="true" />
+    <Language Code="zu" InMinimumRequirementSet="true" />
+    <Language Code="zu-za" InMinimumRequirementSet="true" />
+  </SupportedLocales>
+  <ProductReservedInfo>
+    <MainPackageIdentityName>openHABFoundatione.V.openHABBeta</MainPackageIdentityName>
+    <ReservedNames>
+      <ReservedName>openHAB Beta</ReservedName>
+    </ReservedNames>
+  </ProductReservedInfo>
+  <AccountPackageIdentityNames />
+  <PackageInfoList LandingUrl="https://developer.microsoft.com/dashboard/Application?appId=9N140MD0NJ6T" />
+</StoreAssociation>
diff --git a/src/openHAB.Windows.Package.Beta/Package.appxmanifest b/src/openHAB.Windows.Package.Beta/Package.appxmanifest
new file mode 100644
index 00000000..82ca6adb
--- /dev/null
+++ b/src/openHAB.Windows.Package.Beta/Package.appxmanifest
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<Package
+  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
+  xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
+  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+  xmlns:uap5="http://schemas.microsoft.com/appx/manifest/uap/windows10/5"
+  xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
+  xmlns:com="http://schemas.microsoft.com/appx/manifest/com/windows10"
+  xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10"
+  IgnorableNamespaces="uap rescap com desktop">
+	<Identity
+		Name="openHABFoundatione.V.openHABBeta"
+		Publisher="CN=8A77D062-E996-4F32-9CC6-50568ABAFF8F"
+		Version="2025.1.6.0" />
+
+	<Properties>
+		<DisplayName>openHAB Beta</DisplayName>
+		<PublisherDisplayName>openHAB Foundation e.V.</PublisherDisplayName>
+		<Logo>Images\StoreLogo.png</Logo>
+	</Properties>
+
+	<Dependencies>
+		<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
+		<TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
+	</Dependencies>
+
+	<Resources>
+		<Resource Language="x-generate"/>
+	</Resources>
+
+	<Applications>
+		<Application Id="App"
+		  Executable="$targetnametoken$.exe"
+		  EntryPoint="$targetentrypoint$">
+			<uap:VisualElements
+			  DisplayName="ms-resource:AppDisplayName"
+			  Description="OpenHAB.Windows"
+			  BackgroundColor="transparent"
+			  Square150x150Logo="Images\Square150x150Logo.png"
+			  Square44x44Logo="Images\Square44x44Logo.png">
+				<uap:DefaultTile Wide310x150Logo="Images\Wide310x150Logo.png"  ShortName="openHAB Beta" Square71x71Logo="Images\Square71x71Logo.png" Square310x310Logo="Images\Square310x310Logo.png">
+					<uap:ShowNameOnTiles>
+						<uap:ShowOn Tile="square150x150Logo"/>
+						<uap:ShowOn Tile="wide310x150Logo"/>
+						<uap:ShowOn Tile="square310x310Logo"/>
+					</uap:ShowNameOnTiles>
+				</uap:DefaultTile >
+				<uap:SplashScreen Image="Images\SplashScreen.png"  BackgroundColor="#FFFFFF"/>
+			</uap:VisualElements>
+			<Extensions>
+				<uap5:Extension Category="windows.startupTask">
+					<uap5:StartupTask TaskId="openHABStartupId" Enabled="false" DisplayName="openHAB Beta" />
+				</uap5:Extension>
+
+				<desktop:Extension Category="windows.toastNotificationActivation">
+					<desktop:ToastNotificationActivation ToastActivatorCLSID="5EDF1378-0453-439A-9D48-71C645088153" />
+				</desktop:Extension>
+
+				<!--Register COM CLSID LocalServer32 registry key-->
+				<com:Extension Category="windows.comServer">
+					<com:ComServer>
+						<com:ExeServer Executable="openHAB.Windows\openHAB.Windows.exe" Arguments="-ToastActivated" DisplayName="Toast activator">
+							<com:Class Id="5EDF1378-0453-439A-9D48-71C645088153" DisplayName="Toast activator"/>
+						</com:ExeServer>
+					</com:ComServer>
+				</com:Extension>
+
+			</Extensions>
+		</Application>
+	</Applications>
+
+	<Capabilities>
+		<Capability Name="internetClient" />
+		<rescap:Capability Name="runFullTrust" />
+		<Capability Name="privateNetworkClientServer"/>
+	</Capabilities>
+</Package>
diff --git a/src/openHAB.Windows.Package.Beta/Properties/Resources.resw b/src/openHAB.Windows.Package.Beta/Properties/Resources.resw
new file mode 100644
index 00000000..78771dac
--- /dev/null
+++ b/src/openHAB.Windows.Package.Beta/Properties/Resources.resw
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+		<xsd:element name="root" msdata:IsDataSet="true">
+			<xsd:complexType>
+				<xsd:choice maxOccurs="unbounded">
+					<xsd:element name="data">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+							<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+							<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+						</xsd:complexType>
+					</xsd:element>
+					<xsd:element name="resheader">
+						<xsd:complexType>
+							<xsd:sequence>
+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+							</xsd:sequence>
+							<xsd:attribute name="name" type="xsd:string" use="required" />
+						</xsd:complexType>
+					</xsd:element>
+				</xsd:choice>
+			</xsd:complexType>
+		</xsd:element>
+	</xsd:schema>
+	<resheader name="resmimetype">
+		<value>text/microsoft-resx</value>
+	</resheader>
+	<resheader name="version">
+		<value>1.3</value>
+	</resheader>
+	<resheader name="reader">
+		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+	<resheader name="writer">
+		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.3500.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+	</resheader>
+  <data name="AppDisplayName" xml:space="preserve">
+    <value>openHAB Beta</value>
+  </data>
+</root>
diff --git a/src/openHAB.Windows.Package.Beta/openHAB.Windows.Package.Beta.wapproj b/src/openHAB.Windows.Package.Beta/openHAB.Windows.Package.Beta.wapproj
new file mode 100644
index 00000000..9a187a12
--- /dev/null
+++ b/src/openHAB.Windows.Package.Beta/openHAB.Windows.Package.Beta.wapproj
@@ -0,0 +1,254 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '15.0'">
+    <VisualStudioVersion>15.0</VisualStudioVersion>
+  </PropertyGroup>
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x86">
+      <Configuration>Debug</Configuration>
+      <Platform>x86</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x86">
+      <Configuration>Release</Configuration>
+      <Platform>x86</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM">
+      <Configuration>Release</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|ARM64">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM64">
+      <Configuration>Release</Configuration>
+      <Platform>ARM64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|AnyCPU">
+      <Configuration>Debug</Configuration>
+      <Platform>AnyCPU</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|AnyCPU">
+      <Configuration>Release</Configuration>
+      <Platform>AnyCPU</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup>
+    <WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
+  </PropertyGroup>
+  <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
+  <PropertyGroup>
+    <ProjectGuid>dc801784-7226-423e-ab0d-c34dfc8ab938</ProjectGuid>
+    <TargetPlatformVersion>10.0.26100.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.20348.0</TargetPlatformMinVersion>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
+    <NoWarn>$(NoWarn);NU1702</NoWarn>
+    <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
+    <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
+    <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
+    <GenerateTestArtifacts>True</GenerateTestArtifacts>
+    <AppxBundlePlatforms>x86|x64|arm64</AppxBundlePlatforms>
+    <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
+    <EntryPointProjectUniqueName>..\openHAB.Windows\openHAB.Windows.csproj</EntryPointProjectUniqueName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <ItemGroup>
+    <AppxManifest Include="Package.appxmanifest">
+      <SubType>Designer</SubType>
+    </AppxManifest>
+  </ItemGroup>
+  <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.241114003" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Images\" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="..\openHAB.Windows.Package\Images\SplashScreen.scale-100.png">
+      <Link>Images\SplashScreen.scale-100.png</Link>
+    </Content>
+    <Content Include="..\openHAB.Windows.Package\Images\SplashScreen.scale-125.png">
+      <Link>Images\SplashScreen.scale-125.png</Link>
+    </Content>
+    <Content Include="..\openHAB.Windows.Package\Images\SplashScreen.scale-150.png">
+      <Link>Images\SplashScreen.scale-150.png</Link>
+    </Content>
+    <Content Include="..\openHAB.Windows.Package\Images\SplashScreen.scale-200.png">
+      <Link>Images\SplashScreen.scale-200.png</Link>
+    </Content>
+    <Content Include="..\openHAB.Windows.Package\Images\SplashScreen.scale-400.png">
+      <Link>Images\SplashScreen.scale-400.png</Link>
+    </Content>
+    <Content Include="..\openHAB.Windows.Package\Images\Square150x150Logo.scale-100.png">
+      <Link>Images\Square150x150Logo.scale-100.png</Link>
+    </Content>
+    <Content Include="..\openHAB.Windows.Package\Images\Square150x150Logo.scale-125.png">
+      <Link>Images\Square150x150Logo.scale-125.png</Link>
+    </Content>
+    <Content Include="..\openHAB.Windows.Package\Images\Square150x150Logo.scale-150.png">
+      <Link>Images\Square150x150Logo.scale-150.png</Link>
+    </Content>
+    <Content Include="..\openHAB.Windows.Package\Images\Square150x150Logo.scale-200.png">
+      <Link>Images\Square150x150Logo.scale-200.png</Link>
+    </Content>
+    <Content Include="..\openHAB.Windows.Package\Images\Square150x150Logo.scale-400.png">
+      <Link>Images\Square150x150Logo.scale-400.png</Link>
+    </Content>
+    <Content Include="..\openHAB.Windows.Package\Images\Square310x310Logo.scale-100.png">
+      <Link>Images\Square310x310Logo.scale-100.png</Link>
+    </Content>
+    <Content Include="..\openHAB.Windows.Package\Images\Square310x310Logo.scale-125.png">
+      <Link>Images\Square310x310Logo.scale-125.png</Link>
+    </Content>
+    <Content Include="..\openHAB.Windows.Package\Images\Square310x310Logo.scale-150.png">
+      <Link>Images\Square310x310Logo.scale-150.png</Link>
+    </Content>
+    <Content Include="..\openHAB.Windows.Package\Images\Square310x310Logo.scale-200.png">
+      <Link>Images\Square310x310Logo.scale-200.png</Link>
+    </Content>
+    <Content Include="..\openHAB.Windows.Package\Images\Square310x310Logo.scale-400.png">
+      <Link>Images\Square310x310Logo.scale-400.png</Link>
+    </Content>
+    <Content Include="..\openHAB.Windows.Package\Images\Square44x44Logo.scale-100.png">
+      <Link>Images\Square44x44Logo.scale-100.png</Link>
+    </Content>
+    <Content Include="..\openHAB.Windows.Package\Images\Square44x44Logo.scale-125.png">
+      <Link>Images\Square44x44Logo.scale-125.png</Link>
+    </Content>
+    <Content Include="..\openHAB.Windows.Package\Images\Square44x44Logo.scale-150.png">
+      <Link>Images\Square44x44Logo.scale-150.png</Link>
+    </Content>
+    <Content Include="..\openHAB.Windows.Package\Images\Square44x44Logo.scale-200.png">
+      <Link>Images\Square44x44Logo.scale-200.png</Link>
+    </Content>
+    <Content Include="..\openHAB.Windows.Package\Images\Square44x44Logo.scale-400.png">
+      <Link>Images\Square44x44Logo.scale-400.png</Link>
+    </Content>
+    <Content Include="..\openHAB.Windows.Package\Images\Square44x44Logo.targetsize-16.png">
+      <Link>Images\Square44x44Logo.targetsize-16.png</Link>
+    </Content>
+    <Content Include="..\openHAB.Windows.Package\Images\Square44x44Logo.targetsize-16_altform-unplated.png">
+      <Link>Images\Square44x44Logo.targetsize-16_altform-unplated.png</Link>
+    </Content>
+    <Content Include="..\openHAB.Windows.Package\Images\Square44x44Logo.targetsize-24.png">
+      <Link>Images\Square44x44Logo.targetsize-24.png</Link>
+    </Content>
+    <Content Include="..\openHAB.Windows.Package\Images\Square44x44Logo.targetsize-24_altform-unplated.png">
+      <Link>Images\Square44x44Logo.targetsize-24_altform-unplated.png</Link>
+    </Content>
+    <Content Include="..\openHAB.Windows.Package\Images\Square44x44Logo.targetsize-256.png">
+      <Link>Images\Square44x44Logo.targetsize-256.png</Link>
+    </Content>
+    <Content Include="..\openHAB.Windows.Package\Images\Square44x44Logo.targetsize-256_altform-unplated.png">
+      <Link>Images\Square44x44Logo.targetsize-256_altform-unplated.png</Link>
+    </Content>
+    <Content Include="..\openHAB.Windows.Package\Images\Square44x44Logo.targetsize-32.png">
+      <Link>Images\Square44x44Logo.targetsize-32.png</Link>
+    </Content>
+    <Content Include="..\openHAB.Windows.Package\Images\Square44x44Logo.targetsize-32_altform-unplated.png">
+      <Link>Images\Square44x44Logo.targetsize-32_altform-unplated.png</Link>
+    </Content>
+    <Content Include="..\openHAB.Windows.Package\Images\Square44x44Logo.targetsize-48.png">
+      <Link>Images\Square44x44Logo.targetsize-48.png</Link>
+    </Content>
+    <Content Include="..\openHAB.Windows.Package\Images\Square44x44Logo.targetsize-48_altform-unplated.png">
+      <Link>Images\Square44x44Logo.targetsize-48_altform-unplated.png</Link>
+    </Content>
+    <Content Include="..\openHAB.Windows.Package\Images\Square71x71Logo.scale-100.png">
+      <Link>Images\Square71x71Logo.scale-100.png</Link>
+    </Content>
+    <Content Include="..\openHAB.Windows.Package\Images\Square71x71Logo.scale-125.png">
+      <Link>Images\Square71x71Logo.scale-125.png</Link>
+    </Content>
+    <Content Include="..\openHAB.Windows.Package\Images\Square71x71Logo.scale-150.png">
+      <Link>Images\Square71x71Logo.scale-150.png</Link>
+    </Content>
+    <Content Include="..\openHAB.Windows.Package\Images\Square71x71Logo.scale-200.png">
+      <Link>Images\Square71x71Logo.scale-200.png</Link>
+    </Content>
+    <Content Include="..\openHAB.Windows.Package\Images\Square71x71Logo.scale-400.png">
+      <Link>Images\Square71x71Logo.scale-400.png</Link>
+    </Content>
+    <Content Include="..\openHAB.Windows.Package\Images\StoreLogo.scale-100.png">
+      <Link>Images\StoreLogo.scale-100.png</Link>
+    </Content>
+    <Content Include="..\openHAB.Windows.Package\Images\StoreLogo.scale-125.png">
+      <Link>Images\StoreLogo.scale-125.png</Link>
+    </Content>
+    <Content Include="..\openHAB.Windows.Package\Images\StoreLogo.scale-150.png">
+      <Link>Images\StoreLogo.scale-150.png</Link>
+    </Content>
+    <Content Include="..\openHAB.Windows.Package\Images\StoreLogo.scale-200.png">
+      <Link>Images\StoreLogo.scale-200.png</Link>
+    </Content>
+    <Content Include="..\openHAB.Windows.Package\Images\StoreLogo.scale-400.png">
+      <Link>Images\StoreLogo.scale-400.png</Link>
+    </Content>
+    <Content Include="..\openHAB.Windows.Package\Images\Wide310x150Logo.scale-100.png">
+      <Link>Images\Wide310x150Logo.scale-100.png</Link>
+    </Content>
+    <Content Include="..\openHAB.Windows.Package\Images\Wide310x150Logo.scale-125.png">
+      <Link>Images\Wide310x150Logo.scale-125.png</Link>
+    </Content>
+    <Content Include="..\openHAB.Windows.Package\Images\Wide310x150Logo.scale-150.png">
+      <Link>Images\Wide310x150Logo.scale-150.png</Link>
+    </Content>
+    <Content Include="..\openHAB.Windows.Package\Images\Wide310x150Logo.scale-200.png">
+      <Link>Images\Wide310x150Logo.scale-200.png</Link>
+    </Content>
+    <Content Include="..\openHAB.Windows.Package\Images\Wide310x150Logo.scale-400.png">
+      <Link>Images\Wide310x150Logo.scale-400.png</Link>
+    </Content>
+    <PRIResource Include="Properties\Resources.resw" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Package.StoreAssociation.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\openHAB.Windows\openHAB.Windows.csproj" />
+  </ItemGroup>
+</Project>
diff --git a/src/openHAB.Windows/Assets/Square71x71Logo.scale-100.png b/src/openHAB.Windows.Package/Assets/Square71x71Logo.scale-100.png
similarity index 100%
rename from src/openHAB.Windows/Assets/Square71x71Logo.scale-100.png
rename to src/openHAB.Windows.Package/Assets/Square71x71Logo.scale-100.png
diff --git a/src/openHAB.Windows/Assets/Square71x71Logo.scale-125.png b/src/openHAB.Windows.Package/Assets/Square71x71Logo.scale-125.png
similarity index 100%
rename from src/openHAB.Windows/Assets/Square71x71Logo.scale-125.png
rename to src/openHAB.Windows.Package/Assets/Square71x71Logo.scale-125.png
diff --git a/src/openHAB.Windows/Assets/Square71x71Logo.scale-150.png b/src/openHAB.Windows.Package/Assets/Square71x71Logo.scale-150.png
similarity index 100%
rename from src/openHAB.Windows/Assets/Square71x71Logo.scale-150.png
rename to src/openHAB.Windows.Package/Assets/Square71x71Logo.scale-150.png
diff --git a/src/openHAB.Windows/Assets/Square71x71Logo.scale-200.png b/src/openHAB.Windows.Package/Assets/Square71x71Logo.scale-200.png
similarity index 100%
rename from src/openHAB.Windows/Assets/Square71x71Logo.scale-200.png
rename to src/openHAB.Windows.Package/Assets/Square71x71Logo.scale-200.png
diff --git a/src/openHAB.Windows/Assets/StoreLogo.backup.png b/src/openHAB.Windows.Package/Images/LockScreenLogo.scale-200.png
similarity index 53%
rename from src/openHAB.Windows/Assets/StoreLogo.backup.png
rename to src/openHAB.Windows.Package/Images/LockScreenLogo.scale-200.png
index 7385b56c..735f57ad 100644
Binary files a/src/openHAB.Windows/Assets/StoreLogo.backup.png and b/src/openHAB.Windows.Package/Images/LockScreenLogo.scale-200.png differ
diff --git a/src/openHAB.Windows/Assets/SplashScreen.scale-100.png b/src/openHAB.Windows.Package/Images/SplashScreen.scale-100.png
similarity index 100%
rename from src/openHAB.Windows/Assets/SplashScreen.scale-100.png
rename to src/openHAB.Windows.Package/Images/SplashScreen.scale-100.png
diff --git a/src/openHAB.Windows/Assets/SplashScreen.scale-125.png b/src/openHAB.Windows.Package/Images/SplashScreen.scale-125.png
similarity index 100%
rename from src/openHAB.Windows/Assets/SplashScreen.scale-125.png
rename to src/openHAB.Windows.Package/Images/SplashScreen.scale-125.png
diff --git a/src/openHAB.Windows/Assets/SplashScreen.scale-150.png b/src/openHAB.Windows.Package/Images/SplashScreen.scale-150.png
similarity index 100%
rename from src/openHAB.Windows/Assets/SplashScreen.scale-150.png
rename to src/openHAB.Windows.Package/Images/SplashScreen.scale-150.png
diff --git a/src/openHAB.Windows/Assets/SplashScreen.scale-200.png b/src/openHAB.Windows.Package/Images/SplashScreen.scale-200.png
similarity index 100%
rename from src/openHAB.Windows/Assets/SplashScreen.scale-200.png
rename to src/openHAB.Windows.Package/Images/SplashScreen.scale-200.png
diff --git a/src/openHAB.Windows/Assets/SplashScreen.scale-400.png b/src/openHAB.Windows.Package/Images/SplashScreen.scale-400.png
similarity index 100%
rename from src/openHAB.Windows/Assets/SplashScreen.scale-400.png
rename to src/openHAB.Windows.Package/Images/SplashScreen.scale-400.png
diff --git a/src/openHAB.Windows/Assets/Square150x150Logo.scale-100.png b/src/openHAB.Windows.Package/Images/Square150x150Logo.scale-100.png
similarity index 100%
rename from src/openHAB.Windows/Assets/Square150x150Logo.scale-100.png
rename to src/openHAB.Windows.Package/Images/Square150x150Logo.scale-100.png
diff --git a/src/openHAB.Windows/Assets/Square150x150Logo.scale-125.png b/src/openHAB.Windows.Package/Images/Square150x150Logo.scale-125.png
similarity index 100%
rename from src/openHAB.Windows/Assets/Square150x150Logo.scale-125.png
rename to src/openHAB.Windows.Package/Images/Square150x150Logo.scale-125.png
diff --git a/src/openHAB.Windows/Assets/Square150x150Logo.scale-150.png b/src/openHAB.Windows.Package/Images/Square150x150Logo.scale-150.png
similarity index 100%
rename from src/openHAB.Windows/Assets/Square150x150Logo.scale-150.png
rename to src/openHAB.Windows.Package/Images/Square150x150Logo.scale-150.png
diff --git a/src/openHAB.Windows/Assets/Square150x150Logo.scale-200.png b/src/openHAB.Windows.Package/Images/Square150x150Logo.scale-200.png
similarity index 100%
rename from src/openHAB.Windows/Assets/Square150x150Logo.scale-200.png
rename to src/openHAB.Windows.Package/Images/Square150x150Logo.scale-200.png
diff --git a/src/openHAB.Windows/Assets/Square150x150Logo.scale-400.png b/src/openHAB.Windows.Package/Images/Square150x150Logo.scale-400.png
similarity index 100%
rename from src/openHAB.Windows/Assets/Square150x150Logo.scale-400.png
rename to src/openHAB.Windows.Package/Images/Square150x150Logo.scale-400.png
diff --git a/src/openHAB.Windows/Assets/Square310x310Logo.scale-100.png b/src/openHAB.Windows.Package/Images/Square310x310Logo.scale-100.png
similarity index 100%
rename from src/openHAB.Windows/Assets/Square310x310Logo.scale-100.png
rename to src/openHAB.Windows.Package/Images/Square310x310Logo.scale-100.png
diff --git a/src/openHAB.Windows/Assets/Square310x310Logo.scale-125.png b/src/openHAB.Windows.Package/Images/Square310x310Logo.scale-125.png
similarity index 100%
rename from src/openHAB.Windows/Assets/Square310x310Logo.scale-125.png
rename to src/openHAB.Windows.Package/Images/Square310x310Logo.scale-125.png
diff --git a/src/openHAB.Windows/Assets/Square310x310Logo.scale-150.png b/src/openHAB.Windows.Package/Images/Square310x310Logo.scale-150.png
similarity index 100%
rename from src/openHAB.Windows/Assets/Square310x310Logo.scale-150.png
rename to src/openHAB.Windows.Package/Images/Square310x310Logo.scale-150.png
diff --git a/src/openHAB.Windows/Assets/Square310x310Logo.scale-200.png b/src/openHAB.Windows.Package/Images/Square310x310Logo.scale-200.png
similarity index 100%
rename from src/openHAB.Windows/Assets/Square310x310Logo.scale-200.png
rename to src/openHAB.Windows.Package/Images/Square310x310Logo.scale-200.png
diff --git a/src/openHAB.Windows/Assets/Square310x310Logo.scale-400.png b/src/openHAB.Windows.Package/Images/Square310x310Logo.scale-400.png
similarity index 100%
rename from src/openHAB.Windows/Assets/Square310x310Logo.scale-400.png
rename to src/openHAB.Windows.Package/Images/Square310x310Logo.scale-400.png
diff --git a/src/openHAB.Windows/Assets/Square44x44Logo.scale-100.png b/src/openHAB.Windows.Package/Images/Square44x44Logo.scale-100.png
similarity index 100%
rename from src/openHAB.Windows/Assets/Square44x44Logo.scale-100.png
rename to src/openHAB.Windows.Package/Images/Square44x44Logo.scale-100.png
diff --git a/src/openHAB.Windows/Assets/Square44x44Logo.scale-125.png b/src/openHAB.Windows.Package/Images/Square44x44Logo.scale-125.png
similarity index 100%
rename from src/openHAB.Windows/Assets/Square44x44Logo.scale-125.png
rename to src/openHAB.Windows.Package/Images/Square44x44Logo.scale-125.png
diff --git a/src/openHAB.Windows/Assets/Square44x44Logo.scale-150.png b/src/openHAB.Windows.Package/Images/Square44x44Logo.scale-150.png
similarity index 100%
rename from src/openHAB.Windows/Assets/Square44x44Logo.scale-150.png
rename to src/openHAB.Windows.Package/Images/Square44x44Logo.scale-150.png
diff --git a/src/openHAB.Windows/Assets/Square44x44Logo.scale-200.png b/src/openHAB.Windows.Package/Images/Square44x44Logo.scale-200.png
similarity index 100%
rename from src/openHAB.Windows/Assets/Square44x44Logo.scale-200.png
rename to src/openHAB.Windows.Package/Images/Square44x44Logo.scale-200.png
diff --git a/src/openHAB.Windows/Assets/Square44x44Logo.scale-400.png b/src/openHAB.Windows.Package/Images/Square44x44Logo.scale-400.png
similarity index 100%
rename from src/openHAB.Windows/Assets/Square44x44Logo.scale-400.png
rename to src/openHAB.Windows.Package/Images/Square44x44Logo.scale-400.png
diff --git a/src/openHAB.Windows/Assets/Square44x44Logo.targetsize-16.png b/src/openHAB.Windows.Package/Images/Square44x44Logo.targetsize-16.png
similarity index 100%
rename from src/openHAB.Windows/Assets/Square44x44Logo.targetsize-16.png
rename to src/openHAB.Windows.Package/Images/Square44x44Logo.targetsize-16.png
diff --git a/src/openHAB.Windows/Assets/Square44x44Logo.targetsize-16_altform-unplated.png b/src/openHAB.Windows.Package/Images/Square44x44Logo.targetsize-16_altform-unplated.png
similarity index 100%
rename from src/openHAB.Windows/Assets/Square44x44Logo.targetsize-16_altform-unplated.png
rename to src/openHAB.Windows.Package/Images/Square44x44Logo.targetsize-16_altform-unplated.png
diff --git a/src/openHAB.Windows/Assets/Square44x44Logo.targetsize-24.png b/src/openHAB.Windows.Package/Images/Square44x44Logo.targetsize-24.png
similarity index 100%
rename from src/openHAB.Windows/Assets/Square44x44Logo.targetsize-24.png
rename to src/openHAB.Windows.Package/Images/Square44x44Logo.targetsize-24.png
diff --git a/src/openHAB.Windows/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/src/openHAB.Windows.Package/Images/Square44x44Logo.targetsize-24_altform-unplated.png
similarity index 100%
rename from src/openHAB.Windows/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
rename to src/openHAB.Windows.Package/Images/Square44x44Logo.targetsize-24_altform-unplated.png
diff --git a/src/openHAB.Windows/Assets/Square44x44Logo.targetsize-256.png b/src/openHAB.Windows.Package/Images/Square44x44Logo.targetsize-256.png
similarity index 100%
rename from src/openHAB.Windows/Assets/Square44x44Logo.targetsize-256.png
rename to src/openHAB.Windows.Package/Images/Square44x44Logo.targetsize-256.png
diff --git a/src/openHAB.Windows/Assets/Square44x44Logo.targetsize-256_altform-unplated.png b/src/openHAB.Windows.Package/Images/Square44x44Logo.targetsize-256_altform-unplated.png
similarity index 100%
rename from src/openHAB.Windows/Assets/Square44x44Logo.targetsize-256_altform-unplated.png
rename to src/openHAB.Windows.Package/Images/Square44x44Logo.targetsize-256_altform-unplated.png
diff --git a/src/openHAB.Windows/Assets/Square44x44Logo.targetsize-32.png b/src/openHAB.Windows.Package/Images/Square44x44Logo.targetsize-32.png
similarity index 100%
rename from src/openHAB.Windows/Assets/Square44x44Logo.targetsize-32.png
rename to src/openHAB.Windows.Package/Images/Square44x44Logo.targetsize-32.png
diff --git a/src/openHAB.Windows/Assets/Square44x44Logo.targetsize-32_altform-unplated.png b/src/openHAB.Windows.Package/Images/Square44x44Logo.targetsize-32_altform-unplated.png
similarity index 100%
rename from src/openHAB.Windows/Assets/Square44x44Logo.targetsize-32_altform-unplated.png
rename to src/openHAB.Windows.Package/Images/Square44x44Logo.targetsize-32_altform-unplated.png
diff --git a/src/openHAB.Windows/Assets/Square44x44Logo.targetsize-48.png b/src/openHAB.Windows.Package/Images/Square44x44Logo.targetsize-48.png
similarity index 100%
rename from src/openHAB.Windows/Assets/Square44x44Logo.targetsize-48.png
rename to src/openHAB.Windows.Package/Images/Square44x44Logo.targetsize-48.png
diff --git a/src/openHAB.Windows/Assets/Square44x44Logo.targetsize-48_altform-unplated.png b/src/openHAB.Windows.Package/Images/Square44x44Logo.targetsize-48_altform-unplated.png
similarity index 100%
rename from src/openHAB.Windows/Assets/Square44x44Logo.targetsize-48_altform-unplated.png
rename to src/openHAB.Windows.Package/Images/Square44x44Logo.targetsize-48_altform-unplated.png
diff --git a/src/openHAB.Windows.Package/Images/Square71x71Logo.scale-100.png b/src/openHAB.Windows.Package/Images/Square71x71Logo.scale-100.png
new file mode 100644
index 00000000..c0a7f5c9
Binary files /dev/null and b/src/openHAB.Windows.Package/Images/Square71x71Logo.scale-100.png differ
diff --git a/src/openHAB.Windows.Package/Images/Square71x71Logo.scale-125.png b/src/openHAB.Windows.Package/Images/Square71x71Logo.scale-125.png
new file mode 100644
index 00000000..500a5a30
Binary files /dev/null and b/src/openHAB.Windows.Package/Images/Square71x71Logo.scale-125.png differ
diff --git a/src/openHAB.Windows.Package/Images/Square71x71Logo.scale-150.png b/src/openHAB.Windows.Package/Images/Square71x71Logo.scale-150.png
new file mode 100644
index 00000000..4a603f9f
Binary files /dev/null and b/src/openHAB.Windows.Package/Images/Square71x71Logo.scale-150.png differ
diff --git a/src/openHAB.Windows.Package/Images/Square71x71Logo.scale-200.png b/src/openHAB.Windows.Package/Images/Square71x71Logo.scale-200.png
new file mode 100644
index 00000000..c417c4d1
Binary files /dev/null and b/src/openHAB.Windows.Package/Images/Square71x71Logo.scale-200.png differ
diff --git a/src/openHAB.Windows/Assets/Square71x71Logo.scale-400.png b/src/openHAB.Windows.Package/Images/Square71x71Logo.scale-400.png
similarity index 100%
rename from src/openHAB.Windows/Assets/Square71x71Logo.scale-400.png
rename to src/openHAB.Windows.Package/Images/Square71x71Logo.scale-400.png
diff --git a/src/openHAB.Windows/Assets/NewStoreLogo.scale-100.png b/src/openHAB.Windows.Package/Images/StoreLogo.scale-100.png
similarity index 100%
rename from src/openHAB.Windows/Assets/NewStoreLogo.scale-100.png
rename to src/openHAB.Windows.Package/Images/StoreLogo.scale-100.png
diff --git a/src/openHAB.Windows/Assets/NewStoreLogo.scale-125.png b/src/openHAB.Windows.Package/Images/StoreLogo.scale-125.png
similarity index 100%
rename from src/openHAB.Windows/Assets/NewStoreLogo.scale-125.png
rename to src/openHAB.Windows.Package/Images/StoreLogo.scale-125.png
diff --git a/src/openHAB.Windows/Assets/NewStoreLogo.scale-150.png b/src/openHAB.Windows.Package/Images/StoreLogo.scale-150.png
similarity index 100%
rename from src/openHAB.Windows/Assets/NewStoreLogo.scale-150.png
rename to src/openHAB.Windows.Package/Images/StoreLogo.scale-150.png
diff --git a/src/openHAB.Windows/Assets/NewStoreLogo.scale-200.png b/src/openHAB.Windows.Package/Images/StoreLogo.scale-200.png
similarity index 100%
rename from src/openHAB.Windows/Assets/NewStoreLogo.scale-200.png
rename to src/openHAB.Windows.Package/Images/StoreLogo.scale-200.png
diff --git a/src/openHAB.Windows/Assets/NewStoreLogo.scale-400.png b/src/openHAB.Windows.Package/Images/StoreLogo.scale-400.png
similarity index 100%
rename from src/openHAB.Windows/Assets/NewStoreLogo.scale-400.png
rename to src/openHAB.Windows.Package/Images/StoreLogo.scale-400.png
diff --git a/src/openHAB.Windows/Assets/Wide310x150Logo.scale-100.png b/src/openHAB.Windows.Package/Images/Wide310x150Logo.scale-100.png
similarity index 100%
rename from src/openHAB.Windows/Assets/Wide310x150Logo.scale-100.png
rename to src/openHAB.Windows.Package/Images/Wide310x150Logo.scale-100.png
diff --git a/src/openHAB.Windows/Assets/Wide310x150Logo.scale-125.png b/src/openHAB.Windows.Package/Images/Wide310x150Logo.scale-125.png
similarity index 100%
rename from src/openHAB.Windows/Assets/Wide310x150Logo.scale-125.png
rename to src/openHAB.Windows.Package/Images/Wide310x150Logo.scale-125.png
diff --git a/src/openHAB.Windows/Assets/Wide310x150Logo.scale-150.png b/src/openHAB.Windows.Package/Images/Wide310x150Logo.scale-150.png
similarity index 100%
rename from src/openHAB.Windows/Assets/Wide310x150Logo.scale-150.png
rename to src/openHAB.Windows.Package/Images/Wide310x150Logo.scale-150.png
diff --git a/src/openHAB.Windows/Assets/Wide310x150Logo.scale-200.png b/src/openHAB.Windows.Package/Images/Wide310x150Logo.scale-200.png
similarity index 100%
rename from src/openHAB.Windows/Assets/Wide310x150Logo.scale-200.png
rename to src/openHAB.Windows.Package/Images/Wide310x150Logo.scale-200.png
diff --git a/src/openHAB.Windows/Assets/Wide310x150Logo.scale-400.png b/src/openHAB.Windows.Package/Images/Wide310x150Logo.scale-400.png
similarity index 100%
rename from src/openHAB.Windows/Assets/Wide310x150Logo.scale-400.png
rename to src/openHAB.Windows.Package/Images/Wide310x150Logo.scale-400.png
diff --git a/src/openHAB.Windows/Package.StoreAssociation.xml b/src/openHAB.Windows.Package/Package.StoreAssociation.xml
similarity index 99%
rename from src/openHAB.Windows/Package.StoreAssociation.xml
rename to src/openHAB.Windows.Package/Package.StoreAssociation.xml
index 17292492..8b0b596f 100644
--- a/src/openHAB.Windows/Package.StoreAssociation.xml
+++ b/src/openHAB.Windows.Package/Package.StoreAssociation.xml
@@ -365,4 +365,4 @@
   </ProductReservedInfo>
   <AccountPackageIdentityNames />
   <PackageInfoList LandingUrl="https://developer.microsoft.com/dashboard/Application?appId=9NMQ39CTWXGT" />
-</StoreAssociation>
\ No newline at end of file
+</StoreAssociation>
diff --git a/src/openHAB.Windows.Package/Package.appxmanifest b/src/openHAB.Windows.Package/Package.appxmanifest
new file mode 100644
index 00000000..33e64769
--- /dev/null
+++ b/src/openHAB.Windows.Package/Package.appxmanifest
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<Package
+  xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
+  xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
+  xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
+  xmlns:uap5="http://schemas.microsoft.com/appx/manifest/uap/windows10/5"
+  xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
+  xmlns:com="http://schemas.microsoft.com/appx/manifest/com/windows10"
+  xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10"
+  IgnorableNamespaces="uap rescap com desktop">
+	<Identity
+		Name="openHABFoundatione.V.openHAB"
+		Publisher="CN=8A77D062-E996-4F32-9CC6-50568ABAFF8F"
+		Version="2025.1.6.0" />
+
+	<Properties>
+		<DisplayName>openHAB</DisplayName>
+		<PublisherDisplayName>openHAB Foundation e.V.</PublisherDisplayName>
+		<Logo>Images\StoreLogo.png</Logo>
+	</Properties>
+
+	<Dependencies>
+		<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
+		<TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.17763.0" MaxVersionTested="10.0.19041.0" />
+	</Dependencies>
+
+	<Resources>
+		<Resource Language="x-generate"/>
+	</Resources>
+
+	<Applications>
+		<Application Id="App"
+		  Executable="$targetnametoken$.exe"
+		  EntryPoint="$targetentrypoint$">
+			<uap:VisualElements
+			  DisplayName="ms-resource:AppDisplayName"
+			  Description="OpenHAB.Windows"
+			  BackgroundColor="transparent"
+			  Square150x150Logo="Images\Square150x150Logo.png"
+			  Square44x44Logo="Images\Square44x44Logo.png">
+				<uap:DefaultTile Wide310x150Logo="Images\Wide310x150Logo.png"  ShortName="openHAB" Square71x71Logo="Images\Square71x71Logo.png" Square310x310Logo="Images\Square310x310Logo.png">
+					<uap:ShowNameOnTiles>
+						<uap:ShowOn Tile="square150x150Logo"/>
+						<uap:ShowOn Tile="wide310x150Logo"/>
+						<uap:ShowOn Tile="square310x310Logo"/>
+					</uap:ShowNameOnTiles>
+				</uap:DefaultTile >
+				<uap:SplashScreen Image="Images\SplashScreen.png"  BackgroundColor="#FFFFFF"/>
+			</uap:VisualElements>
+			<Extensions>
+				<uap5:Extension Category="windows.startupTask">
+					<uap5:StartupTask TaskId="openHABStartupId" Enabled="false" DisplayName="openHAB" />
+				</uap5:Extension>
+
+				<desktop:Extension Category="windows.toastNotificationActivation">
+					<desktop:ToastNotificationActivation ToastActivatorCLSID="5EDF1378-0453-439A-9D48-71C645088153" />
+				</desktop:Extension>
+
+				<!--Register COM CLSID LocalServer32 registry key-->
+				<com:Extension Category="windows.comServer">
+					<com:ComServer>
+						<com:ExeServer Executable="openHAB.Windows\openHAB.Windows.exe" Arguments="-ToastActivated" DisplayName="Toast activator">
+							<com:Class Id="5EDF1378-0453-439A-9D48-71C645088153" DisplayName="Toast activator"/>
+						</com:ExeServer>
+					</com:ComServer>
+				</com:Extension>
+
+			</Extensions>
+		</Application>
+	</Applications>
+
+	<Capabilities>
+		<Capability Name="internetClient" />
+		<rescap:Capability Name="runFullTrust" />
+		<Capability Name="privateNetworkClientServer"/>
+	</Capabilities>
+</Package>
diff --git a/src/openHAB.Windows.Package/Properties/Resources.resw b/src/openHAB.Windows.Package/Properties/Resources.resw
new file mode 100644
index 00000000..8f99f449
--- /dev/null
+++ b/src/openHAB.Windows.Package/Properties/Resources.resw
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!--
+    Microsoft ResX Schema
+
+    Version 2.0
+
+    The primary goals of this format is to allow a simple XML format
+    that is mostly human readable. The generation and parsing of the
+    various data types are done through the TypeConverter classes
+    associated with the data types.
+
+    Example:
+
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+
+    There are any number of "resheader" rows that contain simple
+    name/value pairs.
+
+    Each data row contains a name, and value. The row also contains a
+    type or mimetype. Type corresponds to a .NET class that support
+    text/value conversion through the TypeConverter architecture.
+    Classes that don't support this are serialized and stored with the
+    mimetype set.
+
+    The mimetype is used for serialized objects, and tells the
+    ResXResourceReader how to depersist the object. This is currently not
+    extensible. For a given mimetype the value must be set accordingly:
+
+    Note - application/x-microsoft.net.object.binary.base64 is the format
+    that the ResXResourceWriter will generate, however the reader can
+    read any of the formats listed below.
+
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="AppDisplayName" xml:space="preserve">
+    <value>openHAB</value>
+  </data>
+</root>
diff --git a/src/openHAB.Windows.Package/openHAB.Windows.Package.wapproj b/src/openHAB.Windows.Package/openHAB.Windows.Package.wapproj
new file mode 100644
index 00000000..cfa381b4
--- /dev/null
+++ b/src/openHAB.Windows.Package/openHAB.Windows.Package.wapproj
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Condition="'$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '15.0'">
+    <VisualStudioVersion>15.0</VisualStudioVersion>
+  </PropertyGroup>
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|x86">
+      <Configuration>Debug</Configuration>
+      <Platform>x86</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x86">
+      <Configuration>Release</Configuration>
+      <Platform>x86</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|arm64">
+      <Configuration>Debug</Configuration>
+      <Platform>arm64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|arm64">
+      <Configuration>Release</Configuration>
+      <Platform>arm64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup>
+    <WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
+    <PathToXAMLWinRTImplementations>openHAB.Windows\</PathToXAMLWinRTImplementations>
+  </PropertyGroup>
+  <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
+  <PropertyGroup>
+    <ProjectGuid>4e463e63-604d-4c3d-8a13-273b787c99b2</ProjectGuid>
+    <TargetPlatformVersion>10.0.26100.0</TargetPlatformVersion>
+    <TargetPlatformMinVersion>10.0.20348.0</TargetPlatformMinVersion>
+    <AssetTargetFallback>net8.0-windows$(TargetPlatformVersion);$(AssetTargetFallback)</AssetTargetFallback>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <AppxPackageSigningEnabled>false</AppxPackageSigningEnabled>
+    <NoWarn>$(NoWarn);NU1702</NoWarn>
+    <EntryPointProjectUniqueName>..\openHAB.Windows\openHAB.Windows.csproj</EntryPointProjectUniqueName>
+    <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
+    <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
+    <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
+    <GenerateTestArtifacts>True</GenerateTestArtifacts>
+    <AppxBundlePlatforms>x86|x64|arm64</AppxBundlePlatforms>
+    <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|arm64'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|arm64'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
+    <AppxBundle>Always</AppxBundle>
+  </PropertyGroup>
+  <ItemGroup>
+    <AppxManifest Include="Package.appxmanifest">
+      <SubType>Designer</SubType>
+    </AppxManifest>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Images\StoreLogo.scale-100.png" />
+    <Content Include="Images\StoreLogo.scale-125.png" />
+    <Content Include="Images\StoreLogo.scale-150.png" />
+    <Content Include="Images\StoreLogo.scale-200.png" />
+    <Content Include="Images\StoreLogo.scale-400.png" />
+    <Content Include="Images\SplashScreen.scale-100.png" />
+    <Content Include="Images\SplashScreen.scale-125.png" />
+    <Content Include="Images\SplashScreen.scale-150.png" />
+    <Content Include="Images\SplashScreen.scale-200.png" />
+    <Content Include="Images\LockScreenLogo.scale-200.png" />
+    <Content Include="Images\SplashScreen.scale-400.png" />
+    <Content Include="Images\Square150x150Logo.scale-100.png" />
+    <Content Include="Images\Square150x150Logo.scale-125.png" />
+    <Content Include="Images\Square150x150Logo.scale-150.png" />
+    <Content Include="Images\Square150x150Logo.scale-200.png" />
+    <Content Include="Images\Square150x150Logo.scale-400.png" />
+    <Content Include="Images\Square310x310Logo.scale-100.png" />
+    <Content Include="Images\Square310x310Logo.scale-125.png" />
+    <Content Include="Images\Square310x310Logo.scale-150.png" />
+    <Content Include="Images\Square310x310Logo.scale-200.png" />
+    <Content Include="Images\Square310x310Logo.scale-400.png" />
+    <Content Include="Images\Square44x44Logo.scale-100.png" />
+    <Content Include="Images\Square44x44Logo.scale-125.png" />
+    <Content Include="Images\Square44x44Logo.scale-150.png" />
+    <Content Include="Images\Square44x44Logo.scale-200.png" />
+    <Content Include="Images\Square44x44Logo.scale-400.png" />
+    <Content Include="Images\Square44x44Logo.targetsize-16.png" />
+    <Content Include="Images\Square44x44Logo.targetsize-16_altform-unplated.png" />
+    <Content Include="Images\Square44x44Logo.targetsize-24.png" />
+    <Content Include="Images\Square44x44Logo.targetsize-24_altform-unplated.png" />
+    <Content Include="Images\Square44x44Logo.targetsize-256.png" />
+    <Content Include="Images\Square44x44Logo.targetsize-256_altform-unplated.png" />
+    <Content Include="Images\Square44x44Logo.targetsize-32.png" />
+    <Content Include="Images\Square44x44Logo.targetsize-32_altform-unplated.png" />
+    <Content Include="Images\Square44x44Logo.targetsize-48.png" />
+    <Content Include="Images\Square44x44Logo.targetsize-48_altform-unplated.png" />
+    <Content Include="Images\Square71x71Logo.scale-100.png" />
+    <Content Include="Images\Square71x71Logo.scale-125.png" />
+    <Content Include="Images\Square71x71Logo.scale-150.png" />
+    <Content Include="Images\Square71x71Logo.scale-200.png" />
+    <Content Include="Images\Square71x71Logo.scale-400.png" />
+    <Content Include="Images\Wide310x150Logo.scale-100.png" />
+    <Content Include="Images\Wide310x150Logo.scale-125.png" />
+    <Content Include="Images\Wide310x150Logo.scale-150.png" />
+    <Content Include="Images\Wide310x150Logo.scale-200.png" />
+    <Content Include="Images\Wide310x150Logo.scale-400.png" />
+    <PRIResource Include="Properties\Resources.resw" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="OpenHAB.Windows_StoreKey.pfx" />
+    <None Include="Package.StoreAssociation.xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\openHAB.Windows\openHAB.Windows.csproj">
+      <SkipGetTargetFrameworkProperties>True</SkipGetTargetFrameworkProperties>
+      <PublishProfile>Properties\PublishProfiles\win-$(Platform).pubxml</PublishProfile>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
+    <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.241114003" />
+  </ItemGroup>
+  <Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
+</Project>
diff --git a/src/openHAB.Windows/App.xaml b/src/openHAB.Windows/App.xaml
index f6e5ede1..4f2eb941 100644
--- a/src/openHAB.Windows/App.xaml
+++ b/src/openHAB.Windows/App.xaml
@@ -1,97 +1,76 @@
-<Application x:Class="OpenHAB.Windows.App"
-			 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-			 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-			 xmlns:controls="using:OpenHAB.Windows.Controls"
-			 xmlns:converters="using:OpenHAB.Windows.Converters"
-			 RequestedTheme="Light">
-	<Application.Resources>
-		<ResourceDictionary>
-			<ResourceDictionary.MergedDictionaries>
-				<XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
-				<ResourceDictionary Source="Styles/DefaultTheme.xaml" />
-			</ResourceDictionary.MergedDictionaries>
-
-			<converters:StateToBoolConverter x:Key="StateToBoolConverter" />
-			<converters:IconToPathConverter x:Key="IconToPathConverter" />
-			<converters:StringToColorBrushConverter x:Key="StringToColorConverter"/>
-			<converters:BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
-
-			<DataTemplate x:Key="FrameTemplate">
-				<controls:FrameWidget Widget="{Binding Mode=OneWay}" />
-			</DataTemplate>
-
-			<DataTemplate x:Key="ChartTemplate">
-				<controls:ChartWidget Widget="{Binding Mode=OneWay}" />
-			</DataTemplate>
-
-			<DataTemplate x:Key="SelectionTemplate">
-				<controls:SelectionWidget Widget="{Binding Mode=OneWay}" />
-			</DataTemplate>
-
-			<DataTemplate x:Key="MjpegTemplate">
-				<controls:MjpegWidget Widget="{Binding Mode=OneWay}" />
-			</DataTemplate>
-
-			<DataTemplate x:Key="PageLinkTemplate">
-				<controls:PageLinkWidget Widget="{Binding Mode=OneWay}" />
-			</DataTemplate>
-
-			<DataTemplate x:Key="SwitchTemplate">
-				<controls:ToggleWidget Widget="{Binding Mode=OneWay}" />
-			</DataTemplate>
-
-			<DataTemplate x:Key="MapViewTemplate">
-				<controls:MapViewWidget Widget="{Binding Mode=OneWay}" />
-			</DataTemplate>
-
-			<DataTemplate x:Key="WebViewTemplate">
-				<controls:WebViewWidget Widget="{Binding Mode=OneWay}" />
-			</DataTemplate>
-
-			<DataTemplate x:Key="RollershutterTemplate">
-				<controls:RollershutterWidget Widget="{Binding Mode=OneWay}" />
-			</DataTemplate>
-
-			<DataTemplate x:Key="SliderTemplate">
-				<controls:SliderWidget Widget="{Binding Mode=OneWay}" />
-			</DataTemplate>
-
-			<DataTemplate x:Key="TextItemTemplate">
-				<controls:TextWidget Widget="{Binding Mode=OneWay}" />
-			</DataTemplate>
-
-			<DataTemplate x:Key="ImageItemTemplate">
-				<controls:ImageWidget Widget="{Binding Mode=OneWay}" />
-			</DataTemplate>
-
-			<DataTemplate x:Key="SetpoinTemplate">
-				<controls:SetpointWidget Widget="{Binding Mode=OneWay}" />
-			</DataTemplate>
-
-			<DataTemplate x:Key="SectionSwitchTemplate">
-				<controls:SectionSwitchWidget Widget="{Binding Mode=OneWay}" />
-			</DataTemplate>
-
-			<DataTemplate x:Key="ColorTemplate">
-				<controls:ColorWidget Widget="{Binding Mode=OneWay}" />
-			</DataTemplate>
-
-			<converters:WidgetTemplateSelector x:Key="WidgetTemplateSelector"
-											   ChartTemplate="{StaticResource ChartTemplate}"
-											   ColorTemplate="{StaticResource ColorTemplate}"
-											   FrameTemplate="{StaticResource FrameTemplate}"
-											   ImageTemplate="{StaticResource ImageItemTemplate}"
-											   MjpegTemplate="{StaticResource MjpegTemplate}"
-											   PageLinkTemplate="{StaticResource PageLinkTemplate}"
-											   RollershutterTemplate="{StaticResource RollershutterTemplate}"
-											   SectionSwitchTemplate="{StaticResource SectionSwitchTemplate}"
-											   SelectionTemplate="{StaticResource SelectionTemplate}"
-											   SetpointTemplate="{StaticResource SetpoinTemplate}"
-											   SliderTemplate="{StaticResource SliderTemplate}"
-											   SwitchTemplate="{StaticResource SwitchTemplate}"
-											   MapViewTemplate="{StaticResource MapViewTemplate}"
-											   WebViewTemplate="{StaticResource WebViewTemplate}"
-											   TextTemplate="{StaticResource TextItemTemplate}" />
-		</ResourceDictionary>
-	</Application.Resources>
+<Application x:Class="openHAB.Windows.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:controls="using:openHAB.Windows.Controls"
+             xmlns:converters="using:openHAB.Windows.Converters">
+    <Application.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
+                <ResourceDictionary Source="Styles/DefaultTheme.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+            <converters:StateToBoolConverter x:Key="StateToBoolConverter" />
+            <DataTemplate x:Key="FrameTemplate">
+                <controls:FrameWidget Widget="{Binding Mode=OneWay}" />
+            </DataTemplate>
+            <DataTemplate x:Key="ChartTemplate">
+                <controls:ChartWidget Widget="{Binding Mode=OneWay}" />
+            </DataTemplate>
+            <DataTemplate x:Key="SelectionTemplate">
+                <controls:SelectionWidget Widget="{Binding Mode=OneWay}" />
+            </DataTemplate>
+            <DataTemplate x:Key="MjpegTemplate">
+                <controls:MjpegWidget Widget="{Binding Mode=OneWay}" />
+            </DataTemplate>
+            <DataTemplate x:Key="PageLinkTemplate">
+                <controls:PageLinkWidget Widget="{Binding Mode=OneWay}" />
+            </DataTemplate>
+            <DataTemplate x:Key="SwitchTemplate">
+                <controls:ToggleWidget Widget="{Binding Mode=OneWay}" />
+            </DataTemplate>
+            <DataTemplate x:Key="MapViewTemplate">
+                <controls:MapViewWidget Widget="{Binding Mode=OneWay}" />
+            </DataTemplate>
+            <DataTemplate x:Key="WebViewTemplate">
+                <controls:WebViewWidget Widget="{Binding Mode=OneWay}" />
+            </DataTemplate>
+            <DataTemplate x:Key="RollershutterTemplate">
+                <controls:RollershutterWidget Widget="{Binding Mode=OneWay}" />
+            </DataTemplate>
+            <DataTemplate x:Key="SliderTemplate">
+                <controls:SliderWidget Widget="{Binding Mode=OneWay}" />
+            </DataTemplate>
+            <DataTemplate x:Key="TextItemTemplate">
+                <controls:TextWidget Widget="{Binding Mode=OneWay}" />
+            </DataTemplate>
+            <DataTemplate x:Key="ImageItemTemplate">
+                <controls:ImageWidget Widget="{Binding Mode=OneWay}" />
+            </DataTemplate>
+            <DataTemplate x:Key="SetpoinTemplate">
+                <controls:SetpointWidget Widget="{Binding Mode=OneWay}" />
+            </DataTemplate>
+            <DataTemplate x:Key="SectionSwitchTemplate">
+                <controls:SectionSwitchWidget Widget="{Binding Mode=OneWay}" />
+            </DataTemplate>
+            <DataTemplate x:Key="ColorTemplate">
+                <controls:ColorWidget Widget="{Binding Mode=OneWay}" />
+            </DataTemplate>
+            <converters:WidgetTemplateSelector x:Key="WidgetTemplateSelector"
+                                               ChartTemplate="{StaticResource ChartTemplate}"
+                                               ColorTemplate="{StaticResource ColorTemplate}"
+                                               FrameTemplate="{StaticResource FrameTemplate}"
+                                               ImageTemplate="{StaticResource ImageItemTemplate}"
+                                               MjpegTemplate="{StaticResource MjpegTemplate}"
+                                               PageLinkTemplate="{StaticResource PageLinkTemplate}"
+                                               RollershutterTemplate="{StaticResource RollershutterTemplate}"
+                                               SectionSwitchTemplate="{StaticResource SectionSwitchTemplate}"
+                                               SelectionTemplate="{StaticResource SelectionTemplate}"
+                                               SetpointTemplate="{StaticResource SetpoinTemplate}"
+                                               SliderTemplate="{StaticResource SliderTemplate}"
+                                               SwitchTemplate="{StaticResource SwitchTemplate}"
+                                               MapViewTemplate="{StaticResource MapViewTemplate}"
+                                               WebViewTemplate="{StaticResource WebViewTemplate}"
+                                               TextTemplate="{StaticResource TextItemTemplate}" />
+        </ResourceDictionary>
+    </Application.Resources>
 </Application>
diff --git a/src/openHAB.Windows/App.xaml.cs b/src/openHAB.Windows/App.xaml.cs
index 13b5c17f..c79ae37b 100644
--- a/src/openHAB.Windows/App.xaml.cs
+++ b/src/openHAB.Windows/App.xaml.cs
@@ -1,156 +1,146 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using OpenHAB.Core.Contracts.Services;
-using OpenHAB.Core.Model;
-using OpenHAB.Core.Services;
-using OpenHAB.Windows.Services;
-using OpenHAB.Windows.View;
-using Windows.ApplicationModel;
-using Windows.ApplicationModel.Activation;
-using Windows.Foundation.Metadata;
-using Windows.System;
-using Windows.UI;
-using Windows.UI.Core;
-using Windows.UI.ViewManagement;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Navigation;
-
-namespace OpenHAB.Windows
+using Microsoft.Extensions.Options;
+using Microsoft.Toolkit.Uwp.Notifications;
+using Microsoft.UI.Dispatching;
+using Microsoft.UI.Xaml;
+using Microsoft.Windows.AppLifecycle;
+using openHAB.Core.Model;
+using openHAB.Core.Notification.Contracts;
+using openHAB.Core.Services.Contracts;
+
+namespace openHAB.Windows;
+
+/// <summary>
+/// Provides application-specific behavior to supplement the default Application class.
+/// </summary>
+public partial class App : Application
 {
+    private readonly ILogger<App> _logger;
+    private readonly IAppManager _appManager;
+    private readonly INotificationManager _notificationManager;
+    private static Window _mainWindow;
+    private readonly IOptions<SettingOptions> _options;
+
     /// <summary>
-    /// Provides application-specific behavior to supplement the default Application class.
+    /// Initializes a new instance of the <see cref="App" /> class.
     /// </summary>
-    public sealed partial class App : Application
+    /// <param name="appManager">The application manager.</param>
+    /// <param name="notificationManage">The notification manager.</param>
+    /// <param name="options">The application settings options.</param>
+    /// <param name="logger">The logger instance.</param>
+    public App(IAppManager appManager, INotificationManager notificationManage, IOptions<SettingOptions> options, ILogger<App> logger)
     {
-        private ILogger<App> _logger;
-        private ISettingsService _settingsService;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="App"/> class.
-        /// Initializes the singleton application object.  This is the first line of authored code
-        /// executed, and as such is the logical equivalent of main() or WinMain().
-        /// </summary>
-        public App()
-        {
-            InitializeComponent();
+        _options = options;
+        _logger = logger;
+        _appManager = appManager;
+        _notificationManager = notificationManage;
 
-            _logger = (ILogger<App>)DIService.Instance.Services.GetService(typeof(ILogger<App>));
-            _settingsService = (ISettingsService)DIService.Instance.Services.GetService(typeof(ISettingsService));
+        InitializeComponent();
 
-            Suspending += OnSuspending;
-            UnhandledException += App_UnhandledException;
+        RequestedTheme = _options.Value.AppTheme.ConvertToApplicationTheme();
+        UnhandledException += App_UnhandledException;
+        DispatcherQueue = DispatcherQueue.GetForCurrentThread();
+    }
 
-            INotificationManager notificationManager = (INotificationManager)DIService.Instance.Services.GetService(typeof(INotificationManager));
-            notificationManager.ResetBadgeCount();
+    /// <summary>
+    /// Gets the dispatcher queue for the current thread.
+    /// </summary>
+    public static DispatcherQueue DispatcherQueue
+    {
+        get; private set;
+    }
+
+    /// <summary>
+    /// Gets the main window of the application.
+    /// </summary>
+    public static Window MainWindow
+    {
+        get => _mainWindow;
+    }
+
+    /// <summary>
+    /// Invoked when the application is launched normally by the end user. Other entry points
+    /// will be used such as when the application is launched to open a specific file.
+    /// </summary>
+    /// <param name="e">Details about the launch request and process.</param>
+    protected override async void OnLaunched(LaunchActivatedEventArgs e)
+    {
+        _logger.LogInformation("=== Start Application ===");
+        _appManager.SetProgramLanguage(null);
+
+        AppInstance mainInstance = AppInstance.FindOrRegisterForKey("main");
+        AppActivationArguments activatedEventArgs = AppInstance.GetCurrent().GetActivatedEventArgs();
+
+        DispatcherQueue = DispatcherQueue.GetForCurrentThread();
+
+        // Register for toast activation. Requires Microsoft.Toolkit.Uwp.Notifications NuGet package version 7.0 or greater
+        ToastNotificationManagerCompat.OnActivated += ToastNotificationManagerCompat_OnActivated;
+
+        // If the instance that's executing the OnLaunched handler right now
+        // isn't the "main" instance.
+        if (!mainInstance.IsCurrent)
+        {
+            // Redirect the activation (and args) to the "main" instance, and exit.
+            await mainInstance.RedirectActivationToAsync(activatedEventArgs);
+            System.Diagnostics.Process.GetCurrentProcess().Kill();
+            return;
         }
 
-        /// <summary>
-        /// Invoked when the application is launched normally by the end user.  Other entry points
-        /// will be used such as when the application is launched to open a specific file.
-        /// </summary>
-        /// <param name="e">Details about the launch request and process.</param>
-        protected override async void OnLaunched(LaunchActivatedEventArgs e)
+        if (activatedEventArgs.Kind == ExtendedActivationKind.ToastNotification)
         {
-            _logger.LogInformation("=== Start Application ===");
 
-            _settingsService.SetProgramLanguage(null);
+        }
 
-            SystemNavigationManager.GetForCurrentView().BackRequested += OnBackRequested;
+        // Initialize MainWindow here
+        _mainWindow = Program.Host.Services.GetRequiredService<MainWindow>();
 
-            var rootFrame = Window.Current.Content as Frame;
+        _appManager.SetAppTheme(MainWindow.Content);
 
-            // Do not repeat app initialization when the Window already has content,
-            // just ensure that the window is active
-            if (rootFrame == null)
-            {
-                // Create a Frame to act as the navigation context and navigate to the first page
-                rootFrame = new Frame();
+        MainWindow.Activate();
+    }
 
-                rootFrame.NavigationFailed += OnNavigationFailed;
+    private void App_UnhandledException(object sender, Microsoft.UI.Xaml.UnhandledExceptionEventArgs e)
+    {
+        _logger.LogCritical(e.Exception, "Unhandled Exception");
+    }
 
-                if (e.PreviousExecutionState == ApplicationExecutionState.Terminated)
-                {
-                    // TODO: Load state from previously suspended application
-                }
+    private void ToastNotificationManagerCompat_OnActivated(ToastNotificationActivatedEventArgsCompat e)
+    {
+        // Use the dispatcher from the window if present, otherwise the app dispatcher
+        var dispatcherQueue = MainWindow?.DispatcherQueue ?? App.DispatcherQueue;
 
-                // Place the frame in the current Window
-                Window.Current.Content = rootFrame;
-            }
+        dispatcherQueue.TryEnqueue(delegate
+        {
+            var args = ToastArguments.Parse(e.Argument);
 
-            if (e.PrelaunchActivated == false)
+            switch (args["action"])
             {
-                if (rootFrame.Content == null)
-                {
-                    // When the navigation stack isn't restored navigate to the first page,
-                    // configuring the new page by passing required information as a navigation
-                    // parameter
-                    rootFrame.Navigate(typeof(MainPage), e.Arguments);
-                }
-
-                // Ensure the current window is active
-                Window.Current.Activate();
-
-                Settings settings = _settingsService.Load();
-
-                if (settings.StartAppMinimized.HasValue && settings.StartAppMinimized.Value)
-                {
-                    _logger.LogInformation($"Settings:StartAppMinimized value is set to '{settings.StartAppMinimized.Value}'");
-
-                    IList<AppDiagnosticInfo> infos = await AppDiagnosticInfo.RequestInfoForAppAsync();
-                    AppDiagnosticInfo appDiagnosticInfo = infos.FirstOrDefault();
-
-                    if (appDiagnosticInfo != null)
-                    {
-                        IList<AppResourceGroupInfo> resourceInfos = appDiagnosticInfo.GetResourceGroups();
-                        await resourceInfos[0].StartSuspendAsync();
-
-                        _logger.LogInformation("Start App in susp   ended mode.");
-                    }
-                }
-            }
-        }
+                //// Send a background message
+                //case "show":
+                //    string message = e.UserInput["textBox"].ToString();
+                //    // TODO: Send it
 
-        private void OnBackRequested(object sender, BackRequestedEventArgs e)
-        {
-            e.Handled = true;
-        }
-
-        /// <summary>
-        /// Invoked when Navigation to a certain page fails.
-        /// </summary>
-        /// <param name="sender">The Frame which failed navigation.</param>
-        /// <param name="e">Details about the navigation failure.</param>
-        private void OnNavigationFailed(object sender, NavigationFailedEventArgs e)
-        {
-            throw new Exception("Failed to load Page " + e.SourcePageType.FullName);
-        }
+                //    // If the UI app isn't open
+                //    if (MainWindow == null)
+                //    {
+                //        // Close since we're done
+                //        Process.GetCurrentProcess().Kill();
+                //    }
 
-        /// <summary>
-        /// Invoked when application execution is being suspended.  Application state is saved
-        /// without knowing whether the application will be terminated or resumed with the contents
-        /// of memory still intact.
-        /// </summary>
-        /// <param name="sender">The source of the suspend request.</param>
-        /// <param name="e">Details about the suspend request.</param>
-        private void OnSuspending(object sender, SuspendingEventArgs e)
-        {
-            var deferral = e.SuspendingOperation.GetDeferral();
+                //    break;
 
-            // TODO: Save application state and stop any background activity
-            _logger.LogInformation("=== Close Application ===");
+                // View a message
+                case "show":
 
-            deferral.Complete();
-        }
+                    string itemName = args["item"];
+                    // Launch/bring window to foreground
+                    //LaunchAndBringToForegroundIfNeeded();
 
-        /// <summary>Handles the UnhandledException event of the App control.</summary>
-        /// <param name="sender">The source of the event.</param>
-        /// <param name="e">The <see cref="global::Windows.UI.Xaml.UnhandledExceptionEventArgs"/> instance containing the event data.</param>
-        private void App_UnhandledException(object sender, global::Windows.UI.Xaml.UnhandledExceptionEventArgs e)
-        {
-            _logger.LogCritical(e.Exception, "UnhandledException occurred");
-        }
+                    // TODO: Open the message
+                    break;
+            }
+        });
     }
 }
diff --git a/src/openHAB.Windows/AppServiceExtensions.cs b/src/openHAB.Windows/AppServiceExtensions.cs
new file mode 100644
index 00000000..47fceed0
--- /dev/null
+++ b/src/openHAB.Windows/AppServiceExtensions.cs
@@ -0,0 +1,125 @@
+using CommunityToolkit.Mvvm.Messaging;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Logging;
+using NLog.Config;
+using NLog.Extensions.Logging;
+using NLog.Layouts;
+using NLog.Targets;
+using openHAB.Core;
+using openHAB.Core.Client;
+using openHAB.Core.Client.Connection;
+using openHAB.Core.Client.Connection.Contracts;
+using openHAB.Core.Client.Contracts;
+using openHAB.Core.Client.Event.Contracts;
+using openHAB.Core.Client.Extensions;
+using openHAB.Core.Client.Options;
+using openHAB.Core.Model;
+using openHAB.Core.Notification;
+using openHAB.Core.Notification.Contracts;
+using openHAB.Core.Services;
+using openHAB.Core.Services.Contracts;
+using openHAB.Windows.ViewModel;
+using JsonAttribute = NLog.Layouts.JsonAttribute;
+
+namespace openHAB.Windows;
+
+/// <summary>
+/// Extension methods for configuring OpenHAB services.
+/// </summary>
+public static class AppServiceExtensions
+{
+    /// <summary>
+    /// Adds OpenHAB services to the specified IServiceCollection.
+    /// </summary>
+    /// <param name="services">The IServiceCollection to add services to.</param>
+    public static void AddOpenHABServices(this IServiceCollection services)
+    {
+        services.AddLogging(loggingBuilder =>
+        {
+            loggingBuilder.ClearProviders();
+            loggingBuilder.SetMinimumLevel(LogLevel.Information);
+            loggingBuilder.AddNLog(GetLoggingConfiguration());
+        });
+
+        services.AddSingleton<IMessenger>(StrongReferenceMessenger.Default);
+
+        services.AddOpenHabHttpClients();
+        services.AddSingleton<IOpenHABClient, OpenHABClient>();
+
+        services.AddSingleton<IConnectionService, ConnectionService>();
+        services.AddSingleton<IIconCaching, IconCaching>();
+        services.AddSingleton<IAppManager, AppManager>();
+        services.AddSingleton<IItemManager, ItemManager>();
+        services.AddSingleton<INotificationManager, NotificationManager>();
+        services.AddSingleton<IOpenHABEventParser, OpenHABEventParser>();
+        services.AddSingleton<SitemapService>();
+    }
+
+    /// <summary>
+    /// Adds OpenHAB view models to the specified IServiceCollection.
+    /// </summary>
+    /// <param name="services">The IServiceCollection to add view models to.</param>
+    public static void AddOpenHABViewModels(this IServiceCollection services)
+    {
+        services.AddTransient<MainViewModel>();
+        services.AddTransient<SettingsViewModel>();
+        services.AddTransient<ConfigurationViewModel>();
+        services.AddTransient<LogsViewModel>();
+        services.AddTransient<MainUIViewModel>();
+    }
+
+    /// <summary>
+    /// Adds views to the specified IServiceCollection.
+    /// </summary>
+    /// <param name="services">The IServiceCollection to add views to.</param>
+    public static void AddViews(this IServiceCollection services)
+    {
+        services.AddSingleton<App>();
+        services.AddSingleton<MainWindow>();
+    }
+
+    /// <summary>
+    /// Adds configuration settings to the specified IServiceCollection.
+    /// </summary>
+    /// <param name="services">The IServiceCollection to add configuration settings to.</param>
+    /// <param name="configuration">The ConfigurationManager containing the configuration settings.</param>
+    public static void AddConfiguration(this IServiceCollection services, ConfigurationManager configuration)
+    {
+        IConfiguration config = configuration;
+        services.Configure<SettingOptions>(config);
+        services.Configure<ConnectionOptions>(config);
+    }
+
+    private static LoggingConfiguration GetLoggingConfiguration()
+    {
+        JsonLayout layout = new JsonLayout()
+        {
+            IncludeEventProperties = true,
+        };
+
+        layout.Attributes.Add(new JsonAttribute("time", @"${date:format=HH\:mm\:ss}"));
+        layout.Attributes.Add(new JsonAttribute("level", "${level:upperCase=true}"));
+        layout.Attributes.Add(new JsonAttribute("callsite", "${callsite:includeSourcePath=false}"));
+        layout.Attributes.Add(new JsonAttribute("message", "${message}"));
+        layout.Attributes.Add(new JsonAttribute("exception", "${exception:format=ToString}"));
+        layout.Attributes.Add(new JsonAttribute("stacktrace", "${onexception:inner=${stacktrace:topFrames=10}}"));
+
+        FileTarget fileTarget = new FileTarget("file")
+        {
+            FileName = "${var:LogPath}/${shortdate}.json",
+            Layout = layout,
+            MaxArchiveFiles = 3,
+            ArchiveEvery = FileArchivePeriod.Day,
+        };
+
+        LoggingConfiguration configuration = new LoggingConfiguration();
+        configuration.AddTarget(fileTarget);
+        configuration.AddRuleForAllLevels(fileTarget);
+
+        string logsFolderPath = AppPaths.LogsDirectory;
+        configuration.Variables["LogPath"] = logsFolderPath;
+
+        return configuration;
+    }
+}
diff --git a/src/openHAB.Windows/Controls/ChartWidget.xaml b/src/openHAB.Windows/Controls/ChartWidget.xaml
index 0ab2b0e1..eb23bf55 100644
--- a/src/openHAB.Windows/Controls/ChartWidget.xaml
+++ b/src/openHAB.Windows/Controls/ChartWidget.xaml
@@ -1,41 +1,38 @@
-<local:WidgetBase x:Class="OpenHAB.Windows.Controls.ChartWidget"
-				  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-				  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-				  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-				  xmlns:local="using:OpenHAB.Windows.Controls"
-				  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-				  mc:Ignorable="d"
-				  Visibility="{x:Bind Widget.Visibility, Converter={StaticResource BooleanToVisibilityConverter}}">
-
-	<Grid Style="{StaticResource Widget}"
-		  Tapped="ImageWidget_OnTapped">
-		<Grid.ColumnDefinitions>
-			<ColumnDefinition Width="Auto" />
-			<ColumnDefinition Width="*" />
-		</Grid.ColumnDefinitions>
-		<local:ImageLabel Grid.Column="0"
-						  IconPath="{x:Bind Widget, Mode=OneWay, Converter={StaticResource IconToPathConverter}}"
-						  LabelText="{x:Bind Widget.Label, Mode=OneWay}"
-						  LabelForeground="{x:Bind Widget.LabelColor,Converter={StaticResource StringToColorConverter}, Mode=OneWay}"/>
-
-		<ContentDialog x:Name="PopupDialog"
-					   Title="{x:Bind Widget.Label}"
-					   Grid.Column="0"
-					   Grid.ColumnSpan="2"
-					   Background="{StaticResource OpenHABLightColor}"
-					   IsPrimaryButtonEnabled="True"
-					   PrimaryButtonText="Close">
-			<Image x:Name="FullImage"
-				   HorizontalAlignment="Right"
-				   Source="http://demo.openhab.org:8080/chart?groups=Weather_Chart&amp;period=w"
-				   Stretch="Uniform" />
-		</ContentDialog>
-
-		<Image x:Name="ThumbImage"
-			   Grid.Column="1"
-			   Margin="8"
-			   HorizontalAlignment="Stretch"
-			   VerticalAlignment="Stretch"
-			   Stretch="UniformToFill" />
-	</Grid>
+<local:WidgetBase x:Class="openHAB.Windows.Controls.ChartWidget"
+                  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                  xmlns:local="using:openHAB.Windows.Controls"
+                  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                  mc:Ignorable="d"
+                  Visibility="{x:Bind Widget.Visibility}">
+    <Grid Style="{StaticResource Widget}"
+          Tapped="ImageWidget_OnTapped">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
+        <local:ImageLabel Grid.Column="0"
+                          IconPath="{x:Bind Widget.IconPath, Mode=OneWay}"
+                          LabelText="{x:Bind Widget.Label, Mode=OneWay}"
+                          LabelForeground="{x:Bind Widget.LabelColor, Mode=OneWay}" />
+        <ContentDialog x:Name="PopupDialog"
+                       Title="{x:Bind Widget.Label}"
+                       Grid.Column="0"
+                       Grid.ColumnSpan="2"
+                       Background="{StaticResource ContentDialog}"
+                       IsPrimaryButtonEnabled="True"
+                       PrimaryButtonText="Close">
+            <Image x:Name="FullImage"
+                   HorizontalAlignment="Right"
+                   Source="http://demo.openhab.org:8080/chart?groups=Weather_Chart&amp;period=w"
+                   Stretch="Uniform" />
+        </ContentDialog>
+        <Image x:Name="ThumbImage"
+               Grid.Column="1"
+               Margin="8"
+               HorizontalAlignment="Stretch"
+               VerticalAlignment="Stretch"
+               Stretch="UniformToFill" />
+    </Grid>
 </local:WidgetBase>
diff --git a/src/openHAB.Windows/Controls/ChartWidget.xaml.cs b/src/openHAB.Windows/Controls/ChartWidget.xaml.cs
index ee4a789f..2ce1c1f7 100644
--- a/src/openHAB.Windows/Controls/ChartWidget.xaml.cs
+++ b/src/openHAB.Windows/Controls/ChartWidget.xaml.cs
@@ -1,99 +1,99 @@
-using System;
-using OpenHAB.Core.Common;
-using OpenHAB.Core.Contracts.Services;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media.Imaging;
+using System;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media.Imaging;
+using openHAB.Core.Client.Connection.Contracts;
 
-namespace OpenHAB.Windows.Controls
+namespace openHAB.Windows.Controls;
+
+/// <summary>
+/// Widget control that represents an OpenHAB slider.
+/// </summary>
+public sealed partial class ChartWidget : WidgetBase
 {
+    private DispatcherTimer _timer;
+    private string _chartUri;
+
     /// <summary>
-    /// Widget control that represents an OpenHAB slider.
+    /// Gets or sets the assembled URI for the chart.
     /// </summary>
-    public sealed partial class ChartWidget : WidgetBase
+    public string ChartUri
     {
-        private DispatcherTimer _timer;
-        private string _chartUri;
-
-        /// <summary>
-        /// Gets or sets the assembled URI for the chart.
-        /// </summary>
-        public string ChartUri
+        get => _chartUri;
+        set
         {
-            get => _chartUri;
-            set
-            {
-                _chartUri = value;
-                RaisePropertyChanged();
-            }
+            _chartUri = value;
+            RaisePropertyChanged();
         }
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ChartWidget"/> class.
-        /// </summary>
-        public ChartWidget()
-        {
-            InitializeComponent();
-            Loaded += OnLoaded;
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ChartWidget"/> class.
+    /// </summary>
+    public ChartWidget()
+    {
+        InitializeComponent();
+        Loaded += OnLoaded;
+    }
 
-        private void OnLoaded(object sender, RoutedEventArgs routedEventArgs)
-        {
-            SetState();
+    private void OnLoaded(object sender, RoutedEventArgs routedEventArgs)
+    {
+        SetState();
 
-            SetSources();
-            InitTimer();
-        }
+        SetSources();
+        InitTimer();
+    }
+
+    internal override void SetState()
+    {
+        IConnectionService connectionService = Program.Host.Services.GetRequiredService<IConnectionService>();
+        var serverUrl = connectionService.CurrentConnection.Url;
 
-        internal override void SetState()
+        if (!serverUrl.EndsWith("/"))
         {
-            var serverUrl = OpenHABHttpClient.BaseUrl;
+            serverUrl += "/";
+        }
 
-            if (!serverUrl.EndsWith("/"))
-            {
-                serverUrl += "/";
-            }
+        // http://demo.openhab.org:8080/chart?groups=Weather_Chart&period=d
+        ChartUri = $"{serverUrl}chart?groups={Widget.Item.Name}&period={Widget.Period}";
+    }
 
-            // http://demo.openhab.org:8080/chart?groups=Weather_Chart&period=d
-            ChartUri = $"{serverUrl}chart?groups={Widget.Item.Name}&period={Widget.Period}";
+    private void InitTimer()
+    {
+        if (Widget.Refresh <= 0)
+        {
+            return;
         }
 
-        private void InitTimer()
-        {
-            if (Widget.Refresh <= 0)
-            {
-                return;
-            }
+        _timer = new DispatcherTimer { Interval = new TimeSpan(0, 0, 0, 0, Widget.Refresh) };
+        _timer.Tick += TimerOnTick;
+        _timer.Start();
+    }
 
-            _timer = new DispatcherTimer { Interval = new TimeSpan(0, 0, 0, 0, Widget.Refresh) };
-            _timer.Tick += TimerOnTick;
-            _timer.Start();
-        }
+    private void TimerOnTick(object sender, object o)
+    {
+        SetState();
+        SetSources();
+    }
 
-        private void TimerOnTick(object sender, object o)
+    private void SetSources()
+    {
+        ThumbImage.Source = new BitmapImage(
+            new Uri(ChartUri, UriKind.Absolute))
         {
-            SetState();
-            SetSources();
-        }
+            CreateOptions = BitmapCreateOptions.IgnoreImageCache,
+        };
 
-        private void SetSources()
+        FullImage.Source = new BitmapImage(
+            new Uri(ChartUri, UriKind.Absolute))
         {
-            ThumbImage.Source = new BitmapImage(
-                new Uri(ChartUri, UriKind.Absolute))
-            {
-                CreateOptions = BitmapCreateOptions.IgnoreImageCache,
-            };
-
-            FullImage.Source = new BitmapImage(
-                new Uri(ChartUri, UriKind.Absolute))
-            {
-                CreateOptions = BitmapCreateOptions.IgnoreImageCache,
-            };
-        }
+            CreateOptions = BitmapCreateOptions.IgnoreImageCache,
+        };
+    }
 
-        private async void ImageWidget_OnTapped(object sender, TappedRoutedEventArgs e)
-        {
-            await PopupDialog.ShowAsync();
-        }
+    private async void ImageWidget_OnTapped(object sender, TappedRoutedEventArgs e)
+    {
+        await PopupDialog.ShowAsync();
     }
 }
diff --git a/src/openHAB.Windows/Controls/ColorMap.xaml b/src/openHAB.Windows/Controls/ColorMap.xaml
index b9b2a424..91921f1f 100644
--- a/src/openHAB.Windows/Controls/ColorMap.xaml
+++ b/src/openHAB.Windows/Controls/ColorMap.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="OpenHAB.Windows.Controls.ColorMap"
+<UserControl x:Class="openHAB.Windows.Controls.ColorMap"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
diff --git a/src/openHAB.Windows/Controls/ColorMap.xaml.cs b/src/openHAB.Windows/Controls/ColorMap.xaml.cs
index 55bff9dc..cd19e138 100644
--- a/src/openHAB.Windows/Controls/ColorMap.xaml.cs
+++ b/src/openHAB.Windows/Controls/ColorMap.xaml.cs
@@ -1,301 +1,321 @@
-using System;
+using System;
 using System.IO;
 using System.Linq;
 using System.Numerics;
 using System.Runtime.InteropServices.WindowsRuntime;
 using System.Threading.Tasks;
+using Microsoft.UI;
+using Microsoft.UI.Input;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Media.Imaging;
 using Windows.Foundation;
 using Windows.UI;
-using Windows.UI.Input;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Media.Imaging;
-using ColorChangedEventArgs = OpenHAB.Core.Common.ColorChangedEventArgs;
-using ColorHelper = OpenHAB.Core.Common.ColorHelper;
-
-namespace OpenHAB.Windows.Controls
+using ColorChangedEventArgs = openHAB.Core.Common.ColorChangedEventArgs;
+using ColorHelper = openHAB.Core.Common.ColorHelper;
+
+namespace openHAB.Windows.Controls;
+
+/// <summary>
+/// Colorpicker control.
+/// </summary>
+public sealed partial class ColorMap : UserControl
 {
+    private readonly GradientStop _lightnessStart;
+    private readonly GradientStop _lightnessMid;
+    private readonly GradientStop _lightnessEnd;
+
+    private PointerPoint _lastPoint;
+    private WriteableBitmap _bitmap;
+    private double _colorX;
+    private double _colorY;
+    private bool _settingColor;
+    private bool _isloaded;
+    private double _angle;
+    private double _radialpos;
+
     /// <summary>
-    /// Colorpicker control.
+    /// Event that fires whenever a new color is selected
     /// </summary>
-    public sealed partial class ColorMap : UserControl
+    public event EventHandler<ColorChangedEventArgs> ColorChanged;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ColorMap"/> class.
+    /// </summary>
+    public ColorMap()
     {
-        private readonly GradientStop _lightnessStart;
-        private readonly GradientStop _lightnessMid;
-        private readonly GradientStop _lightnessEnd;
-
-        private PointerPoint _lastPoint;
-        private WriteableBitmap _bitmap;
-        private double _colorX;
-        private double _colorY;
-        private bool _settingColor;
-        private bool _isloaded;
-        private double _angle;
-        private double _radialpos;
-
-        /// <summary>
-        /// Event that fires whenever a new color is selected
-        /// </summary>
-        public event EventHandler<ColorChangedEventArgs> ColorChanged;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ColorMap"/> class.
-        /// </summary>
-        public ColorMap()
-        {
-            InitializeComponent();
+        InitializeComponent();
 
-            Loaded += MeshCanvas_Loaded;
+        Loaded += MeshCanvas_Loaded;
 
-            ellipse.PointerMoved += Image3_PointerMoved;
-            ellipse.PointerPressed += Image3_PointerPressed;
-            ellipse.PointerReleased += Image3_PointerReleased;
+        ellipse.PointerMoved += Image3_PointerMoved;
+        ellipse.PointerPressed += Image3_PointerPressed;
+        ellipse.PointerReleased += Image3_PointerReleased;
 
-            var lightnessGradient = new LinearGradientBrush
-            {
-                StartPoint = new Point(0, 0),
-                EndPoint = new Point(0, 1),
-            };
-
-            _lightnessStart = new GradientStop();
-            _lightnessMid = new GradientStop { Offset = 0.5 };
-            _lightnessEnd = new GradientStop { Offset = 1 };
-            lightnessGradient.GradientStops = new GradientStopCollection()
-            {
-                _lightnessStart, _lightnessMid, _lightnessEnd,
-            };
-        }
+        var lightnessGradient = new LinearGradientBrush
+        {
+            StartPoint = new Point(0, 0),
+            EndPoint = new Point(0, 1),
+        };
+
+        _lightnessStart = new GradientStop();
+        _lightnessMid = new GradientStop { Offset = 0.5 };
+        _lightnessEnd = new GradientStop { Offset = 1 };
+        lightnessGradient.GradientStops = new GradientStopCollection()
+        {
+            _lightnessStart, _lightnessMid, _lightnessEnd,
+        };
+    }
 
-        /// <summary>
-        /// Gets or sets the Color property.
-        /// </summary>
-        public Color Color
+    /// <summary>
+    /// Gets or sets the Color property.
+    /// </summary>
+    public Color Color
+    {
+        get
+        {
+            return (Color)GetValue(ColorProperty);
+        }
+        set
         {
-            get { return (Color)GetValue(ColorProperty); }
-            set { SetValue(ColorProperty, value); }
+            SetValue(ColorProperty, value);
         }
+    }
 
-        /// <summary>Gets or sets the angle.</summary>
-        /// <value>The angle.</value>
-        public double Angle
+    /// <summary>Gets or sets the angle.</summary>
+    /// <value>The angle.</value>
+    public double Angle
+    {
+        get
         {
-            get { return _angle; }
-            set { _angle = value; }
+            return _angle;
         }
+        set
+        {
+            _angle = value;
+        }
+    }
 
-        /// <summary>Gets or sets the radial position.</summary>
-        /// <value>The radial position.</value>
-        public double RadialPos
+    /// <summary>Gets or sets the radial position.</summary>
+    /// <value>The radial position.</value>
+    public double RadialPos
+    {
+        get
         {
-            get { return _radialpos; }
-            set { _radialpos = value; }
+            return _radialpos;
         }
+        set
+        {
+            _radialpos = value;
+        }
+    }
 
-        /// <summary>
-        /// Bindable property for the Color property.
-        /// </summary>
-        public static readonly DependencyProperty ColorProperty =
-            DependencyProperty.Register("Color", typeof(Color), typeof(ColorMap), new PropertyMetadata(default(Color), OnColorChanged));
+    /// <summary>
+    /// Bindable property for the Color property.
+    /// </summary>
+    public static readonly DependencyProperty ColorProperty =
+        DependencyProperty.Register("Color", typeof(Color), typeof(ColorMap), new PropertyMetadata(default(Color), OnColorChanged));
+
+    private static void OnColorChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        ColorMap? colorMap = d as ColorMap;
+        colorMap?.ColorChanged?.Invoke(colorMap, new ColorChangedEventArgs((Color)e.NewValue));
 
-        private static void OnColorChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        if (colorMap == null || colorMap._settingColor)
         {
-            var map = d as ColorMap;
-            map?.ColorChanged?.Invoke(map, new ColorChangedEventArgs((Color)e.NewValue));
+            return;
+        }
 
-            if (map == null || map._settingColor)
-            {
-                return;
-            }
+        Color col = (Color)e.NewValue;
+        Vector4 hsl = ColorHelper.ToHSL(col);
 
-            var col = (Color)e.NewValue;
-            var hsl = ColorHelper.ToHSL(col);
+        colorMap._lightnessMid.Color = ColorHelper.FromHSL(new Vector4(hsl.X, 1, 0.5f, 1));
 
-            map._lightnessMid.Color = ColorHelper.FromHSL(new Vector4(hsl.X, 1, 0.5f, 1));
+        double angle = Math.PI * 2 * hsl.X;
+        Vector2 normalized = new Vector2((float)Math.Cos(angle), (float)Math.Sin(angle));
+        Vector2 halfSize = new Vector2(
+            (float)colorMap.ellipse.ActualWidth / 2,
+            (float)colorMap.ellipse.ActualHeight / 2);
 
-            double angle = Math.PI * 2 * hsl.X;
-            Vector2 normalized = new Vector2((float)Math.Cos(angle), (float)Math.Sin(angle));
-            Vector2 halfSize = new Vector2(
-                (float)map.ellipse.ActualWidth / 2,
-                (float)map.ellipse.ActualHeight / 2);
+        Vector2 pos = (hsl.Y / 2 * normalized * halfSize * new Vector2(1, -1)) + halfSize;
 
-            Vector2 pos = ((hsl.Y / 2) * normalized * halfSize * new Vector2(1, -1)) + halfSize;
+        colorMap._colorX = pos.X;
+        colorMap._colorY = pos.Y;
+        colorMap.UpdateThumb();
+    }
 
-            map._colorX = pos.X;
-            map._colorY = pos.Y;
-            map.UpdateThumb();
-        }
+    private void Image3_PointerPressed(object sender, PointerRoutedEventArgs e)
+    {
+        ellipse.CapturePointer(e.Pointer);
+        _lastPoint = e.GetCurrentPoint(ellipse);
+        _colorX = _lastPoint.Position.X;
+        _colorY = _lastPoint.Position.Y;
+        UpdateColor();
+        UpdateAnglePos();
+        UpdateThumb();
+        e.Handled = true;
+    }
 
-        private void Image3_PointerPressed(object sender, PointerRoutedEventArgs e)
-        {
-            ellipse.CapturePointer(e.Pointer);
-            _lastPoint = e.GetCurrentPoint(ellipse);
-            _colorX = _lastPoint.Position.X;
-            _colorY = _lastPoint.Position.Y;
-            UpdateColor();
-            UpdateAnglePos();
-            UpdateThumb();
-            e.Handled = true;
-        }
+    private void Image3_PointerReleased(object sender, PointerRoutedEventArgs e)
+    {
+        ellipse.ReleasePointerCapture(e.Pointer);
+        _lastPoint = null;
+        e.Handled = true;
+    }
 
-        private void Image3_PointerReleased(object sender, PointerRoutedEventArgs e)
+    private void Image3_PointerMoved(object sender, PointerRoutedEventArgs e)
+    {
+        if (ellipse.PointerCaptures?.Any(p => p.PointerId == e.Pointer.PointerId) != true)
         {
-            ellipse.ReleasePointerCapture(e.Pointer);
-            _lastPoint = null;
-            e.Handled = true;
+            return;
         }
 
-        private void Image3_PointerMoved(object sender, PointerRoutedEventArgs e)
+        _lastPoint = e.GetCurrentPoint(ellipse);
+        _colorX = _lastPoint.Position.X;
+        _colorY = _lastPoint.Position.Y;
+
+        var bounds = new Rect(0, 0, ellipse.ActualWidth, ellipse.ActualHeight);
+        if (!bounds.Contains(_lastPoint.Position) || !UpdateColor())
         {
-            if (ellipse.PointerCaptures?.Any(p => p.PointerId == e.Pointer.PointerId) != true)
-            {
-                return;
-            }
+            return;
+        }
 
-            _lastPoint = e.GetCurrentPoint(ellipse);
-            _colorX = _lastPoint.Position.X;
-            _colorY = _lastPoint.Position.Y;
+        UpdateThumb();
+        e.Handled = true;
+    }
 
-            var bounds = new Rect(0, 0, ellipse.ActualWidth, ellipse.ActualHeight);
-            if (!bounds.Contains(_lastPoint.Position) || !UpdateColor())
-            {
-                return;
-            }
+    private void UpdateThumb()
+    {
+        Canvas.SetLeft(thumb, _colorX - (thumb.ActualWidth / 2));
+        Canvas.SetTop(thumb, _colorY - (thumb.ActualHeight / 2));
+        thumb.Visibility = Visibility.Visible;
+    }
 
-            UpdateThumb();
-            e.Handled = true;
+    private void UpdateAnglePos()
+    {
+        var sizeX = ellipse.ActualWidth;
+        var sizeY = ellipse.ActualHeight;
+        var x = _colorX / sizeX;
+        var y = 1 - (_colorY / sizeY);
+        var intangle = Math.Abs(Math.Atan((y - 0.5) / (x - 0.5)) * 180 / Math.PI); // Absolute Value
+
+        // Check Quadrant
+        if (x >= 0.5 && y >= 0.5)
+        {
+            _angle = 270 - intangle;
         }
-
-        private void UpdateThumb()
+        else if (x < 0.5 && y >= 0.5)
         {
-            Canvas.SetLeft(thumb, _colorX - (thumb.ActualWidth / 2));
-            Canvas.SetTop(thumb, _colorY - (thumb.ActualHeight / 2));
-            thumb.Visibility = Visibility.Visible;
+            _angle = 180 + intangle;
         }
-
-        private void UpdateAnglePos()
+        else if (x < 0.5 && y < 0.5)
         {
-            var sizeX = ellipse.ActualWidth;
-            var sizeY = ellipse.ActualHeight;
-            var x = _colorX / sizeX;
-            var y = 1 - (_colorY / sizeY);
-            var intangle = Math.Abs((Math.Atan((y - 0.5) / (x - 0.5)) * 180) / Math.PI); // Absolute Value
-
-            // Check Quadrant
-            if (x >= 0.5 && y >= 0.5)
-            {
-                _angle = 270 - intangle;
-            }
-            else if (x < 0.5 && y >= 0.5)
-            {
-                _angle = 180 + intangle;
-            }
-            else if (x < 0.5 && y < 0.5)
-            {
-                _angle = 180 - intangle;
-            }
-            else
-            {
-                _angle = intangle;
-            }
-
-            _radialpos = Math.Sqrt(Math.Pow(x - 0.5, 2) + Math.Pow(y - 0.5, 2));
-            _radialpos = _radialpos * 2.2; // 2times because we are working with 0.5 as max. .2 to give a bit more value and make it easier to catch max value;
-            if (_radialpos > 1)
-            {
-                _radialpos = 1;
-            }
-
-            _radialpos = _radialpos * 100;
+            _angle = 180 - intangle;
         }
-
-        private bool UpdateColor()
+        else
         {
-            if (!_isloaded)
-            {
-                return false;
-            }
-
-            var x = _colorX / ellipse.ActualWidth;
-            var y = 1 - (_colorY / ellipse.ActualHeight);
-            var selectedColor = CalcWheelColor((float)x, 1 - (float)y, 100);
-
-            if (selectedColor.A <= 0)
-            {
-                return false;
-            }
-
-            SetColor(selectedColor);
-            _lightnessStart.Color = Colors.White;
-            _lightnessMid.Color = CalcWheelColor((float)x, 1 - (float)y, 0.5f);
-            _lightnessEnd.Color = Colors.Black;
-            return true;
+            _angle = intangle;
         }
 
-        private void SetColor(Color color)
+        _radialpos = Math.Sqrt(Math.Pow(x - 0.5, 2) + Math.Pow(y - 0.5, 2));
+
+        // 2times because we are working with 0.5 as max. .2 to give a bit more value and make it easier to catch max value;
+        _radialpos = _radialpos * 2.2;
+        if (_radialpos > 1)
         {
-            _settingColor = true;
-            Color = color;
-            _settingColor = false;
+            _radialpos = 1;
         }
 
-        private async void MeshCanvas_Loaded(object sender, RoutedEventArgs e)
+        _radialpos = _radialpos * 100;
+    }
+
+    private bool UpdateColor()
+    {
+        if (!_isloaded)
         {
-            _bitmap = new WriteableBitmap(1000, 1000);
-            await CreateHueCircle(0.5f);
-            image3.ImageSource = _bitmap;
-            _isloaded = true;
+            return false;
         }
 
-        private Task CreateHueCircle(float lightness)
+        double x = _colorX / ellipse.ActualWidth;
+        double y = 1 - (_colorY / ellipse.ActualHeight);
+        Color selectedColor = CalcWheelColor((float)x, 1 - (float)y, 100);
+
+        if (selectedColor.A <= 0)
         {
-            return FillBitmap(_bitmap, (x, y) => CalcWheelColor(x, y, lightness));
+            return false;
         }
 
-        private Color CalcWheelColor(float x, float y, float lightness)
-        {
-            x = x - 0.5f;
-            y = (1 - y) - 0.5f;
-            float saturation = 2 * (float)Math.Sqrt((x * x) + (y * y));
-            float hue = y < 0 ?
-                (float)Math.Atan2(-y, -x) + (float)Math.PI :
-                (float)Math.Atan2(y, x);
-
-            if (saturation > 1)
-            {
-                saturation = 1;
-            }
+        SetColor(selectedColor);
+        _lightnessStart.Color = Colors.White;
+        _lightnessMid.Color = CalcWheelColor((float)x, 1 - (float)y, 0.5f);
+        _lightnessEnd.Color = Colors.Black;
+        return true;
+    }
+
+    private void SetColor(Color color)
+    {
+        _settingColor = true;
+        Color = color;
+        _settingColor = false;
+    }
+
+    private async void MeshCanvas_Loaded(object sender, RoutedEventArgs e)
+    {
+        _bitmap = new WriteableBitmap(1000, 1000);
+        await CreateHueCircle(0.5f);
+        image3.ImageSource = _bitmap;
+        _isloaded = true;
+    }
+
+    private Task CreateHueCircle(float lightness)
+    {
+        return FillBitmap(_bitmap, (x, y) => CalcWheelColor(x, y, lightness));
+    }
 
-            return ColorHelper.FromHSL(new Vector4(hue / ((float)Math.PI * 2), saturation, lightness, 1));
+    private Color CalcWheelColor(float x, float y, float lightness)
+    {
+        x = x - 0.5f;
+        y = 1 - y - 0.5f;
+        float saturation = 2 * (float)Math.Sqrt((x * x) + (y * y));
+        float hue = y < 0 ?
+            (float)Math.Atan2(-y, -x) + (float)Math.PI :
+            (float)Math.Atan2(y, x);
+
+        if (saturation > 1)
+        {
+            saturation = 1;
         }
 
-        private async Task FillBitmap(WriteableBitmap bmp, Func<float, float, Color> fillPixel)
+        return ColorHelper.FromHSL(new Vector4(hue / ((float)Math.PI * 2), saturation, lightness, 1));
+    }
+
+    private async Task FillBitmap(WriteableBitmap bmp, Func<float, float, Color> fillPixel)
+    {
+        var stream = bmp.PixelBuffer.AsStream();
+        int width = bmp.PixelWidth;
+        int height = bmp.PixelHeight;
+        await Task.Run(() =>
         {
-            var stream = bmp.PixelBuffer.AsStream();
-            int width = bmp.PixelWidth;
-            int height = bmp.PixelHeight;
-            await Task.Run(() =>
+            for (int y = 0; y < width; y++)
             {
-                for (int y = 0; y < width; y++)
+                for (int x = 0; x < height; x++)
                 {
-                    for (int x = 0; x < height; x++)
-                    {
-                        var color = fillPixel((float)x / width, (float)y / height);
-                        WriteBgra(stream, color);
-                    }
+                    var color = fillPixel((float)x / width, (float)y / height);
+                    WriteBgra(stream, color);
                 }
-            });
-            stream.Dispose();
-            bmp.Invalidate();
-        }
+            }
+        });
+        stream.Dispose();
+        bmp.Invalidate();
+    }
 
-        private void WriteBgra(Stream stream, Color color)
-        {
-            stream.WriteByte(color.B);
-            stream.WriteByte(color.G);
-            stream.WriteByte(color.R);
-            stream.WriteByte(color.A);
-        }
+    private void WriteBgra(Stream stream, Color color)
+    {
+        stream.WriteByte(color.B);
+        stream.WriteByte(color.G);
+        stream.WriteByte(color.R);
+        stream.WriteByte(color.A);
     }
 }
diff --git a/src/openHAB.Windows/Controls/ColorWidget.xaml b/src/openHAB.Windows/Controls/ColorWidget.xaml
index 21db1320..436b59e0 100644
--- a/src/openHAB.Windows/Controls/ColorWidget.xaml
+++ b/src/openHAB.Windows/Controls/ColorWidget.xaml
@@ -1,16 +1,15 @@
-<local:WidgetBase x:Class="OpenHAB.Windows.Controls.ColorWidget"
+<local:WidgetBase x:Class="openHAB.Windows.Controls.ColorWidget"
 				  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 				  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-				  xmlns:controls="using:WinRTXamlToolkit.Controls"
-				  xmlns:converters="using:OpenHAB.Windows.Converters"
+				  xmlns:converters="using:openHAB.Windows.Converters"
 				  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-				  xmlns:local="using:OpenHAB.Windows.Controls"
+				  xmlns:local="using:openHAB.Windows.Controls"
 				  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 				  d:DesignHeight="300"
 				  d:DesignWidth="400"
 				  VariableSizedWrapGrid.ColumnSpan="2"
 				  mc:Ignorable="d"
-				  Visibility="{x:Bind Widget.Visibility, Converter={StaticResource BooleanToVisibilityConverter}}">
+				  Visibility="{x:Bind Widget.Visibility}">
 
     <Grid Style="{StaticResource Widget}">
         <Grid.ColumnDefinitions>
@@ -19,9 +18,9 @@
         </Grid.ColumnDefinitions>
 
         <local:ImageLabel VerticalAlignment="Center"
-						  IconPath="{x:Bind Widget, Converter={StaticResource IconToPathConverter}, Mode=OneWay}"
-						  LabelText="{x:Bind Widget.Label, Mode=OneWay}"
-						  LabelForeground="{x:Bind Widget.LabelColor,Converter={StaticResource StringToColorConverter}, Mode=OneWay}"/>
+                          IconPath="{x:Bind Widget.IconPath, Mode=OneWay}"
+                          LabelText="{x:Bind Widget.Label, Mode=OneWay}"
+						  LabelForeground="{x:Bind Widget.LabelColor, Mode=OneWay}"/>
 
         <Grid Grid.Column="1" HorizontalAlignment="Right" Margin="0,0,10,0">
             <Grid.ColumnDefinitions>
diff --git a/src/openHAB.Windows/Controls/ColorWidget.xaml.cs b/src/openHAB.Windows/Controls/ColorWidget.xaml.cs
index 0c5caae0..67dc3dc5 100644
--- a/src/openHAB.Windows/Controls/ColorWidget.xaml.cs
+++ b/src/openHAB.Windows/Controls/ColorWidget.xaml.cs
@@ -1,108 +1,108 @@
-using System;
+using System;
 using System.Globalization;
 using System.Text.RegularExpressions;
 using CommunityToolkit.Mvvm.Messaging;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using OpenHAB.Core.Messages;
-using OpenHAB.Windows.Services;
+using Microsoft.UI;
+using Microsoft.UI.Xaml;
+using openHAB.Core.Client.Messages;
 using Windows.UI;
-using Windows.UI.Xaml;
 
-namespace OpenHAB.Windows.Controls
+namespace openHAB.Windows.Controls;
+
+/// <summary>
+/// Widget control that represents an OpenHAB text.
+/// </summary>
+public sealed partial class ColorWidget : WidgetBase
 {
+    private Color _selectedColor;
+    private readonly ILogger<ColorWidget> _logger;
+
     /// <summary>
-    /// Widget control that represents an OpenHAB text.
+    /// Initializes a new instance of the <see cref="ColorWidget"/> class.
     /// </summary>
-    public sealed partial class ColorWidget : WidgetBase
+    public ColorWidget()
     {
-        private Color _selectedColor;
-        private ILogger<ColorWidget> _logger;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ColorWidget"/> class.
-        /// </summary>
-        public ColorWidget()
-        {
-            InitializeComponent();
-            Loaded += OnLoaded;
-
-            _logger = (ILogger<ColorWidget>)DIService.Instance.Services.GetService(typeof(ILogger<ColorWidget>));
-        }
+        InitializeComponent();
+        Loaded += OnLoaded;
 
-        /// <summary>
-        /// Gets or sets the color currently selected in the color picker widget.
-        /// </summary>
-        public Color SelectedColor
-        {
-            get => _selectedColor;
-
-            set
-            {
-                if (_selectedColor == value)
-                {
-                    return;
-                }
+        _logger = Program.Host.Services.GetRequiredService<ILogger<ColorWidget>>();
+    }
 
-                _selectedColor = value;
-                RaisePropertyChanged();
-            }
-        }
+    /// <summary>
+    /// Gets or sets the color currently selected in the color picker widget.
+    /// </summary>
+    public Color SelectedColor
+    {
+        get => _selectedColor;
 
-        internal override void SetState()
+        set
         {
-            string rgbString = Widget.Item?.State;
-            string[] rgbSegements = Widget.Item?.State.Split(',');
-
-            Regex rgbRegEx = new Regex(@"^(([1-9][\.\d]*)(,)){2}([1-9][\.\d]*)");
-
-            if (rgbString == null || rgbString.Length == 0 || !rgbRegEx.IsMatch(rgbString) || rgbSegements == null)
+            if (_selectedColor == value)
             {
-                _logger.LogWarning($"Item state '{rgbString}' is not a valid RGB value");
                 return;
             }
 
-            double h = Convert.ToDouble(rgbSegements[0], CultureInfo.InvariantCulture);
-            double s = Convert.ToDouble(rgbSegements[1], CultureInfo.InvariantCulture) / 100;
-            double v = Convert.ToDouble(rgbSegements[2], CultureInfo.InvariantCulture);
-
-            // Disable Changed Events
-            ClrPicker.ColorChanged -= ClrPicker_ColorChanged;
-            BrightnessSlider.ValueChanged -= BrightnessSlider_ValueChanged;
+            _selectedColor = value;
+            RaisePropertyChanged();
+        }
+    }
 
-            // Check if brightness > 0 to prevent Widget from losing last Color
-            if (v > 0)
-            {
-                // Set Colorproperty
-                SelectedColor = Microsoft.Toolkit.Uwp.Helpers.ColorHelper.FromHsv(h, s, 1);
-            }
+    internal override void SetState()
+    {
+        string? rgbString = Widget.Item?.State;
+        string[]? rgbSegements = Widget.Item?.State.Split(',');
 
-            // Set Brightness to Slider
-            BrightnessSlider.Value = v;
-            BrightnessSlider.ValueChanged += BrightnessSlider_ValueChanged;
-            ClrPicker.ColorChanged += ClrPicker_ColorChanged;
-        }
+        Regex rgbRegEx = new Regex(@"^(([1-9][\.\d]*)(,)){2}([1-9][\.\d]*)", RegexOptions.None, TimeSpan.FromMilliseconds(100));
 
-        private void OnLoaded(object sender, RoutedEventArgs routedEventArgs)
+        if (rgbString == null || rgbString.Length == 0 || !rgbRegEx.IsMatch(rgbString) || rgbSegements == null)
         {
-            SelectedColor = Colors.White;
-            SetState();
+            _logger.LogWarning($"Item state '{rgbString}' is not a valid RGB value");
+            return;
         }
 
-        private void ClrPicker_ColorChanged(global::Windows.UI.Xaml.Controls.ColorPicker sender, global::Windows.UI.Xaml.Controls.ColorChangedEventArgs args)
-        {
-            ColorChanged();
-        }
+        double h = Convert.ToDouble(rgbSegements[0], CultureInfo.InvariantCulture);
+        double s = Convert.ToDouble(rgbSegements[1], CultureInfo.InvariantCulture) / 100;
+        double v = Convert.ToDouble(rgbSegements[2], CultureInfo.InvariantCulture);
 
-        private void BrightnessSlider_ValueChanged(object sender, global::Windows.UI.Xaml.Controls.Primitives.RangeBaseValueChangedEventArgs e)
-        {
-            ColorChanged();
-        }
+        // Disable Changed Events
+        ClrPicker.ColorChanged -= ClrPicker_ColorChanged;
+        BrightnessSlider.ValueChanged -= BrightnessSlider_ValueChanged;
 
-        /// <summary>Sends the Color to Openhab Messenger.</summary>
-        private void ColorChanged()
+        // Check if brightness > 0 to prevent Widget from losing last Color
+        if (v > 0)
         {
-            var hsvclr = Microsoft.Toolkit.Uwp.Helpers.ColorHelper.ToHsv(ClrPicker.Color);
-            StrongReferenceMessenger.Default.Send(new TriggerCommandMessage(Widget.Item, $"{hsvclr.H.ToString(CultureInfo.InvariantCulture)},{(hsvclr.S * 100).ToString(CultureInfo.InvariantCulture)}, {BrightnessSlider.Value.ToString(CultureInfo.InvariantCulture)}"));
+            // Set Colorproperty
+            SelectedColor = CommunityToolkit.WinUI.Helpers.ColorHelper.FromHsv(h, s, 1);
         }
+
+        // Set Brightness to Slider
+        BrightnessSlider.Value = v;
+        BrightnessSlider.ValueChanged += BrightnessSlider_ValueChanged;
+        ClrPicker.ColorChanged += ClrPicker_ColorChanged;
+    }
+
+    private void OnLoaded(object sender, RoutedEventArgs routedEventArgs)
+    {
+        SelectedColor = Colors.White;
+        SetState();
+    }
+
+    private void ClrPicker_ColorChanged(global::Microsoft.UI.Xaml.Controls.ColorPicker sender, global::Microsoft.UI.Xaml.Controls.ColorChangedEventArgs args)
+    {
+        ColorChanged();
+    }
+
+    private void BrightnessSlider_ValueChanged(object sender, global::Microsoft.UI.Xaml.Controls.Primitives.RangeBaseValueChangedEventArgs e)
+    {
+        ColorChanged();
+    }
+
+    /// <summary>Sends the Color to Openhab Messenger.</summary>
+    private void ColorChanged()
+    {
+        var hsvclr = CommunityToolkit.WinUI.Helpers.ColorHelper.ToHsv(ClrPicker.Color);
+        StrongReferenceMessenger.Default.Send(new TriggerCommandMessage(Widget.Item, $"{hsvclr.H.ToString(CultureInfo.InvariantCulture)},{(hsvclr.S * 100).ToString(CultureInfo.InvariantCulture)}, {BrightnessSlider.Value.ToString(CultureInfo.InvariantCulture)}"));
     }
 }
diff --git a/src/openHAB.Windows/Controls/ConnectionDialog.xaml b/src/openHAB.Windows/Controls/ConnectionDialog.xaml
index afd26323..52ca1eea 100644
--- a/src/openHAB.Windows/Controls/ConnectionDialog.xaml
+++ b/src/openHAB.Windows/Controls/ConnectionDialog.xaml
@@ -1,96 +1,95 @@
-<ContentDialog x:Class="OpenHAB.Windows.Controls.ConnectionDialog"
-			   x:Uid="ConnectionDialog"
-			   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-			   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-			   xmlns:local="using:OpenHAB.Windows.Controls"
-			   xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-			   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-			   xmlns:Interactivity="using:Microsoft.Xaml.Interactivity"
-			   xmlns:Core="using:Microsoft.Xaml.Interactions.Core"
-			   xmlns:converters="using:OpenHAB.Windows.Converters"
-			   mc:Ignorable="d">
-
-	<ContentDialog.Resources>
-		<converters:NullToBooleanConverter x:Key="NullToBooleanConverter" />
-		<converters:OpenHabUrlStateToGlyph x:Key="OpenHabUrlStateToGlyph" />
-	</ContentDialog.Resources>
-	<Grid>
-		<StackPanel Margin="0,0,10,0">
-			<TextBlock x:Uid="ConnectionProfile" />
-			<ComboBox Margin="0,0,12,12"
-					  x:Name="ProfileSeletion"
-					  ItemsSource="{Binding Profiles, Mode=TwoWay}"
-					  PlaceholderText="No profile selected"
-					  DisplayMemberPath="Name"
-					  SelectedItem="{Binding Profile, Mode=TwoWay}">                    
-				<Interactivity:Interaction.Behaviors>
-					<Core:EventTriggerBehavior EventName="SelectionChanged">
-						<Core:InvokeCommandAction Command="{Binding Path=SelectProfile, Mode=TwoWay}"
-												  CommandParameter="{Binding ElementName=ProfileSeletion,Path=SelectedValue}" />
-					</Core:EventTriggerBehavior>
-				</Interactivity:Interaction.Behaviors>
-			</ComboBox>
-			<TextBlock x:Uid="LocalUrlHeader" />
-			<TextBox x:Uid="LocalUrl"
-					 x:Name="TextBoxUrl"
-					 IsEnabled="{Binding AllowHostUrlConfiguration, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
-					 Margin="0,0,12,12"
-					 Text="{Binding Url, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
-				<Interactivity:Interaction.Behaviors>
-					<Core:EventTriggerBehavior EventName="LostFocus">
-						<Core:InvokeCommandAction Command="{Binding Path=UrlCheckCommand, Mode=TwoWay}"
-												  CommandParameter="{Binding ElementName=TextBoxUrl,Path=Text}" />
-					</Core:EventTriggerBehavior>
-				</Interactivity:Interaction.Behaviors>
-			</TextBox>
-			<TextBlock x:Uid="UsernameHeader" />
-			<TextBox x:Name="TextBoxUsername"
-					 Margin="0,0,12,12"
-					 IsEnabled="{Binding Profile, Converter={StaticResource NullToBooleanConverter}}"
-					 Text="{Binding Username, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
-				<Interactivity:Interaction.Behaviors>
-					<Core:EventTriggerBehavior EventName="LostFocus">
-						<Core:InvokeCommandAction Command="{Binding Path=UrlCheckCommand, Mode=TwoWay}"
-												  CommandParameter="{Binding ElementName=TextBoxUrl,Path=Text}" />
-					</Core:EventTriggerBehavior>
-				</Interactivity:Interaction.Behaviors>
-			</TextBox>
-			<TextBlock x:Uid="PasswordHeader" />
-			<PasswordBox x:Name="TextBoxPassword"
-						 Margin="0,0,12,12"
-						 IsEnabled="{Binding Profile, Converter={StaticResource NullToBooleanConverter}}"
-						 Password="{Binding Password, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
-				<Interactivity:Interaction.Behaviors>
-					<Core:EventTriggerBehavior EventName="LostFocus">
-						<Core:InvokeCommandAction Command="{Binding Path=UrlCheckCommand, Mode=TwoWay}"
-												  CommandParameter="{Binding ElementName=TextBoxUrl,Path=Text}" />
-					</Core:EventTriggerBehavior>
-				</Interactivity:Interaction.Behaviors>
-			</PasswordBox>
-			<TextBlock x:Uid="IgnoreSSLCertErrors" />
-			<CheckBox x:Name="CheckBoxIgnoreSSL"
-					  Margin="0,0,0,12"
-					  IsEnabled="{Binding AllowIgnoreSSLCertificate, Mode=OneWay}"
-					  HorizontalAlignment="Stretch"
-					  VerticalAlignment="Stretch"
-					  IsChecked="{Binding WillIgnoreSSLCertificate, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
-			<TextBlock x:Uid="IgnoreSSLCertHostErrors" />
-			<CheckBox x:Name="CheckBoxIgnoreSSLHostname"
-					  Margin="0,0,0,12"
-					  IsEnabled="{Binding AllowIgnoreSSLHostname, Mode=OneWay}"
-					  HorizontalAlignment="Stretch"
-					  VerticalAlignment="Stretch"
-					  IsChecked="{Binding WillIgnoreSSLHostname, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
-			<StackPanel Orientation="Horizontal">
-				<TextBlock x:Uid="ConnectionCheck"
-						   Margin="0,0,10,0"
-						   VerticalAlignment="Center" />
-				<FontIcon x:Name="IconUrlStatusCheck"
-						  VerticalAlignment="Top"
-						  FontSize="32"
-						  FontFamily="{StaticResource SymbolThemeFontFamily}"
-						  Glyph="{Binding State, Converter={StaticResource OpenHabUrlStateToGlyph}, Mode=TwoWay}" />
-			</StackPanel>
-		</StackPanel>
-	</Grid>
+<ContentDialog x:Class="openHAB.Windows.Controls.ConnectionDialog"
+               x:Uid="ConnectionDialog"
+               xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+               xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+               xmlns:local="using:openHAB.Windows.Controls"
+               xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+               xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+               xmlns:Interactivity="using:Microsoft.Xaml.Interactivity"
+               xmlns:Core="using:Microsoft.Xaml.Interactions.Core"
+               xmlns:converters="using:openHAB.Windows.Converters"
+               mc:Ignorable="d">
+    <ContentDialog.Resources>
+        <converters:NullToBooleanConverter x:Key="NullToBooleanConverter" />
+        <converters:OpenHabUrlStateToGlyph x:Key="OpenHabUrlStateToGlyph" />
+    </ContentDialog.Resources>
+    <Grid>
+        <StackPanel Margin="0,0,10,0">
+            <TextBlock x:Uid="ConnectionProfile" />
+            <ComboBox Margin="0,0,12,12"
+                      x:Name="ProfileSeletion"
+                      ItemsSource="{Binding Profiles, Mode=TwoWay}"
+                      PlaceholderText="No profile selected"
+                      DisplayMemberPath="Name"
+                      SelectedItem="{Binding Profile, Mode=TwoWay}">
+                <Interactivity:Interaction.Behaviors>
+                    <Core:EventTriggerBehavior EventName="SelectionChanged">
+                        <Core:InvokeCommandAction Command="{Binding Path=SelectProfile, Mode=TwoWay}"
+                                                  CommandParameter="{Binding ElementName=ProfileSeletion,Path=SelectedValue}" />
+                    </Core:EventTriggerBehavior>
+                </Interactivity:Interaction.Behaviors>
+            </ComboBox>
+            <TextBlock x:Uid="LocalUrlHeader" />
+            <TextBox x:Uid="LocalUrl"
+                     x:Name="TextBoxUrl"
+                     IsEnabled="{Binding AllowHostUrlConfiguration, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                     Margin="0,0,12,12"
+                     Text="{Binding Url, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
+                <Interactivity:Interaction.Behaviors>
+                    <Core:EventTriggerBehavior EventName="LostFocus">
+                        <Core:InvokeCommandAction Command="{Binding Path=UrlCheckCommand, Mode=TwoWay}"
+                                                  CommandParameter="{Binding ElementName=TextBoxUrl,Path=Text}" />
+                    </Core:EventTriggerBehavior>
+                </Interactivity:Interaction.Behaviors>
+            </TextBox>
+            <TextBlock x:Uid="UsernameHeader" />
+            <TextBox x:Name="TextBoxUsername"
+                     Margin="0,0,12,12"
+                     IsEnabled="{Binding Profile, Converter={StaticResource NullToBooleanConverter}}"
+                     Text="{Binding Username, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
+                <Interactivity:Interaction.Behaviors>
+                    <Core:EventTriggerBehavior EventName="LostFocus">
+                        <Core:InvokeCommandAction Command="{Binding Path=UrlCheckCommand, Mode=TwoWay}"
+                                                  CommandParameter="{Binding ElementName=TextBoxUrl,Path=Text}" />
+                    </Core:EventTriggerBehavior>
+                </Interactivity:Interaction.Behaviors>
+            </TextBox>
+            <TextBlock x:Uid="PasswordHeader" />
+            <PasswordBox x:Name="TextBoxPassword"
+                         Margin="0,0,12,12"
+                         IsEnabled="{Binding Profile, Converter={StaticResource NullToBooleanConverter}}"
+                         Password="{Binding Password, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}">
+                <Interactivity:Interaction.Behaviors>
+                    <Core:EventTriggerBehavior EventName="LostFocus">
+                        <Core:InvokeCommandAction Command="{Binding Path=UrlCheckCommand, Mode=TwoWay}"
+                                                  CommandParameter="{Binding ElementName=TextBoxUrl,Path=Text}" />
+                    </Core:EventTriggerBehavior>
+                </Interactivity:Interaction.Behaviors>
+            </PasswordBox>
+            <TextBlock x:Uid="IgnoreSSLCertErrors" />
+            <CheckBox x:Name="CheckBoxIgnoreSSL"
+                      Margin="0,0,0,12"
+                      IsEnabled="{Binding AllowIgnoreSSLCertificate, Mode=OneWay}"
+                      HorizontalAlignment="Stretch"
+                      VerticalAlignment="Stretch"
+                      IsChecked="{Binding WillIgnoreSSLCertificate, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+            <TextBlock x:Uid="IgnoreSSLCertHostErrors" />
+            <CheckBox x:Name="CheckBoxIgnoreSSLHostname"
+                      Margin="0,0,0,12"
+                      IsEnabled="{Binding AllowIgnoreSSLHostname, Mode=OneWay}"
+                      HorizontalAlignment="Stretch"
+                      VerticalAlignment="Stretch"
+                      IsChecked="{Binding WillIgnoreSSLHostname, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
+            <StackPanel Orientation="Horizontal">
+                <TextBlock x:Uid="ConnectionCheck"
+                           Margin="0,0,10,0"
+                           VerticalAlignment="Center" />
+                <FontIcon x:Name="IconUrlStatusCheck"
+                          VerticalAlignment="Top"
+                          FontSize="32"
+                          FontFamily="{StaticResource SymbolThemeFontFamily}"
+                          Glyph="{Binding Path=Status.State, Converter={StaticResource OpenHabUrlStateToGlyph}, Mode=TwoWay}" />
+            </StackPanel>
+        </StackPanel>
+    </Grid>
 </ContentDialog>
diff --git a/src/openHAB.Windows/Controls/ConnectionDialog.xaml.cs b/src/openHAB.Windows/Controls/ConnectionDialog.xaml.cs
index f8981f0a..eb86cd4a 100644
--- a/src/openHAB.Windows/Controls/ConnectionDialog.xaml.cs
+++ b/src/openHAB.Windows/Controls/ConnectionDialog.xaml.cs
@@ -1,19 +1,16 @@
-using OpenHAB.Windows.ViewModel;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Markup;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Markup;
 
-namespace OpenHAB.Windows.Controls
+namespace openHAB.Windows.Controls;
+
+/// <summary>Dialog control for connection configruation.</summary>
+/// <seealso cref="ContentDialog" />
+/// <seealso cref="IComponentConnector" />
+public sealed partial class ConnectionDialog : ContentDialog
 {
-    /// <summary>Dialog control for connection configruation.</summary>
-    /// <seealso cref="ContentDialog" />
-    /// <seealso cref="IComponentConnector" />
-    /// <seealso cref="IComponentConnector2" />
-    public sealed partial class ConnectionDialog : ContentDialog
+    /// <summary>Initializes a new instance of the <see cref="ConnectionDialog"/> class.</summary>
+    public ConnectionDialog()
     {
-        /// <summary>Initializes a new instance of the <see cref="ConnectionDialog"/> class.</summary>
-        public ConnectionDialog()
-        {
-            this.InitializeComponent();
-        }
+        this.InitializeComponent();
     }
 }
diff --git a/src/openHAB.Windows/Controls/DeviceFamilyStateTrigger.cs b/src/openHAB.Windows/Controls/DeviceFamilyStateTrigger.cs
index d103fa0f..5329327f 100644
--- a/src/openHAB.Windows/Controls/DeviceFamilyStateTrigger.cs
+++ b/src/openHAB.Windows/Controls/DeviceFamilyStateTrigger.cs
@@ -1,41 +1,40 @@
-using OpenHAB.Core.Common;
-using Windows.UI.Xaml;
+using Microsoft.UI.Xaml;
+using openHAB.Core.Common;
 
-namespace OpenHAB.Windows.Controls
+namespace openHAB.Windows.Controls;
+
+/// <summary>
+/// Trigger to differentiate between device families.
+/// </summary>
+public class DeviceFamilyStateTrigger : StateTriggerBase
 {
     /// <summary>
-    /// Trigger to differentiate between device families.
+    /// The target device family property.
     /// </summary>
-    public class DeviceFamilyStateTrigger : StateTriggerBase
-    {
-        /// <summary>
-        /// The target device family property.
-        /// </summary>
-        public static readonly DependencyProperty TargetDeviceFamilyProperty = DependencyProperty.Register(
-            "TargetDeviceFamily", typeof(DeviceFamily), typeof(DeviceFamilyStateTrigger), new PropertyMetadata(default(DeviceFamily), OnDeviceTypePropertyChanged));
+    public static readonly DependencyProperty TargetDeviceFamilyProperty = DependencyProperty.Register(
+        "TargetDeviceFamily", typeof(DeviceFamily), typeof(DeviceFamilyStateTrigger), new PropertyMetadata(default(DeviceFamily), OnDeviceTypePropertyChanged));
 
-        /// <summary>
-        /// Gets or sets the target device family.
-        /// </summary>
-        /// <value>The target device family.</value>
-        public DeviceFamily TargetDeviceFamily
+    /// <summary>
+    /// Gets or sets the target device family.
+    /// </summary>
+    /// <value>The target device family.</value>
+    public DeviceFamily TargetDeviceFamily
+    {
+        get
         {
-            get
-            {
-                return (DeviceFamily)GetValue(TargetDeviceFamilyProperty);
-            }
-
-            set
-            {
-                SetValue(TargetDeviceFamilyProperty, value);
-            }
+            return (DeviceFamily)GetValue(TargetDeviceFamilyProperty);
         }
 
-        private static void OnDeviceTypePropertyChanged(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs eventArgs)
+        set
         {
-            var trigger = (DeviceFamilyStateTrigger)dependencyObject;
-            var newTargetDeviceFamily = (DeviceFamily)eventArgs.NewValue;
-            trigger.SetActive(newTargetDeviceFamily == DeviceTypeHelper.DeviceFamily);
+            SetValue(TargetDeviceFamilyProperty, value);
         }
     }
+
+    private static void OnDeviceTypePropertyChanged(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs eventArgs)
+    {
+        var trigger = (DeviceFamilyStateTrigger)dependencyObject;
+        var newTargetDeviceFamily = (DeviceFamily)eventArgs.NewValue;
+        trigger.SetActive(newTargetDeviceFamily == DeviceTypeHelper.DeviceFamily);
+    }
 }
diff --git a/src/openHAB.Windows/Controls/FrameWidget.xaml b/src/openHAB.Windows/Controls/FrameWidget.xaml
index bbec2f8a..5c7fdd57 100644
--- a/src/openHAB.Windows/Controls/FrameWidget.xaml
+++ b/src/openHAB.Windows/Controls/FrameWidget.xaml
@@ -1,65 +1,59 @@
-<local:WidgetBase x:Class="OpenHAB.Windows.Controls.FrameWidget"
-				  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-				  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-				  xmlns:converters="using:OpenHAB.Windows.Converters"
-				  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-				  xmlns:local="using:OpenHAB.Windows.Controls"
-				  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-				  Width="310"
-				  HorizontalAlignment="Stretch"
-				  VerticalAlignment="Stretch"
-				  d:DesignHeight="300"
-				  d:DesignWidth="400"
-				  mc:Ignorable="d"
-				  Visibility="{x:Bind Widget.Visibility, Converter={StaticResource BooleanToVisibilityConverter}}">
+<local:WidgetBase x:Class="openHAB.Windows.Controls.FrameWidget"
+                  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                  xmlns:converters="using:openHAB.Windows.Converters"
+                  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                  xmlns:local="using:openHAB.Windows.Controls"
+                  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                  HorizontalAlignment="Center"
+                  VerticalAlignment="Top"
+                  d:DesignHeight="300"
+                  d:DesignWidth="400"
+                  mc:Ignorable="d"
+                  Visibility="{x:Bind Widget.Visibility}">
 
-	<local:WidgetBase.Resources>
-		<Style TargetType="GridViewItem">
-			<Setter Property="HorizontalContentAlignment" Value="Stretch" />
-			<Setter Property="VerticalContentAlignment" Value="Stretch" />
-			<Setter Property="VerticalAlignment" Value="Stretch" />
-		</Style>
-		<converters:IconToBitmapConverter x:Key="IconToBitmapConverter" />
-	</local:WidgetBase.Resources>
-
-	<StackPanel VerticalAlignment="Stretch">
-		<StackPanel HorizontalAlignment="Stretch" Orientation="Horizontal">
-			<Image x:Name="Icon"
-				   Height="40"
-				   VerticalAlignment="Center"
-				   Source="{x:Bind Widget.Icon, Mode=OneWay, Converter={StaticResource IconToBitmapConverter}}"
-				   Stretch="UniformToFill" />
-			<TextBlock x:Name="Label"
-					   Margin="8"
-					   FontSize="18"
-					   Foreground="White"
-					   Text="{x:Bind Widget.Label, Mode=OneWay}"
-					   TextWrapping="Wrap" />
-		</StackPanel>
-		<GridView HorizontalContentAlignment="Stretch"
-				  VerticalContentAlignment="Stretch"
-				  IsItemClickEnabled="True"
-				  IsSwipeEnabled="True"
-				  ItemClick="OnItemClick"
-				  ItemTemplateSelector="{StaticResource WidgetTemplateSelector}"
-				  ItemsSource="{x:Bind Widget.Children, Mode=OneWay}"
-				  SelectionMode="None">
-			<GridView.ItemsPanel>
-				<ItemsPanelTemplate>
-					<VariableSizedWrapGrid ItemHeight="100" ItemWidth="300" />
-				</ItemsPanelTemplate>
-			</GridView.ItemsPanel>
-		</GridView>
-	</StackPanel>
-
-
-	<!--<StackPanel Margin="8, 4, 8, 4" Background="{StaticResource OpenHABLightGreyBrush}">
-		<local:ImageLabel IconPath="{x:Bind Widget, Mode=OneWay, Converter={StaticResource IconToPathConverter}}"
-						  LabelText="{x:Bind Widget.Label, Mode=OneWay}" />
-
-		<ItemsControl IsTapEnabled="False"
-					  Margin="0, 8, 0, 0"
-					  ItemTemplateSelector="{StaticResource WidgetTemplateSelector}"
-					  ItemsSource="{x:Bind Widget.Children, Mode=OneWay}" />
-	</StackPanel>-->
+    <local:WidgetBase.Resources>
+        <Style TargetType="GridViewItem">
+            <Setter Property="HorizontalContentAlignment"
+                    Value="Stretch" />
+            <Setter Property="VerticalContentAlignment"
+                    Value="Stretch" />
+            <Setter Property="VerticalAlignment"
+                    Value="Stretch" />
+        </Style>
+        <converters:IconToBitmapConverter x:Key="IconToBitmapConverter" />
+    </local:WidgetBase.Resources>
+    <StackPanel VerticalAlignment="Top"
+                CornerRadius="10"
+                Style="{StaticResource WidgetGroup}">
+        <StackPanel Margin="5,5,0,0"
+                    HorizontalAlignment="Stretch"
+                    Orientation="Horizontal">
+            <Image x:Name="Icon"
+                   Height="35"
+                   VerticalAlignment="Center"
+                   Source="{x:Bind Widget.Icon, Mode=OneWay}"
+                   Stretch="UniformToFill" />
+            <TextBlock x:Name="Label"
+                       Margin="8"
+                       Style="{StaticResource OpenHABGroupHeader}"
+                       Text="{x:Bind Widget.Label, Mode=OneWay}"
+                       TextWrapping="Wrap" />
+        </StackPanel>
+        <GridView HorizontalContentAlignment="Center"
+                  VerticalContentAlignment="Stretch"
+                  IsItemClickEnabled="True"
+                  IsSwipeEnabled="True"
+                  ItemClick="OnItemClick"
+                  ItemTemplateSelector="{StaticResource WidgetTemplateSelector}"
+                  ItemsSource="{x:Bind Widget.Children, Mode=TwoWay}"
+                  SelectionMode="None">
+            <GridView.ItemsPanel>
+                <ItemsPanelTemplate>
+                    <VariableSizedWrapGrid ItemHeight="100"
+                                           Margin="10"/>
+                </ItemsPanelTemplate>
+            </GridView.ItemsPanel>
+        </GridView>
+    </StackPanel>
 </local:WidgetBase>
diff --git a/src/openHAB.Windows/Controls/FrameWidget.xaml.cs b/src/openHAB.Windows/Controls/FrameWidget.xaml.cs
index 8af0d47d..e60d39c6 100644
--- a/src/openHAB.Windows/Controls/FrameWidget.xaml.cs
+++ b/src/openHAB.Windows/Controls/FrameWidget.xaml.cs
@@ -1,30 +1,35 @@
-using CommunityToolkit.Mvvm.Messaging;
-using OpenHAB.Core.Messages;
-using OpenHAB.Core.Model;
-using Windows.UI.Xaml.Controls;
+using CommunityToolkit.Mvvm.Messaging;
+using Microsoft.UI.Xaml.Controls;
+using openHAB.Windows.Messages;
+using openHAB.Windows.ViewModel;
 
-namespace OpenHAB.Windows.Controls
+namespace openHAB.Windows.Controls;
+
+/// <summary>
+/// Widget control that represents an OpenHAB frame.
+/// </summary>
+public sealed partial class FrameWidget : WidgetBase
 {
     /// <summary>
-    /// Widget control that represents an OpenHAB frame.
+    /// Initializes a new instance of the <see cref="FrameWidget"/> class.
     /// </summary>
-    public sealed partial class FrameWidget : WidgetBase
+    public FrameWidget()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="FrameWidget"/> class.
-        /// </summary>
-        public FrameWidget()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
+    }
 
-        private void OnItemClick(object sender, ItemClickEventArgs e)
+    private void OnItemClick(object sender, ItemClickEventArgs e)
+    {
+        WidgetViewModel? viewModel = e.ClickedItem as WidgetViewModel;
+        if (viewModel == null)
         {
-            StrongReferenceMessenger.Default.Send(new WidgetClickedMessage(e.ClickedItem as OpenHABWidget));
+            return;
         }
 
-        internal override void SetState()
-        {
-        }
+        StrongReferenceMessenger.Default.Send(new WidgetClickedMessage(viewModel));
+    }
+
+    internal override void SetState()
+    {
     }
 }
diff --git a/src/openHAB.Windows/Controls/ImageLabel.xaml b/src/openHAB.Windows/Controls/ImageLabel.xaml
index 16657d60..d0a3cda8 100644
--- a/src/openHAB.Windows/Controls/ImageLabel.xaml
+++ b/src/openHAB.Windows/Controls/ImageLabel.xaml
@@ -1,23 +1,22 @@
-<UserControl x:Class="OpenHAB.Windows.Controls.ImageLabel"
-			 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-			 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-			 xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-			 xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-			 d:DesignHeight="300"
-			 d:DesignWidth="400"
-			 mc:Ignorable="d">
-
-	<StackPanel HorizontalAlignment="Stretch">
-		<Image x:Name="Icon"
-			   Width="60"
-			   Height="60"
-			   Margin="12,0,0,0"
-			   HorizontalAlignment="Left"
-			   VerticalAlignment="Top" />
-		<TextBlock x:Name="Label"
-				   Margin="8"
-				   Foreground="{x:Bind LabelForeground, Mode=OneWay}"
-				   Text="{x:Bind LabelText, Mode=OneWay}"
-				   TextTrimming="WordEllipsis" />
-	</StackPanel>
+<UserControl x:Class="openHAB.Windows.Controls.ImageLabel"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             d:DesignHeight="300"
+             d:DesignWidth="400"
+             mc:Ignorable="d">
+    <StackPanel HorizontalAlignment="Stretch">
+        <Image x:Name="Icon"
+               Height="60"
+               Margin="15,5,0,0"
+               HorizontalAlignment="Left"
+               VerticalAlignment="Top"
+               Stretch="Uniform" />
+        <TextBlock x:Name="Label"
+                   Margin="8"
+                   Foreground="{x:Bind LabelForeground, Mode=OneWay}"
+                   Text="{x:Bind LabelText, Mode=OneWay}"
+                   TextTrimming="WordEllipsis" />
+    </StackPanel>
 </UserControl>
diff --git a/src/openHAB.Windows/Controls/ImageLabel.xaml.cs b/src/openHAB.Windows/Controls/ImageLabel.xaml.cs
index b3c47e70..1e68fc76 100644
--- a/src/openHAB.Windows/Controls/ImageLabel.xaml.cs
+++ b/src/openHAB.Windows/Controls/ImageLabel.xaml.cs
@@ -1,119 +1,106 @@
-using System;
+using System;
 using System.Text.RegularExpressions;
-using OpenHAB.Core.Services;
-using OpenHAB.Windows.Services;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Media.Imaging;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Media.Imaging;
 
-namespace OpenHAB.Windows.Controls
+namespace openHAB.Windows.Controls;
+
+/// <summary>
+/// Control that represents an image with a label.
+/// </summary>
+public sealed partial class ImageLabel : UserControl
 {
     /// <summary>
-    /// Control that represents an image with a label.
+    /// Initializes a new instance of the <see cref="ImageLabel"/> class.
     /// </summary>
-    public sealed partial class ImageLabel : UserControl
+    public ImageLabel()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImageLabel"/> class.
-        /// </summary>
-        public ImageLabel()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
+    }
 
-        /// <summary>
-        /// Bindable property for the control icon.
-        /// </summary>
-        public static readonly DependencyProperty IconPathProperty = DependencyProperty.Register(
-            "IconPath", typeof(string), typeof(ImageLabel), new PropertyMetadata(default(string), IconChangedCallback));
+    /// <summary>
+    /// Bindable property for the control icon.
+    /// </summary>
+    public static readonly DependencyProperty IconPathProperty = DependencyProperty.Register(
+        "IconPath", typeof(string), typeof(ImageLabel), new PropertyMetadata(default(string), IconChangedCallback));
 
 #pragma warning disable S3168 // "async" methods should not return "void"
-        private static async void IconChangedCallback(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs dependencyPropertyChangedEventArgs)
+    private static async void IconChangedCallback(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs dependencyPropertyChangedEventArgs)
 #pragma warning restore S3168 // "async" methods should not return "void"
+    {
+        var control = (ImageLabel)dependencyObject;
+        if (control == null)
         {
-            var control = (ImageLabel)dependencyObject;
-            if (control == null)
-            {
-                return;
-            }
-
-            // fix IconPathState by removing empty space and special characters
-            string iconPath = control.IconPath;
-
-            Match format = Regex.Match(iconPath, @"format=svg");
-            Match state = Regex.Match(iconPath, @"state=(.+?)&");
-            if (state != null)
-            {
-                if (!string.IsNullOrEmpty(state.Value))
-                {
-                    string newstate = Regex.Replace(state.Groups[1].Value, "[^0-9a-zA-Z.&]", string.Empty);
-                    iconPath = control.IconPath.Replace(state.Groups[1].Value, newstate, StringComparison.InvariantCulture);
-                }
-            }
-
-            IIconCaching iconCaching = (IIconCaching)DIService.Instance.Services.GetService(typeof(IIconCaching));
-            iconPath = await iconCaching.ResolveIconPath(iconPath, format.Success ? "svg" : "png");
-
-            if (format.Success)
-            {
-                control.Icon.Source = new SvgImageSource(new Uri(iconPath));
-            }
-            else
-            {
-                control.Icon.Source = new BitmapImage(new Uri(iconPath));
-            }
+            return;
         }
 
-        /// <summary>
-        /// Gets or sets the IconPath.
-        /// </summary>
-        public string IconPath
+        string iconPath = control.IconPath;
+        if (string.IsNullOrEmpty(iconPath))
         {
-            get => (string)GetValue(IconPathProperty);
-            set => SetValue(IconPathProperty, value ?? string.Empty);
+            return;
         }
 
-        /// <summary>
-        /// Bindable property for the label.
-        /// </summary>
-        public static readonly DependencyProperty TextProperty = DependencyProperty.Register(
-            "Text", typeof(string), typeof(ImageLabel), new PropertyMetadata(default(string), TextChangedCallback));
-
-        /// <summary>
-        /// Gets or sets the label.
-        /// </summary>
-        public string LabelText
+        Match format = Regex.Match(iconPath, @".svg", RegexOptions.None, TimeSpan.FromMilliseconds(100));
+        if (format.Success)
         {
-            get => (string)GetValue(TextProperty);
-            set => SetValue(TextProperty, value ?? string.Empty);
+            control.Icon.Source = new SvgImageSource(new Uri(iconPath));
         }
-
-        private static void TextChangedCallback(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs dependencyPropertyChangedEventArgs)
+        else
         {
-            var control = (ImageLabel)dependencyObject;
+            control.Icon.Source = new BitmapImage(new Uri(iconPath));
+        }
+    }
 
-            if (control == null)
-            {
-                return;
-            }
+    /// <summary>
+    /// Gets or sets the IconPath.
+    /// </summary>
+    public string IconPath
+    {
+        get => (string)GetValue(IconPathProperty);
+        set => SetValue(IconPathProperty, value ?? string.Empty);
+    }
 
-            control.Label.Text = control.LabelText;
-        }
+    /// <summary>
+    /// Bindable property for the label.
+    /// </summary>
+    public static readonly DependencyProperty TextProperty = DependencyProperty.Register(
+        "Text", typeof(string), typeof(ImageLabel), new PropertyMetadata(default(string), TextChangedCallback));
 
-        /// <summary>
-        /// The color for label text property.
-        /// </summary>
-        public static readonly DependencyProperty LabelForegroundProperty = DependencyProperty.Register(
-         nameof(LabelForeground), typeof(SolidColorBrush), typeof(WidgetBase), new PropertyMetadata(default(SolidColorBrush)));
+    /// <summary>
+    /// Gets or sets the label.
+    /// </summary>
+    public string LabelText
+    {
+        get => (string)GetValue(TextProperty);
+        set => SetValue(TextProperty, value ?? string.Empty);
+    }
+
+    private static void TextChangedCallback(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs dependencyPropertyChangedEventArgs)
+    {
+        var control = (ImageLabel)dependencyObject;
 
-        /// <summary>
-        /// Gets or sets the OpenHAB widget.
-        /// </summary>
-        public SolidColorBrush LabelForeground
+        if (control == null)
         {
-            get => (SolidColorBrush)GetValue(LabelForegroundProperty);
-            set => SetValue(LabelForegroundProperty, value);
+            return;
         }
+
+        control.Label.Text = control.LabelText;
+    }
+
+    /// <summary>
+    /// The color for label text property.
+    /// </summary>
+    public static readonly DependencyProperty LabelForegroundProperty = DependencyProperty.Register(
+     nameof(LabelForeground), typeof(SolidColorBrush), typeof(WidgetBase), new PropertyMetadata(default(SolidColorBrush)));
+
+    /// <summary>
+    /// Gets or sets the OpenHAB widget.
+    /// </summary>
+    public SolidColorBrush LabelForeground
+    {
+        get => (SolidColorBrush)GetValue(LabelForegroundProperty);
+        set => SetValue(LabelForegroundProperty, value);
     }
 }
diff --git a/src/openHAB.Windows/Controls/ImageWidget.xaml b/src/openHAB.Windows/Controls/ImageWidget.xaml
index e654385a..a5170263 100644
--- a/src/openHAB.Windows/Controls/ImageWidget.xaml
+++ b/src/openHAB.Windows/Controls/ImageWidget.xaml
@@ -1,42 +1,39 @@
-<local:WidgetBase x:Class="OpenHAB.Windows.Controls.ImageWidget"
-				  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-				  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-				  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-				  xmlns:local="using:OpenHAB.Windows.Controls"
-				  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-				  d:DesignHeight="300"
-				  d:DesignWidth="400"
-				  mc:Ignorable="d"
-				  Visibility="{x:Bind Widget.Visibility, Converter={StaticResource BooleanToVisibilityConverter}}">
-
-	<Grid Style="{StaticResource Widget}"
-		  Tapped="ImageWidget_OnTapped">
-		<Grid.ColumnDefinitions>
-			<ColumnDefinition Width="Auto" />
-			<ColumnDefinition Width="*" />
-		</Grid.ColumnDefinitions>
-		<local:ImageLabel Grid.Column="0"
-						  IconPath="{x:Bind Widget, Mode=OneWay, Converter={StaticResource IconToPathConverter}}"
-						  LabelText="{x:Bind Widget.Label, Mode=OneWay}"
-						  LabelForeground="{x:Bind Widget.LabelColor,Converter={StaticResource StringToColorConverter}, Mode=OneWay}"/>
-
-		<ContentDialog x:Name="PopupDialog"
-					   Title="{x:Bind Widget.Label}"
-					   Grid.Column="0"
-					   Grid.ColumnSpan="2"
-					   Background="{StaticResource OpenHABLightColor}"
-					   IsPrimaryButtonEnabled="True"
-					   PrimaryButtonText="Close">
-			<Image x:Name="FullImage"
-				   HorizontalAlignment="Right"
-				   Stretch="Uniform" />
-		</ContentDialog>
-
-		<Image x:Name="ThumbImage"
-			   Grid.Column="1"
-			   Margin="8"
-			   HorizontalAlignment="Stretch"
-			   VerticalAlignment="Stretch"
-			   Stretch="UniformToFill" />
-	</Grid>
+<local:WidgetBase x:Class="openHAB.Windows.Controls.ImageWidget"
+                  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                  xmlns:local="using:openHAB.Windows.Controls"
+                  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                  d:DesignHeight="300"
+                  d:DesignWidth="400"
+                  mc:Ignorable="d"
+                  Visibility="{x:Bind Widget.Visibility}">
+    <Grid Style="{StaticResource Widget}"
+          Tapped="ImageWidget_OnTapped">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
+        <local:ImageLabel Grid.Column="0"
+                          IconPath="{x:Bind Widget.IconPath, Mode=OneWay}"
+                          LabelText="{x:Bind Widget.Label, Mode=OneWay}"
+                          LabelForeground="{x:Bind Widget.LabelColor, Mode=OneWay}" />
+        <ContentDialog x:Name="PopupDialog"
+                       Title="{x:Bind Widget.Label}"
+                       Grid.Column="0"
+                       Grid.ColumnSpan="2"
+                       Background="{StaticResource ContentDialog}"
+                       IsPrimaryButtonEnabled="True"
+                       PrimaryButtonText="Close">
+            <Image x:Name="FullImage"
+                   HorizontalAlignment="Right"
+                   Stretch="Uniform" />
+        </ContentDialog>
+        <Image x:Name="ThumbImage"
+               Grid.Column="1"
+               Margin="8"
+               HorizontalAlignment="Stretch"
+               VerticalAlignment="Stretch"
+               Stretch="UniformToFill" />
+    </Grid>
 </local:WidgetBase>
diff --git a/src/openHAB.Windows/Controls/ImageWidget.xaml.cs b/src/openHAB.Windows/Controls/ImageWidget.xaml.cs
index 20225e4a..0257c5b4 100644
--- a/src/openHAB.Windows/Controls/ImageWidget.xaml.cs
+++ b/src/openHAB.Windows/Controls/ImageWidget.xaml.cs
@@ -1,82 +1,96 @@
-using System;
+using System;
 using System.Threading.Tasks;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media.Imaging;
-using WinRTXamlToolkit.Imaging;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media.Imaging;
+using Windows.Storage.Streams;
 
-namespace OpenHAB.Windows.Controls
+namespace openHAB.Windows.Controls;
+
+/// <summary>
+/// Widget control that represents an OpenHAB Image.
+/// </summary>
+public sealed partial class ImageWidget : WidgetBase
 {
     /// <summary>
-    /// Widget control that represents an OpenHAB Image.
+    /// Initializes a new instance of the <see cref="ImageWidget"/> class.
     /// </summary>
-    public sealed partial class ImageWidget : WidgetBase
+    public ImageWidget()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ImageWidget"/> class.
-        /// </summary>
-        public ImageWidget()
+        InitializeComponent();
+        Loaded += OnLoaded;
+    }
+
+    private void OnLoaded(object sender, RoutedEventArgs routedEventArgs)
+    {
+        SetState();
+    }
+
+    internal override async void SetState()
+    {
+        if (Widget.Item != null && Widget.Item.State.StartsWith("data:", StringComparison.OrdinalIgnoreCase))
         {
-            InitializeComponent();
-            Loaded += OnLoaded;
+            await SetLocalData();
         }
-
-        private void OnLoaded(object sender, RoutedEventArgs routedEventArgs)
+        else
         {
-            SetState();
+            SetUrl();
         }
+    }
 
-        internal override async void SetState()
+    private async Task SetLocalData()
+    {
+        string data = Widget.Item.State.Substring(Widget.Item.State.IndexOf(',') + 1);
+        byte[] binaryData = Convert.FromBase64String(data);
+
+        var image = new BitmapImage();
+        using (InMemoryRandomAccessStream ms = new InMemoryRandomAccessStream())
         {
-            if (Widget.Item != null && Widget.Item.State.StartsWith("data:", StringComparison.OrdinalIgnoreCase))
-            {
-                await SetLocalData();
-            }
-            else
+            using (DataWriter writer = new DataWriter(ms.GetOutputStreamAt(0)))
             {
-                SetUrl();
+                writer.WriteBytes(binaryData);
+                await writer.StoreAsync();
             }
-        }
 
-        private async Task SetLocalData()
-        {
-            var image = new BitmapImage();
-            string data = Widget.Item.State.Substring(Widget.Item.State.IndexOf(',') + 1);
-            await image.LoadFromBase64StringAsync(data);
+            await image.SetSourceAsync(ms);
 
             ThumbImage.Source = image;
             FullImage.Source = image;
         }
+    }
 
-        private void SetUrl()
+    private void SetUrl()
+    {
+        string url;
+        if (Widget.Item != null && Widget.Item.State.StartsWith("http", StringComparison.OrdinalIgnoreCase))
         {
-            string url;
-            if (Widget.Item != null && Widget.Item.State.StartsWith("http", StringComparison.OrdinalIgnoreCase))
-            {
-                url = Widget.Item.State;
-            }
-            else
-            {
-                url = Widget.Url;
-            }
-
-            ThumbImage.Source = new BitmapImage(
-                    new Uri(url, UriKind.Absolute))
-                { CreateOptions = BitmapCreateOptions.IgnoreImageCache };
-
-            FullImage.Source = new BitmapImage(
-                    new Uri(url, UriKind.Absolute))
-                { CreateOptions = BitmapCreateOptions.IgnoreImageCache };
+            url = Widget.Item.State;
+        }
+        else
+        {
+            url = Widget.Url;
         }
 
-        private async void ImageWidget_OnTapped(object sender, TappedRoutedEventArgs e)
+        ThumbImage.Source = new BitmapImage(
+                new Uri(url, UriKind.Absolute))
         {
-            if (Widget.LinkedPage != null)
-            {
-                return;
-            }
+            CreateOptions = BitmapCreateOptions.IgnoreImageCache
+        };
+
+        FullImage.Source = new BitmapImage(
+                new Uri(url, UriKind.Absolute))
+        {
+            CreateOptions = BitmapCreateOptions.IgnoreImageCache
+        };
+    }
 
-            await PopupDialog.ShowAsync();
+    private async void ImageWidget_OnTapped(object sender, TappedRoutedEventArgs e)
+    {
+        if (Widget.LinkedPage != null)
+        {
+            return;
         }
+
+        await PopupDialog.ShowAsync();
     }
-}
\ No newline at end of file
+}
diff --git a/src/openHAB.Windows/Controls/MapViewWidget.xaml b/src/openHAB.Windows/Controls/MapViewWidget.xaml
index fdd5fd7a..1d9a3f61 100644
--- a/src/openHAB.Windows/Controls/MapViewWidget.xaml
+++ b/src/openHAB.Windows/Controls/MapViewWidget.xaml
@@ -1,26 +1,29 @@
-<local:WidgetBase
-	x:Class="OpenHAB.Windows.Controls.MapViewWidget"
-	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-	xmlns:local="using:OpenHAB.Windows.Controls"
-	xmlns:maps="using:Windows.UI.Xaml.Controls.Maps"
-	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	mc:Ignorable="d"
-	d:DesignHeight="300"
-	d:DesignWidth="400"
-	Visibility="{x:Bind Widget.Visibility, Converter={StaticResource BooleanToVisibilityConverter}}">
+<local:WidgetBase x:Class="openHAB.Windows.Controls.MapViewWidget"
+                  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                  xmlns:local="using:openHAB.Windows.Controls"
+                  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                  xmlns:maps="using:Mapsui.UI.WinUI"
+                  mc:Ignorable="d"
+                  d:DesignHeight="300"
+                  d:DesignWidth="400"
+                  Visibility="{x:Bind Widget.Visibility}">
 
-	<Grid Style="{StaticResource Widget}"
-		  Tapped="OnTapped">
-		<maps:MapControl x:Name="MapView" ZoomLevel="10" />
+    <Grid Style="{StaticResource Widget}"
+          Tapped="OnTapped">
+        <maps:MapControl x:Name="MapView"
+                         Tapped="OnTapped" />
 
-		<ContentDialog x:Name="PopupDialog"
-					   Title="{x:Bind Widget.Label}"
-					   Background="{StaticResource OpenHABLightColor}"
-					   IsPrimaryButtonEnabled="True"
-					   PrimaryButtonText="Close">
-			<maps:MapControl x:Name="MapViewFull" ZoomLevel="10" Width="550" Height="300" />
-		</ContentDialog>
-	</Grid>
-</local:WidgetBase>
\ No newline at end of file
+        <ContentDialog x:Name="PopupDialog"
+                       Title="{x:Bind Widget.Label}"
+                       Style="{StaticResource ContentDialog}"
+                       IsPrimaryButtonEnabled="True"
+                       PrimaryButtonText="Close"
+                       DefaultButton="Primary">
+            <maps:MapControl x:Name="MapViewFull"
+                             Width="650"
+                             Height="400" />
+        </ContentDialog>
+    </Grid>
+</local:WidgetBase>
diff --git a/src/openHAB.Windows/Controls/MapViewWidget.xaml.cs b/src/openHAB.Windows/Controls/MapViewWidget.xaml.cs
index 24dc8e6f..fa2cc1d6 100644
--- a/src/openHAB.Windows/Controls/MapViewWidget.xaml.cs
+++ b/src/openHAB.Windows/Controls/MapViewWidget.xaml.cs
@@ -1,65 +1,74 @@
-using System;
+using System;
 using System.Globalization;
-using System.Linq;
-using OpenHAB.Windows.Extensions;
-using Windows.Devices.Geolocation;
-using Windows.Foundation;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls.Maps;
-using Windows.UI.Xaml.Input;
+using Mapsui;
+using Mapsui.Extensions;
+using Mapsui.Projections;
+using Mapsui.Tiling;
+using Mapsui.Widgets.ScaleBar;
+using Mapsui.Widgets.Zoom;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Input;
 
-namespace OpenHAB.Windows.Controls
+namespace openHAB.Windows.Controls;
+
+/// <summary>
+/// Widget control that represents an OpenHAB Map.
+/// </summary>
+public sealed partial class MapViewWidget : WidgetBase
 {
     /// <summary>
-    /// Widget control that represents an OpenHAB Map.
+    /// Initializes a new instance of the <see cref="MapViewWidget"/> class.
     /// </summary>
-    public sealed partial class MapViewWidget : WidgetBase
+    public MapViewWidget()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MapViewWidget"/> class.
-        /// </summary>
-        public MapViewWidget()
-        {
-            InitializeComponent();
-            PopupDialog.AdjustSize();
+        InitializeComponent();
 
-#if RELEASE
-            MapView.MapServiceToken = "Don't forget to set the Bing Maps keys!";
-            MapViewFull.MapServiceToken = "Don't forget to set the Bing Maps keys!";
-#endif
-            Loaded += OnLoaded;
-        }
+        MapView.Map.Layers.Add(OpenStreetMap.CreateTileLayer());
+        MapViewFull.Map.Layers.Add(OpenStreetMap.CreateTileLayer());
+        MapViewFull.Map.Widgets.Add(new ScaleBarWidget(MapViewFull.Map));
+        MapViewFull.Map.Widgets.Add(new ZoomInOutWidget());
 
-        private void OnLoaded(object sender, RoutedEventArgs e)
-        {
-            SetState();
-        }
+        Loaded += OnLoaded;
+    }
 
-        private async void OnTapped(object sender, TappedRoutedEventArgs e)
-        {
-            await PopupDialog.ShowAsync();
-        }
+    private void OnLoaded(object sender, RoutedEventArgs e)
+    {
+        SetState();
+    }
+
+    private async void OnTapped(object sender, TappedRoutedEventArgs e)
+    {
+        e.Handled = true;
+
+        PopupDialog.XamlRoot = this.XamlRoot;
+        await PopupDialog.ShowAsync();
+    }
 
-        internal override void SetState()
+    internal override void SetState()
+    {
+        if (!string.IsNullOrEmpty(Widget.Item.State))
         {
-            if (!string.IsNullOrEmpty(Widget.Item.State))
+            var latLong = Widget.Item.State.Split(',');
+            if (latLong?.Length == 2)
             {
-                var latLong = Widget.Item.State.Split(',');
-                if (latLong?.Length == 2)
-                {
-                    double latitude = double.Parse(latLong[0], CultureInfo.InvariantCulture);
-                    double longitude = double.Parse(latLong[1], CultureInfo.InvariantCulture);
+                double latitude = double.Parse(latLong[0], CultureInfo.InvariantCulture);
+                double longitude = double.Parse(latLong[1], CultureInfo.InvariantCulture);
+
+                var coordinate = SphericalMercator.FromLonLat(longitude, latitude).ToMPoint();
+
+                Viewport viewport = new Viewport(longitude, latitude, 0, 0, Width, Height);
 
-                    MapView.Center = MapViewFull.Center = new Geopoint(new BasicGeoposition() { Latitude = latitude, Longitude = longitude });
+                MapView.Map.Home = n => n.CenterOnAndZoomTo(coordinate, n.Viewport.Resolution);
+                MapViewFull.Map.Home = n => n.CenterOnAndZoomTo(coordinate, n.Viewport.Resolution);
 
-                    MapIcon mapIcon = new MapIcon();
-                    mapIcon.Location = MapView.Center;
-                    mapIcon.NormalizedAnchorPoint = new Point(0.5, 0.5);
-                    mapIcon.ZIndex = 0;
+                //TODO: Implement mapicon
+                //MapIcon mapIcon = new MapIcon();
+                //mapIcon.Location = MapView.Center;
+                //mapIcon.NormalizedAnchorPoint = new Point(0.5, 0.5);
+                //mapIcon.ZIndex = 0;
 
-                    MapView.MapElements.Add(mapIcon);
-                    MapViewFull.MapElements.Add(mapIcon);
-                }
+                //MapView.MapElements.Add(mapIcon);
+                //MapViewFull.MapElements.Add(mapIcon);
             }
         }
     }
diff --git a/src/openHAB.Windows/Controls/MjpegWidget.xaml b/src/openHAB.Windows/Controls/MjpegWidget.xaml
index 2325e06d..ca0dc061 100644
--- a/src/openHAB.Windows/Controls/MjpegWidget.xaml
+++ b/src/openHAB.Windows/Controls/MjpegWidget.xaml
@@ -1,43 +1,43 @@
-<local:WidgetBase x:Class="OpenHAB.Windows.Controls.MjpegWidget"
-				  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-				  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-				  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-				  xmlns:local="using:OpenHAB.Windows.Controls"
-				  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-				  d:DesignHeight="300"
-				  d:DesignWidth="400"
-				  mc:Ignorable="d"
-				  Visibility="{x:Bind Widget.Visibility, Converter={StaticResource BooleanToVisibilityConverter}}">
+<local:WidgetBase x:Class="openHAB.Windows.Controls.MjpegWidget"
+                  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                  xmlns:local="using:openHAB.Windows.Controls"
+                  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                  d:DesignHeight="300"
+                  d:DesignWidth="400"
+                  mc:Ignorable="d"
+                  Visibility="{x:Bind Widget.Visibility}">
 
-	<Grid Style="{StaticResource Widget}"
-		  Tapped="ImageWidget_OnTapped">
-		<Grid.ColumnDefinitions>
-			<ColumnDefinition Width="Auto" />
-			<ColumnDefinition Width="*" />
-		</Grid.ColumnDefinitions>
-		<local:ImageLabel Grid.Column="0"
-						  IconPath="{x:Bind Widget, Mode=OneWay, Converter={StaticResource IconToPathConverter}}"
-						  LabelText="{x:Bind Widget.Label, Mode=OneWay}"
-						  LabelForeground="{x:Bind Widget.LabelColor,Converter={StaticResource StringToColorConverter}, Mode=OneWay}"/>
+    <Grid Style="{StaticResource Widget}"
+          Tapped="ImageWidget_OnTapped">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
+        <local:ImageLabel Grid.Column="0"
+                          IconPath="{x:Bind Widget.IconPath, Mode=OneWay}"
+                          LabelText="{x:Bind Widget.Label, Mode=OneWay}"
+                          LabelForeground="{x:Bind Widget.LabelColor, Mode=OneWay}"/>
 
-		<ContentDialog x:Name="CameraViewDialog"
-					   Title="{x:Bind Widget.Label}"
-					   Grid.Column="0"
-					   Grid.ColumnSpan="2"
-					   Background="{StaticResource OpenHABLightColor}"
-					   IsPrimaryButtonEnabled="True"
-					   PrimaryButtonText="Close">
-			<Grid CornerRadius="5">
-				<Image HorizontalAlignment="Right"
-					   Source="{x:Bind CameraBitmapImage, Mode=OneWay}"
-					   Stretch="Uniform" />
-			</Grid>
-		</ContentDialog>
-		<Image Grid.Column="1"
-			   Margin="8"
-			   HorizontalAlignment="Stretch"
-			   VerticalAlignment="Stretch"
-			   Source="{x:Bind CameraBitmapImage, Mode=OneWay}"
-			   Stretch="UniformToFill" />
-	</Grid>
+        <ContentDialog x:Name="CameraViewDialog"
+                       Title="{x:Bind Widget.Label}"
+                       Grid.Column="0"
+                       Grid.ColumnSpan="2"
+                       Background="{StaticResource ContentDialog}"
+                       IsPrimaryButtonEnabled="True"
+                       PrimaryButtonText="Close">
+            <Grid CornerRadius="5">
+                <Image HorizontalAlignment="Right"
+                       Source="{x:Bind CameraBitmapImage, Mode=OneWay}"
+                       Stretch="Uniform" />
+            </Grid>
+        </ContentDialog>
+        <Image Grid.Column="1"
+               Margin="8"
+               HorizontalAlignment="Stretch"
+               VerticalAlignment="Stretch"
+               Source="{x:Bind CameraBitmapImage, Mode=OneWay}"
+               Stretch="UniformToFill" />
+    </Grid>
 </local:WidgetBase>
diff --git a/src/openHAB.Windows/Controls/MjpegWidget.xaml.cs b/src/openHAB.Windows/Controls/MjpegWidget.xaml.cs
index df5d73fd..2ee79ed8 100644
--- a/src/openHAB.Windows/Controls/MjpegWidget.xaml.cs
+++ b/src/openHAB.Windows/Controls/MjpegWidget.xaml.cs
@@ -1,95 +1,94 @@
-using System;
+using System;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media.Imaging;
 using MJPEGDecoderWinRTLib;
 using Windows.Storage.Streams;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media.Imaging;
 
-namespace OpenHAB.Windows.Controls
+namespace openHAB.Windows.Controls;
+
+/// <summary>
+/// Widget control that represents an OpenHAB Image.
+/// </summary>
+public sealed partial class MjpegWidget : WidgetBase
 {
+    private BitmapImage _cameraBitmapImage;
+    private MJPEGDecoder _mjpegDecoder;
+
     /// <summary>
-    /// Widget control that represents an OpenHAB Image.
+    /// Gets or sets the camera bitmapimage.
     /// </summary>
-    public sealed partial class MjpegWidget : WidgetBase
+    public BitmapImage CameraBitmapImage
     {
-        private BitmapImage _cameraBitmapImage;
-        private MJPEGDecoder _mjpegDecoder;
+        get => _cameraBitmapImage;
 
-        /// <summary>
-        /// Gets or sets the camera bitmapimage.
-        /// </summary>
-        public BitmapImage CameraBitmapImage
+        set
         {
-            get => _cameraBitmapImage;
-
-            set
+            if (_cameraBitmapImage == value)
             {
-                if (_cameraBitmapImage == value)
-                {
-                    return;
-                }
-
-                _cameraBitmapImage = value;
-                RaisePropertyChanged();
+                return;
             }
-        }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MjpegWidget"/> class.
-        /// </summary>
-        public MjpegWidget()
-        {
-            InitializeComponent();
-            Loaded += OnLoaded;
+            _cameraBitmapImage = value;
+            RaisePropertyChanged();
         }
+    }
 
-        private void OnLoaded(object sender, RoutedEventArgs routedEventArgs)
-        {
-            SetState();
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="MjpegWidget"/> class.
+    /// </summary>
+    public MjpegWidget()
+    {
+        InitializeComponent();
+        Loaded += OnLoaded;
+    }
 
-        internal override async void SetState()
-        {
-            _mjpegDecoder = new MJPEGDecoder();
-            CameraBitmapImage = new BitmapImage();
+    private void OnLoaded(object sender, RoutedEventArgs routedEventArgs)
+    {
+        SetState();
+    }
 
-            // Register listener methods
-            _mjpegDecoder.FrameReady += MjpegDecoder_FrameReady;
-            _mjpegDecoder.Error += MjpegDecoder_Error;
+    internal override async void SetState()
+    {
+        _mjpegDecoder = new MJPEGDecoder();
+        CameraBitmapImage = new BitmapImage();
 
-            // Construct Http Uri
-            string requestUri = Widget?.Url;
+        // Register listener methods
+        _mjpegDecoder.FrameReady += MjpegDecoder_FrameReady;
+        _mjpegDecoder.Error += MjpegDecoder_Error;
 
-            // Tell MJPEGDecoder to connect to the IP camera, parse the mjpeg stream, and
-            // report the received image frames.
-            await _mjpegDecoder.ParseStreamAsync(requestUri, string.Empty, string.Empty);
-        }
+        // Construct Http Uri
+        string? requestUri = Widget?.Url;
+
+        // Tell MJPEGDecoder to connect to the IP camera, parse the mjpeg stream, and
+        // report the received image frames.
+        await _mjpegDecoder.ParseStreamAsync(requestUri, string.Empty, string.Empty);
+    }
 
-        private async void MjpegDecoder_FrameReady(object sender, FrameReadyEventArgs e)
+    private async void MjpegDecoder_FrameReady(object sender, FrameReadyEventArgs e)
+    {
+        // Copy the received FrameBuffer to an InMemoryRandomAccessStream.
+        using (InMemoryRandomAccessStream ms = new InMemoryRandomAccessStream())
         {
-            // Copy the received FrameBuffer to an InMemoryRandomAccessStream.
-            using (InMemoryRandomAccessStream ms = new InMemoryRandomAccessStream())
+            using (DataWriter writer = new DataWriter(ms.GetOutputStreamAt(0)))
             {
-                using (DataWriter writer = new DataWriter(ms.GetOutputStreamAt(0)))
-                {
-                    writer.WriteBytes(e.FrameBuffer);
-                    await writer.StoreAsync();
-                }
-
-                // Update source of CameraBitmap with the memory stream
-                CameraBitmapImage.SetSource(ms);
+                writer.WriteBytes(e.FrameBuffer);
+                await writer.StoreAsync();
             }
-        }
 
-        private void MjpegDecoder_Error(object sender, ErrorEventArgs e)
-        {
-            // ErrorMsg = e.Message;
+            // Update source of CameraBitmap with the memory stream
+            CameraBitmapImage.SetSource(ms);
         }
+    }
 
-        private async void ImageWidget_OnTapped(object sender, TappedRoutedEventArgs e)
-        {
-            CameraViewDialog.MinWidth = CameraBitmapImage.PixelWidth;
-            await CameraViewDialog.ShowAsync();
-        }
+    private void MjpegDecoder_Error(object sender, ErrorEventArgs e)
+    {
+        // ErrorMsg = e.Message;
+    }
+
+    private async void ImageWidget_OnTapped(object sender, TappedRoutedEventArgs e)
+    {
+        CameraViewDialog.MinWidth = CameraBitmapImage.PixelWidth;
+        await CameraViewDialog.ShowAsync();
     }
 }
diff --git a/src/openHAB.Windows/Controls/NavMenuListView.cs b/src/openHAB.Windows/Controls/NavMenuListView.cs
index ae363b4c..1dc44d84 100644
--- a/src/openHAB.Windows/Controls/NavMenuListView.cs
+++ b/src/openHAB.Windows/Controls/NavMenuListView.cs
@@ -1,285 +1,284 @@
-using System;
+using System;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Media.Animation;
 using Windows.System;
 using Windows.UI.Core;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Media.Animation;
 
-namespace OpenHAB.Windows.Controls
+namespace openHAB.Windows.Controls;
+
+/// <summary>
+/// A specialized ListView to represent the items in the navigation menu.
+/// </summary>
+/// <remarks>
+/// This class handles the following:
+/// 1. Sizes the panel that hosts the items so they fit in the hosting pane.  Otherwise, the keyboard
+///    may appear cut off on one side b/c the Pane clips instead of affecting layout.
+/// 2. Provides a single selection experience where keyboard focus can move without changing selection.
+///    Both the 'Space' and 'Enter' keys will trigger selection.  The up/down arrow keys can move
+///    keyboard focus without triggering selection.  This is different than the default behavior when
+///    SelectionMode == Single.  The default behavior for a ListView in single selection requires using
+///    the Ctrl + arrow key to move keyboard focus without triggering selection.  Users won't expect
+///    this type of keyboarding model on the nav menu.
+/// </remarks>
+public class NavMenuListView : ListView
 {
+    private SplitView _splitViewHost;
+
     /// <summary>
-    /// A specialized ListView to represent the items in the navigation menu.
+    /// Event that fires whenever menu items are updated
     /// </summary>
-    /// <remarks>
-    /// This class handles the following:
-    /// 1. Sizes the panel that hosts the items so they fit in the hosting pane.  Otherwise, the keyboard
-    ///    may appear cut off on one side b/c the Pane clips instead of affecting layout.
-    /// 2. Provides a single selection experience where keyboard focus can move without changing selection.
-    ///    Both the 'Space' and 'Enter' keys will trigger selection.  The up/down arrow keys can move
-    ///    keyboard focus without triggering selection.  This is different than the default behavior when
-    ///    SelectionMode == Single.  The default behavior for a ListView in single selection requires using
-    ///    the Ctrl + arrow key to move keyboard focus without triggering selection.  Users won't expect
-    ///    this type of keyboarding model on the nav menu.
-    /// </remarks>
-    public class NavMenuListView : ListView
-    {
-        private SplitView _splitViewHost;
+    public event EventHandler MenuItemsUpdated;
 
-        /// <summary>
-        /// Event that fires whenever menu items are updated
-        /// </summary>
-        public event EventHandler MenuItemsUpdated;
+    /// <summary>
+    /// Initializes a new instance of the <see cref="NavMenuListView"/> class.
+    /// </summary>
+    public NavMenuListView()
+    {
+        SelectionMode = ListViewSelectionMode.Single;
+        IsItemClickEnabled = true;
+        ItemClick += ItemClickedHandler;
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="NavMenuListView"/> class.
-        /// </summary>
-        public NavMenuListView()
+        // Locate the hosting SplitView control
+        Loaded += (s, a) =>
         {
-            SelectionMode = ListViewSelectionMode.Single;
-            IsItemClickEnabled = true;
-            ItemClick += ItemClickedHandler;
+            var parent = VisualTreeHelper.GetParent(this);
+            while (parent != null && !(parent is SplitView))
+            {
+                parent = VisualTreeHelper.GetParent(parent);
+            }
 
-            // Locate the hosting SplitView control
-            Loaded += (s, a) =>
+            if (parent == null)
             {
-                var parent = VisualTreeHelper.GetParent(this);
-                while (parent != null && !(parent is SplitView))
-                {
-                    parent = VisualTreeHelper.GetParent(parent);
-                }
+                return;
+            }
 
-                if (parent == null)
-                {
-                    return;
-                }
+            _splitViewHost = parent as SplitView;
 
-                _splitViewHost = parent as SplitView;
+            _splitViewHost.RegisterPropertyChangedCallback(SplitView.IsPaneOpenProperty, (sender, args) =>
+            {
+                OnPaneToggled();
+            });
 
-                _splitViewHost.RegisterPropertyChangedCallback(SplitView.IsPaneOpenProperty, (sender, args) =>
-                {
-                    OnPaneToggled();
-                });
+            // Call once to ensure we're in the correct state
+            OnPaneToggled();
+        };
+    }
 
-                // Call once to ensure we're in the correct state
-                OnPaneToggled();
-            };
-        }
+    /// <inheritdoc/>
+    protected override void OnApplyTemplate()
+    {
+        base.OnApplyTemplate();
 
-        /// <inheritdoc/>
-        protected override void OnApplyTemplate()
+        // Remove the entrance animation on the item containers.
+        for (int i = 0; i < ItemContainerTransitions.Count; i++)
         {
-            base.OnApplyTemplate();
-
-            // Remove the entrance animation on the item containers.
-            for (int i = 0; i < ItemContainerTransitions.Count; i++)
+            if (ItemContainerTransitions[i] is EntranceThemeTransition)
             {
-                if (ItemContainerTransitions[i] is EntranceThemeTransition)
-                {
-                    ItemContainerTransitions.RemoveAt(i);
-                }
+                ItemContainerTransitions.RemoveAt(i);
             }
         }
+    }
+
+    /// <summary>
+    /// Mark the <paramref name="item"/> as selected and ensures everything else is not.
+    /// If the <paramref name="item"/> is null then everything is unselected.
+    /// </summary>
+    /// <param name="item">The selected menu item.</param>
+    public void SetSelectedItem(ListViewItem item)
+    {
+        int index = -1;
+        if (item != null)
+        {
+            index = IndexFromContainer(item);
+        }
 
-        /// <summary>
-        /// Mark the <paramref name="item"/> as selected and ensures everything else is not.
-        /// If the <paramref name="item"/> is null then everything is unselected.
-        /// </summary>
-        /// <param name="item">The selected menu item.</param>
-        public void SetSelectedItem(ListViewItem item)
+        if (Items == null)
         {
-            int index = -1;
-            if (item != null)
+            return;
+        }
+
+        for (int i = 0; i < Items.Count; i++)
+        {
+            var lvi = (ListViewItem)ContainerFromIndex(i);
+
+            if (lvi == null)
             {
-                index = IndexFromContainer(item);
+                continue;
             }
 
-            if (Items == null)
+            if (i != index)
             {
-                return;
+                lvi.IsSelected = false;
             }
-
-            for (int i = 0; i < Items.Count; i++)
+            else if (i == index)
             {
-                var lvi = (ListViewItem)ContainerFromIndex(i);
-
-                if (lvi == null)
-                {
-                    continue;
-                }
-
-                if (i != index)
-                {
-                    lvi.IsSelected = false;
-                }
-                else if (i == index)
-                {
-                    lvi.IsSelected = true;
-                }
+                lvi.IsSelected = true;
             }
         }
+    }
 
-        /// <inheritdoc/>
-        protected override void OnItemsChanged(object e)
-        {
-            base.OnItemsChanged(e);
-            MenuItemsUpdated?.Invoke(this, EventArgs.Empty);
-        }
+    /// <inheritdoc/>
+    protected override void OnItemsChanged(object e)
+    {
+        base.OnItemsChanged(e);
+        MenuItemsUpdated?.Invoke(this, EventArgs.Empty);
+    }
+
+    /// <summary>
+    /// Occurs when an item has been selected
+    /// </summary>
+    public event EventHandler<ListViewItem> ItemInvoked;
+
+    /// <summary>
+    /// Custom keyboarding logic to enable movement via the arrow keys without triggering selection
+    /// until a 'Space' or 'Enter' key is pressed.
+    /// </summary>
+    /// <param name="e">Routed event args.</param>
+    protected override void OnKeyDown(KeyRoutedEventArgs e)
+    {
+        var focusedItem = FocusManager.GetFocusedElement();
 
-        /// <summary>
-        /// Occurs when an item has been selected
-        /// </summary>
-        public event EventHandler<ListViewItem> ItemInvoked;
-
-        /// <summary>
-        /// Custom keyboarding logic to enable movement via the arrow keys without triggering selection
-        /// until a 'Space' or 'Enter' key is pressed.
-        /// </summary>
-        /// <param name="e">Routed event args.</param>
-        protected override void OnKeyDown(KeyRoutedEventArgs e)
+        switch (e.Key)
         {
-            var focusedItem = FocusManager.GetFocusedElement();
+            case VirtualKey.Up:
+                TryMoveFocus(FocusNavigationDirection.Up);
+                e.Handled = true;
+                break;
 
-            switch (e.Key)
-            {
-                case VirtualKey.Up:
-                    TryMoveFocus(FocusNavigationDirection.Up);
-                    e.Handled = true;
-                    break;
-
-                case VirtualKey.Down:
-                    TryMoveFocus(FocusNavigationDirection.Down);
-                    e.Handled = true;
-                    break;
-
-                case VirtualKey.Tab:
-                    var shiftKeyState = CoreWindow.GetForCurrentThread().GetKeyState(VirtualKey.Shift);
-                    var shiftKeyDown = (shiftKeyState & CoreVirtualKeyStates.Down) == CoreVirtualKeyStates.Down;
-
-                    // If we're on the header item then this will be null and we'll still get the default behavior.
-                    var item = focusedItem as ListViewItem;
-                    if (item != null)
+            case VirtualKey.Down:
+                TryMoveFocus(FocusNavigationDirection.Down);
+                e.Handled = true;
+                break;
+
+            case VirtualKey.Tab:
+                var shiftKeyState = CoreWindow.GetForCurrentThread().GetKeyState(VirtualKey.Shift);
+                var shiftKeyDown = (shiftKeyState & CoreVirtualKeyStates.Down) == CoreVirtualKeyStates.Down;
+
+                // If we're on the header item then this will be null and we'll still get the default behavior.
+                var item = focusedItem as ListViewItem;
+                if (item != null)
+                {
+                    var currentItem = item;
+
+                    if (Items == null)
+                    {
+                        return;
+                    }
+
+                    bool onlastitem = IndexFromContainer(currentItem) == Items.Count - 1;
+                    bool onfirstitem = IndexFromContainer(currentItem) == 0;
+
+                    if (!shiftKeyDown)
                     {
-                        var currentItem = item;
-
-                        if (Items == null)
-                        {
-                            return;
-                        }
-
-                        bool onlastitem = IndexFromContainer(currentItem) == Items.Count - 1;
-                        bool onfirstitem = IndexFromContainer(currentItem) == 0;
-
-                        if (!shiftKeyDown)
-                        {
-                            TryMoveFocus(onlastitem ? FocusNavigationDirection.Next : FocusNavigationDirection.Down);
-                        }
-                        else
-                        {
-                            // Shift + Tab
-                            TryMoveFocus(onfirstitem ? FocusNavigationDirection.Previous : FocusNavigationDirection.Up);
-                        }
+                        TryMoveFocus(onlastitem ? FocusNavigationDirection.Next : FocusNavigationDirection.Down);
                     }
-                    else if (focusedItem is Control)
+                    else
                     {
-                        TryMoveFocus(!shiftKeyDown ? FocusNavigationDirection.Down : FocusNavigationDirection.Up);
+                        // Shift + Tab
+                        TryMoveFocus(onfirstitem ? FocusNavigationDirection.Previous : FocusNavigationDirection.Up);
                     }
+                }
+                else if (focusedItem is Control)
+                {
+                    TryMoveFocus(!shiftKeyDown ? FocusNavigationDirection.Down : FocusNavigationDirection.Up);
+                }
 
-                    e.Handled = true;
-                    break;
+                e.Handled = true;
+                break;
 
-                case VirtualKey.Space:
-                case VirtualKey.Enter:
-                    // Fire our event using the item with current keyboard focus
-                    InvokeItem(focusedItem);
-                    e.Handled = true;
-                    break;
+            case VirtualKey.Space:
+            case VirtualKey.Enter:
+                // Fire our event using the item with current keyboard focus
+                InvokeItem(focusedItem);
+                e.Handled = true;
+                break;
 
-                default:
-                    base.OnKeyDown(e);
-                    break;
-            }
+            default:
+                base.OnKeyDown(e);
+                break;
         }
+    }
 
-        /// <summary>
-        /// This method is a work-around until the bug in FocusManager.TryMoveFocus is fixed.
-        /// </summary>
-        /// <param name="direction">Navigated direction.</param>
-        private void TryMoveFocus(FocusNavigationDirection direction)
+    /// <summary>
+    /// This method is a work-around until the bug in FocusManager.TryMoveFocus is fixed.
+    /// </summary>
+    /// <param name="direction">Navigated direction.</param>
+    private void TryMoveFocus(FocusNavigationDirection direction)
+    {
+        if (direction == FocusNavigationDirection.Next || direction == FocusNavigationDirection.Previous)
         {
-            if (direction == FocusNavigationDirection.Next || direction == FocusNavigationDirection.Previous)
-            {
-                FocusManager.TryMoveFocus(direction);
-            }
-            else
-            {
-                var control = FocusManager.FindNextFocusableElement(direction) as Control;
-                control?.Focus(FocusState.Programmatic);
-            }
+            FocusManager.TryMoveFocus(direction);
         }
-
-        /// <summary>
-        /// Sets a menu item as the active one.
-        /// </summary>
-        /// <param name="item">the item.</param>
-        /// <returns>true when the item was set as active.</returns>
-        public bool SetActiveItem(object item)
+        else
         {
-            if (_splitViewHost == null)
-            {
-                return false;
-            }
-
-            var itemContainer = ContainerFromItem(item);
-            InvokeItem(itemContainer);
-            return true;
+            var control = FocusManager.FindNextFocusableElement(direction) as Control;
+            control?.Focus(FocusState.Programmatic);
         }
+    }
 
-        private void ItemClickedHandler(object sender, ItemClickEventArgs e)
+    /// <summary>
+    /// Sets a menu item as the active one.
+    /// </summary>
+    /// <param name="item">the item.</param>
+    /// <returns>true when the item was set as active.</returns>
+    public bool SetActiveItem(object item)
+    {
+        if (_splitViewHost == null)
         {
-            // Triggered when the item is selected using something other than a keyboard
-            var item = ContainerFromItem(e.ClickedItem);
-            InvokeItem(item);
+            return false;
         }
 
-        private void InvokeItem(object focusedItem)
-        {
-            SetSelectedItem(focusedItem as ListViewItem);
-            ItemInvoked?.Invoke(this, focusedItem as ListViewItem);
+        var itemContainer = ContainerFromItem(item);
+        InvokeItem(itemContainer);
+        return true;
+    }
 
-            if (_splitViewHost.IsPaneOpen && (
-                _splitViewHost.DisplayMode == SplitViewDisplayMode.CompactOverlay ||
-                _splitViewHost.DisplayMode == SplitViewDisplayMode.Overlay))
-            {
-                _splitViewHost.IsPaneOpen = false;
-                var item = focusedItem as ListViewItem;
-                item?.Focus(FocusState.Programmatic);
-            }
+    private void ItemClickedHandler(object sender, ItemClickEventArgs e)
+    {
+        // Triggered when the item is selected using something other than a keyboard
+        var item = ContainerFromItem(e.ClickedItem);
+        InvokeItem(item);
+    }
+
+    private void InvokeItem(object focusedItem)
+    {
+        SetSelectedItem(focusedItem as ListViewItem);
+        ItemInvoked?.Invoke(this, focusedItem as ListViewItem);
+
+        if (_splitViewHost.IsPaneOpen && (
+            _splitViewHost.DisplayMode == SplitViewDisplayMode.CompactOverlay ||
+            _splitViewHost.DisplayMode == SplitViewDisplayMode.Overlay))
+        {
+            _splitViewHost.IsPaneOpen = false;
+            var item = focusedItem as ListViewItem;
+            item?.Focus(FocusState.Programmatic);
         }
+    }
 
-        /// <summary>
-        /// Re-size the ListView's Panel when the SplitView is compact so the items
-        /// will fit within the visible space and correctly display a keyboard focus rect.
-        /// </summary>
-        private void OnPaneToggled()
+    /// <summary>
+    /// Re-size the ListView's Panel when the SplitView is compact so the items
+    /// will fit within the visible space and correctly display a keyboard focus rect.
+    /// </summary>
+    private void OnPaneToggled()
+    {
+        if (ItemsPanelRoot == null)
         {
-            if (ItemsPanelRoot == null)
-            {
-                return;
-            }
+            return;
+        }
 
-            if (_splitViewHost.IsPaneOpen)
-            {
-                ItemsPanelRoot.ClearValue(WidthProperty);
-                ItemsPanelRoot.ClearValue(HorizontalAlignmentProperty);
-            }
-            else if (_splitViewHost.DisplayMode == SplitViewDisplayMode.CompactInline ||
-                _splitViewHost.DisplayMode == SplitViewDisplayMode.CompactOverlay)
-            {
-                ItemsPanelRoot.SetValue(WidthProperty, _splitViewHost.CompactPaneLength);
-                ItemsPanelRoot.SetValue(HorizontalAlignmentProperty, HorizontalAlignment.Left);
-            }
+        if (_splitViewHost.IsPaneOpen)
+        {
+            ItemsPanelRoot.ClearValue(WidthProperty);
+            ItemsPanelRoot.ClearValue(HorizontalAlignmentProperty);
+        }
+        else if (_splitViewHost.DisplayMode == SplitViewDisplayMode.CompactInline ||
+            _splitViewHost.DisplayMode == SplitViewDisplayMode.CompactOverlay)
+        {
+            ItemsPanelRoot.SetValue(WidthProperty, _splitViewHost.CompactPaneLength);
+            ItemsPanelRoot.SetValue(HorizontalAlignmentProperty, HorizontalAlignment.Left);
         }
     }
 }
diff --git a/src/openHAB.Windows/Controls/PageLinkWidget.xaml b/src/openHAB.Windows/Controls/PageLinkWidget.xaml
index bd87c237..ba0aeb0b 100644
--- a/src/openHAB.Windows/Controls/PageLinkWidget.xaml
+++ b/src/openHAB.Windows/Controls/PageLinkWidget.xaml
@@ -1,32 +1,32 @@
-<local:WidgetBase x:Class="OpenHAB.Windows.Controls.PageLinkWidget"
+<local:WidgetBase x:Class="openHAB.Windows.Controls.PageLinkWidget"
                   xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                   xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                  xmlns:converters="using:OpenHAB.Windows.Converters"
+                  xmlns:converters="using:openHAB.Windows.Converters"
                   xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-                  xmlns:local="using:OpenHAB.Windows.Controls"
+                  xmlns:local="using:openHAB.Windows.Controls"
                   xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
                   d:DesignHeight="300"
                   d:DesignWidth="400"
                   mc:Ignorable="d"
-				  Visibility="{x:Bind Widget.Visibility, Converter={StaticResource BooleanToVisibilityConverter}}">
-
-    <local:WidgetBase.Resources>
-        <converters:IconToBitmapConverter x:Key="IconToBitmapConverter" />
-    </local:WidgetBase.Resources>
-
-	<Grid Style="{StaticResource Widget}">
+                  Visibility="{x:Bind Widget.Visibility}">
+    <Grid Style="{StaticResource Widget}">
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="*" />
-            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="auto" />
         </Grid.ColumnDefinitions>
-
         <local:ImageLabel Margin="8,0,0,0"
                           HorizontalAlignment="Left"
                           VerticalAlignment="Center"
-                          IconPath="{x:Bind Widget, Converter={StaticResource IconToPathConverter}, Mode=OneWay}"
+                          IconPath="{x:Bind Widget.IconPath, Mode=OneWay}"
                           LabelText="{x:Bind Widget.Label, Mode=OneWay}"
-						  LabelForeground="{x:Bind Widget.LabelColor,Converter={StaticResource StringToColorConverter}, Mode=OneWay}"/>
-
+                          LabelForeground="{x:Bind Widget.LabelColor, Mode=OneWay}" />
+        <TextBlock Grid.Column="1"
+                   Margin="0,0,10,10"
+                   TextWrapping="WrapWholeWords"
+                   VerticalAlignment="Bottom"
+                   HorizontalAlignment="Right"
+                   FontSize="18"
+                   Text="{x:Bind Widget.State}" />
         <TextBlock Grid.Column="1"
                    Margin="0,0,12,0"
                    HorizontalAlignment="Right"
diff --git a/src/openHAB.Windows/Controls/PageLinkWidget.xaml.cs b/src/openHAB.Windows/Controls/PageLinkWidget.xaml.cs
index 86212ff4..f43e7d8f 100644
--- a/src/openHAB.Windows/Controls/PageLinkWidget.xaml.cs
+++ b/src/openHAB.Windows/Controls/PageLinkWidget.xaml.cs
@@ -1,20 +1,19 @@
-namespace OpenHAB.Windows.Controls
+namespace openHAB.Windows.Controls;
+
+/// <summary>
+/// Widget control that represents an OpenHAB switch.
+/// </summary>
+public sealed partial class PageLinkWidget : WidgetBase
 {
     /// <summary>
-    /// Widget control that represents an OpenHAB switch.
+    /// Initializes a new instance of the <see cref="PageLinkWidget"/> class.
     /// </summary>
-    public sealed partial class PageLinkWidget : WidgetBase
+    public PageLinkWidget()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="PageLinkWidget"/> class.
-        /// </summary>
-        public PageLinkWidget()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
+    }
 
-        internal override void SetState()
-        {
-        }
+    internal override void SetState()
+    {
     }
-}
\ No newline at end of file
+}
diff --git a/src/openHAB.Windows/Controls/RadialSlider.cs b/src/openHAB.Windows/Controls/RadialSlider.cs
index 9099d86b..605778a6 100644
--- a/src/openHAB.Windows/Controls/RadialSlider.cs
+++ b/src/openHAB.Windows/Controls/RadialSlider.cs
@@ -1,592 +1,694 @@
-using System;
+using System;
+using Microsoft.UI;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Input;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Shapes;
 using Windows.Foundation;
-using Windows.UI;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Media;
-using Windows.UI.Xaml.Shapes;
-
-namespace OpenHAB.Windows.Controls
+
+namespace openHAB.Windows.Controls;
+
+/// <summary>
+/// A Percentage Ring Control.
+/// </summary>
+//// All calculations are for a 200x200 square. The ViewBox control will do the rest.
+[TemplatePart(Name = ContainerPartName, Type = typeof(Grid))]
+[TemplatePart(Name = ScalePartName, Type = typeof(Path))]
+[TemplatePart(Name = TrailPartName, Type = typeof(Path))]
+[TemplatePart(Name = ValueTextPartName, Type = typeof(TextBlock))]
+public class RadialSlider : Control
 {
     /// <summary>
-    /// A Percentage Ring Control.
-    /// </summary>
-    //// All calculations are for a 200x200 square. The ViewBox control will do the rest.
-    [TemplatePart(Name = ContainerPartName, Type = typeof(Grid))]
-    [TemplatePart(Name = ScalePartName, Type = typeof(Path))]
-    [TemplatePart(Name = TrailPartName, Type = typeof(Path))]
-    [TemplatePart(Name = ValueTextPartName, Type = typeof(TextBlock))]
-    public class RadialSlider : Control
-    {
-        /// <summary>
-        /// Triggers whenever the slider changes
-        /// </summary>
-        public event EventHandler ValueChanged;
-
-        /// <summary>
-        /// Identifies the optional StepSize property.
-        /// </summary>
-        public static readonly DependencyProperty StepSizeProperty =
-            DependencyProperty.Register(nameof(StepSize), typeof(double), typeof(RadialSlider), new PropertyMetadata(0.0));
-
-        /// <summary>
-        /// Identifies the IsInteractive dependency property.
-        /// </summary>
-        public static readonly DependencyProperty IsInteractiveProperty =
-            DependencyProperty.Register(nameof(IsInteractive), typeof(bool), typeof(RadialSlider), new PropertyMetadata(false, OnInteractivityChanged));
-
-        /// <summary>
-        /// Identifies the ScaleWidth dependency property.
-        /// </summary>
-        public static readonly DependencyProperty ScaleWidthProperty =
-            DependencyProperty.Register(nameof(ScaleWidth), typeof(double), typeof(RadialSlider), new PropertyMetadata(25.0, OnScaleChanged));
-
-        /// <summary>
-        /// Identifies the Value dependency property.
-        /// </summary>
-        public static readonly DependencyProperty ValueProperty =
-            DependencyProperty.Register(nameof(Value), typeof(double), typeof(RadialSlider), new PropertyMetadata(0.0, OnValueChanged));
-
-        /// <summary>
-        /// Identifies the TrailBrush dependency property.
-        /// </summary>
-        public static readonly DependencyProperty TrailBrushProperty =
-            DependencyProperty.Register(nameof(TrailBrush), typeof(Brush), typeof(RadialSlider), new PropertyMetadata(new SolidColorBrush(Colors.Orange), OnValueChanged));
-
-        /// <summary>
-        /// Identifies the TrailStartCap dependency property.
-        /// </summary>
-        public static readonly DependencyProperty TrailStartCapProperty =
-            DependencyProperty.Register(nameof(TrailStartCap), typeof(PenLineCap), typeof(RadialSlider), new PropertyMetadata(PenLineCap.Round, OnValueChanged));
-
-        /// <summary>
-        /// Identifies the TrailEndCap dependency property.
-        /// </summary>
-        public static readonly DependencyProperty TrailEndCapProperty =
-            DependencyProperty.Register(nameof(TrailEndCap), typeof(PenLineCap), typeof(RadialSlider), new PropertyMetadata(PenLineCap.Triangle, OnValueChanged));
-
-        /// <summary>
-        /// Identifies the ScaleBrush dependency property.
-        /// </summary>
-        public static readonly DependencyProperty ScaleBrushProperty =
-            DependencyProperty.Register(nameof(ScaleBrush), typeof(Brush), typeof(RadialSlider), new PropertyMetadata(new SolidColorBrush(Colors.DarkGray), OnScaleChanged));
-
-        /// <summary>
-        /// Identifies the ScaleStartCap dependency property.
-        /// </summary>
-        public static readonly DependencyProperty ScaleStartCapProperty =
-            DependencyProperty.Register(nameof(ScaleStartCap), typeof(PenLineCap), typeof(RadialSlider), new PropertyMetadata(PenLineCap.Round, OnScaleChanged));
-
-        /// <summary>
-        /// Identifies the ScaleEndCap dependency property.
-        /// </summary>
-        public static readonly DependencyProperty ScaleEndCapProperty =
-            DependencyProperty.Register(nameof(ScaleEndCap), typeof(PenLineCap), typeof(RadialSlider), new PropertyMetadata(PenLineCap.Triangle, OnScaleChanged));
-
-        /// <summary>
-        /// Identifies the ValueBrush dependency property.
-        /// </summary>
-        public static readonly DependencyProperty ValueBrushProperty =
-            DependencyProperty.Register(nameof(ValueBrush), typeof(Brush), typeof(RadialSlider), new PropertyMetadata(new SolidColorBrush(Colors.Black)));
-
-        /// <summary>
-        /// Identifies the ValueStringFormat dependency property.
-        /// </summary>
-        public static readonly DependencyProperty ValueStringFormatProperty =
-            DependencyProperty.Register(nameof(ValueStringFormat), typeof(string), typeof(RadialSlider), null);
-
-        /// <summary>
-        /// Identifies the MinAngle dependency property.
-        /// </summary>
-        public static readonly DependencyProperty MinAngleProperty =
-            DependencyProperty.Register(nameof(MinAngle), typeof(int), typeof(RadialSlider), new PropertyMetadata(0, OnScaleChanged));
-
-        /// <summary>
-        /// Identifies the MaxAngle dependency property.
-        /// </summary>
-        public static readonly DependencyProperty MaxAngleProperty =
-            DependencyProperty.Register(nameof(MaxAngle), typeof(int), typeof(RadialSlider), new PropertyMetadata(360, OnScaleChanged));
-
-        /// <summary>
-        /// Identifies the ValueAngle dependency property.
-        /// </summary>
-        protected static readonly DependencyProperty ValueAngleProperty =
-            DependencyProperty.Register(nameof(ValueAngle), typeof(double), typeof(RadialSlider), new PropertyMetadata(null));
-
-        /// <summary>
-        /// Identifies the MinimumValue dependency property.
-        /// </summary>
-        protected static readonly DependencyProperty MinimumProperty =
-            DependencyProperty.Register(nameof(Minimum), typeof(double), typeof(RadialSlider), new PropertyMetadata(0.0, OnValueChanged));
-
-        /// <summary>
-        /// Identifies the MaximumValue dependency property.
-        /// </summary>
-        protected static readonly DependencyProperty MaximumProperty =
-            DependencyProperty.Register(nameof(Maximum), typeof(double), typeof(RadialSlider), new PropertyMetadata(100.0, OnValueChanged));
-
-        // Template Parts.
-        private const string ContainerPartName = "PART_Container";
-        private const string ScalePartName = "PART_Scale";
-        private const string TrailPartName = "PART_Trail";
-        private const string ValueTextPartName = "PART_ValueText";
-
-        // For convenience.
-        private const double Degrees2Radians = Math.PI / 180;
-        private const double Radius = 100;
+    /// Identifies the IsInteractive dependency property.
+    /// </summary>
+    public static readonly DependencyProperty IsInteractiveProperty =
+        DependencyProperty.Register(nameof(IsInteractive), typeof(bool), typeof(RadialSlider), new PropertyMetadata(false, OnInteractivityChanged));
+
+    /// <summary>
+    /// Identifies the MaxAngle dependency property.
+    /// </summary>
+    public static readonly DependencyProperty MaxAngleProperty =
+        DependencyProperty.Register(nameof(MaxAngle), typeof(int), typeof(RadialSlider), new PropertyMetadata(360, OnScaleChanged));
+
+    /// <summary>
+    /// Identifies the MinAngle dependency property.
+    /// </summary>
+    public static readonly DependencyProperty MinAngleProperty =
+        DependencyProperty.Register(nameof(MinAngle), typeof(int), typeof(RadialSlider), new PropertyMetadata(0, OnScaleChanged));
+
+    /// <summary>
+    /// Identifies the ScaleBrush dependency property.
+    /// </summary>
+    public static readonly DependencyProperty ScaleBrushProperty =
+        DependencyProperty.Register(nameof(ScaleBrush), typeof(Brush), typeof(RadialSlider), new PropertyMetadata(new SolidColorBrush(Colors.DarkGray), OnScaleChanged));
+
+    /// <summary>
+    /// Identifies the ScaleEndCap dependency property.
+    /// </summary>
+    public static readonly DependencyProperty ScaleEndCapProperty =
+        DependencyProperty.Register(nameof(ScaleEndCap), typeof(PenLineCap), typeof(RadialSlider), new PropertyMetadata(PenLineCap.Triangle, OnScaleChanged));
+
+    /// <summary>
+    /// Identifies the ScaleStartCap dependency property.
+    /// </summary>
+    public static readonly DependencyProperty ScaleStartCapProperty =
+        DependencyProperty.Register(nameof(ScaleStartCap), typeof(PenLineCap), typeof(RadialSlider), new PropertyMetadata(PenLineCap.Round, OnScaleChanged));
+
+    /// <summary>
+    /// Identifies the ScaleWidth dependency property.
+    /// </summary>
+    public static readonly DependencyProperty ScaleWidthProperty =
+        DependencyProperty.Register(nameof(ScaleWidth), typeof(double), typeof(RadialSlider), new PropertyMetadata(25.0, OnScaleChanged));
+
+    /// <summary>
+    /// Identifies the optional StepSize property.
+    /// </summary>
+    public static readonly DependencyProperty StepSizeProperty =
+        DependencyProperty.Register(nameof(StepSize), typeof(double), typeof(RadialSlider), new PropertyMetadata(0.0));
+
+    /// <summary>
+    /// Identifies the TrailBrush dependency property.
+    /// </summary>
+    public static readonly DependencyProperty TrailBrushProperty =
+        DependencyProperty.Register(nameof(TrailBrush), typeof(Brush), typeof(RadialSlider), new PropertyMetadata(new SolidColorBrush(Colors.Orange), OnValueChanged));
+
+    /// <summary>
+    /// Identifies the TrailEndCap dependency property.
+    /// </summary>
+    public static readonly DependencyProperty TrailEndCapProperty =
+        DependencyProperty.Register(nameof(TrailEndCap), typeof(PenLineCap), typeof(RadialSlider), new PropertyMetadata(PenLineCap.Triangle, OnValueChanged));
 
-        private double _normalizedMinAngle;
-        private double _normalizedMaxAngle;
+    /// <summary>
+    /// Identifies the TrailStartCap dependency property.
+    /// </summary>
+    public static readonly DependencyProperty TrailStartCapProperty =
+        DependencyProperty.Register(nameof(TrailStartCap), typeof(PenLineCap), typeof(RadialSlider), new PropertyMetadata(PenLineCap.Round, OnValueChanged));
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RadialSlider"/> class.
-        /// </summary>
-        public RadialSlider()
+    /// <summary>
+    /// Identifies the ValueBrush dependency property.
+    /// </summary>
+    public static readonly DependencyProperty ValueBrushProperty =
+        DependencyProperty.Register(nameof(ValueBrush), typeof(Brush), typeof(RadialSlider), new PropertyMetadata(new SolidColorBrush(Colors.Black)));
+
+    /// <summary>
+    /// Identifies the Value dependency property.
+    /// </summary>
+    public static readonly DependencyProperty ValueProperty =
+        DependencyProperty.Register(nameof(Value), typeof(double), typeof(RadialSlider), new PropertyMetadata(0.0, OnValueChanged));
+
+    /// <summary>
+    /// Identifies the ValueStringFormat dependency property.
+    /// </summary>
+    public static readonly DependencyProperty ValueStringFormatProperty =
+        DependencyProperty.Register(nameof(ValueStringFormat), typeof(string), typeof(RadialSlider), null);
+
+    /// <summary>
+    /// Identifies the MaximumValue dependency property.
+    /// </summary>
+    protected static readonly DependencyProperty MaximumProperty =
+        DependencyProperty.Register(nameof(Maximum), typeof(double), typeof(RadialSlider), new PropertyMetadata(100.0, OnValueChanged));
+
+    /// <summary>
+    /// Identifies the MinimumValue dependency property.
+    /// </summary>
+    protected static readonly DependencyProperty MinimumProperty =
+        DependencyProperty.Register(nameof(Minimum), typeof(double), typeof(RadialSlider), new PropertyMetadata(0.0, OnValueChanged));
+
+    /// <summary>
+    /// Identifies the ValueAngle dependency property.
+    /// </summary>
+    protected static readonly DependencyProperty ValueAngleProperty =
+        DependencyProperty.Register(nameof(ValueAngle), typeof(double), typeof(RadialSlider), new PropertyMetadata(null));
+
+    // Template Parts.
+    private const string ContainerPartName = "PART_Container";
+
+    // For convenience.
+    private const double Degrees2Radians = Math.PI / 180;
+
+    private const double Radius = 100;
+
+    private const string ScalePartName = "PART_Scale";
+
+    private const string TrailPartName = "PART_Trail";
+
+    private const string ValueTextPartName = "PART_ValueText";
+
+    private double _normalizedMaxAngle;
+
+    private double _normalizedMinAngle;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="RadialSlider"/> class.
+    /// </summary>
+    public RadialSlider()
+    {
+        DefaultStyleKey = typeof(RadialSlider);
+    }
+
+    /// <summary>
+    /// Triggers whenever the slider changes
+    /// </summary>
+    public event EventHandler ValueChanged;
+    /// <summary>
+    /// Gets or sets a value indicating whether the control accepts setting its value through interaction.
+    /// </summary>
+    public bool IsInteractive
+    {
+        get
         {
-            DefaultStyleKey = typeof(RadialSlider);
+            return (bool)GetValue(IsInteractiveProperty);
         }
-
-        /// <summary>
-        /// Gets or sets the rounding interval for the Value.
-        /// </summary>
-        public double StepSize
+        set
         {
-            get { return (double)GetValue(StepSizeProperty); }
-            set { SetValue(StepSizeProperty, value); }
+            SetValue(IsInteractiveProperty, value);
         }
+    }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether the control accepts setting its value through interaction.
-        /// </summary>
-        public bool IsInteractive
+    /// <summary>
+    /// Gets or sets the end angle of the scale, which corresponds with the Maximum value, in degrees.
+    /// </summary>
+    public int MaxAngle
+    {
+        get
         {
-            get { return (bool)GetValue(IsInteractiveProperty); }
-            set { SetValue(IsInteractiveProperty, value); }
+            return (int)GetValue(MaxAngleProperty);
         }
-
-        /// <summary>
-        /// Gets or sets the width of the scale, in percentage of the radius.
-        /// </summary>
-        public double ScaleWidth
+        set
         {
-            get { return (double)GetValue(ScaleWidthProperty); }
-            set { SetValue(ScaleWidthProperty, value); }
+            SetValue(MaxAngleProperty, value);
         }
+    }
 
-        /// <summary>
-        /// Gets or sets the current value.
-        /// </summary>
-        public double Value
+    /// <summary>
+    /// Gets or sets the Maximum value for the Widget.
+    /// </summary>
+    public double Maximum
+    {
+        get
         {
-            get { return (double)GetValue(ValueProperty); }
-            set { SetValue(ValueProperty, value); }
+            return (double)GetValue(MaximumProperty);
         }
-
-        /// <summary>
-        /// Gets or sets the trail brush.
-        /// </summary>
-        public Brush TrailBrush
+        set
         {
-            get { return (Brush)GetValue(TrailBrushProperty); }
-            set { SetValue(TrailBrushProperty, value); }
+            SetValue(MaximumProperty, value);
         }
+    }
 
-        /// <summary>
-        /// Gets or sets the StrokeStartCap for the Trail.
-        /// </summary>
-        public PenLineCap TrailStartCap
+    /// <summary>
+    /// Gets or sets the start angle of the scale, which corresponds with the Minimum value, in degrees.
+    /// </summary>
+    public int MinAngle
+    {
+        get
         {
-            get { return (PenLineCap)GetValue(TrailStartCapProperty); }
-            set { SetValue(TrailStartCapProperty, value); }
+            return (int)GetValue(MinAngleProperty);
         }
-
-        /// <summary>
-        /// Gets or sets the StrokeEndCap for the Trail.
-        /// </summary>
-        public PenLineCap TrailEndCap
+        set
         {
-            get { return (PenLineCap)GetValue(TrailEndCapProperty); }
-            set { SetValue(TrailEndCapProperty, value); }
+            SetValue(MinAngleProperty, value);
         }
+    }
 
-        /// <summary>
-        /// Gets or sets the scale brush.
-        /// </summary>
-        public Brush ScaleBrush
+    /// <summary>
+    /// Gets or sets the Minimum value for the Widget.
+    /// </summary>
+    public double Minimum
+    {
+        get
         {
-            get { return (Brush)GetValue(ScaleBrushProperty); }
-            set { SetValue(ScaleBrushProperty, value); }
+            return (double)GetValue(MinimumProperty);
         }
-
-        /// <summary>
-        /// Gets or sets the StrokeStartCap for the Scale.
-        /// </summary>
-        public PenLineCap ScaleStartCap
+        set
         {
-            get { return (PenLineCap)GetValue(ScaleStartCapProperty); }
-            set { SetValue(ScaleStartCapProperty, value); }
+            SetValue(MinimumProperty, value);
         }
+    }
 
-        /// <summary>
-        /// Gets or sets the StrokeEndCap for the Scale.
-        /// </summary>
-        public PenLineCap ScaleEndCap
+    /// <summary>
+    /// Gets or sets the scale brush.
+    /// </summary>
+    public Brush ScaleBrush
+    {
+        get
         {
-            get { return (PenLineCap)GetValue(ScaleEndCapProperty); }
-            set { SetValue(ScaleEndCapProperty, value); }
+            return (Brush)GetValue(ScaleBrushProperty);
         }
-
-        /// <summary>
-        /// Gets or sets the brush for the displayed value.
-        /// </summary>
-        public Brush ValueBrush
+        set
         {
-            get { return (Brush)GetValue(ValueBrushProperty); }
-            set { SetValue(ValueBrushProperty, value); }
+            SetValue(ScaleBrushProperty, value);
         }
+    }
 
-        /// <summary>
-        /// Gets or sets the value string format.
-        /// </summary>
-        public string ValueStringFormat
+    /// <summary>
+    /// Gets or sets the StrokeEndCap for the Scale.
+    /// </summary>
+    public PenLineCap ScaleEndCap
+    {
+        get
         {
-            get { return (string)GetValue(ValueStringFormatProperty); }
-            set { SetValue(ValueStringFormatProperty, value); }
+            return (PenLineCap)GetValue(ScaleEndCapProperty);
         }
-
-        /// <summary>
-        /// Gets or sets the start angle of the scale, which corresponds with the Minimum value, in degrees.
-        /// </summary>
-        public int MinAngle
+        set
         {
-            get { return (int)GetValue(MinAngleProperty); }
-            set { SetValue(MinAngleProperty, value); }
+            SetValue(ScaleEndCapProperty, value);
         }
+    }
 
-        /// <summary>
-        /// Gets or sets the end angle of the scale, which corresponds with the Maximum value, in degrees.
-        /// </summary>
-        public int MaxAngle
+    /// <summary>
+    /// Gets or sets the StrokeStartCap for the Scale.
+    /// </summary>
+    public PenLineCap ScaleStartCap
+    {
+        get
         {
-            get { return (int)GetValue(MaxAngleProperty); }
-            set { SetValue(MaxAngleProperty, value); }
+            return (PenLineCap)GetValue(ScaleStartCapProperty);
         }
-
-        /// <summary>
-        /// Gets or sets the current angle of the needle (between MinAngle and MaxAngle). Setting the angle will update the Value.
-        /// </summary>
-        protected double ValueAngle
+        set
         {
-            get { return (double)GetValue(ValueAngleProperty); }
-            set { SetValue(ValueAngleProperty, value); }
+            SetValue(ScaleStartCapProperty, value);
         }
+    }
 
-        /// <summary>
-        /// Gets or sets the Minimum value for the Widget.
-        /// </summary>
-        public double Minimum
+    /// <summary>
+    /// Gets or sets the width of the scale, in percentage of the radius.
+    /// </summary>
+    public double ScaleWidth
+    {
+        get
         {
-            get { return (double)GetValue(MinimumProperty); }
-            set { SetValue(MinimumProperty, value); }
+            return (double)GetValue(ScaleWidthProperty);
         }
+        set
+        {
+            SetValue(ScaleWidthProperty, value);
+        }
+    }
 
-        /// <summary>
-        /// Gets or sets the Maximum value for the Widget.
-        /// </summary>
-        public double Maximum
+    /// <summary>
+    /// Gets or sets the rounding interval for the Value.
+    /// </summary>
+    public double StepSize
+    {
+        get
+        {
+            return (double)GetValue(StepSizeProperty);
+        }
+        set
+        {
+            SetValue(StepSizeProperty, value);
+        }
+    }
+    /// <summary>
+    /// Gets or sets the trail brush.
+    /// </summary>
+    public Brush TrailBrush
+    {
+        get
         {
-            get { return (double)GetValue(MaximumProperty); }
-            set { SetValue(MaximumProperty, value); }
+            return (Brush)GetValue(TrailBrushProperty);
         }
+        set
+        {
+            SetValue(TrailBrushProperty, value);
+        }
+    }
 
-        /// <summary>
-        /// Gets the normalized minimum angle.
-        /// </summary>
-        /// <value>The minimum angle in the range from -180 to 180.</value>
-        protected double NormalizedMinAngle => _normalizedMinAngle;
+    /// <summary>
+    /// Gets or sets the StrokeEndCap for the Trail.
+    /// </summary>
+    public PenLineCap TrailEndCap
+    {
+        get
+        {
+            return (PenLineCap)GetValue(TrailEndCapProperty);
+        }
+        set
+        {
+            SetValue(TrailEndCapProperty, value);
+        }
+    }
 
-        /// <summary>
-        /// Gets the normalized maximum angle.
-        /// </summary>
-        /// <value>The maximum angle in the range from 180 to 540.</value>
-        protected double NormalizedMaxAngle => _normalizedMaxAngle;
+    /// <summary>
+    /// Gets or sets the StrokeStartCap for the Trail.
+    /// </summary>
+    public PenLineCap TrailStartCap
+    {
+        get
+        {
+            return (PenLineCap)GetValue(TrailStartCapProperty);
+        }
+        set
+        {
+            SetValue(TrailStartCapProperty, value);
+        }
+    }
 
-        /// <summary>
-        /// Update the visual state of the control when its template is changed.
-        /// </summary>
-        protected override void OnApplyTemplate()
+    /// <summary>
+    /// Gets or sets the current value.
+    /// </summary>
+    public double Value
+    {
+        get
+        {
+            return (double)GetValue(ValueProperty);
+        }
+        set
         {
-            OnScaleChanged(this);
+            SetValue(ValueProperty, value);
+        }
+    }
 
-            base.OnApplyTemplate();
+    /// <summary>
+    /// Gets or sets the brush for the displayed value.
+    /// </summary>
+    public Brush ValueBrush
+    {
+        get
+        {
+            return (Brush)GetValue(ValueBrushProperty);
         }
+        set
+        {
+            SetValue(ValueBrushProperty, value);
+        }
+    }
 
-        private static void OnValueChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    /// <summary>
+    /// Gets or sets the value string format.
+    /// </summary>
+    public string ValueStringFormat
+    {
+        get
+        {
+            return (string)GetValue(ValueStringFormatProperty);
+        }
+        set
         {
-            OnValueChanged(d);
+            SetValue(ValueStringFormatProperty, value);
         }
+    }
+    /// <summary>
+    /// Gets the normalized maximum angle.
+    /// </summary>
+    /// <value>The maximum angle in the range from 180 to 540.</value>
+    protected double NormalizedMaxAngle => _normalizedMaxAngle;
+
+    /// <summary>
+    /// Gets the normalized minimum angle.
+    /// </summary>
+    /// <value>The minimum angle in the range from -180 to 180.</value>
+    protected double NormalizedMinAngle => _normalizedMinAngle;
 
-        private static void OnValueChanged(DependencyObject d)
+    /// <summary>
+    /// Gets or sets the current angle of the needle (between MinAngle and MaxAngle). Setting the angle will update the Value.
+    /// </summary>
+    protected double ValueAngle
+    {
+        get
         {
-            var percentageRing = (RadialSlider)d;
-            if (!double.IsNaN(percentageRing.Value))
-            {
-                if (percentageRing.StepSize > 0)
-                {
-                    percentageRing.Value = percentageRing.RoundToMultiple(percentageRing.Value, percentageRing.StepSize);
-                }
+            return (double)GetValue(ValueAngleProperty);
+        }
+        set
+        {
+            SetValue(ValueAngleProperty, value);
+        }
+    }
+    /// <summary>
+    /// Update the visual state of the control when its template is changed.
+    /// </summary>
+    protected override void OnApplyTemplate()
+    {
+        OnScaleChanged(this);
 
-                var middleOfScale = Radius - percentageRing.ScaleWidth / 2;
-                var valueText = percentageRing.GetTemplateChild(ValueTextPartName) as TextBlock;
-                percentageRing.ValueAngle = percentageRing.ValueToAngle(percentageRing.Value);
+        base.OnApplyTemplate();
+    }
 
-                // Trail
-                var trail = percentageRing.GetTemplateChild(TrailPartName) as Path;
-                if (trail != null)
-                {
-                    if (percentageRing.ValueAngle > percentageRing.NormalizedMinAngle)
-                    {
-                        trail.Visibility = Visibility.Visible;
+    private static double Mod(double number, double divider)
+    {
+        double result = number % divider;
+        result = result < 0 ? result + divider : result;
+        return result;
+    }
 
-                        if (percentageRing.ValueAngle - percentageRing.NormalizedMinAngle == 360)
-                        {
-                            // Draw full circle.
-                            var eg = new EllipseGeometry
-                            {
-                                Center = new Point(Radius, Radius),
-                                RadiusX = Radius - (percentageRing.ScaleWidth / 2),
-                            };
-
-                            eg.RadiusY = eg.RadiusX;
-                            trail.Data = eg;
-                        }
-                        else
-                        {
-                            trail.StrokeStartLineCap = percentageRing.TrailStartCap;
-                            trail.StrokeEndLineCap = percentageRing.TrailEndCap;
-
-                            // Draw arc.
-                            var pg = new PathGeometry();
-                            var pf = new PathFigure
-                            {
-                                IsClosed = false,
-                                StartPoint = percentageRing.ScalePoint(percentageRing.NormalizedMinAngle, middleOfScale),
-                            };
-
-                            var seg = new ArcSegment
-                            {
-                                SweepDirection = SweepDirection.Clockwise,
-                                IsLargeArc = percentageRing.ValueAngle > 180 + percentageRing.NormalizedMinAngle,
-                                Size = new Size(middleOfScale, middleOfScale),
-                                Point =
-                                    percentageRing.ScalePoint(
-                                        Math.Min(percentageRing.ValueAngle, percentageRing.NormalizedMaxAngle), middleOfScale),
-                            };
-
-                            pf.Segments.Add(seg);
-                            pg.Figures.Add(pf);
-                            trail.Data = pg;
-                        }
-                    }
-                    else
-                    {
-                        trail.Visibility = Visibility.Collapsed;
-                    }
-                }
+    private static void OnInteractivityChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        RadialSlider percentageRing = (RadialSlider)d;
 
-                // Value Text
-                if (valueText != null)
-                {
-                    valueText.Text = percentageRing.Value.ToString(percentageRing.ValueStringFormat);
-                }
-            }
+        if (percentageRing.IsInteractive)
+        {
+            percentageRing.Tapped += percentageRing.RadialSlider_Tapped;
+            percentageRing.ManipulationDelta += percentageRing.RadialSlider_ManipulationDelta;
+            percentageRing.ManipulationCompleted += percentageRing.PercentageRingOnManipulationCompleted;
+            percentageRing.ManipulationMode = ManipulationModes.TranslateX | ManipulationModes.TranslateY;
         }
-
-        private static void OnInteractivityChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+        else
         {
-            var percentageRing = (RadialSlider)d;
+            percentageRing.Tapped -= percentageRing.RadialSlider_Tapped;
+            percentageRing.ManipulationCompleted -= percentageRing.PercentageRingOnManipulationCompleted;
+            percentageRing.ManipulationDelta -= percentageRing.RadialSlider_ManipulationDelta;
+            percentageRing.ManipulationMode = ManipulationModes.None;
+        }
+    }
+
+    private static void OnScaleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        OnScaleChanged(d);
+    }
 
-            if (percentageRing.IsInteractive)
+    private static void OnScaleChanged(DependencyObject d)
+    {
+        RadialSlider percentageRing = (RadialSlider)d;
+
+        percentageRing.UpdateNormalizedAngles();
+
+        Path? scale = percentageRing.GetTemplateChild(ScalePartName) as Path;
+        if (scale != null)
+        {
+            if (percentageRing.NormalizedMaxAngle - percentageRing.NormalizedMinAngle == 360)
             {
-                percentageRing.Tapped += percentageRing.RadialSlider_Tapped;
-                percentageRing.ManipulationDelta += percentageRing.RadialSlider_ManipulationDelta;
-                percentageRing.ManipulationCompleted += percentageRing.PercentageRingOnManipulationCompleted;
-                percentageRing.ManipulationMode = ManipulationModes.TranslateX | ManipulationModes.TranslateY;
+                // Draw full circle.
+                EllipseGeometry eg = new EllipseGeometry
+                {
+                    Center = new Point(Radius, Radius),
+                    RadiusX = Radius - (percentageRing.ScaleWidth / 2),
+                };
+
+                eg.RadiusY = eg.RadiusX;
+                scale.Data = eg;
             }
             else
             {
-                percentageRing.Tapped -= percentageRing.RadialSlider_Tapped;
-                percentageRing.ManipulationCompleted -= percentageRing.PercentageRingOnManipulationCompleted;
-                percentageRing.ManipulationDelta -= percentageRing.RadialSlider_ManipulationDelta;
-                percentageRing.ManipulationMode = ManipulationModes.None;
+                scale.StrokeStartLineCap = percentageRing.ScaleStartCap;
+                scale.StrokeEndLineCap = percentageRing.ScaleEndCap;
+
+                // Draw arc.
+                var pg = new PathGeometry();
+                var pf = new PathFigure { IsClosed = false };
+                var middleOfScale = Radius - (percentageRing.ScaleWidth / 2);
+                pf.StartPoint = percentageRing.ScalePoint(percentageRing.NormalizedMinAngle, middleOfScale);
+                var seg = new ArcSegment
+                {
+                    SweepDirection = SweepDirection.Clockwise,
+                    IsLargeArc = percentageRing.NormalizedMaxAngle > (percentageRing.NormalizedMinAngle + 180),
+                    Size = new Size(middleOfScale, middleOfScale),
+                    Point = percentageRing.ScalePoint(percentageRing.NormalizedMaxAngle, middleOfScale),
+                };
+
+                pf.Segments.Add(seg);
+                pg.Figures.Add(pf);
+                scale.Data = pg;
             }
         }
 
-        private static void OnScaleChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
-        {
-            OnScaleChanged(d);
-        }
+        OnValueChanged(percentageRing);
+    }
+
+    private static void OnValueChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
+    {
+        OnValueChanged(d);
+    }
 
-        private static void OnScaleChanged(DependencyObject d)
+    private static void OnValueChanged(DependencyObject d)
+    {
+        RadialSlider? percentageRing = (RadialSlider)d;
+        if (!double.IsNaN(percentageRing.Value))
         {
-            var percentageRing = (RadialSlider)d;
+            if (percentageRing.StepSize > 0)
+            {
+                percentageRing.Value = percentageRing.RoundToMultiple(percentageRing.Value, percentageRing.StepSize);
+            }
 
-            percentageRing.UpdateNormalizedAngles();
+            double middleOfScale = Radius - (percentageRing.ScaleWidth / 2);
+            TextBlock? valueText = percentageRing.GetTemplateChild(ValueTextPartName) as TextBlock;
+            percentageRing.ValueAngle = percentageRing.ValueToAngle(percentageRing.Value);
 
-            var scale = percentageRing.GetTemplateChild(ScalePartName) as Path;
-            if (scale != null)
+            // Trail
+            Path? trail = percentageRing.GetTemplateChild(TrailPartName) as Path;
+            if (trail != null)
             {
-                if (percentageRing.NormalizedMaxAngle - percentageRing.NormalizedMinAngle == 360)
+                if (percentageRing.ValueAngle > percentageRing.NormalizedMinAngle)
                 {
-                    // Draw full circle.
-                    var eg = new EllipseGeometry
+                    trail.Visibility = Visibility.Visible;
+
+                    if (percentageRing.ValueAngle - percentageRing.NormalizedMinAngle == 360)
+                    {
+                        // Draw full circle.
+                        EllipseGeometry eg = new EllipseGeometry
+                        {
+                            Center = new Point(Radius, Radius),
+                            RadiusX = Radius - (percentageRing.ScaleWidth / 2),
+                        };
+
+                        eg.RadiusY = eg.RadiusX;
+                        trail.Data = eg;
+                    }
+                    else
                     {
-                        Center = new Point(Radius, Radius),
-                        RadiusX = Radius - (percentageRing.ScaleWidth / 2),
-                    };
+                        trail.StrokeStartLineCap = percentageRing.TrailStartCap;
+                        trail.StrokeEndLineCap = percentageRing.TrailEndCap;
+
+                        // Draw arc.
+                        PathGeometry pg = new PathGeometry();
+                        PathFigure pf = new PathFigure
+                        {
+                            IsClosed = false,
+                            StartPoint = percentageRing.ScalePoint(percentageRing.NormalizedMinAngle, middleOfScale),
+                        };
 
-                    eg.RadiusY = eg.RadiusX;
-                    scale.Data = eg;
+                        ArcSegment? seg = new ArcSegment
+                        {
+                            SweepDirection = SweepDirection.Clockwise,
+                            IsLargeArc = percentageRing.ValueAngle > 180 + percentageRing.NormalizedMinAngle,
+                            Size = new Size(middleOfScale, middleOfScale),
+                            Point =
+                                percentageRing.ScalePoint(
+                                    Math.Min(percentageRing.ValueAngle, percentageRing.NormalizedMaxAngle), middleOfScale),
+                        };
+
+                        pf.Segments.Add(seg);
+                        pg.Figures.Add(pf);
+                        trail.Data = pg;
+                    }
                 }
                 else
                 {
-                    scale.StrokeStartLineCap = percentageRing.ScaleStartCap;
-                    scale.StrokeEndLineCap = percentageRing.ScaleEndCap;
-
-                    // Draw arc.
-                    var pg = new PathGeometry();
-                    var pf = new PathFigure { IsClosed = false };
-                    var middleOfScale = Radius - (percentageRing.ScaleWidth / 2);
-                    pf.StartPoint = percentageRing.ScalePoint(percentageRing.NormalizedMinAngle, middleOfScale);
-                    var seg = new ArcSegment
-                    {
-                        SweepDirection = SweepDirection.Clockwise,
-                        IsLargeArc = percentageRing.NormalizedMaxAngle > (percentageRing.NormalizedMinAngle + 180),
-                        Size = new Size(middleOfScale, middleOfScale),
-                        Point = percentageRing.ScalePoint(percentageRing.NormalizedMaxAngle, middleOfScale),
-                    };
-
-                    pf.Segments.Add(seg);
-                    pg.Figures.Add(pf);
-                    scale.Data = pg;
+                    trail.Visibility = Visibility.Collapsed;
                 }
             }
 
-            OnValueChanged(percentageRing);
-        }
-
-        private void UpdateNormalizedAngles()
-        {
-            var result = Mod(MinAngle, 360);
-
-            if (result >= 180)
+            // Value Text
+            if (valueText != null)
             {
-                result = result - 360;
+                valueText.Text = percentageRing.Value.ToString(percentageRing.ValueStringFormat);
             }
+        }
+    }
 
-            _normalizedMinAngle = result;
-
-            result = Mod(MaxAngle, 360);
-
-            if (result < 180)
-            {
-                result = result + 360;
-            }
+    private void PercentageRingOnManipulationCompleted(object sender, ManipulationCompletedRoutedEventArgs e)
+    {
+        ValueChanged?.Invoke(this, EventArgs.Empty);
+    }
 
-            if (result > NormalizedMinAngle + 360)
-            {
-                result = result - 360;
-            }
+    private void RadialSlider_ManipulationDelta(object sender, ManipulationDeltaRoutedEventArgs e)
+    {
+        SetValueFromPoint(e.Position);
+    }
 
-            _normalizedMaxAngle = result;
-        }
+    private void RadialSlider_Tapped(object sender, TappedRoutedEventArgs e)
+    {
+        SetValueFromPoint(e.GetPosition(this));
+        ValueChanged?.Invoke(this, EventArgs.Empty);
+    }
 
-        private void RadialSlider_ManipulationDelta(object sender, ManipulationDeltaRoutedEventArgs e)
+    private double RoundToMultiple(double number, double multiple)
+    {
+        double modulo = number % multiple;
+        if ((multiple - modulo) <= modulo)
         {
-            SetValueFromPoint(e.Position);
+            modulo = multiple - modulo;
         }
-
-        private void PercentageRingOnManipulationCompleted(object sender, ManipulationCompletedRoutedEventArgs e)
+        else
         {
-            ValueChanged?.Invoke(this, EventArgs.Empty);
+            modulo *= -1;
         }
 
-        private void RadialSlider_Tapped(object sender, TappedRoutedEventArgs e)
+        return number + modulo;
+    }
+
+    private Point ScalePoint(double angle, double middleOfScale)
+    {
+        return new Point(Radius + (Math.Sin(Degrees2Radians * angle) * middleOfScale), Radius - (Math.Cos(Degrees2Radians * angle) * middleOfScale));
+    }
+
+    private void SetValueFromPoint(Point p)
+    {
+        Point pt = new Point(p.X - (ActualWidth / 2), -p.Y + (ActualHeight / 2));
+
+        double angle = Math.Atan2(pt.X, pt.Y) / Degrees2Radians;
+        double divider = Mod(NormalizedMaxAngle - NormalizedMinAngle, 360);
+        if (Math.Abs(divider) < 1e-10)
         {
-            SetValueFromPoint(e.GetPosition(this));
-            ValueChanged?.Invoke(this, EventArgs.Empty);
+            divider = 360;
         }
 
-        private void SetValueFromPoint(Point p)
+        double value = Minimum + ((Maximum - Minimum) * Mod(angle - NormalizedMinAngle, 360) / divider);
+        if (value < Minimum || value > Maximum)
         {
-            var pt = new Point(p.X - (ActualWidth / 2), -p.Y + (ActualHeight / 2));
+            // Ignore positions outside the scale angle.
+            return;
+        }
 
-            var angle = Math.Atan2(pt.X, pt.Y) / Degrees2Radians;
-            var divider = Mod(NormalizedMaxAngle - NormalizedMinAngle, 360);
-            if (divider == 0)
-            {
-                divider = 360;
-            }
+        Value = value;
+    }
 
-            var value = Minimum + ((Maximum - Minimum) * Mod(angle - NormalizedMinAngle, 360) / divider);
-            if (value < Minimum || value > Maximum)
-            {
-                // Ignore positions outside the scale angle.
-                return;
-            }
+    private void UpdateNormalizedAngles()
+    {
+        double result = Mod(MinAngle, 360);
 
-            Value = value;
+        if (result >= 180)
+        {
+            result = result - 360;
         }
 
-        private Point ScalePoint(double angle, double middleOfScale)
+        _normalizedMinAngle = result;
+
+        result = Mod(MaxAngle, 360);
+
+        if (result < 180)
         {
-            return new Point(Radius + (Math.Sin(Degrees2Radians * angle) * middleOfScale), Radius - (Math.Cos(Degrees2Radians * angle) * middleOfScale));
+            result = result + 360;
         }
 
-        private double ValueToAngle(double value)
+        if (result > NormalizedMinAngle + 360)
         {
-            if (this.Minimum == this.Maximum)
-            {
-                Minimum = 0;
-                Maximum = 100;
-            }
-
-            // Off-scale on the left.
-            if (value < Minimum)
-            {
-                return MinAngle;
-            }
+            result = result - 360;
+        }
 
-            // Off-scale on the right.
-            if (value > Maximum)
-            {
-                return MaxAngle;
-            }
+        _normalizedMaxAngle = result;
+    }
 
-            return ((value - Minimum) / (Maximum - Minimum) * (NormalizedMaxAngle - NormalizedMinAngle)) + NormalizedMinAngle;
+    private double ValueToAngle(double value)
+    {
+        if (this.Minimum == this.Maximum)
+        {
+            Minimum = 0;
+            Maximum = 100;
         }
 
-        private double RoundToMultiple(double number, double multiple)
+        // Off-scale on the left.
+        if (value < Minimum)
         {
-            var modulo = number % multiple;
-            if ((multiple - modulo) <= modulo)
-            {
-                modulo = multiple - modulo;
-            }
-            else
-            {
-                modulo *= -1;
-            }
-
-            return number + modulo;
+            return MinAngle;
         }
 
-        private static double Mod(double number, double divider)
+        // Off-scale on the right.
+        if (value > Maximum)
         {
-            var result = number % divider;
-            result = result < 0 ? result + divider : result;
-            return result;
+            return MaxAngle;
         }
+
+        return ((value - Minimum) / (Maximum - Minimum) * (NormalizedMaxAngle - NormalizedMinAngle)) + NormalizedMinAngle;
     }
-}
\ No newline at end of file
+}
diff --git a/src/openHAB.Windows/Controls/RollershutterWidget.xaml b/src/openHAB.Windows/Controls/RollershutterWidget.xaml
index 8ac649d2..792426eb 100644
--- a/src/openHAB.Windows/Controls/RollershutterWidget.xaml
+++ b/src/openHAB.Windows/Controls/RollershutterWidget.xaml
@@ -1,43 +1,43 @@
-<local:WidgetBase x:Class="OpenHAB.Windows.Controls.RollershutterWidget"
-				  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-				  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-				  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-				  xmlns:local="using:OpenHAB.Windows.Controls"
-				  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-				  d:DesignHeight="150"
-				  d:DesignWidth="300"
-				  mc:Ignorable="d"
-				  Visibility="{x:Bind Widget.Visibility, Converter={StaticResource BooleanToVisibilityConverter}}">
-
-	<Grid Style="{StaticResource Widget}">
-		<Grid.ColumnDefinitions>
-			<ColumnDefinition Width="*" />
-			<ColumnDefinition Width="Auto" />
-		</Grid.ColumnDefinitions>
-		<local:ImageLabel VerticalAlignment="Center"
-						  IconPath="{x:Bind Widget, Converter={StaticResource IconToPathConverter}, Mode=OneWay}"
-						  LabelText="{x:Bind Widget.Label, Mode=OneWay}"
-						  LabelForeground="{x:Bind Widget.LabelColor,Converter={StaticResource StringToColorConverter}, Mode=OneWay}"/>
-
-		<StackPanel Grid.Column="1"
-					Width="100"
-					Margin="0,0,12,0"
-					HorizontalAlignment="Center"
-					VerticalAlignment="Center"
-					BorderBrush="{StaticResource DarkAcrylicColor}"
-					BorderThickness="0">
-			<Button HorizontalAlignment="Stretch"
-                    
-					Click="ButtonUp_Click"
-					Content="Up" FontSize="12" />
-			<Button Margin="0,2,0,0"
-					HorizontalAlignment="Stretch"
-					Click="ButtonStop_Click"
-					Content="Stop" FontSize="12" />
-			<Button Margin="0,2,0,0"
-					HorizontalAlignment="Stretch"
-					Click="ButtonDown_Click"
-					Content="Down" FontSize="12" />
-		</StackPanel>
-	</Grid>
+<local:WidgetBase x:Class="openHAB.Windows.Controls.RollershutterWidget"
+                  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                  xmlns:local="using:openHAB.Windows.Controls"
+                  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                  d:DesignHeight="150"
+                  d:DesignWidth="300"
+                  mc:Ignorable="d"
+                  Visibility="{x:Bind Widget.Visibility}">
+    <Grid Style="{StaticResource Widget}">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="Auto" />
+        </Grid.ColumnDefinitions>
+        <local:ImageLabel VerticalAlignment="Center"
+                          IconPath="{x:Bind Widget.IconPath, Mode=OneWay}"
+                          LabelText="{x:Bind Widget.Label, Mode=OneWay}"
+                          LabelForeground="{x:Bind Widget.LabelColor, Mode=OneWay}" />
+        <StackPanel Grid.Column="1"
+                    Width="100"
+                    Margin="0,0,12,0"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    BorderBrush="{ThemeResource SolidBackgroundFillColorSecondaryBrush}"
+                    BorderThickness="0">
+            <Button HorizontalAlignment="Stretch"
+                    Click="ButtonUp_Click"
+                    Content="Up"
+                    FontSize="12" />
+            <Button Margin="0,2,0,0"
+                    HorizontalAlignment="Stretch"
+                    Click="ButtonStop_Click"
+                    Content="Stop"
+                    FontSize="12" />
+            <Button Margin="0,2,0,0"
+                    HorizontalAlignment="Stretch"
+                    Click="ButtonDown_Click"
+                    Content="Down"
+                    FontSize="12" />
+        </StackPanel>
+    </Grid>
 </local:WidgetBase>
diff --git a/src/openHAB.Windows/Controls/RollershutterWidget.xaml.cs b/src/openHAB.Windows/Controls/RollershutterWidget.xaml.cs
index 45dd9a37..ece45a0e 100644
--- a/src/openHAB.Windows/Controls/RollershutterWidget.xaml.cs
+++ b/src/openHAB.Windows/Controls/RollershutterWidget.xaml.cs
@@ -1,45 +1,47 @@
-using CommunityToolkit.Mvvm.Messaging;
-using OpenHAB.Core.Messages;
-using OpenHAB.Core.Model;
-using Windows.UI.Xaml;
+using CommunityToolkit.Mvvm.Messaging;
+using Microsoft.UI.Xaml;
+using openHAB.Core.Client.Messages;
+using openHAB.Core.Model;
 
-namespace OpenHAB.Windows.Controls
+namespace openHAB.Windows.Controls;
+
+/// <summary>
+/// Widget control that represents an OpenHAB switch.
+/// </summary>
+public sealed partial class RollershutterWidget : WidgetBase
 {
     /// <summary>
-    /// Widget control that represents an OpenHAB switch.
+    /// Gets or sets a value indicating whether the switch is on or off.
     /// </summary>
-    public sealed partial class RollershutterWidget : WidgetBase
+    public bool IsOn
     {
-        /// <summary>
-        /// Gets or sets a value indicating whether the switch is on or off.
-        /// </summary>
-        public bool IsOn { get; set; }
+        get; set;
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="RollershutterWidget"/> class.
-        /// </summary>
-        public RollershutterWidget()
-        {
-            InitializeComponent();
-        }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="RollershutterWidget"/> class.
+    /// </summary>
+    public RollershutterWidget()
+    {
+        InitializeComponent();
+    }
 
-        private void ButtonUp_Click(object sender, RoutedEventArgs e)
-        {
-            StrongReferenceMessenger.Default.Send(new TriggerCommandMessage(Widget.Item, OpenHABCommands.UpCommand));
-        }
+    private void ButtonUp_Click(object sender, RoutedEventArgs e)
+    {
+        StrongReferenceMessenger.Default.Send(new TriggerCommandMessage(Widget.Item, OpenHABCommands.UpCommand));
+    }
 
-        private void ButtonStop_Click(object sender, RoutedEventArgs e)
-        {
-            StrongReferenceMessenger.Default.Send(new TriggerCommandMessage(Widget.Item, OpenHABCommands.StopCommand));
-        }
+    private void ButtonStop_Click(object sender, RoutedEventArgs e)
+    {
+        StrongReferenceMessenger.Default.Send(new TriggerCommandMessage(Widget.Item, OpenHABCommands.StopCommand));
+    }
 
-        private void ButtonDown_Click(object sender, RoutedEventArgs e)
-        {
-            StrongReferenceMessenger.Default.Send(new TriggerCommandMessage(Widget.Item, OpenHABCommands.DownCommand));
-        }
+    private void ButtonDown_Click(object sender, RoutedEventArgs e)
+    {
+        StrongReferenceMessenger.Default.Send(new TriggerCommandMessage(Widget.Item, OpenHABCommands.DownCommand));
+    }
 
-        internal override void SetState()
-        {
-        }
+    internal override void SetState()
+    {
     }
-}
\ No newline at end of file
+}
diff --git a/src/openHAB.Windows/Controls/SectionSwitchWidget.xaml b/src/openHAB.Windows/Controls/SectionSwitchWidget.xaml
index 2edebbf3..d74727d6 100644
--- a/src/openHAB.Windows/Controls/SectionSwitchWidget.xaml
+++ b/src/openHAB.Windows/Controls/SectionSwitchWidget.xaml
@@ -1,51 +1,49 @@
-<local:WidgetBase x:Class="OpenHAB.Windows.Controls.SectionSwitchWidget"
-				  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-				  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-				  xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
-				  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-				  xmlns:local="using:OpenHAB.Windows.Controls"
-				  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-				  xmlns:model="using:OpenHAB.Core.Model"
-				  xmlns:wrapPanel="using:Microsoft.Toolkit.Uwp.UI.Controls.WrapPanel"
-				  d:DesignHeight="150"
-				  d:DesignWidth="300"
-				  mc:Ignorable="d"
-				  Visibility="{x:Bind Widget.Visibility, Converter={StaticResource BooleanToVisibilityConverter}}">
-
-	<Grid Style="{StaticResource Widget}">
-		<Grid.ColumnDefinitions>
-			<ColumnDefinition Width="Auto" />
-			<ColumnDefinition Width="*" />
-		</Grid.ColumnDefinitions>
-		<local:ImageLabel Margin="8,0,0,0"
-						  HorizontalAlignment="Left"
-						  VerticalAlignment="Center"
-						  IconPath="{x:Bind Widget, Converter={StaticResource IconToPathConverter}, Mode=OneWay}"
-						  LabelText="{x:Bind Widget.Label, Mode=OneWay}" 
-						  LabelForeground="{x:Bind Widget.LabelColor, Converter={StaticResource StringToColorConverter}, Mode=OneWay}"/>
-		<ItemsControl x:Name="SectionsList"
-					  Grid.Column="1"
-					  Margin="2,2,8,2"
-					  HorizontalAlignment="Center"
-					  VerticalAlignment="Center"
-					  HorizontalContentAlignment="Center"
-					  VerticalContentAlignment="Center"
-					  Foreground="{x:Bind Widget.ValueColor,Converter={StaticResource StringToColorConverter}, Mode=OneWay}"
-					  Background="{StaticResource OpenHABLightColor}"
-					  ItemsSource="{x:Bind Widget.Mappings}">
-			<ItemsControl.ItemTemplate>
-				<DataTemplate x:DataType="model:OpenHABWidgetMapping">
-					<ToggleButton Margin="0,0,4,4"
-								  Content="{x:Bind Label}"
-								  Tag="{x:Bind Command}"
-								  Tapped="Button_OnClick" />
-				</DataTemplate>
-			</ItemsControl.ItemTemplate>
-			<ItemsControl.ItemsPanel>
-				<ItemsPanelTemplate>
-					<controls:WrapPanel />
-				</ItemsPanelTemplate>
-			</ItemsControl.ItemsPanel>
-		</ItemsControl>
-	</Grid>
+<local:WidgetBase x:Class="openHAB.Windows.Controls.SectionSwitchWidget"
+                  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                  xmlns:controls="using:CommunityToolkit.WinUI.Controls"
+                  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                  xmlns:local="using:openHAB.Windows.Controls"
+                  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                  xmlns:model="using:openHAB.Core.Client.Models"
+                  d:DesignHeight="150"
+                  d:DesignWidth="300"
+                  mc:Ignorable="d"
+                  Visibility="{x:Bind Widget.Visibility}">
+    <Grid Style="{StaticResource Widget}">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
+        <local:ImageLabel Margin="8,0,0,0"
+                          HorizontalAlignment="Left"
+                          VerticalAlignment="Center"
+                          IconPath="{x:Bind Widget.IconPath, Mode=OneWay}"
+                          LabelText="{x:Bind Widget.Label, Mode=OneWay}"
+                          LabelForeground="{x:Bind Widget.LabelColor, Mode=OneWay}" />
+        <ItemsControl x:Name="SectionsList"
+                      Grid.Column="1"
+                      Margin="2,2,8,2"
+                      HorizontalAlignment="Center"
+                      VerticalAlignment="Center"
+                      HorizontalContentAlignment="Center"
+                      VerticalContentAlignment="Center"
+                      Foreground="{x:Bind Widget.ValueColor, Mode=OneWay}"
+                      Background="{ThemeResource ControlStrokeColorSecondaryBrush}"
+                      ItemsSource="{x:Bind Widget.Mappings}">
+            <ItemsControl.ItemTemplate>
+                <DataTemplate x:DataType="model:WidgetMapping">
+                    <ToggleButton Margin="0,0,4,4"
+                                  Content="{x:Bind Label}"
+                                  Tag="{x:Bind Command}"
+                                  Tapped="Button_OnClick" />
+                </DataTemplate>
+            </ItemsControl.ItemTemplate>
+            <ItemsControl.ItemsPanel>
+                <ItemsPanelTemplate>
+                    <controls:WrapPanel />
+                </ItemsPanelTemplate>
+            </ItemsControl.ItemsPanel>
+        </ItemsControl>
+    </Grid>
 </local:WidgetBase>
diff --git a/src/openHAB.Windows/Controls/SectionSwitchWidget.xaml.cs b/src/openHAB.Windows/Controls/SectionSwitchWidget.xaml.cs
index d362c7e4..61ad1024 100644
--- a/src/openHAB.Windows/Controls/SectionSwitchWidget.xaml.cs
+++ b/src/openHAB.Windows/Controls/SectionSwitchWidget.xaml.cs
@@ -1,81 +1,80 @@
-using System.Linq;
+using System.Linq;
 using CommunityToolkit.Mvvm.Messaging;
-using OpenHAB.Core.Messages;
-using OpenHAB.Core.Model;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Controls.Primitives;
-using Windows.UI.Xaml.Input;
-using WinRTXamlToolkit.Controls.Extensions;
+using CommunityToolkit.WinUI;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Controls.Primitives;
+using Microsoft.UI.Xaml.Input;
+using openHAB.Core.Client.Messages;
+using openHAB.Core.Client.Models;
 
-namespace OpenHAB.Windows.Controls
+namespace openHAB.Windows.Controls;
+
+/// <summary>
+/// Widget control that represents an OpenHAB switch.
+/// </summary>
+public sealed partial class SectionSwitchWidget : WidgetBase
 {
     /// <summary>
-    /// Widget control that represents an OpenHAB switch.
+    /// Initializes a new instance of the <see cref="SectionSwitchWidget"/> class.
     /// </summary>
-    public sealed partial class SectionSwitchWidget : WidgetBase
+    public SectionSwitchWidget()
+    {
+        InitializeComponent();
+        Loaded += SectionSwitchWidget_Loaded;
+    }
+
+    private void SectionSwitchWidget_Loaded(object sender, RoutedEventArgs e)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SectionSwitchWidget"/> class.
-        /// </summary>
-        public SectionSwitchWidget()
+        if (string.IsNullOrWhiteSpace(Widget.Item?.State))
         {
-            InitializeComponent();
-            Loaded += SectionSwitchWidget_Loaded;
+            return;
         }
 
-        private void SectionSwitchWidget_Loaded(object sender, RoutedEventArgs e)
-        {
-            if (string.IsNullOrWhiteSpace(Widget.Item?.State))
-            {
-                return;
-            }
+        SetState();
+    }
 
-            SetState();
-        }
+    internal override void SetState()
+    {
+        UncheckEverything();
+        object? currentItem = SectionsList?.Items?.SingleOrDefault(x => ((WidgetMapping)x).Command == Widget.Item.State);
+        ContentPresenter? presenter = SectionsList?.ContainerFromItem(currentItem) as ContentPresenter;
 
-        internal override void SetState()
+        if (presenter != null && presenter.FindChild(typeof(ToggleButton)) is ToggleButton toggleButton)
         {
-            UncheckEverything();
-            var currentItem = SectionsList?.Items?.SingleOrDefault(x => ((OpenHABWidgetMapping)x).Command == Widget.Item.State);
-            ContentPresenter presenter = SectionsList?.ContainerFromItem(currentItem) as ContentPresenter;
-
-            if (presenter.GetChildren().FirstOrDefault() is ToggleButton toggleButton)
-            {
-                toggleButton.IsChecked = true;
-            }
+            toggleButton.IsChecked = true;
         }
+    }
 
-        private void Button_OnClick(object sender, TappedRoutedEventArgs e)
+    private void Button_OnClick(object sender, TappedRoutedEventArgs e)
+    {
+        ToggleButton? button = sender as ToggleButton;
+        if (button == null)
         {
-            ToggleButton button = sender as ToggleButton;
-            if(button == null)
-            {
-                return;
-            }
+            return;
+        }
 
-            if (string.CompareOrdinal(button?.Tag?.ToString(), Widget.Item.State) == 0)
-            {
-                SetState();
-                return;
-            }
+        if (string.CompareOrdinal(button.Tag?.ToString(), Widget.Item.State) == 0)
+        {
+            SetState();
+            return;
+        }
 
-            UncheckEverything();
-            button.IsChecked = true;
+        UncheckEverything();
+        button.IsChecked = true;
 
-            StrongReferenceMessenger.Default.Send(new TriggerCommandMessage(Widget.Item, button?.Tag.ToString()));
-        }
+        StrongReferenceMessenger.Default.Send(new TriggerCommandMessage(Widget.Item, button?.Tag.ToString()));
+    }
 
-        private void UncheckEverything()
+    private void UncheckEverything()
+    {
+        foreach (var item in SectionsList.Items)
         {
-            foreach (var item in SectionsList.Items)
+            ContentPresenter? presenter = SectionsList?.ContainerFromItem(item) as ContentPresenter;
+            if (presenter?.FindChild(typeof(ToggleButton)) is ToggleButton toggleButton)
             {
-                ContentPresenter presenter = SectionsList?.ContainerFromItem(item) as ContentPresenter;
-                if (presenter.GetChildren().FirstOrDefault() is ToggleButton toggleButton)
-                {
-                    toggleButton.IsChecked = false;
-                }
+                toggleButton.IsChecked = false;
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/openHAB.Windows/Controls/SelectionWidget.xaml b/src/openHAB.Windows/Controls/SelectionWidget.xaml
index b82ee15a..362caaba 100644
--- a/src/openHAB.Windows/Controls/SelectionWidget.xaml
+++ b/src/openHAB.Windows/Controls/SelectionWidget.xaml
@@ -1,32 +1,32 @@
-<local:WidgetBase x:Class="OpenHAB.Windows.Controls.SelectionWidget"
-				  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-				  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-				  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-				  xmlns:local="using:OpenHAB.Windows.Controls"
-				  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-				  d:DesignHeight="150"
-				  d:DesignWidth="300"
-				  mc:Ignorable="d"
-				  Visibility="{x:Bind Widget.Visibility, Converter={StaticResource BooleanToVisibilityConverter}}">
+<local:WidgetBase x:Class="openHAB.Windows.Controls.SelectionWidget"
+                  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                  xmlns:local="using:openHAB.Windows.Controls"
+                  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                  d:DesignHeight="150"
+                  d:DesignWidth="300"
+                  mc:Ignorable="d"
+                  Visibility="{x:Bind Widget.Visibility}">
 
-	<Grid Style="{StaticResource Widget}">
-		<Grid.ColumnDefinitions>
-			<ColumnDefinition Width="*" />
-			<ColumnDefinition Width="Auto" />
-		</Grid.ColumnDefinitions>
-		<local:ImageLabel Margin="8,0,0,0"
-						  HorizontalAlignment="Left"
-						  VerticalAlignment="Center"
-						  IconPath="{x:Bind Widget, Converter={StaticResource IconToPathConverter}, Mode=OneWay}"
-						  LabelText="{x:Bind Widget.Label, Mode=OneWay}" 
-						  LabelForeground="{x:Bind Widget.LabelColor, Converter={StaticResource StringToColorConverter}, Mode=OneWay}"/>
+    <Grid Style="{StaticResource Widget}">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="Auto" />
+        </Grid.ColumnDefinitions>
+        <local:ImageLabel Margin="8,0,0,0"
+                          HorizontalAlignment="Left"
+                          VerticalAlignment="Center"
+                          IconPath="{x:Bind Widget.IconPath, Mode=OneWay}"
+                          LabelText="{x:Bind Widget.Label, Mode=OneWay}" 
+                          LabelForeground="{x:Bind Widget.LabelColor, Mode=OneWay}"/>
 
-		<ComboBox x:Name="SelectionComboBox"
-				  Grid.Column="1"
-				  Margin="0,0,12,0"
-				  HorizontalAlignment="Right"
-				  VerticalAlignment="Center"
-				  Foreground="{x:Bind Widget.ValueColor, Converter={StaticResource StringToColorConverter}, Mode=OneWay}"
-				  DisplayMemberPath="Label"/>
-	</Grid>
+        <ComboBox x:Name="SelectionComboBox"
+                  Grid.Column="1"
+                  Margin="0,0,12,0"
+                  HorizontalAlignment="Right"
+                  VerticalAlignment="Center"
+                  Foreground="{x:Bind Widget.ValueColor, Mode=OneWay}"
+                  DisplayMemberPath="Label"/>
+    </Grid>
 </local:WidgetBase>
diff --git a/src/openHAB.Windows/Controls/SelectionWidget.xaml.cs b/src/openHAB.Windows/Controls/SelectionWidget.xaml.cs
index 960e674e..7b64b65a 100644
--- a/src/openHAB.Windows/Controls/SelectionWidget.xaml.cs
+++ b/src/openHAB.Windows/Controls/SelectionWidget.xaml.cs
@@ -1,113 +1,114 @@
-using System.Linq;
+using System.Linq;
 using CommunityToolkit.Mvvm.Messaging;
-using Microsoft.Toolkit.Uwp.Helpers;
-using OpenHAB.Core.Messages;
-using OpenHAB.Core.Model;
-using Windows.UI.Xaml.Controls;
+using CommunityToolkit.WinUI;
+using Microsoft.UI.Dispatching;
+using Microsoft.UI.Xaml.Controls;
+using openHAB.Core.Client.Messages;
+using openHAB.Core.Client.Models;
 
-namespace OpenHAB.Windows.Controls
+namespace openHAB.Windows.Controls;
+
+/// <summary>
+/// Widget control that represents an OpenHAB switch.
+/// </summary>
+public sealed partial class SelectionWidget : WidgetBase
 {
+    private System.Collections.Generic.List<SelectionMapping> selectionMappings;
+
     /// <summary>
-    /// Widget control that represents an OpenHAB switch.
+    /// Initializes a new instance of the <see cref="SelectionWidget"/> class.
     /// </summary>
-    public sealed partial class SelectionWidget : WidgetBase
+    public SelectionWidget()
     {
-        private System.Collections.Generic.List<SelectionMapping> selectionMappings;
+        InitializeComponent();
+        Loaded += SelectionWidget_Loaded;
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SelectionWidget"/> class.
-        /// </summary>
-        public SelectionWidget()
+    /// <summary>
+    /// Get's called after SelectionWidget was loaded and updates the Widgets Selection Dropdown.
+    /// </summary>
+    private void SelectionWidget_Loaded(object sender, global::Microsoft.UI.Xaml.RoutedEventArgs e)
+    {
+        selectionMappings = new System.Collections.Generic.List<SelectionMapping>();
+        if (Widget?.Item.CommandDescription?.CommandOptions?.Count > 0)
         {
-            InitializeComponent();
-            Loaded += SelectionWidget_Loaded;
+            foreach (CommandOptions option in Widget.Item.CommandDescription.CommandOptions)
+            {
+                SelectionMapping mapping = new SelectionMapping(option.Command, option.Label);
+                selectionMappings.Add(mapping);
+            }
         }
 
-        /// <summary>
-        /// Get's called after SelectionWidget was loaded and updates the Widgets Selection Dropdown.
-        /// </summary>
-        private void SelectionWidget_Loaded(object sender, global::Windows.UI.Xaml.RoutedEventArgs e)
+        if (Widget?.Mappings.Count > 0)
         {
-            selectionMappings = new System.Collections.Generic.List<SelectionMapping>();
-            if (Widget?.Item.CommandDescription?.CommandOptions?.Count > 0)
+            foreach (WidgetMapping option in Widget.Mappings)
             {
-                foreach (OpenHABCommandOptions option in Widget.Item.CommandDescription.CommandOptions)
-                {
-                    SelectionMapping mapping = new SelectionMapping(option.Command, option.Label);
-                    selectionMappings.Add(mapping);
-                }
+                SelectionMapping mapping = new SelectionMapping(option.Command, option.Label);
+                selectionMappings.Add(mapping);
             }
+        }
 
-            if (Widget?.Mappings.Count > 0)
-            {
-                foreach (OpenHABWidgetMapping option in Widget.Mappings)
-                {
-                    SelectionMapping mapping = new SelectionMapping(option.Command, option.Label);
-                    selectionMappings.Add(mapping);
-                }
-            }
+        SelectionComboBox.ItemsSource = selectionMappings;
+        SetState();
+    }
 
-            SelectionComboBox.ItemsSource = selectionMappings;
-            SetState();
-        }
+    internal override void SetState()
+    {
+        SelectionMapping? itemState = selectionMappings.FirstOrDefault(x => x.Command == Widget.Item.State);
 
-        internal override void SetState()
+        DispatcherQueue dispatcherQueue = DispatcherQueue.GetForCurrentThread();
+        dispatcherQueue.EnqueueAsync(() =>
         {
-            SelectionMapping itemState = selectionMappings.FirstOrDefault(x => x.Command == Widget.Item.State);
-            DispatcherHelper.ExecuteOnUIThreadAsync(() =>
+            SelectionMapping? currentSelection = SelectionComboBox.SelectedItem as SelectionMapping;
+            if (currentSelection != null && string.CompareOrdinal(currentSelection.Command, itemState?.Command) != 0)
             {
-                SelectionMapping currentSelection = SelectionComboBox.SelectedItem as SelectionMapping;
+                SelectionComboBox.SelectedItem = itemState;
+            }
 
-                if (currentSelection != null && string.CompareOrdinal(currentSelection?.Command, itemState?.Command) != 0)
-                {
-                    SelectionComboBox.SelectedItem = itemState;
-                }
+            SelectionComboBox.SelectionChanged += Selector_OnSelectionChanged;
+        });
+    }
 
-                SelectionComboBox.SelectionChanged += Selector_OnSelectionChanged;
-            });
+    private void Selector_OnSelectionChanged(object sender, SelectionChangedEventArgs e)
+    {
+        SelectionMapping? mapping = (SelectionMapping)e.AddedItems.FirstOrDefault();
+        if (mapping == null || string.CompareOrdinal(Widget.Item.State, mapping.Command) == 0)
+        {
+            return;
         }
 
-        private void Selector_OnSelectionChanged(object sender, SelectionChangedEventArgs e)
-        {
-            SelectionMapping mapping = (SelectionMapping)e.AddedItems.FirstOrDefault();
-            if (mapping == null || string.CompareOrdinal(Widget.Item.State, mapping.Command) == 0)
-            {
-                return;
-            }
+        Widget.Item.State = mapping.Command;
+        StrongReferenceMessenger.Default.Send(new TriggerCommandMessage(Widget.Item, mapping.Command));
+    }
 
-            Widget.Item.State = mapping.Command;
-            StrongReferenceMessenger.Default.Send(new TriggerCommandMessage(Widget.Item, mapping.Command));
+    /// <summary>
+    /// A Class that is used for Mapping Selectionvalues to Labels.
+    /// </summary>
+    private class SelectionMapping
+    {
+        /// <summary>
+        /// Gets or sets the Command of the mapping.
+        /// </summary>
+        public string Command
+        {
+            get; set;
         }
 
         /// <summary>
-        /// A Class that is used for Mapping Selectionvalues to Labels.
+        /// Gets or sets the Label of the mapping.
         /// </summary>
-        private class SelectionMapping
+        public string Label
         {
-            /// <summary>
-            /// Gets or sets the Command of the mapping.
-            /// </summary>
-            public string Command
-            {
-                get; set;
-            }
-
-            /// <summary>
-            /// Gets or sets the Label of the mapping.
-            /// </summary>
-            public string Label
-            {
-                get; set;
-            }
+            get; set;
+        }
 
-            /// <summary>Initializes a new instance of the <see cref="SelectionMapping" /> class.</summary>
-            /// <param name="command">The command.</param>
-            /// <param name="label">The label.</param>
-            public SelectionMapping(string command, string label)
-            {
-                Command = command;
-                Label = label;
-            }
+        /// <summary>Initializes a new instance of the <see cref="SelectionMapping" /> class.</summary>
+        /// <param name="command">The command.</param>
+        /// <param name="label">The label.</param>
+        public SelectionMapping(string command, string label)
+        {
+            Command = command;
+            Label = label;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/openHAB.Windows/Controls/SetpointWidget.xaml b/src/openHAB.Windows/Controls/SetpointWidget.xaml
index 1c9da21c..2626438c 100644
--- a/src/openHAB.Windows/Controls/SetpointWidget.xaml
+++ b/src/openHAB.Windows/Controls/SetpointWidget.xaml
@@ -1,84 +1,73 @@
-<local:WidgetBase x:Class="OpenHAB.Windows.Controls.SetpointWidget"
-				  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-				  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-				  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-				  xmlns:local="using:OpenHAB.Windows.Controls"
-				  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-				  d:DesignHeight="150"
-				  d:DesignWidth="300"
-				  mc:Ignorable="d" 
-				  Loaded="SetPointWidget_Loaded"
-				  Visibility="{x:Bind Widget.Visibility, Converter={StaticResource BooleanToVisibilityConverter}}">
-
-	<Grid Style="{StaticResource Widget}">
-		<Grid.ColumnDefinitions>
-			<ColumnDefinition Width="*" />
-			<ColumnDefinition Width="Auto" />
-		</Grid.ColumnDefinitions>
-		<local:ImageLabel VerticalAlignment="Center"
-						  IconPath="{x:Bind Widget, Converter={StaticResource IconToPathConverter}, Mode=OneWay}"
-						  LabelForeground="{x:Bind Widget.LabelColor, Converter={StaticResource StringToColorConverter}, Mode=OneWay}"
-						  LabelText="{x:Bind Widget.Label, Mode=OneWay}" />
-
-
-
-		<StackPanel Grid.Column="1"
-					Width="100"
-					Margin="0,12,12,12"
-					HorizontalAlignment="Center"
-					VerticalAlignment="Center"
-					BorderBrush="{StaticResource DarkAcrylicColor}"
-					BorderThickness="0">
-			<Grid>
-				<Grid.RowDefinitions>
-					<RowDefinition Height="*"/>
-					<RowDefinition Height="*" />
-				</Grid.RowDefinitions>
-				<ComboBox Margin="0,4,0,0"
-					  x:Name="comboBox"
-					  HorizontalAlignment="Stretch"
-					  FontSize="16"
-					  Foreground="{x:Bind Widget.ValueColor, Converter={StaticResource StringToColorConverter}, Mode=OneWay}"
-					  Width="Auto" VerticalAlignment="Stretch"/>
-				<Grid Grid.Row="1" Margin="0,3,0,0">
-					<Grid.ColumnDefinitions>
-						<ColumnDefinition Width="*"/>
-						<ColumnDefinition Width="*"/>
-					</Grid.ColumnDefinitions>
-					<Button 
-						Grid.Column="0"
-						Height="40"
-						HorizontalAlignment="Stretch"
-						VerticalAlignment="Stretch"
-						Click="ButtonUp_Click">
-						<TextBlock AutomationProperties.Name="ArrowUp"
-							FontFamily="Segoe MDL2 Assets"
-							Text="&#xE74A;" />
-					</Button>
-					<Button 
-						Grid.Column="1"
-						Height="40"
-						Margin="1,0,0,0"                        
-						HorizontalAlignment="Stretch"
-						VerticalAlignment="Stretch"
-						Click="ButtonDown_Click">
-
-						<TextBlock AutomationProperties.Name="ArrowDown"
-							   FontFamily="Segoe MDL2 Assets"
-							   RenderTransformOrigin="0.5,0.5"
-							   Text="&#xE74A;">
-							<TextBlock.RenderTransform>
-								<RotateTransform Angle="180" />
-							</TextBlock.RenderTransform>
-						</TextBlock>
-					</Button>
-
-				</Grid>
-
-			</Grid>
-
-
-
-		</StackPanel>
-	</Grid>
+<local:WidgetBase x:Class="openHAB.Windows.Controls.SetpointWidget"
+                  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                  xmlns:local="using:openHAB.Windows.Controls"
+                  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                  d:DesignHeight="150"
+                  d:DesignWidth="300"
+                  mc:Ignorable="d"
+                  Loaded="SetPointWidget_Loaded"
+                  Visibility="{x:Bind Widget.Visibility}">
+    <Grid Style="{StaticResource Widget}">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="Auto" />
+        </Grid.ColumnDefinitions>
+        <local:ImageLabel VerticalAlignment="Center"
+                          IconPath="{x:Bind Widget.IconPath, Mode=OneWay}"
+                          LabelForeground="{x:Bind Widget.LabelColor, Mode=OneWay}"
+                          LabelText="{x:Bind Widget.Label, Mode=OneWay}" />
+        <StackPanel Grid.Column="1"
+                    Width="100"
+                    Margin="0,12,12,12"
+                    HorizontalAlignment="Center"
+                    VerticalAlignment="Center"
+                    BorderBrush="{ThemeResource SolidBackgroundFillColorSecondaryBrush}"
+                    BorderThickness="0">
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="*" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+                <ComboBox Margin="0,4,0,0"
+                          x:Name="comboBox"
+                          HorizontalAlignment="Stretch"
+                          FontSize="16"
+                          Foreground="{x:Bind Widget.ValueColor, Mode=OneWay}"
+                          Width="Auto"
+                          VerticalAlignment="Stretch" />
+                <Grid Grid.Row="1"
+                      Margin="0,3,0,0">
+                    <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="*" />
+                        <ColumnDefinition Width="*" />
+                    </Grid.ColumnDefinitions>
+                    <Button Grid.Column="0"
+                            Height="40"
+                            HorizontalAlignment="Stretch"
+                            VerticalAlignment="Stretch"
+                            Click="ButtonUp_Click">
+                        <TextBlock AutomationProperties.Name="ArrowUp"
+                                   FontFamily="Segoe MDL2 Assets"
+                                   Text="&#xE74A;" />
+                    </Button>
+                    <Button Grid.Column="1"
+                            Height="40"
+                            Margin="1,0,0,0"
+                            HorizontalAlignment="Stretch"
+                            VerticalAlignment="Stretch"
+                            Click="ButtonDown_Click">
+                        <TextBlock AutomationProperties.Name="ArrowDown"
+                                   FontFamily="Segoe MDL2 Assets"
+                                   RenderTransformOrigin="0.5,0.5"
+                                   Text="&#xE74A;">
+                            <TextBlock.RenderTransform>
+                                <RotateTransform Angle="180" />
+                            </TextBlock.RenderTransform></TextBlock>
+                    </Button>
+                </Grid>
+            </Grid>
+        </StackPanel>
+    </Grid>
 </local:WidgetBase>
diff --git a/src/openHAB.Windows/Controls/SetpointWidget.xaml.cs b/src/openHAB.Windows/Controls/SetpointWidget.xaml.cs
index b04688e1..a0b0a27a 100644
--- a/src/openHAB.Windows/Controls/SetpointWidget.xaml.cs
+++ b/src/openHAB.Windows/Controls/SetpointWidget.xaml.cs
@@ -1,114 +1,115 @@
-using System;
+using System;
 using System.Globalization;
 using System.Linq;
-using Microsoft.Toolkit.Uwp.Helpers;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
+using CommunityToolkit.WinUI;
+using Microsoft.UI.Dispatching;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
 
-namespace OpenHAB.Windows.Controls
+namespace openHAB.Windows.Controls;
+
+/// <summary>
+/// Widget control that represents an OpenHAB switch.
+/// </summary>
+public sealed partial class SetpointWidget : WidgetBase
 {
     /// <summary>
-    /// Widget control that represents an OpenHAB switch.
+    /// represents the stepwidth of the item.
     /// </summary>
-    public sealed partial class SetpointWidget : WidgetBase
+    private float step;
+
+    /// <summary>Initializes a new instance of the <see cref="SetpointWidget" /> class.</summary>
+    public SetpointWidget()
     {
-        /// <summary>
-        /// represents the stepwidth of the item.
-        /// </summary>
-        private float step;
+        InitializeComponent();
+    }
 
-        /// <summary>Initializes a new instance of the <see cref="SetpointWidget" /> class.</summary>
-        public SetpointWidget()
-        {
-            InitializeComponent();
-        }
+    private void ButtonUp_Click(object sender, RoutedEventArgs e)
+    {
+        double value = Widget.Item.GetStateAsDoubleValue();
+        value += step;
 
-        private void ButtonUp_Click(object sender, RoutedEventArgs e)
+        if (value > Widget.MaxValue)
         {
-            double value = Widget.Item.GetStateAsDoubleValue();
-            value += step;
+            value = Widget.MaxValue;
+        }
 
-            if (value > Widget.MaxValue)
-            {
-                value = Widget.MaxValue;
-            }
+        Widget.Item.UpdateValue(value.ToString(CultureInfo.InvariantCulture));
+        RaisePropertyChanged(nameof(Widget));
+        SetState();
+    }
 
-            Widget.Item.UpdateValue(value.ToString(CultureInfo.InvariantCulture));
-            RaisePropertyChanged(nameof(Widget));
-            SetState();
-        }
+    private void ButtonDown_Click(object sender, RoutedEventArgs e)
+    {
+        double value = Widget.Item.GetStateAsDoubleValue();
+        value -= step;
 
-        private void ButtonDown_Click(object sender, RoutedEventArgs e)
+        if (value < Widget.MinValue)
         {
-            double value = Widget.Item.GetStateAsDoubleValue();
-            value -= step;
+            value = Widget.MinValue;
+        }
 
-            if (value < Widget.MinValue)
-            {
-                value = Widget.MinValue;
-            }
+        Widget.Item.UpdateValue(value.ToString(CultureInfo.InvariantCulture));
+        RaisePropertyChanged(nameof(Widget));
+        SetState();
+    }
 
-            Widget.Item.UpdateValue(value.ToString(CultureInfo.InvariantCulture));
-            RaisePropertyChanged(nameof(Widget));
-            SetState();
-        }
+    internal override async void SetState()
+    {
+        DispatcherQueue dispatcherQueue = DispatcherQueue.GetForCurrentThread();
+        await dispatcherQueue.EnqueueAsync(() =>
+        {
+            comboBox.SelectionChanged -= ComboBox_SelectionChanged;
+            UpdateComboBox();
+            comboBox.SelectedItem = Widget.Item.GetStateAsDoubleValue().ToString(CultureInfo.InvariantCulture) + Widget.Item.Unit;
+            comboBox.SelectionChanged += ComboBox_SelectionChanged;
+        });
+    }
 
-        internal override void SetState()
+    private void SetPointWidget_Loaded(object sender, RoutedEventArgs e)
+    {
+        // if Widget Step == 0 --> Step = 1
+        step = Widget.Step;
+        if (step == 0)
         {
-            DispatcherHelper.ExecuteOnUIThreadAsync(() =>
-            {
-                comboBox.SelectionChanged -= ComboBox_SelectionChanged;
-                UpdateComboBox();
-                comboBox.SelectedItem = Widget.Item.GetStateAsDoubleValue().ToString(CultureInfo.InvariantCulture) + Widget.Item.Unit;
-                comboBox.SelectionChanged += ComboBox_SelectionChanged;
-            });
+            step = 1;
         }
 
-        private void SetPointWidget_Loaded(object sender, RoutedEventArgs e)
+        SetState();
+    }
+
+    private void UpdateComboBox()
+    {
+        comboBox.Items.Clear();
+        float step = 1;
+        double currentValue = Widget.Item.GetStateAsDoubleValue();
+        if (Widget.Step != 0)
         {
-            // if Widget Step == 0 --> Step = 1
             step = Widget.Step;
-            if (step == 0)
-            {
-                step = 1;
-            }
-
-            SetState();
         }
 
-        private void UpdateComboBox()
+        for (float i = Widget.MinValue; i <= Widget.MaxValue; i += step)
         {
-            comboBox.Items.Clear();
-            float step = 1;
-            double currentValue = Widget.Item.GetStateAsDoubleValue();
-            if (Widget.Step != 0)
+            comboBox.Items.Add(i.ToString(CultureInfo.InvariantCulture) + Widget.Item.Unit);
+            if (i < currentValue && currentValue < (i + step))
             {
-                step = Widget.Step;
-            }
-
-            for (float i = Widget.MinValue; i <= Widget.MaxValue; i += step)
-            {
-                comboBox.Items.Add(i.ToString(CultureInfo.InvariantCulture) + Widget.Item.Unit);
-                if (i < currentValue && currentValue < (i + step))
-                {
-                    comboBox.Items.Add(currentValue.ToString(CultureInfo.InvariantCulture) + Widget.Item.Unit);
-                }
+                comboBox.Items.Add(currentValue.ToString(CultureInfo.InvariantCulture) + Widget.Item.Unit);
             }
         }
+    }
 
-        private void ComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+    private void ComboBox_SelectionChanged(object sender, SelectionChangedEventArgs e)
+    {
+        string newValue = (string)e.AddedItems.FirstOrDefault();
+        if (Widget.Item.Unit != null)
         {
-            string newValue = (string)e.AddedItems.FirstOrDefault();
-            if (Widget.Item.Unit != null)
-            {
-                newValue = newValue.Replace(Widget.Item.Unit, string.Empty, StringComparison.InvariantCultureIgnoreCase);
-            }
+            newValue = newValue?.Replace(Widget.Item.Unit, string.Empty, StringComparison.InvariantCultureIgnoreCase);
+        }
 
-            if (newValue != null)
-            {
-                Widget.Item.UpdateValue(newValue);
-                RaisePropertyChanged(nameof(Widget));
-            }
+        if (newValue != null)
+        {
+            Widget.Item.UpdateValue(newValue);
+            RaisePropertyChanged(nameof(Widget));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/openHAB.Windows/Controls/SliderWidget.xaml b/src/openHAB.Windows/Controls/SliderWidget.xaml
index 0d763f90..41f72df4 100644
--- a/src/openHAB.Windows/Controls/SliderWidget.xaml
+++ b/src/openHAB.Windows/Controls/SliderWidget.xaml
@@ -1,46 +1,46 @@
-<local:WidgetBase x:Class="OpenHAB.Windows.Controls.SliderWidget"
-				  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-				  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-				  xmlns:converters="using:OpenHAB.Windows.Converters"
-				  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-				  xmlns:local="using:OpenHAB.Windows.Controls"
-				  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-				  mc:Ignorable="d" 
-				  Loaded="SliderWidget_Loaded"
-				  Visibility="{x:Bind Widget.Visibility, Converter={StaticResource BooleanToVisibilityConverter}}">
+<local:WidgetBase x:Class="openHAB.Windows.Controls.SliderWidget"
+                  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                  xmlns:converters="using:openHAB.Windows.Converters"
+                  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                  xmlns:local="using:openHAB.Windows.Controls"
+                  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                  mc:Ignorable="d"
+                  Loaded="SliderWidget_Loaded"
+                  Visibility="{x:Bind Widget.Visibility}">
 
-	<local:WidgetBase.Resources>
-		<converters:StringToDoubleConverter x:Key="StringToDoubleConverter" />
-	</local:WidgetBase.Resources>
+    <local:WidgetBase.Resources>
+        <converters:StringToDoubleConverter x:Key="StringToDoubleConverter" />
+    </local:WidgetBase.Resources>
 
-	<Grid Style="{StaticResource Widget}">
-		<Grid.ColumnDefinitions>
-			<ColumnDefinition Width="1*" />
-			<ColumnDefinition Width="1*" />
-		</Grid.ColumnDefinitions>
+    <Grid Style="{StaticResource Widget}">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*" />
+            <ColumnDefinition Width="1*" />
+        </Grid.ColumnDefinitions>
 
-		<local:ImageLabel VerticalAlignment="Center"
-						  IconPath="{x:Bind Widget, Converter={StaticResource IconToPathConverter}, Mode=OneWay}"
-						  LabelText="{x:Bind Widget.Label, Mode=OneWay}"
-						  LabelForeground="{x:Bind Widget.LabelColor, Converter={StaticResource StringToColorConverter}, Mode=OneWay}"
-						  Tapped="Widget_OnTapped" />
+        <local:ImageLabel VerticalAlignment="Center"
+                          IconPath="{x:Bind Widget.IconPath, Mode=OneWay}"
+                          LabelText="{x:Bind Widget.Label, Mode=OneWay}"
+                          LabelForeground="{x:Bind Widget.LabelColor, Mode=OneWay}"
+                          Tapped="Widget_OnTapped" />
 
-		<local:RadialSlider x:Name="radialSlider"
-							Grid.Column="1"
-							Width="80"
-							Height="80"
-							HorizontalAlignment="Center"
-							Foreground="{x:Bind Widget.ValueColor, Converter={StaticResource StringToColorConverter}, Mode=OneWay}"
-							VerticalAlignment="Center"
-							IsInteractive="True"
-							MaxAngle="150"
-							MinAngle="-150"
-							ScaleBrush="{StaticResource DarkAcrylicColor}"
-							ScaleWidth="10"
-							StepSize="1"
-							TrailBrush="{StaticResource OpenHABLightOrangeBrush}"
-							ValueBrush="Black"
-							ValueChanged="RadialSlider_OnValueChanged"
-							Value="{x:Bind Widget.Item.GetStateAsDoubleValue(), Mode=OneWay}" />
-	</Grid>
-</local:WidgetBase>
\ No newline at end of file
+        <local:RadialSlider x:Name="radialSlider"
+                            Grid.Column="1"
+                            Width="80"
+                            Height="80"
+                            HorizontalAlignment="Center"
+                            Foreground="{x:Bind Widget.ValueColor, Mode=OneWay}"
+                            VerticalAlignment="Center"
+                            IsInteractive="True"
+                            MaxAngle="150"
+                            MinAngle="-150"
+                            ScaleBrush="{ThemeResource SolidBackgroundFillColorSecondaryBrush}"
+                            ScaleWidth="10"
+                            StepSize="1"
+                            TrailBrush="{StaticResource OpenHABLightOrangeBrush}"
+                            ValueBrush="Black"
+                            ValueChanged="RadialSlider_OnValueChanged"
+                            Value="{x:Bind Widget.Item.GetStateAsDoubleValue(), Mode=OneWay}" />
+    </Grid>
+</local:WidgetBase>
diff --git a/src/openHAB.Windows/Controls/SliderWidget.xaml.cs b/src/openHAB.Windows/Controls/SliderWidget.xaml.cs
index c3b76811..dda3858f 100644
--- a/src/openHAB.Windows/Controls/SliderWidget.xaml.cs
+++ b/src/openHAB.Windows/Controls/SliderWidget.xaml.cs
@@ -1,74 +1,70 @@
-using System;
-using System.Globalization;
-using OpenHAB.Core.Messages;
-using OpenHAB.Core.Model;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Input;
+using System;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Input;
 
-namespace OpenHAB.Windows.Controls
+namespace openHAB.Windows.Controls;
+
+/// <summary>
+/// Widget control that represents an OpenHAB slider.
+/// </summary>
+public sealed partial class SliderWidget : WidgetBase
 {
     /// <summary>
-    /// Widget control that represents an OpenHAB slider.
+    /// Initializes a new instance of the <see cref="SliderWidget"/> class.
     /// </summary>
-    public sealed partial class SliderWidget : WidgetBase
+    public SliderWidget()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SliderWidget"/> class.
-        /// </summary>
-        public SliderWidget()
+        InitializeComponent();
+    }
+
+    private void RadialSlider_OnValueChanged(object sender, EventArgs e)
+    {
+        if (Widget == null)
         {
-            InitializeComponent();
+            return;
         }
 
-        private void RadialSlider_OnValueChanged(object sender, EventArgs e)
-        {
-            if (Widget == null)
-            {
-                return;
-            }
+        Widget.Item.UpdateValue(((RadialSlider)sender)?.Value);
+        RaisePropertyChanged(nameof(Widget));
+    }
 
-            Widget.Item.UpdateValue(((RadialSlider)sender)?.Value);
-            RaisePropertyChanged(nameof(Widget));
+    private void Widget_OnTapped(object sender, TappedRoutedEventArgs e)
+    {
+        double maxval = Widget.MaxValue;
+        double minval = Widget.MinValue;
+        if (maxval == minval)
+        {
+            // use default
+            maxval = 100;
+            minval = 0;
         }
 
-        private void Widget_OnTapped(object sender, TappedRoutedEventArgs e)
+        if (Widget.Item.GetStateAsDoubleValue() <= minval)
         {
-            double maxval = Widget.MaxValue;
-            double minval = Widget.MinValue;
-            if (maxval == minval)
-            {
-                // use default
-                maxval = 100;
-                minval = 0;
-            }
+            Widget.Item.UpdateValue(maxval);
+        }
+        else
+        {
+            Widget.Item.UpdateValue(minval);
+        }
 
-            if (Widget.Item.GetStateAsDoubleValue() <= minval)
-            {
-                Widget.Item.UpdateValue(maxval);
-            }
-            else
-            {
-                Widget.Item.UpdateValue(minval);
-            }
+        RaisePropertyChanged(nameof(Widget));
+    }
 
-            RaisePropertyChanged(nameof(Widget));
-        }
+    internal override void SetState()
+    {
+    }
 
-        internal override void SetState()
+    private void SliderWidget_Loaded(object sender, RoutedEventArgs e)
+    {
+        if (Widget.MaxValue != 0)
         {
+            radialSlider.Maximum = Widget.MaxValue;
         }
 
-        private void SliderWidget_Loaded(object sender, RoutedEventArgs e)
+        if (Widget.MinValue != 0)
         {
-            if (Widget.MaxValue != 0)
-            {
-                radialSlider.Maximum = Widget.MaxValue;
-            }
-
-            if (Widget.MinValue != 0)
-            {
-                radialSlider.Minimum = Widget.MinValue;
-            }
+            radialSlider.Minimum = Widget.MinValue;
         }
     }
 }
diff --git a/src/openHAB.Windows/Controls/SwitchWidget.xaml b/src/openHAB.Windows/Controls/SwitchWidget.xaml
index a3253b9d..36a76771 100644
--- a/src/openHAB.Windows/Controls/SwitchWidget.xaml
+++ b/src/openHAB.Windows/Controls/SwitchWidget.xaml
@@ -1,84 +1,84 @@
-<local:WidgetBase x:Class="OpenHAB.Windows.Controls.SwitchWidget"
-				  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-				  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-				  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-				  xmlns:local="using:OpenHAB.Windows.Controls"
-				  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-				  d:DesignHeight="100"
-				  d:DesignWidth="300"
-				  mc:Ignorable="d"
-				  Visibility="{x:Bind Widget.Visibility, Converter={StaticResource BooleanToVisibilityConverter}}">
+<local:WidgetBase x:Class="openHAB.Windows.Controls.SwitchWidget"
+                  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                  xmlns:local="using:openHAB.Windows.Controls"
+                  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                  d:DesignHeight="100"
+                  d:DesignWidth="300"
+                  mc:Ignorable="d"
+                  Visibility="{x:Bind Widget.Visibility}">
 
-	<Grid Style="{StaticResource Widget}"
-		  Tapped="OnToggle">
-		<Grid.ColumnDefinitions>
-			<ColumnDefinition Width="*" />
-			<ColumnDefinition Width="Auto" />
-		</Grid.ColumnDefinitions>
-		<local:ImageLabel VerticalAlignment="Center"
-						  IconPath="{x:Bind Widget, Converter={StaticResource IconToPathConverter}, Mode=OneWay}"
-						  LabelText="{x:Bind Widget.Label, Mode=OneWay}"
-						  LabelForeground="{x:Bind Widget.LabelColor, Converter={StaticResource StringToColorConverter}, Mode=OneWay}"/>
+    <Grid Style="{StaticResource Widget}"
+          Tapped="OnToggle">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="Auto" />
+        </Grid.ColumnDefinitions>
+        <local:ImageLabel VerticalAlignment="Center"
+                          IconPath="{x:Bind Widget.IconPath, Mode=OneWay}"
+                          LabelText="{x:Bind Widget.Label, Mode=OneWay}"
+                          LabelForeground="{x:Bind Widget.LabelColor, Mode=OneWay}"/>
 
-		<Grid Grid.Column="1"
-			  Width="100"
-			  Height="80"
-			  Margin="0,0,12,0"
-			  HorizontalAlignment="Center"
-			  VerticalAlignment="Center"
-			  BorderBrush="{StaticResource DarkAcrylicColor}"
-			  BorderThickness="2">
-			<Grid.RowDefinitions>
-				<RowDefinition Height="1*" />
-				<RowDefinition Height="1*" />
-			</Grid.RowDefinitions>
+        <Grid Grid.Column="1"
+              Width="100"
+              Height="80"
+              Margin="0,0,12,0"
+              HorizontalAlignment="Center"
+              VerticalAlignment="Center"
+              BorderBrush="{StaticResource SolidBackgroundFillColorSecondaryBrush}"
+              BorderThickness="2">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="1*" />
+                <RowDefinition Height="1*" />
+            </Grid.RowDefinitions>
 
-			<Border x:Name="OnBorder"
-					Grid.Row="0"
-					HorizontalAlignment="Stretch"
-					VerticalAlignment="Stretch">
-				<TextBlock x:Name="TextBlockOn"
-						   HorizontalAlignment="Center"
-						   VerticalAlignment="Center"
-						   Text="On" />
-			</Border>
-			<Border x:Name="OffBorder"
-					Grid.Row="1"
-					HorizontalAlignment="Stretch"
-					VerticalAlignment="Stretch">
-				<TextBlock x:Name="TextBlockOff"
-						   HorizontalAlignment="Center"
-						   VerticalAlignment="Center"
-						   Text="Off" />
-			</Border>
-		</Grid>
-		<VisualStateManager.VisualStateGroups>
-			<VisualStateGroup x:Name="ToggleStates">
-				<VisualState x:Name="OnState">
-					<VisualState.Setters>
-						<Setter Target="OnBorder.(Border.Background)" Value="{StaticResource DarkAcrylicColor}" />
-					</VisualState.Setters>
-					<Storyboard>
-						<ColorAnimation d:IsOptimized="True"
-										Storyboard.TargetName="TextBlockOn"
-										Storyboard.TargetProperty="(TextBlock.Foreground).(SolidColorBrush.Color)"
-										To="White"
-										Duration="0" />
-					</Storyboard>
-				</VisualState>
-				<VisualState x:Name="OffState">
-					<VisualState.Setters>
-						<Setter Target="OffBorder.(Border.Background)" Value="{StaticResource DarkAcrylicColor}" />
-					</VisualState.Setters>
-					<Storyboard>
-						<ColorAnimation d:IsOptimized="True"
-										Storyboard.TargetName="TextBlockOff"
-										Storyboard.TargetProperty="(TextBlock.Foreground).(SolidColorBrush.Color)"
-										To="White"
-										Duration="0" />
-					</Storyboard>
-				</VisualState>
-			</VisualStateGroup>
-		</VisualStateManager.VisualStateGroups>
-	</Grid>
+            <Border x:Name="OnBorder"
+                    Grid.Row="0"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Stretch">
+                <TextBlock x:Name="TextBlockOn"
+                           HorizontalAlignment="Center"
+                           VerticalAlignment="Center"
+                           Text="On" />
+            </Border>
+            <Border x:Name="OffBorder"
+                    Grid.Row="1"
+                    HorizontalAlignment="Stretch"
+                    VerticalAlignment="Stretch">
+                <TextBlock x:Name="TextBlockOff"
+                           HorizontalAlignment="Center"
+                           VerticalAlignment="Center"
+                           Text="Off" />
+            </Border>
+        </Grid>
+        <VisualStateManager.VisualStateGroups>
+            <VisualStateGroup x:Name="ToggleStates">
+                <VisualState x:Name="OnState">
+                    <VisualState.Setters>
+                        <Setter Target="OnBorder.(Border.Background)" Value="{StaticResource SolidBackgroundFillColorSecondaryBrush}" />
+                    </VisualState.Setters>
+                    <Storyboard>
+                        <ColorAnimation d:IsOptimized="True"
+                                        Storyboard.TargetName="TextBlockOn"
+                                        Storyboard.TargetProperty="(TextBlock.Foreground).(SolidColorBrush.Color)"
+                                        To="White"
+                                        Duration="0" />
+                    </Storyboard>
+                </VisualState>
+                <VisualState x:Name="OffState">
+                    <VisualState.Setters>
+                        <Setter Target="OffBorder.(Border.Background)" Value="{StaticResource SolidBackgroundFillColorSecondaryBrush}" />
+                    </VisualState.Setters>
+                    <Storyboard>
+                        <ColorAnimation d:IsOptimized="True"
+                                        Storyboard.TargetName="TextBlockOff"
+                                        Storyboard.TargetProperty="(TextBlock.Foreground).(SolidColorBrush.Color)"
+                                        To="White"
+                                        Duration="0" />
+                    </Storyboard>
+                </VisualState>
+            </VisualStateGroup>
+        </VisualStateManager.VisualStateGroups>
+    </Grid>
 </local:WidgetBase>
diff --git a/src/openHAB.Windows/Controls/SwitchWidget.xaml.cs b/src/openHAB.Windows/Controls/SwitchWidget.xaml.cs
index c77f4f2c..cb97b8df 100644
--- a/src/openHAB.Windows/Controls/SwitchWidget.xaml.cs
+++ b/src/openHAB.Windows/Controls/SwitchWidget.xaml.cs
@@ -1,77 +1,76 @@
-using CommunityToolkit.Mvvm.Messaging;
-using OpenHAB.Core.Messages;
-using OpenHAB.Core.Model;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Input;
+using CommunityToolkit.Mvvm.Messaging;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Input;
+using openHAB.Core.Client.Messages;
+using openHAB.Core.Model;
 
-namespace OpenHAB.Windows.Controls
+namespace openHAB.Windows.Controls;
+
+/// <summary>
+/// Widget control that represents an OpenHAB switch.
+/// </summary>
+public sealed partial class SwitchWidget : WidgetBase
 {
+    private bool _isOn;
+
     /// <summary>
-    /// Widget control that represents an OpenHAB switch.
+    /// Gets or sets a value indicating whether the switch is on or off.
     /// </summary>
-    public sealed partial class SwitchWidget : WidgetBase
+    public bool IsOn
     {
-        private bool _isOn;
+        get => _isOn;
 
-        /// <summary>
-        /// Gets or sets a value indicating whether the switch is on or off.
-        /// </summary>
-        public bool IsOn
+        set
         {
-            get => _isOn;
-
-            set
+            if (_isOn == value)
             {
-                if (_isOn == value)
-                {
-                    return;
-                }
-
-                _isOn = value;
-                RaisePropertyChanged();
+                return;
             }
-        }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SwitchWidget"/> class.
-        /// </summary>
-        public SwitchWidget()
-        {
-            InitializeComponent();
-            Loaded += SwitchWidget_Loaded;
-        }
 
-        private void SwitchWidget_Loaded(object sender, RoutedEventArgs e)
-        {
-            SetState();
+            _isOn = value;
+            RaisePropertyChanged();
         }
+    }
 
-        internal override void SetState()
-        {
-            // Fix for slider things with a switch item
-            if (Widget.Item.State != "ON" && Widget.Item.State != "OFF" && int.TryParse(Widget.Item.State, out int state))
-            {
-                IsOn = state > 0;
-            }
-            else
-            {
-                IsOn = Widget.Item.State == "ON";
-            }
+    /// <summary>
+    /// Initializes a new instance of the <see cref="SwitchWidget"/> class.
+    /// </summary>
+    public SwitchWidget()
+    {
+        InitializeComponent();
+        Loaded += SwitchWidget_Loaded;
+    }
 
-            VisualStateManager.GoToState(this, IsOn ? "OnState" : "OffState", false);
-            RaisePropertyChanged(nameof(Widget));
-        }
+    private void SwitchWidget_Loaded(object sender, RoutedEventArgs e)
+    {
+        SetState();
+    }
 
-        private void OnToggle()
+    internal override void SetState()
+    {
+        // Fix for slider things with a switch item
+        if (Widget.Item.State != "ON" && Widget.Item.State != "OFF" && int.TryParse(Widget.Item.State, out int state))
         {
-            IsOn = !IsOn;
-            StrongReferenceMessenger.Default.Send(new TriggerCommandMessage(Widget.Item, IsOn ? OpenHABCommands.OnCommand : OpenHABCommands.OffCommand));
+            IsOn = state > 0;
         }
-
-        private void OnToggle(object sender, TappedRoutedEventArgs e)
+        else
         {
-            OnToggle();
-            VisualStateManager.GoToState(this, ToggleStates.CurrentState == OnState ? "OffState" : "OnState", true);
+            IsOn = Widget.Item.State == "ON";
         }
+
+        VisualStateManager.GoToState(this, IsOn ? "OnState" : "OffState", false);
+        RaisePropertyChanged(nameof(Widget));
+    }
+
+    private void OnToggle()
+    {
+        IsOn = !IsOn;
+        StrongReferenceMessenger.Default.Send(new TriggerCommandMessage(Widget.Item, IsOn ? OpenHABCommands.OnCommand : OpenHABCommands.OffCommand));
+    }
+
+    private void OnToggle(object sender, TappedRoutedEventArgs e)
+    {
+        OnToggle();
+        VisualStateManager.GoToState(this, ToggleStates.CurrentState == OnState ? "OffState" : "OnState", true);
     }
-}
\ No newline at end of file
+}
diff --git a/src/openHAB.Windows/Controls/TextWidget.xaml b/src/openHAB.Windows/Controls/TextWidget.xaml
index f2a651aa..f7e2d838 100644
--- a/src/openHAB.Windows/Controls/TextWidget.xaml
+++ b/src/openHAB.Windows/Controls/TextWidget.xaml
@@ -1,33 +1,33 @@
-<local:WidgetBase x:Class="OpenHAB.Windows.Controls.TextWidget"
-				  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-				  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-				  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-				  xmlns:local="using:OpenHAB.Windows.Controls"
-				  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-				  d:DesignHeight="300"
-				  d:DesignWidth="400"
-				  mc:Ignorable="d"
-				  Visibility="{x:Bind Widget.Visibility, Converter={StaticResource BooleanToVisibilityConverter}}">
+<local:WidgetBase x:Class="openHAB.Windows.Controls.TextWidget"
+                  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                  xmlns:local="using:openHAB.Windows.Controls"
+                  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                  d:DesignHeight="300"
+                  d:DesignWidth="400"
+                  mc:Ignorable="d"
+                  Visibility="{x:Bind Widget.Visibility}">
 
-	<Grid Style="{StaticResource Widget}">
-		<Grid.ColumnDefinitions>
-			<ColumnDefinition Width="1*" />
-			<ColumnDefinition Width="1*" />
-		</Grid.ColumnDefinitions>
+    <Grid Style="{StaticResource Widget}">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="1*" />
+            <ColumnDefinition Width="1*" />
+        </Grid.ColumnDefinitions>
 
-		<local:ImageLabel VerticalAlignment="Center"
-						  IconPath="{x:Bind Widget, Converter={StaticResource IconToPathConverter}, Mode=OneWay}"
-						  LabelText="{x:Bind Widget.Label, Mode=OneWay}" 
-						  LabelForeground="{x:Bind Widget.LabelColor, Converter={StaticResource StringToColorConverter}, Mode=OneWay}" />
+        <local:ImageLabel VerticalAlignment="Center"
+                          IconPath="{x:Bind Widget.IconPath, Mode=OneWay}"
+                          LabelText="{x:Bind Widget.Label, Mode=OneWay}" 
+                          LabelForeground="{x:Bind Widget.LabelColor, Mode=OneWay}" />
 
-		<TextBlock Grid.Column="1"
-				   Margin="0, 0, 12, 0"
-				   HorizontalAlignment="Right"
-				   VerticalAlignment="Center"
-				   FontSize="18"
-				   Text="{x:Bind Widget.Value, Mode=OneWay}" 
-				   Foreground="{x:Bind Widget.ValueColor, Converter={StaticResource StringToColorConverter}, Mode=OneWay}" 
-				   TextWrapping="Wrap"
-				   TextTrimming="WordEllipsis" />
-	</Grid>
+        <TextBlock Grid.Column="1"
+                   Margin="0, 0, 12, 0"
+                   HorizontalAlignment="Right"
+                   VerticalAlignment="Center"
+                   FontSize="18"
+                   Text="{x:Bind Widget.State, Mode=OneWay}" 
+                   Foreground="{x:Bind Widget.ValueColor, Mode=OneWay}" 
+                   TextWrapping="Wrap"
+                   TextTrimming="WordEllipsis" />
+    </Grid>
 </local:WidgetBase>
\ No newline at end of file
diff --git a/src/openHAB.Windows/Controls/TextWidget.xaml.cs b/src/openHAB.Windows/Controls/TextWidget.xaml.cs
index cb447417..1e13df65 100644
--- a/src/openHAB.Windows/Controls/TextWidget.xaml.cs
+++ b/src/openHAB.Windows/Controls/TextWidget.xaml.cs
@@ -1,20 +1,20 @@
-namespace OpenHAB.Windows.Controls
+namespace openHAB.Windows.Controls;
+
+/// <summary>
+/// Widget control that represents an OpenHAB text.
+/// </summary>
+public sealed partial class TextWidget : WidgetBase
 {
     /// <summary>
-    /// Widget control that represents an OpenHAB text.
+    /// Initializes a new instance of the <see cref="TextWidget"/> class.
     /// </summary>
-    public sealed partial class TextWidget : WidgetBase
+    public TextWidget()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="TextWidget"/> class.
-        /// </summary>
-        public TextWidget()
-        {
-            InitializeComponent();
-        }
+        InitializeComponent();
+    }
 
-        internal override void SetState()
-        {
-        }
+    internal override void SetState()
+    {
+        RaisePropertyChanged(nameof(Widget));
     }
 }
diff --git a/src/openHAB.Windows/Controls/ToggleWidget.xaml b/src/openHAB.Windows/Controls/ToggleWidget.xaml
index 040fb356..a8c35170 100644
--- a/src/openHAB.Windows/Controls/ToggleWidget.xaml
+++ b/src/openHAB.Windows/Controls/ToggleWidget.xaml
@@ -1,30 +1,29 @@
-<local:WidgetBase x:Class="OpenHAB.Windows.Controls.ToggleWidget"
-				  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-				  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-				  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-				  xmlns:local="using:OpenHAB.Windows.Controls"
-				  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-				  d:DesignHeight="100"
-				  d:DesignWidth="300"
-				  mc:Ignorable="d"
-				  Visibility="{x:Bind Widget.Visibility, Converter={StaticResource BooleanToVisibilityConverter}}">
+<local:WidgetBase x:Class="openHAB.Windows.Controls.ToggleWidget"
+                  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                  xmlns:local="using:openHAB.Windows.Controls"
+                  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                  d:DesignHeight="100"
+                  d:DesignWidth="300"
+                  mc:Ignorable="d"
+                  Visibility="{x:Bind Widget.Visibility}">
 
-	<Grid Style="{StaticResource Widget}">
-		<Grid.ColumnDefinitions>
-			<ColumnDefinition Width="70*" />
-			<ColumnDefinition Width="30*" />
-		</Grid.ColumnDefinitions>
-		<local:ImageLabel Grid.Column="0" 
-						  VerticalAlignment="Center"
-						  IconPath="{x:Bind Widget, Converter={StaticResource IconToPathConverter}, Mode=OneWay}"
-						  LabelText="{x:Bind Widget.Label, Mode=OneWay}"
-						  LabelForeground="{x:Bind Widget.LabelColor, Converter={StaticResource StringToColorConverter}, Mode=OneWay}" />
+    <Grid Style="{StaticResource Widget}">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="70*" />
+            <ColumnDefinition Width="30*" />
+        </Grid.ColumnDefinitions>
+        <local:ImageLabel Grid.Column="0" 
+                          VerticalAlignment="Center"
+                          IconPath="{x:Bind Widget.IconPath, Mode=OneWay}"
+                          LabelText="{x:Bind Widget.Label, Mode=OneWay}"
+                          LabelForeground="{x:Bind Widget.LabelColor, Mode=OneWay}" />
 
-		<ToggleSwitch  Grid.Column="1"
-					   Toggled="ToggleSwitch_Toggled"
-					   IsOn="{x:Bind State, Mode=TwoWay, Converter={StaticResource StateToBoolConverter}}"
-					   HorizontalAlignment="Right" HorizontalContentAlignment="Right"
-					   Foreground="{x:Bind Widget.ValueColor, Converter={StaticResource StringToColorConverter}, Mode=OneWay}" />
+        <ToggleSwitch  Grid.Column="1"
+                       Toggled="ToggleSwitch_Toggled"
+                       IsOn="{x:Bind State, Mode=TwoWay, Converter={StaticResource StateToBoolConverter}}"
+                       Foreground="{x:Bind Widget.ValueColor, Mode=OneWay}" />
 
-	</Grid>
+    </Grid>
 </local:WidgetBase>
diff --git a/src/openHAB.Windows/Controls/ToggleWidget.xaml.cs b/src/openHAB.Windows/Controls/ToggleWidget.xaml.cs
index a6ef8cb7..94b7f7aa 100644
--- a/src/openHAB.Windows/Controls/ToggleWidget.xaml.cs
+++ b/src/openHAB.Windows/Controls/ToggleWidget.xaml.cs
@@ -1,82 +1,81 @@
-using CommunityToolkit.Mvvm.Messaging;
-using OpenHAB.Core.Messages;
-using OpenHAB.Core.Model;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
+using CommunityToolkit.Mvvm.Messaging;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using openHAB.Core.Client.Messages;
+using openHAB.Core.Model;
 
-namespace OpenHAB.Windows.Controls
+namespace openHAB.Windows.Controls;
+
+/// <summary>
+/// Widget control that represents an OpenHAB switch.
+/// </summary>
+public sealed partial class ToggleWidget : WidgetBase
 {
     /// <summary>
-    /// Widget control that represents an OpenHAB switch.
+    /// Initializes a new instance of the <see cref="ToggleWidget"/> class.
     /// </summary>
-    public sealed partial class ToggleWidget : WidgetBase
+    public ToggleWidget()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ToggleWidget"/> class.
-        /// </summary>
-        public ToggleWidget()
-        {
-            InitializeComponent();
+        InitializeComponent();
 
-            Loading += ToggleWidget_Loading;
-        }
+        //Loading += ToggleWidget_Loading;
+    }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether the switch is on or off.
-        /// </summary>
-        public string State
+    /// <summary>
+    /// Gets or sets a value indicating whether the switch is on or off.
+    /// </summary>
+    public string State
+    {
+        get => Widget.Item?.State;
+        set
         {
-            get => Widget.Value;
-            set
+            if (string.Compare(value, Widget.Item.State, true) == 0)
             {
-                if (value.CompareTo(Widget.Value) == 0)
-                {
-                    return;
-                }
-
-                Widget.Value = value;
+                return;
             }
-        }
 
-        private void ToggleWidget_Loading(FrameworkElement sender, object args)
-        {
-            SetState();
+            Widget.Item.State = value;
         }
+    }
 
-        internal override void SetState()
-        {
-            if (string.IsNullOrEmpty(Widget?.Item?.State) ||
-                string.CompareOrdinal(Widget?.Item?.State, "NULL") == 0)
-            {
-                Widget.Value = OpenHABCommands.OffCommand;
-            }
-            else if (Widget.Value == null)
-            {
-                Widget.Value = Widget.Item.State;
-            }
-            else if (Widget.Item.State != Widget.Value)
-            {
-                Widget.Value = Widget.Item.State;
-            }
+    //private void ToggleWidget_Loading(FrameworkElement sender, object args)
+    //{
+    //    SetState();
+    //}
 
-            RaisePropertyChanged(nameof(Widget));
-            RaisePropertyChanged(nameof(State));
-        }
+    internal override void SetState()
+    {
+        //if (string.IsNullOrEmpty(Widget?.Item?.State) ||
+        //    string.CompareOrdinal(Widget?.Item?.State, "NULL") == 0)
+        //{
+        //    Widget.Item.State = OpenHABCommands.OffCommand;
+        //}
+        //else if (Widget.Item.State == null)
+        //{
+        //    Widget.Item.State = Widget.Item.State;
+        //}
+        //else if (Widget.Item.State != Widget.Item.State)
+        //{
+        //    Widget.Item.State = Widget.Item.State;
+        //}
+
+        RaisePropertyChanged(nameof(Widget));
+        RaisePropertyChanged(nameof(State));
+    }
 
-        private void ToggleSwitch_Toggled(object sender, RoutedEventArgs e)
+    private void ToggleSwitch_Toggled(object sender, RoutedEventArgs e)
+    {
+        ToggleSwitch toggleSwitch = sender as ToggleSwitch;
+        if (toggleSwitch == null)
         {
-            ToggleSwitch toggleSwitch = sender as ToggleSwitch;
-            if (toggleSwitch == null)
-            {
-                return;
-            }
+            return;
+        }
 
-            string currentValue = toggleSwitch.IsOn ? OpenHABCommands.OnCommand : OpenHABCommands.OffCommand;
-            if (string.CompareOrdinal(currentValue, Widget?.Item?.State) != 0)
-            {
-                Widget.Item.State = currentValue;
-                StrongReferenceMessenger.Default.Send(new TriggerCommandMessage(Widget.Item, currentValue));
-            }
+        string currentValue = toggleSwitch.IsOn ? OpenHABCommands.OnCommand : OpenHABCommands.OffCommand;
+        if (string.CompareOrdinal(currentValue, Widget?.Item?.State) != 0)
+        {
+            Widget.Item.State = currentValue;
+            StrongReferenceMessenger.Default.Send(new TriggerCommandMessage(Widget.Item, currentValue));
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/openHAB.Windows/Controls/WebViewWidget.xaml b/src/openHAB.Windows/Controls/WebViewWidget.xaml
index e3b7336a..ea9cf1b0 100644
--- a/src/openHAB.Windows/Controls/WebViewWidget.xaml
+++ b/src/openHAB.Windows/Controls/WebViewWidget.xaml
@@ -1,32 +1,32 @@
-<local:WidgetBase x:Class="OpenHAB.Windows.Controls.WebViewWidget"
+<local:WidgetBase x:Class="openHAB.Windows.Controls.WebViewWidget"
 				  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 				  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 				  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-				  xmlns:local="using:OpenHAB.Windows.Controls"
+				  xmlns:local="using:openHAB.Windows.Controls"
 				  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 				  d:DesignHeight="150"
 				  d:DesignWidth="300"
-				  mc:Ignorable="d" 
-				  Visibility="{x:Bind Widget.Visibility, Converter={StaticResource BooleanToVisibilityConverter}}">
+				  mc:Ignorable="d"
+				  Visibility="{x:Bind Widget.Visibility}">
 
 	<Grid Style="{StaticResource Widget}"
 		  Tapped="OnTapped">
 
-		<WebView x:Name="WebView">
-			<WebView.RenderTransform>
+		<WebView2 x:Name="WebView">
+			<WebView2.RenderTransform>
 				<CompositeTransform ScaleY="0.5" ScaleX="0.5"/>
-			</WebView.RenderTransform>
-		</WebView>
+			</WebView2.RenderTransform>
+		</WebView2>
 
 		<Border Background="Transparent" CornerRadius="5" />
 
 		<ContentDialog x:Name="PopupDialog"
 					   Title="{x:Bind Widget.Label}"
-					   Background="{StaticResource OpenHABLightColor}"
+                       Background="{StaticResource ContentDialog}"
 					   IsPrimaryButtonEnabled="True"
 					   PrimaryButtonText="Close">
-			<WebView x:Name="WebViewFull" Width="550" Height="300" />
+			<WebView2 x:Name="WebViewFull" Width="550" Height="300" />
 		</ContentDialog>
 
 	</Grid>
-</local:WidgetBase>
\ No newline at end of file
+</local:WidgetBase>
diff --git a/src/openHAB.Windows/Controls/WebViewWidget.xaml.cs b/src/openHAB.Windows/Controls/WebViewWidget.xaml.cs
index 0453d244..dd739858 100644
--- a/src/openHAB.Windows/Controls/WebViewWidget.xaml.cs
+++ b/src/openHAB.Windows/Controls/WebViewWidget.xaml.cs
@@ -1,39 +1,38 @@
-using System;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Input;
+using System;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Input;
 
-namespace OpenHAB.Windows.Controls
+namespace openHAB.Windows.Controls;
+
+/// <summary>
+/// Widget control that represents an OpenHab WebView.
+/// </summary>
+public sealed partial class WebViewWidget : WidgetBase
 {
     /// <summary>
-    /// Widget control that represents an OpenHab WebView.
+    /// Initializes a new instance of the <see cref="WebViewWidget"/> class.
     /// </summary>
-    public sealed partial class WebViewWidget : WidgetBase
+    public WebViewWidget()
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="WebViewWidget"/> class.
-        /// </summary>
-        public WebViewWidget()
-        {
-            this.InitializeComponent();
-            Loaded += OnLoaded;
-        }
+        this.InitializeComponent();
+        Loaded += OnLoaded;
+    }
 
-        private void OnLoaded(object sender, RoutedEventArgs e)
-        {
-            SetState();
-        }
+    private void OnLoaded(object sender, RoutedEventArgs e)
+    {
+        SetState();
+    }
 
-        private async void OnTapped(object sender, TappedRoutedEventArgs e)
-        {
-            await PopupDialog.ShowAsync();
-        }
+    private async void OnTapped(object sender, TappedRoutedEventArgs e)
+    {
+        await PopupDialog.ShowAsync();
+    }
 
-        internal override void SetState()
+    internal override void SetState()
+    {
+        if (!string.IsNullOrEmpty(Widget?.Url))
         {
-            if (!string.IsNullOrEmpty(Widget?.Url))
-            {
-                WebView.Source = WebViewFull.Source = new Uri(Widget.Url);
-            }
+            WebView.Source = WebViewFull.Source = new Uri(Widget.Url);
         }
     }
 }
diff --git a/src/openHAB.Windows/Controls/WidgetBase.cs b/src/openHAB.Windows/Controls/WidgetBase.cs
index 2379b82f..04a87f8c 100644
--- a/src/openHAB.Windows/Controls/WidgetBase.cs
+++ b/src/openHAB.Windows/Controls/WidgetBase.cs
@@ -1,69 +1,66 @@
-using System;
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
-using OpenHAB.Core.Model;
-using Windows.UI.Core;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Media;
+using CommunityToolkit.WinUI;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using openHAB.Windows.ViewModel;
 
-namespace OpenHAB.Windows.Controls
+namespace openHAB.Windows.Controls;
+
+/// <summary>
+/// A base class for all OpenHAB widget controls.
+/// </summary>
+public abstract class WidgetBase : UserControl, INotifyPropertyChanged
 {
     /// <summary>
-    /// A base class for all OpenHAB widget controls.
+    /// A bindable property to bind the OpenHAB widget to the control.
+    /// </summary>
+    public static readonly DependencyProperty WidgetProperty = DependencyProperty.Register(
+        nameof(Widget), typeof(WidgetViewModel), typeof(WidgetBase), new PropertyMetadata(default(WidgetViewModel), CommonPropertyChangedCallback));
+
+    /// <summary>
+    /// Gets or sets the OpenHAB widget.
     /// </summary>
-    public abstract class WidgetBase : UserControl, INotifyPropertyChanged
+    public WidgetViewModel Widget
     {
-        /// <summary>
-        /// A bindable property to bind the OpenHAB widget to the control.
-        /// </summary>
-        public static readonly DependencyProperty WidgetProperty = DependencyProperty.Register(
-            nameof(Widget), typeof(OpenHABWidget), typeof(WidgetBase), new PropertyMetadata(default(OpenHABWidget), CommonPropertyChangedCallback));
+        get => (WidgetViewModel)GetValue(WidgetProperty);
+        set => SetValue(WidgetProperty, value);
+    }
 
-        /// <summary>
-        /// Gets or sets the OpenHAB widget.
-        /// </summary>
-        public OpenHABWidget Widget
-        {
-            get => (OpenHABWidget)GetValue(WidgetProperty);
-            set => SetValue(WidgetProperty, value);
-        }
+    private static void CommonPropertyChangedCallback(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs dependencyPropertyChangedEventArgs)
+    {
+        var widgetBase = dependencyObject as WidgetBase;
+        widgetBase?.SetPropertyChangedHandler();
+    }
 
-        private static void CommonPropertyChangedCallback(DependencyObject dependencyObject, DependencyPropertyChangedEventArgs dependencyPropertyChangedEventArgs)
+    private void SetPropertyChangedHandler()
+    {
+        if (Widget.Item == null)
         {
-            var widgetBase = dependencyObject as WidgetBase;
-            widgetBase?.SetPropertyChangedHandler();
+            return;
         }
 
-        private void SetPropertyChangedHandler()
-        {
-            if (Widget.Item == null)
-            {
-                return;
-            }
-
-            Widget.Item.PropertyChanged += Item_PropertyChanged;
-        }
+        Widget.Item.PropertyChanged += Item_PropertyChanged;
+    }
 
-        private async void Item_PropertyChanged(object sender, PropertyChangedEventArgs e)
+    private async void Item_PropertyChanged(object sender, PropertyChangedEventArgs e)
+    {
+        var widget = sender as WidgetViewModel;
+        if (e.PropertyName != nameof(widget.Item.State))
         {
-            var widget = sender as OpenHABWidget;
-            if (e.PropertyName != nameof(widget.Item.State))
-            {
-                return;
-            }
-
-            await Dispatcher.RunAsync(CoreDispatcherPriority.Normal, SetState);
+            return;
         }
 
-        internal abstract void SetState();
+        await App.DispatcherQueue.EnqueueAsync(SetState);
+    }
 
-        /// <inheritdoc />
-        public event PropertyChangedEventHandler PropertyChanged;
+    internal abstract void SetState();
 
-        internal void RaisePropertyChanged([CallerMemberName] string propertyName = null)
-        {
-            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
-        }
+    /// <inheritdoc />
+    public event PropertyChangedEventHandler PropertyChanged;
+
+    internal void RaisePropertyChanged([CallerMemberName] string propertyName = null)
+    {
+        PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
     }
 }
diff --git a/src/openHAB.Windows/Converters/BooleanToVisibilityConverter.cs b/src/openHAB.Windows/Converters/BooleanToVisibilityConverter.cs
index 7fbb75a6..761410b1 100644
--- a/src/openHAB.Windows/Converters/BooleanToVisibilityConverter.cs
+++ b/src/openHAB.Windows/Converters/BooleanToVisibilityConverter.cs
@@ -1,44 +1,43 @@
-using System;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Data;
+using System;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Data;
 
-namespace OpenHAB.Windows.Converters
+namespace openHAB.Windows.Converters;
+
+/// <summary>
+/// Class to convert boolean to visibility.
+/// </summary>
+public class BooleanToVisibilityConverter : IValueConverter
 {
     /// <summary>
-    /// Class to convert boolean to visibility.
+    /// Converts the specified value.
     /// </summary>
-    public class BooleanToVisibilityConverter : IValueConverter
+    /// <param name="value">The value.</param>
+    /// <param name="targetType">Type of the target.</param>
+    /// <param name="parameter">The parameter.</param>
+    /// <param name="language">The language.</param>
+    /// <returns>Visible for true, otherwise collapsed.</returns>
+    /// <exception cref="System.InvalidOperationException">The target must be a Visibility.</exception>
+    public object Convert(object value, Type targetType, object parameter, string language)
     {
-        /// <summary>
-        /// Converts the specified value.
-        /// </summary>
-        /// <param name="value">The value.</param>
-        /// <param name="targetType">Type of the target.</param>
-        /// <param name="parameter">The parameter.</param>
-        /// <param name="language">The language.</param>
-        /// <returns>Visible for true, otherwise collapsed.</returns>
-        /// <exception cref="System.InvalidOperationException">The target must be a Visibility.</exception>
-        public object Convert(object value, Type targetType, object parameter, string language)
+        if (targetType != typeof(Visibility))
         {
-            if (targetType != typeof(Visibility))
-            {
-                throw new InvalidOperationException("The target must be a Visibility");
-            }
-
-            return (bool)value ? Visibility.Visible : Visibility.Collapsed;
+            throw new InvalidOperationException("The target must be a Visibility");
         }
 
-        /// <summary>
-        /// Converts the back.
-        /// </summary>
-        /// <param name="value">The value.</param>
-        /// <param name="targetType">Type of the target.</param>
-        /// <param name="parameter">The parameter.</param>
-        /// <param name="language">The language.</param>
-        /// <returns>Visibility.Visible => true and Visibility.Collapsed => false.</returns>
-        public object ConvertBack(object value, Type targetType, object parameter, string language)
-        {
-            return ((Visibility)value) == Visibility.Visible;
-        }
+        return (bool)value ? Visibility.Visible : Visibility.Collapsed;
+    }
+
+    /// <summary>
+    /// Converts the back.
+    /// </summary>
+    /// <param name="value">The value.</param>
+    /// <param name="targetType">Type of the target.</param>
+    /// <param name="parameter">The parameter.</param>
+    /// <param name="language">The language.</param>
+    /// <returns>Visibility.Visible => true and Visibility.Collapsed => false.</returns>
+    public object ConvertBack(object value, Type targetType, object parameter, string language)
+    {
+        return ((Visibility)value) == Visibility.Visible;
     }
 }
diff --git a/src/openHAB.Windows/Converters/IconToBitmapConverter.cs b/src/openHAB.Windows/Converters/IconToBitmapConverter.cs
index 58e39d0e..0c7352c0 100644
--- a/src/openHAB.Windows/Converters/IconToBitmapConverter.cs
+++ b/src/openHAB.Windows/Converters/IconToBitmapConverter.cs
@@ -1,33 +1,43 @@
-using System;
-using OpenHAB.Core.Contracts.Services;
-using OpenHAB.Core.Model;
-using OpenHAB.Windows.Services;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Media.Imaging;
+using System;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
+using Microsoft.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Media.Imaging;
+using openHAB.Core.Model;
+using openHAB.Windows.ViewModel;
 
-namespace OpenHAB.Windows.Converters
+namespace openHAB.Windows.Converters;
+
+/// <summary>
+/// Converts an icon path to a bitmap object.
+/// </summary>
+public class IconToBitmapConverter : IValueConverter
 {
-    /// <summary>
-    /// Converts an icon path to a bitmap object.
-    /// </summary>
-    public class IconToBitmapConverter : IValueConverter
+    /// <inheritdoc/>
+    public object Convert(object value, Type targetType, object parameter, string language)
     {
-        /// <inheritdoc/>
-        public object Convert(object value, Type targetType, object parameter, string language)
-        {
-            var settingsService = (ISettingsService)DIService.Instance.Services.GetService(typeof(ISettingsService));
-            OpenHABVersion openHABVersion = settingsService.ServerVersion;
-
-            var serverUrl = Core.Common.OpenHABHttpClient.BaseUrl;
-            string url = openHABVersion == OpenHABVersion.Two || openHABVersion == OpenHABVersion.Three ? $"{serverUrl}icon/{value}?state=UNDEF&format=png" : $"{serverUrl}images/{value}.png";
+        IOptions<SettingOptions> settingsOptions = Program.Host.Services.GetRequiredService<IOptions<SettingOptions>>();
+        SettingOptions settings = settingsOptions.Value;
 
-            return new BitmapImage(new Uri(url));
+        WidgetViewModel? widget = value as WidgetViewModel;
+        if (widget == null || string.IsNullOrEmpty(widget.IconPath))
+        {
+            return null;
         }
 
-        /// <inheritdoc/>
-        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        if (settings.UseSVGIcons)
         {
-            throw new NotSupportedException();
+            return new SvgImageSource(new Uri(widget.IconPath));
         }
+        else
+        {
+            return new BitmapImage(new Uri(widget.IconPath));
+        }
+    }
+
+    /// <inheritdoc/>
+    public object ConvertBack(object value, Type targetType, object parameter, string language)
+    {
+        throw new NotSupportedException();
     }
 }
diff --git a/src/openHAB.Windows/Converters/IconToPathConverter.cs b/src/openHAB.Windows/Converters/IconToPathConverter.cs
deleted file mode 100644
index 0fcc2aa7..00000000
--- a/src/openHAB.Windows/Converters/IconToPathConverter.cs
+++ /dev/null
@@ -1,53 +0,0 @@
-using System;
-using System.Text.RegularExpressions;
-using OpenHAB.Core.Common;
-using OpenHAB.Core.Contracts.Services;
-using OpenHAB.Core.Model;
-using OpenHAB.Windows.Services;
-using Windows.UI.Xaml.Data;
-
-namespace OpenHAB.Windows.Converters
-{
-    /// <summary>
-    /// Converts an OpenHAB widget icon to a full path.
-    /// </summary>
-    public class IconToPathConverter : IValueConverter
-    {
-        private Settings _settings;
-
-        /// <summary>Initializes a new instance of the <see cref="IconToPathConverter" /> class.</summary>
-        public IconToPathConverter()
-        {
-            _settings = (Settings)DIService.Instance.Services.GetService(typeof(Settings));
-        }
-
-        /// <inheritdoc/>
-        public object Convert(object value, Type targetType, object parameter, string language)
-        {
-            var settingsService = (ISettingsService)DIService.Instance.Services.GetService(typeof(ISettingsService));
-            OpenHABVersion openHABVersion = settingsService.ServerVersion;
-
-            var serverUrl = OpenHABHttpClient.BaseUrl;
-
-            var widget = value as OpenHABWidget;
-            var state = widget.Item?.State ?? "ON";
-            string iconFormat = _settings.UseSVGIcons ? "svg" : "png";
-
-            var regMatch = Regex.Match(state, @"\d+");
-            if (regMatch.Success)
-            {
-                state = regMatch.Value;
-            }
-
-            return openHABVersion == OpenHABVersion.Two || openHABVersion == OpenHABVersion.Three ?
-                $"{serverUrl}icon/{widget.Icon}?state={state}&format={iconFormat}" :
-                $"{serverUrl}images/{widget.Icon}.png";
-        }
-
-        /// <inheritdoc/>
-        public object ConvertBack(object value, Type targetType, object parameter, string language)
-        {
-            throw new NotSupportedException();
-        }
-    }
-}
diff --git a/src/openHAB.Windows/Converters/MenuItemTemplateSelector.cs b/src/openHAB.Windows/Converters/MenuItemTemplateSelector.cs
index 14a36188..9f67931b 100644
--- a/src/openHAB.Windows/Converters/MenuItemTemplateSelector.cs
+++ b/src/openHAB.Windows/Converters/MenuItemTemplateSelector.cs
@@ -1,40 +1,39 @@
-using OpenHAB.Windows.ViewModel;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Markup;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Markup;
+using openHAB.Core.Client.Models;
 
-namespace OpenHAB.Windows.Converters
+namespace openHAB.Windows.Converters;
+
+/// <summary>Template selector to differentiate between sitemaps and general menu items.</summary>
+[ContentProperty(Name = "SiteMapMenuItemTemplate")]
+public class MenuItemTemplateSelector : DataTemplateSelector
 {
-    /// <summary>Template selector to differeniate between sitemaps and general menu items.</summary>
-    [ContentProperty(Name = "SiteMapMenuItemTemplate")]
-    public class MenuItemTemplateSelector : DataTemplateSelector
+    /// <summary>Gets or sets the sitemap menu item template.</summary>
+    /// <value>The site map menu item template.</value>
+    public DataTemplate SiteMapMenuItemTemplate
     {
-        /// <summary>Gets or sets the sitemap menuitem template.</summary>
-        /// <value>The site map menu item template.</value>
-        public DataTemplate SiteMapMenuItemTemplate
-        {
-            get;
-            set;
-        }
-
-        /// <summary>Gets or sets the item temlate for default menuitems.</summary>
-        /// <value>The default item temlate.</value>
-        public DataTemplate DefaultItemTemlate
-        {
-            get; set;
-        }
+        get;
+        set;
+    }
 
-        /// <inheritdoc/>
-        protected override DataTemplate SelectTemplateCore(object item)
-        {
-            SitemapViewModel sitemapMenuItem = item as SitemapViewModel;
+    /// <summary>Gets or sets the item template for default menu items.</summary>
+    /// <value>The default item template.</value>
+    public DataTemplate DefaultItemTemlate
+    {
+        get; set;
+    }
 
-            if (sitemapMenuItem != null)
-            {
-                return SiteMapMenuItemTemplate;
-            }
+    /// <inheritdoc/>
+    protected override DataTemplate SelectTemplateCore(object item)
+    {
+        Sitemap sitemapMenuItem = item as Sitemap;
 
-            return DefaultItemTemlate;
+        if (sitemapMenuItem != null)
+        {
+            return SiteMapMenuItemTemplate;
         }
+
+        return DefaultItemTemlate;
     }
 }
diff --git a/src/openHAB.Windows/Converters/NullToBooleanConverter.cs b/src/openHAB.Windows/Converters/NullToBooleanConverter.cs
index 47289233..1aab2997 100644
--- a/src/openHAB.Windows/Converters/NullToBooleanConverter.cs
+++ b/src/openHAB.Windows/Converters/NullToBooleanConverter.cs
@@ -1,44 +1,42 @@
-using System;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Data;
+using System;
+using Microsoft.UI.Xaml.Data;
 
-namespace OpenHAB.Windows.Converters
+namespace openHAB.Windows.Converters;
+
+/// <summary>
+/// Class to convert null to boolean.
+/// </summary>
+public class NullToBooleanConverter : IValueConverter
 {
     /// <summary>
-    /// Class to convert null to boolean.
+    /// Converts the specified value.
     /// </summary>
-    public class NullToBooleanConverter : IValueConverter
+    /// <param name="value">The value.</param>
+    /// <param name="targetType">Type of the target.</param>
+    /// <param name="parameter">The parameter.</param>
+    /// <param name="language">The language.</param>
+    /// <returns>Visible for true, otherwise collapsed.</returns>
+    /// <exception cref="System.InvalidOperationException">The target must be a Visibility.</exception>
+    public object Convert(object value, Type targetType, object parameter, string language)
     {
-        /// <summary>
-        /// Converts the specified value.
-        /// </summary>
-        /// <param name="value">The value.</param>
-        /// <param name="targetType">Type of the target.</param>
-        /// <param name="parameter">The parameter.</param>
-        /// <param name="language">The language.</param>
-        /// <returns>Visible for true, otherwise collapsed.</returns>
-        /// <exception cref="System.InvalidOperationException">The target must be a Visibility.</exception>
-        public object Convert(object value, Type targetType, object parameter, string language)
+        if (targetType != typeof(bool))
         {
-            if (targetType != typeof(bool))
-            {
-                throw new InvalidOperationException("The target must be a Boolean");
-            }
-
-            return !(value == null);
+            throw new InvalidOperationException("The target must be a Boolean");
         }
 
-        /// <summary>
-        /// Converts the back.
-        /// </summary>
-        /// <param name="value">The value.</param>
-        /// <param name="targetType">Type of the target.</param>
-        /// <param name="parameter">The parameter.</param>
-        /// <param name="language">The language.</param>
-        /// <returns>Visibility.Visible => true and Visibility.Collapsed => false.</returns>
-        public object ConvertBack(object value, Type targetType, object parameter, string language)
-        {
-            return null;
-        }
+        return !(value == null);
+    }
+
+    /// <summary>
+    /// Converts the back.
+    /// </summary>
+    /// <param name="value">The value.</param>
+    /// <param name="targetType">Type of the target.</param>
+    /// <param name="parameter">The parameter.</param>
+    /// <param name="language">The language.</param>
+    /// <returns>Visibility.Visible => true and Visibility.Collapsed => false.</returns>
+    public object ConvertBack(object value, Type targetType, object parameter, string language)
+    {
+        return null;
     }
 }
diff --git a/src/openHAB.Windows/Converters/NullToVisibilityConverter.cs b/src/openHAB.Windows/Converters/NullToVisibilityConverter.cs
new file mode 100644
index 00000000..9a691e92
--- /dev/null
+++ b/src/openHAB.Windows/Converters/NullToVisibilityConverter.cs
@@ -0,0 +1,41 @@
+using System;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Data;
+
+namespace openHAB.Windows.Converters;
+
+
+public class NullToVisibilityConverter : IValueConverter
+{
+    /// <summary>
+    /// Converts the specified value.
+    /// </summary>
+    /// <param name="value">The value.</param>
+    /// <param name="targetType">Type of the target.</param>
+    /// <param name="parameter">The parameter.</param>
+    /// <param name="language">The language.</param>
+    /// <returns>Visible for true, otherwise collapsed.</returns>
+    /// <exception cref="System.InvalidOperationException">The target must be a Visibility.</exception>
+    public object Convert(object value, Type targetType, object parameter, string language)
+    {
+        if (targetType != typeof(Visibility))
+        {
+            throw new InvalidOperationException("The target must be a Boolean");
+        }
+
+        return value == null ? Visibility.Collapsed : Visibility.Visible;
+    }
+
+    /// <summary>
+    /// Converts the back.
+    /// </summary>
+    /// <param name="value">The value.</param>
+    /// <param name="targetType">Type of the target.</param>
+    /// <param name="parameter">The parameter.</param>
+    /// <param name="language">The language.</param>
+    /// <returns>Visibility.Visible => true and Visibility.Collapsed => false.</returns>
+    public object ConvertBack(object value, Type targetType, object parameter, string language)
+    {
+        return null;
+    }
+}
diff --git a/src/openHAB.Windows/Converters/ObjectToSitemapConverter.cs b/src/openHAB.Windows/Converters/ObjectToSitemapConverter.cs
index 1581fac7..9c4ff493 100644
--- a/src/openHAB.Windows/Converters/ObjectToSitemapConverter.cs
+++ b/src/openHAB.Windows/Converters/ObjectToSitemapConverter.cs
@@ -1,24 +1,23 @@
-using System;
-using OpenHAB.Core.Model;
-using Windows.UI.Xaml.Data;
+using System;
+using Microsoft.UI.Xaml.Data;
+using openHAB.Core.Client.Models;
 
-namespace OpenHAB.Windows.Converters
+namespace openHAB.Windows.Converters;
+
+/// <summary>
+/// Converts objects to sitemaps, for use in compiled bindings.
+/// </summary>
+public class ObjectToSitemapConverter : IValueConverter
 {
-    /// <summary>
-    /// Converts objects to sitemaps, for use in compiled bindings.
-    /// </summary>
-    public class ObjectToSitemapConverter : IValueConverter
+    /// <inheritdoc/>
+    public object Convert(object value, Type targetType, object parameter, string language)
     {
-        /// <inheritdoc/>
-        public object Convert(object value, Type targetType, object parameter, string language)
-        {
-            return value as OpenHABSitemap;
-        }
+        return value as Sitemap;
+    }
 
-        /// <inheritdoc/>
-        public object ConvertBack(object value, Type targetType, object parameter, string language)
-        {
-            return value as OpenHABSitemap;
-        }
+    /// <inheritdoc/>
+    public object ConvertBack(object value, Type targetType, object parameter, string language)
+    {
+        return value as Sitemap;
     }
 }
diff --git a/src/openHAB.Windows/Converters/OpenHabUrlStateToGlyph.cs b/src/openHAB.Windows/Converters/OpenHabUrlStateToGlyph.cs
index 9809fbbc..64060d96 100644
--- a/src/openHAB.Windows/Converters/OpenHabUrlStateToGlyph.cs
+++ b/src/openHAB.Windows/Converters/OpenHabUrlStateToGlyph.cs
@@ -1,49 +1,48 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using OpenHAB.Core.Model;
-using Windows.UI.Xaml.Data;
+using Microsoft.UI.Xaml.Data;
+using openHAB.Core.Client.Connection.Models;
 
-namespace OpenHAB.Windows.Converters
+namespace openHAB.Windows.Converters;
+
+/// <summary>
+/// Converts OpenHABUlrState value to corresponding ui glyph.
+/// </summary>
+/// <seealso cref="IValueConverter" />
+public class OpenHabUrlStateToGlyph : IValueConverter
 {
-    /// <summary>
-    /// Converts OpenHABUlrState value to corresponding ui glyph.
-    /// </summary>
-    /// <seealso cref="IValueConverter" />
-    public class OpenHabUrlStateToGlyph : IValueConverter
+    private static readonly Dictionary<ConnectionState, string> _stateToGlyphMapping = new Dictionary<ConnectionState, string>()
     {
-        private static Dictionary<ConnectionState, string> _stateToGlyphMapping = new Dictionary<ConnectionState, string>()
-        {
-            { ConnectionState.Unknown, "\uF142" },
-            { ConnectionState.OK, "\uF13E" },
-            { ConnectionState.Failed, "\uF13D" },
-        };
+        { ConnectionState.Unknown, "\uF142" },
+        { ConnectionState.OK, "\uF13E" },
+        { ConnectionState.Failed, "\uF13D" },
+    };
 
-        /// <summary>Converts the specified value.</summary>
-        /// <param name="value">The value.</param>
-        /// <param name="targetType">Type of the target.</param>
-        /// <param name="parameter">The parameter.</param>
-        /// <param name="language">The language.</param>
-        /// <returns>Returns a glyph for an url state.</returns>
-        public object Convert(object value, Type targetType, object parameter, string language)
-        {
-            ConnectionState state = (ConnectionState)value;
-            _stateToGlyphMapping.TryGetValue(state, out string glyph);
+    /// <summary>Converts the specified value.</summary>
+    /// <param name="value">The value.</param>
+    /// <param name="targetType">Type of the target.</param>
+    /// <param name="parameter">The parameter.</param>
+    /// <param name="language">The language.</param>
+    /// <returns>Returns a glyph for an url state.</returns>
+    public object Convert(object value, Type targetType, object parameter, string language)
+    {
+        ConnectionState state = (ConnectionState)value;
+        _stateToGlyphMapping.TryGetValue(state, out string glyph);
 
-            return glyph;
-        }
+        return glyph;
+    }
 
-        /// <summary>Converts the back.</summary>
-        /// <param name="value">The value.</param>
-        /// <param name="targetType">Type of the target.</param>
-        /// <param name="parameter">The parameter.</param>
-        /// <param name="language">The language.</param>
-        /// <returns>Returns OpenHABUrlState by glyph.</returns>
-        public object ConvertBack(object value, Type targetType, object parameter, string language)
-        {
-            string glyph = value.ToString();
+    /// <summary>Converts the back.</summary>
+    /// <param name="value">The value.</param>
+    /// <param name="targetType">Type of the target.</param>
+    /// <param name="parameter">The parameter.</param>
+    /// <param name="language">The language.</param>
+    /// <returns>Returns OpenHABUrlState by glyph.</returns>
+    public object ConvertBack(object value, Type targetType, object parameter, string language)
+    {
+        string glyph = value.ToString();
 
-            return _stateToGlyphMapping.FirstOrDefault(x => x.Value.CompareTo(glyph) == 0).Key;
-        }
+        return _stateToGlyphMapping.FirstOrDefault(x => x.Value.CompareTo(glyph) == 0).Key;
     }
 }
diff --git a/src/openHAB.Windows/Converters/ReverseBoolConverter.cs b/src/openHAB.Windows/Converters/ReverseBoolConverter.cs
index 08b38168..b2e7f0a2 100644
--- a/src/openHAB.Windows/Converters/ReverseBoolConverter.cs
+++ b/src/openHAB.Windows/Converters/ReverseBoolConverter.cs
@@ -1,30 +1,29 @@
-using System;
-using Windows.UI.Xaml.Data;
+using System;
+using Microsoft.UI.Xaml.Data;
 
-namespace OpenHAB.Windows.Converters
+namespace openHAB.Windows.Converters;
+
+/// <summary>
+/// Reverses the value of a boolean.
+/// </summary>
+public class ReverseBoolConverter : IValueConverter
 {
-    /// <summary>
-    /// Reverses the value of a boolean.
-    /// </summary>
-    public class ReverseBoolConverter : IValueConverter
+    /// <inheritdoc/>
+    public object Convert(object value, Type targetType, object parameter, string language)
     {
-        /// <inheritdoc/>
-        public object Convert(object value, Type targetType, object parameter, string language)
+        if (value == null)
         {
-            if (value == null)
-            {
-                return false;
-            }
+            return false;
+        }
 
-            bool convertedValue = (bool)value;
+        bool convertedValue = (bool)value;
 
-            return !convertedValue;
-        }
+        return !convertedValue;
+    }
 
-        /// <inheritdoc/>
-        public object ConvertBack(object value, Type targetType, object parameter, string language)
-        {
-            throw new NotSupportedException();
-        }
+    /// <inheritdoc/>
+    public object ConvertBack(object value, Type targetType, object parameter, string language)
+    {
+        throw new NotSupportedException();
     }
 }
diff --git a/src/openHAB.Windows/Converters/StateToBoolConverter.cs b/src/openHAB.Windows/Converters/StateToBoolConverter.cs
index 2181b762..9c6a5e82 100644
--- a/src/openHAB.Windows/Converters/StateToBoolConverter.cs
+++ b/src/openHAB.Windows/Converters/StateToBoolConverter.cs
@@ -1,36 +1,35 @@
-using System;
-using OpenHAB.Core.Model;
-using Windows.UI.Xaml.Data;
+using System;
+using Microsoft.UI.Xaml.Data;
+using openHAB.Core.Model;
 
-namespace OpenHAB.Windows.Converters
+namespace openHAB.Windows.Converters;
+
+/// <summary>
+/// Converts a boolean string value to a .NET bool.
+/// </summary>
+public class StateToBoolConverter : IValueConverter
 {
-    /// <summary>
-    /// Converts a boolean string value to a .NET bool.
-    /// </summary>
-    public class StateToBoolConverter : IValueConverter
+    /// <inheritdoc/>
+    public object Convert(object value, Type targetType, object parameter, string language)
     {
-        /// <inheritdoc/>
-        public object Convert(object value, Type targetType, object parameter, string language)
+        if (value == null)
         {
-            if (value == null)
-            {
-                return false;
-            }
-
-            return string.CompareOrdinal(value.ToString(), OpenHABCommands.OnCommand) == 0;
+            return false;
         }
 
-        /// <inheritdoc/>
-        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        return string.Compare(value.ToString(), OpenHABCommands.OnCommand, true) == 0;
+    }
+
+    /// <inheritdoc/>
+    public object ConvertBack(object value, Type targetType, object parameter, string language)
+    {
+        if (value == null)
         {
-            if (value == null)
-            {
-                return "Off";
-            }
+            return "Off";
+        }
 
-            bool toggleValue = (bool)value;
+        bool toggleValue = (bool)value;
 
-            return toggleValue ? "On" : "Off";
-        }
+        return toggleValue ? "On" : "Off";
     }
 }
diff --git a/src/openHAB.Windows/Converters/StringToColorBrushConverter.cs b/src/openHAB.Windows/Converters/StringToColorBrushConverter.cs
deleted file mode 100644
index 766c0b4a..00000000
--- a/src/openHAB.Windows/Converters/StringToColorBrushConverter.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using System;
-using Windows.UI;
-using Windows.UI.Xaml.Data;
-using Windows.UI.Xaml.Markup;
-using Windows.UI.Xaml.Media;
-
-namespace OpenHAB.Windows.Converters
-{
-    /// <summary>Convert color string e.g. 'green' to Color.Green. </summary>
-    public class StringToColorBrushConverter : IValueConverter
-    {
-        /// <summary>Converts the specified value.</summary>
-        /// <param name="value">The value.</param>
-        /// <param name="targetType">Type of the target.</param>
-        /// <param name="parameter">The parameter.</param>
-        /// <param name="language">The language.</param>
-        /// <returns>
-        ///   <br />
-        /// </returns>
-        public object Convert(object value, Type targetType, object parameter, string language)
-        {
-            string colorString = value as string;
-            if (string.IsNullOrEmpty(colorString))
-            {
-                return new SolidColorBrush(Colors.Black);
-            }
-
-            Color color = (Color)XamlBindingHelper.ConvertValue(typeof(Color), colorString);
-            return new SolidColorBrush(color);
-        }
-
-        /// <summary>Converts the back.</summary>
-        /// <param name="value">The value.</param>
-        /// <param name="targetType">Type of the target.</param>
-        /// <param name="parameter">The parameter.</param>
-        /// <param name="language">The language.</param>
-        /// <returns>
-        ///   <br />
-        /// </returns>
-        public object ConvertBack(object value, Type targetType, object parameter, string language)
-        {
-            return null;
-        }
-    }
-}
diff --git a/src/openHAB.Windows/Converters/StringToDoubleConverter.cs b/src/openHAB.Windows/Converters/StringToDoubleConverter.cs
index 2ae64ae9..1646d018 100644
--- a/src/openHAB.Windows/Converters/StringToDoubleConverter.cs
+++ b/src/openHAB.Windows/Converters/StringToDoubleConverter.cs
@@ -1,27 +1,26 @@
-using System;
-using Windows.UI.Xaml.Data;
+using System;
+using Microsoft.UI.Xaml.Data;
 
-namespace OpenHAB.Windows.Converters
+namespace openHAB.Windows.Converters;
+
+/// <summary>
+/// Converts a string to a double, returning 0 if the string is invalid.
+/// </summary>
+public class StringToDoubleConverter : IValueConverter
 {
-    /// <summary>
-    /// Converts a string to a double, returning 0 if the string is invalid.
-    /// </summary>
-    public class StringToDoubleConverter : IValueConverter
+    /// <inheritdoc/>
+    public object Convert(object value, Type targetType, object parameter, string language)
     {
-        /// <inheritdoc/>
-        public object Convert(object value, Type targetType, object parameter, string language)
-        {
-            string valueString = value.ToString();
-            double valueDouble;
+        string valueString = value.ToString();
+        double valueDouble;
 
-            double.TryParse(valueString, out valueDouble);
-            return valueDouble;
-        }
+        double.TryParse(valueString, out valueDouble);
+        return valueDouble;
+    }
 
-        /// <inheritdoc/>
-        public object ConvertBack(object value, Type targetType, object parameter, string language)
-        {
-            return value.ToString();
-        }
+    /// <inheritdoc/>
+    public object ConvertBack(object value, Type targetType, object parameter, string language)
+    {
+        return value.ToString();
     }
 }
diff --git a/src/openHAB.Windows/Converters/WidgetTemplateSelector.cs b/src/openHAB.Windows/Converters/WidgetTemplateSelector.cs
index 2dae7549..2805365d 100644
--- a/src/openHAB.Windows/Converters/WidgetTemplateSelector.cs
+++ b/src/openHAB.Windows/Converters/WidgetTemplateSelector.cs
@@ -1,165 +1,208 @@
-using System.Linq;
-using OpenHAB.Core.Common;
-using OpenHAB.Core.Model;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-
-namespace OpenHAB.Windows.Converters
+using System.Linq;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using openHAB.Core.Common;
+using openHAB.Core.Model;
+using openHAB.Windows.ViewModel;
+
+namespace openHAB.Windows.Converters;
+
+/// <summary>
+/// TemplateSelector that determines what widget needs to be shown in the UI.
+/// </summary>
+public class WidgetTemplateSelector : DataTemplateSelector
 {
+    /// <inheritdoc/>
+    protected override DataTemplate SelectTemplateCore(object item, DependencyObject container)
+    {
+        WidgetViewModel widget = item as WidgetViewModel;
+        UIElement uiElement = container as UIElement;
+
+        if (widget == null)
+        {
+            return null;
+        }
+
+        WidgetTypeEnum itemType = GetItemViewType(widget);
+        switch (itemType)
+        {
+            case WidgetTypeEnum.ColorPicker:
+                return ColorTemplate;
+            case WidgetTypeEnum.Group:
+                return PageLinkTemplate;
+            case WidgetTypeEnum.Frame:
+                VariableSizedWrapGrid.SetRowSpan(uiElement, widget.Children.Count + 1);
+                return FrameTemplate;
+            case WidgetTypeEnum.Switch:
+                return SwitchTemplate;
+            case WidgetTypeEnum.SectionSwitch:
+                return SectionSwitchTemplate;
+            case WidgetTypeEnum.RollerShutter:
+                return RollershutterTemplate;
+            case WidgetTypeEnum.Slider:
+                return SliderTemplate;
+            case WidgetTypeEnum.DateTime:
+            case WidgetTypeEnum.Text:
+                return TextTemplate;
+            case WidgetTypeEnum.Image:
+                return ImageTemplate;
+            case WidgetTypeEnum.Selection:
+                return SelectionTemplate;
+            case WidgetTypeEnum.Setpoint:
+                return SetpointTemplate;
+            case WidgetTypeEnum.Chart:
+                return ChartTemplate;
+            case WidgetTypeEnum.Video:
+            case WidgetTypeEnum.VideoMjpeg:
+                return MjpegTemplate;
+            case WidgetTypeEnum.Mapview:
+                return MapViewTemplate;
+            case WidgetTypeEnum.Webview:
+                return WebViewTemplate;
+            default:
+                return FrameTemplate;
+        }
+    }
+
     /// <summary>
-    /// TemplateSelector that determines what widget needs to be shown in the UI.
+    /// Gets or sets the template for a Frame control.
     /// </summary>
-    public class WidgetTemplateSelector : DataTemplateSelector
+    public DataTemplate FrameTemplate
     {
-        /// <inheritdoc/>
-        protected override DataTemplate SelectTemplateCore(object item, DependencyObject container)
-        {
-            var widget = item as OpenHABWidget;
-            var uiElement = container as UIElement;
+        get; set;
+    }
 
-            if (widget == null)
-            {
-                return null;
-            }
+    /// <summary>
+    /// Gets or sets the template for a Selection control.
+    /// </summary>
+    public DataTemplate SelectionTemplate
+    {
+        get; set;
+    }
 
-            var itemType = GetItemViewType(widget);
-            switch (itemType)
-            {
-                case WidgetTypeEnum.ColorPicker:
-                    return ColorTemplate;
-                case WidgetTypeEnum.Group:
-                    return PageLinkTemplate;
-                case WidgetTypeEnum.Frame:
-                    VariableSizedWrapGrid.SetRowSpan(uiElement, widget.Children.Count + 1);
-                    return FrameTemplate;
-                case WidgetTypeEnum.Switch:
-                    return SwitchTemplate;
-                case WidgetTypeEnum.SectionSwitch:
-                    return SectionSwitchTemplate;
-                case WidgetTypeEnum.RollerShutter:
-                    return RollershutterTemplate;
-                case WidgetTypeEnum.Slider:
-                    return SliderTemplate;
-                case WidgetTypeEnum.DateTime:
-                case WidgetTypeEnum.Text:
-                    return TextTemplate;
-                case WidgetTypeEnum.Image:
-                    return ImageTemplate;
-                case WidgetTypeEnum.Selection:
-                    return SelectionTemplate;
-                case WidgetTypeEnum.Setpoint:
-                    return SetpointTemplate;
-                case WidgetTypeEnum.Chart:
-                    return ChartTemplate;
-                case WidgetTypeEnum.Video:
-                case WidgetTypeEnum.VideoMjpeg:
-                    return MjpegTemplate;
-                case WidgetTypeEnum.Mapview:
-                    return MapViewTemplate;
-                case WidgetTypeEnum.Webview:
-                    return WebViewTemplate;
-                default:
-                    return FrameTemplate;
-            }
-        }
+    /// <summary>
+    /// Gets or sets the template for a MJPEG video control.
+    /// </summary>
+    public DataTemplate MjpegTemplate
+    {
+        get; set;
+    }
 
-        /// <summary>
-        /// Gets or sets the template for a Frame control.
-        /// </summary>
-        public DataTemplate FrameTemplate { get; set; }
-
-        /// <summary>
-        /// Gets or sets the template for a Selection control.
-        /// </summary>
-        public DataTemplate SelectionTemplate { get; set; }
-
-        /// <summary>
-        /// Gets or sets the template for a MJPEG video control.
-        /// </summary>
-        public DataTemplate MjpegTemplate { get; set; }
-
-        /// <summary>
-        /// Gets or sets the template for a rollershutter control.
-        /// </summary>
-        public DataTemplate RollershutterTemplate { get; set; }
-
-        /// <summary>
-        /// Gets or sets the template for a Pagelink control.
-        /// </summary>
-        public DataTemplate PageLinkTemplate { get; set; }
-
-        /// <summary>
-        /// Gets or sets the template for a Switch control.
-        /// </summary>
-        public DataTemplate SwitchTemplate { get; set; }
-
-        /// <summary>
-        /// Gets or sets the template for a Slider control.
-        /// </summary>
-        public DataTemplate SliderTemplate { get; set; }
-
-        /// <summary>
-        /// Gets or sets the template for a Text control.
-        /// </summary>
-        public DataTemplate TextTemplate { get; set; }
-
-        /// <summary>
-        /// Gets or sets the template for a Image control.
-        /// </summary>
-        public DataTemplate ImageTemplate { get; set; }
-
-        /// <summary>
-        /// Gets or sets the template for a section switch control.
-        /// </summary>
-        public DataTemplate SectionSwitchTemplate { get; set; }
-
-        /// <summary>
-        /// Gets or sets the template for a color picker control.
-        /// </summary>
-        public DataTemplate ColorTemplate { get; set; }
-
-        /// <summary>
-        /// Gets or sets the template for a setpoint control.
-        /// </summary>
-        public DataTemplate SetpointTemplate { get; set; }
-
-        /// <summary>
-        /// Gets or sets the template for a chart control.
-        /// </summary>
-        public DataTemplate ChartTemplate { get; set; }
-
-        /// <summary>
-        /// Gets or sets the template for a map view control.
-        /// </summary>
-        public DataTemplate MapViewTemplate { get; set; }
-
-        /// <summary>
-        /// Gets or sets the template for a web view control.
-        /// </summary>
-        public DataTemplate WebViewTemplate { get; set; }
-
-        private WidgetTypeEnum GetItemViewType(OpenHABWidget openHABWidget)
+    /// <summary>
+    /// Gets or sets the template for a rollershutter control.
+    /// </summary>
+    public DataTemplate RollershutterTemplate
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets the template for a Pagelink control.
+    /// </summary>
+    public DataTemplate PageLinkTemplate
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets the template for a Switch control.
+    /// </summary>
+    public DataTemplate SwitchTemplate
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets the template for a Slider control.
+    /// </summary>
+    public DataTemplate SliderTemplate
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets the template for a Text control.
+    /// </summary>
+    public DataTemplate TextTemplate
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets the template for a Image control.
+    /// </summary>
+    public DataTemplate ImageTemplate
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets the template for a section switch control.
+    /// </summary>
+    public DataTemplate SectionSwitchTemplate
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets the template for a color picker control.
+    /// </summary>
+    public DataTemplate ColorTemplate
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets the template for a setpoint control.
+    /// </summary>
+    public DataTemplate SetpointTemplate
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets the template for a chart control.
+    /// </summary>
+    public DataTemplate ChartTemplate
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets the template for a map view control.
+    /// </summary>
+    public DataTemplate MapViewTemplate
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets the template for a web view control.
+    /// </summary>
+    public DataTemplate WebViewTemplate
+    {
+        get; set;
+    }
+
+    private WidgetTypeEnum GetItemViewType(WidgetViewModel widget)
+    {
+        if (widget.Type.Equals("Switch"))
         {
-            if (openHABWidget.Type.Equals("Switch"))
+            if (widget.Mappings != null && widget.Mappings.Any())
             {
-                if (openHABWidget.Mappings != null && openHABWidget.Mappings.Any())
-                {
-                    return WidgetTypeEnum.SectionSwitch;
-                }
+                return WidgetTypeEnum.SectionSwitch;
+            }
 
-                if (openHABWidget.Item != null)
+            if (widget.Item != null)
+            {
+                if (widget.Item.Type != null)
                 {
-                    if (openHABWidget.Item.Type != null)
+                    // RollerShutterItem changed to RollerShutter in later builds of OH2
+                    if ("RollershutterItem".Equals(widget.Item.Type) ||
+                        "Rollershutter".Equals(widget.Item.Type) ||
+                        "Rollershutter".Equals(widget.Item.GroupType))
                     {
-                        // RollerShutterItem changed to RollerShutter in later builds of OH2
-                        if ("RollershutterItem".Equals(openHABWidget.Item.Type) ||
-                            "Rollershutter".Equals(openHABWidget.Item.Type) ||
-                            "Rollershutter".Equals(openHABWidget.Item.GroupType))
-                        {
-                            return WidgetTypeEnum.RollerShutter;
-                        }
-
-                        return WidgetTypeEnum.Switch;
+                        return WidgetTypeEnum.RollerShutter;
                     }
 
                     return WidgetTypeEnum.Switch;
@@ -168,29 +211,31 @@ private WidgetTypeEnum GetItemViewType(OpenHABWidget openHABWidget)
                 return WidgetTypeEnum.Switch;
             }
 
-            if (openHABWidget.Type.Equals("Video"))
+            return WidgetTypeEnum.Switch;
+        }
+
+        if (widget.Type.Equals("Video"))
+        {
+            if (widget.Encoding != null)
             {
-                if (openHABWidget.Encoding != null)
+                if (widget.Encoding.Equals("mjpeg"))
                 {
-                    if (openHABWidget.Encoding.Equals("mjpeg"))
-                    {
-                        return WidgetTypeEnum.VideoMjpeg;
-                    }
-
-                    return WidgetTypeEnum.Video;
+                    return WidgetTypeEnum.VideoMjpeg;
                 }
 
                 return WidgetTypeEnum.Video;
             }
 
-            try
-            {
-                return Enum<WidgetTypeEnum>.Parse(openHABWidget.Type);
-            }
-            catch (System.Exception ex)
-            {
-                return WidgetTypeEnum.Generic;
-            }
+            return WidgetTypeEnum.Video;
+        }
+
+        try
+        {
+            return Enum<WidgetTypeEnum>.Parse(widget.Type);
+        }
+        catch (System.Exception)
+        {
+            return WidgetTypeEnum.Generic;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/openHAB.Windows/Converters/ZeroToVisibilityConverter.cs b/src/openHAB.Windows/Converters/ZeroToVisibilityConverter.cs
index 4023abc6..faf391f6 100644
--- a/src/openHAB.Windows/Converters/ZeroToVisibilityConverter.cs
+++ b/src/openHAB.Windows/Converters/ZeroToVisibilityConverter.cs
@@ -1,31 +1,30 @@
-using System;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Data;
+using System;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Data;
 
-namespace OpenHAB.Windows.Converters
+namespace openHAB.Windows.Converters;
+
+/// <summary>
+/// Converts zero to visibility type (0 = Visibility.Visible, else Visibility.Collapsed).
+/// </summary>
+/// <seealso cref="IValueConverter" />
+public class ZeroToVisibilityConverter : IValueConverter
 {
-    /// <summary>
-    /// Converts zero to visibility type (0 = Visibility.Visible, else Visibility.Collapsed).
-    /// </summary>
-    /// <seealso cref="IValueConverter" />
-    public class ZeroToVisibilityConverter : IValueConverter
+    /// <inheritdoc/>
+    public object Convert(object value, Type targetType, object parameter, string language)
     {
-        /// <inheritdoc/>
-        public object Convert(object value, Type targetType, object parameter, string language)
+        if (value == null)
         {
-            if (value == null)
-            {
-                return Visibility.Visible;
-            }
-
-            int numberOfElements = (int)value;
-            return numberOfElements == 0 ? Visibility.Visible : Visibility.Collapsed;
+            return Visibility.Visible;
         }
 
-        /// <inheritdoc/>
-        public object ConvertBack(object value, Type targetType, object parameter, string language)
-        {
-            throw new NotImplementedException();
-        }
+        int numberOfElements = (int)value;
+        return numberOfElements == 0 ? Visibility.Visible : Visibility.Collapsed;
+    }
+
+    /// <inheritdoc/>
+    public object ConvertBack(object value, Type targetType, object parameter, string language)
+    {
+        throw new NotImplementedException();
     }
 }
diff --git a/src/openHAB.Windows/DIService.cs b/src/openHAB.Windows/DIService.cs
deleted file mode 100644
index a335097a..00000000
--- a/src/openHAB.Windows/DIService.cs
+++ /dev/null
@@ -1,133 +0,0 @@
-using CommunityToolkit.Mvvm.Messaging;
-using Microsoft.Extensions.DependencyInjection;
-using Microsoft.Extensions.Logging;
-using NLog.Config;
-using NLog.Extensions.Logging;
-using NLog.Layouts;
-using NLog.Targets;
-using OpenHAB.Core.Common;
-using OpenHAB.Core.Contracts.Services;
-using OpenHAB.Core.Model;
-using OpenHAB.Core.SDK;
-using OpenHAB.Core.Services;
-using OpenHAB.Windows.ViewModel;
-using Windows.Storage;
-
-namespace OpenHAB.Windows.Services
-{
-    /// <summary>
-    /// Dependency Injection Service.
-    /// </summary>
-    public class DIService : IDependencyInjectionService
-    {
-        private static DIService _instance;
-        private readonly ServiceCollection _services;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="DIService"/> class.
-        /// </summary>
-        public DIService()
-        {
-            _services = new ServiceCollection();
-            RegisterServices();
-            RegisterViewModels();
-
-            Services = _services.BuildServiceProvider();
-        }
-
-        private void RegisterServices()
-        {
-            _services.AddLogging(loggingBuilder =>
-             {
-                 // configure Logging with NLog
-                 loggingBuilder.ClearProviders();
-                 loggingBuilder.SetMinimumLevel(LogLevel.Trace);
-                 loggingBuilder.AddNLog(GetLoggingConfiguration());
-             });
-
-            _services.AddSingleton<IMessenger>(StrongReferenceMessenger.Default);
-            _services.AddSingleton<IOpenHAB, OpenHABClient>();
-            _services.AddSingleton<ISettingsService, SettingsService>();
-            _services.AddTransient<Settings>(x =>
-            {
-                ISettingsService settingsService = x.GetService<ISettingsService>();
-                return settingsService.Load();
-            });
-
-            //_services.AddSingleton<INavigationService, NavigationService>();
-            _services.AddSingleton<OpenHABHttpClient>();
-            _services.AddSingleton<IIconCaching, IconCaching>();
-            _services.AddSingleton<IAppManager, AppManager>();
-            _services.AddSingleton<IItemManager, ItemManager>();
-            _services.AddSingleton<INotificationManager, NotificationManager>();
-            _services.AddSingleton<IOpenHABEventParser, OpenHABEventParser>();
-        }
-
-        private void RegisterViewModels()
-        {
-            _services.AddTransient<MainViewModel>();
-            _services.AddTransient<SettingsViewModel>();
-            _services.AddTransient<ConfigurationViewModel>();
-            _services.AddTransient<LogsViewModel>();
-        }
-
-        private LoggingConfiguration GetLoggingConfiguration()
-        {
-            CsvLayout layout = new CsvLayout()
-            {
-                Delimiter = CsvColumnDelimiterMode.Semicolon,
-            };
-
-            layout.Columns.Add(new CsvColumn("time", @"${date:format=HH\:mm\:ss}"));
-            layout.Columns.Add(new CsvColumn("level", "${level:upperCase=true}"));
-            layout.Columns.Add(new CsvColumn("callsite", "${callsite:includeSourcePath=false}"));
-            layout.Columns.Add(new CsvColumn("message", "${message}"));
-            layout.Columns.Add(new CsvColumn("exception", "${exception:format=ToString}"));
-            layout.Columns.Add(new CsvColumn("stacktrace", "${onexception:inner=${stacktrace:topFrames=10}}"));
-
-            FileTarget fileTarget = new FileTarget("file")
-            {
-                FileName = "${var:LogPath}/logs/${shortdate}.log",
-                Layout = layout,
-                MaxArchiveFiles = 3,
-                ArchiveEvery = FileArchivePeriod.Day,
-            };
-
-            LoggingConfiguration configuration = new LoggingConfiguration();
-            configuration.AddTarget(fileTarget);
-            configuration.AddRuleForAllLevels(fileTarget);
-
-            StorageFolder storageFolder = ApplicationData.Current.LocalFolder;
-            configuration.Variables["LogPath"] = storageFolder.Path;
-
-            return configuration;
-        }
-
-        /// <summary>
-        /// Gets the DIService instance.
-        /// </summary>
-        /// <value>The instance.</value>
-        public static DIService Instance
-        {
-            get
-            {
-                if (_instance == null)
-                {
-                    _instance = new DIService();
-                }
-
-                return _instance;
-            }
-        }
-
-        /// <summary>
-        /// Gets the services.
-        /// </summary>
-        /// <value>The services.</value>
-        public ServiceProvider Services
-        {
-            get;
-            private set;
-        }
-    }
-}
diff --git a/src/openHAB.Windows/Extensions/ContentDialogExtensions.cs b/src/openHAB.Windows/Extensions/ContentDialogExtensions.cs
index 27eb3891..9fb8033d 100644
--- a/src/openHAB.Windows/Extensions/ContentDialogExtensions.cs
+++ b/src/openHAB.Windows/Extensions/ContentDialogExtensions.cs
@@ -1,30 +1,29 @@
-using Windows.Foundation;
+using Microsoft.UI.Xaml.Controls;
+using Windows.Foundation;
 using Windows.Graphics.Display;
 using Windows.UI.ViewManagement;
-using Windows.UI.Xaml.Controls;
 
-namespace OpenHAB.Windows.Extensions
+namespace openHAB.Windows.Extensions;
+
+/// <summary>Extensions for ContentDialog control.</summary>
+public static class ContentDialogExtensions
 {
-    /// <summary>Extensions for ContentDialog control.</summary>
-    public static class ContentDialogExtensions
+    /// <summary>Adjusts the ContentDialog size.</summary>
+    /// <param name="dialog">The dialog.</param>
+    public static void AdjustSize(this ContentDialog dialog)
     {
-        /// <summary>Adjusts the ContentDialog size.</summary>
-        /// <param name="dialog">The dialog.</param>
-        public static void AdjustSize(this ContentDialog dialog)
-        {
-            var bounds = ApplicationView.GetForCurrentView().VisibleBounds;
-            var scaleFactor = DisplayInformation.GetForCurrentView().RawPixelsPerViewPixel;
-            var size = new Size(bounds.Width * scaleFactor, bounds.Height * scaleFactor);
+        var bounds = ApplicationView.GetForCurrentView().VisibleBounds;
+        var scaleFactor = DisplayInformation.GetForCurrentView().RawPixelsPerViewPixel;
+        var size = new Size(bounds.Width * scaleFactor, bounds.Height * scaleFactor);
 
-            if (size.Width > 1000.0)
-            {
-                dialog.MinWidth = 640;
-                dialog.MinHeight = 400;
-            }
-            else
-            {
-                dialog.MinWidth = dialog.MinHeight = 300;
-            }
+        if (size.Width > 1000.0)
+        {
+            dialog.MinWidth = 640;
+            dialog.MinHeight = 400;
+        }
+        else
+        {
+            dialog.MinWidth = dialog.MinHeight = 300;
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/openHAB.Windows/GlobalSuppressions.cs b/src/openHAB.Windows/GlobalSuppressions.cs
new file mode 100644
index 00000000..e106f936
--- /dev/null
+++ b/src/openHAB.Windows/GlobalSuppressions.cs
@@ -0,0 +1,8 @@
+// This file is used by Code Analysis to maintain SuppressMessage
+// attributes that are applied to this project.
+// Project-level suppressions either have no target or are given
+// a specific target and scoped to a namespace, type, member, etc.
+
+using System.Diagnostics.CodeAnalysis;
+
+[assembly: SuppressMessage("StyleCop.CSharp.NamingRules", "SA1300:Element should begin with upper-case letter", Justification = "Correct spelling of openHab", Scope = "namespaceanddescendants", Target = "~N:openHAB.Windows")]
diff --git a/src/openHAB.Windows/MainWindow.xaml b/src/openHAB.Windows/MainWindow.xaml
new file mode 100644
index 00000000..7b364eb5
--- /dev/null
+++ b/src/openHAB.Windows/MainWindow.xaml
@@ -0,0 +1,264 @@
+<Window x:Class="openHAB.Windows.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:converters="using:openHAB.Windows.Converters"
+        xmlns:core="using:Microsoft.Xaml.Interactions.Core"
+        xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
+        xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
+        xmlns:model="using:openHAB.Core.Client.Models"
+        xmlns:behaviors="using:CommunityToolkit.WinUI.Behaviors"
+        mc:Ignorable="d"
+        Title="openHab"
+        x:Name="Window">
+    <Window.SystemBackdrop>
+        <DesktopAcrylicBackdrop />
+    </Window.SystemBackdrop>
+    <Grid Name="Root">
+        <Grid.Resources>
+            <Style TargetType="GridViewItem">
+                <Setter Property="HorizontalContentAlignment"
+                        Value="Stretch" />
+                <Setter Property="VerticalContentAlignment"
+                        Value="Stretch" />
+            </Style>
+            <Style TargetType="muxc:NavigationViewItem">
+                <Setter Property="FontSize"
+                        Value="18" />
+            </Style>
+            <Style x:Key="SitemapHeader"
+                   TargetType="TextBlock">
+                <Setter Property="FontSize"
+                        Value="42" />
+            </Style>
+            <Style x:Key="BreakcrumbItemText"
+                   TargetType="TextBlock">
+                <Setter Property="FontSize"
+                        Value="21" />
+            </Style>
+            <!-- Navigation View Styling -->
+            <SolidColorBrush x:Key="NavigationViewItemForegroundPointerOver"
+                             Color="#FFFF5722" />
+            <SolidColorBrush x:Key="NavigationViewItemForegroundChecked"
+                             Color="#FFFF5722" />
+            <SolidColorBrush x:Key="NavigationViewItemForegroundCheckedPressed"
+                             Color="#FFFF5722" />
+            <SolidColorBrush x:Key="NavigationViewItemForegroundSelected"
+                             Color="#FFFF5722" />
+            <SolidColorBrush x:Key="NavigationViewItemForegroundSelectedPressed"
+                             Color="#FFFF5722" />
+            <SolidColorBrush x:Key="NavigationViewSelectionIndicatorForeground"
+                             Color="#FFFF5722" />
+            <!-- Converters -->
+            <converters:NullToVisibilityConverter x:Key="NullToVisibility" />
+            <converters:NullToBooleanConverter x:Key="NullToBooleanConverter" />
+            <converters:ObjectToSitemapConverter x:Key="ObjectToSitemapConverter" />
+            <converters:ZeroToVisibilityConverter x:Key="ZeroToVisibility" />
+            <converters:BooleanToVisibilityConverter x:Key="BoolToVisibilityConverter" />
+            <converters:MenuItemTemplateSelector x:Key="Selector">
+                <converters:MenuItemTemplateSelector.DefaultItemTemlate>
+                    <DataTemplate x:DataType="muxc:NavigationViewItem">
+                        <muxc:NavigationViewItem Margin="-15,0,0,0"
+                                                 Content="{Binding}" />
+                    </DataTemplate>
+                </converters:MenuItemTemplateSelector.DefaultItemTemlate>
+                <converters:MenuItemTemplateSelector.SiteMapMenuItemTemplate>
+                    <DataTemplate x:DataType="model:Sitemap">
+                        <muxc:NavigationViewItem Content="{Binding Label, Mode=OneWay}">
+                            <muxc:NavigationViewItem.Icon>
+                                <muxc:ImageIcon Source="ms-appx:///Assets/openhab.png"
+                                                Width="48"
+                                                Height="48" />
+                            </muxc:NavigationViewItem.Icon>
+                            <interactivity:Interaction.Behaviors>
+                                <core:EventTriggerBehavior EventName="Tapped">
+                                    <core:NavigateToPageAction TargetPage="openHAB.Windows.View.SettingsPage" />
+                                </core:EventTriggerBehavior>
+                            </interactivity:Interaction.Behaviors>
+                        </muxc:NavigationViewItem>
+                    </DataTemplate>
+                </converters:MenuItemTemplateSelector.SiteMapMenuItemTemplate>
+            </converters:MenuItemTemplateSelector>
+        </Grid.Resources>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+        <Grid x:Name="AppTitleBar"
+              Grid.Row="0"
+              Height="48">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition x:Name="LeftPaddingColumn"
+                                  Width="0" />
+                <ColumnDefinition x:Name="IconColumn"
+                                  Width="Auto" />
+                <ColumnDefinition x:Name="TitleColumn"
+                                  Width="Auto" />
+                <ColumnDefinition x:Name="LeftDragColumn"
+                                  Width="*" />
+                <ColumnDefinition x:Name="SearchColumn"
+                                  Width="4*"
+                                  MinWidth="220" />
+                <ColumnDefinition x:Name="RightDragColumn"
+                                  Width="*"
+                                  MinWidth="48" />
+                <ColumnDefinition x:Name="AccountColumn"
+                                  Width="Auto" />
+                <ColumnDefinition x:Name="RightPaddingColumn"
+                                  Width="0" />
+            </Grid.ColumnDefinitions>
+            <Image x:Name="TitleBarIcon"
+                   Source="ms-appx:///Assets/openhab.png"
+                   Grid.Column="1"
+                   Width="16"
+                   Height="16"
+                   Margin="8,0,4,0" />
+            <TextBlock x:Name="TitleBarTextBlock"
+                       Text="App title"
+                       Style="{StaticResource CaptionTextBlockStyle}"
+                       Grid.Column="2"
+                       VerticalAlignment="Center" />
+            <!--<AutoSuggestBox x:Name="TitleBarSearchBox"
+                            Grid.Column="4"
+                            QueryIcon="Find"
+                            PlaceholderText="Search"
+                            VerticalAlignment="Center"
+                            MaxWidth="600" />-->
+        </Grid>
+        <muxc:NavigationView x:Name="SitemapNavigation"
+                             Grid.Row="1"
+                             Grid.RowSpan="2"
+                             MenuItemsSource="{x:Bind Vm.Sitemaps, Mode=OneWay}"
+                             MenuItemTemplateSelector="{StaticResource Selector}"
+                             SelectedItem="{x:Bind Vm.SelectedMenuItem, Mode=TwoWay}"
+                             IsBackButtonVisible="Collapsed"
+                             AlwaysShowHeader="False"
+                             IsSettingsVisible="True"
+                             OpenPaneLength="250"
+                             CompactPaneLength="55"
+                             PaneDisplayMode="Left"
+                             IsPaneOpen="True"
+                             SelectionChanged="SitemapNavigation_SelectionChanged">
+            <muxc:NavigationView.Header>
+                <Grid Visibility="{Binding SelectedSitemap, Converter={StaticResource NullToVisibility}}">
+                    <Grid.RowDefinitions>
+                        <RowDefinition />
+                        <RowDefinition />
+                    </Grid.RowDefinitions>
+                    <StackPanel Grid.Row="0"
+                                Orientation="Horizontal">
+                        <TextBlock Style="{StaticResource SitemapHeader}"
+                                   VerticalAlignment="Center"
+                                   Text="{Binding Path=SelectedSitemap.Label, Mode=OneWay}"
+                                   Tapped="SitemapTextBlock_Tapped" />
+                        <Button Margin="10,10,0,0"
+                                MaxHeight="35"
+                                MaxWidth="35"
+                                VerticalAlignment="Center">
+                            <FontIcon Glyph="&#xE72C;"
+                                      FontSize="12" />
+                        </Button>
+                    </StackPanel>
+                    <BreadcrumbBar Grid.Row="1"
+                                   Margin="0,0,0,10"
+                                   ItemsSource="{Binding BreadcrumbItems, Mode=TwoWay}"
+                                   ItemClicked="BreadcrumbBar_ItemClicked">
+                        <BreadcrumbBar.ItemTemplate>
+                            <DataTemplate x:DataType="model:Widget">
+                                <BreadcrumbBarItem Content="{Binding }">
+                                    <BreadcrumbBarItem.ContentTemplate>
+                                        <DataTemplate>
+                                            <TextBlock Style="{StaticResource BreakcrumbItemText}"
+                                                       Text="{Binding Label}" />
+                                        </DataTemplate>
+                                    </BreadcrumbBarItem.ContentTemplate>
+                                </BreadcrumbBarItem>
+                            </DataTemplate>
+                        </BreadcrumbBar.ItemTemplate>
+                    </BreadcrumbBar>
+                </Grid>
+            </muxc:NavigationView.Header>
+            <muxc:NavigationView.PaneCustomContent>
+                <StackPanel Orientation="Vertical"
+                            Visibility="{Binding IsPaneOpen, ElementName=SitemapNavigation}">
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="70*" />
+                            <ColumnDefinition Width="30*" />
+                        </Grid.ColumnDefinitions>
+                        <TextBlock x:Name="textBlock"
+                                   Grid.Column="0"
+                                   Margin="10,-3,0,0"
+                                   VerticalAlignment="Center"
+                                   Style="{StaticResource MenuSubHeader}"
+                                   Text="Sitemaps" />
+                        <Button Grid.Column="1"
+                                Margin="0,0,10,0"
+                                HorizontalAlignment="Right"
+                                Command="{Binding Vm.RefreshCommand, ElementName=Window}">
+                            <FontIcon Glyph="&#xE72C;"
+                                      FontSize="12" />
+                        </Button>
+                    </Grid>
+                    <TextBlock Margin="10,10,10,0"
+                               x:Uid="NoItemsOrOpenHabNotAvailable"
+                               Visibility="{Binding DataContext.Sitemaps.Count, Converter={StaticResource ZeroToVisibility}, Mode=OneWay, ElementName=ContentFrame}"
+                               TextWrapping="Wrap"
+                               Style="{StaticResource FlyoutPickerTitleTextBlockStyle}" />
+                </StackPanel>
+            </muxc:NavigationView.PaneCustomContent>
+            <muxc:NavigationView.FooterMenuItems>
+                <muxc:NavigationViewItem Icon="Home"
+                                         x:Uid="MenuItemMainUI"
+                                         Tag="openHAB.Windows.View.MainUIPage"
+                                         Tapped="NavigationViewItemMainUI_Tapped" />
+            </muxc:NavigationView.FooterMenuItems>
+            <Grid>
+                <Grid.RowDefinitions>
+                    <RowDefinition Height="auto" />
+                    <RowDefinition Height="*" />
+                </Grid.RowDefinitions>
+                <muxc:InfoBar x:Name="Notification"
+                              Grid.Row="0"
+                              Margin="15"
+                              IsIconVisible="True"
+                              IsClosable="True"
+                              HorizontalAlignment="Center"
+                              VerticalAlignment="Center">
+                    <interactivity:Interaction.Behaviors>
+                        <behaviors:StackedNotificationsBehavior x:Name="NotificationQueue" />
+                    </interactivity:Interaction.Behaviors>
+                </muxc:InfoBar>
+                <Frame Grid.Row="1" x:Name="ContentFrame" Navigated="ContentFrame_Navigated" />
+            </Grid>
+        </muxc:NavigationView>
+        <Border x:Name="LoadingControl"
+                MaxHeight="150"
+                MaxWidth="150"
+                Grid.Row="1"
+                Padding="25"
+                BorderThickness="2"
+                CornerRadius="10"
+                BorderBrush="{StaticResource SolidBackgroundFillColorBaseBrush}"
+                Background="{StaticResource SolidBackgroundFillColorBaseAltBrush}"
+                Visibility="{Binding IsDataLoading, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">
+            <StackPanel Orientation="Vertical"
+                        HorizontalAlignment="Center"
+                        VerticalAlignment="Center">
+                <ProgressRing IsIndeterminate="True"
+                              IsActive="{x:Bind Vm.IsDataLoading, Mode=TwoWay}"
+                              Margin="20"
+                              HorizontalContentAlignment="Stretch"
+                              VerticalContentAlignment="Stretch">
+                    <!--<ProgressRing.Background>
+                        <SolidColorBrush Color="Black"
+                                         Opacity="0.7" />
+                    </ProgressRing.Background>-->
+                </ProgressRing>
+                <TextBlock x:Uid="Loading" />
+            </StackPanel>
+        </Border>
+    </Grid>
+</Window>
diff --git a/src/openHAB.Windows/MainWindow.xaml.cs b/src/openHAB.Windows/MainWindow.xaml.cs
new file mode 100644
index 00000000..ed55e528
--- /dev/null
+++ b/src/openHAB.Windows/MainWindow.xaml.cs
@@ -0,0 +1,193 @@
+using System;
+using System.Threading.Tasks;
+using CommunityToolkit.Mvvm.Messaging;
+using CommunityToolkit.WinUI.Behaviors;
+using Microsoft.Extensions.Logging;
+using Microsoft.UI;
+using Microsoft.UI.Input;
+using Microsoft.UI.Windowing;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using openHAB.Core.Client.Models;
+using openHAB.Core.Messages;
+using openHAB.Windows.Messages;
+using openHAB.Windows.View;
+using openHAB.Windows.ViewModel;
+using Windows.ApplicationModel;
+using Windows.Foundation;
+using Windows.Graphics;
+
+namespace openHAB.Windows;
+
+/// <summary>
+/// An empty window that can be used on its own or navigated to within a Frame.
+/// </summary>
+public sealed partial class MainWindow : Window
+{
+    private readonly ILogger<MainPage> _logger;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="MainWindow"/> class.
+    /// </summary>
+    public MainWindow(MainViewModel mainViewModel, ILogger<MainPage> logger)
+    {
+        _logger = logger;
+
+        StrongReferenceMessenger.Default.Register<TriggerInfoMessage>(this, async (recipient, msg)
+           => await ShowInfoMessage(recipient, msg));
+
+
+
+        this.InitializeComponent();
+
+        this.ExtendsContentIntoTitleBar = true;
+        this.AppWindow.TitleBar.PreferredHeightOption = TitleBarHeightOption.Tall;
+        this.AppWindow.TitleBar.ButtonForegroundColor = Colors.Black;
+        AppTitleBar.Loaded += AppTitleBar_Loaded;
+        AppTitleBar.SizeChanged += AppTitleBar_SizeChanged;
+        TitleBarTextBlock.Text = AppInfo.Current.DisplayInfo.DisplayName;
+
+        Vm = mainViewModel;
+        Root.DataContext = Vm;
+
+        _ = Vm.LoadSitemapsAndItemData();
+    }
+
+    /// <summary>
+    /// Gets the root frame.
+    /// </summary>
+    /// <value>
+    /// The root frame.
+    /// </value>
+    public Frame RootFrame => ContentFrame;
+
+    /// <summary>
+    /// Gets the data context, for use in compiled bindings.
+    /// </summary>
+    public MainViewModel Vm
+    {
+        get;
+        private set;
+    }
+
+    private void BreadcrumbBar_ItemClicked(BreadcrumbBar sender, BreadcrumbBarItemClickedEventArgs args)
+    {
+        WidgetViewModel widget = args.Item as WidgetViewModel;
+        if (widget == null)
+        {
+            _logger.LogWarning("Breadcrumb item is not a widget.");
+            return;
+        }
+
+        StrongReferenceMessenger.Default.Send(new WidgetNavigationMessage(null, widget, EventTriggerSource.Breadcrumb), Vm.SelectedSitemap.Name);
+    }
+
+    private void NavigationViewItemMainUI_Tapped(object sender, Microsoft.UI.Xaml.Input.TappedRoutedEventArgs e)
+    {
+        SitemapNavigation.IsPaneOpen = false;
+
+        Vm.SelectedSitemap = null;
+        SitemapNavigation.AlwaysShowHeader = false;
+
+        ContentFrame.Navigate(typeof(MainUIPage));
+    }
+
+    private void SitemapNavigation_SelectionChanged(
+            NavigationView sender,
+            NavigationViewSelectionChangedEventArgs args)
+    {
+
+        NavigationViewItem item = args.SelectedItem as NavigationViewItem;
+        if (args.IsSettingsSelected)
+        {
+            sender.AlwaysShowHeader = false;
+            ContentFrame.Navigate(typeof(SettingsPage));
+        }
+        else if (args.SelectedItem is Sitemap)
+        {
+            sender.AlwaysShowHeader = true;
+            Sitemap sitemap = args.SelectedItem as Sitemap;
+            if (sitemap != null)
+            {
+                ContentFrame.Navigate(typeof(SitemapPage), sitemap.Link);
+            }
+        }
+    }
+
+    private void SitemapTextBlock_Tapped(object sender, Microsoft.UI.Xaml.Input.TappedRoutedEventArgs e)
+    {
+        StrongReferenceMessenger.Default.Send(new WidgetNavigationMessage(null, null, EventTriggerSource.Root), Vm.SelectedSitemap.Name);
+    }
+
+    private async Task ShowInfoMessage(object recipient, TriggerInfoMessage msg)
+    {
+        Vm.Notifications.Add(msg);
+
+        Notification notification = new Notification()
+        {
+            Title = $"Notification {DateTimeOffset.Now}",
+            Message = msg.Message,
+            Severity = (InfoBarSeverity)msg.Severity,
+        };
+
+        NotificationQueue.Show(notification);
+    }
+
+    #region App TitleBar
+
+    private void AppTitleBar_Loaded(object sender, RoutedEventArgs e)
+    {
+        SetRegionsForCustomTitleBar();
+    }
+
+    private void AppTitleBar_SizeChanged(object sender, SizeChangedEventArgs e)
+    {
+        SetRegionsForCustomTitleBar();
+    }
+    private RectInt32 GetRect(Rect bounds, double scale)
+    {
+        return new RectInt32(
+            _X: (int)Math.Round(bounds.X * scale),
+            _Y: (int)Math.Round(bounds.Y * scale),
+            _Width: (int)Math.Round(bounds.Width * scale),
+            _Height: (int)Math.Round(bounds.Height * scale)
+        );
+    }
+
+    private void SetRegionsForCustomTitleBar()
+    {
+        // Specify the interactive regions of the title bar.
+
+        double scaleAdjustment = AppTitleBar.XamlRoot.RasterizationScale;
+
+        RightPaddingColumn.Width = new GridLength(this.AppWindow.TitleBar.RightInset / scaleAdjustment);
+        LeftPaddingColumn.Width = new GridLength(this.AppWindow.TitleBar.LeftInset / scaleAdjustment);
+
+        //GeneralTransform transform = TitleBarSearchBox.TransformToVisual(null);
+        //Rect bounds = transform.TransformBounds(new Rect(0, 0,
+        //                                                 TitleBarSearchBox.ActualWidth,
+        //                                                 TitleBarSearchBox.ActualHeight));
+        //RectInt32 SearchBoxRect = GetRect(bounds, scaleAdjustment);
+
+        //transform = PersonPic.TransformToVisual(null);
+        //bounds = transform.TransformBounds(new Rect(0, 0,
+        //                                            PersonPic.ActualWidth,
+        //                                            PersonPic.ActualHeight));
+        //RectInt32 PersonPicRect = GetRect(bounds, scaleAdjustment);
+
+        var rectArray = new RectInt32[] { /*SearchBoxRect,/*, PersonPicRect*/ };
+
+        InputNonClientPointerSource nonClientInputSrc =
+            InputNonClientPointerSource.GetForWindowId(this.AppWindow.Id);
+        nonClientInputSrc.SetRegionRects(NonClientRegionKind.Passthrough, rectArray);
+    }
+    #endregion
+
+    private void ContentFrame_Navigated(object sender, Microsoft.UI.Xaml.Navigation.NavigationEventArgs e)
+    {
+        if (e.Content is LogViewerPage)
+        {
+            SitemapNavigation.SelectedItem = null;
+        }
+    }
+}
diff --git a/src/openHAB.Windows/Messages/WidgetClickedMessage.cs b/src/openHAB.Windows/Messages/WidgetClickedMessage.cs
new file mode 100644
index 00000000..0d13c973
--- /dev/null
+++ b/src/openHAB.Windows/Messages/WidgetClickedMessage.cs
@@ -0,0 +1,26 @@
+using openHAB.Windows.ViewModel;
+
+namespace openHAB.Windows.Messages;
+
+/// <summary>
+/// A message that fires whenever a widget is clicked on a sitemap.
+/// </summary>
+public class WidgetClickedMessage
+{
+    /// <summary>
+    /// Gets or sets the Widget property.
+    /// </summary>
+    public WidgetViewModel Widget
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="WidgetClickedMessage"/> class.
+    /// </summary>
+    /// <param name="widget">The widget that was clicked.</param>
+    public WidgetClickedMessage(WidgetViewModel widget)
+    {
+        Widget = widget;
+    }
+}
diff --git a/src/openHAB.Windows/Messages/WidgetNavigationMessage.cs b/src/openHAB.Windows/Messages/WidgetNavigationMessage.cs
new file mode 100644
index 00000000..954eb21a
--- /dev/null
+++ b/src/openHAB.Windows/Messages/WidgetNavigationMessage.cs
@@ -0,0 +1,46 @@
+using openHAB.Core.Messages;
+using openHAB.Windows.ViewModel;
+
+namespace openHAB.Windows.Messages;
+
+/// <summary>
+/// Represents a navigation between two OpenHAB widgets.
+/// </summary>
+public class WidgetNavigationMessage
+{
+    /// <summary>
+    /// Initializes a new instance of the <see cref="WidgetNavigationMessage"/> class.
+    /// </summary>
+    /// <param name="originWidget">The origin widget.</param>
+    /// <param name="targetWidget">The target widget.</param>
+    public WidgetNavigationMessage(WidgetViewModel originWidget, WidgetViewModel targetWidget, EventTriggerSource trigger)
+    {
+        OriginWidget = originWidget;
+        TargetWidget = targetWidget;
+        Trigger = trigger;
+    }
+
+    /// <summary>
+    /// Gets or sets the trigger source.
+    /// </summary>
+    public EventTriggerSource Trigger
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets the origin widget.
+    /// </summary>
+    public WidgetViewModel OriginWidget
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Gets or sets the target widget.
+    /// </summary>
+    public WidgetViewModel TargetWidget
+    {
+        get; set;
+    }
+}
diff --git a/src/openHAB.Windows/OpenHAB.Windows_StoreKey.pfx b/src/openHAB.Windows/OpenHAB.Windows_StoreKey.pfx
deleted file mode 100644
index c40fa1ae..00000000
Binary files a/src/openHAB.Windows/OpenHAB.Windows_StoreKey.pfx and /dev/null differ
diff --git a/src/openHAB.Windows/Package.appxmanifest b/src/openHAB.Windows/Package.appxmanifest
deleted file mode 100644
index 815d30f2..00000000
--- a/src/openHAB.Windows/Package.appxmanifest
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:uap5="http://schemas.microsoft.com/appx/manifest/uap/windows10/5"  IgnorableNamespaces="uap mp">
-	<Identity Name="openHABFoundatione.V.openHAB" Publisher="CN=8A77D062-E996-4F32-9CC6-50568ABAFF8F" Version="2020.11.5.0" />
-	<mp:PhoneIdentity PhoneProductId="84eff8f6-3c88-41b7-b1cc-1e3357b8e776" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
-	<Properties>
-		<DisplayName>openHAB</DisplayName>
-		<PublisherDisplayName>openHAB Foundation e.V.</PublisherDisplayName>
-		<Logo>Assets\NewStoreLogo.png</Logo>
-	</Properties>
-	<Dependencies>
-		<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
-	</Dependencies>
-	<Resources>
-		<Resource Language="x-generate" />
-	</Resources>
-	<Applications>
-		<Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="OpenHAB.Windows.App">
-			<uap:VisualElements DisplayName="openHAB" Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" Description="OpenHAB.Windows" BackgroundColor="transparent">
-				<uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png" Square310x310Logo="Assets\Square310x310Logo.png" Square71x71Logo="Assets\Square71x71Logo.png" ShortName="openHAB">
-					<uap:ShowNameOnTiles>
-						<uap:ShowOn Tile="square150x150Logo" />
-						<uap:ShowOn Tile="wide310x150Logo" />
-						<uap:ShowOn Tile="square310x310Logo" />
-					</uap:ShowNameOnTiles>
-				</uap:DefaultTile>
-				<uap:SplashScreen Image="Assets\SplashScreen.png" BackgroundColor="#FFFFFF" />
-			</uap:VisualElements>
-			<Extensions>
-				<uap5:Extension Category="windows.startupTask">
-					<uap5:StartupTask TaskId="openHABStartupId" Enabled="false" DisplayName="openHAB" />
-				</uap5:Extension>
-			</Extensions>
-		</Application>
-	</Applications>
-	<Capabilities>
-		<Capability Name="internetClient" />
-		<Capability Name="privateNetworkClientServer" />
-	</Capabilities>
-</Package>
\ No newline at end of file
diff --git a/src/openHAB.Windows/Program.cs b/src/openHAB.Windows/Program.cs
new file mode 100644
index 00000000..ab893ecd
--- /dev/null
+++ b/src/openHAB.Windows/Program.cs
@@ -0,0 +1,63 @@
+using System;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+using System.Threading;
+using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using Microsoft.UI.Dispatching;
+using Microsoft.UI.Xaml;
+using openHAB.Core;
+
+namespace openHAB.Windows;
+
+#if DISABLE_XAML_GENERATED_MAIN
+public static partial class Program
+{
+    public static IHost Host
+    {
+        get; set;
+    }
+
+    /// <summary>
+    /// Ensures that the process can run XAML, and provides a deterministic
+    /// error if a check fails. Otherwise, it quietly does nothing.
+    /// </summary>
+    [LibraryImport("Microsoft.ui.xaml.dll")]
+    private static partial void XamlCheckProcessRequirements();
+
+    [STAThread]
+    private static void Main(string[] args)
+    {
+        HostApplicationBuilder builder = new HostApplicationBuilder(args);
+        builder.Configuration.AddJsonFile(AppPaths.SettingsFilePath, optional: true, reloadOnChange: true);
+        builder.Configuration.AddJsonFile(AppPaths.ConnectionFilePath, optional: true, reloadOnChange: true);
+
+        builder.Services.AddConfiguration(builder.Configuration);
+        builder.Services.AddOpenHABServices();
+        builder.Services.AddOpenHABViewModels();
+        builder.Services.AddViews();
+
+        Host = builder.Build();
+
+        // Taken from the default generated XAML entry point
+        XamlCheckProcessRequirements();
+        WinRT.ComWrappersSupport.InitializeComWrappers();
+        Application.Start(_ =>
+        {
+            try
+            {
+                DispatcherQueueSynchronizationContext? context = new DispatcherQueueSynchronizationContext(DispatcherQueue.GetForCurrentThread());
+                SynchronizationContext.SetSynchronizationContext(context);
+
+                App? app = Host.Services.GetRequiredService<App>();
+            }
+            catch (Exception ex)
+            {
+                Debug.WriteLine($"Error in application start callback: {ex.Message}.");
+            }
+        });
+    }
+}
+
+#endif
diff --git a/src/openHAB.Windows/Properties/AssemblyInfo.cs b/src/openHAB.Windows/Properties/AssemblyInfo.cs
deleted file mode 100644
index 2dd8bd5b..00000000
--- a/src/openHAB.Windows/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("OpenHAB.Windows")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("OpenHAB.Windows")]
-[assembly: AssemblyCopyright("Copyright ©  2016")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
-[assembly: ComVisible(false)]
\ No newline at end of file
diff --git a/src/openHAB.Windows/Properties/Default.rd.xml b/src/openHAB.Windows/Properties/Default.rd.xml
deleted file mode 100644
index 80a960ce..00000000
--- a/src/openHAB.Windows/Properties/Default.rd.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<!--
-    This file contains Runtime Directives used by .NET Native. The defaults here are suitable for most
-    developers. However, you can modify these parameters to modify the behavior of the .NET Native
-    optimizer.
-
-    Runtime Directives are documented at http://go.microsoft.com/fwlink/?LinkID=391919
-
-    To fully enable reflection for App1.MyClass and all of its public/private members
-    <Type Name="App1.MyClass" Dynamic="Required All"/>
-
-    To enable dynamic creation of the specific instantiation of AppClass<T> over System.Int32
-    <TypeInstantiation Name="App1.AppClass" Arguments="System.Int32" Activate="Required Public" />
-
-    Using the Namespace directive to apply reflection policy to all the types in a particular namespace
-    <Namespace Name="DataClasses.ViewModels" Seralize="All" />
--->
-
-<Directives xmlns="http://schemas.microsoft.com/netfx/2013/01/metadata">
-  <Application>
-    <!--
-      An Assembly element with Name="*Application*" applies to all assemblies in
-      the application package. The asterisks are not wildcards.
-    -->
-    <Assembly Name="*Application*" Dynamic="Required All" />
-    
-    
-    <!-- Add your application specific runtime directives here. -->
-
-
-  </Application>
-</Directives>
\ No newline at end of file
diff --git a/src/openHAB.Windows/Properties/PublishProfiles/win-arm64.pubxml b/src/openHAB.Windows/Properties/PublishProfiles/win-arm64.pubxml
new file mode 100644
index 00000000..cb55a013
--- /dev/null
+++ b/src/openHAB.Windows/Properties/PublishProfiles/win-arm64.pubxml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<PropertyGroup>
+		<PublishProtocol>FileSystem</PublishProtocol>
+		<Platform>arm64</Platform>
+		<RuntimeIdentifier>win-arm64</RuntimeIdentifier>
+		<PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
+		<SelfContained>true</SelfContained>
+		<PublishSingleFile>False</PublishSingleFile>
+	</PropertyGroup>
+</Project>
diff --git a/src/openHAB.Windows/Properties/PublishProfiles/win-x64.pubxml b/src/openHAB.Windows/Properties/PublishProfiles/win-x64.pubxml
new file mode 100644
index 00000000..9ccb4177
--- /dev/null
+++ b/src/openHAB.Windows/Properties/PublishProfiles/win-x64.pubxml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<PropertyGroup>
+		<PublishProtocol>FileSystem</PublishProtocol>
+		<Platform>x64</Platform>
+		<RuntimeIdentifier>win-x64</RuntimeIdentifier>
+		<PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
+		<SelfContained>true</SelfContained>
+		<PublishSingleFile>False</PublishSingleFile>
+	</PropertyGroup>
+</Project>
diff --git a/src/openHAB.Windows/Properties/PublishProfiles/win-x86.pubxml b/src/openHAB.Windows/Properties/PublishProfiles/win-x86.pubxml
new file mode 100644
index 00000000..b288ccbd
--- /dev/null
+++ b/src/openHAB.Windows/Properties/PublishProfiles/win-x86.pubxml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+	<PropertyGroup>
+		<PublishProtocol>FileSystem</PublishProtocol>
+		<Platform>x86</Platform>
+		<RuntimeIdentifier>win-x86</RuntimeIdentifier>
+		<PublishDir>bin\$(Configuration)\$(TargetFramework)\$(RuntimeIdentifier)\publish\</PublishDir>
+		<SelfContained>true</SelfContained>
+		<PublishSingleFile>False</PublishSingleFile>
+	</PropertyGroup>
+</Project>
diff --git a/src/openHAB.Windows/Properties/launchSettings.json b/src/openHAB.Windows/Properties/launchSettings.json
new file mode 100644
index 00000000..b7cd65a1
--- /dev/null
+++ b/src/openHAB.Windows/Properties/launchSettings.json
@@ -0,0 +1,11 @@
+{
+  "profiles": {
+    "openHAB.Windows (Package)": {
+      "commandName": "MsixPackage",
+      "nativeDebugging": false
+    },
+    "openHAB.Windows (Unpackaged)": {
+      "commandName": "Project"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/openHAB.Windows/Services/WidgetNavigationService.cs b/src/openHAB.Windows/Services/WidgetNavigationService.cs
new file mode 100644
index 00000000..87d9c1eb
--- /dev/null
+++ b/src/openHAB.Windows/Services/WidgetNavigationService.cs
@@ -0,0 +1,81 @@
+using System.Collections.Generic;
+using System.Linq;
+using openHAB.Windows.ViewModel;
+
+namespace openHAB.Windows.Services;
+
+/// <summary>
+/// Service that keeps track of navigation between linked pages.
+/// </summary>
+public static class WidgetNavigationService
+{
+    private static readonly Stack<WidgetViewModel> WidgetBackStack = new Stack<WidgetViewModel>();
+    private static WidgetViewModel _currentWidget;
+
+    /// <summary>
+    /// Gets a value indicating whether there is a previous widget on the backstack.
+    /// </summary>
+    public static bool CanGoBack => _currentWidget != null;
+
+    /// <summary>
+    /// Navigates the backstack to the passed in target.
+    /// </summary>
+    /// <param name="target">The openHAB widget to navigate to.</param>
+    public static void Navigate(WidgetViewModel target)
+    {
+        if (target == _currentWidget)
+        {
+            return;
+        }
+
+        WidgetBackStack.Push(target);
+        _currentWidget = target;
+    }
+
+    /// <summary>
+    /// Go back to the previous openHAB widget.
+    /// </summary>
+    /// <returns>The previous visited widget.</returns>
+    public static WidgetViewModel GoBack()
+    {
+        if (WidgetBackStack.Count == 0)
+        {
+            return null;
+        }
+
+        WidgetBackStack.Pop();
+        _currentWidget = WidgetBackStack.Count == 0 ? null : WidgetBackStack.Peek();
+
+        return _currentWidget;
+    }
+
+    /// <summary>
+    /// Go back to the previous openHAB widget.
+    /// </summary>
+    /// <returns>The previous visited widget.</returns>
+    public static WidgetViewModel GoBackToRoot()
+    {
+        WidgetViewModel widget = GoBack();
+        while (widget != null && widget.Parent != null)
+        {
+            widget = GoBack();
+        }
+
+        _currentWidget = WidgetBackStack.Count == 0 ? null : WidgetBackStack.Peek();
+
+        return _currentWidget;
+    }
+
+    /// <summary>
+    /// Clears and resets the widget navigation.
+    /// </summary>
+    public static void ClearWidgetNavigation()
+    {
+        _currentWidget = null;
+        WidgetBackStack.Clear();
+    }
+
+    /// <summary>Gets the navigated widgets.</summary>
+    /// <value>The widgets.</value>
+    public static List<WidgetViewModel> Widgets => WidgetBackStack.Reverse().ToList();
+}
diff --git a/src/openHAB.Windows/Styles/DefaultTheme.xaml b/src/openHAB.Windows/Styles/DefaultTheme.xaml
index 8aeb8fb7..6d2bf010 100644
--- a/src/openHAB.Windows/Styles/DefaultTheme.xaml
+++ b/src/openHAB.Windows/Styles/DefaultTheme.xaml
@@ -1,208 +1,65 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:media="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-
     <!-- Base colors -->
     <Color x:Key="OpenHABLightOrange">#FFFF5722</Color>
     <Color x:Key="OpenHABLightGrey">#EEEEEE</Color>
     <Color x:Key="DarkColor">#344040</Color>
-
     <!-- Control base colors -->
-    
-
-    <SolidColorBrush x:Key="OpenHABLightGreyBrush"
-                     Color="{StaticResource OpenHABLightGrey}" />
-    
     <SolidColorBrush x:Key="OpenHABLightOrangeBrush"
                      Color="{StaticResource OpenHABLightOrange}" />
-
-    <SolidColorBrush x:Key="OpenHABMenuColor"
-                     Color="White" />
-
-    <!-- Acryl colors -->
-
-    <media:AcrylicBrush x:Key="DarkAcrylicColor"
-                        BackgroundSource="Backdrop"
-                        TintOpacity="0.7"
-                        FallbackColor="{StaticResource DarkColor}"
-                        TintColor="{StaticResource DarkColor}" />
-
-    <media:AcrylicBrush x:Key="OpenHABLightColor"
-                        BackgroundSource="Backdrop"
-                        TintOpacity="0.5"
-                        FallbackColor="{StaticResource OpenHABLightGrey}"
-                        TintColor="{StaticResource OpenHABLightGrey}"
-                        AlwaysUseFallback="False" />
-
+    <SolidColorBrush x:Key="DefaultTextColor"
+                     Color="{ThemeResource TextFillColorPrimaryBrush}" />
     <media:AcrylicBrush x:Key="ErrorNotificationBackground"
-                        BackgroundSource="Backdrop"
                         TintOpacity="0.5"
                         FallbackColor="Red"
                         TintColor="Red"
                         AlwaysUseFallback="False" />
-
     <media:AcrylicBrush x:Key="NotificationBackground"
-                        BackgroundSource="Backdrop"
                         TintOpacity="0.5"
                         FallbackColor="Silver"
                         TintColor="Silver"
                         AlwaysUseFallback="False" />
-
-    <Style x:Key="HeaderText"
+    <Style x:Key="OpenHABGroupHeader"
+           BasedOn="{StaticResource SubtitleTextBlockStyle}"
            TargetType="TextBlock">
         <Setter Property="Foreground"
-                Value="{StaticResource OpenHABMenuColor}" />
+                Value="{StaticResource OpenHABLightOrangeBrush}" />
+    </Style>
+    <Style x:Key="HeaderText"
+           TargetType="TextBlock">
         <Setter Property="FontSize"
                 Value="24" />
     </Style>
-
-	<Style x:Key="MenuSubHeader"
-		   TargetType="TextBlock">
-		<Setter Property="Foreground"
-				Value="{StaticResource OpenHABMenuColor}" />
-		<Setter Property="FontSize"
-				Value="21" />
-	</Style>
-
-	<Style x:Key="Widget"
+    <Style x:Key="MenuSubHeader"
+           TargetType="TextBlock">
+        <Setter Property="FontSize"
+                Value="21" />
+    </Style>
+    <Style x:Key="Widget"
            TargetType="Grid">
         <Setter Property="Width"
                 Value="300" />
         <Setter Property="Height"
                 Value="100" />
         <Setter Property="Background"
-                Value="{StaticResource OpenHABLightColor}" />
+                Value="{ThemeResource ControlStrokeColorDefaultBrush }" />
     </Style>
-
-    <Style x:Key="SplitViewTogglePaneButtonStyle"
-           TargetType="ToggleButton">
-        <Setter Property="FontSize"
-                Value="20" />
-        <Setter Property="FontFamily"
-                Value="{ThemeResource SymbolThemeFontFamily}" />
-        <Setter Property="MinHeight"
-                Value="48" />
-        <Setter Property="MinWidth"
-                Value="48" />
-        <Setter Property="Margin"
-                Value="0" />
-        <Setter Property="Padding"
-                Value="0" />
-        <Setter Property="HorizontalAlignment"
-                Value="Left" />
-        <Setter Property="VerticalAlignment"
-                Value="Top" />
-        <Setter Property="HorizontalContentAlignment"
-                Value="Center" />
-        <Setter Property="VerticalContentAlignment"
-                Value="Center" />
+    <Style x:Key="WidgetGroup"
+           TargetType="StackPanel">
         <Setter Property="Background"
-                Value="Transparent" />
+                Value="{ThemeResource CardStrokeColorDefaultBrush}" />
+    </Style>
+    <Style x:Key="ContentDialog"
+           TargetType="ContentDialog">
+        <Setter Property="Background"
+                Value="{ThemeResource ControlStrokeColorDefaultBrush}" />
+    </Style>
+    <!-- Text Styles -->
+    <Style x:Key="TitleStyle"
+           BasedOn="{StaticResource TitleTextBlockStyle}"
+           TargetType="TextBlock">
         <Setter Property="Foreground"
-                Value="{ThemeResource SystemControlForegroundBaseHighBrush}" />
-        <Setter Property="Content"
-                Value="&#xE700;" />
-        <Setter Property="AutomationProperties.Name"
-                Value="Menu" />
-        <Setter Property="UseSystemFocusVisuals"
-                Value="True" />
-        <Setter Property="Template">
-            <Setter.Value>
-                <ControlTemplate TargetType="ToggleButton">
-                    <Grid x:Name="LayoutRoot"
-                          Background="{TemplateBinding Background}">
-                        <ContentPresenter x:Name="ContentPresenter"
-                                          Margin="{TemplateBinding Padding}"
-                                          HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                          VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                          AutomationProperties.AccessibilityView="Raw"
-                                          Content="{TemplateBinding Content}" />
-                        <VisualStateManager.VisualStateGroups>
-                            <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Normal" />
-                                <VisualState x:Name="PointerOver">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="LayoutRoot"
-                                                                       Storyboard.TargetProperty="(Grid.Background)">
-                                            <DiscreteObjectKeyFrame KeyTime="0"
-                                                                    Value="{x:Null}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
-                                                                       Storyboard.TargetProperty="Foreground">
-                                            <DiscreteObjectKeyFrame KeyTime="0"
-                                                                    Value="{StaticResource OpenHABLightOrangeBrush}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="Pressed">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="LayoutRoot"
-                                                                       Storyboard.TargetProperty="(Grid.Background)">
-                                            <DiscreteObjectKeyFrame KeyTime="0"
-                                                                    Value="{ThemeResource SystemControlHighlightListMediumBrush}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
-                                                                       Storyboard.TargetProperty="Foreground">
-                                            <DiscreteObjectKeyFrame KeyTime="0"
-                                                                    Value="{ThemeResource SystemControlHighlightAltBaseHighBrush}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="Disabled">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
-                                                                       Storyboard.TargetProperty="(TextBlock.Foreground)">
-                                            <DiscreteObjectKeyFrame KeyTime="0"
-                                                                    Value="{ThemeResource SystemControlDisabledBaseLowBrush}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="Checked" />
-                                <VisualState x:Name="CheckedPointerOver">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="LayoutRoot"
-                                                                       Storyboard.TargetProperty="(Grid.Background)">
-                                            <DiscreteObjectKeyFrame KeyTime="0"
-                                                                    Value="{ThemeResource SystemControlHighlightListLowBrush}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
-                                                                       Storyboard.TargetProperty="Foreground">
-                                            <DiscreteObjectKeyFrame KeyTime="0"
-                                                                    Value="{StaticResource OpenHABLightOrangeBrush}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="CheckedPressed">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="LayoutRoot"
-                                                                       Storyboard.TargetProperty="(Grid.Background)">
-                                            <DiscreteObjectKeyFrame KeyTime="0"
-                                                                    Value="{ThemeResource SystemControlHighlightListMediumBrush}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
-                                                                       Storyboard.TargetProperty="Foreground">
-                                            <DiscreteObjectKeyFrame KeyTime="0"
-                                                                    Value="{ThemeResource SystemControlHighlightAltBaseHighBrush}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                                <VisualState x:Name="CheckedDisabled">
-                                    <Storyboard>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter"
-                                                                       Storyboard.TargetProperty="(TextBlock.Foreground)">
-                                            <DiscreteObjectKeyFrame KeyTime="0"
-                                                                    Value="{ThemeResource SystemControlDisabledBaseLowBrush}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                    </Storyboard>
-                                </VisualState>
-                            </VisualStateGroup>
-                        </VisualStateManager.VisualStateGroups>
-                    </Grid>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
+                Value="{ThemeResource TextFillColorPrimaryBrush}" />
     </Style>
-	
-	
-	
 </ResourceDictionary>
diff --git a/src/openHAB.Windows/Themes/Generic.xaml b/src/openHAB.Windows/Themes/Generic.xaml
index 64d01b1c..2cfd06ee 100644
--- a/src/openHAB.Windows/Themes/Generic.xaml
+++ b/src/openHAB.Windows/Themes/Generic.xaml
@@ -1,6 +1,6 @@
 <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-                    xmlns:controls="using:OpenHAB.Windows.Controls">
+                    xmlns:controls="using:openHAB.Windows.Controls">
 
     <Style TargetType="controls:RadialSlider">
         <Setter Property="Template">
diff --git a/src/openHAB.Windows/View/LogViewerPage.xaml b/src/openHAB.Windows/View/LogViewerPage.xaml
index d0622a4e..3c67238e 100644
--- a/src/openHAB.Windows/View/LogViewerPage.xaml
+++ b/src/openHAB.Windows/View/LogViewerPage.xaml
@@ -1,72 +1,60 @@
-<Page x:Class="OpenHAB.Windows.View.LogViewerPage"
+<Page x:Class="openHAB.Windows.View.LogViewerPage"
       xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
       xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       xmlns:core="using:Microsoft.Xaml.Interactions.Core"
       xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
-      mc:Ignorable="d">
-
-    <Page.Background>
-        <ImageBrush ImageSource="/Assets/background.jpg"
-                    Stretch="UniformToFill" />
-    </Page.Background>
-
-    <Grid>
+      mc:Ignorable="d"
+      Background="Transparent">
+    <Grid Margin="10">
         <Grid.RowDefinitions>
             <RowDefinition Height="auto" />
             <RowDefinition Height="95*" />
         </Grid.RowDefinitions>
         <CommandBar Grid.Row="0"
-                    Background="{StaticResource DarkAcrylicColor}"
-                    DefaultLabelPosition="Right"  OverflowButtonVisibility="Collapsed">
-            <AppBarButton  x:Uid="LogsFolderOpen"
-                           Foreground="White"
-                              Icon="Folder"
-                    Command="{Binding OpenLogFileCommand}" />
-            <AppBarButton  x:Uid="Back"
-                           Foreground="White"
-                              Icon="Back">
-                <interactivity:Interaction.Behaviors>
-                    <core:EventTriggerBehavior EventName="Tapped">
-                        <core:NavigateToPageAction TargetPage="OpenHAB.Windows.View.SettingsPage" />
-                    </core:EventTriggerBehavior>
-                </interactivity:Interaction.Behaviors>
-            </AppBarButton>
+                    DefaultLabelPosition="Right"
+                    OverflowButtonVisibility="Collapsed">
+            <AppBarButton x:Uid="LogsFolderOpen"
+                          Icon="Folder"
+                          Command="{Binding OpenLogFileCommand}" />
             <CommandBar.Content>
                 <StackPanel Orientation="Horizontal">
                     <SymbolIcon Symbol="Folder"
                                 Margin="10,5,0,0"
-                                VerticalAlignment="Center"
-                                Foreground="{StaticResource OpenHABMenuColor}" />
+                                VerticalAlignment="Center" />
                     <TextBlock x:Uid="LogsHeader"
                                Margin="10,0,0,0"
-                               FontSize="28"
+                               Style="{StaticResource TitleTextBlockStyle}"
                                VerticalAlignment="Center"
-                               TextWrapping="Wrap"
-                               Foreground="White" />
+                               TextWrapping="Wrap" />
                 </StackPanel>
-
             </CommandBar.Content>
         </CommandBar>
-
-        <Grid Grid.Row="1" Margin="10" Background="{ThemeResource OpenHABLightColor}">
+        <Grid Grid.Row="1"
+              Margin="10">
             <Grid.RowDefinitions>
-                <RowDefinition Height="6*" />
-                <RowDefinition Height="94*" />
+                <RowDefinition Height="auto" />
+                <RowDefinition Height="*" />
             </Grid.RowDefinitions>
-            <StackPanel Grid.Row="0" Margin="10,10,0,5" Orientation="Horizontal">
-                <TextBlock x:Uid="Log" Margin="0,0,10,0" Style="{StaticResource TitleTextBlockStyle}"/>
+            <StackPanel Grid.Row="0"
+                        Margin="10,0,0,5"
+                        Orientation="Horizontal">
+                <TextBlock x:Uid="Log"
+                           Margin="0,0,10,0"
+                           Style="{StaticResource TitleTextBlockStyle}" />
                 <TextBlock Style="{StaticResource TitleTextBlockStyle}"
                            Text="{Binding Path=LogFile}" />
             </StackPanel>
-            <ScrollViewer Grid.Row="1">
+            <ScrollViewer x:Name="LogScroller"
+                          Grid.Row="1">
                 <TextBlock ScrollViewer.VerticalScrollBarVisibility="Visible"
-                       ScrollViewer.ZoomMode="Enabled"
-                       ScrollViewer.VerticalScrollMode="Auto"
-                       Padding="5,0,0,0"
-                       TextWrapping="Wrap"
-                       Text="{Binding LogContent}" />
+                           ScrollViewer.ZoomMode="Enabled"
+                           ScrollViewer.VerticalScrollMode="Auto"
+                           Padding="5,0,0,0"
+                           TextWrapping="Wrap"
+                           SizeChanged="TextBlock_SizeChanged"
+                           Text="{Binding LogContent}" />
             </ScrollViewer>
         </Grid>
     </Grid>
diff --git a/src/openHAB.Windows/View/LogViewerPage.xaml.cs b/src/openHAB.Windows/View/LogViewerPage.xaml.cs
index ed9d699a..e11da2aa 100644
--- a/src/openHAB.Windows/View/LogViewerPage.xaml.cs
+++ b/src/openHAB.Windows/View/LogViewerPage.xaml.cs
@@ -1,20 +1,24 @@
-using OpenHAB.Windows.Services;
-using OpenHAB.Windows.ViewModel;
-using Windows.UI.Xaml.Controls;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.UI.Xaml.Controls;
+using openHAB.Windows.ViewModel;
 
-namespace OpenHAB.Windows.View
+namespace openHAB.Windows.View;
+
+/// <summary>
+/// An empty page that can be used on its own or navigated to within a Frame.
+/// </summary>
+public sealed partial class LogViewerPage : Page
 {
-    /// <summary>
-    /// An empty page that can be used on its own or navigated to within a Frame.
-    /// </summary>
-    public sealed partial class LogViewerPage : Page
+    /// <summary>Initializes a new instance of the <see cref="LogViewerPage" /> class.</summary>
+    public LogViewerPage()
     {
-        /// <summary>Initializes a new instance of the <see cref="LogViewerPage" /> class.</summary>
-        public LogViewerPage()
-        {
-            DataContext = (LogsViewModel)DIService.Instance.Services.GetService(typeof(LogsViewModel));
+        DataContext = Program.Host.Services.GetRequiredService<LogsViewModel>();
+
+        this.InitializeComponent();
+    }
 
-            this.InitializeComponent();
-        }
+    private void TextBlock_SizeChanged(object sender, Microsoft.UI.Xaml.SizeChangedEventArgs e)
+    {
+        LogScroller.ScrollToVerticalOffset(LogScroller.ScrollableHeight);
     }
 }
diff --git a/src/openHAB.Windows/View/MainPage.xaml b/src/openHAB.Windows/View/MainPage.xaml
index 3111119e..3003f2fe 100644
--- a/src/openHAB.Windows/View/MainPage.xaml
+++ b/src/openHAB.Windows/View/MainPage.xaml
@@ -1,317 +1,12 @@
-<Page x:Class="OpenHAB.Windows.View.MainPage"
-	  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-	  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-	  xmlns:converters="using:OpenHAB.Windows.Converters"
-	  xmlns:core="using:Microsoft.Xaml.Interactions.Core"
-	  xmlns:community="using:Microsoft.Toolkit.Uwp.UI.Controls"
-	  xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
-	  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-	  xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
-	  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	  xmlns:viewModel="using:OpenHAB.Windows.ViewModel"
-	  xmlns:controls="using:OpenHAB.Windows.Controls" 
-      xmlns:media="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+<Page x:Class="openHAB.Windows.View.MainPage"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
       mc:Ignorable="d"
-	  Name="Page">
-	<Page.Background>
-		<ImageBrush ImageSource="/Assets/background.jpg"
-					Stretch="UniformToFill" />
-	</Page.Background>
-
-	<Page.Resources>
-		<Style TargetType="GridViewItem">
-			<Setter Property="HorizontalContentAlignment"
-					Value="Stretch" />
-			<Setter Property="VerticalContentAlignment"
-					Value="Stretch" />
-		</Style>
-
-
-		<Style TargetType="muxc:NavigationViewItem">
-			<Setter Property="FontSize"
-					Value="18" />
-		</Style>
-
-		<!-- Navigation View Styling -->
-		<!--<SolidColorBrush x:Key="NavigationViewDefaultPaneBackground"
-						 Color="{StaticResource DarkColor}" />
-		<SolidColorBrush x:Key="NavigationViewExpandedPaneBackground"
-						 Color="{StaticResource DarkColor}" />-->
-
-        <media:AcrylicBrush x:Key="NavigationViewDefaultPaneBackground"
-                        BackgroundSource="Backdrop"
-                        TintOpacity="0.7"
-                        FallbackColor="{StaticResource DarkColor}"
-                        TintColor="{StaticResource DarkColor}" />
-
-        <media:AcrylicBrush x:Key="NavigationViewExpandedPaneBackground"
-                        BackgroundSource="Backdrop"
-                        TintOpacity="0.7"
-                        FallbackColor="{StaticResource DarkColor}"
-                        TintColor="{StaticResource DarkColor}" />
-
-        <SolidColorBrush x:Key="NavigationViewItemForeground"
-						 Color="White" />
-		<SolidColorBrush x:Key="NavigationViewItemForegroundPointerOver"
-						 Color="#FFFF5722" />
-		<SolidColorBrush x:Key="NavigationViewItemForegroundPressed"
-						 Color="White" />
-
-		<SolidColorBrush x:Key="NavigationViewItemForegroundChecked"
-						 Color="#FFFF5722" />
-		<SolidColorBrush x:Key="NavigationViewItemForegroundCheckedPressed"
-						 Color="#FFFF5722" />
-		<SolidColorBrush x:Key="NavigationViewItemForegroundCheckedPointerOver"
-						 Color="White" />
-
-		<SolidColorBrush x:Key="NavigationViewItemForegroundSelected"
-						 Color="#FFFF5722" />
-		<SolidColorBrush x:Key="NavigationViewItemForegroundSelectedPressed"
-						 Color="#FFFF5722" />
-		<SolidColorBrush x:Key="NavigationViewItemForegroundSelectedPointerOver"
-						 Color="White" />
-
-		<SolidColorBrush x:Key="NavigationViewSelectionIndicatorForeground"
-						 Color="#FFFF5722" />
-
-		<!-- Converters -->
-		<converters:ObjectToSitemapConverter x:Key="ObjectToSitemapConverter" />
-		<converters:ZeroToVisibilityConverter x:Key="ZeroToVisibility" />
-		<converters:BooleanToVisibilityConverter x:Key="BoolToVisibilityConverter" />
-
-		<converters:MenuItemTemplateSelector x:Key="Selector">
-			<converters:MenuItemTemplateSelector.DefaultItemTemlate>
-				<DataTemplate x:DataType="muxc:NavigationViewItem">
-					<muxc:NavigationViewItem  Content="{x:Bind Content}"
-											  Icon="{x:Bind Icon}">
-					</muxc:NavigationViewItem>
-				</DataTemplate>
-			</converters:MenuItemTemplateSelector.DefaultItemTemlate>
-			<converters:MenuItemTemplateSelector.SiteMapMenuItemTemplate>
-				<DataTemplate x:DataType="viewModel:SitemapViewModel">
-					<muxc:NavigationViewItem Content="{x:Bind Label, Mode=OneWay}">
-						<muxc:NavigationViewItem.Icon>
-							<muxc:ImageIcon Source="ms-appx:///Assets/openhab.png"
-											Width="48"
-											Height="48" />
-						</muxc:NavigationViewItem.Icon>
-					</muxc:NavigationViewItem>
-				</DataTemplate>
-			</converters:MenuItemTemplateSelector.SiteMapMenuItemTemplate>
-		</converters:MenuItemTemplateSelector>
-
-		<DataTemplate x:Key="NavMenuHeaderTemplate">
-
-			<TextBlock x:Name="textBlock"
-					   Margin="5,0,0,10"
-					   VerticalAlignment="Center"
-					   Style="{StaticResource HeaderText}"
-					   Foreground="{StaticResource OpenHABMenuColor}"
-					   Text="{Binding }" />
-
-		</DataTemplate>
-
-		<DataTemplate x:Key="NavHeaderTemplate">
-			<StackPanel Orientation="Horizontal">
-				<TextBlock x:Name="textBlock"
-						   Margin="5,0,10,10"
-						   VerticalAlignment="Center"
-						   Style="{StaticResource HeaderText}"
-						   FontSize="36"
-						   Foreground="White"
-						   Text="{Binding }" />
-				<Button Command="{Binding Vm.ReloadSitemapCommand, ElementName=Page}">
-					<SymbolIcon Symbol="Refresh"
-								Foreground="White"
-								VerticalAlignment="Center" />
-				</Button>
-			</StackPanel>
-		</DataTemplate>
-
-		<DataTemplate x:Key="WaitListTemplate">
-			<StackPanel Orientation="Horizontal"
-						Padding="12">
-				<ProgressRing IsActive="True"
-							  Margin="0,0,12,0"
-							  Foreground="{ThemeResource OpenHABMenuColor}" />
-				<TextBlock x:Uid="Loading"
-						   VerticalAlignment="Center"
-						   Foreground="White" />
-			</StackPanel>
-		</DataTemplate>
-
-	</Page.Resources>
-
-	<Grid>
-		<Grid.Background>
-			<SolidColorBrush Opacity="0.2"
-							 Color="Black" />
-		</Grid.Background>
-		<muxc:NavigationView x:Name="SitemapNavigation"
-							 Header="{x:Bind Vm.Subtitle, Mode=OneWay}"
-							 MenuItemsSource="{x:Bind Vm.Sitemaps, Mode=OneWay}"
-							 MenuItemTemplateSelector="{StaticResource Selector}"
-							 SelectedItem="{x:Bind Vm.SelectedMenuItem, Mode=TwoWay}"
-							 Foreground="White"
-							 IsBackButtonVisible="Collapsed"
-							 AlwaysShowHeader="True"
-							 IsSettingsVisible="True"
-							 OpenPaneLength="200"
-							 CompactPaneLength="45"
-							 PaneDisplayMode="Left"
-							 IsPaneOpen="False"
-							 SelectionChanged="SitemapNavigation_SelectionChanged"
-							 HeaderTemplate="{StaticResource NavHeaderTemplate}"
-							 CornerRadius="0">
-			<muxc:NavigationView.PaneCustomContent>
-				<StackPanel Orientation="Vertical"
-							Visibility="{Binding IsPaneOpen, ElementName=SitemapNavigation}">
-					<Grid>
-						<Grid.ColumnDefinitions>
-							<ColumnDefinition Width="70*" />
-							<ColumnDefinition Width="30*" />
-						</Grid.ColumnDefinitions>
-						<TextBlock x:Name="textBlock"
-								   Grid.Column="0"
-								   Margin="5,-3,0,0"
-								   VerticalAlignment="Center"
-								   Style="{StaticResource MenuSubHeader}"
-								   Foreground="{StaticResource OpenHABMenuColor}"
-								   Text="Sitemaps" />
-						<Button Grid.Column="1"
-								Margin="0,0,10,0"
-								HorizontalAlignment="Right"
-								Command="{Binding Vm.RefreshCommand, ElementName=Page}">
-							<SymbolIcon Symbol="Refresh"
-										Foreground="White"
-										VerticalAlignment="Center" />
-						</Button>
-					</Grid>
-					<TextBlock Grid.Row="1"
-							   Margin="10,10,10,0"
-							   x:Uid="NoItemsOrOpenHabNotAvailable"
-							   Visibility="{x:Bind Vm.Sitemaps.Count, Converter={StaticResource ZeroToVisibility}, Mode=OneWay}"
-							   TextWrapping="Wrap"
-							   Foreground="{StaticResource OpenHABMenuColor}"
-							   Style="{StaticResource FlyoutPickerTitleTextBlockStyle}" />
-				</StackPanel>
-			</muxc:NavigationView.PaneCustomContent>
-			<muxc:NavigationView.FooterMenuItems>
-				<muxc:NavigationViewItem x:Uid="FeedbackHeader">
-					<muxc:NavigationViewItem.Icon>
-						<FontIcon  VerticalAlignment="Center"
-								   AutomationProperties.Name="Favorite"
-								   FontFamily="Segoe MDL2 Assets"
-								   FontSize="18"
-								   Glyph="&#xE939;" />
-					</muxc:NavigationViewItem.Icon>
-					<interactivity:Interaction.Behaviors>
-						<core:EventTriggerBehavior EventName="Tapped">
-							<core:InvokeCommandAction Command="{x:Bind Vm.FeedbackCommand}" />
-						</core:EventTriggerBehavior>
-					</interactivity:Interaction.Behaviors>
-				</muxc:NavigationViewItem>
-			</muxc:NavigationView.FooterMenuItems>
-			<Grid x:Name="MainContentGrid"
-				  Margin="35,0,0,0"
-				  VerticalAlignment="Stretch">
-				<Grid.RowDefinitions>
-					<RowDefinition Height="*" />
-					<RowDefinition Height="auto" />
-				</Grid.RowDefinitions>
-				<ScrollViewer VerticalScrollBarVisibility="Auto">
-					<GridView x:Name="MasterListView"
-							  Margin="12,0,0,0"
-							  HorizontalAlignment="Stretch"
-							  VerticalAlignment="Stretch"
-							  HorizontalContentAlignment="Stretch"
-							  VerticalContentAlignment="Stretch"
-							  IsItemClickEnabled="True"
-							  IsTapEnabled="True"
-							  ItemClick="MasterListView_OnItemClick"
-							  ItemTemplateSelector="{StaticResource WidgetTemplateSelector}"
-							  ItemsSource="{x:Bind Vm.CurrentWidgets, Mode=OneWay}"
-							  SelectionMode="None">
-						<GridView.ItemsPanel>
-							<ItemsPanelTemplate>
-								<VariableSizedWrapGrid ItemHeight="106"
-													   ItemWidth="310"
-													   Orientation="Horizontal" />
-							</ItemsPanelTemplate>
-						</GridView.ItemsPanel>
-					</GridView>
-				</ScrollViewer>
-
-				<StackPanel Orientation="Vertical" Grid.Row="1" Margin="-25,10,10,10">
-					<muxc:InfoBar x:Name="ErrorNotification"
-							  Margin="0,0,0,5"
-							  Severity="Error"
-							  IsClosable="True"
-							  HorizontalAlignment="Stretch"
-							  VerticalAlignment="Center" />
-
-					<muxc:InfoBar x:Name="InfoNotification"
-							  Severity="Informational"
-							  IsClosable="True"
-							  HorizontalAlignment="Stretch"
-							  VerticalAlignment="Center">
-						<muxc:InfoBar.ActionButton>
-							<Button x:Name="SettingsButtonInfoNotification"
-								x:Uid="InfoAppBarSettingsButton">
-								<interactivity:Interaction.Behaviors>
-									<core:EventTriggerBehavior EventName="Tapped">
-										<core:NavigateToPageAction TargetPage="OpenHAB.Windows.View.SettingsPage" />
-									</core:EventTriggerBehavior>
-								</interactivity:Interaction.Behaviors>
-							</Button>
-						</muxc:InfoBar.ActionButton>
-					</muxc:InfoBar>
-				</StackPanel>
-			</Grid>
-		</muxc:NavigationView>
-
-		<community:Loading x:Name="LoadingControl"
-						   IsLoading="{x:Bind Vm.IsDataLoading, Mode=TwoWay}"
-						   HorizontalContentAlignment="Center"
-						   VerticalContentAlignment="Center">
-			<community:Loading.Background>
-				<SolidColorBrush Color="Black"
-								 Opacity="0.7" />
-			</community:Loading.Background> 
-			<ContentControl x:Name="LoadingContentControl"
-							ContentTemplate="{StaticResource WaitListTemplate}" />
-		</community:Loading>
-
-		<VisualStateManager.VisualStateGroups>
-			<VisualStateGroup>
-				<VisualState>
-					<VisualState.StateTriggers>
-						<controls:DeviceFamilyStateTrigger TargetDeviceFamily="Desktop" />
-					</VisualState.StateTriggers>
-					<VisualState.Setters>
-						<Setter Target="SitemapNavigation.PaneDisplayMode"
-								Value="Left" />
-					</VisualState.Setters>
-				</VisualState>
-				<VisualState>
-					<VisualState.StateTriggers>
-						<controls:DeviceFamilyStateTrigger TargetDeviceFamily="Mobile" />
-					</VisualState.StateTriggers>
-					<VisualState.Setters>
-						<Setter Target="SitemapNavigation.PaneDisplayMode"
-								Value="LeftCompact" />
-					</VisualState.Setters>
-				</VisualState>
-				<VisualState>
-					<VisualState.StateTriggers>
-						<controls:DeviceFamilyStateTrigger TargetDeviceFamily="Xbox" />
-					</VisualState.StateTriggers>
-					<VisualState.Setters>
-						<Setter Target="SitemapNavigation.PaneDisplayMode"
-								Value="LeftMinimal" />
-					</VisualState.Setters>
-				</VisualState>
-			</VisualStateGroup>
-		</VisualStateManager.VisualStateGroups>
-	</Grid>
+      Name="Page">
+    <Grid>
+        <TextBlock Foreground="Black"
+                   Text="MainPage" />
+    </Grid>
 </Page>
\ No newline at end of file
diff --git a/src/openHAB.Windows/View/MainPage.xaml.cs b/src/openHAB.Windows/View/MainPage.xaml.cs
index 00604365..d29b1efd 100644
--- a/src/openHAB.Windows/View/MainPage.xaml.cs
+++ b/src/openHAB.Windows/View/MainPage.xaml.cs
@@ -1,148 +1,16 @@
-using System;
-using System.Threading.Tasks;
-using CommunityToolkit.Mvvm.Messaging;
-using Microsoft.Extensions.Logging;
-using OpenHAB.Core;
-using OpenHAB.Core.Messages;
-using OpenHAB.Core.Model;
-using OpenHAB.Core.Services;
-using OpenHAB.Windows.Services;
-using OpenHAB.Windows.ViewModel;
-using Windows.UI.Core;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Navigation;
+namespace openHAB.Windows.View;
 
-namespace OpenHAB.Windows.View
+/// <summary>
+/// Startup page of the application.
+/// </summary>
+public sealed partial class MainPage : Microsoft.UI.Xaml.Controls.Page
 {
+
     /// <summary>
-    /// Startup page of the application.
+    /// Initializes a new instance of the <see cref="MainPage"/> class.
     /// </summary>
-    public sealed partial class MainPage : Page
+    public MainPage()
     {
-        private ILogger<MainPage> _logger;
-
-        /// <summary>
-        /// Gets the datacontext, for use in compiled bindings.
-        /// </summary>
-        public MainViewModel Vm => DataContext as MainViewModel;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MainPage"/> class.
-        /// </summary>
-        public MainPage()
-        {
-            DataContext = (MainViewModel)DIService.Instance.Services.GetService(typeof(MainViewModel));
-            _logger = (ILogger<MainPage>)DIService.Instance.Services.GetService(typeof(ILogger<MainPage>));
-
-            InitializeComponent();
-
-            Vm.CurrentWidgets.CollectionChanged += async (sender, args) =>
-            {
-                await Dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
-                 {
-                     SystemNavigationManager.GetForCurrentView().AppViewBackButtonVisibility = WidgetNavigationService.CanGoBack
-                     ? AppViewBackButtonVisibility.Visible
-                     : AppViewBackButtonVisibility.Collapsed;
-                 });
-            };
-
-            SystemNavigationManager.GetForCurrentView().BackRequested += (sender, args) => Vm.WidgetGoBack();
-        }
-
-        /// <inheritdoc/>
-        protected override async void OnNavigatedTo(NavigationEventArgs e)
-        {
-            StrongReferenceMessenger.Default.Register<FireErrorMessage>(this, async (recipient,  msg) => await ShowErrorMessage(recipient, msg));
-            StrongReferenceMessenger.Default.Register<FireInfoMessage>(this, async (recipient, msg) => await ShowInfoMessage(recipient, msg));
-
-            await Vm.LoadSitemapsAndItemData().ConfigureAwait(false);
-        }
-
-        /// <inheritdoc/>
-        protected override void OnNavigatedFrom(NavigationEventArgs e)
-        {
-            StrongReferenceMessenger.Default.Unregister<FireErrorMessage>(this);
-            StrongReferenceMessenger.Default.Unregister<FireInfoMessage>(this);
-
-            ErrorNotification.IsOpen = false;
-            InfoNotification.IsOpen = false;
-        }
-
-#pragma warning disable S1172 // Unused method parameters should be removed
-        private async Task ShowErrorMessage(object recipient, FireErrorMessage message)
-#pragma warning restore S1172 // Unused method parameters should be removed
-        {
-            try
-            {
-                string errorMessage = null;
-                if (message == null || string.IsNullOrEmpty(message.ErrorMessage))
-                {
-                    errorMessage = AppResources.Values.GetString("MessageError");
-                    ErrorNotification.Message = errorMessage;
-                    ErrorNotification.IsOpen = true;
-                }
-                else
-                {
-                    errorMessage = message.ErrorMessage;
-                }
-
-                await Dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
-                {
-                    ErrorNotification.Message = errorMessage;
-                    ErrorNotification.IsOpen = true;
-                });
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Show error message failed.");
-            }
-        }
-
-#pragma warning disable S1172 // Unused method parameters should be removed
-        private async Task ShowInfoMessage(object recipient, FireInfoMessage msg)
-#pragma warning restore S1172 // Unused method parameters should be removed
-        {
-            try
-            {
-                string message = null;
-                switch (msg.MessageType)
-                {
-                    case MessageType.NotConfigured:
-                        message = AppResources.Values.GetString("MessageNotConfigured");
-                        break;
-                    case MessageType.NotReachable:
-                        message = AppResources.Values.GetString("MessagesNotReachable");
-                        break;
-                    default:
-                        message = "Message not defined";
-                        break;
-                }
-
-                await Dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
-                  {
-                      InfoNotification.Message = message;
-                      InfoNotification.IsOpen = true;
-                  });
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Show info message failed.");
-            }
-        }
-
-        private void MasterListView_OnItemClick(object sender, ItemClickEventArgs e)
-        {
-            StrongReferenceMessenger.Default.Send(new WidgetClickedMessage(e.ClickedItem as OpenHABWidget));
-        }
-
-        private void SitemapNavigation_SelectionChanged(
-            Microsoft.UI.Xaml.Controls.NavigationView sender,
-            Microsoft.UI.Xaml.Controls.NavigationViewSelectionChangedEventArgs args)
-        {
-            if (args.IsSettingsSelected)
-            {
-                Frame.Navigate(typeof(SettingsPage));
-            }
-        }
+        InitializeComponent();
     }
-}
\ No newline at end of file
+}
diff --git a/src/openHAB.Windows/View/MainUIPage.xaml b/src/openHAB.Windows/View/MainUIPage.xaml
new file mode 100644
index 00000000..14dfe252
--- /dev/null
+++ b/src/openHAB.Windows/View/MainUIPage.xaml
@@ -0,0 +1,11 @@
+<Page x:Class="openHAB.Windows.View.MainUIPage"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      mc:Ignorable="d"
+      NavigationCacheMode="Enabled">
+    <Grid>
+        <WebView2 Source="{Binding MainUIUrl}" />
+    </Grid>
+</Page>
diff --git a/src/openHAB.Windows/View/MainUIPage.xaml.cs b/src/openHAB.Windows/View/MainUIPage.xaml.cs
new file mode 100644
index 00000000..fdd2275f
--- /dev/null
+++ b/src/openHAB.Windows/View/MainUIPage.xaml.cs
@@ -0,0 +1,25 @@
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.UI.Xaml.Controls;
+using openHAB.Windows.ViewModel;
+
+namespace openHAB.Windows.View;
+
+/// <summary>
+/// An empty page that can be used on its own or navigated to within a Frame.
+/// </summary>
+public sealed partial class MainUIPage : Page
+{
+    public MainUIPage()
+    {
+        InitializeComponent();
+        ViewModel = Program.Host.Services.GetRequiredService<MainUIViewModel>();
+
+        DataContext = ViewModel;
+    }
+
+    public MainUIViewModel ViewModel
+    {
+        get;
+        set;
+    }
+}
diff --git a/src/openHAB.Windows/View/SettingsPage.xaml b/src/openHAB.Windows/View/SettingsPage.xaml
index 9e3ff978..ec0fcc12 100644
--- a/src/openHAB.Windows/View/SettingsPage.xaml
+++ b/src/openHAB.Windows/View/SettingsPage.xaml
@@ -1,268 +1,212 @@
-<Page x:Class="OpenHAB.Windows.View.SettingsPage"
-	  xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-	  xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-	  xmlns:converters="using:OpenHAB.Windows.Converters"
-	  xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-	  xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-	  xmlns:core="using:Microsoft.Xaml.Interactions.Core"
-	  xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
-	  xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
-	  mc:Ignorable="d"
-	  x:Name="SettingsView">
-
-	<Page.Background>
-		<ImageBrush ImageSource="/Assets/background.jpg"
-					Stretch="UniformToFill" />
-	</Page.Background>
-	<Page.Resources>
-		<converters:ReverseBoolConverter x:Key="ReverseBoolConverter" />
-
-		<Style x:Name="SettingsMenuItem"
-			   TargetType="ListViewItem">
-			<Setter Property="Foreground"
-					Value="White" />
-			<Setter Property="FontSize"
-					Value="16" />
-			<Setter Property="Template">
-				<Setter.Value>
-					<ControlTemplate TargetType="ListViewItem">
-
-						<ListViewItemPresenter 	CheckBrush="{ThemeResource SystemControlForegroundBaseMediumHighBrush}"
-												ContentMargin="{TemplateBinding Padding}"
-												CheckMode="Overlay"
-												ContentTransitions="{TemplateBinding ContentTransitions}"
-												CheckBoxBrush="{ThemeResource SystemControlBackgroundChromeMediumBrush}"
-												DragForeground="{ThemeResource ListViewItemDragForegroundThemeBrush}"
-												DragOpacity="{ThemeResource ListViewItemDragThemeOpacity}"
-												DragBackground="{ThemeResource ListViewItemDragBackgroundThemeBrush}"
-												DisabledOpacity="{ThemeResource ListViewItemDisabledThemeOpacity}"
-												FocusBorderBrush="{ThemeResource SystemControlForegroundAltHighBrush}"
-												FocusSecondaryBorderBrush="{ThemeResource SystemControlForegroundBaseHighBrush}"
-												HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-												PointerOverForeground="#FFFF5722"
-												PressedBackground="{ThemeResource SystemControlHighlightListMediumBrush}"
-												PlaceholderBackground="{ThemeResource ListViewItemPlaceholderBackgroundThemeBrush}"
-												PointerOverBackground="{ThemeResource SystemControlHighlightListLowBrush}"
-												ReorderHintOffset="{ThemeResource GridViewItemReorderHintThemeOffset}"
-												SelectedPressedBackground="{ThemeResource SystemControlHighlightListAccentHighBrush}"
-												SelectionCheckMarkVisualEnabled="True"
-												SelectedForeground="#FFFF5722"
-												SelectedPointerOverBackground="{ThemeResource SystemControlHighlightListAccentMediumBrush}"
-												SelectedBackground="#344040"
-												VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}" />
-					</ControlTemplate>
-				</Setter.Value>
-			</Setter>
-		</Style>
-	</Page.Resources>
-	<Grid>
-        <SplitView IsPaneOpen="True"
-                   DisplayMode="CompactInline"
-                   OpenPaneLength="256"
-                   PaneBackground="{ThemeResource DarkAcrylicColor}">
-            <SplitView.Pane>
-                <Grid>
-		<Grid.RowDefinitions>
-			<RowDefinition Height="auto" />
-                        <RowDefinition Height="100*" />
-                        <RowDefinition Height="auto" />
-		</Grid.RowDefinitions>
-                    <StackPanel Grid.Row="0"
-                                Orientation="Horizontal">
-					<SymbolIcon Symbol="Setting"
-								Margin="10,5,0,0"
-								VerticalAlignment="Center"
-								Foreground="{StaticResource OpenHABMenuColor}" />
-					<TextBlock x:Uid="SettingsHeader"
-							   Margin="10,0,0,0"
-							   FontSize="28"
-							   VerticalAlignment="Center"
-							   TextWrapping="Wrap"
-							   Foreground="White" />
-				</StackPanel>
-                    <ListView Grid.Row="1"
-                              x:Name="SettingOptionsListView"
-						  Margin="0,10,0,0"
-						  ItemContainerStyle="{StaticResource SettingsMenuItem}">
-					<ListViewItem x:Uid="MenuAppSettings"
-								  Tapped="AppSettingsListViewItem_Tapped" />
-					<ListViewItem x:Uid="MenuConnectionSettings"
-								  Tapped="ConnectionSettingsListViewItem_Tapped" />
-					<ListViewItem x:Uid="MenuLogsView">
-						<interactivity:Interaction.Behaviors>
-							<core:EventTriggerBehavior EventName="Tapped">
-								<core:NavigateToPageAction TargetPage="OpenHAB.Windows.View.LogViewerPage" />
-							</core:EventTriggerBehavior>
-						</interactivity:Interaction.Behaviors>
-					</ListViewItem>
-				</ListView>
-                    <CommandBar Grid.Row="2"
-                                Background="Transparent"
+<Page x:Class="openHAB.Windows.View.SettingsPage"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:converters="using:openHAB.Windows.Converters"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      xmlns:core="using:Microsoft.Xaml.Interactions.Core"
+      xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
+      xmlns:ui="using:CommunityToolkit.WinUI"
+      xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
+      xmlns:media="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:controls="using:CommunityToolkit.WinUI.Controls"
+      mc:Ignorable="d"
+      Background="Transparent"
+      x:Name="SettingsView">
+    <Page.Resources>
+        <converters:ReverseBoolConverter x:Key="ReverseBoolConverter" />
+        <!--<media:AcrylicBrush x:Key="NavigationViewDefaultPaneBackground"
+                            TintOpacity="0.7"
+                            FallbackColor="{StaticResource DarkColor}"
+                            TintColor="{StaticResource DarkColor}" />
+        <media:AcrylicBrush x:Key="NavigationViewExpandedPaneBackground"
+                            TintOpacity="0.7"
+                            FallbackColor="{StaticResource DarkColor}"
+                            TintColor="{StaticResource DarkColor}" />
+        <media:AcrylicBrush x:Key="NavigationViewTopPaneBackground"
+                            TintOpacity="0.7"
+                            FallbackColor="{StaticResource DarkColor}"
+                            TintColor="{StaticResource DarkColor}" />-->
+    </Page.Resources>
+    <ScrollViewer VerticalScrollBarVisibility="Auto">
+        <Grid Margin="20,20,50,50">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="auto" />
+                <RowDefinition Height="*" />
+            </Grid.RowDefinitions>
+            <CommandBar Grid.Row="0"
+                        DefaultLabelPosition="Right"
+                        OverflowButtonVisibility="Collapsed">
+                <CommandBar.PrimaryCommands>
+                    <AppBarButton x:Uid="SettingsSaveButton"
+                                  Icon="Save"
+                                  Command="{x:Bind Vm.SaveCommand}" />
+                    <AppBarButton x:Uid="SettingsCancelButton"
+                                  Icon="Cancel">
+                        <interactivity:Interaction.Behaviors>
+                            <core:EventTriggerBehavior EventName="Tapped">
+                                <core:NavigateToPageAction TargetPage="openHAB.Windows.View.MainPage" />
+                            </core:EventTriggerBehavior>
+                        </interactivity:Interaction.Behaviors>
+                    </AppBarButton>
+                    <AppBarSeparator />
+                    <AppBarButton x:Uid="OpenLogViewerButton"
+                                  Icon="Document">
+                        <interactivity:Interaction.Behaviors>
+                            <core:EventTriggerBehavior EventName="Tapped">
+                                <core:NavigateToPageAction TargetPage="openHAB.Windows.View.LogViewerPage" />
+                            </core:EventTriggerBehavior>
+                        </interactivity:Interaction.Behaviors>
+                    </AppBarButton>
+                </CommandBar.PrimaryCommands>
+                <CommandBar.Content>
+                    <StackPanel Orientation="Horizontal">
+                        <SymbolIcon Symbol="Setting"
+                                    Margin="10,5,0,0"
+                                    VerticalAlignment="Center" />
+                        <TextBlock x:Uid="SettingsHeader"
+                                   Margin="10,0,0,0"
+                                   Style="{StaticResource TitleTextBlockStyle}"
+                                   VerticalAlignment="Center"
+                                   TextWrapping="Wrap" />
+                    </StackPanel>
+                </CommandBar.Content>
+            </CommandBar>
+            <StackPanel Grid.Row="1"
+                        Orientation="Vertical">
+                <StackPanel Margin="0,0,0,10"
+                            Padding="12">
+                    <TextBlock x:Uid="ConnectionSettingsSection"
+                               Style="{StaticResource SubtitleTextBlockStyle}"
+                               Margin="0,0,0,10" />
+                    <controls:SettingsCard x:Uid="DemoModeHeader"
+                                           HeaderIcon="{ui:FontIcon Glyph=&#xE81E;}"
+                                           Margin="0,0,0,10">
+                        <ToggleSwitch x:Name="CheckBoxDemoMode"
+                                      Margin="0,0,0,12"
+                                      HorizontalAlignment="Stretch"
+                                      VerticalAlignment="Stretch"
+                                      IsOn="{Binding Settings.IsRunningInDemoMode, Mode=TwoWay}" />
+                    </controls:SettingsCard>
+                    <controls:SettingsExpander x:Uid="ConnectionSettings"
+                                               HeaderIcon="{ui:FontIcon Glyph=&#xE839;}">
+                        <controls:SettingsExpander.Items>
+                            <controls:SettingsCard x:Uid="LocalSettings"
+                                                   DataContext="{Binding Path=Settings.LocalConnection}"
+                                                   Description="{Binding Subtitle}"
+                                                   HeaderIcon="{ui:FontIcon Glyph=&#xEC27;}">
+                                <Button x:Uid="ConnectionSettingsButton"
+                                        Margin="10"
+                                        HorizontalAlignment="Stretch"
+                                        VerticalAlignment="Stretch"
+                                        HorizontalContentAlignment="Left"
+                                        IsEnabled="{x:Bind CheckBoxDemoMode.IsOn, Converter={StaticResource ReverseBoolConverter}, Mode=OneWay}"
+                                        Click="OpenLocalConnectionButton_Click" />
+                            </controls:SettingsCard>
+                            <controls:SettingsCard x:Uid="RemoteSettings"
+                                                   DataContext="{Binding Path=Settings.RemoteConnection}"
+                                                   Description="{Binding Subtitle}"
+                                                   HeaderIcon="{ui:FontIcon Glyph=&#xE909;}">
+                                <Button x:Uid="ConnectionSettingsButton"
+                                        Margin="10"
+                                        HorizontalAlignment="Stretch"
+                                        VerticalAlignment="Stretch"
+                                        HorizontalContentAlignment="Left"
+                                        IsEnabled="{x:Bind CheckBoxDemoMode.IsOn, Converter={StaticResource ReverseBoolConverter}, Mode=OneWay}"
+                                        Click="OpenRemoteConnectionButton_Click" />
+                            </controls:SettingsCard>
+                        </controls:SettingsExpander.Items>
+                    </controls:SettingsExpander>
+                </StackPanel>
+                <StackPanel Margin="0,0,0,10"
+                            Padding="12">
+                    <TextBlock x:Uid="AppSettings"
+                               Style="{StaticResource SubtitleTextBlockStyle}"
+                               Margin="0,0,0,10" />
+                    <controls:SettingsCard x:Uid="AppAutostart"
+                                           Margin="0,0,0,10"
+                                           HeaderIcon="{ui:FontIcon Glyph=&#xE80F;}">
+                        <ToggleSwitch x:Name="AppAutostartSwitch"
+                                      Margin="0,0,0,12"
+                                      HorizontalAlignment="Stretch"
+                                      VerticalAlignment="Stretch"
+                                      IsEnabled="{Binding Settings.CanAppAutostartEnabled, Mode=TwoWay}"
+                                      IsOn="{Binding Settings.IsAppAutostartEnabled, Mode=TwoWay}" />
+                    </controls:SettingsCard>
+                    <controls:SettingsCard x:Uid="StartAppMinimized"
+                                           Margin="0,0,0,10"
+                                           HeaderIcon="{ui:FontIcon Glyph=&#xE7F4;g}">
+                        <ToggleSwitch x:Name="StartAppMinimizedSwitch"
+                                      Margin="0,0,0,12"
+                                      HorizontalAlignment="Stretch"
+                                      VerticalAlignment="Stretch"
+                                      IsOn="{Binding Settings.StartAppMinimized, Mode=TwoWay}" />
+                    </controls:SettingsCard>
+                    <controls:SettingsCard x:Uid="AppLanguage"
+                                           Margin="0,0,0,10"
+                                           HeaderIcon="{ui:FontIcon Glyph=&#xF2B7;}">
+                        <ComboBox Margin="0,0,0,12"
+                                  ItemsSource="{Binding Settings.AppLanguages}"
+                                  DisplayMemberPath="Name"
+                                  SelectedItem="{Binding Settings.SelectedAppLanguage, Mode=TwoWay}" />
+                    </controls:SettingsCard>
+                    <controls:SettingsCard x:Uid="AppTheme"
+                                           Margin="0,0,0,12"
+                                           HeaderIcon="{ui:FontIcon Glyph=&#xE790;}">
+                        <ComboBox Margin="0,0,0,12"
+                                  ItemsSource="{Binding Settings.AppThemes}"
+                                  DisplayMemberPath="Name"
+                                  SelectedItem="{Binding Settings.SelectedAppTheme, Mode=TwoWay}" />
+                    </controls:SettingsCard>
+                </StackPanel>
+                <StackPanel Margin="0,0,0,10"
+                            Padding="12">
+                    <TextBlock x:Uid="NotificationSetting"
+                               Style="{StaticResource SubtitleTextBlockStyle}"
+                               Margin="0,0,0,10" />
+                    <controls:SettingsCard x:Uid="EnableWindowsNotifications"
+                                           Margin="0,0,0,10"
+                                           HeaderIcon="{ui:FontIcon Glyph=&#xED0C;}">
+                        <ToggleSwitch Margin="0,0,0,12"
+                                      HorizontalAlignment="Stretch"
+                                      VerticalAlignment="Stretch"
+                                      IsOn="{Binding Settings.NotificationsEnable, Mode=TwoWay}" />
+                    </controls:SettingsCard>
+                </StackPanel>
+                <StackPanel Margin="0,0,0,10"
+                            Padding="12">
+                    <TextBlock x:Uid="SitemapSetting"
+                               Style="{StaticResource SubtitleTextBlockStyle}"
+                               Margin="0,0,0,10" />
+                    <controls:SettingsCard x:Uid="ShowDefaultSitemap"
+                                           Margin="0,0,0,10"
+                                           HeaderIcon="{ui:FontIcon Glyph=&#xF22C;}">
+                        <ToggleSwitch x:Name="CheckBoxHideDefaultSitemap"
+                                      Margin="0,0,0,12"
+                                      HorizontalAlignment="Stretch"
+                                      VerticalAlignment="Stretch"
+                                      IsOn="{Binding Settings.ShowDefaultSitemap, Mode=TwoWay}" />
+                    </controls:SettingsCard>
+                    <controls:SettingsCard x:Uid="SVGIcons"
+                                           Margin="0,0,0,10"
+                                           HeaderIcon="{ui:FontIcon Glyph=&#xE91B;}">
+                        <ToggleSwitch x:Name="CheckBoxSVGIcons"
+                                      Margin="0,0,0,12"
+                                      HorizontalAlignment="Stretch"
+                                      VerticalAlignment="Stretch"
+                                      IsOn="{Binding Settings.UseSVGIcons, Mode=TwoWay}" />
+                    </controls:SettingsCard>
+                    <controls:SettingsCard x:Uid="ClearIconCache"
+                                           Margin="0,0,0,10"
+                                           HeaderIcon="{ui:FontIcon Glyph=&#xF12B;}">
+                        <Button x:Uid="ClearIconCacheButton"
+                                Margin="0,0,0,12"
                                 HorizontalAlignment="Left"
-                                DefaultLabelPosition="Right">
-                        <AppBarButton x:Uid="SettingsSaveButton"
-                                       Icon="Save"
-                                       Foreground="White"
-                                       Command="{x:Bind Vm.SaveCommand}" />
-                        <AppBarButton  x:Uid="SettingsCancelButton"
-                                       Foreground="White"
-                                       Icon="Cancel">
-                            <interactivity:Interaction.Behaviors>
-                                <core:EventTriggerBehavior EventName="Tapped">
-                                    <core:NavigateToPageAction TargetPage="OpenHAB.Windows.View.MainPage" />
-                                </core:EventTriggerBehavior>
-                            </interactivity:Interaction.Behaviors>
-                        </AppBarButton>
-                    </CommandBar>
-                </Grid>
-			</SplitView.Pane>
-			<ScrollViewer VerticalScrollBarVisibility="Auto">
-                <Grid Margin="20,20,50,50">
-					<Grid.RowDefinitions>
-						<RowDefinition Height="*" />
-						<RowDefinition Height="auto" />
-					</Grid.RowDefinitions>
-					<StackPanel Grid.Row="0"
-								Orientation="Vertical">
-						<!-- App Settings -->
-						<StackPanel x:Name="AppSettings">
-							<StackPanel Margin="0,0,0,25"
-										Padding="12"
-										Background="{ThemeResource OpenHABLightColor}">
-								<TextBlock x:Uid="AppSettings"
-										   Style="{StaticResource TitleTextBlockStyle}"
-										   Margin="0,0,0,10" />
-								<TextBlock x:Uid="AppAutostart"
-										   Margin="0,0,0,10" />
-								<ToggleSwitch x:Name="AppAutostartSwitch"
-											  Margin="0,0,0,12"
-											  HorizontalAlignment="Stretch"
-											  VerticalAlignment="Stretch"
-											  IsEnabled="{Binding Settings.CanAppAutostartEnabled, Mode=TwoWay}"
-											  IsOn="{Binding Settings.IsAppAutostartEnabled, Mode=TwoWay}" />
-								<TextBlock x:Uid="StartAppMinimized"
-										   Margin="0,0,0,10" />
-								<ToggleSwitch x:Name="StartAppMinimizedSwitch"
-											  Margin="0,0,0,12"
-											  HorizontalAlignment="Stretch"
-											  VerticalAlignment="Stretch"
-											  IsOn="{Binding Settings.StartAppMinimized, Mode=TwoWay}" />
-								<TextBlock x:Uid="AppLanguage"
-										   Margin="0,0,0,10" />
-								<ComboBox Margin="0,0,0,12"
-										  ItemsSource="{Binding Settings.AppLanguages}"
-										  DisplayMemberPath="Name"
-										  SelectedItem="{Binding Settings.SelectedAppLanguage, Mode=TwoWay}" />
-							</StackPanel>
-
-							<StackPanel Margin="0,0,0,25"
-										Padding="12"
-										Background="{ThemeResource OpenHABLightColor}">
-								<TextBlock x:Uid="NotificationSetting"
-										   Style="{StaticResource TitleTextBlockStyle}"
-										   Margin="0,0,0,10" />
-								<TextBlock x:Uid="EnableWindowsNotifications"
-										   Margin="0,0,0,10" />
-								<ToggleSwitch Margin="0,0,0,12"
-											  HorizontalAlignment="Stretch"
-											  VerticalAlignment="Stretch"
-											  IsOn="{Binding Settings.NotificationsEnable, Mode=TwoWay}" />
-							</StackPanel>
-
-							<StackPanel Margin="0,0,0,25"
-										Padding="12"
-										Background="{ThemeResource OpenHABLightColor}">
-								<TextBlock x:Uid="SitemapSetting"
-										   Style="{StaticResource TitleTextBlockStyle}"
-										   Margin="0,0,0,10" />
-								<TextBlock x:Uid="ShowDefaultSitemap"
-										   Margin="0,0,0,10" />
-								<ToggleSwitch x:Name="CheckBoxHideDefaultSitemap"
-											  Margin="0,0,0,12"
-											  HorizontalAlignment="Stretch"
-											  VerticalAlignment="Stretch"
-											  IsOn="{Binding Settings.ShowDefaultSitemap, Mode=TwoWay}" />
-								<TextBlock x:Uid="SVGIcons"
-										   Margin="0,0,0,10" />
-								<ToggleSwitch x:Name="CheckBoxSVGIcons"
-											  Margin="0,0,0,12"
-											  HorizontalAlignment="Stretch"
-											  VerticalAlignment="Stretch"
-											  IsOn="{Binding Settings.UseSVGIcons, Mode=TwoWay}" />
-								<TextBlock x:Uid="ClearIconCache"
-										   Margin="0,0,0,10" />
-								<Button x:Uid="ClearIconCacheButton"
-										Margin="0,0,0,12"
-										HorizontalAlignment="Left"
-										VerticalAlignment="Center"
-										Command="{x:Bind Vm.ClearIconCacheCommand}" />
-							</StackPanel>
-						</StackPanel>
-
-
-
-						<!-- Connection Settings -->
-						<Grid x:Name="ConnectionSettings"
-							  Margin="0,0,0,25"
-							  Padding="12"
-							  Background="{ThemeResource OpenHABLightColor}"
-							  Visibility="Collapsed">
-							<Grid.RowDefinitions>
-								<RowDefinition Height="Auto" />
-								<RowDefinition Height="Auto" />
-								<RowDefinition Height="Auto" />
-							</Grid.RowDefinitions>
-							<StackPanel Grid.Row="0">
-								<TextBlock x:Uid="ConnectionSettings"
-										   Style="{StaticResource TitleTextBlockStyle}"
-										   Margin="0,0,0,10" />
-								<TextBlock x:Uid="DemoModeHeader" />
-								<ToggleSwitch x:Name="CheckBoxDemoMode"
-											  Margin="0,0,0,12"
-											  HorizontalAlignment="Stretch"
-											  VerticalAlignment="Stretch"
-											  IsOn="{Binding Settings.IsRunningInDemoMode, Mode=TwoWay}" />
-							</StackPanel>
-							<StackPanel Grid.Row="1">
-								<Button Margin="10"
-										HorizontalAlignment="Stretch"
-										VerticalAlignment="Stretch"
-										HorizontalContentAlignment="Left"
-										DataContext="{Binding Path=Settings.LocalConnection}"
-										IsEnabled="{x:Bind CheckBoxDemoMode.IsOn, Converter={StaticResource ReverseBoolConverter}, Mode=OneWay}"
-										Click="OpenLocalConnectionButton_Click">
-									<StackPanel HorizontalAlignment="Left">
-										<TextBlock x:Uid="LocalSettings"
-												   FontSize="16" />
-										<TextBlock Text="{Binding Subtitle}" />
-									</StackPanel>
-								</Button>
-								<Button Margin="10"
-										HorizontalAlignment="Stretch"
-										VerticalAlignment="Stretch"
-										HorizontalContentAlignment="Left"
-										DataContext="{Binding Path=Settings.RemoteConnection}"
-										IsEnabled="{x:Bind CheckBoxDemoMode.IsOn, Converter={StaticResource ReverseBoolConverter}, Mode=OneWay}"
-										Click="OpenRemoteConnectionButton_Click">
-									<StackPanel>
-										<TextBlock x:Uid="RemoteSettings"
-												   FontSize="16" />
-										<TextBlock Text="{Binding Subtitle}" />
-									</StackPanel>
-								</Button>
-							</StackPanel>
-						</Grid>
-
-					</StackPanel>
-					<muxc:InfoBar x:Name="SettingsNotification"
-								  Grid.Row="1"
-								  Margin="10"
-								  IsClosable="True"
-								  Severity="Error"
-								  HorizontalAlignment="Stretch"
-								  VerticalAlignment="Center" />
-				</Grid>
-			</ScrollViewer>
-		</SplitView>
-	</Grid>
-</Page>
\ No newline at end of file
+                                VerticalAlignment="Center"
+                                Command="{x:Bind Vm.ClearIconCacheCommand}" />
+                    </controls:SettingsCard>
+                </StackPanel>
+            </StackPanel>
+        </Grid>
+    </ScrollViewer>
+</Page>
diff --git a/src/openHAB.Windows/View/SettingsPage.xaml.cs b/src/openHAB.Windows/View/SettingsPage.xaml.cs
index c26a65dd..25e423e3 100644
--- a/src/openHAB.Windows/View/SettingsPage.xaml.cs
+++ b/src/openHAB.Windows/View/SettingsPage.xaml.cs
@@ -1,168 +1,107 @@
-using System;
-using CommunityToolkit.Mvvm.Messaging;
+using System;
+using CommunityToolkit.WinUI;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
-using OpenHAB.Core;
-using OpenHAB.Core.Messages;
-using OpenHAB.Core.Services;
-using OpenHAB.Windows.Controls;
-using OpenHAB.Windows.Services;
-using OpenHAB.Windows.ViewModel;
-using Windows.UI.Core;
-using Windows.UI.Xaml;
-using Windows.UI.Xaml.Controls;
-using Windows.UI.Xaml.Input;
-using Windows.UI.Xaml.Navigation;
-
-namespace OpenHAB.Windows.View
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Navigation;
+using openHAB.Core.Services.Contracts;
+using openHAB.Windows.Controls;
+using openHAB.Windows.ViewModel;
+
+namespace openHAB.Windows.View;
+
+/// <summary>
+/// In this page users can set their connection to the OpenHAB server.
+/// </summary>
+public sealed partial class SettingsPage : Page
 {
+    private readonly IAppManager _appManager;
+    private readonly ILogger<SettingsPage> _logger;
+    private readonly SettingsViewModel _settingsViewModel;
+
     /// <summary>
-    /// In this page users can set their connection to the OpenHAB server.
+    /// Initializes a new instance of the <see cref="SettingsPage"/> class.
     /// </summary>
-    public sealed partial class SettingsPage : Page
+    public SettingsPage()
     {
-        private IAppManager _appManager;
-        private ILogger<SettingsViewModel> _logger;
-        private SettingsViewModel _settingsViewModel;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SettingsPage"/> class.
-        /// </summary>
-        public SettingsPage()
-        {
-            InitializeComponent();
+        InitializeComponent();
 
-            _settingsViewModel = (SettingsViewModel)DIService.Instance.Services.GetService(typeof(SettingsViewModel));
-            _logger = (ILogger<SettingsViewModel>)DIService.Instance.Services.GetService(typeof(ILogger<SettingsViewModel>));
-            _appManager = (IAppManager)DIService.Instance.Services.GetService(typeof(IAppManager));
+        _settingsViewModel = Program.Host.Services.GetRequiredService<SettingsViewModel>();
+        _logger = Program.Host.Services.GetRequiredService<ILogger<SettingsPage>>();
+        _appManager = Program.Host.Services.GetRequiredService<IAppManager>();
 
-            DataContext = _settingsViewModel;
+        DataContext = _settingsViewModel;
+    }
 
-            SettingOptionsListView.SelectedIndex = 0;
-        }
+    #region Page Navigation
 
-        #region Page Navigation
+    /// <inheritdoc/>
+    protected override async void OnNavigatedTo(NavigationEventArgs e)
+    {
+        AppAutostartSwitch.Toggled += AppAutostartSwitch_Toggled;
+    }
 
-        /// <inheritdoc/>
-        protected override async void OnNavigatedTo(NavigationEventArgs e)
-        {
-            StrongReferenceMessenger.Default.Register<SettingsUpdatedMessage>(this, (recipient, msg) => HandleSettingsUpdate(recipient, msg));
-            StrongReferenceMessenger.Default.Register<SettingsValidationMessage>(this, (recipient, msg) => NotificationSettingsValidation(recipient, msg));
+    /// <inheritdoc/>
+    protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
+    {
+        AppAutostartSwitch.Toggled -= AppAutostartSwitch_Toggled;
+    }
 
-            AppAutostartSwitch.Toggled += AppAutostartSwitch_Toggled;
-        }
+    #endregion
 
-        /// <inheritdoc/>
-        protected override void OnNavigatingFrom(NavigatingCancelEventArgs e)
-        {
-            StrongReferenceMessenger.Default.Unregister<SettingsUpdatedMessage>(this);
-            StrongReferenceMessenger.Default.Unregister<SettingsValidationMessage>(this);
+    /// <summary>
+    /// Gets the datacontext, for use in compiled bindings.
+    /// </summary>
+    public SettingsViewModel Vm => DataContext as SettingsViewModel;
 
-            AppAutostartSwitch.Toggled -= AppAutostartSwitch_Toggled;
-        }
+    private static ConnectionDialog CreateConnectionDialog()
+    {
+        ConnectionDialog connectionDialog = new ConnectionDialog();
+        connectionDialog.DefaultButton = ContentDialogButton.Primary;
 
-        #endregion
+        return connectionDialog;
+    }
 
-        /// <summary>
-        /// Gets the datacontext, for use in compiled bindings.
-        /// </summary>
-        public SettingsViewModel Vm => DataContext as SettingsViewModel;
+    private async void OpenLocalConnectionButton_Click(object sender, RoutedEventArgs e)
+    {
+        ConnectionDialog connectionDialog = CreateConnectionDialog();
+        connectionDialog.DataContext = Vm.Settings.LocalConnection;
 
-        private static ConnectionDialog CreateConnectionDialog()
-        {
-            ConnectionDialog connectionDialog = new ConnectionDialog();
-            connectionDialog.DefaultButton = ContentDialogButton.Primary;
+        /*TODO: Remove workaround when fix available
+        https://github.com/microsoft/microsoft-ui-xaml/issues/2504 */
+        connectionDialog.XamlRoot = this.Content.XamlRoot;
 
-            return connectionDialog;
-        }
+        await connectionDialog.ShowAsync();
+    }
 
-        private void AppSettingsListViewItem_Tapped(object sender, TappedRoutedEventArgs e)
-        {
-            AppSettings.Visibility = Visibility.Visible;
-            ConnectionSettings.Visibility = Visibility.Collapsed;
-        }
+    private async void OpenRemoteConnectionButton_Click(object sender, RoutedEventArgs e)
+    {
+        ConnectionDialog connectionDialog = CreateConnectionDialog();
+        connectionDialog.DataContext = Vm.Settings.RemoteConnection;
 
-        private void ConnectionSettingsListViewItem_Tapped(object sender, TappedRoutedEventArgs e)
-        {
-            AppSettings.Visibility = Visibility.Collapsed;
-            ConnectionSettings.Visibility = Visibility.Visible;
-        }
+        /*TODO: Remove workaround when fix available
+        https://github.com/microsoft/microsoft-ui-xaml/issues/2504 */
+        connectionDialog.XamlRoot = this.Content.XamlRoot;
 
-#pragma warning disable S1172 // Unused method parameters should be removed
-        private void HandleSettingsUpdate(object recipient, SettingsUpdatedMessage msg)
-#pragma warning restore S1172 // Unused method parameters should be removed
-        {
-            try
-            {
-                if (msg.IsSettingsValid && msg.SettingsPersisted)
-                {
-                    Frame.BackStack.Clear();
-                    Frame.Navigate(typeof(MainPage));
+        await connectionDialog.ShowAsync();
+    }
 
-                    return;
-                }
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Show info message failed.");
-            }
-        }
+    private async void AppAutostartSwitch_Toggled(object sender, RoutedEventArgs e)
+    {
+        ToggleSwitch toggleSwitch = (ToggleSwitch)e.OriginalSource;
+
+        bool toggleIsOn = toggleSwitch.IsOn;
+        var autostartEnabled = await _appManager.IsStartupEnabled().ConfigureAwait(false);
 
-#pragma warning disable S1172 // Unused method parameters should be removed
-        private void NotificationSettingsValidation(object recipient, SettingsValidationMessage msg)
-#pragma warning restore S1172 // Unused method parameters should be removed
+        await App.DispatcherQueue.EnqueueAsync(async () =>
         {
-            try
+            if (autostartEnabled != toggleIsOn)
             {
-                if (!msg.IsSettingsValid)
-                {
-                    string message = AppResources.Values.GetString("MessageSettingsConnectionConfigInvalid");
-
-                    SettingsNotification.Message = message;
-                    SettingsNotification.IsOpen = true;
-                }
-                else
-                {
-                    SettingsNotification.IsOpen = false;
-                }
+                await _appManager.ToggleAutostart();
             }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Show info message failed.");
-            }
-        }
 
-        private async void OpenLocalConnectionButton_Click(object sender, RoutedEventArgs e)
-        {
-            ConnectionDialog connectionDialog = CreateConnectionDialog();
-            connectionDialog.DataContext = Vm.Settings.LocalConnection;
-
-            await connectionDialog.ShowAsync();
-        }
-
-        private async void OpenRemoteConnectionButton_Click(object sender, RoutedEventArgs e)
-        {
-            ConnectionDialog connectionDialog = CreateConnectionDialog();
-            connectionDialog.DataContext = Vm.Settings.RemoteConnection;
-
-            await connectionDialog.ShowAsync();
-        }
-
-        private async void AppAutostartSwitch_Toggled(object sender, RoutedEventArgs e)
-        {
-            ToggleSwitch toggleSwitch = (ToggleSwitch)e.OriginalSource;
-
-            bool toggleIsOn = toggleSwitch.IsOn;
-            var autostartEnabled = await _appManager.IsStartupEnabled().ConfigureAwait(false);
-
-            await Dispatcher.RunAsync(CoreDispatcherPriority.Normal, async () =>
-            {
-                if (autostartEnabled != toggleIsOn)
-                {
-                    await _appManager.ToggleAutostart();
-                }
-
-                _settingsViewModel.Settings.IsAppAutostartEnabled = toggleIsOn;
-            });
-        }
+            _settingsViewModel.Settings.IsAppAutostartEnabled = toggleIsOn;
+        });
     }
-}
\ No newline at end of file
+}
diff --git a/src/openHAB.Windows/View/SitemapPage.xaml b/src/openHAB.Windows/View/SitemapPage.xaml
new file mode 100644
index 00000000..1ecd3e56
--- /dev/null
+++ b/src/openHAB.Windows/View/SitemapPage.xaml
@@ -0,0 +1,35 @@
+<Page x:Class="openHAB.Windows.View.SitemapPage"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+      xmlns:controls="using:CommunityToolkit.WinUI.Controls"
+      mc:Ignorable="d"
+      DataContext="{x:Bind ViewModel}">
+    <Grid x:Name="MainContentGrid"
+          Margin="35,0,0,0" >
+        <Grid.RowDefinitions>
+            <RowDefinition Height="auto" />
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+        <ScrollViewer Grid.Row="1"
+                      VerticalScrollBarVisibility="Auto">
+            <GridView x:Name="MasterListView"
+                      Margin="12,0,0,0"
+                      IsItemClickEnabled="True"
+                      IsTapEnabled="True"
+                      ItemClick="MasterListView_OnItemClick"
+                      ItemTemplateSelector="{StaticResource WidgetTemplateSelector}"
+                      ItemsSource="{Binding CurrentWidgets, Mode=OneWay}"
+                      SelectionMode="None">
+                <GridView.ItemsPanel>
+                    <ItemsPanelTemplate>
+                        <controls:WrapPanel Orientation="Horizontal"
+                                            VerticalSpacing="10"
+                                            HorizontalSpacing="10" />
+                    </ItemsPanelTemplate>
+                </GridView.ItemsPanel>
+            </GridView>
+        </ScrollViewer>
+    </Grid>
+</Page>
diff --git a/src/openHAB.Windows/View/SitemapPage.xaml.cs b/src/openHAB.Windows/View/SitemapPage.xaml.cs
new file mode 100644
index 00000000..0eef1f61
--- /dev/null
+++ b/src/openHAB.Windows/View/SitemapPage.xaml.cs
@@ -0,0 +1,108 @@
+using System;
+using CommunityToolkit.Mvvm.Messaging;
+using CommunityToolkit.WinUI;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.UI.Dispatching;
+using Microsoft.UI.Xaml.Controls;
+using Microsoft.UI.Xaml.Navigation;
+using openHAB.Common;
+using openHAB.Core.Client.Models;
+using openHAB.Core.Messages;
+using openHAB.Core.Services;
+using openHAB.Windows.Messages;
+using openHAB.Windows.Services;
+using openHAB.Windows.ViewModel;
+
+namespace openHAB.Windows.View;
+
+/// <summary>
+/// An empty page that can be used on its own or navigated to within a Frame.
+/// </summary>
+public sealed partial class SitemapPage : Microsoft.UI.Xaml.Controls.Page
+{
+    private readonly SitemapService _sitemapService;
+    private readonly IServiceProvider _serviceProvider;
+    private SitemapViewModel _viewModel;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="SitemapPage" /> class
+    /// .</summary>
+    public SitemapPage()
+    {
+        this.InitializeComponent();
+
+        StrongReferenceMessenger.Default.Register<SitemapChanged>(this, (obj, message)
+                => OnSitemapChangedEvent(message));
+
+        _sitemapService = Program.Host.Services.GetRequiredService<SitemapService>();
+        _serviceProvider = Program.Host.Services.GetRequiredService<IServiceProvider>();
+    }
+
+    /// <summary>
+    /// Gets the data context, for use in compiled bindings.
+    /// </summary>
+    public SitemapViewModel ViewModel
+    {
+        get => _viewModel;
+    }
+
+    protected override void OnNavigatedFrom(NavigationEventArgs e)
+    {
+        base.OnNavigatedFrom(e);
+
+        StrongReferenceMessenger.Default.Unregister<SitemapChanged>(this);
+        ViewModel?.Dispose();
+    }
+
+    protected async override void OnNavigatedTo(NavigationEventArgs e)
+    {
+        base.OnNavigatedTo(e);
+
+        string sitemapUrl = e.Parameter as string;
+        if (string.IsNullOrEmpty(sitemapUrl))
+        {
+            return;
+        }
+
+        StrongReferenceMessenger.Default.Send<DataOperation>(new DataOperation(OperationState.Started));
+
+        Sitemap sitemap = await _sitemapService.GetSitemapByUrlAsync(sitemapUrl);
+        if (sitemap is null)
+        {
+            StrongReferenceMessenger.Default.Send<TriggerInfoMessage>(new TriggerInfoMessage(MessageSeverity.Error, AppResources.Values.GetString("MessagesNotReachable")));
+            StrongReferenceMessenger.Default.Send<DataOperation>(new DataOperation(OperationState.Completed));
+
+            return;
+        }
+
+        _viewModel = await SitemapViewModel.CreateAsync(sitemap, _sitemapService, _serviceProvider);
+
+        DispatcherQueue dispatcherQueue = DispatcherQueue.GetForCurrentThread();
+        await dispatcherQueue.EnqueueAsync(async () =>
+        {
+            DataContext = _viewModel;
+            WidgetNavigationService.ClearWidgetNavigation();
+        });
+
+        StrongReferenceMessenger.Default.Send<DataOperation>(new DataOperation(OperationState.Completed));
+    }
+
+    private void MasterListView_OnItemClick(object sender, ItemClickEventArgs e)
+    {
+        WidgetViewModel? widgetViewModel = e.ClickedItem as WidgetViewModel;
+        if (widgetViewModel == null)
+        {
+            return;
+        }
+
+        StrongReferenceMessenger.Default.Send(new WidgetClickedMessage(widgetViewModel));
+    }
+
+    private void OnSitemapChangedEvent(SitemapChanged message)
+    {
+        if (message.Sitemap == null)
+        {
+            return;
+        }
+    }
+}
diff --git a/src/openHAB.Windows/ViewModel/ApplicationThemeViewModel.cs b/src/openHAB.Windows/ViewModel/ApplicationThemeViewModel.cs
new file mode 100644
index 00000000..09fe3754
--- /dev/null
+++ b/src/openHAB.Windows/ViewModel/ApplicationThemeViewModel.cs
@@ -0,0 +1,56 @@
+using Microsoft.UI.Xaml;
+using openHAB.Common;
+using openHAB.Core.Model;
+
+namespace openHAB.Windows.ViewModel;
+
+public class ApplicationThemeViewModel : ViewModelBase<AppTheme>
+{
+    private string _name;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="ApplicationThemeViewModel"/> class.
+    /// </summary>
+    /// <param name="model">The application theme model.</param>
+    public ApplicationThemeViewModel(AppTheme model)
+        : base(model)
+    {
+        switch (Model)
+        {
+            case AppTheme.Light:
+                Name = AppResources.Values.GetString("AppThemeLight");
+                break;
+            case AppTheme.Dark:
+                Name = AppResources.Values.GetString("AppThemeDark");
+                break;
+            case AppTheme.System:
+                Name = AppResources.Values.GetString("AppThemeSystem");
+                break;
+            default:
+                Name = "Unknown";
+                break;
+        }
+    }
+
+    /// <summary>
+    /// Gets the name of the application theme.
+    /// </summary>
+    public string Name
+    {
+        get => _name;
+        set
+        {
+            Set(ref _name, value);
+        }
+    }
+
+    /// <summary>
+    /// Gets the identifier of the application theme.
+    /// </summary>
+    public int Id => (int)Model;
+
+    /// <summary>
+    /// Gets the application theme.
+    /// </summary>
+    public ApplicationTheme Theme => (ApplicationTheme)Model;
+}
diff --git a/src/openHAB.Windows/ViewModel/ConfigurationViewModel.cs b/src/openHAB.Windows/ViewModel/ConfigurationViewModel.cs
index 14d21a96..2b2b7430 100644
--- a/src/openHAB.Windows/ViewModel/ConfigurationViewModel.cs
+++ b/src/openHAB.Windows/ViewModel/ConfigurationViewModel.cs
@@ -1,364 +1,352 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading.Tasks;
+using CommunityToolkit.WinUI;
 using Microsoft.Extensions.Logging;
-using OpenHAB.Core.Contracts.Services;
-using OpenHAB.Core.Messages;
-using OpenHAB.Core.Model;
-using OpenHAB.Core.Model.Connection;
-using OpenHAB.Core.SDK;
-using OpenHAB.Core.Services;
-using Windows.ApplicationModel.Core;
-using Windows.UI.Core;
-
-namespace OpenHAB.Windows.ViewModel
+using Microsoft.Extensions.Options;
+using openHAB.Core;
+using openHAB.Core.Client.Connection.Contracts;
+using openHAB.Core.Client.Connection.Models;
+using openHAB.Core.Client.Options;
+using openHAB.Core.Model;
+using openHAB.Core.Services.Contracts;
+using ConnectionState = openHAB.Core.Client.Connection.Models.ConnectionState;
+
+namespace openHAB.Windows.ViewModel;
+
+/// <summary>
+/// Class that holds all the OpenHAB Windows application settings.
+/// </summary>
+public class ConfigurationViewModel : ViewModelBase<object>
 {
+    private readonly IAppManager _appManager;
+    private readonly ConnectionOptions _connection;
+    private readonly ILogger<ConfigurationViewModel> _logger;
+    private readonly SettingOptions _settings;
+    private List<LanguageViewModel> _appLanguages;
+    private bool? _canAppAutostartEnabled;
+    private bool? _isAppAutostartEnabled;
+    private bool? _isRunningInDemoMode;
+    private ConnectionDialogViewModel _localConnection;
+    private bool? _notificationsEnable;
+    private ConnectionDialogViewModel _remoteConnection;
+    private LanguageViewModel _selectedAppLanguage;
+
+    private ApplicationThemeViewModel _selectedAppTheme;
+    private bool _showDefaultSitemap;
+    private bool? _startAppMinimized;
+    private bool _useSVGIcons;
+    private List<ApplicationThemeViewModel> _appThemes;
+
     /// <summary>
-    /// Class that holds all the OpenHAB Windows application settings.
+    /// Initializes a new instance of the <see cref="ConfigurationViewModel"/> class.
     /// </summary>
-    public class ConfigurationViewModel : ViewModelBase<object>
+    /// <param name="appManager">The application manager.</param>
+    /// <param name="connectionService">The connection service.</param>
+    /// <param name="logger">The logger instance.</param>
+    /// <param name="settingsOptions">The settings options.</param>
+    /// <param name="connectionOptions">The connection options.</param>
+    public ConfigurationViewModel(
+        IAppManager appManager,
+        IConnectionService connectionService,
+        ILogger<ConfigurationViewModel> logger,
+        IOptions<SettingOptions> settingsOptions,
+        IOptions<ConnectionOptions> connectionOptions)
+        : base(new object())
     {
-        private readonly ILogger<ConfigurationViewModel> _logger;
-        private readonly Settings _settings;
-        private readonly IAppManager _appManager;
-        private readonly ISettingsService _settingsService;
-        private List<LanguageViewModel> _appLanguages;
-        private bool? _canAppAutostartEnabled;
-        private bool? _isAppAutostartEnabled;
-        private bool? _isRunningInDemoMode;
-        private ConnectionDialogViewModel _localConnection;
-        private ConnectionDialogViewModel _remoteConnection;
-        private LanguageViewModel _selectedAppLanguage;
-
-        private bool _showDefaultSitemap;
-        private bool? _startAppMinimized;
-        private bool _useSVGIcons;
-        private bool? _notificationsEnable;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ConfigurationViewModel"/> class.
-        /// </summary>
-        public ConfigurationViewModel(ISettingsService settingsService, IAppManager appManager, IOpenHAB openHabsdk, ILogger<ConfigurationViewModel> logger, Settings settings)
-            : base(new object())
-        {
-            _settingsService = settingsService;
-            _logger = logger;
-            _settings = settings;
-            _appManager = appManager;
-
-            _localConnection = new ConnectionDialogViewModel(_settings.LocalConnection, openHabsdk, OpenHABHttpClientType.Local);
-            _localConnection.PropertyChanged += ConnectionPropertyChanged;
-
-            _remoteConnection = new ConnectionDialogViewModel(_settings.RemoteConnection, openHabsdk, OpenHABHttpClientType.Remote);
-            _remoteConnection.PropertyChanged += ConnectionPropertyChanged;
-
-            _isRunningInDemoMode = _settings.IsRunningInDemoMode;
-            _showDefaultSitemap = _settings.ShowDefaultSitemap;
-            _useSVGIcons = _settings.UseSVGIcons;
-            _startAppMinimized = _settings.StartAppMinimized;
-            _notificationsEnable = _settings.NotificationsEnable;
-
-            CoreDispatcher dispatcher = CoreApplication.MainView.CoreWindow.Dispatcher;
-            Task<bool> taskCanEnableAutostart = _appManager.CanEnableAutostart();
-            taskCanEnableAutostart.ContinueWith(result =>
-            {
-                dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
-                {
-                    CanAppAutostartEnabled = result.Result;
-                });
-            });
-
-            Task<bool> taskStartupEnbabled = _appManager.IsStartupEnabled();
-            taskStartupEnbabled.ContinueWith(result =>
-            {
-                dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
-                {
-                    IsAppAutostartEnabled = result.Result;
-                });
-            });
+        _logger = logger;
+        _settings = settingsOptions.Value;
+        _connection = connectionOptions.Value;
+        _appManager = appManager;
 
-            _appLanguages = InitalizeAppLanguages();
-            _selectedAppLanguage =
-                _appLanguages.FirstOrDefault(x => string.Compare(x.Code, _settings.AppLanguage, StringComparison.InvariantCultureIgnoreCase) == 0);
+        _localConnection = new ConnectionDialogViewModel(_connection.LocalConnection, connectionService, HttpClientType.Local);
+        _localConnection.PropertyChanged += ConnectionPropertyChanged;
 
-            PropertyChanged += ConfigurationViewModel_PropertyChanged;
-        }
+        _remoteConnection = new ConnectionDialogViewModel(_connection.RemoteConnection, connectionService, HttpClientType.Remote);
+        _remoteConnection.PropertyChanged += ConnectionPropertyChanged;
 
-        /// <summary>
-        /// Gets or sets the supported application languages.
-        /// </summary>
-        /// <value>The application languages.</value>
-        public List<LanguageViewModel> AppLanguages
-        {
-            get
-            {
-                return _appLanguages;
-            }
+        _isRunningInDemoMode = _connection.IsRunningInDemoMode;
+        _showDefaultSitemap = _settings.ShowDefaultSitemap;
+        _useSVGIcons = _settings.UseSVGIcons;
+        _startAppMinimized = _settings.StartAppMinimized;
+        _notificationsEnable = _settings.NotificationsEnable;
 
-            set
-            {
-                Set(ref _appLanguages, value);
-            }
-        }
+        _appThemes = Enum.GetValues<AppTheme>().Select(x => new ApplicationThemeViewModel(x)).ToList();
+        _selectedAppTheme = _appThemes.FirstOrDefault(x => x.Model == _settings.AppTheme);
 
-        /// <summary>Gets or sets the can application autostart enabled.</summary>
-        /// <value>The can application autostart enabled.</value>
-        public bool? CanAppAutostartEnabled
-        {
-            get
-            {
-                return _canAppAutostartEnabled;
-            }
+        InitializeAutostartSettings();
+        InitializeAppLanguage();
 
-            set
-            {
-                _canAppAutostartEnabled = value;
-                OnPropertyChanged(nameof(CanAppAutostartEnabled));
-            }
-        }
+        PropertyChanged += ConfigurationViewModel_PropertyChanged;
+        OnPropertyChanged(nameof(SelectedAppTheme));
+    }
 
-        /// <summary>Gets or sets the is application autostart is enabled.</summary>
-        /// <value>The is application autostart enabled.</value>
-        public bool? IsAppAutostartEnabled
-        {
-            get
-            {
-                return _isAppAutostartEnabled;
-            }
+    #region Properties
 
-            set
-            {
-                _isAppAutostartEnabled = value;
-                OnPropertyChanged(nameof(IsAppAutostartEnabled));
-            }
-        }
+    /// <summary>
+    /// Gets or sets the supported application languages.
+    /// </summary>
+    /// <value>The application languages.</value>
+    public List<LanguageViewModel> AppLanguages
+    {
+        get => _appLanguages;
+        set => Set(ref _appLanguages, value);
+    }
+
+    /// <summary>
+    /// Gets or sets the supported application themes.
+    /// </summary>
+    /// <value>The application themes.</value>
+    public List<ApplicationThemeViewModel> AppThemes
+    {
+        get => _appThemes;
+        set => Set(ref _appThemes, value);
+    }
 
-        /// <summary>Gets a value indicating whether this instance is dirty.</summary>
-        /// <value>
-        ///   <c>true</c> if this instance is dirty; otherwise, <c>false</c>.</value>
-        public new bool IsDirty
+    /// <summary>
+    /// Gets or sets the can application autostart enabled.
+    /// </summary>
+    /// <value>The can application autostart enabled.</value>
+    public bool? CanAppAutostartEnabled
+    {
+        get => _canAppAutostartEnabled;
+        set => App.DispatcherQueue.EnqueueAsync(() =>
         {
-            get
-            {
-                return base.IsDirty || LocalConnection.IsDirty || RemoteConnection.IsDirty;
-            }
-        }
+            _canAppAutostartEnabled = value;
+            OnPropertyChanged(nameof(CanAppAutostartEnabled));
+        });
+    }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether the app is currently running in demo mode.
-        /// </summary>
-        public bool? IsRunningInDemoMode
+    /// <summary>
+    /// Gets or sets the is application autostart is enabled.
+    /// </summary>
+    /// <value>The is application autostart enabled.</value>
+    public bool? IsAppAutostartEnabled
+    {
+        get => _isAppAutostartEnabled;
+        set => App.DispatcherQueue.EnqueueAsync(() =>
         {
-            get
-            {
-                return _isRunningInDemoMode;
-            }
+            _isAppAutostartEnabled = value;
+            OnPropertyChanged(nameof(IsAppAutostartEnabled));
+        });
+    }
 
-            set
-            {
-                if (Set(ref _isRunningInDemoMode, value, true))
-                {
-                    _settings.IsRunningInDemoMode = value;
-                }
-            }
-        }
+    /// <summary>
+    /// Gets a value indicating whether this instance is dirty.
+    /// </summary>
+    /// <value>
+    ///   <c>true</c> if this instance is dirty; otherwise, <c>false</c>.</value>
+    public new bool IsDirty => base.IsDirty || LocalConnection.IsDirty || RemoteConnection.IsDirty;
 
-        /// <summary>
-        /// Gets or sets local OpenHAB connection configuration.
-        /// </summary>
-        public ConnectionDialogViewModel LocalConnection
+    /// <summary>
+    /// Gets or sets a value indicating whether the app is currently running in demo mode.
+    /// </summary>
+    public bool? IsRunningInDemoMode
+    {
+        get => _isRunningInDemoMode;
+        set
         {
-            get
+            if (Set(ref _isRunningInDemoMode, value, true))
             {
-                return _localConnection;
-            }
-
-            set
-            {
-                Set(ref _localConnection, value);
+                _connection.IsRunningInDemoMode = value;
             }
         }
+    }
 
-        /// <summary>Gets or sets the setting if notifications are enabled.</summary>
-        /// <value>The application triggers notification on openHAB events.</value>
-        public bool? NotificationsEnable
+    /// <summary>
+    /// Gets or sets local OpenHAB connection configuration.
+    /// </summary>
+    public ConnectionDialogViewModel LocalConnection
+    {
+        get => _localConnection;
+        set
         {
-            get
-            {
-                return _notificationsEnable;
-            }
-
-            set
+            if (Set(ref _localConnection, value))
             {
-                if (Set(ref _notificationsEnable, value, true))
-                {
-                    _settings.NotificationsEnable = value;
-                }
+                _connection.LocalConnection = value.Model;
             }
         }
+    }
 
-        /// <summary>
-        /// Gets or sets remote OpenHAB connection configuration.
-        /// </summary>
-        public ConnectionDialogViewModel RemoteConnection
+    /// <summary>
+    /// Gets or sets the setting if notifications are enabled.
+    /// </summary>
+    /// <value>The application triggers notification on openHAB events.</value>
+    public bool? NotificationsEnable
+    {
+        get => _notificationsEnable;
+        set
         {
-            get
+            if (Set(ref _notificationsEnable, value, true))
             {
-                return _remoteConnection;
-            }
-
-            set
-            {
-                Set(ref _remoteConnection, value);
+                _settings.NotificationsEnable = value;
             }
         }
+    }
 
-        /// <summary>
-        /// Gets or sets the selected application language.
-        /// </summary>
-        /// <value>The selected application language.</value>
-        public LanguageViewModel SelectedAppLanguage
+    /// <summary>
+    /// Gets or sets remote OpenHAB connection configuration.
+    /// </summary>
+    public ConnectionDialogViewModel RemoteConnection
+    {
+        get => _remoteConnection;
+        set
         {
-            get
+            if (Set(ref _remoteConnection, value))
             {
-                return _selectedAppLanguage;
-            }
-
-            set
-            {
-                if (Set(ref _selectedAppLanguage, value, true))
-                {
-                    _settings.AppLanguage = value.Code;
-                }
+                _connection.RemoteConnection = value.Model;
             }
         }
+    }
 
-        /// <summary>
-        /// Gets or sets a value indicating whether the default sitemap should be visible.
-        /// </summary>
-        /// <value>The hide default sitemap.</value>
-        public bool ShowDefaultSitemap
+    /// <summary>
+    /// Gets or sets the selected application language.
+    /// </summary>
+    /// <value>The selected application language.</value>
+    public LanguageViewModel SelectedAppLanguage
+    {
+        get => _selectedAppLanguage;
+        set
         {
-            get
-            {
-                return _showDefaultSitemap;
-            }
-
-            set
+            if (Set(ref _selectedAppLanguage, value, true))
             {
-                if (Set(ref _showDefaultSitemap, value, true))
-                {
-                    _settings.ShowDefaultSitemap = value;
-                }
+                _settings.AppLanguage = value.Code;
             }
         }
+    }
 
-        /// <summary>Gets or sets the start application minimized.</summary>
-        /// <value>The start application minimized.</value>
-        public bool? StartAppMinimized
+    public ApplicationThemeViewModel SelectedAppTheme
+    {
+        get => _selectedAppTheme;
+        set
         {
-            get
+            if (value != null)
             {
-                return _startAppMinimized;
+                _settings.AppTheme = value.Model;
+                Set<ApplicationThemeViewModel>(ref _selectedAppTheme, value, true);
             }
+        }
+    }
 
-            set
+    /// <summary>
+    /// Gets or sets a value indicating whether the default sitemap should be visible.
+    /// </summary>
+    /// <value>The hide default sitemap.</value>
+    public bool ShowDefaultSitemap
+    {
+        get => _showDefaultSitemap;
+        set
+        {
+            if (Set(ref _showDefaultSitemap, value, true))
             {
-                if (Set(ref _startAppMinimized, value, true))
-                {
-                    _settings.StartAppMinimized = value;
-                }
+                _settings.ShowDefaultSitemap = value;
             }
         }
+    }
 
-        /// <summary>Gets or sets a value indicating whether [use SVG icons].</summary>
-        /// <value>
-        ///   <c>true</c> if [use SVG icons]; otherwise, <c>false</c>.</value>
-        public bool UseSVGIcons
+    /// <summary>
+    /// Gets or sets the start application minimized.
+    /// </summary>
+    /// <value>The start application minimized.</value>
+    public bool? StartAppMinimized
+    {
+        get => _startAppMinimized;
+        set
         {
-            get
+            if (Set(ref _startAppMinimized, value, true))
             {
-                return _useSVGIcons;
+                _settings.StartAppMinimized = value;
             }
+        }
+    }
 
-            set
+    /// <summary>
+    /// Gets or sets a value indicating whether [use SVG icons].
+    /// </summary>
+    /// <value>
+    ///   <c>true</c> if [use SVG icons]; otherwise, <c>false</c>.</value>
+    public bool UseSVGIcons
+    {
+        get => _useSVGIcons;
+        set
+        {
+            if (Set(ref _useSVGIcons, value, true))
             {
-                if (Set(ref _useSVGIcons, value, true))
-                {
-                    _settings.UseSVGIcons = value;
-                }
+                _settings.UseSVGIcons = value;
             }
         }
+    }
 
-        /// <summary>Determines whether [is connection configuration valid].</summary>
-        /// <returns>
-        ///   <c>true</c> if [is connection configuration valid]; otherwise, <c>false</c>.</returns>
-        public bool IsConnectionConfigValid()
-        {
-            bool validConfig = IsRunningInDemoMode.Value ||
-                     (!string.IsNullOrEmpty(LocalConnection?.Url) && LocalConnection?.Status.State == ConnectionState.OK) ||
-                     (!string.IsNullOrEmpty(RemoteConnection?.Url) && RemoteConnection?.Status.State == ConnectionState.OK);
+    #endregion
 
-            _logger.LogInformation($"Valid application configuration: {validConfig}");
+    /// <summary>
+    /// Determines whether [is connection configuration valid].
+    /// </summary>
+    /// <returns>
+    ///   <c>true</c> if [is connection configuration valid]; otherwise, <c>false</c>.</returns>
+    public bool IsConnectionConfigValid()
+    {
+        bool validConfig = IsRunningInDemoMode.Value ||
+                 (!string.IsNullOrEmpty(LocalConnection?.Url) && LocalConnection?.Status.State == ConnectionState.OK) ||
+                 (!string.IsNullOrEmpty(RemoteConnection?.Url) && RemoteConnection?.Status.State == ConnectionState.OK);
 
-            return validConfig;
-        }
+        _logger.LogInformation("Valid application configuration: {ValidConfig}", validConfig);
 
-        /// <summary>
-        /// Persists the settings to disk.
-        /// </summary>
-        /// <returns>True if settings saved successful, otherwise false.</returns>
-        public bool Save()
-        {
-            _settings.LocalConnection = _localConnection.Model;
-            _settings.RemoteConnection = _remoteConnection.Model;
+        return validConfig;
+    }
 
-            bool result = _settingsService.Save(_settings);
-            _settingsService.SetProgramLanguage(null);
+    /// <summary>
+    /// Persists the settings to disk.
+    /// </summary>
+    /// <returns>True if settings saved successful, otherwise false.</returns>
+    public bool Save()
+    {
+        _connection.LocalConnection = _localConnection.Model;
+        _connection.RemoteConnection = _remoteConnection.Model;
 
-            return result;
-        }
+        bool result = _settings.Save();
+        result &= _connection.Save(AppPaths.ConnectionFilePath);
+        _appManager.SetProgramLanguage(null);
+        _appManager.SetAppTheme(App.MainWindow.Content);
 
-        private void ConfigurationViewModel_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
-        {
-            if (e.PropertyName != nameof(IsDirty) && e.PropertyName != nameof(CanAppAutostartEnabled) && e.PropertyName != nameof(IsAppAutostartEnabled))
-            {
-                OnPropertyChanged(nameof(IsDirty));
-            }
-        }
+        return result;
+    }
 
-        private void ConnectionPropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+    private void ConfigurationViewModel_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+    {
+        if (e.PropertyName != nameof(IsDirty) && e.PropertyName != nameof(CanAppAutostartEnabled) && e.PropertyName != nameof(IsAppAutostartEnabled))
         {
             OnPropertyChanged(nameof(IsDirty));
         }
+    }
 
-        private List<LanguageViewModel> InitalizeAppLanguages()
-        {
-            List<LanguageViewModel> appLanguages = new List<LanguageViewModel>();
-            LanguageViewModel system = new LanguageViewModel()
-            {
-                Name = "System",
-                Code = null
-            };
+    private void ConnectionPropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+    {
+        OnPropertyChanged(nameof(IsDirty));
+    }
 
-            LanguageViewModel english = new LanguageViewModel()
-            {
-                Name = "English",
-                Code = "en-us"
-            };
+    private void InitializeAppLanguage()
+    {
+        _appLanguages = InitializeAppLanguages();
 
-            LanguageViewModel german = new LanguageViewModel()
-            {
-                Name = "Deutsch",
-                Code = "de-de"
-            };
+        _selectedAppLanguage = string.IsNullOrEmpty(_settings.AppLanguage)
+            ? _appLanguages.FirstOrDefault(x => x.Code == null)
+            : _appLanguages.FirstOrDefault(x => string.Equals(x.Code, _settings.AppLanguage, StringComparison.InvariantCultureIgnoreCase));
+    }
 
-            appLanguages.Add(system);
-            appLanguages.Add(english);
-            appLanguages.Add(german);
+    private List<LanguageViewModel> InitializeAppLanguages()
+    {
+        return new List<LanguageViewModel>
+        {
+            new LanguageViewModel { Name = "System", Code = null },
+            new LanguageViewModel { Name = "English", Code = "en-US" },
+            new LanguageViewModel { Name = "Deutsch", Code = "de-DE" }
+        };
+    }
 
-            return appLanguages;
-        }
+    private async void InitializeAutostartSettings()
+    {
+        CanAppAutostartEnabled = await _appManager.CanEnableAutostart();
+        IsAppAutostartEnabled = await _appManager.IsStartupEnabled();
     }
 }
diff --git a/src/openHAB.Windows/ViewModel/ConnectionDialogViewModel.cs b/src/openHAB.Windows/ViewModel/ConnectionDialogViewModel.cs
index c5da8fca..d2937f28 100644
--- a/src/openHAB.Windows/ViewModel/ConnectionDialogViewModel.cs
+++ b/src/openHAB.Windows/ViewModel/ConnectionDialogViewModel.cs
@@ -1,273 +1,272 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Windows.Input;
 using CommunityToolkit.Mvvm.Input;
-using OpenHAB.Core;
-using OpenHAB.Core.Common;
-using OpenHAB.Core.Contracts;
-using OpenHAB.Core.Model;
-using OpenHAB.Core.Model.Connection;
-using OpenHAB.Core.SDK;
-
-namespace OpenHAB.Windows.ViewModel
+using openHAB.Common;
+using openHAB.Core.Client.Connection.Contracts;
+using openHAB.Core.Client.Connection.Models;
+using openHAB.Core.Common;
+
+namespace openHAB.Windows.ViewModel;
+
+/// <summary>
+/// ViewModel for OpenHAB connection dialog.
+/// </summary>
+public class ConnectionDialogViewModel : ViewModelBase<Connection>
 {
+    private readonly HttpClientType _type;
+    private string _password;
+    private ConnectionProfileViewModel _profile;
+    private ObservableCollection<ConnectionProfileViewModel> _profiles;
+    private ICommand _selectProfile;
+    private string _url;
+    private ICommand _urlCheckCommand;
+    private ConnectionStatusViewModel _connectionStatus;
+    private string _username;
+    private bool? _willIgnoreSSLCertificate;
+    private bool? _willIgnoreSSLHostname;
+
     /// <summary>
-    /// ViewModel for OpenHAB connection dialog.
+    /// Initializes a new instance of the <see cref="ConnectionDialogViewModel"/> class.
     /// </summary>
-    public class ConnectionDialogViewModel : ViewModelBase<OpenHABConnection>
+    /// <param name="connectionConfig">The connection configuration.</param>
+    /// <param name="connectionService">ConnectionService to retrive connection information.</param>
+    /// <param name="type">Defines if openHAB instance is local or remote.</param>
+    public ConnectionDialogViewModel(Connection connectionConfig, IConnectionService connectionService, HttpClientType type)
+        : base(connectionConfig)
     {
-        private readonly OpenHABHttpClientType _type;
-        private string _password;
-        private ConnectionProfileViewModel _profile;
-        private ObservableCollection<ConnectionProfileViewModel> _profiles;
-        private ICommand _selectProfile;
-        private string _url;
-        private ICommand _urlCheckCommand;
-        private ConnectionStatusViewModel _connectionStatus;
-        private string _username;
-        private bool? _willIgnoreSSLCertificate;
-        private bool? _willIgnoreSSLHostname;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ConnectionDialogViewModel"/> class.
-        /// </summary>
-        /// <param name="connectionConfig">The connection configuration.</param>
-        /// <param name="openHabsdk">OpenHABSDK class.</param>
-        /// <param name="type">Defines if openHAB instance is local or remote.</param>
-        public ConnectionDialogViewModel(OpenHABConnection connectionConfig, IOpenHAB openHabsdk, OpenHABHttpClientType type)
-            : base(connectionConfig)
-        {
-            _type = type;
-
-            List<ConnectionProfileViewModel> list
-                = new List<ConnectionProfileViewModel>(Settings.ConnectionProfiles.Where(x => x.Type == _type).OrderBy(x => x.Id).Select(x => new ConnectionProfileViewModel(x)));
-
-            _profiles = new ObservableCollection<ConnectionProfileViewModel>(list);
+        _type = type;
 
-            if (Model != null)
-            {
-                _profile = list.FirstOrDefault(x => x.Id == Model.Profile.Id);
-            }
-
-            _connectionStatus = new ConnectionStatusViewModel(openHabsdk);
+        List<ConnectionProfileViewModel> list
+            = new List<ConnectionProfileViewModel>(ConnectionProfiles.GetProfiles().Where(x => x.Type == _type)
+            .OrderBy(x => x.Id)
+            .Select(x => new ConnectionProfileViewModel(x)));
 
-            if (!string.IsNullOrEmpty(Model?.Url))
-            {
-                CheckConnectionSettings(null);
-            }
+        _profiles = new ObservableCollection<ConnectionProfileViewModel>(list);
 
-            _username = Model?.Username;
-            _password = Model?.Password;
-            _url = Model?.Url;
-            _willIgnoreSSLHostname = Model?.WillIgnoreSSLHostname;
-            _willIgnoreSSLCertificate = Model?.WillIgnoreSSLCertificate;
-        }
-
-        /// <summary>Gets a value indicating whether [host URL] value can be modified.</summary>
-        /// <value>
-        ///   <c>true</c> if [host URL configuration] can be modified; otherwise, <c>false</c>.</value>
-        public bool AllowHostUrlConfiguration
+        if (Model != null)
         {
-            get => Profile?.AllowHostUrlConfiguration ?? false;
+            _profile = list.FirstOrDefault(x => x.Id == Model.Profile.Id);
         }
 
-        /// <summary>Gets a value indicating whether [allow ignore SSL certificate] issues option is available.</summary>
-        /// <value>
-        ///   <c>true</c> if [allow ignore SSL certificate] is available; otherwise, <c>false</c>.</value>
-        public bool AllowIgnoreSSLCertificate
-        {
-            get => Profile?.AllowIgnoreSSLCertificate ?? false;
-        }
+        _connectionStatus = new ConnectionStatusViewModel(connectionService);
 
-        /// <summary>Gets a value indicating whether [host URL] value can be modified.</summary>
-        /// <value>
-        ///   <c>true</c> if [host URL configuration] can be modified; otherwise, <c>false</c>.</value>
-        public bool AllowIgnoreSSLHostname
+        if (!string.IsNullOrEmpty(Model?.Url))
         {
-            get => Profile?.AllowIgnoreSSLHostname ?? false;
+            CheckConnectionSettings(null);
         }
 
-        /// <summary>
-        /// Gets or sets the password for the local OpenHAB connection.
-        /// </summary>
-        public string Password
-        {
-            get => _password;
-            set
-            {
-                Set(ref _password, value, true);
-                Model.Password = value;
-            }
-        }
+        _username = Model?.Username;
+        _password = Model?.Password;
+        _url = Model?.Url;
+        _willIgnoreSSLHostname = Model?.WillIgnoreSSLHostname;
+        _willIgnoreSSLCertificate = Model?.WillIgnoreSSLCertificate;
+    }
 
-        /// <summary>Gets or sets the profile for the connection.</summary>
-        /// <value>The profile.</value>
-        public ConnectionProfileViewModel Profile
-        {
-            get => _profile;
-            set
-            {
-                Set(ref _profile, value);
+    /// <summary>Gets a value indicating whether [host URL] value can be modified.</summary>
+    /// <value>
+    ///   <c>true</c> if [host URL configuration] can be modified; otherwise, <c>false</c>.</value>
+    public bool AllowHostUrlConfiguration
+    {
+        get => Profile?.AllowHostUrlConfiguration ?? false;
+    }
 
-                if (Model != null && value != null)
-                {
-                    Model.Profile = value.Model;
-                }
-            }
-        }
+    /// <summary>Gets a value indicating whether [allow ignore SSL certificate] issues option is available.</summary>
+    /// <value>
+    ///   <c>true</c> if [allow ignore SSL certificate] is available; otherwise, <c>false</c>.</value>
+    public bool AllowIgnoreSSLCertificate
+    {
+        get => Profile?.AllowIgnoreSSLCertificate ?? false;
+    }
+
+    /// <summary>Gets a value indicating whether [host URL] value can be modified.</summary>
+    /// <value>
+    ///   <c>true</c> if [host URL configuration] can be modified; otherwise, <c>false</c>.</value>
+    public bool AllowIgnoreSSLHostname
+    {
+        get => Profile?.AllowIgnoreSSLHostname ?? false;
+    }
 
-        /// <summary>Gets or sets the connection status.</summary>
-        /// <value>The connection status.</value>
-        public ConnectionStatusViewModel Status
+    /// <summary>
+    /// Gets or sets the password for the local OpenHAB connection.
+    /// </summary>
+    public string Password
+    {
+        get => _password;
+        set
         {
-            get => _connectionStatus;
-            set
-            {
-                Set(ref _connectionStatus, value);
-            }
+            Set(ref _password, value, true);
+            Model.Password = value;
         }
+    }
 
-        /// <summary>Gets or sets the available connection profiles.</summary>
-        /// <value>The profiles.</value>
-        public ObservableCollection<ConnectionProfileViewModel> Profiles
+    /// <summary>Gets or sets the profile for the connection.</summary>
+    /// <value>The profile.</value>
+    public ConnectionProfileViewModel Profile
+    {
+        get => _profile;
+        set
         {
-            get => _profiles;
-            set
+            Set(ref _profile, value);
+
+            if (Model != null && value != null)
             {
-                Set(ref _profiles, value);
+                Model.Profile = value.Model;
             }
         }
+    }
 
-        /// <summary>
-        /// Gets the save command to persist the settings.
-        /// </summary>
-        /// <value>The save command.</value>
-        public ICommand SelectProfile => _selectProfile ?? (_selectProfile = new ActionCommand(ExecuteSelectProfile));
-
-        /// <summary>
-        /// Gets the subtitle.
-        /// </summary>
-        /// <value>The subtitle.</value>
-        public string Subtitle
+    /// <summary>Gets or sets the connection status.</summary>
+    /// <value>The connection status.</value>
+    public ConnectionStatusViewModel Status
+    {
+        get => _connectionStatus;
+        set
         {
-            get
-            {
-                if (string.IsNullOrEmpty(Url))
-                {
-                    return AppResources.Values.GetString("ConnectionNotConfigured");
-                }
-
-                if (Uri.TryCreate(Url, UriKind.Absolute, out Uri uri) &&
-                    string.Compare(uri.Scheme.ToUpperInvariant(), "HTTPS", StringComparison.InvariantCulture) == 0)
-                {
-                    return $"{AppResources.Values.GetString("EncryptedConnection")} {Url}";
-                }
-
-                return $"{AppResources.Values.GetString("UnencryptedConnection")} {Url}";
-            }
+            Set(ref _connectionStatus, value);
         }
+    }
 
-        /// <summary>
-        /// Gets or sets the URL to the OpenHAB server.
-        /// </summary>
-        public string Url
+    /// <summary>Gets or sets the available connection profiles.</summary>
+    /// <value>The profiles.</value>
+    public ObservableCollection<ConnectionProfileViewModel> Profiles
+    {
+        get => _profiles;
+        set
         {
-            get => _url;
-            set
-            {
-                string tempUrl;
-                if (!string.IsNullOrEmpty(value) && !value.EndsWith("/", StringComparison.InvariantCultureIgnoreCase))
-                {
-                    tempUrl = value + "/";
-                }
-                else
-                {
-                    tempUrl = value;
-                }
-
-                Set(ref _url, tempUrl, true);
-                Model.Url = _url;
-
-                OnPropertyChanged(nameof(Subtitle));
-            }
+            Set(ref _profiles, value);
         }
+    }
 
-        /// <summary>
-        /// Gets the command for local URL check.
-        /// </summary>
-        /// <value>The local URL check command.</value>
-        public ICommand UrlCheckCommand => _urlCheckCommand ?? (_urlCheckCommand = new RelayCommand<object>(CheckConnectionSettings));
+    /// <summary>
+    /// Gets the save command to persist the settings.
+    /// </summary>
+    /// <value>The save command.</value>
+    public ICommand SelectProfile => _selectProfile ?? (_selectProfile = new ActionCommand(ExecuteSelectProfile));
 
-        /// <summary>
-        /// Gets or sets the username for the local OpenHAB server connection.
-        /// </summary>
-        public string Username
+    /// <summary>
+    /// Gets the subtitle.
+    /// </summary>
+    /// <value>The subtitle.</value>
+    public string Subtitle
+    {
+        get
         {
-            get => _username;
-            set
+            if (string.IsNullOrEmpty(Url))
             {
-                Set(ref _username, value, true);
-                Model.Username = value;
+                return AppResources.Values.GetString("ConnectionNotConfigured");
             }
-        }
 
-        /// <summary>
-        ///  Gets or sets a value indicating whether the application will ignore the SSL certificate.
-        /// </summary>
-        public bool? WillIgnoreSSLCertificate
-        {
-            get => _willIgnoreSSLCertificate;
-            set
+            if (Uri.TryCreate(Url, UriKind.Absolute, out Uri uri) &&
+                string.Compare(uri.Scheme.ToUpperInvariant(), "HTTPS", StringComparison.InvariantCulture) == 0)
             {
-                Set(ref _willIgnoreSSLCertificate, value, true);
-                Model.WillIgnoreSSLCertificate = value;
+                return $"{AppResources.Values.GetString("EncryptedConnection")} {Url}";
             }
+
+            return $"{AppResources.Values.GetString("UnencryptedConnection")} {Url}";
         }
+    }
 
-        /// <summary>
-        ///  Gets or sets a value indicating whether the application will ignore the SSL hostname.
-        /// </summary>
-        public bool? WillIgnoreSSLHostname
+    /// <summary>
+    /// Gets or sets the URL to the OpenHAB server.
+    /// </summary>
+    public string Url
+    {
+        get => _url;
+        set
         {
-            get => _willIgnoreSSLHostname;
-            set
+            string tempUrl;
+            if (!string.IsNullOrEmpty(value) && !value.EndsWith("/", StringComparison.InvariantCultureIgnoreCase))
+            {
+                tempUrl = value + "/";
+            }
+            else
             {
-                Set(ref _willIgnoreSSLHostname, value, true);
-                Model.WillIgnoreSSLHostname = value;
+                tempUrl = value;
             }
+
+            Set(ref _url, tempUrl, true);
+            Model.Url = _url;
+
+            OnPropertyChanged(nameof(Subtitle));
         }
+    }
 
-        private void CheckConnectionSettings(object parameter)
+    /// <summary>
+    /// Gets the command for local URL check.
+    /// </summary>
+    /// <value>The local URL check command.</value>
+    public ICommand UrlCheckCommand => _urlCheckCommand ?? (_urlCheckCommand = new RelayCommand<object>(CheckConnectionSettings));
+
+    /// <summary>
+    /// Gets or sets the username for the local OpenHAB server connection.
+    /// </summary>
+    public string Username
+    {
+        get => _username;
+        set
         {
-            _connectionStatus.CheckConnectionSettings(Model.Url, Model);
+            Set(ref _username, value, true);
+            Model.Username = value;
         }
+    }
 
-        private void CreateProfile(IConnectionProfile value)
+    /// <summary>
+    ///  Gets or sets a value indicating whether the application will ignore the SSL certificate.
+    /// </summary>
+    public bool? WillIgnoreSSLCertificate
+    {
+        get => _willIgnoreSSLCertificate;
+        set
         {
-            Model = value.CreateConnection();
-            Model.Profile = value;
-
-            Url = Model.Url;
-            Username = Model.Username;
-            Password = Model.Password;
-            WillIgnoreSSLCertificate = Model.WillIgnoreSSLCertificate;
-            WillIgnoreSSLHostname = Model.WillIgnoreSSLHostname;
+            Set(ref _willIgnoreSSLCertificate, value, true);
+            Model.WillIgnoreSSLCertificate = value;
         }
+    }
 
-        private void ExecuteSelectProfile(object obj)
+    /// <summary>
+    ///  Gets or sets a value indicating whether the application will ignore the SSL hostname.
+    /// </summary>
+    public bool? WillIgnoreSSLHostname
+    {
+        get => _willIgnoreSSLHostname;
+        set
         {
-            ConnectionProfileViewModel profile = obj as ConnectionProfileViewModel;
+            Set(ref _willIgnoreSSLHostname, value, true);
+            Model.WillIgnoreSSLHostname = value;
+        }
+    }
 
-            if (profile != null)
-            {
-                CreateProfile(profile.Model);
+    private void CheckConnectionSettings(object parameter)
+    {
+        _connectionStatus.CheckConnectionSettings(Model.Url, Model);
+    }
 
-                OnPropertyChanged(nameof(AllowHostUrlConfiguration));
-                OnPropertyChanged(nameof(AllowIgnoreSSLCertificate));
-                OnPropertyChanged(nameof(AllowIgnoreSSLHostname));
-            }
+    private void CreateProfile(IConnectionProfile value)
+    {
+        Model = value.CreateConnection();
+        Model.Profile = value;
+
+        Url = Model.Url;
+        Username = Model.Username;
+        Password = Model.Password;
+        WillIgnoreSSLCertificate = Model.WillIgnoreSSLCertificate;
+        WillIgnoreSSLHostname = Model.WillIgnoreSSLHostname;
+    }
+
+    private void ExecuteSelectProfile(object obj)
+    {
+        ConnectionProfileViewModel profile = obj as ConnectionProfileViewModel;
+
+        if (profile != null)
+        {
+            CreateProfile(profile.Model);
+
+            OnPropertyChanged(nameof(AllowHostUrlConfiguration));
+            OnPropertyChanged(nameof(AllowIgnoreSSLCertificate));
+            OnPropertyChanged(nameof(AllowIgnoreSSLHostname));
         }
     }
 }
diff --git a/src/openHAB.Windows/ViewModel/ConnectionProfileViewModel.cs b/src/openHAB.Windows/ViewModel/ConnectionProfileViewModel.cs
index dc58d155..3882d6fa 100644
--- a/src/openHAB.Windows/ViewModel/ConnectionProfileViewModel.cs
+++ b/src/openHAB.Windows/ViewModel/ConnectionProfileViewModel.cs
@@ -1,47 +1,46 @@
-using OpenHAB.Core.Model.Connection;
-using OpenHAB.Windows.ViewModel;
+using openHAB.Core.Client.Connection.Contracts;
+using openHAB.Core.Client.Connection.Models;
 
-namespace OpenHAB.Core.Contracts
+namespace openHAB.Windows.ViewModel;
+
+/// <summary>
+/// ViewModel for connection profile.
+/// </summary>
+public class ConnectionProfileViewModel : ViewModelBase<IConnectionProfile>
 {
-    /// <summary>
-    /// ViewModel for connection profile.
-    /// </summary>
-    public class ConnectionProfileViewModel : ViewModelBase<IConnectionProfile>
+    /// <summary>Initializes a new instance of the <see cref="ConnectionProfileViewModel"/> class.</summary>
+    /// <param name="profile">The profile.</param>
+    public ConnectionProfileViewModel(IConnectionProfile profile)
+        : base(profile)
     {
-        /// <summary>Initializes a new instance of the <see cref="ConnectionProfileViewModel"/> class.</summary>
-        /// <param name="profile">The profile.</param>
-        public ConnectionProfileViewModel(IConnectionProfile profile)
-            : base(profile)
-        {
-        }
-
-        /// <summary>Gets a value indicating whether [host URL] value can be modified.</summary>
-        /// <value>
-        ///   <c>true</c> if [host URL configuration] can be modified; otherwise, <c>false</c>.</value>
-        public bool AllowHostUrlConfiguration => Model.AllowHostUrlConfiguration;
-
-        /// <summary>Gets a value indicating whether [allow ignore SSL certificate] issues option is available.</summary>
-        /// <value>
-        ///   <c>true</c> if [allow ignore SSL certificate] is available; otherwise, <c>false</c>.
-        /// </value>
-        public bool AllowIgnoreSSLCertificate => Model.AllowIgnoreSSLCertificate;
-
-        /// <summary>Gets a value indicating whether [allow ignore SSL hostname] issue option is available.</summary>
-        /// <value>
-        /// <c>true.</c> if [allow ignore SSL hostname] can be enabled; otherwise, <c>false.</c>.
-        /// </value>
-        public bool AllowIgnoreSSLHostname => Model.AllowIgnoreSSLHostname;
-
-        /// <summary>Gets the connection profile id.</summary>
-        /// <value>The id.</value>
-        public int Id => Model.Id;
-
-        /// <summary>Gets the connection profile name.</summary>
-        /// <value>The profile name.</value>
-        public string Name => Model.Name;
-
-        /// <summary>Gets the profile type.</summary>
-        /// <value>The type.</value>
-        public OpenHABHttpClientType Type => Model.Type;
     }
-}
\ No newline at end of file
+
+    /// <summary>Gets a value indicating whether [host URL] value can be modified.</summary>
+    /// <value>
+    ///   <c>true</c> if [host URL configuration] can be modified; otherwise, <c>false</c>.</value>
+    public bool AllowHostUrlConfiguration => Model.AllowHostUrlConfiguration;
+
+    /// <summary>Gets a value indicating whether [allow ignore SSL certificate] issues option is available.</summary>
+    /// <value>
+    ///   <c>true</c> if [allow ignore SSL certificate] is available; otherwise, <c>false</c>.
+    /// </value>
+    public bool AllowIgnoreSSLCertificate => Model.AllowIgnoreSSLCertificate;
+
+    /// <summary>Gets a value indicating whether [allow ignore SSL hostname] issue option is available.</summary>
+    /// <value>
+    /// <c>true.</c> if [allow ignore SSL hostname] can be enabled; otherwise, <c>false.</c>.
+    /// </value>
+    public bool AllowIgnoreSSLHostname => Model.AllowIgnoreSSLHostname;
+
+    /// <summary>Gets the connection profile id.</summary>
+    /// <value>The id.</value>
+    public int Id => Model.Id;
+
+    /// <summary>Gets the connection profile name.</summary>
+    /// <value>The profile name.</value>
+    public string Name => Model.Name;
+
+    /// <summary>Gets the profile type.</summary>
+    /// <value>The type.</value>
+    public HttpClientType Type => Model.Type;
+}
diff --git a/src/openHAB.Windows/ViewModel/ConnectionStatusViewModel.cs b/src/openHAB.Windows/ViewModel/ConnectionStatusViewModel.cs
index a054a86a..3f008e96 100644
--- a/src/openHAB.Windows/ViewModel/ConnectionStatusViewModel.cs
+++ b/src/openHAB.Windows/ViewModel/ConnectionStatusViewModel.cs
@@ -1,100 +1,98 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.Messaging;
-using OpenHAB.Core.Common;
-using OpenHAB.Core.Messages;
-using OpenHAB.Core.Model;
-using OpenHAB.Core.Model.Connection;
-using OpenHAB.Core.SDK;
-using Windows.ApplicationModel.Core;
-using Windows.UI.Core;
+using CommunityToolkit.WinUI;
+using Microsoft.UI.Dispatching;
+using openHAB.Core.Client.Common;
+using openHAB.Core.Client.Connection.Contracts;
+using openHAB.Core.Client.Connection.Models;
+using openHAB.Core.Client.Models;
+using openHAB.Core.Messages;
+using ConnectionState = openHAB.Core.Client.Connection.Models.ConnectionState;
 
-namespace OpenHAB.Windows.ViewModel
+namespace openHAB.Windows.ViewModel;
+
+/// <summary>
+/// ViewModel for OpenHAB connection status.
+/// </summary>
+public class ConnectionStatusViewModel : ViewModelBase<object>
 {
+    private readonly IConnectionService _connectionService;
+    private ConnectionState _connectionState;
+    private string _runtimeVersion;
+    private string _build;
+
     /// <summary>
-    /// ViewModel for OpenHAB connection status.
+    /// Initializes a new instance of the <see cref="ConnectionStatusViewModel"/> class.
     /// </summary>
-    public class ConnectionStatusViewModel : ViewModelBase<object>
+    /// <param name="connectionService">The connection service.</param>
+    public ConnectionStatusViewModel(IConnectionService connectionService)
+        : base(null)
     {
-        private readonly IOpenHAB _openHabsdk;
-
-        private ConnectionState _connectionState;
-
-        private string _runtimeVersion;
-        private string _build;
+        _connectionState = ConnectionState.Unknown;
+        _connectionService = connectionService;
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ConnectionStatusViewModel"/> class.
-        /// </summary>
-        /// <param name="openHabsdk">OpenHABSDK class.</param>
-        public ConnectionStatusViewModel(IOpenHAB openHabsdk)
-            : base(null)
-        {
-            _openHabsdk = openHabsdk;
-            _connectionState = ConnectionState.Unknown;
-        }
+    /// <summary>
+    /// Gets or sets the state for OpenHab connection.
+    /// </summary>
+    /// <value>The state of the connection.</value>
+    public ConnectionState State
+    {
+        get => _connectionState;
+        set => Set(ref _connectionState, value);
+    }
 
-        /// <summary>
-        /// Gets or sets the state for OpenHab connection.
-        /// </summary>
-        /// <value>The state of the connection.</value>
-        public ConnectionState State
-        {
-            get => _connectionState;
-            set => Set(ref _connectionState, value);
-        }
+    /// <summary>Gets or sets the runtime version.</summary>
+    /// <value>The runtime version.</value>
+    public string RuntimeVersion
+    {
+        get => _runtimeVersion;
+        set => Set(ref _runtimeVersion, value, true);
+    }
 
-        /// <summary>Gets or sets the runtime version.</summary>
-        /// <value>The runtime version.</value>
-        public string RuntimeVersion
-        {
-            get => _runtimeVersion;
-            set => Set(ref _runtimeVersion, value, true);
-        }
+    /// <summary>Gets or sets the build.</summary>
+    /// <value>The build.</value>
+    public string Build
+    {
+        get => _build;
+        set => Set(ref _build, value, true);
+    }
 
-        /// <summary>Gets or sets the build.</summary>
-        /// <value>The build.</value>
-        public string Build
+    /// <summary>Checks the connection settings.</summary>
+    /// <param name="url">The URL.</param>
+    /// <param name="connection">The connection.</param>
+    public void CheckConnectionSettings(string url, Connection connection)
+    {
+        Task<HttpResponseResult<ServerInfo>> result = _connectionService.GetOpenHABServerInfo(connection);
+        result.ContinueWith(async (task) =>
         {
-            get => _build;
-            set => Set(ref _build, value, true);
-        }
+            ConnectionState connectionState = ConnectionState.Unknown;
+            string runtimeVersion = string.Empty;
+            string build = string.Empty;
 
-        /// <summary>Checks the connection settings.</summary>
-        /// <param name="url">The URL.</param>
-        /// <param name="connection">The connection.</param>
-        public void CheckConnectionSettings(string url, OpenHABConnection connection)
-        {
-            Task<HttpResponseResult<ServerInfo>> result = _openHabsdk.GetOpenHABServerInfo(connection);
-            result.ContinueWith(async (task) =>
+            if (task.IsCompletedSuccessfully && task.Result.Content != null)
             {
-                ConnectionState connectionState = ConnectionState.Unknown;
-                string runtimeVersion = string.Empty;
-                string build = string.Empty;
+                ServerInfo serverInfo = task.Result.Content;
 
-                if (task.IsCompletedSuccessfully && task.Result.Content != null)
-                {
-                    ServerInfo serverInfo = task.Result.Content;
-
-                    runtimeVersion = serverInfo.RuntimeVersion;
-                    build = serverInfo.Build;
-                    connectionState = ConnectionState.OK;
-                }
-                else
-                {
-                    connectionState = ConnectionState.Failed;
-                }
-
-                CoreDispatcher dispatcher = CoreApplication.MainView.CoreWindow.Dispatcher;
-                await dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
-                {
-                    State = connectionState;
-                    RuntimeVersion = runtimeVersion;
-                    Build = build;
-                });
+                runtimeVersion = serverInfo.RuntimeVersion;
+                build = serverInfo.Build;
+                connectionState = ConnectionState.OK;
+            }
+            else
+            {
+                connectionState = ConnectionState.Failed;
+            }
 
-                StrongReferenceMessenger.Default.Send<ConnectionStatusChanged>(new ConnectionStatusChanged(connectionState));
+            DispatcherQueue dispatcherQueue = DispatcherQueue.GetForCurrentThread();
+            await App.DispatcherQueue.EnqueueAsync(() =>
+            {
+                State = connectionState;
+                RuntimeVersion = runtimeVersion;
+                Build = build;
             });
-        }
+
+            StrongReferenceMessenger.Default.Send<ConnectionStatusChanged>(new ConnectionStatusChanged(connectionState));
+        });
     }
 }
diff --git a/src/openHAB.Windows/ViewModel/IViewModel.cs b/src/openHAB.Windows/ViewModel/IViewModel.cs
index 06f09c6a..9333425d 100644
--- a/src/openHAB.Windows/ViewModel/IViewModel.cs
+++ b/src/openHAB.Windows/ViewModel/IViewModel.cs
@@ -1,21 +1,20 @@
-namespace OpenHAB.Windows.ViewModel
+namespace openHAB.Windows.ViewModel;
+
+/// <summary>
+/// IViewModelModelProp.
+/// </summary>
+/// <typeparam name="T">Model type interface.</typeparam>
+public interface IViewModel<T>
 {
     /// <summary>
-    /// IViewModelModelProp.
+    /// Gets or sets the model.
     /// </summary>
-    /// <typeparam name="T">Model type interface.</typeparam>
-    public interface IViewModel<T>
+    /// <value>
+    /// The model.
+    /// </value>
+    T Model
     {
-        /// <summary>
-        /// Gets or sets the model.
-        /// </summary>
-        /// <value>
-        /// The model.
-        /// </value>
-        T Model
-        {
-            get;
-            set;
-        }
+        get;
+        set;
     }
 }
diff --git a/src/openHAB.Windows/ViewModel/LanguageViewModel.cs b/src/openHAB.Windows/ViewModel/LanguageViewModel.cs
index d338da44..d8125805 100644
--- a/src/openHAB.Windows/ViewModel/LanguageViewModel.cs
+++ b/src/openHAB.Windows/ViewModel/LanguageViewModel.cs
@@ -1,22 +1,25 @@
-namespace OpenHAB.Windows.ViewModel
+namespace openHAB.Windows.ViewModel;
+
+/// <summary>
+/// ViewModel for Application Language.
+/// </summary>
+public class LanguageViewModel
 {
     /// <summary>
-    /// ViewModel for Application Language.
+    /// Gets or sets the language name.
     /// </summary>
-    public class LanguageViewModel
+    /// <value>The name.</value>
+    public string Name
     {
-        /// <summary>Gets or sets the language name.</summary>
-        /// <value>The name.</value>
-        public string Name
-        {
-            get; set;
-        }
+        get; set;
+    }
 
-        /// <summary>Gets or sets the language code.</summary>
-        /// <value>The language code.</value>
-        public string Code
-        {
-            get; set;
-        }
+    /// <summary>
+    /// Gets or sets the language code.
+    /// </summary>
+    /// <value>The language code.</value>
+    public string Code
+    {
+        get; set;
     }
-}
\ No newline at end of file
+}
diff --git a/src/openHAB.Windows/ViewModel/LogsViewModel.cs b/src/openHAB.Windows/ViewModel/LogsViewModel.cs
index 62fb4749..cfa227ad 100644
--- a/src/openHAB.Windows/ViewModel/LogsViewModel.cs
+++ b/src/openHAB.Windows/ViewModel/LogsViewModel.cs
@@ -1,182 +1,186 @@
-using System;
+using System;
+using System.Diagnostics;
 using System.IO;
 using System.Threading.Tasks;
 using System.Windows.Input;
+using CommunityToolkit.WinUI;
 using Microsoft.Extensions.Logging;
-using OpenHAB.Core.Common;
-using Windows.ApplicationModel.Core;
-using Windows.Storage;
-using Windows.System;
-using Windows.UI.Core;
+using openHAB.Core;
+using openHAB.Core.Common;
 
-namespace OpenHAB.Windows.ViewModel
+namespace openHAB.Windows.ViewModel;
+
+/// <summary>
+/// ViewModel for application logs.
+/// </summary>
+public class LogsViewModel : ViewModelBase<object>, IDisposable
 {
+    private readonly string _logFilename = $"{DateTime.Now:yyyy-MM-dd}.json";
+    private readonly ILogger<LogsViewModel> _logger;
+    private FileInfo _logFile;
+    private string _logFileContent;
+    private FileSystemWatcher _logFileWatcher;
+    private ICommand _openLogFileCommand;
+
     /// <summary>
-    /// ViewModel for application logs.
+    /// Initializes a new instance of the <see cref="LogsViewModel" /> class.
     /// </summary>
-    public class LogsViewModel : ViewModelBase<object>, IDisposable
+    /// <param name="logger">The logger instance.</param>
+    public LogsViewModel(ILogger<LogsViewModel> logger)
+        : base(null)
     {
-        private StorageFile _logFile;
-        private string _logFileContent;
-        private FileSystemWatcher _logFileWatcher;
-        private ILogger<LogsViewModel> _logger;
-        private string _logFilename = $"{DateTime.Now:yyyy-MM-dd}.log";
-        private ICommand _openLogFileCommand;
-
-        private CoreDispatcher _dispatcher = CoreApplication.MainView.CoreWindow.Dispatcher;
-
-        /// <summary>Initializes a new instance of the <see cref="LogsViewModel" /> class.</summary>
-        public LogsViewModel(ILogger<LogsViewModel> logger)
-            : base(null)
-        {
-            _logger = logger;
-            LoadLogfileAsync();
-        }
+        _logger = logger;
+        _ = LoadLogfileAsync();
+    }
 
-        /// <summary>Gets or sets the content of the log.</summary>
-        /// <value>The content of the log.</value>
-        public string LogContent
-        {
-            get
-            {
-                return _logFileContent;
-            }
+    /// <summary>
+    /// Gets or sets the content of the log.
+    /// </summary>
+    /// <value>The content of the log.</value>
+    public string LogContent
+    {
+        get => _logFileContent;
+        set => Set(ref _logFileContent, value);
+    }
 
-            set
-            {
-                Set(ref _logFileContent, value);
-            }
-        }
+    /// <summary>
+    /// Gets the log file name including extension.
+    /// </summary>
+    /// <value>The log file.</value>
+    public string LogFile => _logFile?.Name ?? string.Empty;
 
-        /// <summary>Gets the log file path.</summary>
-        /// <value>The log file path.</value>
-        public string LogFilePath
-        {
-            get
-            {
-                if (_logFile != null)
-                {
-                    return _logFile.Path;
-                }
+    /// <summary>
+    /// Asynchronously loads the log file content and registers a file observer.
+    /// </summary>
+    private async Task LoadLogfileAsync()
+    {
+        await LoadLogFileContent().ConfigureAwait(false);
+        RegisterFileObserver();
+    }
 
-                return string.Empty;
-            }
-        }
+    /// <summary>
+    /// Asynchronously loads the content of the log file.
+    /// </summary>
+    private async Task LoadLogFileContent()
+    {
+        _logger.LogInformation("Load current log file: {LogFilename}", _logFilename);
 
-        /// <summary>Gets the log file name including extension.</summary>
-        /// <value>The log file.</value>
-        public string LogFile
+        string logFolderPath = AppPaths.LogsDirectory;
+        if (!Directory.Exists(logFolderPath))
         {
-            get
-            {
-                if (_logFile != null)
-                {
-                    return _logFile.Name;
-                }
-
-                return string.Empty;
-            }
+            return;
         }
 
-        private async Task LoadLogfileAsync()
+        string logFilePath = Path.Combine(logFolderPath, _logFilename);
+        if (!File.Exists(logFilePath))
         {
-            await LoadLogFileContent().ConfigureAwait(false);
-            RegisterFileObserver();
+            return;
         }
 
-        private async Task LoadLogFileContent()
-        {
-            _logger.LogInformation($"Load current log file: {_logFilename}");
+        _logFile = new FileInfo(logFilePath);
 
-            StorageFolder storageFolder = ApplicationData.Current.LocalFolder;
-            _logFolder = await storageFolder.GetFolderAsync("logs");
-            if (_logFolder == null)
+        await Task.Run(() =>
+        {
+            using (FileStream fileStream = File.Open(logFilePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+            using (StreamReader reader = new StreamReader(fileStream))
             {
-                return;
+                LogContent = reader.ReadToEnd();
             }
+        }).ConfigureAwait(false);
+    }
 
-            _logFile = await _logFolder.GetFileAsync(_logFilename);
-            if (_logFile == null)
+    /// <summary>
+    /// Handles the log file changed event and updates the log content.
+    /// </summary>
+    /// <param name="sender">The event sender.</param>
+    /// <param name="e">The event arguments.</param>
+    private async void LogFile_Changed(object sender, FileSystemEventArgs e)
+    {
+        await App.DispatcherQueue.EnqueueAsync(async () =>
+        {
+            using (FileStream fileStream = File.Open(_logFile.FullName, FileMode.Open, FileAccess.Read, FileShare.ReadWrite))
+            using (StreamReader reader = new StreamReader(fileStream))
             {
-                return;
+                LogContent = reader.ReadToEnd();
             }
+        });
+    }
 
-            await _dispatcher.RunAsync(CoreDispatcherPriority.Normal, async () =>
-            {
-                LogContent = await FileIO.ReadTextAsync(_logFile);
-            });
-        }
+    /// <summary>
+    /// Registers a file system watcher to observe changes in the log file.
+    /// </summary>
+    private void RegisterFileObserver()
+    {
+        _logger.LogInformation("Register FileSystemWatch to load changed log file.");
 
-        private void RegisterFileObserver()
+        _logFileWatcher = new FileSystemWatcher
         {
-            _logger.LogInformation("Register FileSystemWatch to load changed log file.");
-
-            _logFileWatcher = new FileSystemWatcher
-            {
-                Path = Path.GetDirectoryName(_logFile.Path),
-                Filter = _logFilename
-            };
+            Path = Path.GetDirectoryName(_logFile.FullName),
+            Filter = _logFilename
+        };
 
-            _logFileWatcher.Changed += LogFile_Changed;
-            _logFileWatcher.EnableRaisingEvents = true;
-        }
+        _logFileWatcher.Changed += LogFile_Changed;
+        _logFileWatcher.EnableRaisingEvents = true;
+    }
 
-        private async void LogFile_Changed(object sender, FileSystemEventArgs e)
-        {
-            await _dispatcher.RunAsync(CoreDispatcherPriority.Normal, async () =>
-            {
-                LogContent = await FileIO.ReadTextAsync(_logFile);
-            });
-        }
+    #region Command
 
-        #region Command
+    /// <summary>
+    /// Gets the command to open log files directory.
+    /// </summary>
+    /// <value>The open log file command.</value>
+    public ICommand OpenLogFileCommand => _openLogFileCommand ??= new ActionCommand(ExecuteOpenLogFileCommand, CanExecuteOpenLogFileCommand);
 
-        /// <summary>Gets the command to open log files directory.</summary>
-        /// <value>The open log file command.</value>
-        public ICommand OpenLogFileCommand => _openLogFileCommand ?? (_openLogFileCommand = new ActionCommand(ExecuteOpenLogFileCommand, CanExecuteOpenLogFileCommand));
+    /// <summary>
+    /// Determines whether the open log file command can execute.
+    /// </summary>
+    /// <param name="arg">The command argument.</param>
+    /// <returns><c>true</c> if the command can execute; otherwise, <c>false</c>.</returns>
+    private bool CanExecuteOpenLogFileCommand(object arg) => true;
 
-        private bool CanExecuteOpenLogFileCommand(object arg)
+    /// <summary>
+    /// Executes the open log file command.
+    /// </summary>
+    /// <param name="obj">The command parameter.</param>
+    private void ExecuteOpenLogFileCommand(object obj)
+    {
+        _logger.LogInformation("Open log files directory: '{LogFolderPath}'", AppPaths.LogsDirectory);
+        Process.Start(new ProcessStartInfo
         {
-            return true;
-        }
+            FileName = AppPaths.LogsDirectory,
+            UseShellExecute = true,
+            Verb = "open"
+        });
+    }
 
-        private void ExecuteOpenLogFileCommand(object obj)
-        {
-            _logger.LogInformation($"Open log files directory: '{_logFolder.Path}'");
-            Launcher.LaunchFolderAsync(_logFolder);
-        }
+    #endregion Command
 
-        #endregion
+    #region IDisposable Support
 
-        #region IDisposable Support
+    private bool disposedValue = false; // To detect redundant calls
 
-        private bool disposedValue = false; // To detect redundant calls
-        private StorageFolder _logFolder;
+    /// <inheritdoc/>
+    public void Dispose()
+    {
+        Dispose(true);
+        GC.SuppressFinalize(this);
+    }
 
-        /// <summary>
-        /// Releases unmanaged and - optionally - managed resources.
-        /// </summary>
-        /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
-        protected virtual void Dispose(bool disposing)
+    /// <summary>
+    /// Releases unmanaged and - optionally - managed resources.
+    /// </summary>
+    /// <param name="disposing"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
+    protected virtual void Dispose(bool disposing)
+    {
+        if (!disposedValue)
         {
-            if (!disposedValue)
+            if (disposing)
             {
-                if (disposing)
-                {
-                    _logFileWatcher.Dispose();
-                }
-
-                disposedValue = true;
+                _logFileWatcher?.Dispose();
             }
-        }
 
-        /// <inheritdoc/>
-        public void Dispose()
-        {
-            Dispose(true);
-            GC.SuppressFinalize(this);
+            disposedValue = true;
         }
-
-        #endregion
     }
+    #endregion IDisposable Support
 }
diff --git a/src/openHAB.Windows/ViewModel/MainUIViewModel.cs b/src/openHAB.Windows/ViewModel/MainUIViewModel.cs
new file mode 100644
index 00000000..bc228942
--- /dev/null
+++ b/src/openHAB.Windows/ViewModel/MainUIViewModel.cs
@@ -0,0 +1,24 @@
+using Microsoft.Extensions.Logging;
+using openHAB.Core.Client.Connection.Contracts;
+
+namespace openHAB.Windows.ViewModel;
+
+public class MainUIViewModel : ViewModelBase<object>
+{
+    private string _mainUiUrl;
+    private readonly ILogger<MainUIViewModel> _logger;
+
+    public MainUIViewModel(IConnectionService connectionService, ILogger<MainUIViewModel> logger)
+        : base(new object())
+    {
+        _logger = logger;
+
+        MainUIUrl = connectionService.CurrentConnection?.MainUIUrl;
+    }
+
+    public string MainUIUrl
+    {
+        get => _mainUiUrl;
+        set => Set(ref _mainUiUrl, value);
+    }
+}
diff --git a/src/openHAB.Windows/ViewModel/MainViewModel.cs b/src/openHAB.Windows/ViewModel/MainViewModel.cs
index 64d09488..3ff39406 100644
--- a/src/openHAB.Windows/ViewModel/MainViewModel.cs
+++ b/src/openHAB.Windows/ViewModel/MainViewModel.cs
@@ -5,540 +5,321 @@
 using System.Threading;
 using System.Threading.Tasks;
 using CommunityToolkit.Mvvm.Messaging;
+using CommunityToolkit.WinUI;
 using Microsoft.Extensions.Logging;
-using Microsoft.Services.Store.Engagement;
-using OpenHAB.Core;
-using OpenHAB.Core.Common;
-using OpenHAB.Core.Contracts.Services;
-using OpenHAB.Core.Messages;
-using OpenHAB.Core.Model;
-using OpenHAB.Core.SDK;
-using OpenHAB.Core.Services;
-using Windows.ApplicationModel.Core;
-using Windows.UI.Core;
-
-namespace OpenHAB.Windows.ViewModel
+using Microsoft.Extensions.Options;
+using openHAB.Common;
+using openHAB.Core.Client.Contracts;
+using openHAB.Core.Client.Messages;
+using openHAB.Core.Client.Models;
+using openHAB.Core.Common;
+using openHAB.Core.Messages;
+using openHAB.Core.Model;
+using openHAB.Core.Services;
+using openHAB.Windows.Messages;
+using openHAB.Windows.Services;
+
+namespace openHAB.Windows.ViewModel;
+
+/// <summary>
+/// Collects and formats all the data for starting the application.
+/// </summary>
+public class MainViewModel : ViewModelBase<object>
 {
+    private readonly IOpenHABClient _openHABClient;
+    private readonly IOptions<SettingOptions> _settingsOptions;
+    private readonly ILogger<MainViewModel> _logger;
+    private readonly SitemapService _sitemapManager;
+
+    private ObservableCollection<WidgetViewModel> _breadcrumbItems;
+    private bool _isDataLoading;
+    private object _selectedMenuItem;
+    private Sitemap? _selectedSitemap;
+    private ObservableCollection<Sitemap> _sitemaps;
+
     /// <summary>
-    /// Collects and formats all the data for starting the application.
+    /// Initializes a new instance of the <see cref="MainViewModel"/> class.
     /// </summary>
-    public class MainViewModel : ViewModelBase<object>
+    /// <param name="openHABClient">The OpenHAB client.</param>
+    /// <param name="sitemapManager">The service responsible for managing sitemaps.</param>
+    /// <param name="settingsOptions">The application settings options.</param>
+    /// <param name="logger">Logger class instance.</param>
+    public MainViewModel(IOpenHABClient openHABClient,
+        IOptions<SettingOptions> settingsOptions,
+        SitemapService sitemapManager,
+        ILogger<MainViewModel> logger)
+        : base(new object())
     {
-        private readonly StoreServicesFeedbackLauncher _feedbackLauncher;
-        private readonly IOpenHAB _openHabsdk;
-        private readonly ISettingsService _settingsService;
-        private CancellationTokenSource _cancellationTokenSource;
-        private ObservableCollection<OpenHABWidget> _currentWidgets;
-        private ActionCommand _feedbackCommand;
-        private bool _isDataLoading;
-        private ILogger<MainViewModel> _logger;
-        private ActionCommand _refreshCommand;
-        private SitemapViewModel _selectedSitemap;
-        private OpenHABWidget _selectedWidget;
-        private ObservableCollection<SitemapViewModel> _sitemaps;
-        private string _subtitle;
-        private ServerInfo _serverInfo;
-        private object _selectedMenuItem;
-        private ActionCommand _reloadSitemapCommand;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="MainViewModel"/> class.
-        /// </summary>
-        /// <param name="openHabsdk">The OpenHAB SDK object.</param>
-        /// <param name="settingsService">Setting service instance.</param>
-        /// <param name="logger">Logger class instance.</param>
-        public MainViewModel(IOpenHAB openHabsdk, ISettingsService settingsService, ILogger<MainViewModel> logger)
-            : base(new object())
-        {
-            _logger = logger;
-            CurrentWidgets = new ObservableCollection<OpenHABWidget>();
+        _logger = logger;
 
-            _openHabsdk = openHabsdk;
-            _settingsService = settingsService;
-            _feedbackLauncher = StoreServicesFeedbackLauncher.GetDefault();
-            _cancellationTokenSource = new CancellationTokenSource();
-
-            StrongReferenceMessenger.Default.Register<TriggerCommandMessage>(this, async (recipient, msg) => await TriggerCommand(recipient, msg).ConfigureAwait(false));
-            StrongReferenceMessenger.Default.Register<WidgetClickedMessage>(this, (recipient, msg) => OnWidgetClickedAction(recipient, msg.Widget));
-        }
+        _openHABClient = openHABClient;
+        _settingsOptions = settingsOptions;
+        _breadcrumbItems = new ObservableCollection<WidgetViewModel>();
+        _notifications = new ObservableCollection<TriggerInfoMessage>();
+        _sitemapManager = sitemapManager;
 
+        StrongReferenceMessenger.Default.Register<DataOperation>(this, async (obj, operation)
+            => await DataOperationStateAsync(operation));
 
+        StrongReferenceMessenger.Default.Register<TriggerAction>(this, async (recipient, msg)
+            => await ExecuteAction(recipient, msg));
+    }
 
-        /// <summary>
-        /// Gets or sets the widgets currently on screen.
-        /// </summary>
-        public ObservableCollection<OpenHABWidget> CurrentWidgets
+    private async Task ExecuteAction(object recipient, TriggerAction msg)
+    {
+        switch (msg.Action)
         {
-            get => _currentWidgets;
-            set => Set(ref _currentWidgets, value);
-        }
-
-        /// <summary>Gets the command to open feedback application.</summary>
-        /// <value>The feedback command.</value>
-        public ActionCommand FeedbackCommand => _feedbackCommand ?? (_feedbackCommand = new ActionCommand(ExecuteFeedbackCommand, CanExecuteFeedbackCommand));
+            case Core.Messages.Action.Reload:
+                LoadSitemapsAndItemData();
+                break;
+            case Core.Messages.Action.None:
+                break;
 
-        /// <summary>
-        /// Gets or sets a value indicating whether data is loaded from an OpenHAB instance.
-        /// </summary>
-        /// <value>
-        ///   <c>true</c> if data will loaded; otherwise, <c>false</c>.</value>
-        public bool IsDataLoading
-        {
-            get => _isDataLoading;
-            set => Set(ref _isDataLoading, value);
         }
+    }
 
-        /// <summary>Gets the command to refresh sitemap and widget data.</summary>
-        /// <value>The refresh command.</value>
-        public ActionCommand RefreshCommand => _refreshCommand ?? (_refreshCommand = new ActionCommand(ExecuteRefreshCommandAsync, CanExecuteRefreshCommand));
+    /// <summary>
+    /// Gets or sets the items for the breadcrumb.
+    /// </summary>
+    /// <value>The breadcrumb items.</value>
+    public ObservableCollection<WidgetViewModel> BreadcrumbItems
+    {
+        get => _breadcrumbItems;
+        set => Set(ref _breadcrumbItems, value);
+    }
 
-        /// <summary>Gets the command to reload sitemap and widget data.</summary>
-        /// <value>The refresh command.</value>
-        public ActionCommand ReloadSitemapCommand => _reloadSitemapCommand ?? (_reloadSitemapCommand = new ActionCommand(ExecuteReloadSitemapCommand, CanExecuteReloadSitemapCommand));
+    /// <summary>
+    /// Gets or sets a value indicating whether data is loaded from an OpenHAB instance.
+    /// </summary>
+    /// <value>
+    ///   <c>true</c> if data will loaded; otherwise, <c>false</c>.</value>
+    public bool IsDataLoading
+    {
+        get => _isDataLoading;
+        set => Set(ref _isDataLoading, value);
+    }
 
-        /// <summary>
-        /// Gets or sets the sitemap currently selected by the user.
-        /// </summary>
-        public SitemapViewModel SelectedSitemap
+    /// <summary>
+    /// Gets or sets the selected menu item.
+    /// </summary>
+    public object SelectedMenuItem
+    {
+        get
         {
-            get
-            {
-                return _selectedSitemap;
-            }
-
-            set
-            {
-                if (Set(ref _selectedSitemap, value))
-                {
-                    if (_selectedSitemap != null)
-                    {
-                        _settingsService.SaveCurrentSitemap(_selectedSitemap.Name);
-                        Subtitle = _selectedSitemap.Label;
-                    }
-
-                    if (!_isDataLoading && (_selectedSitemap?.Widgets == null || _selectedSitemap?.Widgets.Count == 0))
-                    {
-                        CoreDispatcher dispatcher = CoreApplication.MainView.CoreWindow.Dispatcher;
-                        dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
-                        {
-                            LoadWidgets();
-                            WidgetNavigationService.ClearWidgetNavigation();
-                        });
-                    }
-                    else
-                    {
-                        SetWidgetsOnScreen(SelectedSitemap.Widgets);
-                    }
-
-                    SelectedMenuItem = value;
-                }
-            }
+            return _selectedMenuItem;
         }
 
-        /// <summary>
-        /// Gets or sets the selected menu item.
-        /// </summary>
-        public object SelectedMenuItem
+        set
         {
-            get
-            {
-                return _selectedMenuItem;
-            }
-
-            set
+            Sitemap sitemapInfo = value as Sitemap;
+            if (sitemapInfo != null && SelectedSitemap != value)
             {
-                SitemapViewModel sitemapViewModel = value as SitemapViewModel;
-                if (sitemapViewModel != null && SelectedSitemap != value)
-                {
-                    SelectedSitemap = sitemapViewModel;
-                }
-
-                Set(ref _selectedMenuItem, value);
+                SelectedSitemap = sitemapInfo;
             }
-        }
 
-        /// <summary>
-        /// Gets or sets the selected widget.
-        /// </summary>
-        public OpenHABWidget SelectedWidget
-        {
-            get => _selectedWidget;
-            set => Set(ref _selectedWidget, value);
-        }
-
-        /// <summary>
-        /// Gets or sets a collection of OpenHAB sitemaps.
-        /// </summary>
-        public ObservableCollection<SitemapViewModel> Sitemaps
-        {
-            get => _sitemaps;
-            set => Set(ref _sitemaps, value);
-        }
-
-        /// <summary>
-        /// Gets or sets the subtitle of the page.
-        /// </summary>
-        public string Subtitle
-        {
-            get => _subtitle;
-            set => Set(ref _subtitle, value);
-        }
-
-        #region Commands
-
-        private bool CanExecuteReloadSitemapCommand(object arg)
-        {
-            return !IsDataLoading;
-        }
-
-        private bool CanExecuteFeedbackCommand(object obj)
-        {
-            return StoreServicesFeedbackLauncher.IsSupported();
-        }
-
-        private bool CanExecuteRefreshCommand(object arg)
-        {
-            return !IsDataLoading;
-        }
-
-#pragma warning disable S3168 // "async" methods should not return "void"
-        private async void ExecuteFeedbackCommand(object obj)
-#pragma warning restore S3168 // "async" methods should not return "void"
-        {
-            await _feedbackLauncher.LaunchAsync();
-        }
-
-#pragma warning disable S3168 // "async" methods should not return "void"
-        private async void ExecuteRefreshCommandAsync(object obj)
-#pragma warning restore S3168 // "async" methods should not return "void"
-        {
-            await LoadSitemapsAndItemData().ConfigureAwait(false);
+            Set(ref _selectedMenuItem, value);
         }
+    }
 
-#pragma warning disable S3168 // "async" methods should not return "void"
-        private async void ExecuteReloadSitemapCommand(object obj)
-#pragma warning restore S3168 // "async" methods should not return "void"
+    /// <summary>
+    /// Gets or sets the sitemap currently selected by the user.
+    /// </summary>
+    public Sitemap? SelectedSitemap
+    {
+        get
         {
-            await ReloadSitemap().ConfigureAwait(false);
+            return _selectedSitemap;
         }
 
-#pragma warning disable S1172 // Unused method parameters should be removed
-        private async Task TriggerCommand(object recipient, TriggerCommandMessage message)
-#pragma warning restore S1172 // Unused method parameters should be removed
+        set
         {
-            HttpResponseResult<bool> result = await _openHabsdk.SendCommand(message.Item, message.Command).ConfigureAwait(false);
-            if (!result.Content)
+            if (_selectedSitemap != value && value != null)
             {
-                string errorMessage = AppResources.Errors.GetString("CommandFailed");
-                errorMessage = string.Format(errorMessage, message.Command, message.Item?.Name);
-
-                StrongReferenceMessenger.Default.Send<FireErrorMessage>(new FireErrorMessage(errorMessage));
+                StrongReferenceMessenger.Default.Unregister<WidgetNavigationMessage, string>(this, value.Name);
             }
-        }
-
-#pragma warning disable S1172 // Unused method parameters should be removed
-        private async void OnWidgetClickedAction(object recipient, OpenHABWidget widget)
-#pragma warning restore S1172 // Unused method parameters should be removed
-        {
-            await OnWidgetClickedAsync(widget);
-        }
-
-        #endregion
-
-        #region Load sitemap and Data
 
-        /// <summary>
-        /// Loads the sitemap data.
-        /// </summary>
-        /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
-        public async Task LoadSitemapsAndItemData()
-        {
-            await LoadData(_cancellationTokenSource.Token).ConfigureAwait(false);
-        }
-
-        private async Task ReloadSitemap()
-        {
-            CoreDispatcher dispatcher = CoreApplication.MainView.CoreWindow.Dispatcher;
-            await dispatcher.RunAsync(CoreDispatcherPriority.Normal, async () =>
+            if (Set(ref _selectedSitemap, value))
             {
-                CurrentWidgets?.Clear();
-                IsDataLoading = true;
-
-                if (SelectedWidget != null)
-                {
-                    await LoadWidgets().ConfigureAwait(false);
-                    OpenHABWidget widget = FindWidget(SelectedWidget.WidgetId, SelectedSitemap.Widgets);
-                    if (widget != null)
-                    {
-                        await OnWidgetClickedAsync(widget);
-                    }
-                    else
-                    {
-                        SelectedWidget = null;
-                        WidgetNavigationService.ClearWidgetNavigation();
-                    }
-                }
-                else
+                if (_selectedSitemap != null)
                 {
-                    await LoadWidgets().ConfigureAwait(false);
+                    SettingOptions settings = _settingsOptions.Value;
+                    settings.LastSitemap = _selectedSitemap.Name;
+                    settings.Save();
+
+                    StrongReferenceMessenger.Default.Register<WidgetNavigationMessage, string>(this, SelectedSitemap.Name, (obj, operation)
+                         => WidgetNavigatedEvent());
                 }
 
-                IsDataLoading = false;
-                ReloadSitemapCommand.InvokeCanExecuteChanged(null);
-                RefreshCommand.InvokeCanExecuteChanged(null);
-            });
-        }
+                BreadcrumbItems.Clear();
+                SelectedMenuItem = value;
+            }
 
-#pragma warning disable S3168 // "async" methods should not return "void"
-        private async void CancelSyncCallbackAsync()
-#pragma warning restore S3168 // "async" methods should not return "void"
-        {
-            CoreDispatcher dispatcher = CoreApplication.MainView.CoreWindow.Dispatcher;
-            await dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
-            {
-                Sitemaps?.Clear();
-                CurrentWidgets?.Clear();
-                Subtitle = null;
-                IsDataLoading = false;
-            });
+            OnPropertyChanged(nameof(SelectedSitemap));
         }
+    }
 
-        private async Task LoadData(CancellationToken cancellationToken)
-        {
-            CoreDispatcher dispatcher = CoreApplication.MainView.CoreWindow.Dispatcher;
-            cancellationToken.Register(CancelSyncCallbackAsync);
-
-            try
-            {
-                if (IsDataLoading)
-                {
-                    return;
-                }
-
-                _logger.LogInformation("Load available sitemap's and their items");
-
-                await dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
-                {
-                    IsDataLoading = true;
-                    Sitemaps?.Clear();
-                    CurrentWidgets?.Clear();
-                    Subtitle = null;
-                });
-
-                Settings settings = _settingsService.Load();
-                if (settings.LocalConnection == null && settings.RemoteConnection == null &&
-                    (!settings.IsRunningInDemoMode.HasValue || !settings.IsRunningInDemoMode.Value))
-                {
-                    StrongReferenceMessenger.Default.Send(new FireInfoMessage(MessageType.NotConfigured));
-                }
+    /// <summary>
+    /// Gets or sets a collection of OpenHAB sitemaps.
+    /// </summary>
+    public ObservableCollection<Sitemap> Sitemaps
+    {
+        get => _sitemaps;
+        set => Set(ref _sitemaps, value);
+    }
 
-                bool isSuccessful = await _openHabsdk.ResetConnection().ConfigureAwait(false);
-                if (!isSuccessful)
-                {
-                    StrongReferenceMessenger.Default.Send(new FireInfoMessage(MessageType.NotConfigured));
-                    return;
-                }
+    #region Sitemaps Refresh Command
 
-                var result = await _openHabsdk.GetOpenHABServerInfo().ConfigureAwait(false);
-                _serverInfo = result?.Content;
+    private ActionCommand _refreshCommand;
+    private ObservableCollection<TriggerInfoMessage> _notifications;
 
-                if (_serverInfo == null || _serverInfo.Version == OpenHABVersion.None)
-                {
-                    StrongReferenceMessenger.Default.Send(new FireInfoMessage(MessageType.NotConfigured));
-                    return;
-                }
+    /// <summary>Gets the command to refresh sitemap and widget data.</summary>
+    /// <value>The refresh command.</value>
+    public ActionCommand RefreshCommand => _refreshCommand ?? (_refreshCommand = new ActionCommand(ExecuteRefreshCommandAsync, CanExecuteRefreshCommand));
 
-                _settingsService.ServerVersion = _serverInfo.Version;
+    private bool CanExecuteRefreshCommand(object arg)
+    {
+        return !IsDataLoading;
+    }
 
-                if (cancellationToken.IsCancellationRequested)
-                {
-                    return;
-                }
+    private async void ExecuteRefreshCommandAsync(object obj)
+    {
+        await LoadSitemapsAndItemData().ConfigureAwait(false);
+    }
 
-                List<SitemapViewModel> sitemapViewModels = await LoadSitemaps(settings).ConfigureAwait(false);
+    #endregion
 
-                await dispatcher.RunAsync(CoreDispatcherPriority.Normal, async () =>
-                {
-                    Sitemaps = new ObservableCollection<SitemapViewModel>(sitemapViewModels);
-                    _openHabsdk.StartItemUpdates(cancellationToken);
-
-                    OpenLastOrDefaultSitemap();
-
-                    if (SelectedWidget != null)
-                    {
-                        await LoadWidgets().ConfigureAwait(false);
-                        OpenHABWidget widget = FindWidget(SelectedWidget.WidgetId, SelectedSitemap.Widgets);
-                        if (widget != null)
-                        {
-                            await OnWidgetClickedAsync(widget);
-                        }
-                        else
-                        {
-                            SelectedWidget = null;
-                            WidgetNavigationService.ClearWidgetNavigation();
-                        }
-                    }
-                    else
-                    {
-                        await LoadWidgets().ConfigureAwait(false);
-                    }
+    #region Load sitemap and Data
 
-                    IsDataLoading = false;
-                    ReloadSitemapCommand.InvokeCanExecuteChanged(null);
-                    RefreshCommand.InvokeCanExecuteChanged(null);
-                });
-            }
-            catch (OpenHABException ex)
-            {
-                _logger.LogError(ex, "Load data failed.");
-                StrongReferenceMessenger.Default.Send(new FireErrorMessage(ex.Message));
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Load data failed.");
-            }
-            finally
+    /// <summary>
+    /// Loads the sitemap data.
+    /// </summary>
+    /// <returns>A <see cref="Task"/> representing the asynchronous operation.</returns>
+    public async Task LoadSitemapsAndItemData()
+    {
+        using (CancellationTokenSource cancellationTokenSource = new CancellationTokenSource())
+        {
+            await App.DispatcherQueue.EnqueueAsync(async () =>
             {
-                await dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
-                {
-                    IsDataLoading = false;
-                });
-            }
+                await LoadData(cancellationTokenSource.Token).ConfigureAwait(false);
+            });
         }
+    }
 
-        private async Task<List<SitemapViewModel>> LoadSitemaps(Settings settings)
+    private async void CancelSyncCallbackAsync()
+    {
+        await App.DispatcherQueue.EnqueueAsync(() =>
         {
-            Func<OpenHABSitemap, bool> defaultSitemapFilter = (sitemap) =>
-            {
-                return !sitemap.Name.Equals("_default", StringComparison.InvariantCultureIgnoreCase);
-            };
+            Sitemaps?.Clear();
+            SelectedSitemap = null;
+            StrongReferenceMessenger.Default.Send<DataOperation>(new DataOperation(OperationState.Completed));
+        });
+    }
 
-            List<Func<OpenHABSitemap, bool>> filters = new List<Func<OpenHABSitemap, bool>>();
+    private async Task LoadData(CancellationToken loadCancellationToken)
+    {
+        loadCancellationToken.Register(CancelSyncCallbackAsync);
 
-            if (!settings.ShowDefaultSitemap)
+        try
+        {
+            if (IsDataLoading)
             {
-                filters.Add(defaultSitemapFilter);
+                return;
             }
 
-            ICollection<OpenHABSitemap> sitemaps = await _openHabsdk.LoadSiteMaps(_serverInfo.Version, filters).ConfigureAwait(false);
-            List<SitemapViewModel> sitemapViewModels = new List<SitemapViewModel>();
-            sitemaps.ToList().ForEach(x => sitemapViewModels.Add(new SitemapViewModel(x)));
+            _logger.LogInformation("Load available sitemaps and their items");
 
-            return sitemapViewModels;
-        }
+            StrongReferenceMessenger.Default.Send<DataOperation>(new DataOperation(OperationState.Started));
+            Sitemaps?.Clear();
 
-        private void OpenLastOrDefaultSitemap()
-        {
-            string sitemapName = _settingsService.LoadLastSitemap();
-
-            if (string.IsNullOrWhiteSpace(sitemapName))
+            if (loadCancellationToken.IsCancellationRequested)
             {
-                _logger.LogInformation("No sitemap was selected in the past -> Pick first entry from list");
-
-                SelectedSitemap = Sitemaps.FirstOrDefault();
                 return;
             }
 
-            SelectedSitemap = Sitemaps.FirstOrDefault(x => x.Name == sitemapName);
-            if (SelectedSitemap == null)
+            List<Sitemap> sitemaps = await _sitemapManager.GetSitemapsAsync(loadCancellationToken);
+            if (sitemaps == null)
             {
-                _logger.LogInformation($"Unable to find sitemap '{sitemapName}' -> Pick first entry from list");
-                SelectedSitemap = Sitemaps.FirstOrDefault();
+                StrongReferenceMessenger.Default.Send(
+                    new TriggerInfoMessage(MessageSeverity.Warning, AppResources.Values.GetString("MessageNotConfigured")));
+                return;
             }
 
-            Subtitle = SelectedSitemap.Label;
-        }
-
-        #endregion
+            Sitemaps = new ObservableCollection<Sitemap>(sitemaps);
+            _openHABClient.StartItemUpdates(loadCancellationToken);
 
-        #region Widget Handing
-
-        /// <summary>
-        /// Navigate backwards between linked pages.
-        /// </summary>
-        public void WidgetGoBack()
+            SelectedSitemap = OpenLastOrDefaultSitemap();
+        }
+        catch (OpenHABException ex)
         {
-            OpenHABWidget widget = WidgetNavigationService.GoBack();
-
-            if (SelectedSitemap == null)
-            {
-                return;
-            }
-
-            Subtitle = widget == null ? SelectedSitemap?.Label : widget.Label;
-            SetWidgetsOnScreen(widget != null ? widget.LinkedPage.Widgets : SelectedSitemap.Widgets);
+            _logger.LogError(ex, "Load data failed.");
+            StrongReferenceMessenger.Default.Send(new ConnectionErrorMessage(ex.Message));
         }
-
-        private async Task LoadWidgets()
+        catch (Exception ex)
         {
-            if (SelectedSitemap == null)
-            {
-                return;
-            }
+            _logger.LogError(ex, "Load data failed.");
+        }
+        finally
+        {
+            StrongReferenceMessenger.Default.Send<DataOperation>(new DataOperation(OperationState.Completed));
+            RefreshCommand.InvokeCanExecuteChanged(null);
+        }
+    }
 
-            CurrentWidgets.Clear();
-            IsDataLoading = true;
+    private Sitemap? OpenLastOrDefaultSitemap()
+    {
+        SettingOptions settings = _settingsOptions.Value;
+        string sitemapName = settings.LastSitemap;
 
-            await SelectedSitemap.LoadWidgets(_serverInfo.Version).ConfigureAwait(false);
+        if (string.IsNullOrWhiteSpace(sitemapName))
+        {
+            _logger.LogInformation("No sitemap was selected in the past -> Pick first entry from list");
 
-            CoreDispatcher dispatcher = CoreApplication.MainView.CoreWindow.Dispatcher;
-            await dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
-            {
-                SetWidgetsOnScreen(SelectedSitemap.Widgets);
-                IsDataLoading = false;
-            });
+            return Sitemaps.FirstOrDefault();
         }
 
-        private async Task OnWidgetClickedAsync(OpenHABWidget widget)
+        Sitemap? selectedSitemap = Sitemaps.FirstOrDefault(x => x.Name == sitemapName);
+        if (selectedSitemap == null)
         {
-            CoreDispatcher dispatcher = CoreApplication.MainView.CoreWindow.Dispatcher;
-            await dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
-            {
-                SelectedWidget = widget;
-                if (SelectedWidget.LinkedPage == null || !SelectedWidget.LinkedPage.Widgets.Any())
-                {
-                    return;
-                }
+            _logger.LogInformation("Unable to find sitemap '{sitemapName}' -> Pick first entry from list", sitemapName);
+            return Sitemaps.FirstOrDefault();
+        }
 
-                Subtitle = SelectedWidget.Label;
+        return selectedSitemap;
+    }
 
-                WidgetNavigationService.Navigate(SelectedWidget);
-                SetWidgetsOnScreen(SelectedWidget?.LinkedPage?.Widgets);
-            });
-        }
+    #endregion
 
-        private void SetWidgetsOnScreen(ICollection<OpenHABWidget> widgets)
-        {
-            CurrentWidgets.Clear();
-            CurrentWidgets.AddRange(widgets);
-        }
+    #region Events
 
-        private OpenHABWidget FindWidget(string widgetId, ICollection<OpenHABWidget> widgets)
-        {
-            OpenHABWidget openHABWidget = null;
-            if (widgets == null || widgets.Count == 0)
-            {
-                return openHABWidget;
-            }
+    public ObservableCollection<TriggerInfoMessage> Notifications
+    {
+        get => _notifications;
+        set => Set(ref _notifications, value);
+    }
 
-            foreach (OpenHABWidget widget in widgets)
+    private async Task DataOperationStateAsync(DataOperation operation)
+    {
+        await App.DispatcherQueue.EnqueueAsync(() =>
+        {
+            switch (operation.State)
             {
-                if (string.CompareOrdinal(widget.WidgetId, widgetId) == 0)
-                {
-                    return widget;
-                }
+                case OperationState.Started:
+                    IsDataLoading = true;
+                    break;
 
-                ICollection<OpenHABWidget> childWidgets = widget.Type.CompareTo("Group") == 0 ? widget.LinkedPage?.Widgets : widget.Children;
-                openHABWidget = FindWidget(widgetId, childWidgets);
-                if (openHABWidget != null)
-                {
-                    return openHABWidget;
-                }
+                case OperationState.Completed:
+                    IsDataLoading = false;
+                    break;
             }
+        });
+    }
 
-            return openHABWidget;
-        }
-
-        #endregion
+    private void WidgetNavigatedEvent()
+    {
+        BreadcrumbItems?.Clear();
+        BreadcrumbItems?.AddRange(WidgetNavigationService.Widgets);
+        OnPropertyChanged(nameof(BreadcrumbItems));
     }
-}
\ No newline at end of file
+
+    #endregion
+}
diff --git a/src/openHAB.Windows/ViewModel/SettingsViewModel.cs b/src/openHAB.Windows/ViewModel/SettingsViewModel.cs
index 42e3ed34..95dec4a3 100644
--- a/src/openHAB.Windows/ViewModel/SettingsViewModel.cs
+++ b/src/openHAB.Windows/ViewModel/SettingsViewModel.cs
@@ -1,121 +1,126 @@
 using System;
 using CommunityToolkit.Mvvm.Messaging;
 using Microsoft.Extensions.Logging;
-using OpenHAB.Core.Common;
-using OpenHAB.Core.Messages;
-using OpenHAB.Core.Services;
+using openHAB.Core.Common;
+using openHAB.Core.Messages;
+using openHAB.Core.Services.Contracts;
 using Windows.ApplicationModel;
 
-namespace OpenHAB.Windows.ViewModel
+namespace openHAB.Windows.ViewModel;
+
+/// <summary>
+/// Collects and formats all the data for user defined settings.
+/// </summary>
+public class SettingsViewModel : ViewModelBase<object>
 {
+    private readonly IIconCaching _iconCaching;
+    private readonly ILogger<SettingsViewModel> _logger;
+    private readonly IAppManager _appManager;
+    private ActionCommand _clearIconCacheCommand;
+    private ConfigurationViewModel _configuration;
+    private ActionCommand _saveCommand;
+
     /// <summary>
-    /// Collects and formats all the data for user defined settings.
+    /// Initializes a new instance of the <see cref="SettingsViewModel"/> class.
     /// </summary>
-    public class SettingsViewModel : ViewModelBase<object>
+    public SettingsViewModel(
+        ConfigurationViewModel configurationViewModel,
+        IIconCaching iconCaching,
+        IAppManager appManager,
+        ILogger<SettingsViewModel> logger)
+        : base(new object())
     {
-        private readonly IIconCaching _iconCaching;
-        private readonly ILogger<SettingsViewModel> _logger;
-        private ActionCommand _clearIconCacheCommand;
-        private ConfigurationViewModel _configuration;
-        private ActionCommand _saveCommand;
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SettingsViewModel"/> class.
-        /// </summary>
-        public SettingsViewModel(ConfigurationViewModel configurationViewModel, IIconCaching iconCaching, ILogger<SettingsViewModel> logger)
-            : base(new object())
-        {
-            _configuration = configurationViewModel;
-            _configuration.PropertyChanged += Configuration_PropertyChanged;
+        _configuration = configurationViewModel;
+        _configuration.PropertyChanged += Configuration_PropertyChanged;
+        _appManager = appManager;
+        _iconCaching = iconCaching;
 
-            _iconCaching = iconCaching;
+        _logger = logger;
 
-            _logger = logger;
+        StrongReferenceMessenger.Default.Register<ConnectionStatusChanged>(this, (recipient, msg) => SaveCommand.InvokeCanExecuteChanged(null));
+    }
 
-            StrongReferenceMessenger.Default.Register<ConnectionStatusChanged>(this, (recipient, msg) => SaveCommand.InvokeCanExecuteChanged(null));
-        }
+    /// <summary>
+    /// Gets the clear icon cache command to persist the settings.
+    /// </summary>
+    /// <value>The save command.</value>
+    public ActionCommand ClearIconCacheCommand => _clearIconCacheCommand ?? (_clearIconCacheCommand = new ActionCommand(ClearIcons, CanClearIcons));
 
-        /// <summary>
-        /// Gets the clear icon cache command to persist the settings.
-        /// </summary>
-        /// <value>The save command.</value>
-        public ActionCommand ClearIconCacheCommand => _clearIconCacheCommand ?? (_clearIconCacheCommand = new ActionCommand(ClearIcons, CanClearIcons));
-
-        /// <summary>
-        /// Gets the save command to persist the settings.
-        /// </summary>
-        /// <value>The save command.</value>
-        public ActionCommand SaveCommand => _saveCommand ?? (_saveCommand = new ActionCommand(PersistSettings, CanPersistSettings));
-
-        /// <summary>
-        /// Gets or sets the current user-defined settings.
-        /// </summary>
-        public ConfigurationViewModel Settings
-        {
-            get => _configuration;
-            set => Set(ref _configuration, value);
-        }
+    /// <summary>
+    /// Gets the save command to persist the settings.
+    /// </summary>
+    /// <value>The save command.</value>
+    public ActionCommand SaveCommand => _saveCommand ?? (_saveCommand = new ActionCommand(PersistSettings, CanPersistSettings));
 
-        /// <summary>
-        /// Gets the application version number.
-        /// </summary>
-        /// <value>The version number.</value>
-        public string Version
-        {
-            get
-            {
-                Version version = new Version(
-                    Package.Current.Id.Version.Major,
-                    Package.Current.Id.Version.Minor,
-                    Package.Current.Id.Version.Build,
-                    Package.Current.Id.Version.Revision);
-
-                return version.ToString();
-            }
-        }
+    /// <summary>
+    /// Gets or sets the current user-defined settings.
+    /// </summary>
+    public ConfigurationViewModel Settings
+    {
+        get => _configuration;
+        set => Set(ref _configuration, value);
+    }
 
-        /// <summary>
-        /// Save the user defined settings to the UWP settings storage.
-        /// </summary>
-        public void PersistSettings(object obj)
+    /// <summary>
+    /// Gets the application version number.
+    /// </summary>
+    /// <value>The version number.</value>
+    public string Version
+    {
+        get
         {
-            _logger.LogInformation("Execute save settings command");
-
-            bool validConnectionConfig = CheckForValidConnectionConfig();
-            if (validConnectionConfig)
-            {
-                bool savedSuccessful = _configuration.Save();
-                StrongReferenceMessenger.Default.Send(new SettingsUpdatedMessage(validConnectionConfig, savedSuccessful));
-            }
-        }
+            Version version = new Version(
+                Package.Current.Id.Version.Major,
+                Package.Current.Id.Version.Minor,
+                Package.Current.Id.Version.Build,
+                Package.Current.Id.Version.Revision);
 
-        private bool CheckForValidConnectionConfig()
-        {
-            return _configuration.IsConnectionConfigValid() ||
-               (_configuration.IsRunningInDemoMode.HasValue && _configuration.IsRunningInDemoMode.Value);
+            return version.ToString();
         }
+    }
 
-        private bool CanClearIcons(object arg)
-        {
-            return true;
-        }
+    /// <summary>
+    /// Save the user defined settings to the UWP settings storage.
+    /// </summary>
+    public void PersistSettings(object obj)
+    {
+        _logger.LogInformation("Execute save settings command");
 
-        private bool CanPersistSettings(object arg)
+        bool validConnectionConfig = CheckForValidConnectionConfig();
+        if (validConnectionConfig)
         {
-            bool validConnectionConfig = CheckForValidConnectionConfig();
-            StrongReferenceMessenger.Default.Send(new SettingsValidationMessage(validConnectionConfig));
+            bool savedSuccessful = _configuration.Save();
 
-            return validConnectionConfig && _configuration.IsDirty;
+            _appManager.SetAppTheme(App.MainWindow.Content);
+            StrongReferenceMessenger.Default.Send<TriggerAction>(new TriggerAction(Core.Messages.Action.Reload));
         }
+    }
 
-        private void ClearIcons(object obj)
-        {
-            _iconCaching.ClearIconCache();
-        }
+    private bool CheckForValidConnectionConfig()
+    {
+        return _configuration.IsConnectionConfigValid() ||
+           (_configuration.IsRunningInDemoMode.HasValue && _configuration.IsRunningInDemoMode.Value);
+    }
 
-        private void Configuration_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
-        {
-            SaveCommand.InvokeCanExecuteChanged(null);
-        }
+    private bool CanClearIcons(object arg)
+    {
+        return true;
+    }
+
+    private bool CanPersistSettings(object arg)
+    {
+        bool validConnectionConfig = CheckForValidConnectionConfig();
+
+        return validConnectionConfig && _configuration.IsDirty;
+    }
+
+    private void ClearIcons(object obj)
+    {
+        _iconCaching.ClearIconCache();
+    }
+
+    private void Configuration_PropertyChanged(object sender, System.ComponentModel.PropertyChangedEventArgs e)
+    {
+        SaveCommand.InvokeCanExecuteChanged(null);
     }
-}
\ No newline at end of file
+}
diff --git a/src/openHAB.Windows/ViewModel/SitemapViewModel.cs b/src/openHAB.Windows/ViewModel/SitemapViewModel.cs
index c49a27f5..c2f0ba2e 100644
--- a/src/openHAB.Windows/ViewModel/SitemapViewModel.cs
+++ b/src/openHAB.Windows/ViewModel/SitemapViewModel.cs
@@ -1,95 +1,446 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Linq;
 using System.Threading.Tasks;
-using OpenHAB.Core.Model;
-using OpenHAB.Core.SDK;
-using OpenHAB.Windows.Services;
+using CommunityToolkit.Mvvm.Messaging;
+using CommunityToolkit.WinUI;
+using openHAB.Common;
+using openHAB.Core.Client.Common;
+using openHAB.Core.Client.Messages;
+using openHAB.Core.Client.Models;
+using openHAB.Core.Common;
+using openHAB.Core.Messages;
+using openHAB.Core.Services;
+using openHAB.Windows.Messages;
+using openHAB.Windows.Services;
 
-namespace OpenHAB.Windows.ViewModel
+namespace openHAB.Windows.ViewModel;
+
+/// <summary>
+/// ViewModel class for the sitemap view.
+/// </summary>
+public class SitemapViewModel : ViewModelBase<Sitemap>, IDisposable
 {
+    private readonly SitemapService _sitemapService;
+
+    private ObservableCollection<WidgetViewModel> _currentWidgets;
+    private readonly IServiceProvider _serviceProvider;
+    private WidgetViewModel _selectedWidget;
+    private ObservableCollection<WidgetViewModel> _widgets;
+    private bool disposedValue;
+
+    #region Constructors
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="SitemapViewModel"/> class.
+    /// </summary>
+    private SitemapViewModel()
+        : base(new Sitemap())
+    {
+    }
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="SitemapViewModel"/> class.
+    /// </summary>
+    /// <param name="model">Model class for view model.</param>
+    /// <param name="serverInfo">openHAB Instance information.</param>
+    private SitemapViewModel(Sitemap model, List<WidgetViewModel> widgetViewModels, SitemapService sitemapService, IServiceProvider serviceProvider)
+         : base(model)
+    {
+        _widgets = new ObservableCollection<WidgetViewModel>(widgetViewModels ?? new List<WidgetViewModel>());
+        _sitemapService = sitemapService;
+        _currentWidgets = new ObservableCollection<WidgetViewModel>();
+        _serviceProvider = serviceProvider;
+
+        StrongReferenceMessenger.Default.Register<WidgetClickedMessage>(this, async (recipient, msg)
+            =>
+        {
+            if (msg.Widget == null)
+            {
+                return;
+            }
+
+            WidgetViewModel viewModel = msg.Widget;
+            await OnWidgetClickedAsync(viewModel);
+        });
+
+        StrongReferenceMessenger.Default.Register<TriggerCommandMessage>(this, async (recipient, msg)
+            => await TriggerItemCommand(msg).ConfigureAwait(false));
+
+        StrongReferenceMessenger.Default.Register<DataOperation>(this, (obj, operation)
+            => DataOperationState(operation));
+
+        StrongReferenceMessenger.Default.Register<WidgetNavigationMessage, string>(this, Model.Name, (recipient, msg) =>
+        {
+            if (msg.Trigger == EventTriggerSource.Breadcrumb)
+            {
+                WidgetGoBack(msg.TargetWidget);
+            }
+            else if (msg.Trigger == EventTriggerSource.Root)
+            {
+                ExecuteNavigateToSitemapRootCommand(null);
+            }
+        });
+
+        SetWidgetsOnScreenAsync(Widgets);
+    }
+
+    #endregion Constructors
+
+    #region Properties
+
     /// <summary>
-    /// A class that represents an OpenHAB sitemap.
+    /// Gets or sets the widgets currently on screen.
     /// </summary>
-    public class SitemapViewModel : ViewModelBase<OpenHABSitemap>
+    public ObservableCollection<WidgetViewModel> CurrentWidgets
     {
-        private ObservableCollection<OpenHABWidget> _widgets;
-        private IOpenHAB _openHabsdk;
+        get => _currentWidgets;
+        set => Set(ref _currentWidgets, value);
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SitemapViewModel"/> class.
-        /// </summary>
-        public SitemapViewModel()
-            : base(new OpenHABSitemap())
+    /// <summary>
+    /// Gets the label of the OpenHAB sitemap.
+    /// </summary>
+    public string Label
+    {
+        get
         {
+            return Model.Label;
         }
+    }
 
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SitemapViewModel"/> class.
-        /// </summary>
-        /// <param name="model">Model class for view model.</param>
-        public SitemapViewModel(OpenHABSitemap model)
-             : base(model)
+    /// <summary>
+    /// Gets the link of the OpenHAB sitemap.
+    /// </summary>
+    public string Link
+    {
+        get
         {
-            _widgets = new ObservableCollection<OpenHABWidget>();
-            _openHabsdk = (IOpenHAB)DIService.Instance.Services.GetService(typeof(IOpenHAB));
+            return Model.Link;
         }
+    }
 
-        /// <summary>
-        /// Gets the name of the OpenHAB sitemap.
-        /// </summary>
-        public string Name
+    /// <summary>
+    /// Gets the name of the OpenHAB sitemap.
+    /// </summary>
+    public string Name
+    {
+        get
         {
-            get
+            return Model.Name;
+        }
+    }
+
+    /// <summary>
+    /// Gets or sets the selected widget.
+    /// </summary>
+    public WidgetViewModel SelectedWidget
+    {
+        get => _selectedWidget;
+        set => Set(ref _selectedWidget, value);
+    }
+
+    /// <summary>
+    /// Gets or sets a collection of widgets of the OpenHAB sitemap.
+    /// </summary>
+    public ObservableCollection<WidgetViewModel> Widgets
+    {
+        get
+        {
+            return _widgets;
+        }
+
+        set
+        {
+            if (Equals(value, _widgets))
             {
-                return Model.Name;
+                return;
             }
+
+            this.Set(ref _widgets, value);
         }
+    }
+
+    #endregion Properties
+
+    #region Reload Command
 
-        /// <summary>
-        /// Gets the label of the OpenHAB sitemap.
-        /// </summary>
-        public string Label
+    private ActionCommand _reloadSitemapCommand;
+
+    /// <summary>
+    /// Gets the command to reload sitemap and widget data.
+    /// </summary>
+    /// <value>
+    /// The refresh command.
+    /// </value>
+    public ActionCommand ReloadSitemapCommand => _reloadSitemapCommand ?? (_reloadSitemapCommand = new ActionCommand(ExecuteReloadSitemapCommand, CanExecuteReloadSitemapCommand));
+
+    private bool CanExecuteReloadSitemapCommand(object arg)
+    {
+        return !_canExecuteReloadSitemap;
+    }
+
+    private async void ExecuteReloadSitemapCommand(object obj)
+    {
+        await ReloadSitemap().ConfigureAwait(false);
+    }
+
+    private async Task ReloadSitemap()
+    {
+        CurrentWidgets?.Clear();
+        StrongReferenceMessenger.Default.Send<DataOperation>(new DataOperation(OperationState.Started));
+
+        if (SelectedWidget != null)
         {
-            get
+            await LoadWidgetsAsync().ConfigureAwait(false);
+            WidgetViewModel widget = FindWidget(SelectedWidget.WidgetId, Widgets);
+            if (widget != null)
+            {
+                await OnWidgetClickedAsync(widget);
+            }
+            else
             {
-                return Model.Label;
+                SelectedWidget = null;
+                WidgetNavigationService.ClearWidgetNavigation();
             }
         }
+        else
+        {
+            await LoadWidgetsAsync().ConfigureAwait(false);
+        }
 
-        /// <summary>
-        /// Gets or sets a collection of widgets of the OpenHAB sitemap.
-        /// </summary>
-        public ObservableCollection<OpenHABWidget> Widgets
+        StrongReferenceMessenger.Default.Send<DataOperation>(new DataOperation(OperationState.Completed));
+        ReloadSitemapCommand.InvokeCanExecuteChanged(null);
+    }
+
+    #endregion Reload Command
+
+    #region Navigate To Sitemap Root Command
+
+    private bool _canExecuteReloadSitemap;
+    private ActionCommand _navigateToSitemapRootCommand;
+
+    /// <summary>
+    /// Gets the command to navigate to the root of the sitemap.
+    /// </summary>
+    public ActionCommand NavigateToSitemapRoot =>
+        _navigateToSitemapRootCommand ?? (_navigateToSitemapRootCommand = new ActionCommand(ExecuteNavigateToSitemapRootCommand, CanExecuteNavigateToSitemapRootCommand));
+
+    private bool CanExecuteNavigateToSitemapRootCommand(object arg)
+    {
+        return true;
+    }
+
+    private void ExecuteNavigateToSitemapRootCommand(object obj)
+    {
+        WidgetNavigationService.ClearWidgetNavigation();
+        SetWidgetsOnScreenAsync(Widgets);
+        SelectedWidget = null;
+
+        StrongReferenceMessenger.Default.Send(new WidgetNavigationMessage(SelectedWidget, null, EventTriggerSource.Widget), Model.Name);
+    }
+
+    private static async Task<List<WidgetViewModel>> GetWidgetViewModels(ICollection<Widget> widgets, IServiceProvider serviceProvider)
+    {
+        List<WidgetViewModel> widgetViewModels = new List<WidgetViewModel>();
+        foreach (Widget widget in widgets)
+        {
+            WidgetViewModel viewModel = await WidgetViewModel.CreateAsync(widget, serviceProvider).ConfigureAwait(false);
+            widgetViewModels.Add(viewModel);
+        }
+
+        return widgetViewModels;
+    }
+
+    #endregion Navigate To Sitemap Root Command
+
+    #region Events
+
+    private void DataOperationState(DataOperation operation)
+    {
+        switch (operation.State)
+        {
+            case OperationState.Started:
+                _canExecuteReloadSitemap = true;
+                break;
+
+            case OperationState.Completed:
+                _canExecuteReloadSitemap = false;
+                break;
+        }
+    }
+
+    private async Task TriggerItemCommand(TriggerCommandMessage message)
+    {
+        HttpResponseResult<bool> result = await _sitemapService.SendItemCommand(message.Item, message.Command).ConfigureAwait(false);
+        if (!result.Content)
+        {
+            string errorMessage = AppResources.Errors.GetString("CommandFailed");
+            errorMessage = string.Format(errorMessage, message.Command, message.Item?.Name);
+
+            StrongReferenceMessenger.Default.Send<ConnectionErrorMessage>(new ConnectionErrorMessage(errorMessage));
+        }
+    }
+
+    #endregion Events
+
+    #region Factory
+
+    /// <summary>
+    /// Creates a new instance of the <see cref="SitemapViewModel"/> class asynchronously.
+    /// </summary>
+    /// <param name="sitemap">The OpenHABSitemap object.</param>
+    /// <returns>A task that represents the asynchronous operation. The task result contains the created SitemapViewModel.</returns>
+    public static async Task<SitemapViewModel> CreateAsync(Sitemap sitemap, SitemapService sitemapService, IServiceProvider serviceProvider)
+    {
+        if (sitemap.Homepage?.Widgets == null ||
+            sitemap.Homepage.Widgets.Count == 0)
+        {
+            return new SitemapViewModel(sitemap, new List<WidgetViewModel>(), sitemapService, serviceProvider);
+        }
+
+        List<WidgetViewModel> widgetViewModels = await GetWidgetViewModels(sitemap.Homepage.Widgets, serviceProvider).ConfigureAwait(false);
+        SitemapViewModel viewModel = new SitemapViewModel(sitemap, widgetViewModels, sitemapService, serviceProvider);
+
+        return viewModel;
+    }
+
+    private async Task LoadWidgetsAsync()
+    {
+        this.Widgets = new ObservableCollection<WidgetViewModel>();
+        CurrentWidgets?.Clear();
+
+        ICollection<Widget> widgetModels = await _sitemapService.LoadItemsFromSitemapAsync(Model).ConfigureAwait(false);
+        Widgets = new ObservableCollection<WidgetViewModel>(ConvertWidgetToViewModel(widgetModels));
+
+        await SetWidgetsOnScreenAsync(this.Widgets);
+    }
+
+    private List<WidgetViewModel> ConvertWidgetToViewModel(ICollection<Widget> widgetModels)
+    {
+        List<WidgetViewModel> widgetViewModels = new List<WidgetViewModel>();
+        widgetModels.ToList().ForEach(async model =>
+        {
+            WidgetViewModel viewModel = await WidgetViewModel.CreateAsync(model, _serviceProvider).ConfigureAwait(false);
+            widgetViewModels.Add(viewModel);
+        });
+
+        return widgetViewModels;
+    }
+
+    #endregion Factory
+
+    #region Widget interaction
+
+    private WidgetViewModel FindWidget(string widgetId, ICollection<WidgetViewModel> widgets)
+    {
+        WidgetViewModel openHABWidget = null;
+        if (widgets == null || widgets.Count == 0)
         {
-            get
+            return openHABWidget;
+        }
+
+        foreach (WidgetViewModel widget in widgets)
+        {
+            if (string.CompareOrdinal(widget.WidgetId, widgetId) == 0)
             {
-                return _widgets;
+                return widget;
             }
 
-            set
+            ICollection<WidgetViewModel> childWidgets = widget.Type.CompareTo("Group") == 0 ? ConvertWidgetToViewModel(widget.LinkedPage?.Widgets) : widget.Children;
+            openHABWidget = FindWidget(widgetId, childWidgets);
+            if (openHABWidget != null)
             {
-                if (Equals(value, _widgets))
-                {
-                    return;
-                }
+                return openHABWidget;
+            }
+        }
 
-                _widgets = value;
-                OnPropertyChanged();
+        return openHABWidget;
+    }
+
+    private async Task OnWidgetClickedAsync(WidgetViewModel widget)
+    {
+        await App.DispatcherQueue.EnqueueAsync(async () =>
+        {
+            WidgetViewModel lastWidget = SelectedWidget;
+            SelectedWidget = widget;
+            if (SelectedWidget.LinkedPage == null || !SelectedWidget.LinkedPage.Widgets.Any())
+            {
+                return;
             }
+
+            WidgetNavigationService.Navigate(SelectedWidget);
+            StrongReferenceMessenger.Default.Send(new WidgetNavigationMessage(lastWidget, widget, EventTriggerSource.Widget), Model.Name);
+
+            List<WidgetViewModel> widgets = ConvertWidgetToViewModel(SelectedWidget.LinkedPage.Widgets);
+            await SetWidgetsOnScreenAsync(widgets);
+        });
+    }
+
+    private async Task SetWidgetsOnScreenAsync(ICollection<WidgetViewModel> widgets)
+    {
+        await App.DispatcherQueue.EnqueueAsync(() =>
+        {
+            CurrentWidgets?.Clear();
+            CurrentWidgets?.AddRange(widgets);
+        });
+    }
+
+    private async Task WidgetGoBack(WidgetViewModel widget)
+    {
+        if (!WidgetNavigationService.CanGoBack)
+        {
+            return;
         }
 
-        /// <summary>
-        /// Loads widgets for sitemap.
-        /// </summary>
-        /// <param name="version">OH version.</param>
-        /// <returns>Task for async processing.</returns>
-        public async Task LoadWidgets(OpenHABVersion version)
+        WidgetViewModel lastWidget = SelectedWidget;
+        WidgetViewModel widgetFromStack = null;
+
+        while (widgetFromStack?.WidgetId != widget.WidgetId)
         {
-            Widgets.Clear();
+            widgetFromStack = WidgetNavigationService.GoBack();
+        }
+
+        SelectedWidget = widgetFromStack;
+        WidgetNavigationService.Navigate(SelectedWidget);
+        StrongReferenceMessenger.Default.Send(new WidgetNavigationMessage(lastWidget, SelectedWidget, EventTriggerSource.Widget), Model.Name);
+
+        List<WidgetViewModel> widgets = ConvertWidgetToViewModel(SelectedWidget.LinkedPage.Widgets);
+        await SetWidgetsOnScreenAsync(widgets);
+    }
+
+    #endregion Widget interaction
+
+    #region Dispose
 
-            ICollection<OpenHABWidget> widgetModels = await _openHabsdk.LoadItemsFromSitemap(Model, version).ConfigureAwait(false);
-            widgetModels.ToList().ForEach(x => Widgets.Add(x));
+    /// <inheritdoc/>
+    public void Dispose()
+    {
+        // Do not change this code. Put cleanup code in 'Dispose(bool disposing)' method
+        Dispose(disposing: true);
+        GC.SuppressFinalize(this);
+    }
+
+    protected virtual void Dispose(bool disposing)
+    {
+        if (!disposedValue)
+        {
+            if (disposing)
+            {
+                StrongReferenceMessenger.Default.Unregister<WidgetClickedMessage>(this);
+                StrongReferenceMessenger.Default.Unregister<TriggerCommandMessage>(this);
+                StrongReferenceMessenger.Default.Unregister<DataOperation>(this);
+                StrongReferenceMessenger.Default.Unregister<WidgetNavigationMessage, string>(this, Model.Name);
+
+                Widgets = null;
+                CurrentWidgets = null;
+                SelectedWidget = null;
+            }
+
+            disposedValue = true;
         }
     }
+
+    #endregion Dispose
 }
diff --git a/src/openHAB.Windows/ViewModel/ViewModelBase.cs b/src/openHAB.Windows/ViewModel/ViewModelBase.cs
index fc0f51dd..333547e4 100644
--- a/src/openHAB.Windows/ViewModel/ViewModelBase.cs
+++ b/src/openHAB.Windows/ViewModel/ViewModelBase.cs
@@ -1,94 +1,93 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
-using OpenHAB.Core.Common;
+using openHAB.Core.Common;
 
-namespace OpenHAB.Windows.ViewModel
+namespace openHAB.Windows.ViewModel;
+
+/// <summary>
+/// MVVM ViewModel Base Class.
+/// </summary>
+/// <typeparam name="T">Model type interface.</typeparam>
+public class ViewModelBase<T> : DataErrorInfo, INotifyPropertyChanged, IViewModel<T>
 {
     /// <summary>
-    /// MVVM ViewModel Base Class.
+    /// Initializes a new instance of the <see cref="ViewModelBase&lt;T&gt;"/> class.
     /// </summary>
-    /// <typeparam name="T">Model type interface.</typeparam>
-    public class ViewModelBase<T> : DataErrorInfo, INotifyPropertyChanged, IViewModel<T>
+    /// <param name="model">The model.</param>
+    public ViewModelBase(T model)
     {
-        /// <summary>
-        /// Initializes a new instance of the <see cref="ViewModelBase&lt;T&gt;"/> class.
-        /// </summary>
-        /// <param name="model">The model.</param>
-        public ViewModelBase(T model)
-        {
-            Model = model;
-        }
+        Model = model;
+    }
 
-        /// <summary>
-        /// PropertyChanged Event
-        /// </summary>
-        public event PropertyChangedEventHandler PropertyChanged;
+    /// <summary>
+    /// PropertyChanged Event
+    /// </summary>
+    public event PropertyChangedEventHandler PropertyChanged;
 
-        /// <summary>
-        /// Called when [property changed].
-        /// </summary>
-        /// <param name="propertyName">Name of the property.</param>
-        protected void OnPropertyChanged([CallerMemberName] string propertyName = null)
+    /// <summary>
+    /// Called when [property changed].
+    /// </summary>
+    /// <param name="propertyName">Name of the property.</param>
+    protected void OnPropertyChanged([CallerMemberName] string propertyName = null)
+    {
+        PropertyChangedEventHandler handler = PropertyChanged;
+        if (handler != null)
         {
-            PropertyChangedEventHandler handler = PropertyChanged;
-            if (handler != null)
-            {
-                handler(this, new PropertyChangedEventArgs(propertyName));
-            }
+            handler(this, new PropertyChangedEventArgs(propertyName));
         }
+    }
 
-        /// <summary>
-        /// Sets the property.
-        /// </summary>
-        /// <typeparam name="TS">Field value type.</typeparam>
-        /// <param name="field">The field.</param>
-        /// <param name="value">The value.</param>
-        /// <param name="markDirty">Set dirty flag on value change.</param>
-        /// <param name="name">The name.</param>
-        /// <returns>True when value was updated, else false.</returns>
-        public bool Set<TS>(ref TS field, TS value, bool markDirty = false, [CallerMemberName] string name = "")
+    /// <summary>
+    /// Sets the property.
+    /// </summary>
+    /// <typeparam name="TS">Field value type.</typeparam>
+    /// <param name="field">The field.</param>
+    /// <param name="value">The value.</param>
+    /// <param name="markDirty">Set dirty flag on value change.</param>
+    /// <param name="name">The name.</param>
+    /// <returns>True when value was updated, else false.</returns>
+    public bool Set<TS>(ref TS field, TS value, bool markDirty = false, [CallerMemberName] string name = "")
+    {
+        if (!EqualityComparer<TS>.Default.Equals(field, value))
         {
-            if (!EqualityComparer<TS>.Default.Equals(field, value))
-            {
-                field = value;
+            field = value;
 
-                if (markDirty)
-                {
-                    IsDirty = true;
-                    OnPropertyChanged(nameof(IsDirty));
-                }
-
-                var handler = PropertyChanged;
-                if (handler != null)
-                {
-                    handler(this, new PropertyChangedEventArgs(name));
-                    return true;
-                }
+            if (markDirty)
+            {
+                IsDirty = true;
+                OnPropertyChanged(nameof(IsDirty));
             }
 
-            return false;
+            PropertyChangedEventHandler handler = PropertyChanged;
+            if (handler != null)
+            {
+                handler(this, new PropertyChangedEventArgs(name));
+                return true;
+            }
         }
 
-        /// <summary>
-        /// Gets or sets the model.
-        /// </summary>
-        /// <value>
-        /// The model.
-        /// </value>
-        public T Model
-        {
-            get;
-            set;
-        }
+        return false;
+    }
 
-        /// <summary>Gets or sets a value indicating whether this object is dirty.</summary>
-        /// <value>
-        ///   <c>true</c> if this instance is dirty; otherwise, <c>false</c>.</value>
-        public bool IsDirty
-        {
-            get;
-            protected set;
-        }
+    /// <summary>
+    /// Gets or sets the model.
+    /// </summary>
+    /// <value>
+    /// The model.
+    /// </value>
+    public T Model
+    {
+        get;
+        set;
+    }
+
+    /// <summary>Gets or sets a value indicating whether this object is dirty.</summary>
+    /// <value>
+    ///   <c>true</c> if this instance is dirty; otherwise, <c>false</c>.</value>
+    public bool IsDirty
+    {
+        get;
+        protected set;
     }
 }
diff --git a/src/openHAB.Windows/ViewModel/WidgetViewModel.cs b/src/openHAB.Windows/ViewModel/WidgetViewModel.cs
new file mode 100644
index 00000000..ba481def
--- /dev/null
+++ b/src/openHAB.Windows/ViewModel/WidgetViewModel.cs
@@ -0,0 +1,315 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Options;
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Markup;
+using Microsoft.UI.Xaml.Media;
+using Microsoft.UI.Xaml.Media.Imaging;
+using openHAB.Core.Client.Models;
+using openHAB.Core.Model;
+using openHAB.Core.Services.Contracts;
+using Windows.UI;
+
+namespace openHAB.Windows.ViewModel;
+
+/// <summary>
+/// Represents the view model for a widget in the openHAB application.
+/// </summary>
+public class WidgetViewModel : ViewModelBase<Widget>
+{
+    private readonly IServiceProvider _serviceProvider;
+    private readonly IOptions<SettingOptions> _settingsOptions;
+    private ObservableCollection<WidgetViewModel> _children;
+    private string _iconPath;
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="WidgetViewModel"/> class.
+    /// </summary>
+    /// <param name="model">The underlying model for the widget.</param>
+    private WidgetViewModel(Widget model, IServiceProvider serviceProvider)
+        : base(model)
+    {
+        Children = new ObservableCollection<WidgetViewModel>();
+        _serviceProvider = serviceProvider;
+        _settingsOptions = _serviceProvider.GetRequiredService<IOptions<SettingOptions>>();
+    }
+
+    #region Properties
+
+    /// <summary>
+    /// Gets the collection of child widgets.
+    /// </summary>
+    public ObservableCollection<WidgetViewModel> Children
+    {
+        get => _children;
+        set => Set(ref _children, value);
+    }
+
+    /// <summary>
+    /// Gets the encoding of the widget.
+    /// </summary>
+    public string Encoding
+    {
+        get => Model.Encoding;
+    }
+
+    /// <summary>
+    /// Gets the icon of the widget.
+    /// </summary>
+    public SvgImageSource Icon
+    {
+        get => !string.IsNullOrEmpty(IconPath) ? new SvgImageSource(new Uri(IconPath)) : null;
+    }
+
+    /// <summary>
+    /// Gets the path of the icon.
+    /// </summary>
+    public string IconPath
+    {
+        get => _iconPath;
+        set => Set(ref _iconPath, value);
+    }
+
+    /// <summary>
+    /// Gets the item associated with the widget.
+    /// </summary>
+    public Item Item
+    {
+        get => Model.Item;
+    }
+
+    /// <summary>
+    /// Gets the label of the widget.
+    /// </summary>
+    public string Label
+    {
+        get => Model.Label;
+    }
+
+    /// <summary>
+    /// Gets the color of the label.
+    /// </summary>
+    public SolidColorBrush LabelColor
+    {
+        get
+        {
+            string colorString = Model.LabelColor as string;
+            return ColorValueToSolidColor(colorString);
+        }
+    }
+
+    /// <summary>
+    /// Gets the linked page of the widget.
+    /// </summary>
+    public Page LinkedPage
+    {
+        get; internal set;
+    }
+
+    /// <summary>
+    /// Gets the collection of mappings for the widget.
+    /// </summary>
+    public ICollection<WidgetMapping> Mappings
+    {
+        get => Model.Mappings;
+    }
+
+    /// <summary>
+    /// Gets the maximum value for the widget.
+    /// </summary>
+    public float MaxValue
+    {
+        get => Model.MaxValue;
+    }
+
+    /// <summary>
+    /// Gets the minimum value for the widget.
+    /// </summary>
+    public float MinValue
+    {
+        get => Model.MinValue;
+    }
+
+    /// <summary>
+    /// Gets or sets the parent widget view model.
+    /// </summary>
+    public WidgetViewModel Parent
+    {
+        get;
+        internal set;
+    }
+
+    /// <summary>
+    /// Gets the period for the widget.
+    /// </summary>
+    public string Period
+    {
+        get => Model.Period;
+    }
+
+    /// <summary>
+    /// Gets the refresh rate for the widget.
+    /// </summary>
+    public int Refresh
+    {
+        get => (int)Model.Refresh;
+    }
+
+    /// <summary>
+    /// Gets or sets the state of the widget.
+    /// </summary>
+    public string State
+    {
+        get => Model.Item != null && string.Compare(Model.Item?.State, "null", true) != 0 ? Model.Item.State : string.Empty;
+        set
+        {
+            if (value.CompareTo(Model.Item?.State) == 0)
+            {
+                return;
+            }
+
+            Model.Item.State = value;
+            OnPropertyChanged(nameof(State));
+        }
+    }
+
+    /// <summary>
+    /// Gets the step value for the widget.
+    /// </summary>
+    public float Step
+    {
+        get => Model.Step;
+    }
+
+    /// <summary>
+    /// Gets the type of the widget.
+    /// </summary>
+    public string Type
+    {
+        get => Model.Type;
+    }
+
+    /// <summary>
+    /// Gets the URL associated with the widget.
+    /// </summary>
+    public string Url
+    {
+        get => Model.Url;
+    }
+
+    /// <summary>
+    /// Gets the color of the value.
+    /// </summary>
+    public SolidColorBrush ValueColor
+    {
+        get
+        {
+            string colorString = Model.ValueColor as string;
+            return ColorValueToSolidColor(colorString);
+        }
+    }
+
+    /// <summary>
+    /// Gets the visibility of the widget.
+    /// </summary>
+    public Visibility Visibility
+    {
+        get => Model.Visibility ? Visibility.Visible : Visibility.Collapsed;
+    }
+
+    /// <summary>
+    /// Gets the ID of the widget.
+    /// </summary>
+    public string WidgetId
+    {
+        get => Model.WidgetId;
+    }
+
+    #endregion
+
+    #region Factory
+
+    /// <summary>
+    /// Creates a new instance of the <see cref="WidgetViewModel"/> class asynchronously.
+    /// </summary>
+    /// <param name="model">The underlying model for the widget.</param>
+    /// <returns>A task that represents the asynchronous operation. The task result contains the created <see cref="WidgetViewModel"/>.</returns>
+    public static async Task<WidgetViewModel> CreateAsync(Widget model, IServiceProvider serviceProvider)
+    {
+        WidgetViewModel viewModel = new WidgetViewModel(model, serviceProvider);
+        viewModel.LoadData();
+
+        return viewModel;
+    }
+
+    private async Task<string> CacheAndRetrieveLocalIconPath(string icon)
+    {
+        IIconCaching iconCaching = _serviceProvider.GetRequiredService<IIconCaching>();
+        SettingOptions setting = _settingsOptions.Value;
+
+        string iconFormat = setting.UseSVGIcons ? "svg" : "svg";
+        string path = await iconCaching.ResolveIconPath(icon, Model.State, iconFormat).ConfigureAwait(false);
+
+        return path;
+    }
+
+    /// <summary>
+    /// Loads the data for the widget asynchronously.
+    /// </summary>
+    /// <returns>A task that represents the asynchronous operation.</returns>
+    private async Task LoadData()
+    {
+        if (!string.IsNullOrEmpty(Model.Icon))
+        {
+            IconPath = await CacheAndRetrieveLocalIconPath(Model.Icon);
+        }
+
+        if (Model.LinkedPage != null)
+        {
+            LinkedPage = Model.LinkedPage;
+        }
+
+        ObservableCollection<WidgetViewModel> widgets = new ObservableCollection<WidgetViewModel>();
+        foreach (Widget widget in Model.Children)
+        {
+            WidgetViewModel viewModel = await WidgetViewModel.CreateAsync(widget, _serviceProvider);
+            widgets.Add(viewModel);
+        }
+
+        Children = widgets;
+    }
+
+    #endregion
+
+    #region Color Handling
+
+    private SolidColorBrush ColorValueToSolidColor(string colorString, string resourceName = "TextFillColorPrimaryBrush")
+    {
+        if (string.IsNullOrEmpty(colorString))
+        {
+            ResourceDictionary? resourceDictionary = Application.Current.Resources.MergedDictionaries
+                .FirstOrDefault(rd => rd.ContainsKey(resourceName));
+
+            if (resourceDictionary == null || !resourceDictionary.TryGetValue(resourceName, out object defaultTextColor))
+            {
+                return null;
+            }
+
+            return (SolidColorBrush)defaultTextColor;
+        }
+
+        Color color = ConvertColorCodeToColor(colorString);
+        return new SolidColorBrush(color);
+    }
+
+    private Color ConvertColorCodeToColor(string value)
+    {
+        return (Color)XamlBindingHelper.ConvertValue(typeof(Color), value);
+    }
+
+    #endregion
+}
diff --git a/src/openHAB.Windows/app.manifest b/src/openHAB.Windows/app.manifest
new file mode 100644
index 00000000..372af4bc
--- /dev/null
+++ b/src/openHAB.Windows/app.manifest
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
+    <assemblyIdentity version="1.0.0.0" name="openHAB.Windows.app"/>
+
+    <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
+        <application>
+            <!-- The ID below informs the system that this application is compatible with OS features first introduced in Windows 10.
+      It is necessary to support features in unpackaged applications, for example the custom titlebar implementation.
+      For more info see https://docs.microsoft.com/windows/apps/windows-app-sdk/use-windows-app-sdk-run-time#declare-os-compatibility-in-your-application-manifest -->
+            <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
+        </application>
+    </compatibility>
+
+    <application xmlns="urn:schemas-microsoft-com:asm.v3">
+        <windowsSettings>
+            <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
+        </windowsSettings>
+    </application>
+</assembly>
diff --git a/src/openHAB.Windows/openHAB.Windows.GeneratedMSBuildEditorConfig.editorconfig b/src/openHAB.Windows/openHAB.Windows.GeneratedMSBuildEditorConfig.editorconfig
deleted file mode 100644
index 479cd4c4..00000000
--- a/src/openHAB.Windows/openHAB.Windows.GeneratedMSBuildEditorConfig.editorconfig
+++ /dev/null
@@ -1,8 +0,0 @@
-is_global = true
-build_property.TargetFramework = 
-build_property.TargetPlatformMinVersion = 10.0.17763.0
-build_property.UsingMicrosoftNETSdkWeb = 
-build_property.ProjectTypeGuids = {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
-build_property.PublishSingleFile = 
-build_property.IncludeAllContentForSelfExtract = 
-build_property._SupportedPlatformList =
diff --git a/src/openHAB.Windows/openHAB.Windows.csproj b/src/openHAB.Windows/openHAB.Windows.csproj
index 988bbed5..e9992cf2 100644
--- a/src/openHAB.Windows/openHAB.Windows.csproj
+++ b/src/openHAB.Windows/openHAB.Windows.csproj
@@ -1,482 +1,100 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProjectGuid>{D65E41CE-1AE7-403A-B178-D69E8DAFB08B}</ProjectGuid>
-    <OutputType>AppContainerExe</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>OpenHAB.Windows</RootNamespace>
-    <AssemblyName>OpenHAB.Windows</AssemblyName>
-    <DefaultLanguage>en-US</DefaultLanguage>
-    <TargetPlatformIdentifier>UAP</TargetPlatformIdentifier>
-    <TargetPlatformVersion>10.0.19041.0</TargetPlatformVersion>
-    <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
-    <MinimumVisualStudioVersion>14</MinimumVisualStudioVersion>
-    <FileAlignment>512</FileAlignment>
-    <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <PackageCertificateKeyFile>OpenHAB.Windows_StoreKey.pfx</PackageCertificateKeyFile>
-    <PackageCertificateThumbprint>
-    </PackageCertificateThumbprint>
-    <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
-    <AppxBundle>Always</AppxBundle>
-    <AppxBundlePlatforms>x86|x64|arm</AppxBundlePlatforms>
-    <RuntimeIdentifiers>win10-arm;win10-arm-aot;win10-x86;win10-x86-aot;win10-x64;win10-x64-aot</RuntimeIdentifiers>
-    <AppxPackageSigningEnabled>True</AppxPackageSigningEnabled>
-    <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
-    <AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
-    <GenerateTestArtifacts>True</GenerateTestArtifacts>
-    <HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x86\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-    <CodeAnalysisRuleSet>..\..\.sonarlint\openhab_openhab-windowscsharp.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile>bin\x86\Debug\OpenHAB.Windows.XML</DocumentationFile>
-    <UseDotNetNativeToolchain>false</UseDotNetNativeToolchain>
-    <EnableGatekeeperAnalysis>false</EnableGatekeeperAnalysis>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
-    <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE;RELEASE;NETFX_CORE;WINDOWS_UWP;CODE_ANALYSIS</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
-    <CodeAnalysisRuleSet>..\..\.sonarlint\openhab_openhab-windowscsharp.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\ARM\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>ARM</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-    <CodeAnalysisRuleSet>..\..\.sonarlint\openhab_openhab-windowscsharp.ruleset</CodeAnalysisRuleSet>
-    <UseDotNetNativeToolchain>false</UseDotNetNativeToolchain>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
-    <OutputPath>bin\ARM\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>ARM</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
-    <CodeAnalysisRuleSet>..\..\.sonarlint\openhab_openhab-windowscsharp.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-    <CodeAnalysisRuleSet>..\..\.sonarlint\openhab_openhab-windowscsharp.ruleset</CodeAnalysisRuleSet>
-    <UseDotNetNativeToolchain>false</UseDotNetNativeToolchain>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFX_CORE;WINDOWS_UWP</DefineConstants>
-    <Optimize>true</Optimize>
-    <NoWarn>;2008</NoWarn>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
-    <ErrorReport>prompt</ErrorReport>
-    <Prefer32Bit>true</Prefer32Bit>
-    <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
-    <CodeAnalysisRuleSet>..\..\.sonarlint\openhab_openhab-windowscsharp.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <ItemGroup>
-    <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
-    <PRIResource Include="..\Openhab.Core\Strings\de-de\Resources.resw">
-      <Link>Strings\de-de\Resources.resw</Link>
-      <SubType>Designer</SubType>
-    </PRIResource>
-    <PRIResource Include="..\Openhab.Core\Strings\en-us\Resources.resw">
-      <Link>Strings\en-us\Resources.resw</Link>
-    </PRIResource>
-    <PRIResource Include="..\Openhab.Core\Strings\de-de\Errors.resw">
-      <Link>Strings\de-de\Errors.resw</Link>
-    </PRIResource>
-    <PRIResource Include="..\Openhab.Core\Strings\en-us\Errors.resw">
-      <Link>Strings\en-us\Errors.resw</Link>
-    </PRIResource>
-    <None Include="..\..\.sonarlint\openhab_openhab-windowscsharp.ruleset">
-      <Link>openhab_openhab-windowscsharp.ruleset</Link>
-    </None>
-    <None Include="OpenHAB.Windows_StoreKey.pfx" />
-    <None Include="OpenHAB.Windows_TemporaryKey.pfx" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="App.xaml.cs">
-      <DependentUpon>App.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Controls\ChartWidget.xaml.cs">
-      <DependentUpon>ChartWidget.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Controls\ColorMap.xaml.cs">
-      <DependentUpon>ColorMap.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Controls\ConnectionDialog.xaml.cs">
-      <DependentUpon>ConnectionDialog.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Controls\DeviceFamilyStateTrigger.cs" />
-    <Compile Include="Controls\FrameWidget.xaml.cs">
-      <DependentUpon>FrameWidget.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Controls\ImageLabel.xaml.cs">
-      <DependentUpon>ImageLabel.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Controls\MapViewWidget.xaml.cs">
-      <DependentUpon>MapViewWidget.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Controls\MjpegWidget.xaml.cs">
-      <DependentUpon>MjpegWidget.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Controls\ImageWidget.xaml.cs">
-      <DependentUpon>ImageWidget.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Controls\NavMenuListView.cs" />
-    <Compile Include="Controls\RadialSlider.cs" />
-    <Compile Include="Controls\SelectionWidget.xaml.cs">
-      <DependentUpon>SelectionWidget.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Controls\SetpointWidget.xaml.cs">
-      <DependentUpon>SetpointWidget.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Controls\SliderWidget.xaml.cs">
-      <DependentUpon>SliderWidget.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Controls\PageLinkWidget.xaml.cs">
-      <DependentUpon>PageLinkWidget.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Controls\RollershutterWidget.xaml.cs">
-      <DependentUpon>RollershutterWidget.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Controls\SectionSwitchWidget.xaml.cs">
-      <DependentUpon>SectionSwitchWidget.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Controls\SwitchWidget.xaml.cs">
-      <DependentUpon>SwitchWidget.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Controls\ColorWidget.xaml.cs">
-      <DependentUpon>ColorWidget.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Controls\ToggleWidget.xaml.cs">
-      <DependentUpon>ToggleWidget.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Controls\TextWidget.xaml.cs">
-      <DependentUpon>TextWidget.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Controls\WebViewWidget.xaml.cs">
-      <DependentUpon>WebViewWidget.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Controls\WidgetBase.cs" />
-    <Compile Include="Converters\BooleanToVisibilityConverter.cs" />
-    <Compile Include="Converters\StringToColorBrushConverter.cs" />
-    <Compile Include="Converters\IconToBitmapConverter.cs" />
-    <Compile Include="Converters\IconToPathConverter.cs" />
-    <Compile Include="Converters\MenuItemTemplateSelector.cs" />
-    <Compile Include="Converters\NullToBooleanConverter.cs" />
-    <Compile Include="Converters\ObjectToSitemapConverter.cs" />
-    <Compile Include="Converters\OpenHabUrlStateToGlyph.cs" />
-    <Compile Include="Converters\ReverseBoolConverter.cs" />
-    <Compile Include="Converters\StateToBoolConverter.cs" />
-    <Compile Include="Converters\StringToDoubleConverter.cs" />
-    <Compile Include="Converters\WidgetTemplateSelector.cs" />
-    <Compile Include="Converters\ZeroToVisibilityConverter.cs" />
-    <Compile Include="DIService.cs" />
-    <Compile Include="Extensions\ContentDialogExtensions.cs" />
-    <Compile Include="ViewModel\ConfigurationViewModel.cs" />
-    <Compile Include="ViewModel\ConnectionStatusViewModel.cs" />
-    <Compile Include="ViewModel\ConnectionDialogViewModel.cs" />
-    <Compile Include="ViewModel\ConnectionProfileViewModel.cs" />
-    <Compile Include="ViewModel\IViewModel.cs" />
-    <Compile Include="ViewModel\LanguageViewModel.cs" />
-    <Compile Include="ViewModel\LogsViewModel.cs" />
-    <Compile Include="ViewModel\MainViewModel.cs" />
-    <Compile Include="ViewModel\SitemapViewModel.cs" />
-    <Compile Include="ViewModel\SettingsViewModel.cs" />
-    <Compile Include="ViewModel\ViewModelBase.cs" />
-    <Compile Include="View\LogViewerPage.xaml.cs">
-      <DependentUpon>LogViewerPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="View\MainPage.xaml.cs">
-      <DependentUpon>MainPage.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="View\SettingsPage.xaml.cs">
-      <DependentUpon>SettingsPage.xaml</DependentUpon>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <AppxManifest Include="Package.appxmanifest">
-      <SubType>Designer</SubType>
-    </AppxManifest>
-  </ItemGroup>
-  <ItemGroup>
-    <AdditionalFiles Include="..\..\.sonarlint\openhab_openhab-windows\CSharp\SonarLint.xml">
-      <Link>SonarLint.xml</Link>
-    </AdditionalFiles>
-    <Content Include="Assets\background.jpg" />
-    <Content Include="Assets\LogoSplash.jpg" />
-    <Content Include="Assets\NewStoreLogo.scale-100.png" />
-    <Content Include="Assets\NewStoreLogo.scale-125.png" />
-    <Content Include="Assets\NewStoreLogo.scale-150.png" />
-    <Content Include="Assets\NewStoreLogo.scale-200.png" />
-    <Content Include="Assets\NewStoreLogo.scale-400.png" />
-    <Content Include="Assets\openhab.png" />
-    <Content Include="Assets\SplashScreen.scale-100.png" />
-    <Content Include="Assets\SplashScreen.scale-125.png" />
-    <Content Include="Assets\SplashScreen.scale-150.png" />
-    <Content Include="Assets\SplashScreen.scale-400.png" />
-    <Content Include="Assets\Square150x150Logo.scale-100.png" />
-    <Content Include="Assets\Square150x150Logo.scale-125.png" />
-    <Content Include="Assets\Square150x150Logo.scale-150.png" />
-    <Content Include="Assets\Square150x150Logo.scale-400.png" />
-    <Content Include="Assets\Square310x310Logo.scale-100.png" />
-    <Content Include="Assets\Square310x310Logo.scale-125.png" />
-    <Content Include="Assets\Square310x310Logo.scale-150.png" />
-    <Content Include="Assets\Square310x310Logo.scale-200.png" />
-    <Content Include="Assets\Square310x310Logo.scale-400.png" />
-    <Content Include="Assets\Square44x44Logo.scale-100.png" />
-    <Content Include="Assets\Square44x44Logo.scale-125.png" />
-    <Content Include="Assets\Square44x44Logo.scale-150.png" />
-    <Content Include="Assets\Square44x44Logo.scale-400.png" />
-    <Content Include="Assets\Square44x44Logo.targetsize-16.png" />
-    <Content Include="Assets\Square44x44Logo.targetsize-16_altform-unplated.png" />
-    <Content Include="Assets\Square44x44Logo.targetsize-24.png" />
-    <Content Include="Assets\Square44x44Logo.targetsize-256.png" />
-    <Content Include="Assets\Square44x44Logo.targetsize-256_altform-unplated.png" />
-    <Content Include="Assets\Square44x44Logo.targetsize-32.png" />
-    <Content Include="Assets\Square44x44Logo.targetsize-32_altform-unplated.png" />
-    <Content Include="Assets\Square44x44Logo.targetsize-48.png" />
-    <Content Include="Assets\Square44x44Logo.targetsize-48_altform-unplated.png" />
-    <Content Include="Assets\Square71x71Logo.scale-100.png" />
-    <Content Include="Assets\Square71x71Logo.scale-125.png" />
-    <Content Include="Assets\Square71x71Logo.scale-150.png" />
-    <Content Include="Assets\Square71x71Logo.scale-200.png" />
-    <Content Include="Assets\Square71x71Logo.scale-400.png" />
-    <Content Include="Assets\Wide310x150Logo.scale-100.png" />
-    <Content Include="Assets\Wide310x150Logo.scale-125.png" />
-    <Content Include="Assets\Wide310x150Logo.scale-150.png" />
-    <Content Include="Assets\Wide310x150Logo.scale-400.png" />
-    <None Include="Package.StoreAssociation.xml" />
-    <Content Include="Properties\Default.rd.xml" />
-    <Content Include="Assets\LockScreenLogo.scale-200.png" />
-    <Content Include="Assets\SplashScreen.scale-200.png" />
-    <Content Include="Assets\Square150x150Logo.scale-200.png" />
-    <Content Include="Assets\Square44x44Logo.scale-200.png" />
-    <Content Include="Assets\Square44x44Logo.targetsize-24_altform-unplated.png" />
-    <Content Include="Assets\Wide310x150Logo.scale-200.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <ApplicationDefinition Include="App.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </ApplicationDefinition>
-    <Page Include="Controls\ChartWidget.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Controls\ColorMap.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Controls\ConnectionDialog.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Controls\FrameWidget.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Controls\ImageLabel.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Controls\MapViewWidget.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Controls\MjpegWidget.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Controls\ImageWidget.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Controls\SelectionWidget.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Controls\SetpointWidget.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Controls\SliderWidget.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Controls\PageLinkWidget.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Controls\RollershutterWidget.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Controls\SectionSwitchWidget.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Controls\SwitchWidget.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Controls\ColorWidget.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Controls\ToggleWidget.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Controls\TextWidget.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Controls\WebViewWidget.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Themes\Generic.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="View\LogViewerPage.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="View\MainPage.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="Styles\DefaultTheme.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Page>
-    <Page Include="View\SettingsPage.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.UI.Xaml.Markup, Version=10.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\XamlCompiler\Microsoft.UI.Xaml.Markup.winmd</HintPath>
-    </Reference>
-    <Reference Include="MJPEGDecoderWinRTLib, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\libaries\MJPEGDecoderWinRTLib.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\openHAB.Core\Openhab.Core.csproj">
-      <Project>{2a8fd10e-4ee5-4e25-b47c-2296e071f482}</Project>
-      <Name>Openhab.Core</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <SDKReference Include="Microsoft.Services.Store.Engagement, Version=10.0">
-      <Name>Microsoft Engagement Framework</Name>
-    </SDKReference>
-    <SDKReference Include="Microsoft.VCLibs, Version=14.0">
-      <Name>Visual C++ 2015 Runtime for Universal Windows Platform Apps</Name>
-    </SDKReference>
-    <SDKReference Include="WindowsDesktop, Version=10.0.19041.0">
-      <Name>Windows Desktop Extensions for the UWP</Name>
-    </SDKReference>
-  </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="CommunityToolkit.Mvvm">
-      <Version>7.1.2</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers">
-      <Version>6.0.0</Version>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection">
-      <Version>6.0.0</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.2.13</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Services.Store.Engagement">
-      <Version>10.1901.28001</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Toolkit.Uwp.UI.Controls">
-      <Version>7.1.2</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.UI.Xaml">
-      <Version>2.6.0-prerelease.210129001</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.Xaml.Behaviors.Uwp.Managed">
-      <Version>2.0.1</Version>
-    </PackageReference>
-    <PackageReference Include="NLog.Extensions.Logging">
-      <Version>1.7.4</Version>
-    </PackageReference>
-    <PackageReference Include="StyleCop.Analyzers">
-      <Version>1.1.118</Version>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="WinRTXamlToolkit.UWP">
-      <Version>2.3.0</Version>
-    </PackageReference>
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\OpenHAB.Core\OpenHAB.Core.csproj">
-      <Project>{2a8fd10e-4ee5-4e25-b47c-2296e071f482}</Project>
-      <Name>OpenHAB.Core</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
-    <VisualStudioVersion>14.0</VisualStudioVersion>
-  </PropertyGroup>
-  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WindowsXaml\v$(VisualStudioVersion)\Microsoft.Windows.UI.Xaml.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<OutputType>WinExe</OutputType>
+		<TargetFramework>net8.0-windows10.0.26100.0</TargetFramework>
+		<TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
+		<RootNamespace>$(MSBuildProjectName.Replace(" ", "_"))</RootNamespace>
+		<ApplicationManifest>app.manifest</ApplicationManifest>
+		<Platforms>x86;x64;arm64</Platforms>
+		<RuntimeIdentifiers>win-x86;win-x64;win-arm64</RuntimeIdentifiers>
+		<SupportedOSPlatformVersion>10.0.20348.0</SupportedOSPlatformVersion>
+		<UseWinUI>true</UseWinUI>
+		<Nullable>enable</Nullable>
+		<WindowsAppSDKSelfContained>true</WindowsAppSDKSelfContained>
+	</PropertyGroup>
+	<PropertyGroup>
+		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+		<DefineConstants>DISABLE_XAML_GENERATED_MAIN</DefineConstants>
+		<StartupObject>openHAB.Windows.Program</StartupObject>
+	</PropertyGroup>
+	<ItemGroup>
+		<PRIResource Include="..\Openhab.Core\Strings\de-DE\Resources.resw">
+			<Link>Strings\de-DE\Resources.resw</Link>
+		</PRIResource>
+		<PRIResource Include="..\Openhab.Core\Strings\en-US\Resources.resw">
+			<Link>Strings\en-US\Resources.resw</Link>
+		</PRIResource>
+		<PRIResource Include="..\Openhab.Core\Strings\de-DE\Errors.resw">
+			<Link>Strings\de-DE\Errors.resw</Link>
+		</PRIResource>
+		<PRIResource Include="..\Openhab.Core\Strings\en-US\Errors.resw">
+			<Link>Strings\en-US\Errors.resw</Link>
+		</PRIResource>
+	</ItemGroup>
+	<ItemGroup>
+		<Manifest Include="$(ApplicationManifest)" />
+	</ItemGroup>
+	<ItemGroup>
+		<Reference Include="MJPEGDecoderWinRTLib, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+			<SpecificVersion>False</SpecificVersion>
+			<HintPath>..\..\libaries\MJPEGDecoderWinRTLib.dll</HintPath>
+		</Reference>
+	</ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="CommunityToolkit.Mvvm">
+			<Version>8.4.0</Version>
+		</PackageReference>
+		<PackageReference Include="CommunityToolkit.WinUI.Behaviors" Version="8.1.240916" />
+		<PackageReference Include="Microsoft.Extensions.Http" Version="8.0.1" />
+		<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="8.0.11" />
+		<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.1742" />
+		<PackageReference Include="CommunityToolkit.WinUI.Controls.Primitives" Version="8.1.240916" />
+		<PackageReference Include="CommunityToolkit.WinUI.Controls.SettingsControls" Version="8.1.240916" />
+		<PackageReference Include="CommunityToolkit.WinUI.Helpers" Version="8.1.240916" />
+		<PackageReference Include="Mapsui" Version="4.1.8" />
+		<PackageReference Include="Mapsui.WinUI" Version="4.1.8" />
+		<PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers">
+			<Version>8.0.0</Version>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+			<PrivateAssets>all</PrivateAssets>
+		</PackageReference>
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
+		<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
+		<PackageReference Include="Microsoft.Services.Store.SDK" Version="10.1705.16001" />
+		<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.6.241114003" />
+		<PackageReference Include="Microsoft.Xaml.Behaviors.WinUI.Managed" Version="2.0.9" />
+		<PackageReference Include="NLog.Extensions.Logging" Version="5.3.15" />
+		<PackageReference Include="StyleCop.Analyzers">
+			<Version>1.1.118</Version>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+			<PrivateAssets>all</PrivateAssets>
+		</PackageReference>
+	</ItemGroup>
+	<ItemGroup>
+		<Compile Remove="Properties\Annotations.cs" />
+	</ItemGroup>
+	<ItemGroup>
+	  <None Remove="Controls\MapViewWidget.xaml" />
+	  <None Remove="View\MainUIPage.xaml" />
+	  <None Remove="View\SitemapPage.xaml" />
+	</ItemGroup>
+	<ItemGroup>
+	  <ProjectReference Include="..\openHAB.Core.Client\openHAB.Core.Client.csproj" />
+	  <ProjectReference Include="..\openHAB.Core\openHAB.Core.csproj" />
+	</ItemGroup>
+	<ItemGroup>
+	  <Page Update="View\SitemapPage.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </Page>
+	</ItemGroup>
+	<ItemGroup>
+	  <Page Update="View\MainUIPage.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </Page>
+	</ItemGroup>
+	<ItemGroup>
+	  <Page Update="Controls\MapViewWidget.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </Page>
+	</ItemGroup>
+</Project>
diff --git a/store/beta/store_listing_de.txt b/store/beta/store_listing_de.txt
new file mode 100644
index 00000000..7a3274a5
--- /dev/null
+++ b/store/beta/store_listing_de.txt
@@ -0,0 +1,12 @@
+Description:
+
+Dies ist eine native Windows 10 und 11 Beta-Anwendung für openHAB, die kommende Funktionen und Fehlerbehebungen zum Testen anbietet, bevor sie in der Hauptanwendung veröffentlicht werden. Sie können sie im Microsoft Store unter folgendem Link herunterladen: https://www.microsoft.com/store/apps/9NMQ39CTWXGT.
+
+Das open Home Automation Bus (openHAB) Projekt zielt darauf ab, eine universelle Integrationsplattform für alle Aspekte der Heimautomation bereitzustellen. Es ist so konzipiert, dass es völlig herstellerneutral und hardware-/protokollunabhängig ist, um die Kompatibilität mit einer Vielzahl von Geräten und Technologien zu gewährleisten. openHAB integriert verschiedene Bussysteme, Hardwaregeräte und Schnittstellenprotokolle und bietet somit eine vielseitige Lösung für Ihre Smart Home Bedürfnisse.
+
+Unterstützte Technologien umfassen, sind aber nicht beschränkt auf, KNX, Modbus, DMX, Philips Hue, PLCBus, Sonos, Plugwise, IHC/Elko, RFXCOM, Homematic, Koubachi, Pulseaudio, Samsung TV, Bluetooth, One-Wire, Novelan, Asterisk und generische serielle Geräte. Diese umfangreiche Unterstützung ermöglicht es openHAB, als zentrale Integrations- und Steuerungseinheit Ihres Smart Homes zu dienen und eine nahtlose Interaktion zwischen verschiedenen Systemen und Geräten zu bieten.
+
+Weitere Informationen über openHAB und seine Fähigkeiten finden Sie auf der offiziellen Website: http://www.openhab.org/
+
+Update:
+Die überarbeitete App verfügt jetzt über ein erneuertes Design und bietet eine moderne und intuitive Benutzeroberfläche. Dank nahtloser Integration mit Windows 11 können Benutzer eine verbesserte Leistung, erhöhte Sicherheit und neue Funktionen wie Benachrichtigungen, ein helles/dunkles Design und mehr genießen.
diff --git a/store/beta/store_listing_en.txt b/store/beta/store_listing_en.txt
new file mode 100644
index 00000000..54ec53b1
--- /dev/null
+++ b/store/beta/store_listing_en.txt
@@ -0,0 +1,12 @@
+Description:
+
+This is a native Windows 10 and 11 Beta application for openHAB, offering upcoming features and fixes for testing before they are released in the main app. You can download it from the Microsoft Store at the following link: https://www.microsoft.com/store/apps/9NMQ39CTWXGT.
+
+The open Home Automation Bus (openHAB) project aims to provide a universal integration platform for all aspects of home automation. It is designed to be completely vendor-neutral and hardware/protocol-agnostic, ensuring compatibility with a wide range of devices and technologies. openHAB integrates various bus systems, hardware devices, and interface protocols, making it a versatile solution for your smart home needs.
+
+Supported technologies include, but are not limited to, KNX, Modbus, DMX, Philips Hue, PLCBus, Sonos, Plugwise, IHC/Elko, RFXCOM, Homematic, Koubachi, Pulseaudio, Samsung TV, Bluetooth, One-Wire, Novelan, Asterisk, and generic serial devices. This extensive support allows openHAB to serve as the central integration and control point of your Smart Home, providing seamless interaction between different systems and devices.
+
+You can find more information about openHAB and its capabilities on the official website: http://www.openhab.org/
+
+Update:
+The reworked app now features a refreshed design, offering a modern and intuitive user interface. With seamless integration with Windows 11, users can enjoy enhanced performance, improved security, and new functionalities such as notifications, light/dark theme, and more.
diff --git a/store/screenshots/en/screenshot1_dark.png b/store/screenshots/en/screenshot1_dark.png
new file mode 100644
index 00000000..579585ef
Binary files /dev/null and b/store/screenshots/en/screenshot1_dark.png differ
diff --git a/store/screenshots/en/screenshot2_dark.png b/store/screenshots/en/screenshot2_dark.png
new file mode 100644
index 00000000..1a76a349
Binary files /dev/null and b/store/screenshots/en/screenshot2_dark.png differ
diff --git a/store/screenshots/en/screenshot3_dark.png b/store/screenshots/en/screenshot3_dark.png
new file mode 100644
index 00000000..3e922682
Binary files /dev/null and b/store/screenshots/en/screenshot3_dark.png differ
diff --git a/store/screenshots/en/screenshot4_dark.png b/store/screenshots/en/screenshot4_dark.png
new file mode 100644
index 00000000..339e6af3
Binary files /dev/null and b/store/screenshots/en/screenshot4_dark.png differ
diff --git a/store/screenshots/en/screenshot5_dark.png b/store/screenshots/en/screenshot5_dark.png
new file mode 100644
index 00000000..63069d16
Binary files /dev/null and b/store/screenshots/en/screenshot5_dark.png differ