[feat] add implementation for WGC capture on virtual screens

2025-12-17 20:47:01 +08:00 · 2025-10-21 17:30:36 +08:00
105 changed files with 5187 additions and 8714 deletions
--- a/.github/ISSUE_TEMPLATE/问题反馈.md
+++ b/.github/ISSUE_TEMPLATE/问题反馈.md
@@ -1,35 +0,0 @@
---
-name: 问题反馈
-about: 请在此提交问题报告，以便持续优化产品。
-title: ''
-labels: bug
-assignees: kunkundi
-
---
-
-**描述问题**
-清晰简洁地描述遇到的错误。
-
-**复现步骤**
-复现该问题的步骤：
-1. 前往 '...'
-2. 点击 '....'
-3. 出现错误
-
-**预期行为**
-清晰简洁地描述你期望发生的行为。
-
-**截图**
-如果适用，请添加截图以帮助说明问题。
-
-**桌面端信息（请填写以下内容）：**
- - 操作系统: [例如 Windows 11]
- - 版本: [例如 v1.1.10]
-
-**移动端信息（请填写以下内容）：**
- - 设备: [例如 iPhone 17]
- - 操作系统: [例如 iOS 26.1]
- - 浏览器: [例如 系统浏览器、Safari]
-
-**补充信息**
-在此添加与问题相关的其他上下文内容。
--- a/.github/ISSUE_TEMPLATE/需求建议.md
+++ b/.github/ISSUE_TEMPLATE/需求建议.md
@@ -1,28 +0,0 @@
---
-name: 需求建议
-about: 请在此提交功能需求或改进建议，以便后续迭代参考。
-title: ''
-labels: enhancement
-assignees: kunkundi
-
---
-
-**功能/改进建议描述**
-清晰简洁地描述希望新增的功能或改进的内容。
-
-**使用场景 / 背景**
-说明该功能或改进的使用场景，以及解决后带来的价值。
-
-**预期效果**
-描述你认为最理想的功能表现或改进效果。
-
-**参考示例（可选）**
-提供类似功能截图、参考链接或其他说明，帮助更好理解需求。
-
-**优先级（可选）**
- [ ] 高
- [ ] 中
- [ ] 低
-
-**补充信息（可选）**
-其他相关信息或特殊要求。
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -34,15 +34,12 @@ jobs:
        shell: bash
        id: set_deb_version
        run: |
-          SHORT_SHA=$(echo "${GITHUB_SHA}" | cut -c1-7)
-          BUILD_DATE=$(TZ=Asia/Shanghai date +%Y%m%d)
          if [[ ! "${VERSION_NUM}" =~ ^[0-9] ]]; then
-            LEGAL_VERSION="v0.0.0-${VERSION_NUM}-${BUILD_DATE}-${SHORT_SHA}"
+            LEGAL_VERSION="0.0.0-${VERSION_NUM}"
          else
-            LEGAL_VERSION="v${VERSION_NUM}-${BUILD_DATE}-${SHORT_SHA}"
+            LEGAL_VERSION="${VERSION_NUM}"
          fi
          echo "LEGAL_VERSION=${LEGAL_VERSION}" >> $GITHUB_ENV
-          echo "BUILD_DATE=${BUILD_DATE}" >> $GITHUB_ENV

      - name: Checkout code
        uses: actions/checkout@v4
@@ -55,7 +52,6 @@ jobs:
          XMAKE_GLOBALDIR: /data
        run: |
          ls -la $XMAKE_GLOBALDIR
-          xmake f --CROSSDESK_VERSION=${LEGAL_VERSION} --USE_CUDA=true --root -y
          xmake b -vy --root crossdesk

      - name: Decode and save certificate
@@ -100,15 +96,12 @@ jobs:
        shell: bash
        id: set_deb_version
        run: |
-          SHORT_SHA=$(echo "${GITHUB_SHA}" | cut -c1-7)
-          BUILD_DATE=$(TZ=Asia/Shanghai date +%Y%m%d)
          if [[ ! "${VERSION_NUM}" =~ ^[0-9] ]]; then
-            LEGAL_VERSION="v0.0.0-${VERSION_NUM}-${BUILD_DATE}-${SHORT_SHA}"
+            LEGAL_VERSION="0.0.0-${VERSION_NUM}"
          else
-            LEGAL_VERSION="v${VERSION_NUM}-${BUILD_DATE}-${SHORT_SHA}"
+            LEGAL_VERSION="${VERSION_NUM}"
          fi
          echo "LEGAL_VERSION=${LEGAL_VERSION}" >> $GITHUB_ENV
-          echo "BUILD_DATE=${BUILD_DATE}" >> $GITHUB_ENV

      - name: Checkout code
        uses: actions/checkout@v4
@@ -120,7 +113,6 @@ jobs:
          CUDA_PATH: /usr/local/cuda
          XMAKE_GLOBALDIR: /data
        run: |
-          xmake f --CROSSDESK_VERSION=${LEGAL_VERSION} --USE_CUDA=true --root -y
          xmake b -vy --root crossdesk

      - name: Decode and save certificate
@@ -163,18 +155,15 @@ jobs:
        id: version
        run: |
          VERSION="${GITHUB_REF##*/}"
-          SHORT_SHA=$(echo "${GITHUB_SHA}" | cut -c1-7)
-          BUILD_DATE=$(TZ=Asia/Shanghai date +%Y%m%d)
-          VERSION_NUM="v${VERSION#v}-${BUILD_DATE}-${SHORT_SHA}"
+          VERSION_NUM="${VERSION#v}"
          echo "VERSION_NUM=${VERSION_NUM}" >> $GITHUB_ENV
          echo "VERSION_NUM=${VERSION_NUM}"
-          echo "BUILD_DATE=${BUILD_DATE}" >> $GITHUB_ENV

      - name: Cache xmake dependencies
        uses: actions/cache@v4
        with:
          path: ~/.xmake/packages
-          key: ${{ runner.os }}-xmake-deps-${{ matrix.cache-key }}-${{ github.sha }}
+          key: ${{ runner.os }}-xmake-deps-${{ matrix.cache-key }}-${{ hashFiles('**/xmake.lua') }}
          restore-keys: |
            ${{ runner.os }}-xmake-deps-${{ matrix.cache-key }}-

@@ -188,9 +177,7 @@ jobs:
        run: git submodule update --init --recursive

      - name: Build CrossDesk
-        run: |
-          xmake f --CROSSDESK_VERSION=${VERSION_NUM} --USE_CUDA=true -y
-          xmake b -vy crossdesk
+        run: xmake b -vy crossdesk

      - name: Decode and save certificate
        shell: bash
@@ -228,16 +215,13 @@ jobs:
          $version = $ref -replace '^refs/(tags|heads)/', ''
          $version = $version -replace '^v', ''
          $version = $version -replace '/', '-'
-          $SHORT_SHA = $env:GITHUB_SHA.Substring(0,7)
-          $BUILD_DATE = ([System.TimeZoneInfo]::ConvertTimeBySystemTimeZoneId((Get-Date), "China Standard Time")).ToString("yyyyMMdd")
-          echo "VERSION_NUM=v$version-$BUILD_DATE-$SHORT_SHA" >> $env:GITHUB_ENV
-          echo "BUILD_DATE=$BUILD_DATE" >> $env:GITHUB_ENV
+          echo "VERSION_NUM=$version" >> $env:GITHUB_ENV

      - name: Cache xmake dependencies
        uses: actions/cache@v4
        with:
          path: D:\xmake_global\.xmake\packages
-          key: ${{ runner.os }}-xmake-deps-intel-${{ github.sha }}
+          key: ${{ runner.os }}-xmake-deps-intel-${{ hashFiles('**/xmake.lua') }}
          restore-keys: |
            ${{ runner.os }}-xmake-deps-intel-

@@ -297,9 +281,7 @@ jobs:
          copy "${{ github.workspace }}\scripts\windows\nsProcess.dll" $nsisPluginDir

      - name: Build CrossDesk
-        run: |
-          xmake f --CROSSDESK_VERSION=${{ env.VERSION_NUM }} --USE_CUDA=true -y
-          xmake b -vy crossdesk
+        run: xmake b -vy crossdesk

      - name: Decode and save certificate
        shell: powershell
@@ -339,26 +321,17 @@ jobs:
        id: version
        run: |
          VERSION="${GITHUB_REF##*/}"
-          SHORT_SHA=$(echo "${GITHUB_SHA}" | cut -c1-7)
-          BUILD_DATE=$(TZ=Asia/Shanghai date +%Y%m%d)
-          BUILD_DATE_ISO=$(TZ=Asia/Shanghai date +%Y-%m-%d)
-          VERSION_NUM="${VERSION#v}-${BUILD_DATE}-${SHORT_SHA}"
-          VERSION_WITH_V="v${VERSION_NUM}"
-          VERSION_ONLY="${VERSION#v}"
+          VERSION_NUM="${VERSION#v}"
          echo "VERSION_NUM=${VERSION_NUM}" >> $GITHUB_OUTPUT
-          echo "VERSION_WITH_V=${VERSION_WITH_V}" >> $GITHUB_OUTPUT
-          echo "VERSION_ONLY=${VERSION_ONLY}" >> $GITHUB_OUTPUT
-          echo "BUILD_DATE=${BUILD_DATE}" >> $GITHUB_OUTPUT
-          echo "BUILD_DATE_ISO=${BUILD_DATE_ISO}" >> $GITHUB_OUTPUT

      - name: Rename artifacts
        run: |
          mkdir -p release
-          cp artifacts/crossdesk-macos-x64-${{ steps.version.outputs.VERSION_WITH_V }}/* release/crossdesk-macos-x64-${{ steps.version.outputs.VERSION_WITH_V }}.pkg
-          cp artifacts/crossdesk-macos-arm64-${{ steps.version.outputs.VERSION_WITH_V }}/* release/crossdesk-macos-arm64-${{ steps.version.outputs.VERSION_WITH_V }}.pkg
-          cp artifacts/crossdesk-linux-amd64-${{ steps.version.outputs.VERSION_WITH_V }}/* release/crossdesk-linux-amd64-${{ steps.version.outputs.VERSION_WITH_V }}.deb
-          cp artifacts/crossdesk-linux-arm64-${{ steps.version.outputs.VERSION_WITH_V }}/* release/crossdesk-linux-arm64-${{ steps.version.outputs.VERSION_WITH_V }}.deb
-          cp artifacts/crossdesk-win-x64-${{ steps.version.outputs.VERSION_WITH_V }}/* release/crossdesk-win-x64-${{ steps.version.outputs.VERSION_WITH_V }}.exe
+          cp artifacts/crossdesk-macos-x64-${{ steps.version.outputs.VERSION_NUM }}/* release/crossdesk-macos-x64-${{ steps.version.outputs.VERSION_NUM }}.pkg
+          cp artifacts/crossdesk-macos-arm64-${{ steps.version.outputs.VERSION_NUM }}/* release/crossdesk-macos-arm64-${{ steps.version.outputs.VERSION_NUM }}.pkg
+          cp artifacts/crossdesk-linux-amd64-${{ steps.version.outputs.VERSION_NUM }}/* release/crossdesk-linux-amd64-${{ steps.version.outputs.VERSION_NUM }}.deb
+          cp artifacts/crossdesk-linux-arm64-${{ steps.version.outputs.VERSION_NUM }}/* release/crossdesk-linux-arm64-${{ steps.version.outputs.VERSION_NUM }}.deb
+          cp artifacts/crossdesk-win-x64-${{ steps.version.outputs.VERSION_NUM }}/* release/crossdesk-win-x64-${{ steps.version.outputs.VERSION_NUM }}.exe

      - name: List release files
        run: ls -lh release/
@@ -366,8 +339,8 @@ jobs:
      - name: Upload to Versioned GitHub Release
        uses: softprops/action-gh-release@v2
        with:
-          tag_name: ${{ steps.version.outputs.VERSION_WITH_V }}
-          name: Release ${{ steps.version.outputs.VERSION_WITH_V }}
+          tag_name: v${{ steps.version.outputs.VERSION_NUM }}
+          name: Release v${{ steps.version.outputs.VERSION_NUM }}
          draft: false
          prerelease: false
          files: release/*
@@ -401,48 +374,3 @@ jobs:
          remote_host: ${{ secrets.SERVER_HOST }}
          remote_user: ${{ secrets.SERVER_USER }}
          remote_key: ${{ secrets.SERVER_KEY }}
-
-      - name: Generate version.json
-        run: |
-          cat > version.json << EOF
-          {
-            "version": "${{ steps.version.outputs.VERSION_ONLY }}",
-            "releaseDate": "${{ steps.version.outputs.BUILD_DATE_ISO }}",
-            "releaseName": "",
-            "releaseNotes": "",
-            "tagName": "${{ steps.version.outputs.VERSION_WITH_V }}",
-            "downloads": {
-              "windows-x64": {
-                "url": "https://downloads.crossdesk.cn/crossdesk-win-x64-${{ steps.version.outputs.VERSION_WITH_V }}.exe",
-                "filename": "crossdesk-win-x64-${{ steps.version.outputs.VERSION_WITH_V }}.exe"
-              },
-              "macos-x64": {
-                "url": "https://downloads.crossdesk.cn/crossdesk-macos-x64-${{ steps.version.outputs.VERSION_WITH_V }}.pkg",
-                "filename": "crossdesk-macos-x64-${{ steps.version.outputs.VERSION_WITH_V }}.pkg"
-              },
-              "macos-arm64": {
-                "url": "https://downloads.crossdesk.cn/crossdesk-macos-arm64-${{ steps.version.outputs.VERSION_WITH_V }}.pkg",
-                "filename": "crossdesk-macos-arm64-${{ steps.version.outputs.VERSION_WITH_V }}.pkg"
-              },
-              "linux-amd64": {
-                "url": "https://downloads.crossdesk.cn/crossdesk-linux-amd64-${{ steps.version.outputs.VERSION_WITH_V }}.deb",
-                "filename": "crossdesk-linux-amd64-${{ steps.version.outputs.VERSION_WITH_V }}.deb"
-              },
-              "linux-arm64": {
-                "url": "https://downloads.crossdesk.cn/crossdesk-linux-arm64-${{ steps.version.outputs.VERSION_WITH_V }}.deb",
-                "filename": "crossdesk-linux-arm64-${{ steps.version.outputs.VERSION_WITH_V }}.deb"
-              }
-            }
-          }
-          EOF
-          cat version.json
-
-      - name: Upload version.json to server
-        uses: burnett01/rsync-deployments@5.2
-        with:
-          switches: -avzr --delete
-          path: version.json
-          remote_path: /var/www/html/version/
-          remote_host: ${{ secrets.SERVER_HOST }}
-          remote_user: ${{ secrets.SERVER_USER }}
-          remote_key: ${{ secrets.SERVER_KEY }}
--- a/.github/workflows/close-issue.yml
+++ b/.github/workflows/close-issue.yml
@@ -5,11 +5,6 @@ on:
    # run every day at midnight
    - cron: "0 0 * * *"

-permissions:
-  issues: write
-  pull-requests: write
-  contents: read
-
 jobs:
  close_inactive_issues:
    runs-on: ubuntu-latest
@@ -22,59 +17,26 @@ jobs:
              owner: context.repo.owner,
              repo: context.repo.repo,
              state: 'open',
-              per_page: 100,
            });

            const now = new Date().getTime();
            const inactivePeriod = 7 * 24 * 60 * 60 * 1000; // 7 days

            for (const issue of issues) {
-              // skip pull requests (they are also returned by listForRepo)
-              if (issue.pull_request) continue;
-
-              // skip labeled issues
-              if (issue.labels.length > 0) {
-                console.log(`Skipping issue #${issue.number} (Has labels).`);
-                continue;
-              }
-
-              // fetch comments for this issue
-              const { data: comments } = await github.rest.issues.listComments({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                issue_number: issue.number,
-                per_page: 100,
-              });
-
-              // determine the "last activity" time
-              let lastActivityTime;
-              if (comments.length > 0) {
-                const lastComment = comments[comments.length - 1];
-                lastActivityTime = new Date(lastComment.updated_at).getTime();
-              } else {
-                lastActivityTime = new Date(issue.created_at).getTime();
-              }
-
-              // check inactivity
-              if (now - lastActivityTime > inactivePeriod) {
-                console.log(`Closing inactive issue: #${issue.number} (No recent replies for 7 days)`);
-
-                await github.rest.issues.createComment({
-                  owner: context.repo.owner,
-                  repo: context.repo.repo,
-                  issue_number: issue.number,
-                  body: "This issue has been automatically closed due to inactivity for 7 days."
-                });
+              const lastUpdated = new Date(issue.updated_at).getTime();
              
+              // if the issue hasn't been updated in the past week, close it
+              if (now - lastUpdated > inactivePeriod && issue.labels.length === 0) {
+                console.log(`Closing inactive issue: ${issue.number} (No labels)`);
                await github.rest.issues.update({
                  owner: context.repo.owner,
                  repo: context.repo.repo,
                  issue_number: issue.number,
                  state: 'closed',
                });
+              } else if (issue.labels.length === 0) {
+                console.log(`Skipping issue ${issue.number} (No labels) as it has been recently updated.`);
              } else {
-                console.log(`Skipping issue #${issue.number} (Active within 7 days).`);
+                console.log(`Skipping issue ${issue.number} (Has labels).`);
              }
            }
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/workflows/update-pages.yml
+++ b/.github/workflows/update-pages.yml
@@ -0,0 +1,48 @@
+name: Update GitHub Pages Downloads
+
+on:
+  push:
+    tags:
+      - "v*"
+
+jobs:
+  update-pages:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout CrossDesk repo
+        uses: actions/checkout@v4
+
+      - name: Set version number
+        id: version
+        run: |
+          VERSION_NUM="${GITHUB_REF##*/}"
+          VERSION_NUM="${VERSION_NUM#v}"
+          echo "VERSION_NUM=${VERSION_NUM}" >> $GITHUB_ENV
+          echo "VERSION_NUM=${VERSION_NUM}" >> $GITHUB_OUTPUT
+
+      - name: Checkout Pages repo
+        uses: actions/checkout@v4
+        with:
+          repository: kunkundi/kunkundi.github.io
+          token: ${{ secrets.GH_PAGES_PAT }}
+          path: pages
+
+      - name: Update download links
+        run: |
+          cd pages
+          sed -E -i "s/crossdesk-win-x64-[0-9]+\.[0-9]+\.[0-9]+\.exe/crossdesk-win-x64-${VERSION_NUM}.exe/g" index.html
+          sed -E -i "s/crossdesk-macos-x64-[0-9]+\.[0-9]+\.[0-9]+\.pkg/crossdesk-macos-x64-${VERSION_NUM}.pkg/g" index.html
+          sed -E -i "s/crossdesk-macos-arm64-[0-9]+\.[0-9]+\.[0-9]+\.pkg/crossdesk-macos-arm64-${VERSION_NUM}.pkg/g" index.html
+          sed -E -i "s/crossdesk-linux-amd64-[0-9]+\.[0-9]+\.[0-9]+\.deb/crossdesk-linux-amd64-${VERSION_NUM}.deb/g" index.html
+          sed -E -i "s/crossdesk-linux-arm64-[0-9]+\.[0-9]+\.[0-9]+\.deb/crossdesk-linux-arm64-${VERSION_NUM}.deb/g" index.html
+
+      - name: Commit & Push changes
+        run: |
+          cd pages
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git add index.html
+          git commit -m "Update download links to v${VERSION_NUM}" || echo "No changes to commit"
+          git push origin main
+        env:
+          VERSION_NUM: ${{ env.VERSION_NUM }}
--- a/.github/workflows/update-version-json.yml
+++ b/.github/workflows/update-version-json.yml
@@ -1,140 +0,0 @@
-name: Update version.json from Release
-
-on:
-  release:
-    types: [published, edited]
-
-permissions:
-  contents: write
-
-jobs:
-  update-version-json:
-    name: Update version.json with release information
-    runs-on: ubuntu-latest
-    
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Extract version from tag
-        id: version
-        run: |
-          TAG_NAME="${{ github.event.release.tag_name }}"
-          VERSION_ONLY="${TAG_NAME#v}"
-          echo "TAG_NAME=${TAG_NAME}" >> $GITHUB_OUTPUT
-          echo "VERSION_ONLY=${VERSION_ONLY}" >> $GITHUB_OUTPUT
-          
-          # Extract date from tag if available (format: v1.2.3-20251113-abc)
-          if [[ "${TAG_NAME}" =~ -([0-9]{8})- ]]; then
-            DATE_STR="${BASH_REMATCH[1]}"
-            BUILD_DATE_ISO="${DATE_STR:0:4}-${DATE_STR:4:2}-${DATE_STR:6:2}"
-          else
-            # Use release published date
-            BUILD_DATE_ISO=$(echo "${{ github.event.release.published_at }}" | cut -d'T' -f1)
-          fi
-          echo "BUILD_DATE_ISO=${BUILD_DATE_ISO}" >> $GITHUB_OUTPUT
-
-      - name: Install jq
-        run: sudo apt-get update && sudo apt-get install -y jq
-
-      - name: Get release information
-        id: release_info
-        run: |
-          # Use jq to properly escape JSON
-          RELEASE_BODY="${{ github.event.release.body }}"
-          RELEASE_NAME="${{ github.event.release.name }}"
-          
-          # Handle empty values
-          if [ -z "$RELEASE_BODY" ]; then
-            RELEASE_BODY=""
-          fi
-          if [ -z "$RELEASE_NAME" ]; then
-            RELEASE_NAME=""
-          fi
-          
-          # Save to temporary files for proper handling
-          echo -n "$RELEASE_BODY" > /tmp/release_body.txt
-          echo -n "$RELEASE_NAME" > /tmp/release_name.txt
-          
-          # Use jq to escape JSON strings
-          RELEASE_BODY_JSON=$(jq -Rs . < /tmp/release_body.txt)
-          RELEASE_NAME_JSON=$(jq -Rs . < /tmp/release_name.txt)
-          
-          echo "RELEASE_BODY=${RELEASE_BODY_JSON}" >> $GITHUB_OUTPUT
-          echo "RELEASE_NAME=${RELEASE_NAME_JSON}" >> $GITHUB_OUTPUT
-
-      - name: Download current version.json from server
-        id: download_version
-        continue-on-error: true
-        run: |
-          # Try to download current version.json from server
-          curl -f -s "https://version.crossdesk.cn/version.json" -o version.json || echo "Failed to download, will create new one"
-
-      - name: Generate or update version.json
-        run: |
-          # If version.json exists, try to preserve downloads section
-          if [ -f version.json ] && jq -e '.downloads' version.json > /dev/null 2>&1; then
-            EXISTING_DOWNLOADS=$(jq -c '.downloads' version.json)
-            if [ "$EXISTING_DOWNLOADS" != "null" ] && [ "$EXISTING_DOWNLOADS" != "{}" ]; then
-              DOWNLOADS_JSON="$EXISTING_DOWNLOADS"
-            else
-              DOWNLOADS_JSON=""
-            fi
-          else
-            DOWNLOADS_JSON=""
-          fi
-          
-          # If downloads is empty, use default structure
-          if [ -z "$DOWNLOADS_JSON" ]; then
-            DOWNLOADS_JSON=$(cat << DOWNLOADS_EOF
-            {
-              "windows-x64": {
-                "url": "https://downloads.crossdesk.cn/crossdesk-win-x64-${{ steps.version.outputs.TAG_NAME }}.exe",
-                "filename": "crossdesk-win-x64-${{ steps.version.outputs.TAG_NAME }}.exe"
-              },
-              "macos-x64": {
-                "url": "https://downloads.crossdesk.cn/crossdesk-macos-x64-${{ steps.version.outputs.TAG_NAME }}.pkg",
-                "filename": "crossdesk-macos-x64-${{ steps.version.outputs.TAG_NAME }}.pkg"
-              },
-              "macos-arm64": {
-                "url": "https://downloads.crossdesk.cn/crossdesk-macos-arm64-${{ steps.version.outputs.TAG_NAME }}.pkg",
-                "filename": "crossdesk-macos-arm64-${{ steps.version.outputs.TAG_NAME }}.pkg"
-              },
-              "linux-amd64": {
-                "url": "https://downloads.crossdesk.cn/crossdesk-linux-amd64-${{ steps.version.outputs.TAG_NAME }}.deb",
-                "filename": "crossdesk-linux-amd64-${{ steps.version.outputs.TAG_NAME }}.deb"
-              },
-              "linux-arm64": {
-                "url": "https://downloads.crossdesk.cn/crossdesk-linux-arm64-${{ steps.version.outputs.TAG_NAME }}.deb",
-                "filename": "crossdesk-linux-arm64-${{ steps.version.outputs.TAG_NAME }}.deb"
-              }
-            }
-          DOWNLOADS_EOF
-                      )
-                    fi
-          
-          # Generate version.json using cat and heredoc
-          cat > version.json << EOF
-          {
-            "version": "${{ steps.version.outputs.VERSION_ONLY }}",
-            "releaseDate": "${{ steps.version.outputs.BUILD_DATE_ISO }}",
-            "releaseName": ${{ steps.release_info.outputs.RELEASE_NAME }},
-            "releaseNotes": ${{ steps.release_info.outputs.RELEASE_BODY }},
-            "tagName": "${{ steps.version.outputs.TAG_NAME }}",
-            "downloads": ${DOWNLOADS_JSON}
-          }
-          EOF
-          
-          cat version.json
-
-      - name: Upload version.json to server
-        uses: burnett01/rsync-deployments@5.2
-        with:
-          switches: -avzr --delete
-          path: version.json
-          remote_path: /var/www/html/version/
-          remote_host: ${{ secrets.SERVER_HOST }}
-          remote_user: ${{ secrets.SERVER_USER }}
-          remote_key: ${{ secrets.SERVER_KEY }}
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,10 @@
 # Xmake cache
 .xmake/
 build/
-certs/

 # MacOS Cache
 .DS_Store

 # VSCode cache
 .vscode
+continuous-desk.code-workspace
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "submodules/minirtc"]
-	path = submodules/minirtc
+[submodule "thirdparty/minirtc"]
+	path = thirdparty/minirtc
 	url = https://github.com/kunkundi/minirtc.git
--- a/README.md
+++ b/README.md
@@ -1,10 +1,9 @@
 # CrossDesk

-<a href="https://hellogithub.com/repository/kunkundi/crossdesk" target="_blank"><img src="https://api.hellogithub.com/v1/widgets/recommend.svg?rid=55d41367570345f1838e02fd12be7961&claim_uid=cb0OpZRrBuGVAfL&theme=small" alt="Featured｜HelloGitHub" /></a>
-[![Platform](https://img.shields.io/badge/platform-Windows%20%7C%20Linux%20%7C%20macOS-brightgreen.svg)]()
+[![Platform](https://img.shields.io/badge/platform-Windows%20%7C%20Linux%20%7C%20macOS-lightgrey.svg)]()
 [![License: LGPL v3](https://img.shields.io/badge/License-LGPL%20v3-blue.svg)](https://www.gnu.org/licenses/lgpl-3.0)
-[![GitHub last commit](https://img.shields.io/github/last-commit/kunkundi/crossdesk)](https://github.com/kunkundi/crossdesk/commits/web-client)
-[![Build Status](https://github.com/kunkundi/crossdesk/actions/workflows/build.yml/badge.svg)](https://github.com/kunkundi/crossdesk/actions)  
+[![GitHub last commit](https://img.shields.io/github/last-commit/kunkundi/crossdesk)](https://github.com/kunkundi/crossdesk/commits/self-hosted-server)
+[![Build Status](https://github.com/kunkundi/crossdesk/actions/workflows/build.yaml/badge.svg)](https://github.com/kunkundi/crossdesk/actions)  
 [![Docker Pulls](https://img.shields.io/docker/pulls/crossdesk/crossdesk-server)](https://hub.docker.com/r/crossdesk/crossdesk-server/tags)
 [![GitHub issues](https://img.shields.io/github/issues/kunkundi/crossdesk.svg)]()
 [![GitHub stars](https://img.shields.io/github/stars/kunkundi/crossdesk.svg?style=social)]()
@@ -12,27 +11,14 @@

 [ [English](README_EN.md) / 中文 ]

-PC 客户端
 ![sup_example](https://github.com/user-attachments/assets/eeb64fbe-1f07-4626-be1c-b77396beb905)

-Web 客户端
-<p align="center">
-  <img width="850" height="550" alt="6bddcbed47ffd4b9988a4037c7f4f524" src="https://github.com/user-attachments/assets/e44f73f9-24ac-46a3-a189-b7f8b6669881" />
-</p>
-
 ## 简介

-CrossDesk 是一个轻量级的跨平台远程桌面软件，支持 Web 端控制远程设备。
+CrossDesk 是一个轻量级的跨平台远程桌面软件。

 CrossDesk 是 [MiniRTC](https://github.com/kunkundi/minirtc.git) 实时音视频传输库的实验性应用。MiniRTC 是一个轻量级的跨平台实时音视频传输库。它具有网络透传（[RFC5245](https://datatracker.ietf.org/doc/html/rfc5245)），视频软硬编解码（H264/AV1），音频编解码（[Opus](https://github.com/xiph/opus)），信令交互，网络拥塞控制，传输加密（[SRTP](https://tools.ietf.org/html/rfc3711)）等基础能力。

-## 系统要求
-
-| 平台 | 最低版本 |
-|----------------|---------------------------|
-| **Windows** | Windows 10 及以上 (64 位) |
-| **macOS** | macOS Intel 15.0 及以上 ( 大于 14.0 小于 15.0 的版本可自行编译实现兼容 )<br> macOS Apple Silicon 14.0 及以上 |
-| **Linux** | Ubuntu 22.04 及以上 ( 低版本可自行编译实现兼容 ) |

 ## 使用

@@ -47,12 +33,6 @@ CrossDesk 是 [MiniRTC](https://github.com/kunkundi/minirtc.git) 实时音视频
 发起连接前，可在设置中自定义配置项，如语言、视频编码格式等。
 ![settings](https://github.com/user-attachments/assets/8bc5468d-7bbb-4e30-95bd-da1f352ac08c)

-### Web 客户端
-浏览器访问 [CrossDesk Web Client](https://web.crossdesk.cn/)。
-输入 **远程设备 ID** 与 **密码**，点击连接即可接入远程设备。如图，**iOS Safari 远程控制 Win11**：
-
-<img width="645" height="300" alt="_cgi-bin_mmwebwx-bin_webwxgetmsgimg__ MsgID=932911462648581698 skey=@crypt_1f5153b1_b550ca7462b5009ce03c991cca2a92a7 mmweb_appid=wx_webfilehelper" src="https://github.com/user-attachments/assets/a5109e6f-752c-4654-9f4e-7e161bddf43e" />
-
 ## 如何编译

 依赖：
@@ -62,7 +42,7 @@ CrossDesk 是 [MiniRTC](https://github.com/kunkundi/minirtc.git) 实时音视频
 Linux环境下需安装以下包：

 ```
-sudo apt-get install -y software-properties-common git curl unzip build-essential libx11-dev libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev libxcb-randr0-dev libxcb-xtest0-dev libxcb-xinerama0-dev libxcb-shape0-dev libxcb-xkb-dev libxcb-xfixes0-dev libxfixes-dev libxv-dev libxtst-dev libasound2-dev libsndio-dev libxcb-shm0-dev libasound2-dev libpulse-dev
+sudo apt-get install -y software-properties-common git curl unzip build-essential libx11-dev libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev libxcb-randr0-dev libxcb-xtest0-dev libxcb-xinerama0-dev libxcb-shape0-dev libxcb-xkb-dev libxcb-xfixes0-dev libxv-dev libxtst-dev libasound2-dev libsndio-dev libxcb-shm0-dev libasound2-dev libpulse-dev
 ```

 编译
@@ -77,14 +57,7 @@ git submodule update

 xmake b -vy crossdesk
 ```
-编译选项
-```
--USE_CUDA=true/false: 启用 CUDA 硬件编解码，默认不启用
--CROSSDESK_VERSION=xxx: 指定 CrossDesk 的版本

-# 示例
-xmake f --CROSSDESK_VERSION=1.0.0 --USE_CUDA=true
-```
 运行
 ```
 xmake r crossdesk
@@ -92,18 +65,17 @@ xmake r crossdesk

 ### 无 CUDA 环境下的开发支持

-对于**未安装 CUDA 环境的 Linux 开发者，如果希望编译后的成果物拥有硬件编解码能力**，这里提供了预配置的 [Ubuntu 22.04 Docker 镜像](https://hub.docker.com/r/crossdesk/ubuntu22.04)。该镜像内置必要的构建依赖，可在容器中开箱即用，无需额外配置即可直接编译项目。
+对于未安装 **CUDA 环境** 的 Linux 开发者，这里提供了预配置的 [Ubuntu 22.04 Docker 镜像](https://hub.docker.com/r/crossdesk/ubuntu22.04)。该镜像内置必要的构建依赖，可在容器中开箱即用，无需额外配置即可直接编译项目。

 进入容器，下载工程后执行：
 ```
 export CUDA_PATH=/usr/local/cuda
 export XMAKE_GLOBALDIR=/data

-xmake f --USE_CUDA=true
 xmake b --root -vy crossdesk
 ```

-对于**未安装 CUDA 环境的 Windows 开发者**，执行下面的命令安装 CUDA 编译环境：
+对于未安装 **CUDA 环境** 的 Windows 开发者，执行下面的命令安装 CUDA 编译环境：
 ```
 xmake require -vy "cuda 12.6.3"
 ```
@@ -121,7 +93,6 @@ set CUDA_PATH=path_to_cuda_installdir
 ```
 重新执行：
 ```
-xmake f --USE_CUDA=true
 xmake b -vy crossdesk
 ```

@@ -169,70 +140,150 @@ xmake r -d crossdesk

 ## 自托管服务器
 推荐使用Docker部署CrossDesk Server。
-```bash
+```
 sudo docker run -d \
  --name crossdesk_server \
  --network host \
  -e EXTERNAL_IP=xxx.xxx.xxx.xxx \
  -e INTERNAL_IP=xxx.xxx.xxx.xxx \
-  -e CROSSDESK_SERVER_PORT=xxxx \
-  -e COTURN_PORT=xxxx \
-  -e MIN_PORT=xxxxx \
-  -e MAX_PORT=xxxxx \
-  -v /var/lib/crossdesk:/var/lib/crossdesk \
-  -v /var/log/crossdesk:/var/log/crossdesk \
-  crossdesk/crossdesk-server:v1.1.2
+  -e CROSSDESK_SERVER_PORT=9099 \
+  -v /path/to/your/certs:/crossdesk-server/certs \
+  -v /path/to/your/db:/crossdesk-server/db \
+  -v /path/to/your/logs:/crossdesk-server/logs \
+  crossdesk/crossdesk-server:latest
 ```

 上述命令中，用户需注意的参数如下：

-**参数**
 - EXTERNAL_IP：服务器公网 IP , 对应 CrossDesk 客户端**自托管服务器配置**中填写的**服务器地址**
- INTERNAL_IP：服务器内网 IP
- CROSSDESK_SERVER_PORT：自托管服务使用的端口，对应 CrossDesk 客户端**自托管服务器配置**中填写的**服务器端口**
- COTURN_PORT: COTURN 服务使用的端口, 对应 CrossDesk 客户端**自托管服务器配置**中填写的**中继服务端口**
- MIN_PORT/MAX_PORT：COTURN 服务使用的端口范围，例如：MIN_PORT=50000, MAX_PORT=60000，范围可根据客户端数量调整。
- `-v /var/lib/crossdesk:/var/lib/crossdesk`：持久化数据库和证书文件到宿主机
- `-v /var/log/crossdesk:/var/log/crossdesk`：持久化日志文件到宿主机

-**示例**：
-```bash
-sudo docker run -d \
-  --name crossdesk_server \
-  --network host \
-  -e EXTERNAL_IP=114.114.114.114 \
-  -e INTERNAL_IP=10.0.0.1 \
-  -e CROSSDESK_SERVER_PORT=9099 \
-  -e COTURN_PORT=3478 \
-  -e MIN_PORT=50000 \
-  -e MAX_PORT=60000 \
-  -v /var/lib/crossdesk:/var/lib/crossdesk \
-  -v /var/log/crossdesk:/var/log/crossdesk \
-  crossdesk/crossdesk-server:v1.1.3
-```
+- INTERNAL_IP：服务器内网 IP
+
+- CROSSDESK_SERVER_PORT：自托管服务使用的端口，对应 CrossDesk 客户端**自托管服务器配置**中填写的**服务器端口**
+
+- /path/to/your/certs：证书文件目录
+
+- /path/to/your/db：CrossDesk Server 设备管理数据库
+
+- /path/to/your/logs：日志目录

 **注意**：
- **服务器需开放端口：COTURN_PORT/udp，COTURN_PORT/tcp，MIN_PORT-MAX_PORT/udp，CROSSDESK_SERVER_PORT/tcp。**
- 如果不挂载 volume，容器删除后数据会丢失
- 证书文件会在首次启动时自动生成并持久化到宿主机的 `/var/lib/crossdesk/certs` 路径下
- 数据库文件会自动创建并持久化到宿主机的 `/var/lib/crossdesk/db/crossdesk-server.db` 路径下
- 日志文件会自动创建并持久化到宿主机的 `/var/log/crossdesk/` 路径下
-
-**权限注意**：如果 Docker 自动创建的目录权限不足（属于 root），容器内用户无法写入，会导致：
-  - 证书生成失败，容器启动脚本会报错退出
-  - 数据库目录创建失败，程序会抛出异常并崩溃
-  - 日志目录创建失败，日志文件无法写入（但程序可能继续运行）
-  
-**解决方案**：在启动容器前手动设置权限：
-```bash
-sudo mkdir -p /var/lib/crossdesk /var/log/crossdesk
-sudo chown -R $(id -u):$(id -g) /var/lib/crossdesk /var/log/crossdesk
-```
+- **/path/to/your/ 是示例路径，请替换为你自己的实际路径。挂载的目录必须事先创建好，否则容器会报错。**
+- **服务器需开放端口：3478/udp，3478/tcp，30000-60000/udp，CROSSDESK_SERVER_PORT/tcp，443/tcp。**

 ## 证书文件
-在宿主机的 `/var/lib/crossdesk/certs` 路径下可找到证书文件 `crossdesk.cn_root.crt`，下载到你的客户端主机，并在客户端的**自托管服务器设置**中选择相应的**证书文件路径**。
+客户端需加载根证书文件，服务端需加载服务器私钥和服务器证书文件。

-### 客户端
+如果已有SSL证书的用户，可以忽略下面的证书生成步骤。
+
+对于无证书的用户，可使用下面的脚本自行生成证书文件：
+```
+# 创建证书生成脚本
+vim generate_certs.sh
+```
+拷贝到脚本中
+```
+#!/bin/bash
+set -e
+
+# 检查参数
+if [ "$#" -ne 1 ]; then
+    echo "Usage: $0 <SERVER_IP>"
+    exit 1
+fi
+
+SERVER_IP="$1"
+
+# 文件名
+ROOT_KEY="crossdesk.cn_root.key"
+ROOT_CERT="crossdesk.cn_root.crt"
+SERVER_KEY="crossdesk.cn.key"
+SERVER_CSR="crossdesk.cn.csr"
+SERVER_CERT="crossdesk.cn_bundle.crt"
+FULLCHAIN_CERT="crossdesk.cn_fullchain.crt"
+
+# 证书主题
+SUBJ="/C=CN/ST=Zhejiang/L=Hangzhou/O=CrossDesk/OU=CrossDesk/CN=$SERVER_IP"
+
+# 1. 生成根证书
+echo "Generating root private key..."
+openssl genrsa -out "$ROOT_KEY" 4096
+
+echo "Generating self-signed root certificate..."
+openssl req -x509 -new -nodes -key "$ROOT_KEY" -sha256 -days 3650 -out "$ROOT_CERT" -subj "$SUBJ"
+
+# 2. 生成服务器私钥
+echo "Generating server private key..."
+openssl genrsa -out "$SERVER_KEY" 2048
+
+# 3. 生成服务器 CSR
+echo "Generating server CSR..."
+openssl req -new -key "$SERVER_KEY" -out "$SERVER_CSR" -subj "$SUBJ"
+
+# 4. 生成临时 OpenSSL 配置文件，加入 SAN
+SAN_CONF="san.cnf"
+cat > $SAN_CONF <<EOL
+[ req ]
+default_bits = 2048
+distinguished_name = req_distinguished_name
+req_extensions = req_ext
+prompt = no
+
+[ req_distinguished_name ]
+C = CN
+ST = Zhejiang
+L = Hangzhou
+O = CrossDesk
+OU = CrossDesk
+CN = $SERVER_IP
+
+[ req_ext ]
+subjectAltName = IP:$SERVER_IP
+EOL
+
+# 5. 用根证书签发服务器证书（包含 SAN）
+echo "Signing server certificate with root certificate..."
+openssl x509 -req -in "$SERVER_CSR" -CA "$ROOT_CERT" -CAkey "$ROOT_KEY" -CAcreateserial \
+  -out "$SERVER_CERT" -days 3650 -sha256 -extfile "$SAN_CONF" -extensions req_ext
+
+# 6. 生成完整链证书
+cat "$SERVER_CERT" "$ROOT_CERT" > "$FULLCHAIN_CERT"
+
+# 7. 清理中间文件
+rm -f "$ROOT_CERT.srl" "$SAN_CONF" "$ROOT_KEY" "$SERVER_CSR" "FULLCHAIN_CERT"
+
+echo "Generation complete. Deployment files:"
+echo "  Client root certificate: $ROOT_CERT"
+echo "  Server private key: $SERVER_KEY"
+echo "  Server certificate: $SERVER_CERT"
+```
+执行
+```
+chmod +x generate_certs.sh
+./generate_certs.sh 服务器公网IP
+
+# 例如 ./generate_certs.sh 111.111.111.111
+```
+输出如下：
+```
+Generating root private key...
+Generating self-signed root certificate...
+Generating server private key...
+Generating server CSR...
+Signing server certificate with root certificate...
+Certificate request self-signature ok
+subject=C = CN, ST = Zhejiang, L = Hangzhou, O = CrossDesk, OU = CrossDesk, CN = xxx.xxx.xxx.xxx
+cleaning up intermediate files...
+Generation complete. Deployment files::
+  Client root certificate:: crossdesk.cn_root.crt
+  Server private key: crossdesk.cn.key
+  Server certificate: crossdesk.cn_bundle.crt
+```
+
+#### 服务端
+将 **crossdesk.cn.key** 和 **crossdesk.cn_bundle.crt** 放置到 **/path/to/your/certs** 目录下。
+
+#### 客户端
 1. 点击右上角设置进入设置页面。<br>
 <img width="600" height="210" alt="image" src="https://github.com/user-attachments/assets/6431131d-b32a-4726-8783-6788f47baa3b" /><br><br>

@@ -244,9 +295,3 @@ sudo chown -R $(id -u):$(id -g) /var/lib/crossdesk /var/log/crossdesk

 7. 勾选使用**自托管服务器配置**，点击确认配置生效。<br><br>
 <img width="600" height="160" alt="image" src="https://github.com/user-attachments/assets/1e455dc3-4087-4f37-a544-1ff9f8789383" /><br><br>
-
-### Web 客户端
-详情见项目 [CrossDesk Web Client](https://github.com/kunkundi/crossdesk-web-client)。
-
-# 常见问题
-见 [常见问题](https://github.com/kunkundi/crossdesk/blob/self-hosted-server/docs/FAQ.md) 。
--- a/README_EN.md
+++ b/README_EN.md
@@ -1,10 +1,9 @@
 # CrossDesk

-<a href="https://hellogithub.com/repository/kunkundi/crossdesk" target="_blank"><img src="https://api.hellogithub.com/v1/widgets/recommend.svg?rid=55d41367570345f1838e02fd12be7961&claim_uid=cb0OpZRrBuGVAfL&theme=small" alt="Featured｜HelloGitHub" /></a>
-[![Platform](https://img.shields.io/badge/platform-Windows%20%7C%20Linux%20%7C%20macOS-brightgreen.svg)]()
+[![Platform](https://img.shields.io/badge/platform-Windows%20%7C%20Linux%20%7C%20macOS-lightgrey.svg)]()
 [![License: LGPL v3](https://img.shields.io/badge/License-LGPL%20v3-blue.svg)](https://www.gnu.org/licenses/lgpl-3.0)
-[![GitHub last commit](https://img.shields.io/github/last-commit/kunkundi/crossdesk)](https://github.com/kunkundi/crossdesk/commits/web-client)
-[![Build Status](https://github.com/kunkundi/crossdesk/actions/workflows/build.yml/badge.svg)](https://github.com/kunkundi/crossdesk/actions)  
+[![GitHub last commit](https://img.shields.io/github/last-commit/kunkundi/crossdesk)](https://github.com/kunkundi/crossdesk/commits/self-hosted-server)
+[![Build Status](https://github.com/kunkundi/crossdesk/actions/workflows/build.yaml/badge.svg)](https://github.com/kunkundi/crossdesk/actions)  
 [![Docker Pulls](https://img.shields.io/docker/pulls/crossdesk/crossdesk-server)](https://hub.docker.com/r/crossdesk/crossdesk-server/tags)
 [![GitHub issues](https://img.shields.io/github/issues/kunkundi/crossdesk.svg)]()
 [![GitHub stars](https://img.shields.io/github/stars/kunkundi/crossdesk.svg?style=social)]()
@@ -12,29 +11,14 @@

 [ [中文](README.md) / English ]

-PC Client
 ![sup_example](https://github.com/user-attachments/assets/3f17d8f3-7c4a-4b63-bae4-903363628687)

-Web Client
-<p align="center">
-  <img width="850" height="550" alt="6bddcbed47ffd4b9988a4037c7f4f524" src="https://github.com/user-attachments/assets/e44f73f9-24ac-46a3-a189-b7f8b6669881" />
-</p>
-
 # Intro

 CrossDesk is a lightweight cross-platform remote desktop software.

 CrossDesk is an experimental application of [MiniRTC](https://github.com/kunkundi/minirtc.git), a lightweight cross-platform real-time audio and video transmission library. MiniRTC provides fundamental capabilities including network traversal ([RFC5245](https://datatracker.ietf.org/doc/html/rfc5245)), video software/hardware encoding and decoding (H264/AV1), audio encoding/decoding ([Opus](https://github.com/xiph/opus)), signaling interaction, network congestion control, and transmission encryption ([SRTP](https://tools.ietf.org/html/rfc3711)).

-## System Requirements
-
-| Platform | Minimum Version |
-|-----------|-----------------|
-| **Windows** | Windows 10 or later (64-bit) |
-| **macOS** | macOS Intel 15.0 or later *(versions between 14.0 and 15.0 can be built manually for compatibility)*<br>macOS Apple Silicon 14.0 or later |
-| **Linux** | Ubuntu 22.04 or later *(older versions can be built manually for compatibility)* |
-
-
 ## Usage

 Enter the remote desktop ID in the menu bar’s “Remote ID” field and click “→” to initiate a remote connection.
@@ -49,13 +33,6 @@ Before connecting, you can customize configuration options in the settings, such

 ![settings](https://github.com/user-attachments/assets/8bc5468d-7bbb-4e30-95bd-da1f352ac08c)

-### Web Client
-
-Visit  [CrossDesk Web Client](https://web.crossdesk.cn/).
-Enter the **Remote Device ID** and **Password**, then click Connect to access the remote device. As shown, **iOS Safari remotely controlling Windows 11**:
-
-<img width="645" height="300" alt="_cgi-bin_mmwebwx-bin_webwxgetmsgimg__ MsgID=932911462648581698 skey=@crypt_1f5153b1_b550ca7462b5009ce03c991cca2a92a7 mmweb_appid=wx_webfilehelper" src="https://github.com/user-attachments/assets/a5109e6f-752c-4654-9f4e-7e161bddf43e" />
-
 ## How to build

 Requirements:
@@ -65,7 +42,7 @@ Requirements:
 Following packages need to be installed on Linux:

 ```
-sudo apt-get install -y software-properties-common git curl unzip build-essential libx11-dev libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev libxcb-randr0-dev libxcb-xtest0-dev libxcb-xinerama0-dev libxcb-shape0-dev libxcb-xkb-dev libxcb-xfixes0-dev libxfixes-dev libxv-dev libxtst-dev libasound2-dev libsndio-dev libxcb-shm0-dev libasound2-dev libpulse-dev
+sudo apt-get install -y software-properties-common git curl unzip build-essential libx11-dev libxrandr-dev libxinerama-dev libxcursor-dev libxi-dev libxcb-randr0-dev libxcb-xtest0-dev libxcb-xinerama0-dev libxcb-shape0-dev libxcb-xkb-dev libxcb-xfixes0-dev libxv-dev libxtst-dev libasound2-dev libsndio-dev libxcb-shm0-dev libasound2-dev libpulse-dev
 ```

 Build:
@@ -80,14 +57,7 @@ git submodule update

 xmake b -vy crossdesk
 ```
-Build options:
-```
--USE_CUDA=true/false: enable CUDA acceleration codec, default: false
--CROSSDESK_VERSION=xxx: set the version number

-# example:
-xmake f --CROSSDESK_VERSION=1.0.0 --USE_CUDA=true
-```
 Run:
 ```
 xmake r crossdesk
@@ -95,7 +65,7 @@ xmake r crossdesk

 #### Development Without CUDA Environment

-For **Linux developers who do not have a CUDA environment installed and want to enable hardware codec feature**, a preconfigured [Ubuntu 22.04 Docker image](https://hub.docker.com/r/crossdesk/ubuntu22.04) is provided.  
+For **Linux** developers who do not have a **CUDA environment** installed, a preconfigured [Ubuntu 22.04 Docker image](https://hub.docker.com/r/crossdesk/ubuntu22.04) is provided.  
 This image comes with all required build dependencies and allows you to build the project directly inside the container without any additional setup.

 After entering the container, download the project and run:
@@ -103,11 +73,10 @@ After entering the container, download the project and run:
 export CUDA_PATH=/usr/local/cuda
 export XMAKE_GLOBALDIR=/data

-xmake f --USE_CUDA=true
 xmake b --root -vy crossdesk
 ```

-For **Windows developers without a CUDA environment** installed, run the following command to install the CUDA build environment:
+For **Windows** developers without a **CUDA environment** installed, run the following command to install the CUDA build environment:
 ```
 xmake require -vy "cuda 12.6.3"
 ```
@@ -126,7 +95,6 @@ set CUDA_PATH=path_to_cuda_installdir:
 ```
 Then re-run:
 ```
-xmake f --USE_CUDA=true
 xmake b -vy crossdesk
 ```

@@ -181,71 +149,146 @@ It is recommended to deploy CrossDesk Server using Docker.
 sudo docker run -d \
  --name crossdesk_server \
  --network host \
-  -e EXTERNAL_IP=xxx.xxx.xxx.xxx \
-  -e INTERNAL_IP=xxx.xxx.xxx.xxx \
-  -e CROSSDESK_SERVER_PORT=xxxx \
-  -e COTURN_PORT=xxxx \
-  -e MIN_PORT=xxxxx \
-  -e MAX_PORT=xxxxx \
-  -v /var/lib/crossdesk:/var/lib/crossdesk \
-  -v /var/log/crossdesk:/var/log/crossdesk \
-  crossdesk/crossdesk-server:v1.1.2
+  -e EXTERNAL_IP=150.158.81.30 \
+  -e INTERNAL_IP=10.0.4.3 \
+  -e CROSSDESK_SERVER_PORT=9099 \
+  -v /path/to/your/certs:/crossdesk-server/certs \
+  -v /path/to/your/db:/crossdesk-server/db \
+  -v /path/to/your/logs:/crossdesk-server/logs \
+  crossdesk/crossdesk-server:latest
 ```

 The parameters you need to pay attention to are as follows:

-**Parameters**
- **EXTERNAL_IP**: The server’s public IP. This corresponds to **Server Address** in the CrossDesk client’s **Self-Hosted Server Configuration**.
- **INTERNAL_IP**: The server’s internal IP.
- **CROSSDESK_SERVER_PORT**: The port used by the self-hosted service. This corresponds to **Server Port** in the CrossDesk client’s **Self-Hosted Server Configuration**.
- **COTURN_PORT**: The port used by the COTURN service. This corresponds to **Relay Service Port** in the CrossDesk client’s **Self-Hosted Server Configuration**.
- **MIN_PORT / MAX_PORT**: The port range used by the COTURN service. Example: `MIN_PORT=50000`, `MAX_PORT=60000`. Adjust the range depending on the number of clients.
- `-v /var/lib/crossdesk:/var/lib/crossdesk`: Persists database and certificate files on the host machine.
- `-v /var/log/crossdesk:/var/log/crossdesk`: Persists log files on the host machine.
+- **EXTERNAL_IP**: The server's public IP, corresponding to the **Server Address** in the CrossDesk client **Self-Hosted Server Configuration**.

-**Example**:
-```bash
-sudo docker run -d \
-  --name crossdesk_server \
-  --network host \
-  -e EXTERNAL_IP=114.114.114.114 \
-  -e INTERNAL_IP=10.0.0.1 \
-  -e CROSSDESK_SERVER_PORT=9099 \
-  -e COTURN_PORT=3478 \
-  -e MIN_PORT=50000 \
-  -e MAX_PORT=60000 \
-  -v /var/lib/crossdesk:/var/lib/crossdesk \
-  -v /var/log/crossdesk:/var/log/crossdesk \
-  crossdesk/crossdesk-server:v1.1.3
+- **INTERNAL_IP**: The server's internal IP.
+
+- **CROSSDESK_SERVER_PORT**: The port used by the self-hosted server, corresponding to the **Server Port** in the CrossDesk client **Self-Hosted Server Configuration**.
+
+- **/path/to/your/certs**: Directory for certificate files.
+
+- **/path/to/your/db**: CrossDesk Server device management database.
+
+- **/path/to/your/logs**: Log directory.
+
+**Note**:  
+- **/path/to/your/ is an example path; please replace it with your actual path. The mounted directories must be created in advance, otherwise the container will fail.**
+- **The server must open the following ports: 3478/udp, 3478/tcp, 30000-60000/udp, CROSSDESK_SERVER_PORT/tcp, 443/tcp.**
+
+## Certificate Files
+The client needs to load the root certificate, and the server needs to load the server private key and server certificate.
+
+If you already have an SSL certificate, you can skip the following certificate generation steps.
+
+For users without a certificate, you can use the script below to generate the certificate files:
+```
+# Create certificate generation script
+vim generate_certs.sh
+```
+Copy the following into the script:
+```
+#!/bin/bash
+set -e
+
+# Check arguments
+if [ "$#" -ne 1 ]; then
+    echo "Usage: $0 <SERVER_IP>"
+    exit 1
+fi
+
+SERVER_IP="$1"
+
+# Filenames
+ROOT_KEY="crossdesk.cn_root.key"
+ROOT_CERT="crossdesk.cn_root.crt"
+SERVER_KEY="crossdesk.cn.key"
+SERVER_CSR="crossdesk.cn.csr"
+SERVER_CERT="crossdesk.cn_bundle.crt"
+FULLCHAIN_CERT="crossdesk.cn_fullchain.crt"
+
+# Certificate subject
+SUBJ="/C=CN/ST=Zhejiang/L=Hangzhou/O=CrossDesk/OU=CrossDesk/CN=$SERVER_IP"
+
+# 1. Generate root certificate
+echo "Generating root private key..."
+openssl genrsa -out "$ROOT_KEY" 4096
+
+echo "Generating self-signed root certificate..."
+openssl req -x509 -new -nodes -key "$ROOT_KEY" -sha256 -days 3650 -out "$ROOT_CERT" -subj "$SUBJ"
+
+# 2. Generate server private key
+echo "Generating server private key..."
+openssl genrsa -out "$SERVER_KEY" 2048
+
+# 3. Generate server CSR
+echo "Generating server CSR..."
+openssl req -new -key "$SERVER_KEY" -out "$SERVER_CSR" -subj "$SUBJ"
+
+# 4. Create temporary OpenSSL config file with SAN
+SAN_CONF="san.cnf"
+cat > $SAN_CONF <<EOL
+[ req ]
+default_bits = 2048
+distinguished_name = req_distinguished_name
+req_extensions = req_ext
+prompt = no
+
+[ req_distinguished_name ]
+C = CN
+ST = Zhejiang
+L = Hangzhou
+O = CrossDesk
+OU = CrossDesk
+CN = $SERVER_IP
+
+[ req_ext ]
+subjectAltName = IP:$SERVER_IP
+EOL
+
+# 5. Sign server certificate with root certificate (including SAN)
+echo "Signing server certificate with root certificate..."
+openssl x509 -req -in "$SERVER_CSR" -CA "$ROOT_CERT" -CAkey "$ROOT_KEY" -CAcreateserial \
+  -out "$SERVER_CERT" -days 3650 -sha256 -extfile "$SAN_CONF" -extensions req_ext
+
+# 6. Generate full chain certificate
+cat "$SERVER_CERT" "$ROOT_CERT" > "$FULLCHAIN_CERT"
+
+# 7. Clean up intermediate files
+rm -f "$ROOT_CERT.srl" "$SAN_CONF" "$ROOT_KEY" "$SERVER_CSR" "FULLCHAIN_CERT"
+
+echo "Generation complete. Deployment files:"
+echo "  Client root certificate: $ROOT_CERT"
+echo "  Server private key: $SERVER_KEY"
+echo "  Server certificate: $SERVER_CERT"
+```
+Execute:
+```
+chmod +x generate_certs.sh
+./generate_certs.sh EXTERNAL_IP
+
+# example ./generate_certs.sh 111.111.111.111
+```
+Expected output:
+```
+Generating root private key...
+Generating self-signed root certificate...
+Generating server private key...
+Generating server CSR...
+Signing server certificate with root certificate...
+Certificate request self-signature ok
+subject=C = CN, ST = Zhejiang, L = Hangzhou, O = CrossDesk, OU = CrossDesk, CN = xxx.xxx.xxx.xxx
+cleaning up intermediate files...
+Generation complete. Deployment files::
+  Client root certificate:: crossdesk.cn_root.crt
+  Server private key: crossdesk.cn.key
+  Server certificate: crossdesk.cn_bundle.crt
 ```

-**Notes**
- **The server must open the following ports: COTURN_PORT/udp, COTURN_PORT/tcp, MIN_PORT–MAX_PORT/udp, and CROSSDESK_SERVER_PORT/tcp.**
- If you don’t mount volumes, all data will be lost when the container is removed.
- Certificate files will be automatically generated on first startup and persisted to the host at `/var/lib/crossdesk/certs`.
- The database file will be automatically created and stored at `/var/lib/crossdesk/db/crossdesk-server.db`.
- Log files will be created and stored at `/var/log/crossdesk/`.
-
-**Permission Notice**
-If the directories automatically created by Docker belong to root and have insufficient write permissions, the container user may not be able to write to them. This can cause:
-  - Certificate generation failure, leading to startup script errors and container exit.
-  - Database directory creation failure, causing the program to throw exceptions and crash.
-  - Log directory creation failure, preventing logs from being written (though the program may continue running).
-
-**Solution:** Manually set permissions before starting the container:
-```bash
-sudo mkdir -p /var/lib/crossdesk /var/log/crossdesk
-sudo chown -R $(id -u):$(id -g) /var/lib/crossdesk /var/log/crossdesk
-```
-
-### Certificate Files
-You can find the certificate file `crossdesk.cn_root.crt` at `/var/lib/crossdesk/certs` on the host machine.
-Download it to your client device and select it in the **Certificate File Path** field under the CrossDesk client’s **Self-Hosted Server Settings**.
-
-### Server Side
+#### Server Side
 Place **crossdesk.cn.key** and **crossdesk.cn_bundle.crt** into the **/path/to/your/certs** directory.

-### Client Side
+#### Client Side
 1. Click the settings icon in the top-right corner to enter the settings page.<br>
 <img width="600" height="210" alt="image" src="https://github.com/user-attachments/assets/6431131d-b32a-4726-8783-6788f47baa3b" /><br><br>

@@ -257,9 +300,3 @@ Place **crossdesk.cn.key** and **crossdesk.cn_bundle.crt** into the **/path/to/y

 4. Check the option to use **Self-Hosted Server Configuration**.<br><br>
 <img width="600" height="160" alt="image" src="https://github.com/user-attachments/assets/1e455dc3-4087-4f37-a544-1ff9f8789383" /><br><br>
-
-### Web Client
-See [CrossDesk Web Client](https://github.com/kunkundi/crossdesk-web-client)。
-
-# FAQ
-See [FAQ](https://github.com/kunkundi/crosssesk/blob/self-hosted-server/docs/FAQ.md) .
--- a/docs/FAQ.md
+++ b/docs/FAQ.md
@@ -1,33 +0,0 @@
-# 常见问题（FAQ）
-
-欢迎来到 **CrossDesk 常见问题** 页面！  
-这里整理了用户和开发者最常见的一些疑问。如果你没有找到答案，欢迎在 [Issues](https://github.com/kunkundi/crossdesk/issues) 中反馈。
-
---
-
-### Q1. 对等连接失败
-**A:**  
-打开设置，勾选 **启用中继服务** 选项，尝试重新发起连接。
-
-<img width="396" height="306" alt="Image" src="https://github.com/user-attachments/assets/fd8db148-c782-4f4d-b874-8f1b2a7ec7d6" />
-
-由于公共中继服务器带宽较小，连接的清晰度流畅度可能会下降，建议自建服务器。 [Issue #8](https://github.com/kunkundi/crossdesk/issues/8)
-
-### Q2. Windows 无 CUDA 环境下编译
-**A:**  
-运行下面的命令安装 CUDA 编译环境。
-```
-xmake require -vy "cuda 12.6.3"
-```
-安装完成后执行
-```
-xmake require --info "cuda 12.6.3"
-```
-输出如下
-
-<img width="860" height="226" alt="Image" src="https://github.com/user-attachments/assets/999ac365-581a-4b9a-806e-05eb3e4cf44d" />
-
-根据上述输出获取到 CUDA 的安装目录，即 installdir 指向的位置。将 CUDA_PATH 加入系统环境变量，或在终端中输入 set CUDA_PATH=path_to_cuda_installdir，重新执行 xmake b -vy crossdesk 即可。
-[Issue #6](https://github.com/kunkundi/crossdesk/issues/6)
-
---
--- a/image.png
+++ b/image.png
--- a/scripts/linux/pkg_amd64.sh
+++ b/scripts/linux/pkg_amd64.sh
@@ -9,10 +9,7 @@ ARCHITECTURE="amd64"
 MAINTAINER="Junkun Di <junkun.di@hotmail.com>"
 DESCRIPTION="A simple cross-platform remote desktop client."

-# Remove 'v' prefix from version for Debian package (Debian version must start with digit)
-DEB_VERSION="${APP_VERSION#v}"
-
-DEB_DIR="${PKG_NAME}-${DEB_VERSION}"
+DEB_DIR="${PKG_NAME}-${APP_VERSION}"
 DEBIAN_DIR="$DEB_DIR/DEBIAN"
 BIN_DIR="$DEB_DIR/usr/bin"
 CERT_SRC_DIR="$DEB_DIR/opt/$PKG_NAME/certs"
@@ -38,7 +35,7 @@ done

 cat > "$DEBIAN_DIR/control" << EOF
 Package: $PKG_NAME
-Version: $DEB_VERSION
+Version: $APP_VERSION
 Architecture: $ARCHITECTURE
 Maintainer: $MAINTAINER
 Description: $DESCRIPTION
@@ -53,7 +50,7 @@ EOF

 cat > "$DESKTOP_DIR/$PKG_NAME.desktop" << EOF
 [Desktop Entry]
-Version=$DEB_VERSION
+Version=$APP_VERSION
 Name=$APP_NAME
 Comment=$DESCRIPTION
 Exec=/usr/bin/$PKG_NAME
--- a/scripts/linux/pkg_arm64.sh
+++ b/scripts/linux/pkg_arm64.sh
@@ -9,10 +9,7 @@ ARCHITECTURE="arm64"
 MAINTAINER="Junkun Di <junkun.di@hotmail.com>"
 DESCRIPTION="A simple cross-platform remote desktop client."

-# Remove 'v' prefix from version for Debian package (Debian version must start with digit)
-DEB_VERSION="${APP_VERSION#v}"
-
-DEB_DIR="${PKG_NAME}-${DEB_VERSION}"
+DEB_DIR="${PKG_NAME}-${APP_VERSION}"
 DEBIAN_DIR="$DEB_DIR/DEBIAN"
 BIN_DIR="$DEB_DIR/usr/bin"
 CERT_SRC_DIR="$DEB_DIR/opt/$PKG_NAME/certs"
@@ -38,7 +35,7 @@ done

 cat > "$DEBIAN_DIR/control" << EOF
 Package: $PKG_NAME
-Version: $DEB_VERSION
+Version: $APP_VERSION
 Architecture: $ARCHITECTURE
 Maintainer: $MAINTAINER
 Description: $DESCRIPTION
@@ -52,7 +49,7 @@ EOF

 cat > "$DESKTOP_DIR/$PKG_NAME.desktop" << EOF
 [Desktop Entry]
-Version=$DEB_VERSION
+Version=$APP_VERSION
 Name=$APP_NAME
 Comment=$DESCRIPTION
 Exec=/usr/bin/$PKG_NAME
--- a/scripts/macosx/pkg_arm64.sh
+++ b/scripts/macosx/pkg_arm64.sh
@@ -86,66 +86,29 @@ pkgbuild \
  --component "${APP_BUNDLE}" \
  build_pkg_temp/${APP_NAME}-component.pkg

-mkdir -p build_pkg_scripts
+mkdir -p scripts

-cat > build_pkg_scripts/postinstall <<'EOF'
+cat > scripts/postinstall <<'EOF'
 #!/bin/bash
-set -e
-
-IDENTIFIER="cn.crossdesk.app"
-
-# 获取当前登录用户
 USER_HOME=$( /usr/bin/stat -f "%Su" /dev/console )
 HOME_DIR=$( /usr/bin/dscl . -read /Users/$USER_HOME NFSHomeDirectory | awk '{print $2}' )

-# 复制证书文件
 DEST="$HOME_DIR/Library/Application Support/CrossDesk/certs"
+
 mkdir -p "$DEST"
 cp -R "/Library/Application Support/CrossDesk/certs/"* "$DEST/"

-# 清除应用的权限授权，以便重新授权
-# 使用 tccutil 重置录屏权限和辅助功能权限
-if command -v tccutil >/dev/null 2>&1; then
-    # 重置录屏权限
-    tccutil reset ScreenCapture "$IDENTIFIER" 2>/dev/null || true
-    # 重置辅助功能权限
-    tccutil reset Accessibility "$IDENTIFIER" 2>/dev/null || true
-    # 重置摄像头权限（如果需要）
-    tccutil reset Camera "$IDENTIFIER" 2>/dev/null || true
-    # 重置麦克风权限（如果需要）
-    tccutil reset Microphone "$IDENTIFIER" 2>/dev/null || true
-fi
-
-# 为所有用户清除权限（可选，如果需要）
-# 遍历所有用户目录并清除权限
-for USER_DIR in /Users/*; do
-    if [ -d "$USER_DIR" ] && [ "$USER_DIR" != "/Users/Shared" ]; then
-        USER_NAME=$(basename "$USER_DIR")
-        # 跳过系统用户
-        if [ "$USER_NAME" != "Shared" ] && [ -d "$USER_DIR/Library" ]; then
-            # 删除 TCC 数据库中的相关条目（需要管理员权限）
-            TCC_DB="$USER_DIR/Library/Application Support/com.apple.TCC/TCC.db"
-            if [ -f "$TCC_DB" ]; then
-                # 使用 sqlite3 删除相关权限记录（如果可用）
-                if command -v sqlite3 >/dev/null 2>&1; then
-                    sqlite3 "$TCC_DB" "DELETE FROM access WHERE client='$IDENTIFIER' AND service IN ('kTCCServiceScreenCapture', 'kTCCServiceAccessibility');" 2>/dev/null || true
-                fi
-            fi
-        fi
-    fi
-done
-
 exit 0
 EOF

-chmod +x build_pkg_scripts/postinstall
+chmod +x scripts/postinstall

 pkgbuild \
  --root "${CERTS_SOURCE}" \
  --identifier "${IDENTIFIER}.certs" \
  --version "${APP_VERSION}" \
  --install-location "/Library/Application Support/CrossDesk/certs" \
-  --scripts build_pkg_scripts \
+  --scripts scripts \
  build_pkg_temp/${APP_NAME}-certs.pkg

 productbuild \
@@ -155,7 +118,7 @@ productbuild \

 echo "PKG package created: ${PKG_NAME}"

-rm -rf build_pkg_temp build_pkg_scripts ${APP_BUNDLE}
+rm -rf build_pkg_temp scripts ${APP_BUNDLE}

 echo "PKG package created successfully."
 echo "package ${APP_BUNDLE}"
--- a/scripts/macosx/pkg_x64.sh
+++ b/scripts/macosx/pkg_x64.sh
@@ -86,66 +86,29 @@ pkgbuild \
  --component "${APP_BUNDLE}" \
  build_pkg_temp/${APP_NAME}-component.pkg

-mkdir -p build_pkg_scripts
+mkdir -p scripts

-cat > build_pkg_scripts/postinstall <<'EOF'
+cat > scripts/postinstall <<'EOF'
 #!/bin/bash
-set -e
-
-IDENTIFIER="cn.crossdesk.app"
-
-# 获取当前登录用户
 USER_HOME=$( /usr/bin/stat -f "%Su" /dev/console )
 HOME_DIR=$( /usr/bin/dscl . -read /Users/$USER_HOME NFSHomeDirectory | awk '{print $2}' )

-# 复制证书文件
 DEST="$HOME_DIR/Library/Application Support/CrossDesk/certs"
+
 mkdir -p "$DEST"
 cp -R "/Library/Application Support/CrossDesk/certs/"* "$DEST/"

-# 清除应用的权限授权，以便重新授权
-# 使用 tccutil 重置录屏权限和辅助功能权限
-if command -v tccutil >/dev/null 2>&1; then
-    # 重置录屏权限
-    tccutil reset ScreenCapture "$IDENTIFIER" 2>/dev/null || true
-    # 重置辅助功能权限
-    tccutil reset Accessibility "$IDENTIFIER" 2>/dev/null || true
-    # 重置摄像头权限（如果需要）
-    tccutil reset Camera "$IDENTIFIER" 2>/dev/null || true
-    # 重置麦克风权限（如果需要）
-    tccutil reset Microphone "$IDENTIFIER" 2>/dev/null || true
-fi
-
-# 为所有用户清除权限（可选，如果需要）
-# 遍历所有用户目录并清除权限
-for USER_DIR in /Users/*; do
-    if [ -d "$USER_DIR" ] && [ "$USER_DIR" != "/Users/Shared" ]; then
-        USER_NAME=$(basename "$USER_DIR")
-        # 跳过系统用户
-        if [ "$USER_NAME" != "Shared" ] && [ -d "$USER_DIR/Library" ]; then
-            # 删除 TCC 数据库中的相关条目（需要管理员权限）
-            TCC_DB="$USER_DIR/Library/Application Support/com.apple.TCC/TCC.db"
-            if [ -f "$TCC_DB" ]; then
-                # 使用 sqlite3 删除相关权限记录（如果可用）
-                if command -v sqlite3 >/dev/null 2>&1; then
-                    sqlite3 "$TCC_DB" "DELETE FROM access WHERE client='$IDENTIFIER' AND service IN ('kTCCServiceScreenCapture', 'kTCCServiceAccessibility');" 2>/dev/null || true
-                fi
-            fi
-        fi
-    fi
-done
-
 exit 0
 EOF

-chmod +x build_pkg_scripts/postinstall
+chmod +x scripts/postinstall

 pkgbuild \
  --root "${CERTS_SOURCE}" \
  --identifier "${IDENTIFIER}.certs" \
  --version "${APP_VERSION}" \
  --install-location "/Library/Application Support/CrossDesk/certs" \
-  --scripts build_pkg_scripts \
+  --scripts scripts \
  build_pkg_temp/${APP_NAME}-certs.pkg

 productbuild \
@@ -155,7 +118,7 @@ productbuild \

 echo "PKG package created: ${PKG_NAME}"

-rm -rf build_pkg_temp build_pkg_scripts ${APP_BUNDLE}
+rm -rf build_pkg_temp scripts ${APP_BUNDLE}

 echo "PKG package created successfully."
 echo "package ${APP_BUNDLE}"
--- a/src/app/daemon.cpp
+++ b/src/app/daemon.cpp
@@ -1,313 +0,0 @@
-#include "daemon.h"
-
-#include <atomic>
-#include <chrono>
-#include <cstring>
-#include <iostream>
-#include <thread>
-#include <vector>
-
-#ifdef _WIN32
-#include <process.h>
-#include <tchar.h>
-#include <windows.h>
-#elif __APPLE__
-#include <fcntl.h>
-#include <limits.h>
-#include <mach-o/dyld.h>
-#include <signal.h>
-#include <stdlib.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <unistd.h>
-#else
-#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <signal.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <unistd.h>
-
-#include <cstring>
-#endif
-
-#ifndef _WIN32
-Daemon* Daemon::instance_ = nullptr;
-#endif
-
-// get executable file path
-static std::string GetExecutablePath() {
-#ifdef _WIN32
-  char path[32768];
-  DWORD length = GetModuleFileNameA(nullptr, path, sizeof(path));
-  if (length > 0 && length < sizeof(path)) {
-    return std::string(path);
-  }
-#elif __APPLE__
-  char path[PATH_MAX];
-  uint32_t size = sizeof(path);
-  if (_NSGetExecutablePath(path, &size) == 0) {
-    char resolved_path[PATH_MAX];
-    if (realpath(path, resolved_path) != nullptr) {
-      return std::string(resolved_path);
-    }
-    return std::string(path);
-  }
-#else
-  char path[PATH_MAX];
-  ssize_t count = readlink("/proc/self/exe", path, sizeof(path) - 1);
-  if (count != -1) {
-    path[count] = '\0';
-    return std::string(path);
-  }
-#endif
-  return "";
-}
-
-Daemon::Daemon(const std::string& name)
-    : name_(name)
-#ifdef _WIN32
-      ,
-      running_(false)
-#else
-      ,
-      running_(true)
-#endif
-{
-}
-
-void Daemon::stop() { running_ = false; }
-
-bool Daemon::isRunning() const { return running_; }
-
-bool Daemon::start(MainLoopFunc loop) {
-#ifdef _WIN32
-  running_ = true;
-  return runWithRestart(loop);
-#elif __APPLE__
-  // macOS: Use child process monitoring (like Windows) to preserve GUI
-  running_ = true;
-  return runWithRestart(loop);
-#else
-  // linux: Daemonize first, then run with restart monitoring
-  instance_ = this;
-
-  // check if running from terminal before fork
-  bool from_terminal =
-      (isatty(STDIN_FILENO) != 0) || (isatty(STDOUT_FILENO) != 0);
-
-  // first fork: detach from terminal
-  pid_t pid = fork();
-  if (pid < 0) {
-    std::cerr << "Failed to fork daemon process" << std::endl;
-    return false;
-  }
-  if (pid > 0) _exit(0);
-
-  if (setsid() < 0) {
-    std::cerr << "Failed to create new session" << std::endl;
-    return false;
-  }
-
-  pid = fork();
-  if (pid < 0) {
-    std::cerr << "Failed to fork daemon process (second fork)" << std::endl;
-    return false;
-  }
-  if (pid > 0) _exit(0);
-
-  umask(0);
-  chdir("/");
-
-  // redirect file descriptors: keep stdout/stderr if from terminal, else
-  // redirect to /dev/null
-  int fd = open("/dev/null", O_RDWR);
-  if (fd >= 0) {
-    dup2(fd, STDIN_FILENO);
-    if (!from_terminal) {
-      dup2(fd, STDOUT_FILENO);
-      dup2(fd, STDERR_FILENO);
-    }
-    if (fd > 2) close(fd);
-  }
-
-  // set up signal handlers
-  signal(SIGTERM, [](int) {
-    if (instance_) instance_->stop();
-  });
-  signal(SIGINT, [](int) {
-    if (instance_) instance_->stop();
-  });
-
-  // ignore SIGPIPE
-  signal(SIGPIPE, SIG_IGN);
-
-  // set up SIGCHLD handler to reap zombie processes
-  struct sigaction sa_chld;
-  sa_chld.sa_handler = [](int) {
-    // reap zombie processes
-    while (waitpid(-1, nullptr, WNOHANG) > 0) {
-      // continue until no more zombie children
-    }
-  };
-  sigemptyset(&sa_chld.sa_mask);
-  sa_chld.sa_flags = SA_RESTART | SA_NOCLDSTOP;
-  sigaction(SIGCHLD, &sa_chld, nullptr);
-
-  running_ = true;
-  return runWithRestart(loop);
-#endif
-}
-
-#ifdef _WIN32
-static int RunLoopCatchCpp(Daemon::MainLoopFunc& loop) {
-  try {
-    loop();
-    return 0;  // normal exit
-  } catch (const std::exception& e) {
-    std::cerr << "Exception caught: " << e.what() << std::endl;
-    return 1;  // c++ exception
-  } catch (...) {
-    std::cerr << "Unknown exception caught" << std::endl;
-    return 1;  // other exception
-  }
-}
-
-static int RunLoopWithSEH(Daemon::MainLoopFunc& loop) {
-  __try {
-    return RunLoopCatchCpp(loop);
-  } __except (EXCEPTION_EXECUTE_HANDLER) {
-    // catch system-level crashes (access violation, divide by zero, etc.)
-    DWORD code = GetExceptionCode();
-    std::cerr << "System crash detected (SEH exception code: 0x" << std::hex
-              << code << std::dec << ")" << std::endl;
-    return 2;  // System crash
-  }
-}
-#endif
-
-// run with restart logic: parent monitors child process and restarts on crash
-bool Daemon::runWithRestart(MainLoopFunc loop) {
-  int restart_count = 0;
-  std::string exe_path = GetExecutablePath();
-  if (exe_path.empty()) {
-    std::cerr
-        << "Failed to get executable path, falling back to direct execution"
-        << std::endl;
-    while (isRunning()) {
-      try {
-        loop();
-        break;
-      } catch (...) {
-        restart_count++;
-        std::cerr << "Exception caught, restarting... (attempt "
-                  << restart_count << ")" << std::endl;
-        std::this_thread::sleep_for(
-            std::chrono::milliseconds(DAEMON_DEFAULT_RESTART_DELAY_MS));
-      }
-    }
-    return true;
-  }
-
-  while (isRunning()) {
-#ifdef _WIN32
-    // windows: use CreateProcess to create child process
-    STARTUPINFOA si = {sizeof(si)};
-    PROCESS_INFORMATION pi = {0};
-
-    std::string cmd_line = "\"" + exe_path + "\" --child";
-    std::vector<char> cmd_line_buf(cmd_line.begin(), cmd_line.end());
-    cmd_line_buf.push_back('\0');
-
-    BOOL success = CreateProcessA(
-        nullptr,  // executable file path (specified in command line)
-        cmd_line_buf.data(),  // command line arguments
-        nullptr,              // process security attributes
-        nullptr,              // thread security attributes
-        FALSE,                // don't inherit handles
-        0,                    // creation flags
-        nullptr,              // environment variables (inherit from parent)
-        nullptr,              // current directory
-        &si,                  // startup info
-        &pi                   // process information
-    );
-
-    if (!success) {
-      std::cerr << "Failed to create child process, error: " << GetLastError()
-                << std::endl;
-      std::this_thread::sleep_for(
-          std::chrono::milliseconds(DAEMON_DEFAULT_RESTART_DELAY_MS));
-      restart_count++;
-      continue;
-    }
-
-    DWORD exit_code = 0;
-    WaitForSingleObject(pi.hProcess, INFINITE);
-    GetExitCodeProcess(pi.hProcess, &exit_code);
-    CloseHandle(pi.hProcess);
-    CloseHandle(pi.hThread);
-
-    if (exit_code == 0) {
-      break;  // normal exit
-    }
-    restart_count++;
-    std::cerr << "Child process exited with code " << exit_code
-              << ", restarting... (attempt " << restart_count << ")"
-              << std::endl;
-    std::this_thread::sleep_for(
-        std::chrono::milliseconds(DAEMON_DEFAULT_RESTART_DELAY_MS));
-#else
-    // linux: use fork + exec to create child process
-    pid_t pid = fork();
-    if (pid == 0) {
-      execl(exe_path.c_str(), exe_path.c_str(), "--child", nullptr);
-      _exit(1);  // exec failed
-    } else if (pid > 0) {
-      int status = 0;
-      pid_t waited_pid = waitpid(pid, &status, 0);
-
-      if (waited_pid < 0) {
-        restart_count++;
-        std::cerr << "waitpid failed, errno: " << errno
-                  << ", restarting... (attempt " << restart_count << ")"
-                  << std::endl;
-        std::this_thread::sleep_for(
-            std::chrono::milliseconds(DAEMON_DEFAULT_RESTART_DELAY_MS));
-        continue;
-      }
-
-      if (WIFEXITED(status)) {
-        int exit_code = WEXITSTATUS(status);
-        if (exit_code == 0) {
-          break;  // normal exit
-        }
-        restart_count++;
-        std::cerr << "Child process exited with code " << exit_code
-                  << ", restarting... (attempt " << restart_count << ")"
-                  << std::endl;
-      } else if (WIFSIGNALED(status)) {
-        restart_count++;
-        std::cerr << "Child process crashed with signal " << WTERMSIG(status)
-                  << ", restarting... (attempt " << restart_count << ")"
-                  << std::endl;
-      } else {
-        restart_count++;
-        std::cerr << "Child process exited with unknown status, restarting... "
-                     "(attempt "
-                  << restart_count << ")" << std::endl;
-      }
-      std::this_thread::sleep_for(
-          std::chrono::milliseconds(DAEMON_DEFAULT_RESTART_DELAY_MS));
-    } else {
-      std::cerr << "Failed to fork child process" << std::endl;
-      std::this_thread::sleep_for(
-          std::chrono::milliseconds(DAEMON_DEFAULT_RESTART_DELAY_MS));
-      restart_count++;
-    }
-#endif
-  }
-
-  return true;
-}
--- a/src/app/daemon.h
+++ b/src/app/daemon.h
@@ -1,39 +0,0 @@
-/*
- * @Author: DI JUNKUN
- * @Date: 2025-11-19
- * Copyright (c) 2025 by DI JUNKUN, All Rights Reserved.
- */
-
-#ifndef _DAEMON_H_
-#define _DAEMON_H_
-
-#include <functional>
-#include <string>
-
-#define DAEMON_DEFAULT_RESTART_DELAY_MS 1000
-
-class Daemon {
- public:
-  using MainLoopFunc = std::function<void()>;
-
-  Daemon(const std::string& name);
-
-  bool start(MainLoopFunc loop);
-
-  void stop();
-
-  bool isRunning() const;
-
- private:
-  std::string name_;
-  bool runWithRestart(MainLoopFunc loop);
-
-#ifdef _WIN32
-  bool running_;
-#else
-  static Daemon* instance_;
-  volatile bool running_;
-#endif
-};
-
-#endif
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -1,66 +1,17 @@
 #ifdef _WIN32
-#ifdef CROSSDESK_DEBUG
+#ifdef DESK_PORT_DEBUG
 #pragma comment(linker, "/subsystem:\"console\"")
 #else
 #pragma comment(linker, "/subsystem:\"windows\" /entry:\"mainCRTStartup\"")
 #endif
 #endif

-#include <cstring>
-#include <memory>
-#include <string>
-
-#include "config_center.h"
-#include "daemon.h"
-#include "path_manager.h"
+#include "rd_log.h"
 #include "render.h"

-int main(int argc, char* argv[]) {
-  // check if running as child process
-  bool is_child = false;
-  for (int i = 1; i < argc; i++) {
-    if (strcmp(argv[i], "--child") == 0) {
-      is_child = true;
-      break;
-    }
-  }
-
-  if (is_child) {
-    // child process: run render directly
-    crossdesk::Render render;
+int main([[maybe_unused]] int argc, [[maybe_unused]] char *argv[]) {
+  Render render;
  render.Run();
-    return 0;
-  }

-  bool enable_daemon = false;
-  auto path_manager = std::make_unique<crossdesk::PathManager>("CrossDesk");
-  if (path_manager) {
-    std::string cert_path =
-        (path_manager->GetCertPath() / "crossdesk.cn_root.crt").string();
-    std::string cache_path = path_manager->GetCachePath().string();
-    crossdesk::ConfigCenter config_center(cache_path + "/config.ini",
-                                          cert_path);
-    enable_daemon = config_center.IsEnableDaemon();
-  }
-
-  if (enable_daemon) {
-    // start daemon with restart monitoring
-    Daemon daemon("CrossDesk");
-
-    // define main loop function: run render and stop daemon on normal exit
-    Daemon::MainLoopFunc main_loop = [&daemon]() {
-      crossdesk::Render render;
-      render.Run();
-      daemon.stop();
-    };
-
-    // start daemon and return result
-    bool success = daemon.start(main_loop);
-    return success ? 0 : 1;
-  }
-
-  // run without daemon: direct execution
-  crossdesk::Render render;
-  render.Run();
  return 0;
 }
--- a/src/autostart/autostart.cpp
+++ b/src/autostart/autostart.cpp
@@ -1,302 +0,0 @@
-#include "autostart.h"
-
-#include <cstdlib>
-#include <filesystem>
-#include <fstream>
-
-#ifdef _WIN32
-#include <windows.h>
-#elif defined(__APPLE__)
-#include <limits.h>
-#include <mach-o/dyld.h>
-#include <unistd.h>
-#elif defined(__linux__)
-#include <linux/limits.h>
-#include <unistd.h>
-#endif
-
-namespace crossdesk {
-
-static std::string get_home_dir() {
-  const char* home = std::getenv("HOME");
-  if (!home) {
-    return "";
-  }
-  return std::string(home);
-}
-
-static bool file_exists(const std::string& path) {
-  return std::filesystem::exists(path) &&
-         std::filesystem::is_regular_file(path);
-}
-
-static std::string GetExecutablePath() {
-#ifdef _WIN32
-  char path[32768];
-  DWORD length = GetModuleFileNameA(nullptr, path, sizeof(path));
-  if (length > 0 && length < sizeof(path)) {
-    return std::string(path);
-  }
-#elif defined(__APPLE__)
-  char path[1024];
-  uint32_t size = sizeof(path);
-  if (_NSGetExecutablePath(path, &size) == 0) {
-    char resolved_path[PATH_MAX];
-    if (realpath(path, resolved_path) != nullptr) {
-      return std::string(resolved_path);
-    }
-    return std::string(path);
-  }
-#elif defined(__linux__)
-  char path[PATH_MAX];
-  ssize_t count = readlink("/proc/self/exe", path, sizeof(path) - 1);
-  if (count != -1) {
-    path[count] = '\0';
-    return std::string(path);
-  }
-#endif
-  return "";
-}
-
-// Windows
-#ifdef _WIN32
-static constexpr const char* WINDOWS_RUN_KEY =
-    "Software\\Microsoft\\Windows\\CurrentVersion\\Run";
-
-static bool windows_enable(const std::string& appName,
-                           const std::string& exePath) {
-  if (exePath.empty() || !std::filesystem::exists(exePath)) {
-    return false;
-  }
-
-  HKEY hKey = nullptr;
-  // Use KEY_WRITE to ensure we have write permission
-  LONG result =
-      RegOpenKeyExA(HKEY_CURRENT_USER, WINDOWS_RUN_KEY, 0, KEY_WRITE, &hKey);
-  if (result != ERROR_SUCCESS) {
-    return false;
-  }
-
-  std::string regValue = exePath;
-  if (!exePath.empty() && exePath.find(' ') != std::string::npos) {
-    if (exePath.front() != '"' || exePath.back() != '"') {
-      regValue = "\"" + exePath + "\"";
-    }
-  }
-
-  // Ensure we close the key even if RegSetValueExA fails
-  result = RegSetValueExA(hKey, appName.c_str(), 0, REG_SZ,
-                          reinterpret_cast<const BYTE*>(regValue.c_str()),
-                          static_cast<DWORD>(regValue.size() + 1));
-  RegCloseKey(hKey);
-
-  return result == ERROR_SUCCESS;
-}
-
-static bool windows_disable(const std::string& appName) {
-  HKEY hKey = nullptr;
-  LONG result =
-      RegOpenKeyExA(HKEY_CURRENT_USER, WINDOWS_RUN_KEY, 0, KEY_WRITE, &hKey);
-  if (result != ERROR_SUCCESS) {
-    return false;
-  }
-
-  result = RegDeleteValueA(hKey, appName.c_str());
-  RegCloseKey(hKey);
-
-  // Return true even if the value doesn't exist (already disabled)
-  return result == ERROR_SUCCESS || result == ERROR_FILE_NOT_FOUND;
-}
-
-static bool windows_exists(const std::string& appName) {
-  HKEY hKey = nullptr;
-  LONG result =
-      RegOpenKeyExA(HKEY_CURRENT_USER, WINDOWS_RUN_KEY, 0, KEY_READ, &hKey);
-  if (result != ERROR_SUCCESS) {
-    return false;
-  }
-
-  result = RegQueryValueExA(hKey, appName.c_str(), nullptr, nullptr, nullptr,
-                            nullptr);
-  RegCloseKey(hKey);
-
-  return result == ERROR_SUCCESS;
-}
-#endif
-
-// Linux
-#if defined(__linux__)
-static std::string linux_desktop_path(const std::string& appName) {
-  std::string home = get_home_dir();
-  if (home.empty()) {
-    return "";
-  }
-  return home + "/.config/autostart/" + appName + ".desktop";
-}
-
-static bool linux_enable(const std::string& appName,
-                         const std::string& exePath) {
-  std::string home = get_home_dir();
-  if (home.empty()) {
-    return false;
-  }
-
-  std::filesystem::path dir =
-      std::filesystem::path(home) / ".config" / "autostart";
-
-  // Create directory if it doesn't exist
-  std::error_code ec;
-  std::filesystem::create_directories(dir, ec);
-  if (ec) {
-    return false;
-  }
-
-  std::string path = linux_desktop_path(appName);
-  if (path.empty()) {
-    return false;
-  }
-
-  std::ofstream file(path);
-  if (!file.is_open()) {
-    return false;
-  }
-
-  file << "[Desktop Entry]\n";
-  file << "Type=Application\n";
-  file << "Exec=" << exePath << "\n";
-  file << "Hidden=false\n";
-  file << "NoDisplay=false\n";
-  file << "X-GNOME-Autostart-enabled=true\n";
-  file << "Terminal=false\n";
-  file << "StartupNotify=false\n";
-  file << "Name=" << appName << "\n";
-  file.close();
-
-  return file.good();
-}
-
-static bool linux_disable(const std::string& appName) {
-  std::string path = linux_desktop_path(appName);
-  if (path.empty()) {
-    return false;
-  }
-
-  std::error_code ec;
-  return std::filesystem::remove(path, ec) && !ec;
-}
-
-static bool linux_exists(const std::string& appName) {
-  std::string path = linux_desktop_path(appName);
-  if (path.empty()) {
-    return false;
-  }
-  return file_exists(path);
-}
-#endif
-
-// macOS
-#ifdef __APPLE__
-static std::string mac_plist_path(const std::string& appName) {
-  std::string home = get_home_dir();
-  if (home.empty()) {
-    return "";
-  }
-  return home + "/Library/LaunchAgents/" + appName + ".plist";
-}
-
-static bool mac_enable(const std::string& appName, const std::string& exePath) {
-  std::string path = mac_plist_path(appName);
-  if (path.empty()) {
-    return false;
-  }
-
-  // Ensure LaunchAgents directory exists
-  std::filesystem::path dir =
-      std::filesystem::path(get_home_dir()) / "Library" / "LaunchAgents";
-  std::error_code ec;
-  std::filesystem::create_directories(dir, ec);
-  if (ec) {
-    return false;
-  }
-
-  std::ofstream file(path);
-  if (!file.is_open()) {
-    return false;
-  }
-
-  file << R"(<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN"
-"http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>Label</key>
-    <string>)"
-       << appName << R"(</string>
-    <key>ProgramArguments</key>
-    <array>
-        <string>)"
-       << exePath << R"(</string>
-    </array>
-    <key>RunAtLoad</key>
-    <true/>
-</dict>
-</plist>)";
-  file.close();
-
-  return file.good();
-}
-
-static bool mac_disable(const std::string& appName) {
-  std::string path = mac_plist_path(appName);
-  if (path.empty()) {
-    return false;
-  }
-
-  std::error_code ec;
-  return std::filesystem::remove(path, ec) && !ec;
-}
-
-static bool mac_exists(const std::string& appName) {
-  std::string path = mac_plist_path(appName);
-  if (path.empty()) {
-    return false;
-  }
-  return file_exists(path);
-}
-#endif
-
-bool EnableAutostart(const std::string& appName) {
-  std::string exePath = GetExecutablePath();
-  if (exePath.empty()) {
-    return false;
-  }
-#ifdef _WIN32
-  return windows_enable(appName, exePath);
-#elif __APPLE__
-  return mac_enable(appName, exePath);
-#else
-  return linux_enable(appName, exePath);
-#endif
-}
-
-bool DisableAutostart(const std::string& appName) {
-#ifdef _WIN32
-  return windows_disable(appName);
-#elif __APPLE__
-  return mac_disable(appName);
-#else
-  return linux_disable(appName);
-#endif
-}
-
-bool IsAutostartEnabled(const std::string& appName) {
-#ifdef _WIN32
-  return windows_exists(appName);
-#elif __APPLE__
-  return mac_exists(appName);
-#else
-  return linux_exists(appName);
-#endif
-}
-
-}  // namespace crossdesk
--- a/src/autostart/autostart.h
+++ b/src/autostart/autostart.h
@@ -1,21 +0,0 @@
-/*
- * @Author: DI JUNKUN
- * @Date: 2025-11-18
- * Copyright (c) 2025 by DI JUNKUN, All Rights Reserved.
- */
-
-#ifndef _AUTOSTART_H_
-#define _AUTOSTART_H_
-
-#include <string>
-
-namespace crossdesk {
-
-bool EnableAutostart(const std::string& appName);
-
-bool DisableAutostart(const std::string& appName);
-
-bool IsAutostartEnabled(const std::string& appName);
-
-}  // namespace crossdesk
-#endif
--- a/src/common/display_info.h
+++ b/src/common/display_info.h
@@ -9,8 +9,6 @@

 #include <string>

-namespace crossdesk {
-
 class DisplayInfo {
 public:
  DisplayInfo(std::string name, int left, int top, int right, int bottom)
@@ -42,5 +40,5 @@ class DisplayInfo {
  int width = 0;
  int height = 0;
 };
-}  // namespace crossdesk
+
 #endif
--- a/src/common/platform.cpp
+++ b/src/common/platform.cpp
@@ -19,8 +19,6 @@
 #include <unistd.h>
 #endif

-namespace crossdesk {
-
 std::string GetMac() {
  char mac_addr[16];
  int len = 0;
@@ -41,21 +39,21 @@ std::string GetMac() {
 #elif __APPLE__
  std::string if_name = "en0";

-  struct ifaddrs* addrs;
-  struct ifaddrs* cursor;
-  const struct sockaddr_dl* dlAddr;
+  struct ifaddrs *addrs;
+  struct ifaddrs *cursor;
+  const struct sockaddr_dl *dlAddr;

  if (!getifaddrs(&addrs)) {
    cursor = addrs;
    while (cursor != 0) {
-      const struct sockaddr_dl* socAddr =
-          (const struct sockaddr_dl*)cursor->ifa_addr;
+      const struct sockaddr_dl *socAddr =
+          (const struct sockaddr_dl *)cursor->ifa_addr;
      if ((cursor->ifa_addr->sa_family == AF_LINK) &&
          (socAddr->sdl_type == IFT_ETHER) &&
          strcmp(if_name.c_str(), cursor->ifa_name) == 0) {
-        dlAddr = (const struct sockaddr_dl*)cursor->ifa_addr;
-        const unsigned char* base =
-            (const unsigned char*)&dlAddr->sdl_data[dlAddr->sdl_nlen];
+        dlAddr = (const struct sockaddr_dl *)cursor->ifa_addr;
+        const unsigned char *base =
+            (const unsigned char *)&dlAddr->sdl_data[dlAddr->sdl_nlen];
        for (int i = 0; i < dlAddr->sdl_alen; i++) {
          len +=
              snprintf(mac_addr + len, sizeof(mac_addr) - len, "%.2X", base[i]);
@@ -79,8 +77,8 @@ std::string GetMac() {
    close(sock);
    return "";
  }
-  struct ifreq* it = ifc.ifc_req;
-  const struct ifreq* const end = it + (ifc.ifc_len / sizeof(struct ifreq));
+  struct ifreq *it = ifc.ifc_req;
+  const struct ifreq *const end = it + (ifc.ifc_len / sizeof(struct ifreq));
  for (; it != end; ++it) {
    std::strcpy(ifr.ifr_name, it->ifr_name);
    if (ioctl(sock, SIOCGIFFLAGS, &ifr) < 0) {
@@ -125,4 +123,3 @@ std::string GetHostName() {
 #endif
  return hostname;
 }
-}  // namespace crossdesk
--- a/src/common/platform.h
+++ b/src/common/platform.h
@@ -9,10 +9,7 @@

 #include <iostream>

-namespace crossdesk {
-
 std::string GetMac();
 std::string GetHostName();

-}  // namespace crossdesk
 #endif
--- a/src/config_center/config_center.cpp
+++ b/src/config_center/config_center.cpp
@@ -1,10 +1,5 @@
 #include "config_center.h"

-#include "autostart.h"
-#include "rd_log.h"
-
-namespace crossdesk {
-
 ConfigCenter::ConfigCenter(const std::string& config_path,
                           const std::string& cert_file_path)
    : config_path_(config_path),
@@ -41,49 +36,14 @@ int ConfigCenter::Load() {

  enable_turn_ = ini_.GetBoolValue(section_, "enable_turn", enable_turn_);
  enable_srtp_ = ini_.GetBoolValue(section_, "enable_srtp", enable_srtp_);
+  server_host_ = ini_.GetValue(section_, "server_host", server_host_.c_str());
+  server_port_ = static_cast<int>(
+      ini_.GetLongValue(section_, "server_port", server_port_));
+  cert_file_path_ =
+      ini_.GetValue(section_, "cert_file_path", cert_file_path_.c_str());
  enable_self_hosted_ =
      ini_.GetBoolValue(section_, "enable_self_hosted", enable_self_hosted_);

-  const char* signal_server_host_value =
-      ini_.GetValue(section_, "signal_server_host", nullptr);
-  if (signal_server_host_value != nullptr &&
-      strlen(signal_server_host_value) > 0) {
-    signal_server_host_ = signal_server_host_value;
-  } else {
-    signal_server_host_ = "";
-  }
-  const char* signal_server_port_value =
-      ini_.GetValue(section_, "signal_server_port", nullptr);
-  if (signal_server_port_value != nullptr &&
-      strlen(signal_server_port_value) > 0) {
-    signal_server_port_ =
-        static_cast<int>(ini_.GetLongValue(section_, "signal_server_port", 0));
-  } else {
-    signal_server_port_ = 0;
-  }
-  const char* coturn_server_port_value =
-      ini_.GetValue(section_, "coturn_server_port", nullptr);
-  if (coturn_server_port_value != nullptr &&
-      strlen(coturn_server_port_value) > 0) {
-    coturn_server_port_ =
-        static_cast<int>(ini_.GetLongValue(section_, "coturn_server_port", 0));
-  } else {
-    coturn_server_port_ = 0;
-  }
-  const char* cert_file_path_value =
-      ini_.GetValue(section_, "cert_file_path", nullptr);
-  if (cert_file_path_value != nullptr && strlen(cert_file_path_value) > 0) {
-    cert_file_path_ = cert_file_path_value;
-  } else {
-    cert_file_path_ = "";
-  }
-
-  enable_autostart_ =
-      ini_.GetBoolValue(section_, "enable_autostart", enable_autostart_);
-  enable_daemon_ = ini_.GetBoolValue(section_, "enable_daemon", enable_daemon_);
-  enable_minimize_to_tray_ = ini_.GetBoolValue(
-      section_, "enable_minimize_to_tray", enable_minimize_to_tray_);
-
  return 0;
 }

@@ -98,22 +58,10 @@ int ConfigCenter::Save() {
  ini_.SetBoolValue(section_, "hardware_video_codec", hardware_video_codec_);
  ini_.SetBoolValue(section_, "enable_turn", enable_turn_);
  ini_.SetBoolValue(section_, "enable_srtp", enable_srtp_);
-  ini_.SetBoolValue(section_, "enable_self_hosted", enable_self_hosted_);
-
-  // only save when self hosted
-  if (enable_self_hosted_) {
-    ini_.SetValue(section_, "signal_server_host", signal_server_host_.c_str());
-    ini_.SetLongValue(section_, "signal_server_port",
-                      static_cast<long>(signal_server_port_));
-    ini_.SetLongValue(section_, "coturn_server_port",
-                      static_cast<long>(coturn_server_port_));
+  ini_.SetValue(section_, "server_host", server_host_.c_str());
+  ini_.SetLongValue(section_, "server_port", static_cast<long>(server_port_));
  ini_.SetValue(section_, "cert_file_path", cert_file_path_.c_str());
-  }
-
-  ini_.SetBoolValue(section_, "enable_autostart", enable_autostart_);
-  ini_.SetBoolValue(section_, "enable_daemon", enable_daemon_);
-  ini_.SetBoolValue(section_, "enable_minimize_to_tray",
-                    enable_minimize_to_tray_);
+  ini_.SetBoolValue(section_, "enable_self_hosted", enable_self_hosted_);

  SI_Error rc = ini_.SaveFile(config_path_.c_str());
  if (rc < 0) {
@@ -199,9 +147,9 @@ int ConfigCenter::SetSrtp(bool enable_srtp) {
  return 0;
 }

-int ConfigCenter::SetServerHost(const std::string& signal_server_host) {
-  signal_server_host_ = signal_server_host;
-  ini_.SetValue(section_, "signal_server_host", signal_server_host_.c_str());
+int ConfigCenter::SetServerHost(const std::string& server_host) {
+  server_host_ = server_host;
+  ini_.SetValue(section_, "server_host", server_host_.c_str());
  SI_Error rc = ini_.SaveFile(config_path_.c_str());
  if (rc < 0) {
    return -1;
@@ -209,21 +157,9 @@ int ConfigCenter::SetServerHost(const std::string& signal_server_host) {
  return 0;
 }

-int ConfigCenter::SetServerPort(int signal_server_port) {
-  signal_server_port_ = signal_server_port;
-  ini_.SetLongValue(section_, "signal_server_port",
-                    static_cast<long>(signal_server_port_));
-  SI_Error rc = ini_.SaveFile(config_path_.c_str());
-  if (rc < 0) {
-    return -1;
-  }
-  return 0;
-}
-
-int ConfigCenter::SetCoturnServerPort(int coturn_server_port) {
-  coturn_server_port_ = coturn_server_port;
-  ini_.SetLongValue(section_, "coturn_server_port",
-                    static_cast<long>(coturn_server_port_));
+int ConfigCenter::SetServerPort(int server_port) {
+  server_port_ = server_port;
+  ini_.SetLongValue(section_, "server_port", static_cast<long>(server_port_));
  SI_Error rc = ini_.SaveFile(config_path_.c_str());
  if (rc < 0) {
    return -1;
@@ -243,44 +179,6 @@ int ConfigCenter::SetCertFilePath(const std::string& cert_file_path) {

 int ConfigCenter::SetSelfHosted(bool enable_self_hosted) {
  enable_self_hosted_ = enable_self_hosted;
-  ini_.SetBoolValue(section_, "enable_self_hosted", enable_self_hosted_);
-
-  // load from config if self hosted is enabled
-  if (enable_self_hosted_) {
-    const char* signal_server_host_value =
-        ini_.GetValue(section_, "signal_server_host", nullptr);
-    if (signal_server_host_value != nullptr &&
-        strlen(signal_server_host_value) > 0) {
-      signal_server_host_ = signal_server_host_value;
-    }
-    const char* signal_server_port_value =
-        ini_.GetValue(section_, "signal_server_port", nullptr);
-    if (signal_server_port_value != nullptr &&
-        strlen(signal_server_port_value) > 0) {
-      signal_server_port_ = static_cast<int>(
-          ini_.GetLongValue(section_, "signal_server_port", 0));
-    }
-    const char* coturn_server_port_value =
-        ini_.GetValue(section_, "coturn_server_port", nullptr);
-    if (coturn_server_port_value != nullptr &&
-        strlen(coturn_server_port_value) > 0) {
-      coturn_server_port_ = static_cast<int>(
-          ini_.GetLongValue(section_, "coturn_server_port", 0));
-    }
-    const char* cert_file_path_value =
-        ini_.GetValue(section_, "cert_file_path", nullptr);
-    if (cert_file_path_value != nullptr && strlen(cert_file_path_value) > 0) {
-      cert_file_path_ = cert_file_path_value;
-    }
-
-    ini_.SetValue(section_, "signal_server_host", signal_server_host_.c_str());
-    ini_.SetLongValue(section_, "signal_server_port",
-                      static_cast<long>(signal_server_port_));
-    ini_.SetLongValue(section_, "coturn_server_port",
-                      static_cast<long>(coturn_server_port_));
-    ini_.SetValue(section_, "cert_file_path", cert_file_path_.c_str());
-  }
-
  SI_Error rc = ini_.SaveFile(config_path_.c_str());
  if (rc < 0) {
    return -1;
@@ -288,52 +186,6 @@ int ConfigCenter::SetSelfHosted(bool enable_self_hosted) {
  return 0;
 }

-int ConfigCenter::SetMinimizeToTray(bool enable_minimize_to_tray) {
-  enable_minimize_to_tray_ = enable_minimize_to_tray;
-  ini_.SetBoolValue(section_, "enable_minimize_to_tray",
-                    enable_minimize_to_tray_);
-  SI_Error rc = ini_.SaveFile(config_path_.c_str());
-  if (rc < 0) {
-    return -1;
-  }
-  return 0;
-}
-
-int ConfigCenter::SetAutostart(bool enable_autostart) {
-  enable_autostart_ = enable_autostart;
-  bool success = false;
-  if (enable_autostart) {
-    success = EnableAutostart("CrossDesk");
-  } else {
-    success = DisableAutostart("CrossDesk");
-  }
-
-  ini_.SetBoolValue(section_, "enable_autostart", enable_autostart_);
-  SI_Error rc = ini_.SaveFile(config_path_.c_str());
-  if (rc < 0) {
-    return -1;
-  }
-
-  if (!success) {
-    LOG_ERROR("SetAutostart failed");
-    return -1;
-  }
-
-  return 0;
-}
-
-int ConfigCenter::SetDaemon(bool enable_daemon) {
-  enable_daemon_ = enable_daemon;
-
-  ini_.SetBoolValue(section_, "enable_daemon", enable_daemon_);
-  SI_Error rc = ini_.SaveFile(config_path_.c_str());
-  if (rc < 0) {
-    return -1;
-  }
-
-  return 0;
-}
-
 // getters

 ConfigCenter::LANGUAGE ConfigCenter::GetLanguage() const { return language_; }
@@ -358,37 +210,20 @@ bool ConfigCenter::IsEnableTurn() const { return enable_turn_; }

 bool ConfigCenter::IsEnableSrtp() const { return enable_srtp_; }

-std::string ConfigCenter::GetSignalServerHost() const {
-  return signal_server_host_;
-}
+std::string ConfigCenter::GetServerHost() const { return server_host_; }

-int ConfigCenter::GetSignalServerPort() const { return signal_server_port_; }
-
-int ConfigCenter::GetCoturnServerPort() const { return coturn_server_port_; }
+int ConfigCenter::GetServerPort() const { return server_port_; }

 std::string ConfigCenter::GetCertFilePath() const { return cert_file_path_; }

 std::string ConfigCenter::GetDefaultServerHost() const {
-  return signal_server_host_default_;
+  return server_host_default_;
 }

-int ConfigCenter::GetDefaultSignalServerPort() const {
-  return server_port_default_;
-}
-
-int ConfigCenter::GetDefaultCoturnServerPort() const {
-  return coturn_server_port_default_;
-}
+int ConfigCenter::GetDefaultServerPort() const { return server_port_default_; }

 std::string ConfigCenter::GetDefaultCertFilePath() const {
  return cert_file_path_default_;
 }

 bool ConfigCenter::IsSelfHosted() const { return enable_self_hosted_; }
-
-bool ConfigCenter::IsMinimizeToTray() const { return enable_minimize_to_tray_; }
-
-bool ConfigCenter::IsEnableAutostart() const { return enable_autostart_; }
-
-bool ConfigCenter::IsEnableDaemon() const { return enable_daemon_; }
-}  // namespace crossdesk
--- a/src/config_center/config_center.h
+++ b/src/config_center/config_center.h
@@ -11,8 +11,6 @@

 #include "SimpleIni.h"

-namespace crossdesk {
-
 class ConfigCenter {
 public:
  enum class LANGUAGE { CHINESE = 0, ENGLISH = 1 };
@@ -34,14 +32,10 @@ class ConfigCenter {
  int SetHardwareVideoCodec(bool hardware_video_codec);
  int SetTurn(bool enable_turn);
  int SetSrtp(bool enable_srtp);
-  int SetServerHost(const std::string& signal_server_host);
-  int SetServerPort(int signal_server_port);
-  int SetCoturnServerPort(int coturn_server_port);
+  int SetServerHost(const std::string& server_host);
+  int SetServerPort(int server_port);
  int SetCertFilePath(const std::string& cert_file_path);
  int SetSelfHosted(bool enable_self_hosted);
-  int SetMinimizeToTray(bool enable_minimize_to_tray);
-  int SetAutostart(bool enable_autostart);
-  int SetDaemon(bool enable_daemon);

  // read config

@@ -52,46 +46,36 @@ class ConfigCenter {
  bool IsHardwareVideoCodec() const;
  bool IsEnableTurn() const;
  bool IsEnableSrtp() const;
-  std::string GetSignalServerHost() const;
-  int GetSignalServerPort() const;
-  int GetCoturnServerPort() const;
+  std::string GetServerHost() const;
+  int GetServerPort() const;
  std::string GetCertFilePath() const;
  std::string GetDefaultServerHost() const;
-  int GetDefaultSignalServerPort() const;
-  int GetDefaultCoturnServerPort() const;
+  int GetDefaultServerPort() const;
  std::string GetDefaultCertFilePath() const;
  bool IsSelfHosted() const;
-  bool IsMinimizeToTray() const;
-  bool IsEnableAutostart() const;
-  bool IsEnableDaemon() const;

  int Load();
  int Save();

 private:
  std::string config_path_;
+  std::string cert_file_path_;
  CSimpleIniA ini_;
  const char* section_ = "Settings";

  LANGUAGE language_ = LANGUAGE::CHINESE;
  VIDEO_QUALITY video_quality_ = VIDEO_QUALITY::MEDIUM;
-  VIDEO_FRAME_RATE video_frame_rate_ = VIDEO_FRAME_RATE::FPS_60;
+  VIDEO_FRAME_RATE video_frame_rate_ = VIDEO_FRAME_RATE::FPS_30;
  VIDEO_ENCODE_FORMAT video_encode_format_ = VIDEO_ENCODE_FORMAT::H264;
  bool hardware_video_codec_ = false;
-  bool enable_turn_ = true;
+  bool enable_turn_ = false;
  bool enable_srtp_ = false;
-  std::string signal_server_host_ = "";
-  std::string signal_server_host_default_ = "api.crossdesk.cn";
-  int signal_server_port_ = 0;
+  std::string server_host_ = "api.crossdesk.cn";
+  int server_port_ = 9099;
+  std::string server_host_default_ = "api.crossdesk.cn";
  int server_port_default_ = 9099;
-  int coturn_server_port_ = 0;
-  int coturn_server_port_default_ = 3478;
-  std::string cert_file_path_ = "";
  std::string cert_file_path_default_ = "";
  bool enable_self_hosted_ = false;
-  bool enable_minimize_to_tray_ = false;
-  bool enable_autostart_ = false;
-  bool enable_daemon_ = false;
 };
-}  // namespace crossdesk
+
 #endif
--- a/src/device_controller/device_controller.h
+++ b/src/device_controller/device_controller.h
@@ -9,13 +9,7 @@

 #include <stdio.h>

-#include <nlohmann/json.hpp>
-#include <string>
-
 #include "display_info.h"
-using json = nlohmann::json;
-
-namespace crossdesk {

 typedef enum {
  mouse = 0,
@@ -59,7 +53,7 @@ typedef struct {
  int* bottom;
 } HostInfo;

-struct RemoteAction {
+typedef struct {
  ControlType type;
  union {
    Mouse m;
@@ -68,111 +62,7 @@ struct RemoteAction {
    bool a;
    int d;
  };
-
-  // parse
-  std::string to_json() const { return ToJson(*this); }
-
-  bool from_json(const std::string& json_str) {
-    RemoteAction temp;
-    if (!FromJson(json_str, temp)) return false;
-    *this = temp;
-    return true;
-  }
-
-  static std::string ToJson(const RemoteAction& a) {
-    json j;
-    j["type"] = a.type;
-    switch (a.type) {
-      case ControlType::mouse:
-        j["mouse"] = {
-            {"x", a.m.x}, {"y", a.m.y}, {"s", a.m.s}, {"flag", a.m.flag}};
-        break;
-      case ControlType::keyboard:
-        j["keyboard"] = {{"key_value", a.k.key_value}, {"flag", a.k.flag}};
-        break;
-      case ControlType::audio_capture:
-        j["audio_capture"] = a.a;
-        break;
-      case ControlType::display_id:
-        j["display_id"] = a.d;
-        break;
-      case ControlType::host_infomation: {
-        json displays = json::array();
-        for (size_t idx = 0; idx < a.i.display_num; idx++) {
-          displays.push_back(
-              {{"name", a.i.display_list ? a.i.display_list[idx] : ""},
-               {"left", a.i.left ? a.i.left[idx] : 0},
-               {"top", a.i.top ? a.i.top[idx] : 0},
-               {"right", a.i.right ? a.i.right[idx] : 0},
-               {"bottom", a.i.bottom ? a.i.bottom[idx] : 0}});
-        }
-
-        j["host_info"] = {{"host_name", a.i.host_name},
-                          {"display_num", a.i.display_num},
-                          {"displays", displays}};
-        break;
-      }
-    }
-    return j.dump();
-  }
-
-  static bool FromJson(const std::string& json_str, RemoteAction& out) {
-    try {
-      json j = json::parse(json_str);
-      out.type = (ControlType)j.at("type").get<int>();
-      switch (out.type) {
-        case ControlType::mouse:
-          out.m.x = j.at("mouse").at("x").get<float>();
-          out.m.y = j.at("mouse").at("y").get<float>();
-          out.m.s = j.at("mouse").at("s").get<int>();
-          out.m.flag = (MouseFlag)j.at("mouse").at("flag").get<int>();
-          break;
-        case ControlType::keyboard:
-          out.k.key_value = j.at("keyboard").at("key_value").get<size_t>();
-          out.k.flag = (KeyFlag)j.at("keyboard").at("flag").get<int>();
-          break;
-        case ControlType::audio_capture:
-          out.a = j.at("audio_capture").get<bool>();
-          break;
-        case ControlType::display_id:
-          out.d = j.at("display_id").get<int>();
-          break;
-        case ControlType::host_infomation: {
-          std::string host_name =
-              j.at("host_info").at("host_name").get<std::string>();
-          strncpy(out.i.host_name, host_name.c_str(), sizeof(out.i.host_name));
-          out.i.host_name[sizeof(out.i.host_name) - 1] = '\0';
-          out.i.host_name_size = host_name.size();
-
-          out.i.display_num = j.at("host_info").at("display_num").get<size_t>();
-          auto displays = j.at("host_info").at("displays");
-
-          out.i.display_list =
-              (char**)malloc(out.i.display_num * sizeof(char*));
-          out.i.left = (int*)malloc(out.i.display_num * sizeof(int));
-          out.i.top = (int*)malloc(out.i.display_num * sizeof(int));
-          out.i.right = (int*)malloc(out.i.display_num * sizeof(int));
-          out.i.bottom = (int*)malloc(out.i.display_num * sizeof(int));
-
-          for (size_t idx = 0; idx < out.i.display_num; idx++) {
-            std::string name = displays[idx].at("name").get<std::string>();
-            out.i.display_list[idx] = (char*)malloc(name.size() + 1);
-            strcpy(out.i.display_list[idx], name.c_str());
-            out.i.left[idx] = displays[idx].at("left").get<int>();
-            out.i.top[idx] = displays[idx].at("top").get<int>();
-            out.i.right[idx] = displays[idx].at("right").get<int>();
-            out.i.bottom[idx] = displays[idx].at("bottom").get<int>();
-          }
-          break;
-        }
-      }
-      return true;
-    } catch (const std::exception& e) {
-      printf("Failed to parse RemoteAction JSON: %s\n", e.what());
-      return false;
-    }
-  }
-};
+} RemoteAction;

 // int key_code, bool is_down
 typedef void (*OnKeyAction)(int, bool, void*);
@@ -189,5 +79,5 @@ class DeviceController {
  // virtual int Hook();
  // virtual int Unhook();
 };
-}  // namespace crossdesk
+
 #endif
--- a/src/device_controller/device_controller_factory.h
+++ b/src/device_controller/device_controller_factory.h
@@ -11,8 +11,6 @@
 #include "keyboard_capturer.h"
 #include "mouse_controller.h"

-namespace crossdesk {
-
 class DeviceControllerFactory {
 public:
  enum Device { Mouse = 0, Keyboard };
@@ -32,5 +30,5 @@ class DeviceControllerFactory {
    }
  }
 };
-}  // namespace crossdesk
+
 #endif
--- a/src/device_controller/keyboard/linux/keyboard_capturer.cpp
+++ b/src/device_controller/keyboard/linux/keyboard_capturer.cpp
@@ -3,8 +3,6 @@
 #include "keyboard_converter.h"
 #include "rd_log.h"

-namespace crossdesk {
-
 static OnKeyAction g_on_key_action = nullptr;
 static void* g_user_ptr = nullptr;

@@ -51,16 +49,7 @@ int KeyboardCapturer::Hook(OnKeyAction on_key_action, void* user_ptr) {
 }

 int KeyboardCapturer::Unhook() {
-  g_on_key_action = nullptr;
-  g_user_ptr = nullptr;
-
  running_ = false;
-
-  if (display_) {
-    XSelectInput(display_, DefaultRootWindow(display_), 0);
-    XFlush(display_);
-  }
-
  return 0;
 }

@@ -78,4 +67,3 @@ int KeyboardCapturer::SendKeyboardCommand(int key_code, bool is_down) {
  }
  return 0;
 }
-}  // namespace crossdesk
--- a/src/device_controller/keyboard/linux/keyboard_capturer.h
+++ b/src/device_controller/keyboard/linux/keyboard_capturer.h
@@ -13,22 +13,20 @@

 #include "device_controller.h"

-namespace crossdesk {
-
 class KeyboardCapturer : public DeviceController {
 public:
  KeyboardCapturer();
  virtual ~KeyboardCapturer();

 public:
-  virtual int Hook(OnKeyAction on_key_action, void* user_ptr);
+  virtual int Hook(OnKeyAction on_key_action, void *user_ptr);
  virtual int Unhook();
  virtual int SendKeyboardCommand(int key_code, bool is_down);

 private:
-  Display* display_;
+  Display *display_;
  Window root_;
  bool running_;
 };
-}  // namespace crossdesk
+
 #endif
--- a/src/device_controller/keyboard/mac/keyboard_capturer.cpp
+++ b/src/device_controller/keyboard/mac/keyboard_capturer.cpp
@@ -3,18 +3,12 @@
 #include "keyboard_converter.h"
 #include "rd_log.h"

-namespace crossdesk {
-
 static OnKeyAction g_on_key_action = nullptr;
-static void* g_user_ptr = nullptr;
+static void *g_user_ptr = nullptr;

 CGEventRef eventCallback(CGEventTapProxy proxy, CGEventType type,
-                         CGEventRef event, void* userInfo) {
-  if (!g_on_key_action) {
-    return event;
-  }
-
-  KeyboardCapturer* keyboard_capturer = (KeyboardCapturer*)userInfo;
+                         CGEventRef event, void *userInfo) {
+  KeyboardCapturer *keyboard_capturer = (KeyboardCapturer *)userInfo;
  if (!keyboard_capturer) {
    LOG_ERROR("keyboard_capturer is nullptr");
    return event;
@@ -97,7 +91,7 @@ KeyboardCapturer::KeyboardCapturer() {}

 KeyboardCapturer::~KeyboardCapturer() {}

-int KeyboardCapturer::Hook(OnKeyAction on_key_action, void* user_ptr) {
+int KeyboardCapturer::Hook(OnKeyAction on_key_action, void *user_ptr) {
  g_on_key_action = on_key_action;
  g_user_ptr = user_ptr;

@@ -124,25 +118,8 @@ int KeyboardCapturer::Hook(OnKeyAction on_key_action, void* user_ptr) {
 }

 int KeyboardCapturer::Unhook() {
-  g_on_key_action = nullptr;
-  g_user_ptr = nullptr;
-
-  if (event_tap_) {
-    CGEventTapEnable(event_tap_, false);
-  }
-
-  if (run_loop_source_) {
-    CFRunLoopRemoveSource(CFRunLoopGetCurrent(), run_loop_source_,
-                          kCFRunLoopCommonModes);
  CFRelease(run_loop_source_);
-    run_loop_source_ = nullptr;
-  }
-
-  if (event_tap_) {
  CFRelease(event_tap_);
-    event_tap_ = nullptr;
-  }
-
  return 0;
 }

@@ -188,4 +165,3 @@ int KeyboardCapturer::SendKeyboardCommand(int key_code, bool is_down) {

  return 0;
 }
-}  // namespace crossdesk
--- a/src/device_controller/keyboard/mac/keyboard_capturer.h
+++ b/src/device_controller/keyboard/mac/keyboard_capturer.h
@@ -11,15 +11,13 @@

 #include "device_controller.h"

-namespace crossdesk {
-
 class KeyboardCapturer : public DeviceController {
 public:
  KeyboardCapturer();
  virtual ~KeyboardCapturer();

 public:
-  virtual int Hook(OnKeyAction on_key_action, void* user_ptr);
+  virtual int Hook(OnKeyAction on_key_action, void *user_ptr);
  virtual int Unhook();
  virtual int SendKeyboardCommand(int key_code, bool is_down);

@@ -35,5 +33,5 @@ class KeyboardCapturer : public DeviceController {
  bool command_flag_ = false;
  int fn_key_code_ = 0x3F;
 };
-}  // namespace crossdesk
+
 #endif
--- a/src/device_controller/keyboard/windows/keyboard_capturer.cpp
+++ b/src/device_controller/keyboard/windows/keyboard_capturer.cpp
@@ -2,8 +2,6 @@

 #include "rd_log.h"

-namespace crossdesk {
-
 static OnKeyAction g_on_key_action = nullptr;
 static void* g_user_ptr = nullptr;

@@ -39,12 +37,7 @@ int KeyboardCapturer::Hook(OnKeyAction on_key_action, void* user_ptr) {
 }

 int KeyboardCapturer::Unhook() {
-  if (keyboard_hook_) {
-    g_on_key_action = nullptr;
-    g_user_ptr = nullptr;
  UnhookWindowsHookEx(keyboard_hook_);
-    keyboard_hook_ = nullptr;
-  }
  return 0;
 }

@@ -61,4 +54,3 @@ int KeyboardCapturer::SendKeyboardCommand(int key_code, bool is_down) {

  return 0;
 }
-}  // namespace crossdesk
--- a/src/device_controller/keyboard/windows/keyboard_capturer.h
+++ b/src/device_controller/keyboard/windows/keyboard_capturer.h
@@ -11,21 +11,18 @@

 #include "device_controller.h"

-namespace crossdesk {
-
 class KeyboardCapturer : public DeviceController {
 public:
  KeyboardCapturer();
  virtual ~KeyboardCapturer();

 public:
-  virtual int Hook(OnKeyAction on_key_action, void* user_ptr);
+  virtual int Hook(OnKeyAction on_key_action, void *user_ptr);
  virtual int Unhook();
  virtual int SendKeyboardCommand(int key_code, bool is_down);

 private:
  HHOOK keyboard_hook_ = nullptr;
 };
-}  // namespace crossdesk

 #endif
--- a/src/device_controller/keyboard_converter.h
+++ b/src/device_controller/keyboard_converter.h
@@ -9,8 +9,6 @@

 #include <map>

-namespace crossdesk {
-
 // Windows vkCode to macOS CGKeyCode (104 keys)
 std::map<int, int> vkCodeToCGKeyCode = {
    // A-Z
@@ -738,5 +736,5 @@ std::map<int, int> x11KeySymToCgKeyCode = {
    {0xFFEB, 0x37},  // Left Command
    {0xFFEC, 0x36},  // Right Command
 };
-}  // namespace crossdesk
+
 #endif
--- a/src/device_controller/mouse/linux/mouse_controller.cpp
+++ b/src/device_controller/mouse/linux/mouse_controller.cpp
@@ -4,8 +4,6 @@

 #include "rd_log.h"

-namespace crossdesk {
-
 MouseController::MouseController() {}

 MouseController::~MouseController() { Destroy(); }
@@ -124,4 +122,3 @@ void MouseController::SimulateMouseWheel(int direction_button, int count) {
  }
  XFlush(display_);
 }
-}  // namespace crossdesk
--- a/src/device_controller/mouse/linux/mouse_controller.h
+++ b/src/device_controller/mouse/linux/mouse_controller.h
@@ -15,8 +15,6 @@

 #include "device_controller.h"

-namespace crossdesk {
-
 class MouseController : public DeviceController {
 public:
  MouseController();
@@ -39,5 +37,5 @@ class MouseController : public DeviceController {
  int screen_width_ = 0;
  int screen_height_ = 0;
 };
-}  // namespace crossdesk
+
 #endif
--- a/src/device_controller/mouse/mac/mouse_controller.cpp
+++ b/src/device_controller/mouse/mac/mouse_controller.cpp
@@ -4,8 +4,6 @@

 #include "rd_log.h"

-namespace crossdesk {
-
 MouseController::MouseController() {}

 MouseController::~MouseController() {}
@@ -101,4 +99,3 @@ int MouseController::SendMouseCommand(RemoteAction remote_action,

  return 0;
 }
-}  // namespace crossdesk
--- a/src/device_controller/mouse/mac/mouse_controller.h
+++ b/src/device_controller/mouse/mac/mouse_controller.h
@@ -11,8 +11,6 @@

 #include "device_controller.h"

-namespace crossdesk {
-
 class MouseController : public DeviceController {
 public:
  MouseController();
@@ -28,5 +26,5 @@ class MouseController : public DeviceController {
  bool left_dragging_ = false;
  bool right_dragging_ = false;
 };
-}  // namespace crossdesk
+
 #endif
--- a/src/device_controller/mouse/windows/mouse_controller.cpp
+++ b/src/device_controller/mouse/windows/mouse_controller.cpp
@@ -2,8 +2,6 @@

 #include "rd_log.h"

-namespace crossdesk {
-
 MouseController::MouseController() {}

 MouseController::~MouseController() {}
@@ -72,4 +70,3 @@ int MouseController::SendMouseCommand(RemoteAction remote_action,

  return 0;
 }
-}  // namespace crossdesk
--- a/src/device_controller/mouse/windows/mouse_controller.h
+++ b/src/device_controller/mouse/windows/mouse_controller.h
@@ -11,8 +11,6 @@

 #include "device_controller.h"

-namespace crossdesk {
-
 class MouseController : public DeviceController {
 public:
  MouseController();
@@ -26,5 +24,5 @@ class MouseController : public DeviceController {
 private:
  std::vector<DisplayInfo> display_info_list_;
 };
-}  // namespace crossdesk
+
 #endif
--- a/src/gui/assets/fonts/OPPOSans_Regular.h
+++ b/src/gui/assets/fonts/OPPOSans_Regular.h
--- a/src/gui/assets/layouts/layout.h
+++ b/src/gui/assets/layouts/layout.h
@@ -7,81 +7,50 @@
 #ifndef _LAYOUT_STYLE_H_
 #define _LAYOUT_STYLE_H_

-#include "render.h"
+#define MENU_WINDOW_WIDTH_CN 300
+#define MENU_WINDOW_HEIGHT_CN 280
+#define LOCAL_WINDOW_WIDTH_CN 300
+#define LOCAL_WINDOW_HEIGHT_CN 280
+#define REMOTE_WINDOW_WIDTH_CN 300
+#define REMOTE_WINDOW_HEIGHT_CN 280
+#define MENU_WINDOW_WIDTH_EN 190
+#define MENU_WINDOW_HEIGHT_EN 245
+#define IPUT_WINDOW_WIDTH 160
+#define INPUT_WINDOW_PADDING_CN 66
+#define INPUT_WINDOW_PADDING_EN 96
+#define SETTINGS_WINDOW_WIDTH_CN 202
+#define SETTINGS_WINDOW_WIDTH_EN 248
+#define SETTINGS_WINDOW_HEIGHT_CN 315
+#define SETTINGS_WINDOW_HEIGHT_EN 315
+#define SELF_HOSTED_SERVER_CONFIG_WINDOW_WIDTH_CN 228
+#define SELF_HOSTED_SERVER_CONFIG_WINDOW_WIDTH_EN 275
+#define SELF_HOSTED_SERVER_CONFIG_WINDOW_HEIGHT_CN 165
+#define SELF_HOSTED_SERVER_CONFIG_WINDOW_HEIGHT_EN 165
+#define LANGUAGE_SELECT_WINDOW_PADDING_CN 120
+#define LANGUAGE_SELECT_WINDOW_PADDING_EN 167
+#define VIDEO_QUALITY_SELECT_WINDOW_PADDING_CN 120
+#define VIDEO_QUALITY_SELECT_WINDOW_PADDING_EN 167
+#define VIDEO_FRAME_RATE_SELECT_WINDOW_PADDING_CN 120
+#define VIDEO_FRAME_RATE_SELECT_WINDOW_PADDING_EN 167
+#define VIDEO_ENCODE_FORMAT_SELECT_WINDOW_PADDING_CN 120
+#define VIDEO_ENCODE_FORMAT_SELECT_WINDOW_PADDING_EN 167
+#define ENABLE_HARDWARE_VIDEO_CODEC_CHECKBOX_PADDING_CN 171
+#define ENABLE_HARDWARE_VIDEO_CODEC_CHECKBOX_PADDING_EN 218
+#define ENABLE_TURN_CHECKBOX_PADDING_CN 171
+#define ENABLE_TURN_CHECKBOX_PADDING_EN 218
+#define ENABLE_SRTP_CHECKBOX_PADDING_CN 171
+#define ENABLE_SRTP_CHECKBOX_PADDING_EN 218
+#define ENABLE_SELF_HOSTED_SERVER_CHECKBOX_PADDING_CN 171
+#define ENABLE_SELF_HOSTED_SERVER_CHECKBOX_PADDING_EN 218
+#define SELF_HOSTED_SERVER_HOST_INPUT_BOX_PADDING_CN 90
+#define SELF_HOSTED_SERVER_HOST_INPUT_BOX_PADDING_EN 137
+#define SELF_HOSTED_SERVER_PORT_INPUT_BOX_PADDING_CN 90
+#define SELF_HOSTED_SERVER_PORT_INPUT_BOX_PADDING_EN 137
+#define SETTINGS_SELECT_WINDOW_WIDTH 73
+#define SELF_HOSTED_SERVER_INPUT_WINDOW_WIDTH 130
+#define SETTINGS_OK_BUTTON_PADDING_CN 65
+#define SETTINGS_OK_BUTTON_PADDING_EN 83
+#define SELF_HOSTED_SERVER_CONFIG_OK_BUTTON_PADDING_CN 78
+#define SELF_HOSTED_SERVER_CONFIG_OK_BUTTON_PADDING_EN 91

-#define MENU_WINDOW_WIDTH_CN 300 * dpi_scale_
-#define MENU_WINDOW_HEIGHT_CN 280 * dpi_scale_
-#define LOCAL_WINDOW_WIDTH_CN 300 * dpi_scale_
-#define LOCAL_WINDOW_HEIGHT_CN 280 * dpi_scale_
-#define REMOTE_WINDOW_WIDTH_CN 300 * dpi_scale_
-#define REMOTE_WINDOW_HEIGHT_CN 280 * dpi_scale_
-#define MENU_WINDOW_WIDTH_EN 190 * dpi_scale_
-#define MENU_WINDOW_HEIGHT_EN 245 * dpi_scale_
-#define IPUT_WINDOW_WIDTH 160 * dpi_scale_
-#define INPUT_WINDOW_PADDING_CN 66 * dpi_scale_
-#define INPUT_WINDOW_PADDING_EN 96 * dpi_scale_
-#define SETTINGS_WINDOW_WIDTH_CN 202 * dpi_scale_
-#define SETTINGS_WINDOW_WIDTH_EN 248 * dpi_scale_
-#if USE_CUDA
-#if _WIN32
-#define SETTINGS_WINDOW_HEIGHT_CN 405 * dpi_scale_
-#define SETTINGS_WINDOW_HEIGHT_EN 405 * dpi_scale_
-#else
-#define SETTINGS_WINDOW_HEIGHT_CN 375 * dpi_scale_
-#define SETTINGS_WINDOW_HEIGHT_EN 375 * dpi_scale_
-#endif
-#else
-#if _WIN32
-#define SETTINGS_WINDOW_HEIGHT_CN 375 * dpi_scale_
-#define SETTINGS_WINDOW_HEIGHT_EN 375 * dpi_scale_
-#else
-#define SETTINGS_WINDOW_HEIGHT_CN 345 * dpi_scale_
-#define SETTINGS_WINDOW_HEIGHT_EN 345 * dpi_scale_
-#endif
-#endif
-#define SELF_HOSTED_SERVER_CONFIG_WINDOW_WIDTH_CN 228 * dpi_scale_
-#define SELF_HOSTED_SERVER_CONFIG_WINDOW_WIDTH_EN 275 * dpi_scale_
-#define SELF_HOSTED_SERVER_CONFIG_WINDOW_HEIGHT_CN 195 * dpi_scale_
-#define SELF_HOSTED_SERVER_CONFIG_WINDOW_HEIGHT_EN 195 * dpi_scale_
-#define LANGUAGE_SELECT_WINDOW_PADDING_CN 120 * dpi_scale_
-#define LANGUAGE_SELECT_WINDOW_PADDING_EN 167 * dpi_scale_
-#define VIDEO_QUALITY_SELECT_WINDOW_PADDING_CN 120 * dpi_scale_
-#define VIDEO_QUALITY_SELECT_WINDOW_PADDING_EN 167 * dpi_scale_
-#define VIDEO_FRAME_RATE_SELECT_WINDOW_PADDING_CN 120 * dpi_scale_
-#define VIDEO_FRAME_RATE_SELECT_WINDOW_PADDING_EN 167 * dpi_scale_
-#define VIDEO_ENCODE_FORMAT_SELECT_WINDOW_PADDING_CN 120 * dpi_scale_
-#define VIDEO_ENCODE_FORMAT_SELECT_WINDOW_PADDING_EN 167 * dpi_scale_
-#define ENABLE_HARDWARE_VIDEO_CODEC_CHECKBOX_PADDING_CN 171 * dpi_scale_
-#define ENABLE_HARDWARE_VIDEO_CODEC_CHECKBOX_PADDING_EN 218 * dpi_scale_
-#define ENABLE_TURN_CHECKBOX_PADDING_CN 171 * dpi_scale_
-#define ENABLE_TURN_CHECKBOX_PADDING_EN 218 * dpi_scale_
-#define ENABLE_SRTP_CHECKBOX_PADDING_CN 171 * dpi_scale_
-#define ENABLE_SRTP_CHECKBOX_PADDING_EN 218 * dpi_scale_
-#define ENABLE_SELF_HOSTED_SERVER_CHECKBOX_PADDING_CN 171 * dpi_scale_
-#define ENABLE_SELF_HOSTED_SERVER_CHECKBOX_PADDING_EN 218 * dpi_scale_
-#define ENABLE_AUTOSTART_PADDING_CN 171 * dpi_scale_
-#define ENABLE_AUTOSTART_PADDING_EN 218 * dpi_scale_
-#define ENABLE_DAEMON_PADDING_CN 171 * dpi_scale_
-#define ENABLE_DAEMON_PADDING_EN 218 * dpi_scale_
-#define ENABLE_MINIZE_TO_TRAY_PADDING_CN 171 * dpi_scale_
-#define ENABLE_MINIZE_TO_TRAY_PADDING_EN 218 * dpi_scale_
-#define SELF_HOSTED_SERVER_HOST_INPUT_BOX_PADDING_CN 90 * dpi_scale_
-#define SELF_HOSTED_SERVER_HOST_INPUT_BOX_PADDING_EN 137 * dpi_scale_
-#define SELF_HOSTED_SERVER_PORT_INPUT_BOX_PADDING_CN 90 * dpi_scale_
-#define SELF_HOSTED_SERVER_PORT_INPUT_BOX_PADDING_EN 137 * dpi_scale_
-#define SETTINGS_SELECT_WINDOW_WIDTH 73 * dpi_scale_
-#define SELF_HOSTED_SERVER_INPUT_WINDOW_WIDTH 130 * dpi_scale_
-#define SETTINGS_OK_BUTTON_PADDING_CN 65 * dpi_scale_
-#define SETTINGS_OK_BUTTON_PADDING_EN 83 * dpi_scale_
-#define SELF_HOSTED_SERVER_CONFIG_OK_BUTTON_PADDING_CN 78 * dpi_scale_
-#define SELF_HOSTED_SERVER_CONFIG_OK_BUTTON_PADDING_EN 91 * dpi_scale_
-#define UPDATE_NOTIFICATION_OK_BUTTON_PADDING_CN 162 * dpi_scale_
-#define UPDATE_NOTIFICATION_OK_BUTTON_PADDING_EN 146 * dpi_scale_
-#define UPDATE_NOTIFICATION_RESERVED_HEIGHT 120 * dpi_scale_
-#define REQUEST_PERMISSION_WINDOW_WIDTH_CN 130 * dpi_scale_
-#define REQUEST_PERMISSION_WINDOW_HEIGHT_CN 125 * dpi_scale_
-#define REQUEST_PERMISSION_WINDOW_WIDTH_EN 260 * dpi_scale_
-#define REQUEST_PERMISSION_WINDOW_HEIGHT_EN 125 * dpi_scale_
-#define REQUEST_PERMISSION_WINDOW_CHECKBOX_PADDING_CN 90 * dpi_scale_
-#define REQUEST_PERMISSION_WINDOW_CHECKBOX_PADDING_EN 210 * dpi_scale_
 #endif
--- a/src/gui/assets/layouts/layout_relative.h
+++ b/src/gui/assets/layouts/layout_relative.h
@@ -1,91 +0,0 @@
-/*
- * @Author: DI JUNKUN
- * @Date: 2024-06-14
- * Copyright (c) 2024 by DI JUNKUN, All Rights Reserved.
- */
-
-#ifndef _LAYOUT_STYLE_H_
-#define _LAYOUT_STYLE_H_
-
-#include "render.h"
-
-#define TITLE_BAR_HEIGHT 0.0625f
-#define TITLE_BAR_BUTTON_WIDTH 0.0625f
-#define TITLE_BAR_BUTTON_HEIGHT 0.0625f
-#define STATUS_BAR_HEIGHT 0.05f
-#define MENU_WINDOW_WIDTH_CN 300
-#define MENU_WINDOW_HEIGHT_CN 280
-#define LOCAL_WINDOW_WIDTH_CN 300
-#define LOCAL_WINDOW_HEIGHT_CN 280
-#define REMOTE_WINDOW_WIDTH_CN 300
-#define REMOTE_WINDOW_HEIGHT_CN 280
-#define MENU_WINDOW_WIDTH_EN 190
-#define MENU_WINDOW_HEIGHT_EN 245
-#define IPUT_WINDOW_WIDTH 160
-#define INPUT_WINDOW_PADDING_CN 66
-#define INPUT_WINDOW_PADDING_EN 96
-#define SETTINGS_WINDOW_WIDTH_CN 202
-#define SETTINGS_WINDOW_WIDTH_EN 248
-#if USE_CUDA
-#if _WIN32
-#define SETTINGS_WINDOW_HEIGHT_CN 405
-#define SETTINGS_WINDOW_HEIGHT_EN 405
-#else
-#define SETTINGS_WINDOW_HEIGHT_CN 375
-#define SETTINGS_WINDOW_HEIGHT_EN 375
-#endif
-#else
-#if _WIN32
-#define SETTINGS_WINDOW_HEIGHT_CN 375
-#define SETTINGS_WINDOW_HEIGHT_EN 375
-#else
-#define SETTINGS_WINDOW_HEIGHT_CN 345
-#define SETTINGS_WINDOW_HEIGHT_EN 345
-#endif
-#endif
-#define SELF_HOSTED_SERVER_CONFIG_WINDOW_WIDTH_CN 228
-#define SELF_HOSTED_SERVER_CONFIG_WINDOW_WIDTH_EN 275
-#define SELF_HOSTED_SERVER_CONFIG_WINDOW_HEIGHT_CN 195
-#define SELF_HOSTED_SERVER_CONFIG_WINDOW_HEIGHT_EN 195
-#define LANGUAGE_SELECT_WINDOW_PADDING_CN 120
-#define LANGUAGE_SELECT_WINDOW_PADDING_EN 167
-#define VIDEO_QUALITY_SELECT_WINDOW_PADDING_CN 120
-#define VIDEO_QUALITY_SELECT_WINDOW_PADDING_EN 167
-#define VIDEO_FRAME_RATE_SELECT_WINDOW_PADDING_CN 120
-#define VIDEO_FRAME_RATE_SELECT_WINDOW_PADDING_EN 167
-#define VIDEO_ENCODE_FORMAT_SELECT_WINDOW_PADDING_CN 120
-#define VIDEO_ENCODE_FORMAT_SELECT_WINDOW_PADDING_EN 167
-#define ENABLE_HARDWARE_VIDEO_CODEC_CHECKBOX_PADDING_CN 171
-#define ENABLE_HARDWARE_VIDEO_CODEC_CHECKBOX_PADDING_EN 218
-#define ENABLE_TURN_CHECKBOX_PADDING_CN 171
-#define ENABLE_TURN_CHECKBOX_PADDING_EN 218
-#define ENABLE_SRTP_CHECKBOX_PADDING_CN 171
-#define ENABLE_SRTP_CHECKBOX_PADDING_EN 218
-#define ENABLE_SELF_HOSTED_SERVER_CHECKBOX_PADDING_CN 171
-#define ENABLE_SELF_HOSTED_SERVER_CHECKBOX_PADDING_EN 218
-#define ENABLE_AUTOSTART_PADDING_CN 171
-#define ENABLE_AUTOSTART_PADDING_EN 218
-#define ENABLE_DAEMON_PADDING_CN 171
-#define ENABLE_DAEMON_PADDING_EN 218
-#define ENABLE_MINIZE_TO_TRAY_PADDING_CN 171
-#define ENABLE_MINIZE_TO_TRAY_PADDING_EN 218
-#define SELF_HOSTED_SERVER_HOST_INPUT_BOX_PADDING_CN 90
-#define SELF_HOSTED_SERVER_HOST_INPUT_BOX_PADDING_EN 137
-#define SELF_HOSTED_SERVER_PORT_INPUT_BOX_PADDING_CN 90
-#define SELF_HOSTED_SERVER_PORT_INPUT_BOX_PADDING_EN 137
-#define SETTINGS_SELECT_WINDOW_WIDTH 73
-#define SELF_HOSTED_SERVER_INPUT_WINDOW_WIDTH 130
-#define SETTINGS_OK_BUTTON_PADDING_CN 65
-#define SETTINGS_OK_BUTTON_PADDING_EN 83
-#define SELF_HOSTED_SERVER_CONFIG_OK_BUTTON_PADDING_CN 78
-#define SELF_HOSTED_SERVER_CONFIG_OK_BUTTON_PADDING_EN 91
-#define UPDATE_NOTIFICATION_OK_BUTTON_PADDING_CN 162
-#define UPDATE_NOTIFICATION_OK_BUTTON_PADDING_EN 146
-#define UPDATE_NOTIFICATION_RESERVED_HEIGHT 120
-#define REQUEST_PERMISSION_WINDOW_WIDTH_CN 130
-#define REQUEST_PERMISSION_WINDOW_HEIGHT_CN 125
-#define REQUEST_PERMISSION_WINDOW_WIDTH_EN 260
-#define REQUEST_PERMISSION_WINDOW_HEIGHT_EN 125
-#define REQUEST_PERMISSION_WINDOW_CHECKBOX_PADDING_CN 90
-#define REQUEST_PERMISSION_WINDOW_CHECKBOX_PADDING_EN 210
-#endif
--- a/src/gui/assets/localization/localization.h
+++ b/src/gui/assets/localization/localization.h
@@ -8,13 +8,6 @@

 #include <string>
 #include <vector>
-
-#if _WIN32
-#include <Windows.h>
-#endif
-
-namespace crossdesk {
-
 namespace localization {

 static std::vector<std::string> local_desktop = {
@@ -109,9 +102,7 @@ static std::vector<std::string> self_hosted_server_settings = {
 static std::vector<std::string> self_hosted_server_address = {
    reinterpret_cast<const char*>(u8"服务器地址:"), "Server Address:"};
 static std::vector<std::string> self_hosted_server_port = {
-    reinterpret_cast<const char*>(u8"信令服务端口:"), "Signal Service Port:"};
-static std::vector<std::string> self_hosted_server_coturn_server_port = {
-    reinterpret_cast<const char*>(u8"中继服务端口:"), "Relay Service Port:"};
+    reinterpret_cast<const char*>(u8"服务器端口:"), "Server Port:"};
 static std::vector<std::string> self_hosted_server_certificate_path = {
    reinterpret_cast<const char*>(u8"证书文件路径:"), "Certificate File Path:"};
 static std::vector<std::string> select_a_file = {
@@ -158,49 +149,12 @@ static std::vector<std::string> no_such_id = {

 static std::vector<std::string> about = {
    reinterpret_cast<const char*>(u8"关于"), "About"};
-static std::vector<std::string> notification = {
-    reinterpret_cast<const char*>(u8"通知"), "Notification"};
-static std::vector<std::string> new_version_available = {
-    reinterpret_cast<const char*>(u8"新版本可用"), "New Version Available"};
 static std::vector<std::string> version = {
    reinterpret_cast<const char*>(u8"版本"), "Version"};
-static std::vector<std::string> release_date = {
-    reinterpret_cast<const char*>(u8"发布日期: "), "Release Date: "};
-static std::vector<std::string> access_website = {
-    reinterpret_cast<const char*>(u8"访问官网: "), "Access Website: "};
-static std::vector<std::string> update = {
-    reinterpret_cast<const char*>(u8"更新"), "Update"};

 static std::vector<std::string> confirm_delete_connection = {
    reinterpret_cast<const char*>(u8"确认删除此连接"),
    "Confirm to delete this connection"};
-
-static std::vector<std::string> enable_autostart = {
-    reinterpret_cast<const char*>(u8"开机自启:"), "Auto Start:"};
-static std::vector<std::string> enable_daemon = {
-    reinterpret_cast<const char*>(u8"启用守护进程:"), "Enable Daemon:"};
-static std::vector<std::string> takes_effect_after_restart = {
-    reinterpret_cast<const char*>(u8"重启后生效"),
-    "Takes effect after restart"};
-#if _WIN32
-static std::vector<std::string> minimize_to_tray = {
-    reinterpret_cast<const char*>(u8"退出时最小化到系统托盘:"),
-    "Minimize to system tray when exit:"};
-static std::vector<LPCWSTR> exit_program = {L"退出", L"Exit"};
-#endif
-#ifdef __APPLE__
-static std::vector<std::string> request_permissions = {
-    reinterpret_cast<const char*>(u8"权限请求"), "Request Permissions"};
-static std::vector<std::string> screen_recording_permission = {
-    reinterpret_cast<const char*>(u8"屏幕录制权限"),
-    "Screen Recording Permission"};
-static std::vector<std::string> accessibility_permission = {
-    reinterpret_cast<const char*>(u8"辅助功能权限"),
-    "Accessibility Permission"};
-static std::vector<std::string> permission_required_message = {
-    reinterpret_cast<const char*>(u8"该应用需要授权以下权限:"),
-    "The application requires the following permissions:"};
-#endif
 }  // namespace localization
-}  // namespace crossdesk
+
 #endif
--- a/src/gui/panels/local_peer_panel.cpp
+++ b/src/gui/panels/local_peer_panel.cpp
@@ -1,34 +1,25 @@
 #include <random>

-#include "layout_relative.h"
+#include "layout.h"
 #include "localization.h"
 #include "rd_log.h"
 #include "render.h"

-namespace crossdesk {
-
 int Render::LocalWindow() {
-  ImGuiIO& io = ImGui::GetIO();
-  float local_window_width = io.DisplaySize.x * 0.5f;
-  float local_window_height =
-      io.DisplaySize.y * (1 - TITLE_BAR_HEIGHT - STATUS_BAR_HEIGHT);
-  float local_window_button_width = io.DisplaySize.x * 0.046f;
-  float local_window_button_height = io.DisplaySize.y * 0.075f;
-
-  ImGui::SetNextWindowPos(ImVec2(0.0f, io.DisplaySize.y * TITLE_BAR_HEIGHT),
-                          ImGuiCond_Always);
+  ImGui::SetNextWindowPos(ImVec2(-1.0f, title_bar_height_), ImGuiCond_Always);
  ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 3.0f);

-  ImGui::PushStyleColor(ImGuiCol_ChildBg, ImVec4(0, 0, 0, 0));
+  ImGui::PushStyleColor(ImGuiCol_ChildBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
  ImGui::BeginChild("LocalDesktopWindow",
-                    ImVec2(local_window_width, local_window_height),
+                    ImVec2(local_window_width_, local_window_height_),
                    ImGuiChildFlags_None,
-                    ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove |
+                    ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse |
+                        ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoTitleBar |
                        ImGuiWindowFlags_NoBringToFrontOnFocus);
  ImGui::PopStyleColor();

-  ImGui::SetCursorPos(
-      ImVec2(io.DisplaySize.x * 0.045f, io.DisplaySize.y * 0.02f));
+  ImGui::SetCursorPosY(ImGui::GetCursorPosY() + main_window_text_y_padding_);
+  ImGui::Indent(main_child_window_x_padding_);

  ImGui::TextColored(
      ImVec4(0.0f, 0.0f, 0.0f, 0.5f), "%s",
@@ -37,16 +28,18 @@ int Render::LocalWindow() {
  ImGui::Spacing();
  {
    ImGui::SetNextWindowPos(
-        ImVec2(io.DisplaySize.x * 0.045f, io.DisplaySize.y * 0.15f),
+        ImVec2(main_child_window_x_padding_,
+               title_bar_height_ + main_child_window_y_padding_),
        ImGuiCond_Always);
    ImGui::PushStyleColor(ImGuiCol_ChildBg, ImVec4(239.0f / 255, 240.0f / 255,
                                                   242.0f / 255, 1.0f));
    ImGui::PushStyleVar(ImGuiStyleVar_ChildRounding, 10.0f);
    ImGui::BeginChild(
-        "LocalDesktopPanel",
-        ImVec2(local_window_width * 0.8f, local_window_height * 0.43f),
+        "LocalDesktopWindow_1",
+        ImVec2(local_child_window_width_, local_child_window_height_),
        ImGuiChildFlags_Border,
-        ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove |
+        ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse |
+            ImGuiWindowFlags_NoTitleBar |
            ImGuiWindowFlags_NoBringToFrontOnFocus);
    ImGui::PopStyleVar();
    ImGui::PopStyleColor();
@@ -57,7 +50,7 @@ int Render::LocalWindow() {

      ImGui::Spacing();

-      ImGui::SetNextItemWidth(io.DisplaySize.x * 0.25f);
+      ImGui::SetNextItemWidth(IPUT_WINDOW_WIDTH);
      ImGui::SetWindowFontScale(1.0f);
      ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 1.0f);

@@ -81,8 +74,7 @@ int Render::LocalWindow() {
      ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(0, 0, 0, 0));
      ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImVec4(0, 0, 0, 0));
      ImGui::SetWindowFontScale(0.5f);
-      if (ImGui::Button(ICON_FA_COPY, ImVec2(local_window_button_width,
-                                             local_window_button_height))) {
+      if (ImGui::Button(ICON_FA_COPY, ImVec2(22, 38))) {
        local_id_copied_ = true;
        ImGui::SetClipboardText(client_id_);
        copy_start_time_ = ImGui::GetTime();
@@ -92,10 +84,17 @@ int Render::LocalWindow() {

      double time_duration = ImGui::GetTime() - copy_start_time_;
      if (local_id_copied_ && time_duration < 1.0f) {
+        const ImGuiViewport* viewport = ImGui::GetMainViewport();
        ImGui::SetNextWindowPos(
-            ImVec2(io.DisplaySize.x * 0.33f, io.DisplaySize.y * 0.33f));
+            ImVec2((viewport->WorkSize.x - viewport->WorkPos.x -
+                    notification_window_width_) /
+                       2,
+                   (viewport->WorkSize.y - viewport->WorkPos.y -
+                    notification_window_height_) /
+                       2));
+
        ImGui::SetNextWindowSize(
-            ImVec2(io.DisplaySize.x * 0.33f, io.DisplaySize.y * 0.33f));
+            ImVec2(notification_window_width_, notification_window_height_));
        ImGui::PushStyleColor(
            ImGuiCol_WindowBg,
            ImVec4(1.0f, 1.0f, 1.0f, 1.0f - (float)time_duration));
@@ -114,7 +113,7 @@ int Render::LocalWindow() {
            [localization_language_index_];
        auto text_width = ImGui::CalcTextSize(text.c_str()).x;
        ImGui::SetCursorPosX((window_width - text_width) * 0.5f);
-        ImGui::SetCursorPosY(window_height * 0.4f);
+        ImGui::SetCursorPosY(window_height * 0.5f);
        ImGui::PushStyleColor(ImGuiCol_Text,
                              ImVec4(0, 0, 0, 1.0f - (float)time_duration));
        ImGui::Text("%s", text.c_str());
@@ -133,7 +132,7 @@ int Render::LocalWindow() {
                  localization::password[localization_language_index_].c_str());
      ImGui::SetWindowFontScale(1.0f);

-      ImGui::SetNextItemWidth(io.DisplaySize.x * 0.25f);
+      ImGui::SetNextItemWidth(IPUT_WINDOW_WIDTH);
      ImGui::Spacing();

      ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 1.0f);
@@ -155,34 +154,51 @@ int Render::LocalWindow() {
      ImGui::SetWindowFontScale(0.5f);
      auto l_x = ImGui::GetCursorScreenPos().x;
      auto l_y = ImGui::GetCursorScreenPos().y;
-      if (ImGui::Button(
-              show_password_ ? ICON_FA_EYE : ICON_FA_EYE_SLASH,
-              ImVec2(local_window_button_width, local_window_button_height))) {
+      if (ImGui::Button(ICON_FA_EYE, ImVec2(22, 38))) {
        show_password_ = !show_password_;
      }

+      if (!show_password_) {
+        ImDrawList* draw_list = ImGui::GetWindowDrawList();
+        draw_list->AddLine(ImVec2(l_x + 3.0f, l_y + 12.5f),
+                           ImVec2(l_x + 20.3f, l_y + 26.5f),
+                           IM_COL32(239, 240, 242, 255), 2.0f);
+        draw_list->AddLine(ImVec2(l_x + 3.0f, l_y + 11.0f),
+                           ImVec2(l_x + 20.3f, l_y + 25.0f),
+                           IM_COL32(0, 0, 0, 255), 1.5f);
+      }
+
      ImGui::SameLine();

-      if (ImGui::Button(ICON_FA_PEN, ImVec2(local_window_button_width,
-                                            local_window_button_height))) {
+      if (ImGui::Button(ICON_FA_PEN, ImVec2(22, 38))) {
        show_reset_password_window_ = true;
      }
      ImGui::SetWindowFontScale(1.0f);
      ImGui::PopStyleColor(3);

      if (show_reset_password_window_) {
+        const ImGuiViewport* viewport = ImGui::GetMainViewport();
+
        ImGui::SetNextWindowPos(
-            ImVec2(io.DisplaySize.x * 0.33f, io.DisplaySize.y * 0.33f));
-        ImGui::SetNextWindowSize(
-            ImVec2(io.DisplaySize.x * 0.33f, io.DisplaySize.y * 0.33f));
+            ImVec2((viewport->WorkSize.x - viewport->WorkPos.x -
+                    connection_status_window_width_) /
+                       2,
+                   (viewport->WorkSize.y - viewport->WorkPos.y -
+                    connection_status_window_height_) /
+                       2));
+
+        ImGui::SetNextWindowSize(ImVec2(connection_status_window_width_,
+                                        connection_status_window_height_));

        ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 3.0f);
+
        ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(1.0, 1.0, 1.0, 1.0));
        ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 1.0f);
        ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 5.0f);

        ImGui::Begin("ResetPasswordWindow", nullptr,
-                     ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove |
+                     ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse |
+                         ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoTitleBar |
                         ImGuiWindowFlags_NoSavedSettings);
        ImGui::PopStyleVar(2);
        ImGui::PopStyleColor();
@@ -197,9 +213,9 @@ int Render::LocalWindow() {
        ImGui::SetCursorPosY(window_height * 0.2f);
        ImGui::Text("%s", text.c_str());

-        ImGui::SetCursorPosX(window_width * 0.33f);
+        ImGui::SetCursorPosX((window_width - IPUT_WINDOW_WIDTH / 2) * 0.5f);
        ImGui::SetCursorPosY(window_height * 0.4f);
-        ImGui::SetNextItemWidth(window_width * 0.33f);
+        ImGui::SetNextItemWidth(IPUT_WINDOW_WIDTH / 2);

        ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 1.0f);

@@ -233,41 +249,15 @@ int Render::LocalWindow() {
                    sizeof(password_saved_) - 1);
            password_saved_[sizeof(password_saved_) - 1] = '\0';

-            // if self hosted
-            if (config_center_->IsSelfHosted()) {
-              std::string self_hosted_id_str;
-              if (strlen(self_hosted_id_) > 0) {
-                const char* at_pos = strchr(self_hosted_id_, '@');
-                if (at_pos != nullptr) {
-                  self_hosted_id_str =
-                      std::string(self_hosted_id_, at_pos - self_hosted_id_);
-                } else {
-                  self_hosted_id_str = self_hosted_id_;
-                }
-              } else {
-                self_hosted_id_str = client_id_;
-              }
-
-              std::string new_self_hosted_id =
-                  self_hosted_id_str + "@" + password_saved_;
-              memset(&self_hosted_id_, 0, sizeof(self_hosted_id_));
-              strncpy(self_hosted_id_, new_self_hosted_id.c_str(),
-                      sizeof(self_hosted_id_) - 1);
-              self_hosted_id_[sizeof(self_hosted_id_) - 1] = '\0';
-
-            } else {
            std::string client_id_with_password =
                std::string(client_id_) + "@" + password_saved_;
            strncpy(client_id_with_password_, client_id_with_password.c_str(),
                    sizeof(client_id_with_password_) - 1);
            client_id_with_password_[sizeof(client_id_with_password_) - 1] =
                '\0';
-            }

            SaveSettingsIntoCacheFile();

-            memset(new_password_, 0, sizeof(new_password_));
-
            LeaveConnection(peer_, client_id_);
            DestroyPeer(&peer_);
            focus_on_input_widget_ = true;
@@ -298,4 +288,3 @@ int Render::LocalWindow() {

  return 0;
 }
-}  // namespace crossdesk
--- a/src/gui/panels/recent_connections_panel.cpp
+++ b/src/gui/panels/recent_connections_panel.cpp
@@ -1,30 +1,27 @@
-#include "layout_relative.h"
 #include "localization.h"
 #include "rd_log.h"
 #include "render.h"

-namespace crossdesk {
-
 int Render::RecentConnectionsWindow() {
-  ImGuiIO& io = ImGui::GetIO();
-  float recent_connection_window_width = io.DisplaySize.x;
-  float recent_connection_window_height =
-      io.DisplaySize.y * (0.46f - STATUS_BAR_HEIGHT);
-  ImGui::SetNextWindowPos(ImVec2(0, io.DisplaySize.y * 0.55f),
+  ImGui::SetNextWindowPos(
+      ImVec2(0, title_bar_height_ + local_window_height_ - 1.0f),
      ImGuiCond_Always);
  ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0.0f, 0.0f));
  ImGui::PushStyleColor(ImGuiCol_ChildBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
  ImGui::BeginChild(
      "RecentConnectionsWindow",
-      ImVec2(recent_connection_window_width, recent_connection_window_height),
+      ImVec2(main_window_width_default_,
+             main_window_height_default_ - title_bar_height_ -
+                 local_window_height_ - status_bar_height_ + 1.0f),
      ImGuiChildFlags_Border,
-      ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove |
+      ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse |
+          ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoTitleBar |
          ImGuiWindowFlags_NoBringToFrontOnFocus);
  ImGui::PopStyleVar();
  ImGui::PopStyleColor();

-  ImGui::SetCursorPos(
-      ImVec2(io.DisplaySize.x * 0.045f, io.DisplaySize.y * 0.02f));
+  ImGui::SetCursorPosY(ImGui::GetCursorPosY() + main_window_text_y_padding_);
+  ImGui::Indent(main_child_window_x_padding_);

  ImGui::TextColored(
      ImVec4(0.0f, 0.0f, 0.0f, 0.5f), "%s",
@@ -38,40 +35,31 @@ int Render::RecentConnectionsWindow() {
 }

 int Render::ShowRecentConnections() {
-  ImGuiIO& io = ImGui::GetIO();
-  float recent_connection_panel_width = io.DisplaySize.x * 0.912f;
-  float recent_connection_panel_height = io.DisplaySize.y * 0.29f;
-  float recent_connection_image_height = recent_connection_panel_height * 0.6f;
-  float recent_connection_image_width = recent_connection_image_height * 16 / 9;
-  float recent_connection_sub_container_width =
-      recent_connection_image_width * 1.2f;
-  float recent_connection_sub_container_height =
-      recent_connection_image_height * 1.4f;
-  float recent_connection_button_width = recent_connection_image_width * 0.15f;
-  float recent_connection_button_height =
-      recent_connection_image_height * 0.25f;
-  float recent_connection_dummy_button_width =
-      recent_connection_image_width - 2 * recent_connection_button_width;
-
-  ImGui::SetCursorPos(
-      ImVec2(io.DisplaySize.x * 0.045f, io.DisplaySize.y * 0.1f));
-
+  ImGui::SetCursorPosX(25.0f);
+  ImVec2 sub_window_pos = ImGui::GetCursorPos();
  std::map<std::string, ImVec2> sub_containers_pos;
+  float recent_connection_sub_container_width =
+      recent_connection_image_width_ + 16.0f;
+  float recent_connection_sub_container_height =
+      recent_connection_image_height_ + 36.0f;
  ImGui::PushStyleColor(ImGuiCol_ChildBg,
                        ImVec4(239.0f / 255, 240.0f / 255, 242.0f / 255, 1.0f));
  ImGui::PushStyleVar(ImGuiStyleVar_ChildRounding, 10.0f);
-  ImGui::BeginChild(
-      "RecentConnectionsContainer",
-      ImVec2(recent_connection_panel_width, recent_connection_panel_height),
+  ImGui::BeginChild("RecentConnectionsContainer",
+                    ImVec2(main_window_width_default_ - 50.0f, 145.0f),
                    ImGuiChildFlags_Border,
-      ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove |
+                    ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse |
+                        ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoTitleBar |
                        ImGuiWindowFlags_NoBringToFrontOnFocus |
                        ImGuiWindowFlags_AlwaysHorizontalScrollbar |
+                        ImGuiWindowFlags_NoScrollbar |
                        ImGuiWindowFlags_NoScrollWithMouse);
  ImGui::PopStyleVar();
  ImGui::PopStyleColor();
  size_t recent_connections_count = recent_connections_.size();
  int count = 0;
+  float button_width = 22;
+  float button_height = 22;
  for (auto& it : recent_connections_) {
    sub_containers_pos[it.first] = ImGui::GetCursorPos();
    std::string recent_connection_sub_window_name =
@@ -81,8 +69,11 @@ int Render::ShowRecentConnections() {
                      ImVec2(recent_connection_sub_container_width,
                             recent_connection_sub_container_height),
                      ImGuiChildFlags_None,
-                      ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove |
-                          ImGuiWindowFlags_NoBringToFrontOnFocus);
+                      ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse |
+                          ImGuiWindowFlags_NoMove |
+                          ImGuiWindowFlags_NoTitleBar |
+                          ImGuiWindowFlags_NoBringToFrontOnFocus |
+                          ImGuiWindowFlags_NoScrollbar);
    std::string connection_info = it.first;

    // remote id length is 9
@@ -121,16 +112,14 @@ int Render::ShowRecentConnections() {
      it.second.remote_host_name = "unknown";
    }

-    ImVec2 image_screen_pos = ImVec2(
-        ImGui::GetCursorScreenPos().x + recent_connection_image_width * 0.04f,
-        ImGui::GetCursorScreenPos().y + recent_connection_image_height * 0.08f);
+    ImVec2 image_screen_pos = ImVec2(ImGui::GetCursorScreenPos().x + 5.0f,
+                                     ImGui::GetCursorScreenPos().y + 5.0f);
    ImVec2 image_pos =
-        ImVec2(ImGui::GetCursorPosX() + recent_connection_image_width * 0.05f,
-               ImGui::GetCursorPosY() + recent_connection_image_height * 0.08f);
+        ImVec2(ImGui::GetCursorPosX() + 5.0f, ImGui::GetCursorPosY() + 5.0f);
    ImGui::SetCursorPos(image_pos);
-    ImGui::Image(
-        (ImTextureID)(intptr_t)it.second.texture,
-        ImVec2(recent_connection_image_width, recent_connection_image_height));
+    ImGui::Image((ImTextureID)(intptr_t)it.second.texture,
+                 ImVec2((float)recent_connection_image_width_,
+                        (float)recent_connection_image_height_));

    // remote id display button
    {
@@ -139,17 +128,16 @@ int Render::ShowRecentConnections() {
      ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImVec4(0, 0, 0, 0.2f));

      ImVec2 dummy_button_pos =
-          ImVec2(image_pos.x, image_pos.y + recent_connection_image_height);
+          ImVec2(image_pos.x, image_pos.y + recent_connection_image_height_);
      std::string dummy_button_name = "##DummyButton" + it.second.remote_id;
      ImGui::SetCursorPos(dummy_button_pos);
      ImGui::SetWindowFontScale(0.6f);
      ImGui::Button(dummy_button_name.c_str(),
-                    ImVec2(recent_connection_dummy_button_width,
-                           recent_connection_button_height));
+                    ImVec2(recent_connection_image_width_ - 2 * button_width,
+                           button_height));
      ImGui::SetWindowFontScale(1.0f);
-      ImGui::SetCursorPos(ImVec2(
-          dummy_button_pos.x + recent_connection_dummy_button_width * 0.05f,
-          dummy_button_pos.y + recent_connection_button_height * 0.05f));
+      ImGui::SetCursorPos(
+          ImVec2(dummy_button_pos.x + 2.0f, dummy_button_pos.y + 1.0f));
      ImGui::SetWindowFontScale(0.65f);
      ImGui::Text("%s", it.second.remote_id.c_str());
      ImGui::SetWindowFontScale(1.0f);
@@ -172,18 +160,16 @@ int Render::ShowRecentConnections() {
    ImGui::SetWindowFontScale(0.5f);
    // trash button
    {
-      ImVec2 trash_can_button_pos =
-          ImVec2(image_pos.x + recent_connection_image_width -
-                     2 * recent_connection_button_width,
-                 image_pos.y + recent_connection_image_height);
+      ImVec2 trash_can_button_pos = ImVec2(
+          image_pos.x + recent_connection_image_width_ - 2 * button_width,
+          image_pos.y + recent_connection_image_height_);
      ImGui::SetCursorPos(trash_can_button_pos);
      std::string trash_can = ICON_FA_TRASH_CAN;
      std::string recent_connection_delete_button_name =
          trash_can + "##RecentConnectionDelete" +
          std::to_string(trash_can_button_pos.x);
      if (ImGui::Button(recent_connection_delete_button_name.c_str(),
-                        ImVec2(recent_connection_button_width,
-                               recent_connection_button_height))) {
+                        ImVec2(button_width, button_height))) {
        show_confirm_delete_connection_ = true;
        delete_connection_name_ = it.first;
      }
@@ -199,16 +185,14 @@ int Render::ShowRecentConnections() {
    // connect button
    {
      ImVec2 connect_button_pos =
-          ImVec2(image_pos.x + recent_connection_image_width -
-                     recent_connection_button_width,
-                 image_pos.y + recent_connection_image_height);
+          ImVec2(image_pos.x + recent_connection_image_width_ - button_width,
+                 image_pos.y + recent_connection_image_height_);
      ImGui::SetCursorPos(connect_button_pos);
      std::string connect = ICON_FA_ARROW_RIGHT_LONG;
      std::string connect_to_this_connection_button_name =
          connect + "##ConnectionTo" + it.first;
      if (ImGui::Button(connect_to_this_connection_button_name.c_str(),
-                        ImVec2(recent_connection_button_width,
-                               recent_connection_button_height))) {
+                        ImVec2(button_width, button_height))) {
        ConnectTo(it.second.remote_id, it.second.password.c_str(),
                  it.second.remember_password);
      }
@@ -220,20 +204,17 @@ int Render::ShowRecentConnections() {

    if (count != recent_connections_count - 1) {
      ImVec2 line_start =
-          ImVec2(image_screen_pos.x + recent_connection_image_width * 1.19f,
+          ImVec2(image_screen_pos.x + recent_connection_image_width_ + 20.0f,
                 image_screen_pos.y);
-      ImVec2 line_end =
-          ImVec2(image_screen_pos.x + recent_connection_image_width * 1.19f,
-                 image_screen_pos.y + recent_connection_image_height +
-                     recent_connection_button_height);
+      ImVec2 line_end = ImVec2(
+          image_screen_pos.x + recent_connection_image_width_ + 20.0f,
+          image_screen_pos.y + recent_connection_image_height_ + button_height);
      ImGui::GetWindowDrawList()->AddLine(line_start, line_end,
                                          IM_COL32(0, 0, 0, 122), 1.0f);
    }

    count++;
-    ImGui::SameLine(0, count != recent_connections_count
-                           ? (recent_connection_image_width * 0.165f)
-                           : 0.0f);
+    ImGui::SameLine(0, count != recent_connections_count ? 26.0f : 0.0f);
  }

  ImGui::EndChild();
@@ -246,30 +227,32 @@ int Render::ShowRecentConnections() {
 }

 int Render::ConfirmDeleteConnection() {
-  ImGuiIO& io = ImGui::GetIO();
-  ImGui::SetNextWindowPos(
-      ImVec2(io.DisplaySize.x * 0.33f, io.DisplaySize.y * 0.33f));
-  ImGui::SetNextWindowSize(
-      ImVec2(io.DisplaySize.x * 0.33f, io.DisplaySize.y * 0.33f));
+  const ImGuiViewport* viewport = ImGui::GetMainViewport();
+  ImGui::SetNextWindowPos(ImVec2((viewport->WorkSize.x - viewport->WorkPos.x -
+                                  connection_status_window_width_) /
+                                     2,
+                                 (viewport->WorkSize.y - viewport->WorkPos.y -
+                                  connection_status_window_height_) /
+                                     2));

+  ImGui::SetNextWindowSize(ImVec2(connection_status_window_width_,
+                                  connection_status_window_height_));
  ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 3.0f);
  ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(1.0, 1.0, 1.0, 1.0));
  ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 1.0f);
  ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 5.0f);

  ImGui::Begin("ConfirmDeleteConnectionWindow", nullptr,
-               ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove |
+               ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse |
+                   ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoTitleBar |
                   ImGuiWindowFlags_NoSavedSettings);
  ImGui::PopStyleVar(2);
  ImGui::PopStyleColor();

-  auto connection_status_window_width = ImGui::GetWindowSize().x;
-  auto connection_status_window_height = ImGui::GetWindowSize().y;
-
  std::string text =
      localization::confirm_delete_connection[localization_language_index_];
-  ImGui::SetCursorPosX(connection_status_window_width * 0.33f);
-  ImGui::SetCursorPosY(connection_status_window_height * 0.67f);
+  ImGui::SetCursorPosX(connection_status_window_width_ * 6 / 19);
+  ImGui::SetCursorPosY(connection_status_window_height_ * 2 / 3);

  // ok
  ImGui::SetWindowFontScale(0.5f);
@@ -288,9 +271,12 @@ int Render::ConfirmDeleteConnection() {
    show_confirm_delete_connection_ = false;
  }

+  auto window_width = ImGui::GetWindowSize().x;
+  auto window_height = ImGui::GetWindowSize().y;
+
  auto text_width = ImGui::CalcTextSize(text.c_str()).x;
-  ImGui::SetCursorPosX((connection_status_window_width - text_width) * 0.5f);
-  ImGui::SetCursorPosY(connection_status_window_height * 0.2f);
+  ImGui::SetCursorPosX((window_width - text_width) * 0.5f);
+  ImGui::SetCursorPosY(window_height * 0.2f);
  ImGui::Text("%s", text.c_str());
  ImGui::SetWindowFontScale(1.0f);

@@ -298,4 +284,3 @@ int Render::ConfirmDeleteConnection() {
  ImGui::PopStyleVar();
  return 0;
 }
-}  // namespace crossdesk
--- a/src/gui/panels/remote_peer_panel.cpp
+++ b/src/gui/panels/remote_peer_panel.cpp
@@ -1,35 +1,26 @@
-#include "layout_relative.h"
+#include "layout.h"
 #include "localization.h"
 #include "rd_log.h"
 #include "render.h"

-namespace crossdesk {
-
-static int InputTextCallback(ImGuiInputTextCallbackData* data);
+static int InputTextCallback(ImGuiInputTextCallbackData *data);

 int Render::RemoteWindow() {
-  ImGuiIO& io = ImGui::GetIO();
-  float remote_window_width = io.DisplaySize.x * 0.5f;
-  float remote_window_height =
-      io.DisplaySize.y * (1 - TITLE_BAR_HEIGHT - STATUS_BAR_HEIGHT);
-  float remote_window_arrow_button_width = io.DisplaySize.x * 0.1f;
-  float remote_window_arrow_button_height = io.DisplaySize.y * 0.078f;
-
-  ImGui::SetNextWindowPos(
-      ImVec2(io.DisplaySize.x * 0.5f, io.DisplaySize.y * TITLE_BAR_HEIGHT),
+  ImGui::SetNextWindowPos(ImVec2(local_window_width_ + 1.0f, title_bar_height_),
                          ImGuiCond_Always);
  ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 3.0f);

-  ImGui::PushStyleColor(ImGuiCol_ChildBg, ImVec4(0, 0, 0, 0));
+  ImGui::PushStyleColor(ImGuiCol_ChildBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
  ImGui::BeginChild("RemoteDesktopWindow",
-                    ImVec2(remote_window_width, remote_window_height),
+                    ImVec2(remote_window_width_, remote_window_height_),
                    ImGuiChildFlags_None,
-                    ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove |
+                    ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse |
+                        ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoTitleBar |
                        ImGuiWindowFlags_NoBringToFrontOnFocus);
  ImGui::PopStyleColor();

-  ImGui::SetCursorPos(
-      ImVec2(io.DisplaySize.x * 0.057f, io.DisplaySize.y * 0.02f));
+  ImGui::SetCursorPosY(ImGui::GetCursorPosY() + main_window_text_y_padding_);
+  ImGui::Indent(main_child_window_x_padding_ - 1.0f);

  ImGui::TextColored(
      ImVec4(0.0f, 0.0f, 0.0f, 0.5f), "%s",
@@ -38,7 +29,8 @@ int Render::RemoteWindow() {
  ImGui::Spacing();
  {
    ImGui::SetNextWindowPos(
-        ImVec2(io.DisplaySize.x * 0.557f, io.DisplaySize.y * 0.15f),
+        ImVec2(local_window_width_ + main_child_window_x_padding_ - 1.0f,
+               title_bar_height_ + main_child_window_y_padding_),
        ImGuiCond_Always);
    ImGui::PushStyleColor(ImGuiCol_ChildBg, ImVec4(239.0f / 255, 240.0f / 255,
                                                   242.0f / 255, 1.0f));
@@ -46,9 +38,10 @@ int Render::RemoteWindow() {

    ImGui::BeginChild(
        "RemoteDesktopWindow_1",
-        ImVec2(remote_window_width * 0.8f, remote_window_height * 0.43f),
+        ImVec2(remote_child_window_width_, remote_child_window_height_),
        ImGuiChildFlags_Border,
-        ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove |
+        ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse |
+            ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoTitleBar |
            ImGuiWindowFlags_NoBringToFrontOnFocus);
    ImGui::PopStyleVar();
    ImGui::PopStyleColor();
@@ -58,7 +51,7 @@ int Render::RemoteWindow() {
          "%s", localization::remote_id[localization_language_index_].c_str());

      ImGui::Spacing();
-      ImGui::SetNextItemWidth(io.DisplaySize.x * 0.25f);
+      ImGui::SetNextItemWidth(IPUT_WINDOW_WIDTH);
      ImGui::SetWindowFontScale(1.0f);
      ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 1.0f);
      if (re_enter_remote_id_) {
@@ -80,61 +73,35 @@ int Render::RemoteWindow() {
      remote_id.erase(remove_if(remote_id.begin(), remote_id.end(),
                                static_cast<int (*)(int)>(&isspace)),
                      remote_id.end());
-      if (ImGui::Button(ICON_FA_ARROW_RIGHT_LONG,
-                        ImVec2(remote_window_arrow_button_width,
-                               remote_window_arrow_button_height)) ||
+      if (ImGui::Button(ICON_FA_ARROW_RIGHT_LONG, ImVec2(55, 38)) ||
          enter_pressed) {
        connect_button_pressed_ = true;
        bool found = false;
-        std::string target_remote_id;
-        std::string target_password;
-        bool should_connect = false;
-        bool already_connected = false;
-
-        for (auto& [id, props] : recent_connections_) {
+        for (auto &[id, props] : recent_connections_) {
          if (id.find(remote_id) != std::string::npos) {
            found = true;
-            target_remote_id = props.remote_id;
-            target_password = props.password;
-            {
-              // std::shared_lock lock(client_properties_mutex_);
            if (client_properties_.find(remote_id) !=
                client_properties_.end()) {
              if (!client_properties_[remote_id]->connection_established_) {
-                  should_connect = true;
+                ConnectTo(props.remote_id, props.password.c_str(), false);
              } else {
-                  already_connected = true;
+                // todo: show warning message
+                LOG_INFO("Already connected to [{}]", remote_id);
              }
            } else {
-                should_connect = true;
+              ConnectTo(props.remote_id, props.password.c_str(), false);
+            }
          }
        }

-            if (should_connect) {
-              ConnectTo(target_remote_id, target_password.c_str(), false);
-            } else if (already_connected) {
-              LOG_INFO("Already connected to [{}]", remote_id);
-            }
-            break;
-          }
-        }
        if (!found) {
          ConnectTo(remote_id, "", false);
        }
      }

-      // check every 1 second for rejoin
      if (need_to_rejoin_) {
-        auto now = std::chrono::steady_clock::now();
-        auto elapsed = std::chrono::duration_cast<std::chrono::milliseconds>(
-                           now - last_rejoin_check_time_)
-                           .count();
-
-        if (elapsed >= 1000) {
-          last_rejoin_check_time_ = now;
        need_to_rejoin_ = false;
-          // std::shared_lock lock(client_properties_mutex_);
-          for (const auto& [_, props] : client_properties_) {
+        for (const auto &[_, props] : client_properties_) {
          if (props->rejoin_) {
            ConnectTo(props->remote_id_, props->remote_password_,
                      props->remember_password_);
@@ -142,7 +109,6 @@ int Render::RemoteWindow() {
        }
      }
    }
-    }
    ImGui::EndChild();
  }
  ImGui::EndChild();
@@ -151,7 +117,7 @@ int Render::RemoteWindow() {
  return 0;
 }

-static int InputTextCallback(ImGuiInputTextCallbackData* data) {
+static int InputTextCallback(ImGuiInputTextCallbackData *data) {
  if (data->BufTextLen > 3 && data->Buf[3] != ' ') {
    data->InsertChars(3, " ");
  }
@@ -163,22 +129,11 @@ static int InputTextCallback(ImGuiInputTextCallbackData* data) {
  return 0;
 }

-int Render::ConnectTo(const std::string& remote_id, const char* password,
+int Render::ConnectTo(const std::string &remote_id, const char *password,
                      bool remember_password) {
  LOG_INFO("Connect to [{}]", remote_id);
  focused_remote_id_ = remote_id;

-  // std::shared_lock shared_lock(client_properties_mutex_);
-  bool exists =
-      (client_properties_.find(remote_id) != client_properties_.end());
-  // shared_lock.unlock();
-
-  if (!exists) {
-    PeerPtr* peer_to_init = nullptr;
-    std::string local_id;
-
-    {
-      // std::unique_lock unique_lock(client_properties_mutex_);
  if (client_properties_.find(remote_id) == client_properties_.end()) {
    client_properties_[remote_id] =
        std::make_shared<SubStreamWindowProperties>();
@@ -188,41 +143,20 @@ int Render::ConnectTo(const std::string& remote_id, const char* password,
    memcpy(&props->params_, &params_, sizeof(Params));
    props->params_.user_id = props->local_id_.c_str();
    props->peer_ = CreatePeer(&props->params_);
-
-        props->control_window_width_ = title_bar_height_ * 8.0f;
-        props->control_window_height_ = title_bar_height_ * 1.3f;
-        props->control_window_min_width_ = title_bar_height_ * 0.65f;
-        props->control_window_min_height_ = title_bar_height_ * 1.3f;
-        props->control_window_max_width_ = title_bar_height_ * 8.0f;
-        props->control_window_max_height_ = title_bar_height_ * 6.0f;
-
-        if (!props->peer_) {
-          LOG_INFO("Create peer [{}] instance failed", props->local_id_);
-          return -1;
-        }
-
-        for (auto& display_info : display_info_list_) {
-          AddVideoStream(props->peer_, display_info.name.c_str());
-        }
    AddAudioStream(props->peer_, props->audio_label_.c_str());
    AddDataStream(props->peer_, props->data_label_.c_str());

+    if (props->peer_) {
+      LOG_INFO("[{}] Create peer instance successful", props->local_id_);
+      Init(props->peer_);
+      LOG_INFO("[{}] Peer init finish", props->local_id_);
+    } else {
+      LOG_INFO("Create peer [{}] instance failed", props->local_id_);
+    }
+
    props->connection_status_ = ConnectionStatus::Connecting;
-
-        peer_to_init = props->peer_;
-        local_id = props->local_id_;
  }
-    }
-
-    if (peer_to_init) {
-      LOG_INFO("[{}] Create peer instance successful", local_id);
-      Init(peer_to_init);
-      LOG_INFO("[{}] Peer init finish", local_id);
-    }
-  }
-
  int ret = -1;
-  // std::shared_lock read_lock(client_properties_mutex_);
  auto props = client_properties_[remote_id];
  if (!props->connection_established_) {
    props->remember_password_ = remember_password;
@@ -234,7 +168,6 @@ int Render::ConnectTo(const std::string& remote_id, const char* password,
    }

    std::string remote_id_with_pwd = remote_id + "@" + password;
-    if (props->peer_) {
    ret = JoinConnection(props->peer_, remote_id_with_pwd.c_str());
    if (0 == ret) {
      props->rejoin_ = false;
@@ -243,9 +176,6 @@ int Render::ConnectTo(const std::string& remote_id, const char* password,
      need_to_rejoin_ = true;
    }
  }
-  }
-  // read_lock.unlock();

  return 0;
 }
-}  // namespace crossdesk
--- a/src/gui/render.cpp
+++ b/src/gui/render.cpp
--- a/src/gui/render.h
+++ b/src/gui/render.h
@@ -13,12 +13,9 @@
 #include <chrono>
 #include <fstream>
 #include <mutex>
-#include <nlohmann/json.hpp>
 #include <optional>
-#include <shared_mutex>
 #include <string>
 #include <unordered_map>
-#include <vector>

 #include "IconsFontAwesome6.h"
 #include "config_center.h"
@@ -33,11 +30,6 @@
 #include "speaker_capturer_factory.h"
 #include "thumbnail.h"

-#if _WIN32
-#include "win_tray.h"
-#endif
-
-namespace crossdesk {
 class Render {
 public:
  struct SubStreamWindowProperties {
@@ -53,10 +45,10 @@ class Render {
    bool connection_established_ = false;
    bool rejoin_ = false;
    bool net_traffic_stats_button_pressed_ = false;
-    bool mouse_control_button_pressed_ = true;
+    bool mouse_control_button_pressed_ = false;
    bool mouse_controller_is_started_ = false;
-    bool audio_capture_button_pressed_ = true;
-    bool control_mouse_ = true;
+    bool audio_capture_button_pressed_ = false;
+    bool control_mouse_ = false;
    bool streaming_ = false;
    bool is_control_bar_in_left_ = true;
    bool control_bar_hovered_ = false;
@@ -72,10 +64,10 @@ class Render {
    float sub_stream_window_height_ = 720;
    float control_window_min_width_ = 20;
    float control_window_max_width_ = 230;
-    float control_window_min_height_ = 38;
-    float control_window_max_height_ = 180;
+    float control_window_min_height_ = 40;
+    float control_window_max_height_ = 170;
    float control_window_width_ = 230;
-    float control_window_height_ = 38;
+    float control_window_height_ = 40;
    float control_bar_pos_x_ = 0;
    float control_bar_pos_y_ = 30;
    float mouse_diff_control_bar_pos_x_ = 0;
@@ -155,7 +147,6 @@ class Render {
  int CreateStreamRenderWindow();
  int TitleBar(bool main_window);
  int MainWindow();
-  int UpdateNotificationWindow();
  int StreamWindow();
  int LocalWindow();
  int RemoteWindow();
@@ -170,8 +161,6 @@ class Render {
  bool ConnectionStatusWindow(
      std::shared_ptr<SubStreamWindowProperties>& props);
  int ShowRecentConnections();
-  void Hyperlink(const std::string& label, const std::string& url,
-                 const float window_width);

 private:
  int ConnectTo(const std::string& remote_id, const char* password,
@@ -180,8 +169,10 @@ class Render {
  int DestroyMainWindow();
  int CreateStreamWindow();
  int DestroyStreamWindow();
-  int SetupFontAndStyle(bool main_window);
+  int SetupFontAndStyle();
+  int SetupMainWindow();
  int DestroyMainWindowContext();
+  int SetupStreamWindow();
  int DestroyStreamWindowContext();
  int DrawMainWindow();
  int DrawStreamWindow();
@@ -189,14 +180,6 @@ class Render {
  int NetTrafficStats(std::shared_ptr<SubStreamWindowProperties>& props);
  void DrawConnectionStatusText(
      std::shared_ptr<SubStreamWindowProperties>& props);
-#ifdef __APPLE__
-  int RequestPermissionWindow();
-  bool CheckScreenRecordingPermission();
-  bool CheckAccessibilityPermission();
-  void OpenScreenRecordingPreferences();
-  void OpenAccessibilityPreferences();
-  bool DrawToggleSwitch(const char* id, bool active, bool enabled);
-#endif

 public:
  static void OnReceiveVideoBufferCb(const XVideoFrame* video_frame,
@@ -277,25 +260,8 @@ class Render {
    unsigned char iv[16];
  };

-  struct CDCacheV2 {
-    char client_id_with_password[17];
-    int language;
-    int video_quality;
-    int video_frame_rate;
-    int video_encode_format;
-    bool enable_hardware_video_codec;
-    bool enable_turn;
-    bool enable_srtp;
-
-    unsigned char key[16];
-    unsigned char iv[16];
-
-    char self_hosted_id[17];
-  };
-
 private:
  CDCache cd_cache_;
-  CDCacheV2 cd_cache_v2_;
  std::mutex cd_cache_mutex_;
  std::unique_ptr<ConfigCenter> config_center_;
  ConfigCenter::LANGUAGE localization_language_ =
@@ -311,15 +277,13 @@ class Render {
  /* ------ all windows property start ------ */
  float title_bar_width_ = 640;
  float title_bar_height_ = 30;
-  float title_bar_button_width_ = 30;
-  float title_bar_button_height_ = 30;
  /* ------ all windows property end ------ */

  /* ------ main window property start ------ */
  // thumbnail
  unsigned char aes128_key_[16];
  unsigned char aes128_iv_[16];
-  std::shared_ptr<Thumbnail> thumbnail_;
+  std::unique_ptr<Thumbnail> thumbnail_;

  // recent connections
  std::vector<std::pair<std::string, Thumbnail::RecentConnection>>
@@ -332,27 +296,15 @@ class Render {
  SDL_Window* main_window_ = nullptr;
  SDL_Renderer* main_renderer_ = nullptr;
  ImGuiContext* main_ctx_ = nullptr;
-  ImFont* main_windows_system_chinese_font_ = nullptr;
-  ImFont* stream_windows_system_chinese_font_ = nullptr;
  bool exit_ = false;
  const int sdl_refresh_ms_ = 16;  // ~60 FPS
-#if _WIN32
-  std::unique_ptr<WinTray> tray_;
-#endif

  // main window properties
-  nlohmann::json latest_version_info_ = nlohmann::json{};
-  bool update_available_ = false;
-  std::string latest_version_ = "";
-  std::string release_notes_ = "";
  bool start_mouse_controller_ = false;
  bool mouse_controller_is_started_ = false;
  bool start_screen_capturer_ = false;
  bool screen_capturer_is_started_ = false;
-  bool start_speaker_capturer_ = false;
-  bool speaker_capturer_is_started_ = false;
-  bool start_keyboard_capturer_ = true;
-  bool show_cursor_ = false;
+  bool start_keyboard_capturer_ = false;
  bool keyboard_capturer_is_started_ = false;
  bool foucs_on_main_window_ = false;
  bool foucs_on_stream_window_ = false;
@@ -361,7 +313,6 @@ class Render {
  int main_window_height_real_ = 540;
  float main_window_dpi_scaling_w_ = 1.0f;
  float main_window_dpi_scaling_h_ = 1.0f;
-  float dpi_scale_ = 1.0f;
  float main_window_width_default_ = 640;
  float main_window_height_default_ = 480;
  float main_window_width_ = 640;
@@ -384,10 +335,8 @@ class Render {
  float connection_status_window_height_ = 150;
  float notification_window_width_ = 200;
  float notification_window_height_ = 80;
-  float about_window_width_ = 300;
-  float about_window_height_ = 170;
-  float update_notification_window_width_ = 400;
-  float update_notification_window_height_ = 320;
+  float about_window_width_ = 200;
+  float about_window_height_ = 150;
  int screen_width_ = 1280;
  int screen_height_ = 720;
  int selected_display_ = 0;
@@ -401,7 +350,6 @@ class Render {
  int audio_len_ = 0;
  bool audio_buffer_fresh_ = false;
  bool need_to_rejoin_ = false;
-  std::chrono::steady_clock::time_point last_rejoin_check_time_;
  bool just_created_ = false;
  std::string controlled_remote_id_ = "";
  std::string focused_remote_id_ = "";
@@ -444,7 +392,6 @@ class Render {
  bool show_about_window_ = false;
  bool show_connection_status_window_ = false;
  bool show_reset_password_window_ = false;
-  bool show_update_notification_window_ = false;
  bool fullscreen_button_pressed_ = false;
  bool focus_on_input_widget_ = true;
  bool is_client_mode_ = false;
@@ -476,69 +423,40 @@ class Render {
  KeyboardCapturer* keyboard_capturer_ = nullptr;
  std::vector<DisplayInfo> display_info_list_;
  uint64_t last_frame_time_;
-  bool show_new_version_icon_ = false;
-  bool show_new_version_icon_in_menu_ = true;
-  uint64_t new_version_icon_last_trigger_time_ = 0;
-  uint64_t new_version_icon_render_start_time_ = 0;
-#ifdef __APPLE__
-  bool show_request_permission_window_ = true;
-#endif
  char client_id_[10] = "";
  char client_id_display_[12] = "";
  char client_id_with_password_[17] = "";
  char password_saved_[7] = "";
-  char self_hosted_id_[17] = "";
-  char self_hosted_user_id_[17] = "";
  int language_button_value_ = 0;
  int video_quality_button_value_ = 0;
-  int video_frame_rate_button_value_ = 1;
+  int video_frame_rate_button_value_ = 0;
  int video_encode_format_button_value_ = 0;
  bool enable_hardware_video_codec_ = false;
-  bool enable_turn_ = true;
+  bool enable_turn_ = false;
  bool enable_srtp_ = false;
  char signal_server_ip_[256] = "api.crossdesk.cn";
  char signal_server_port_[6] = "9099";
-  char coturn_server_port_[6] = "3478";
  char cert_file_path_[256] = "";
-  bool enable_self_hosted_ = false;
+  bool enable_self_hosted_server_ = false;
  int language_button_value_last_ = 0;
  int video_quality_button_value_last_ = 0;
-  int video_frame_rate_button_value_last_ = 0;
  int video_encode_format_button_value_last_ = 0;
  bool enable_hardware_video_codec_last_ = false;
-  bool enable_turn_last_ = true;
+  bool enable_turn_last_ = false;
  bool enable_srtp_last_ = false;
-  bool enable_self_hosted_last_ = false;
-  bool enable_autostart_ = false;
-  bool enable_autostart_last_ = false;
-  bool enable_daemon_ = false;
-  bool enable_daemon_last_ = false;
-  bool enable_minimize_to_tray_ = false;
-  bool enable_minimize_to_tray_last_ = false;
-  char signal_server_ip_self_[256] = "";
-  char signal_server_port_self_[6] = "";
-  char coturn_server_port_self_[6] = "";
-  std::string tls_cert_path_self_ = "";
+  char signal_server_ip_tmp_[256] = "api.crossdesk.cn";
+  char signal_server_port_tmp_[6] = "9099";
  bool settings_window_pos_reset_ = true;
  bool self_hosted_server_config_window_pos_reset_ = true;
  std::string selected_current_file_path_ = "";
-  bool show_file_browser_ = true;
+  std::string selected_file_ = "";
  /* ------ main window property end ------ */

  /* ------ sub stream window property start ------ */
  std::unordered_map<std::string, std::shared_ptr<SubStreamWindowProperties>>
      client_properties_;
-  std::shared_mutex client_properties_mutex_;
  void CloseTab(decltype(client_properties_)::iterator& it);
  /* ------ stream window property end ------ */
-
-  /* ------ async thumbnail save tasks ------ */
-  std::vector<std::thread> thumbnail_save_threads_;
-  std::mutex thumbnail_save_threads_mutex_;
-  void WaitForThumbnailSaveTasks();
-
-  /* ------ server mode ------ */
-  std::unordered_map<std::string, ConnectionStatus> connection_status_;
 };
-}  // namespace crossdesk
+
 #endif
--- a/src/gui/render_callback.cpp
+++ b/src/gui/render_callback.cpp
@@ -1,6 +1,3 @@
-#include <cmath>
-#include <fstream>
-
 #include "device_controller.h"
 #include "localization.h"
 #include "platform.h"
@@ -9,7 +6,10 @@

 #define NV12_BUFFER_SIZE 1280 * 720 * 3 / 2

-namespace crossdesk {
+#ifdef DESK_PORT_DEBUG
+#else
+#define MOUSE_CONTROL 1
+#endif

 int Render::SendKeyCommand(int key_code, bool is_down) {
  RemoteAction remote_action;
@@ -22,16 +22,12 @@ int Render::SendKeyCommand(int key_code, bool is_down) {
  remote_action.k.key_value = key_code;

  if (!controlled_remote_id_.empty()) {
-    // std::shared_lock lock(client_properties_mutex_);
    if (client_properties_.find(controlled_remote_id_) !=
        client_properties_.end()) {
      auto props = client_properties_[controlled_remote_id_];
      if (props->connection_status_ == ConnectionStatus::Connected) {
-        std::string msg = remote_action.to_json();
-        if (props->peer_) {
-          SendDataFrame(props->peer_, msg.c_str(), msg.size(),
-                        props->data_label_.c_str());
-        }
+        SendDataFrame(props->peer_, (const char*)&remote_action,
+                      sizeof(remote_action), props->data_label_.c_str());
      }
    }
  }
@@ -46,7 +42,6 @@ int Render::ProcessMouseEvent(const SDL_Event& event) {
  float ratio_x, ratio_y = 0;
  RemoteAction remote_action;

-  // std::shared_lock lock(client_properties_mutex_);
  for (auto& it : client_properties_) {
    auto props = it.second;
    if (!props->control_mouse_) {
@@ -97,12 +92,8 @@ int Render::ProcessMouseEvent(const SDL_Event& event) {
      if (props->control_bar_hovered_ || props->display_selectable_hovered_) {
        remote_action.m.flag = MouseFlag::move;
      }
-
-      std::string msg = remote_action.to_json();
-      if (props->peer_) {
-        SendDataFrame(props->peer_, msg.c_str(), msg.size(),
-                      props->data_label_.c_str());
-      }
+      SendDataFrame(props->peer_, (const char*)&remote_action,
+                    sizeof(remote_action), props->data_label_.c_str());
    } else if (SDL_EVENT_MOUSE_WHEEL == event.type &&
               last_mouse_event.button.x >= props->stream_render_rect_.x &&
               last_mouse_event.button.x <= props->stream_render_rect_.x +
@@ -110,46 +101,32 @@ int Render::ProcessMouseEvent(const SDL_Event& event) {
               last_mouse_event.button.y >= props->stream_render_rect_.y &&
               last_mouse_event.button.y <= props->stream_render_rect_.y +
                                                props->stream_render_rect_.h) {
-      float scroll_x = event.wheel.x;
-      float scroll_y = event.wheel.y;
+      int scroll_x = event.wheel.x;
+      int scroll_y = event.wheel.y;
      if (event.wheel.direction == SDL_MOUSEWHEEL_FLIPPED) {
        scroll_x = -scroll_x;
        scroll_y = -scroll_y;
      }

      remote_action.type = ControlType::mouse;
-
-      auto roundUp = [](float value) -> int {
-        if (value > 0) {
-          return static_cast<int>(std::ceil(value));
-        } else if (value < 0) {
-          return static_cast<int>(std::floor(value));
-        }
-        return 0;
-      };
-
-      if (std::abs(scroll_y) >= std::abs(scroll_x)) {
+      if (scroll_x == 0) {
        remote_action.m.flag = MouseFlag::wheel_vertical;
-        remote_action.m.s = roundUp(scroll_y);
-      } else {
+        remote_action.m.s = scroll_y;
+      } else if (scroll_y == 0) {
        remote_action.m.flag = MouseFlag::wheel_horizontal;
-        remote_action.m.s = roundUp(scroll_x);
+        remote_action.m.s = scroll_x;
      }

      render_width = props->stream_render_rect_.w;
      render_height = props->stream_render_rect_.h;
      remote_action.m.x =
-          (float)(last_mouse_event.button.x - props->stream_render_rect_.x) /
-          render_width;
+          (float)(event.button.x - props->stream_render_rect_.x) / render_width;
      remote_action.m.y =
-          (float)(last_mouse_event.button.y - props->stream_render_rect_.y) /
+          (float)(event.button.y - props->stream_render_rect_.y) /
          render_height;

-      std::string msg = remote_action.to_json();
-      if (props->peer_) {
-        SendDataFrame(props->peer_, msg.c_str(), msg.size(),
-                      props->data_label_.c_str());
-      }
+      SendDataFrame(props->peer_, (const char*)&remote_action,
+                    sizeof(remote_action), props->data_label_.c_str());
    }
  }

@@ -163,16 +140,13 @@ void Render::SdlCaptureAudioIn(void* userdata, Uint8* stream, int len) {
  }

  if (1) {
-    // std::shared_lock lock(render->client_properties_mutex_);
-    for (const auto& it : render->client_properties_) {
+    for (auto it : render->client_properties_) {
      auto props = it.second;
      if (props->connection_status_ == ConnectionStatus::Connected) {
-        if (props->peer_) {
        SendAudioFrame(props->peer_, (const char*)stream, len,
                       render->audio_label_.c_str());
      }
    }
-    }

  } else {
    memcpy(render->audio_buffer_, stream, len);
@@ -219,7 +193,6 @@ void Render::OnReceiveVideoBufferCb(const XVideoFrame* video_frame,
  }

  std::string remote_id(user_id, user_id_size);
-  // std::shared_lock lock(render->client_properties_mutex_);
  if (render->client_properties_.find(remote_id) ==
      render->client_properties_.end()) {
    return;
@@ -304,57 +277,66 @@ void Render::OnReceiveDataBufferCb(const char* data, size_t size,
    return;
  }

-  std::string json_str(data, size);
  RemoteAction remote_action;
-
-  try {
-    remote_action.from_json(json_str);
-  } catch (const std::exception& e) {
-    LOG_ERROR("Failed to parse RemoteAction JSON: {}", e.what());
-    return;
-  }
+  memcpy(&remote_action, data, size);

  std::string remote_id(user_id, user_id_size);
-  // std::shared_lock lock(render->client_properties_mutex_);
  if (render->client_properties_.find(remote_id) !=
      render->client_properties_.end()) {
    // local
    auto props = render->client_properties_.find(remote_id)->second;
-    if (remote_action.type == ControlType::host_infomation &&
+    RemoteAction host_info;
+    if (DeserializeRemoteAction(data, size, host_info)) {
+      if (ControlType::host_infomation == host_info.type &&
          props->remote_host_name_.empty()) {
+        props->remote_host_name_ =
+            std::string(host_info.i.host_name, host_info.i.host_name_size);
+        LOG_INFO("Remote hostname: [{}]", props->remote_host_name_);
+
+        for (int i = 0; i < host_info.i.display_num; i++) {
+          props->display_info_list_.push_back(DisplayInfo(
+              std::string(host_info.i.display_list[i]), host_info.i.left[i],
+              host_info.i.top[i], host_info.i.right[i], host_info.i.bottom[i]));
+          LOG_INFO("Remote display [{}:{}], bound [({}, {}) ({}, {})]", i + 1,
+                   props->display_info_list_[i].name,
+                   props->display_info_list_[i].left,
+                   props->display_info_list_[i].top,
+                   props->display_info_list_[i].right,
+                   props->display_info_list_[i].bottom);
+        }
+      }
+    } else {
      props->remote_host_name_ = std::string(remote_action.i.host_name,
                                             remote_action.i.host_name_size);
      LOG_INFO("Remote hostname: [{}]", props->remote_host_name_);
-
-      for (int i = 0; i < remote_action.i.display_num; i++) {
-        props->display_info_list_.push_back(
-            DisplayInfo(remote_action.i.display_list[i],
-                        remote_action.i.left[i], remote_action.i.top[i],
-                        remote_action.i.right[i], remote_action.i.bottom[i]));
+      LOG_ERROR("No remote display detected");
    }
-    }
-    FreeRemoteAction(remote_action);
+    FreeRemoteAction(host_info);
  } else {
    // remote
-    if (remote_action.type == ControlType::mouse && render->mouse_controller_) {
+    if (ControlType::mouse == remote_action.type && render->mouse_controller_) {
      render->mouse_controller_->SendMouseCommand(remote_action,
                                                  render->selected_display_);
-    } else if (remote_action.type == ControlType::audio_capture) {
-      if (remote_action.a && !render->start_speaker_capturer_)
+    } else if (ControlType::audio_capture == remote_action.type) {
+      if (remote_action.a) {
        render->StartSpeakerCapturer();
-      else if (!remote_action.a && render->start_speaker_capturer_)
+        render->audio_capture_ = true;
+      } else {
        render->StopSpeakerCapturer();
-    } else if (remote_action.type == ControlType::keyboard &&
+        render->audio_capture_ = false;
+      }
+    } else if (ControlType::keyboard == remote_action.type &&
               render->keyboard_capturer_) {
      render->keyboard_capturer_->SendKeyboardCommand(
          (int)remote_action.k.key_value,
          remote_action.k.flag == KeyFlag::key_down);
-    } else if (remote_action.type == ControlType::display_id &&
-               render->screen_capturer_) {
+    } else if (ControlType::display_id == remote_action.type) {
+      if (render->screen_capturer_) {
        render->selected_display_ = remote_action.d;
        render->screen_capturer_->SwitchTo(remote_action.d);
      }
    }
+  }
 }

 void Render::OnSignalStatusCb(SignalStatus status, const char* user_id,
@@ -387,7 +369,6 @@ void Render::OnSignalStatusCb(SignalStatus status, const char* user_id,
    }

    std::string remote_id(client_id.begin() + 2, client_id.end());
-    // std::shared_lock lock(render->client_properties_mutex_);
    if (render->client_properties_.find(remote_id) ==
        render->client_properties_.end()) {
      return;
@@ -417,7 +398,6 @@ void Render::OnConnectionStatusCb(ConnectionStatus status, const char* user_id,
  if (!render) return;

  std::string remote_id(user_id, user_id_size);
-  // std::shared_lock lock(render->client_properties_mutex_);
  auto it = render->client_properties_.find(remote_id);
  auto props = (it != render->client_properties_.end()) ? it->second : nullptr;

@@ -427,7 +407,7 @@ void Render::OnConnectionStatusCb(ConnectionStatus status, const char* user_id,
    props->connection_status_ = status;

    switch (status) {
-      case ConnectionStatus::Connected: {
+      case ConnectionStatus::Connected:
        if (!render->need_to_create_stream_window_ &&
            !render->client_properties_.empty()) {
          render->need_to_create_stream_window_ = true;
@@ -438,22 +418,24 @@ void Render::OnConnectionStatusCb(ConnectionStatus status, const char* user_id,
            (int)render->stream_window_width_,
            (int)(render->stream_window_height_ - render->title_bar_height_)};
        break;
-      }
      case ConnectionStatus::Disconnected:
      case ConnectionStatus::Failed:
-      case ConnectionStatus::Closed: {
+      case ConnectionStatus::Closed:
+        render->password_validating_time_ = 0;
+        render->start_screen_capturer_ = false;
+        render->start_mouse_controller_ = false;
+        render->start_keyboard_capturer_ = false;
+        render->control_mouse_ = false;
        props->connection_established_ = false;
        props->mouse_control_button_pressed_ = false;
-        if (props->dst_buffer_ && props->stream_texture_) {
+        if (props->dst_buffer_) {
          memset(props->dst_buffer_, 0, props->dst_buffer_capacity_);
          SDL_UpdateTexture(props->stream_texture_, NULL, props->dst_buffer_,
                            props->texture_width_);
        }
        render->CleanSubStreamWindowProperties(props);
-
        break;
-      }
-      case ConnectionStatus::IncorrectPassword: {
+      case ConnectionStatus::IncorrectPassword:
        render->password_validating_ = false;
        render->password_validating_time_++;
        if (render->connect_button_pressed_) {
@@ -463,52 +445,28 @@ void Render::OnConnectionStatusCb(ConnectionStatus status, const char* user_id,
              localization::connect[render->localization_language_index_];
        }
        break;
-      }
-      case ConnectionStatus::NoSuchTransmissionId: {
+      case ConnectionStatus::NoSuchTransmissionId:
        if (render->connect_button_pressed_) {
          props->connection_established_ = false;
          render->connect_button_label_ =
              localization::connect[render->localization_language_index_];
        }
        break;
-      }
      default:
        break;
    }
  } else {
    render->is_client_mode_ = false;
    render->show_connection_status_window_ = true;
-    render->connection_status_[remote_id] = status;

    switch (status) {
-      case ConnectionStatus::Connected: {
+      case ConnectionStatus::Connected:
        render->need_to_send_host_info_ = true;
        render->start_screen_capturer_ = true;
-        render->start_speaker_capturer_ = true;
-#ifdef CROSSDESK_DEBUG
-        render->start_mouse_controller_ = false;
-        render->start_keyboard_capturer_ = false;
-#else
        render->start_mouse_controller_ = true;
-#endif
-        if (std::all_of(render->connection_status_.begin(),
-                        render->connection_status_.end(), [](const auto& kv) {
-                          return kv.first.find("web") != std::string::npos;
-                        })) {
-          render->show_cursor_ = true;
-        }
-
        break;
-      }
-      case ConnectionStatus::Closed: {
-        if (std::all_of(render->connection_status_.begin(),
-                        render->connection_status_.end(), [](const auto& kv) {
-                          return kv.second == ConnectionStatus::Closed ||
-                                 kv.second == ConnectionStatus::Failed ||
-                                 kv.second == ConnectionStatus::Disconnected;
-                        })) {
+      case ConnectionStatus::Closed:
        render->start_screen_capturer_ = false;
-          render->start_speaker_capturer_ = false;
        render->start_mouse_controller_ = false;
        render->start_keyboard_capturer_ = false;
        render->need_to_send_host_info_ = false;
@@ -517,19 +475,7 @@ void Render::OnConnectionStatusCb(ConnectionStatus status, const char* user_id,
          render->StopSpeakerCapturer();
          render->audio_capture_ = false;
        }
-
-          render->connection_status_.erase(remote_id);
-        }
-
-        if (std::all_of(render->connection_status_.begin(),
-                        render->connection_status_.end(), [](const auto& kv) {
-                          return kv.first.find("web") == std::string::npos;
-                        })) {
-          render->show_cursor_ = false;
-        }
-
        break;
-      }
      default:
        break;
    }
@@ -557,73 +503,6 @@ void Render::NetStatusReport(const char* client_id, size_t client_id_size,
      password = at_pos + 1;
    }

-    bool is_self_hosted = render->config_center_->IsSelfHosted();
-
-    if (is_self_hosted) {
-      memset(&render->client_id_, 0, sizeof(render->client_id_));
-      strncpy(render->client_id_, id.c_str(), sizeof(render->client_id_) - 1);
-      render->client_id_[sizeof(render->client_id_) - 1] = '\0';
-
-      memset(&render->password_saved_, 0, sizeof(render->password_saved_));
-      strncpy(render->password_saved_, password.c_str(),
-              sizeof(render->password_saved_) - 1);
-      render->password_saved_[sizeof(render->password_saved_) - 1] = '\0';
-
-      memset(&render->self_hosted_id_, 0, sizeof(render->self_hosted_id_));
-      strncpy(render->self_hosted_id_, client_id,
-              sizeof(render->self_hosted_id_) - 1);
-      render->self_hosted_id_[sizeof(render->self_hosted_id_) - 1] = '\0';
-
-      LOG_INFO("Use self-hosted client id [{}] and save to cache file", id);
-
-      render->cd_cache_mutex_.lock();
-
-      std::ifstream v2_file_read(render->cache_path_ + "/secure_cache_v2.enc",
-                                 std::ios::binary);
-      if (v2_file_read.good()) {
-        v2_file_read.read(reinterpret_cast<char*>(&render->cd_cache_v2_),
-                          sizeof(CDCacheV2));
-        v2_file_read.close();
-      } else {
-        memset(&render->cd_cache_v2_, 0, sizeof(CDCacheV2));
-        memset(&render->cd_cache_v2_.client_id_with_password, 0,
-               sizeof(render->cd_cache_v2_.client_id_with_password));
-        strncpy(render->cd_cache_v2_.client_id_with_password,
-                render->client_id_with_password_,
-                sizeof(render->cd_cache_v2_.client_id_with_password));
-        memcpy(&render->cd_cache_v2_.key, &render->aes128_key_,
-               sizeof(render->cd_cache_v2_.key));
-        memcpy(&render->cd_cache_v2_.iv, &render->aes128_iv_,
-               sizeof(render->cd_cache_v2_.iv));
-      }
-
-      memset(&render->cd_cache_v2_.self_hosted_id, 0,
-             sizeof(render->cd_cache_v2_.self_hosted_id));
-      strncpy(render->cd_cache_v2_.self_hosted_id, client_id,
-              sizeof(render->cd_cache_v2_.self_hosted_id) - 1);
-      render->cd_cache_v2_
-          .self_hosted_id[sizeof(render->cd_cache_v2_.self_hosted_id) - 1] =
-          '\0';
-
-      memset(&render->cd_cache_v2_.client_id_with_password, 0,
-             sizeof(render->cd_cache_v2_.client_id_with_password));
-      strncpy(render->cd_cache_v2_.client_id_with_password,
-              render->client_id_with_password_,
-              sizeof(render->cd_cache_v2_.client_id_with_password));
-      memcpy(&render->cd_cache_v2_.key, &render->aes128_key_,
-             sizeof(render->cd_cache_v2_.key));
-      memcpy(&render->cd_cache_v2_.iv, &render->aes128_iv_,
-             sizeof(render->cd_cache_v2_.iv));
-      std::ofstream cd_cache_v2_file(
-          render->cache_path_ + "/secure_cache_v2.enc", std::ios::binary);
-      if (cd_cache_v2_file) {
-        cd_cache_v2_file.write(reinterpret_cast<char*>(&render->cd_cache_v2_),
-                               sizeof(CDCacheV2));
-        cd_cache_v2_file.close();
-      }
-
-      render->cd_cache_mutex_.unlock();
-    } else {
    memset(&render->client_id_, 0, sizeof(render->client_id_));
    strncpy(render->client_id_, id.c_str(), sizeof(render->client_id_) - 1);
    render->client_id_[sizeof(render->client_id_) - 1] = '\0';
@@ -637,17 +516,14 @@ void Render::NetStatusReport(const char* client_id, size_t client_id_size,
           sizeof(render->client_id_with_password_));
    strncpy(render->client_id_with_password_, client_id,
            sizeof(render->client_id_with_password_) - 1);
-      render
-          ->client_id_with_password_[sizeof(render->client_id_with_password_) -
+    render->client_id_with_password_[sizeof(render->client_id_with_password_) -
                                     1] = '\0';

    LOG_INFO("Use client id [{}] and save id into cache file", id);
    render->SaveSettingsIntoCacheFile();
  }
-  }

  std::string remote_id(user_id, user_id_size);
-  // std::shared_lock lock(render->client_properties_mutex_);
  if (render->client_properties_.find(remote_id) ==
      render->client_properties_.end()) {
    return;
@@ -667,4 +543,3 @@ void Render::NetStatusReport(const char* client_id, size_t client_id_size,
    props->net_traffic_stats_ = *net_traffic_stats;
  }
 }
-}  // namespace crossdesk
--- a/src/gui/toolbars/control_bar.cpp
+++ b/src/gui/toolbars/control_bar.cpp
@@ -3,8 +3,6 @@
 #include "rd_log.h"
 #include "render.h"

-namespace crossdesk {
-
 int CountDigits(int number) {
  if (number == 0) return 1;
  return (int)std::floor(std::log10(std::abs(number))) + 1;
@@ -32,30 +30,26 @@ int LossRateDisplay(float loss_rate) {
 }

 int Render::ControlBar(std::shared_ptr<SubStreamWindowProperties>& props) {
-  float button_width = title_bar_height_ * 0.8f;
-  float button_height = title_bar_height_ * 0.8f;
-  float line_padding = title_bar_height_ * 0.12f;
-  float line_thickness = title_bar_height_ * 0.07f;
-
  ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 3.0f);
+
  if (props->control_bar_expand_) {
    ImGui::SetCursorPosX(props->is_control_bar_in_left_
-                             ? props->control_window_width_ * 1.03f
-                             : props->control_window_width_ * 0.2f);
-
+                             ? (props->control_window_width_ + 5.0f)
+                             : 38.0f);
+    // mouse control button
    ImDrawList* draw_list = ImGui::GetWindowDrawList();
-    if (!props->is_control_bar_in_left_) {
-      draw_list->AddLine(
-          ImVec2(ImGui::GetCursorScreenPos().x - button_height * 0.56f,
-                 ImGui::GetCursorScreenPos().y + button_height * 0.2f),
-          ImVec2(ImGui::GetCursorScreenPos().x - button_height * 0.56f,
-                 ImGui::GetCursorScreenPos().y + button_height * 0.8f),
-          IM_COL32(178, 178, 178, 255), 2.0f);
+
+    if (props->is_control_bar_in_left_) {
+      draw_list->AddLine(ImVec2(ImGui::GetCursorScreenPos().x - 5.0f,
+                                ImGui::GetCursorScreenPos().y - 7.0f),
+                         ImVec2(ImGui::GetCursorScreenPos().x - 5.0f,
+                                ImGui::GetCursorScreenPos().y - 7.0f +
+                                    props->control_window_height_),
+                         IM_COL32(178, 178, 178, 255), 1.0f);
    }

    std::string display = ICON_FA_DISPLAY;
-    ImGui::SetWindowFontScale(0.5f);
-    if (ImGui::Button(display.c_str(), ImVec2(button_width, button_height))) {
+    if (ImGui::Button(display.c_str(), ImVec2(25, 25))) {
      ImGui::OpenPopup("display");
    }

@@ -72,36 +66,34 @@ int Render::ControlBar(std::shared_ptr<SubStreamWindowProperties>& props) {
          remote_action.type = ControlType::display_id;
          remote_action.d = i;
          if (props->connection_status_ == ConnectionStatus::Connected) {
-            std::string msg = remote_action.to_json();
-            SendDataFrame(props->peer_, msg.c_str(), msg.size(),
-                          props->data_label_.c_str());
+            SendDataFrame(props->peer_, (const char*)&remote_action,
+                          sizeof(remote_action), props->data_label_.c_str());
          }
        }
        props->display_selectable_hovered_ = ImGui::IsWindowHovered();
      }
+      ImGui::SetWindowFontScale(1.0f);
      ImGui::EndPopup();
    }

-    ImGui::SetWindowFontScale(0.5f);
+    ImGui::SetWindowFontScale(0.6f);
    ImVec2 text_size = ImGui::CalcTextSize(
        std::to_string(props->selected_display_ + 1).c_str());
    ImVec2 text_pos =
        ImVec2(btn_min.x + (btn_size_actual.x - text_size.x) * 0.5f,
-               btn_min.y + (btn_size_actual.y - text_size.y) * 0.35f);
+               btn_min.y + (btn_size_actual.y - text_size.y) * 0.5f - 2.0f);
    ImGui::GetWindowDrawList()->AddText(
        text_pos, IM_COL32(0, 0, 0, 255),
        std::to_string(props->selected_display_ + 1).c_str());
+    ImGui::SetWindowFontScale(1.0f);

    ImGui::SameLine();
-    float mouse_x = ImGui::GetCursorScreenPos().x;
-    float mouse_y = ImGui::GetCursorScreenPos().y;
-    float disable_mouse_x = mouse_x + line_padding;
-    float disable_mouse_y = mouse_y + line_padding;
+    float disable_mouse_x = ImGui::GetCursorScreenPos().x + 4.0f;
+    float disable_mouse_y = ImGui::GetCursorScreenPos().y + 4.0f;
    std::string mouse = props->mouse_control_button_pressed_
                            ? ICON_FA_COMPUTER_MOUSE
                            : ICON_FA_COMPUTER_MOUSE;
-    ImGui::SetWindowFontScale(0.5f);
-    if (ImGui::Button(mouse.c_str(), ImVec2(button_width, button_height))) {
+    if (ImGui::Button(mouse.c_str(), ImVec2(25, 25))) {
      if (props->connection_established_) {
        start_keyboard_capturer_ = !start_keyboard_capturer_;
        props->control_mouse_ = !props->control_mouse_;
@@ -113,35 +105,30 @@ int Render::ControlBar(std::shared_ptr<SubStreamWindowProperties>& props) {
                : localization::control_mouse[localization_language_index_];
      }
    }
-
    if (!props->mouse_control_button_pressed_) {
-      draw_list->AddLine(ImVec2(disable_mouse_x, disable_mouse_y),
-                         ImVec2(mouse_x + button_width - line_padding,
-                                mouse_y + button_height - line_padding),
-                         IM_COL32(0, 0, 0, 255), line_thickness);
      draw_list->AddLine(
-          ImVec2(disable_mouse_x - line_thickness * 0.7f,
-                 disable_mouse_y + line_thickness * 0.7f),
-          ImVec2(
-              mouse_x + button_width - line_padding - line_thickness * 0.7f,
-              mouse_y + button_height - line_padding + line_thickness * 0.7f),
+          ImVec2(disable_mouse_x, disable_mouse_y),
+          ImVec2(disable_mouse_x + 16.0f, disable_mouse_y + 14.2f),
+          IM_COL32(0, 0, 0, 255), 2.0f);
+      draw_list->AddLine(
+          ImVec2(disable_mouse_x - 1.2f, disable_mouse_y + 1.2f),
+          ImVec2(disable_mouse_x + 15.3f, disable_mouse_y + 15.4f),
          ImGui::IsItemHovered() ? IM_COL32(66, 150, 250, 255)
                                 : IM_COL32(179, 213, 253, 255),
-          line_thickness);
+          2.0f);
    }

    ImGui::SameLine();
    // audio capture button
-    float audio_x = ImGui::GetCursorScreenPos().x;
-    float audio_y = ImGui::GetCursorScreenPos().y;
-    float disable_audio_x = audio_x + line_padding;
-    float disable_audio_y = audio_y + line_padding;
-
+    float disable_audio_x = ImGui::GetCursorScreenPos().x + 4;
+    float disable_audio_y = ImGui::GetCursorScreenPos().y + 4.0f;
+    // std::string audio = audio_capture_button_pressed_ ? ICON_FA_VOLUME_HIGH
+    //                                                   :
+    //                                                   ICON_FA_VOLUME_XMARK;
    std::string audio = props->audio_capture_button_pressed_
                            ? ICON_FA_VOLUME_HIGH
                            : ICON_FA_VOLUME_HIGH;
-    ImGui::SetWindowFontScale(0.5f);
-    if (ImGui::Button(audio.c_str(), ImVec2(button_width, button_height))) {
+    if (ImGui::Button(audio.c_str(), ImVec2(25, 25))) {
      if (props->connection_established_) {
        props->audio_capture_button_pressed_ =
            !props->audio_capture_button_pressed_;
@@ -153,26 +140,21 @@ int Render::ControlBar(std::shared_ptr<SubStreamWindowProperties>& props) {
        RemoteAction remote_action;
        remote_action.type = ControlType::audio_capture;
        remote_action.a = props->audio_capture_button_pressed_;
-        std::string msg = remote_action.to_json();
-        SendDataFrame(props->peer_, msg.c_str(), msg.size(),
-                      props->data_label_.c_str());
+        SendDataFrame(props->peer_, (const char*)&remote_action,
+                      sizeof(remote_action), props->data_label_.c_str());
      }
    }
-
    if (!props->audio_capture_button_pressed_) {
-      draw_list->AddLine(ImVec2(disable_audio_x, disable_audio_y),
-                         ImVec2(audio_x + button_width - line_padding,
-                                audio_y + button_height - line_padding),
-                         IM_COL32(0, 0, 0, 255), line_thickness);
      draw_list->AddLine(
-          ImVec2(disable_audio_x - line_thickness * 0.7f,
-                 disable_audio_y + line_thickness * 0.7f),
-          ImVec2(
-              audio_x + button_width - line_padding - line_thickness * 0.7f,
-              audio_y + button_height - line_padding + line_thickness * 0.7f),
+          ImVec2(disable_audio_x, disable_audio_y),
+          ImVec2(disable_audio_x + 16.0f, disable_audio_y + 14.2f),
+          IM_COL32(0, 0, 0, 255), 2.0f);
+      draw_list->AddLine(
+          ImVec2(disable_audio_x - 1.2f, disable_audio_y + 1.2f),
+          ImVec2(disable_audio_x + 15.3f, disable_audio_y + 15.4f),
          ImGui::IsItemHovered() ? IM_COL32(66, 150, 250, 255)
                                 : IM_COL32(179, 213, 253, 255),
-          line_thickness);
+          2.0f);
    }

    ImGui::SameLine();
@@ -184,9 +166,7 @@ int Render::ControlBar(std::shared_ptr<SubStreamWindowProperties>& props) {
      button_color_style_pushed = true;
    }
    std::string net_traffic_stats = ICON_FA_SIGNAL;
-    ImGui::SetWindowFontScale(0.5f);
-    if (ImGui::Button(net_traffic_stats.c_str(),
-                      ImVec2(button_width, button_height))) {
+    if (ImGui::Button(net_traffic_stats.c_str(), ImVec2(25, 25))) {
      props->net_traffic_stats_button_pressed_ =
          !props->net_traffic_stats_button_pressed_;
      props->control_window_height_is_changing_ = true;
@@ -198,7 +178,6 @@ int Render::ControlBar(std::shared_ptr<SubStreamWindowProperties>& props) {
              : localization::show_net_traffic_stats
                    [localization_language_index_];
    }
-
    if (button_color_style_pushed) {
      ImGui::PopStyleColor();
      button_color_style_pushed = false;
@@ -208,9 +187,7 @@ int Render::ControlBar(std::shared_ptr<SubStreamWindowProperties>& props) {
    // fullscreen button
    std::string fullscreen =
        fullscreen_button_pressed_ ? ICON_FA_COMPRESS : ICON_FA_EXPAND;
-    ImGui::SetWindowFontScale(0.5f);
-    if (ImGui::Button(fullscreen.c_str(),
-                      ImVec2(button_width, button_height))) {
+    if (ImGui::Button(fullscreen.c_str(), ImVec2(25, 25))) {
      fullscreen_button_pressed_ = !fullscreen_button_pressed_;
      props->fullscreen_button_label_ =
          fullscreen_button_pressed_
@@ -228,35 +205,25 @@ int Render::ControlBar(std::shared_ptr<SubStreamWindowProperties>& props) {
    ImGui::SameLine();
    // close button
    std::string close_button = ICON_FA_XMARK;
-    ImGui::SetWindowFontScale(0.5f);
-    if (ImGui::Button(close_button.c_str(),
-                      ImVec2(button_width, button_height))) {
+    if (ImGui::Button(close_button.c_str(), ImVec2(25, 25))) {
      CleanupPeer(props);
    }

    ImGui::SameLine();

-    if (props->is_control_bar_in_left_) {
-      draw_list->AddLine(
-          ImVec2(ImGui::GetCursorScreenPos().x + button_height * 0.2f,
-                 ImGui::GetCursorScreenPos().y + button_height * 0.2f),
-          ImVec2(ImGui::GetCursorScreenPos().x + button_height * 0.2f,
-                 ImGui::GetCursorScreenPos().y + button_height * 0.8f),
-          IM_COL32(178, 178, 178, 255), 2.0f);
+    if (!props->is_control_bar_in_left_) {
+      draw_list->AddLine(ImVec2(ImGui::GetCursorScreenPos().x - 3.0f,
+                                ImGui::GetCursorScreenPos().y - 7.0f),
+                         ImVec2(ImGui::GetCursorScreenPos().x - 3.0f,
+                                ImGui::GetCursorScreenPos().y - 7.0f +
+                                    props->control_window_height_),
+                         IM_COL32(178, 178, 178, 255), 1.0f);
+    }
  }

-    ImGui::SameLine();
-  }
-
-  float expand_button_pos_x =
-      props->control_bar_expand_ ? (props->is_control_bar_in_left_
-                                        ? props->control_window_width_ * 1.91f
-                                        : props->control_window_width_ * 0.03f)
-                                 : (props->is_control_bar_in_left_
-                                        ? props->control_window_width_ * 1.02f
-                                        : props->control_window_width_ * 0.23f);
-
-  ImGui::SetCursorPosX(expand_button_pos_x);
+  ImGui::SetCursorPosX(props->is_control_bar_in_left_
+                           ? (props->control_window_width_ * 2 - 20.0f)
+                           : 5.0f);

  std::string control_bar =
      props->control_bar_expand_
@@ -264,14 +231,13 @@ int Render::ControlBar(std::shared_ptr<SubStreamWindowProperties>& props) {
                                            : ICON_FA_ANGLE_RIGHT)
          : (props->is_control_bar_in_left_ ? ICON_FA_ANGLE_RIGHT
                                            : ICON_FA_ANGLE_LEFT);
-  if (ImGui::Button(control_bar.c_str(),
-                    ImVec2(button_height * 0.6f, button_height))) {
+  if (ImGui::Button(control_bar.c_str(), ImVec2(15, 25))) {
    props->control_bar_expand_ = !props->control_bar_expand_;
    props->control_bar_button_pressed_time_ = ImGui::GetTime();
    props->control_window_width_is_changing_ = true;

    if (!props->control_bar_expand_) {
-      props->control_window_height_ = props->control_window_min_height_;
+      props->control_window_height_ = 40;
      props->net_traffic_stats_button_pressed_ = false;
    }
  }
@@ -287,13 +253,13 @@ int Render::ControlBar(std::shared_ptr<SubStreamWindowProperties>& props) {

 int Render::NetTrafficStats(std::shared_ptr<SubStreamWindowProperties>& props) {
  ImGui::SetCursorPos(ImVec2(props->is_control_bar_in_left_
-                                 ? props->control_window_width_ * 1.02f
-                                 : props->control_window_width_ * 0.02f,
-                             props->control_window_min_height_));
-  ImGui::SetWindowFontScale(0.5f);
+                                 ? (props->control_window_width_ + 5.0f)
+                                 : 5.0f,
+                             40.0f));
+
  if (ImGui::BeginTable("NetTrafficStats", 4, ImGuiTableFlags_BordersH,
-                        ImVec2(props->control_window_max_width_ * 0.9f,
-                               props->control_window_max_height_ - 0.9f))) {
+                        ImVec2(props->control_window_max_width_ - 10.0f,
+                               props->control_window_max_height_ - 60.0f))) {
    ImGui::TableSetupColumn("", ImGuiTableColumnFlags_WidthFixed);
    ImGui::TableSetupColumn("", ImGuiTableColumnFlags_WidthStretch);
    ImGui::TableSetupColumn("", ImGuiTableColumnFlags_WidthStretch);
@@ -352,13 +318,9 @@ int Render::NetTrafficStats(std::shared_ptr<SubStreamWindowProperties>& props) {
    ImGui::Text("FPS");
    ImGui::TableNextColumn();
    ImGui::Text("%d", props->fps_);
-    ImGui::TableNextColumn();
-    ImGui::TableNextColumn();

    ImGui::EndTable();
  }
-  ImGui::SetWindowFontScale(1.0f);

  return 0;
 }
-}  // namespace crossdesk
--- a/src/gui/toolbars/status_bar.cpp
+++ b/src/gui/toolbars/status_bar.cpp
@@ -1,38 +1,30 @@
-#include "layout_relative.h"
 #include "localization.h"
 #include "render.h"

-namespace crossdesk {
-
 int Render::StatusBar() {
-  ImGuiIO& io = ImGui::GetIO();
-  float status_bar_width = io.DisplaySize.x;
-  float status_bar_height = io.DisplaySize.y * STATUS_BAR_HEIGHT;
-
  ImGui::PushStyleColor(ImGuiCol_ChildBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
  static bool a, b, c, d, e;
-  ImGui::SetNextWindowPos(ImVec2(0, io.DisplaySize.y * (1 - STATUS_BAR_HEIGHT)),
+  ImGui::SetNextWindowPos(
+      ImVec2(0, main_window_height_default_ - status_bar_height_ - 1),
      ImGuiCond_Always);

  ImGui::BeginChild(
-      "StatusBar", ImVec2(status_bar_width, status_bar_height),
+      "StatusBar", ImVec2(main_window_width_, status_bar_height_ + 1),
      ImGuiChildFlags_Border,
      ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoBringToFrontOnFocus);

-  ImVec2 dot_pos = ImVec2(status_bar_width * 0.025f,
-                          io.DisplaySize.y * (1 - STATUS_BAR_HEIGHT * 0.5f));
+  ImVec2 dot_pos =
+      ImVec2(13, main_window_height_default_ - status_bar_height_ + 11.0f);
  ImDrawList* draw_list = ImGui::GetWindowDrawList();
-  draw_list->AddCircleFilled(dot_pos, status_bar_height * 0.2f,
+  draw_list->AddCircleFilled(dot_pos, 5.0f,
                             ImColor(signal_connected_ ? 0.0f : 1.0f,
                                     signal_connected_ ? 1.0f : 0.0f, 0.0f),
                             100);
-  draw_list->AddCircle(dot_pos, status_bar_height * 0.25f,
-                       ImColor(1.0f, 1.0f, 1.0f), 100);
+  draw_list->AddCircle(dot_pos, 6.0f, ImColor(1.0f, 1.0f, 1.0f), 100);

  ImGui::SetWindowFontScale(0.6f);
  draw_list->AddText(
-      ImVec2(status_bar_width * 0.045f,
-             io.DisplaySize.y * (1 - STATUS_BAR_HEIGHT * 0.9f)),
+      ImVec2(25, main_window_height_default_ - status_bar_height_ + 3.0f),
      ImColor(0.0f, 0.0f, 0.0f),
      signal_connected_
          ? localization::signal_connected[localization_language_index_].c_str()
@@ -44,4 +36,3 @@ int Render::StatusBar() {
  ImGui::EndChild();
  return 0;
 }
-}  // namespace crossdesk
--- a/src/gui/toolbars/title_bar.cpp
+++ b/src/gui/toolbars/title_bar.cpp
@@ -1,303 +1,166 @@
-#include "layout_relative.h"
 #include "localization.h"
 #include "rd_log.h"
 #include "render.h"

-#define NEW_VERSION_ICON_RENDER_TIME_INTERVAL 2000
-
-namespace crossdesk {
+#define BUTTON_PADDING 36.0f

 int Render::TitleBar(bool main_window) {
-  ImGuiIO& io = ImGui::GetIO();
-  float title_bar_width = title_bar_width_;
-  float title_bar_height = title_bar_height_;
-  float title_bar_height_padding = title_bar_height_;
-  float title_bar_button_width = title_bar_button_width_;
-  float title_bar_button_height = title_bar_button_height_;
-  if (main_window) {
-    title_bar_width = io.DisplaySize.x;
-    title_bar_height = io.DisplaySize.y * TITLE_BAR_HEIGHT;
-    title_bar_height_padding = io.DisplaySize.y * (TITLE_BAR_HEIGHT + 0.01f);
-    title_bar_button_width = io.DisplaySize.x * TITLE_BAR_BUTTON_WIDTH;
-    title_bar_button_height = io.DisplaySize.y * TITLE_BAR_BUTTON_HEIGHT;
-    title_bar_height_ = title_bar_height;
-    title_bar_button_width_ = title_bar_button_width;
-    title_bar_button_height_ = title_bar_button_height;
-  } else {
-    title_bar_width = io.DisplaySize.x;
-    title_bar_height = title_bar_button_height_;
-    title_bar_button_width = title_bar_button_width_;
-    title_bar_button_height = title_bar_button_height_;
-  }
-
+  ImGui::PushStyleColor(ImGuiCol_MenuBarBg, ImVec4(1.0f, 1.0f, 1.0f, 0.0f));
  ImGui::PushStyleColor(ImGuiCol_ChildBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
-  ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0, 0));
  ImGui::SetNextWindowPos(ImVec2(0, 0), ImGuiCond_Always);
-  ImGui::BeginChild(main_window ? "MainTitleBar" : "StreamTitleBar",
-                    ImVec2(title_bar_width, title_bar_height_padding),
+  ImGui::SetWindowFontScale(0.8f);
+  ImGui::BeginChild(
+      main_window ? "MainTitleBar" : "StreamTitleBar",
+      ImVec2(main_window ? main_window_width_ : stream_window_width_,
+             title_bar_height_),
      ImGuiChildFlags_Border,
-                    ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove |
+      ImGuiWindowFlags_MenuBar | ImGuiWindowFlags_NoDecoration |
          ImGuiWindowFlags_NoBringToFrontOnFocus);
-  ImGui::PopStyleVar();
+  ImGui::SetWindowFontScale(1.0f);
  ImGui::PopStyleColor();

-  // get draw list
  ImDrawList* draw_list = ImGui::GetWindowDrawList();
-
-  ImGui::SetCursorPos(
-      ImVec2(title_bar_width - title_bar_button_width * 3, 0.0f));
-  if (main_window) {
-    float bar_pos_x = title_bar_width - title_bar_button_width * 3 +
-                      title_bar_button_width * 0.33f;
-    float bar_pos_y = title_bar_button_height * 0.5f;
-
-    // draw menu icon
-    float menu_bar_line_size = title_bar_button_width * 0.33f;
-    draw_list->AddLine(
-        ImVec2(bar_pos_x, bar_pos_y - title_bar_button_height * 0.15f),
-        ImVec2(bar_pos_x + menu_bar_line_size,
-               bar_pos_y - title_bar_button_height * 0.15f),
-        IM_COL32(0, 0, 0, 255));
-    draw_list->AddLine(ImVec2(bar_pos_x, bar_pos_y),
-                       ImVec2(bar_pos_x + menu_bar_line_size, bar_pos_y),
-                       IM_COL32(0, 0, 0, 255));
-    draw_list->AddLine(
-        ImVec2(bar_pos_x, bar_pos_y + title_bar_button_height * 0.15f),
-        ImVec2(bar_pos_x + menu_bar_line_size,
-               bar_pos_y + title_bar_button_height * 0.15f),
-        IM_COL32(0, 0, 0, 255));
-
-    std::string title_bar_menu_button = "##title_bar_menu";  // ICON_FA_BARS;
-    std::string title_bar_menu = "##title_bar_menu";
-
-    ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0, 0, 0, 0));
-    ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(0, 0, 0, 0.1f));
-    ImGui::PushStyleColor(ImGuiCol_ButtonActive,
+  if (ImGui::BeginMenuBar()) {
+    ImGui::SetCursorPosX(
+        (main_window ? main_window_width_ : stream_window_width_) -
+        (BUTTON_PADDING * 3 - 3));
+    ImGui::PushStyleColor(ImGuiCol_HeaderHovered, ImVec4(0, 0, 0, 0.1f));
+    ImGui::PushStyleColor(ImGuiCol_HeaderActive,
                          ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
-    if (ImGui::Button(
-            title_bar_menu_button.c_str(),
-            ImVec2(title_bar_button_width, title_bar_button_height))) {
-      ImGui::OpenPopup(title_bar_menu.c_str());
-    }
-    ImGui::PopStyleColor(3);
-
-    if (ImGui::BeginPopup(title_bar_menu.c_str())) {
-      ImGui::SetWindowFontScale(0.6f);
+    if (main_window) {
+      float bar_pos_x = ImGui::GetCursorPosX() + 6;
+      float bar_pos_y = ImGui::GetCursorPosY() + 15;
+      std::string menu_button = "    ";  // ICON_FA_BARS;
+      if (ImGui::BeginMenu(menu_button.c_str())) {
+        ImGui::SetWindowFontScale(0.5f);
        if (ImGui::MenuItem(
                localization::settings[localization_language_index_].c_str())) {
          show_settings_window_ = true;
        }
-
-      show_new_version_icon_in_menu_ = false;
-
-      std::string about_str = localization::about[localization_language_index_];
-      if (update_available_) {
-        auto now_time = std::chrono::duration_cast<std::chrono::milliseconds>(
-                            std::chrono::steady_clock::now().time_since_epoch())
-                            .count();
-
-        // every 2 seconds
-        if (now_time - new_version_icon_last_trigger_time_ >=
-            NEW_VERSION_ICON_RENDER_TIME_INTERVAL) {
-          show_new_version_icon_ = true;
-          new_version_icon_render_start_time_ = now_time;
-          new_version_icon_last_trigger_time_ = now_time;
-        }
-
-        // render for 1 second
-        if (show_new_version_icon_) {
-          about_str = about_str + " " + ICON_FA_TRIANGLE_EXCLAMATION;
-          if (now_time - new_version_icon_render_start_time_ >=
-              NEW_VERSION_ICON_RENDER_TIME_INTERVAL / 2) {
-            show_new_version_icon_ = false;
-          }
-        } else {
-          about_str = about_str + "      ";
-        }
-      }
-
-      if (ImGui::MenuItem(about_str.c_str())) {
+        if (ImGui::MenuItem(
+                localization::about[localization_language_index_].c_str())) {
          show_about_window_ = true;
        }
-
-      if (update_available_ && ImGui::IsItemHovered()) {
-        ImGui::BeginTooltip();
-        ImGui::SetWindowFontScale(0.5f);
-        std::string new_version_available_str =
-            localization::new_version_available[localization_language_index_] +
-            ": " + latest_version_;
-        ImGui::Text("%s", new_version_available_str.c_str());
        ImGui::SetWindowFontScale(1.0f);
-        ImGui::EndTooltip();
-      }
-
-      ImGui::EndPopup();
-    } else {
-      show_new_version_icon_in_menu_ = true;
-    }
-
-    if (update_available_ && show_new_version_icon_in_menu_) {
-      auto now_time = std::chrono::duration_cast<std::chrono::milliseconds>(
-                          std::chrono::steady_clock::now().time_since_epoch())
-                          .count();
-
-      // every 2 seconds
-      if (now_time - new_version_icon_last_trigger_time_ >=
-          NEW_VERSION_ICON_RENDER_TIME_INTERVAL) {
-        show_new_version_icon_ = true;
-        new_version_icon_render_start_time_ = now_time;
-        new_version_icon_last_trigger_time_ = now_time;
-      }
-
-      // render for 1 second
-      if (show_new_version_icon_) {
-        ImGui::SetWindowFontScale(0.6f);
-        ImGui::SetCursorPos(
-            ImVec2(bar_pos_x + title_bar_button_width * 0.15f,
-                   bar_pos_y - title_bar_button_width * 0.325f));
-        ImGui::Text(ICON_FA_TRIANGLE_EXCLAMATION);
-        ImGui::SetWindowFontScale(1.0f);
-
-        if (now_time - new_version_icon_render_start_time_ >=
-            NEW_VERSION_ICON_RENDER_TIME_INTERVAL / 2) {
-          show_new_version_icon_ = false;
-        }
-      }
+        ImGui::EndMenu();
      }
+      float menu_bar_line_size = 15.0f;
+      draw_list->AddLine(ImVec2(bar_pos_x, bar_pos_y - 6),
+                         ImVec2(bar_pos_x + menu_bar_line_size, bar_pos_y - 6),
+                         IM_COL32(0, 0, 0, 255));
+      draw_list->AddLine(ImVec2(bar_pos_x, bar_pos_y),
+                         ImVec2(bar_pos_x + menu_bar_line_size, bar_pos_y),
+                         IM_COL32(0, 0, 0, 255));
+      draw_list->AddLine(ImVec2(bar_pos_x, bar_pos_y + 6),
+                         ImVec2(bar_pos_x + menu_bar_line_size, bar_pos_y + 6),
+                         IM_COL32(0, 0, 0, 255));

      {
        SettingWindow();
        SelfHostedServerWindow();
        AboutWindow();
      }
-  } else {
-    ImGui::SetWindowFontScale(1.2f);
    }

-  ImGui::SetCursorPos(ImVec2(
-      title_bar_width - title_bar_button_width * (main_window ? 2 : 3), 0.0f));
-  ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0, 0, 0, 0));
-  ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(0, 0, 0, 0.1f));
-  ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
+    ImGui::PopStyleColor(2);

-  float minimize_pos_x = title_bar_width -
-                         title_bar_button_width * (main_window ? 2 : 3) +
-                         title_bar_button_width * 0.33f;
-  float minimize_pos_y = title_bar_button_height * 0.5f;
+    ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0, 0, 0, 0));
+    ImGui::SetCursorPosX(main_window
+                             ? (main_window_width_ - BUTTON_PADDING * 2)
+                             : (stream_window_width_ - BUTTON_PADDING * 3));
+    ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(0, 0, 0, 0.1f));
+    ImGui::PushStyleColor(ImGuiCol_ButtonActive,
+                          ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
+
+    float minimize_pos_x = ImGui::GetCursorPosX() + 12;
+    float minimize_pos_y = ImGui::GetCursorPosY() + 15;
    std::string window_minimize_button = "##minimize";  // ICON_FA_MINUS;
    if (ImGui::Button(window_minimize_button.c_str(),
-                    ImVec2(title_bar_button_width, title_bar_button_height))) {
+                      ImVec2(BUTTON_PADDING, 30))) {
      SDL_MinimizeWindow(main_window ? main_window_ : stream_window_);
    }
-  draw_list->AddLine(
-      ImVec2(minimize_pos_x, minimize_pos_y),
-      ImVec2(minimize_pos_x + title_bar_button_width * 0.33f, minimize_pos_y),
+    draw_list->AddLine(ImVec2(minimize_pos_x, minimize_pos_y),
+                       ImVec2(minimize_pos_x + 12, minimize_pos_y),
                       IM_COL32(0, 0, 0, 255));
-  ImGui::PopStyleColor(3);
+    ImGui::PopStyleColor(2);

    if (!main_window) {
-    ImGui::SetCursorPos(
-        ImVec2(title_bar_width - title_bar_button_width * 2, 0.0f));
-    ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0, 0, 0, 0));
+      ImGui::SetCursorPosX(stream_window_width_ - BUTTON_PADDING * 2);
      ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(0, 0, 0, 0.1f));
      ImGui::PushStyleColor(ImGuiCol_ButtonActive,
                            ImVec4(1.0f, 1.0f, 1.0f, 1.0f));

      if (window_maximized_) {
-      float pos_x_top = title_bar_width - title_bar_button_width * 1.65f;
-      float pos_y_top = title_bar_button_height * 0.36f;
-      float pos_x_bottom = title_bar_width - title_bar_button_width * 1.6f;
-      float pos_y_bottom = title_bar_button_height * 0.28f;
+        float pos_x_top = ImGui::GetCursorPosX() + 11;
+        float pos_y_top = ImGui::GetCursorPosY() + 11;
+        float pos_x_bottom = ImGui::GetCursorPosX() + 13;
+        float pos_y_bottom = ImGui::GetCursorPosY() + 9;
        std::string window_restore_button =
            "##restore";  // ICON_FA_WINDOW_RESTORE;
-      if (ImGui::Button(
-              window_restore_button.c_str(),
-              ImVec2(title_bar_button_width, title_bar_button_height))) {
+        if (ImGui::Button(window_restore_button.c_str(),
+                          ImVec2(BUTTON_PADDING, 30))) {
          SDL_RestoreWindow(stream_window_);
          window_maximized_ = false;
        }
        draw_list->AddRect(ImVec2(pos_x_top, pos_y_top),
-                         ImVec2(pos_x_top + title_bar_button_height * 0.33f,
-                                pos_y_top + title_bar_button_height * 0.33f),
+                           ImVec2(pos_x_top + 12, pos_y_top + 12),
                           IM_COL32(0, 0, 0, 255));
        draw_list->AddRect(ImVec2(pos_x_bottom, pos_y_bottom),
-                         ImVec2(pos_x_bottom + title_bar_button_height * 0.33f,
-                                pos_y_bottom + title_bar_button_height * 0.33f),
+                           ImVec2(pos_x_bottom + 12, pos_y_bottom + 12),
                           IM_COL32(0, 0, 0, 255));
-      if (ImGui::IsItemHovered()) {
-        draw_list->AddRectFilled(
-            ImVec2(pos_x_top + title_bar_button_height * 0.02f,
-                   pos_y_top + title_bar_button_height * 0.01f),
-            ImVec2(pos_x_top + title_bar_button_height * 0.32f,
-                   pos_y_top + title_bar_button_height * 0.31f),
-            IM_COL32(229, 229, 229, 255));
-      } else {
-        draw_list->AddRectFilled(
-            ImVec2(pos_x_top + title_bar_button_height * 0.02f,
-                   pos_y_top + title_bar_button_height * 0.01f),
-            ImVec2(pos_x_top + title_bar_button_height * 0.32f,
-                   pos_y_top + title_bar_button_height * 0.31f),
+        draw_list->AddRectFilled(ImVec2(pos_x_top + 1, pos_y_top + 1),
+                                 ImVec2(pos_x_top + 11, pos_y_top + 11),
                                 IM_COL32(255, 255, 255, 255));
-      }
      } else {
-      float maximize_pos_x = title_bar_width - title_bar_button_width * 1.5f -
-                             title_bar_button_height * 0.165f;
-      float maximize_pos_y = title_bar_button_height * 0.33f;
+        float maximize_pos_x = ImGui::GetCursorPosX() + 12;
+        float maximize_pos_y = ImGui::GetCursorPosY() + 10;
        std::string window_maximize_button =
            "##maximize";  // ICON_FA_SQUARE_FULL;
-      if (ImGui::Button(
-              window_maximize_button.c_str(),
-              ImVec2(title_bar_button_width, title_bar_button_height))) {
+        if (ImGui::Button(window_maximize_button.c_str(),
+                          ImVec2(BUTTON_PADDING, 30))) {
          SDL_MaximizeWindow(stream_window_);
          window_maximized_ = !window_maximized_;
        }
-      draw_list->AddRect(
-          ImVec2(maximize_pos_x, maximize_pos_y),
-          ImVec2(maximize_pos_x + title_bar_button_height * 0.33f,
-                 maximize_pos_y + title_bar_button_height * 0.33f),
+        draw_list->AddRect(ImVec2(maximize_pos_x, maximize_pos_y),
+                           ImVec2(maximize_pos_x + 12, maximize_pos_y + 12),
                           IM_COL32(0, 0, 0, 255));
      }
-    ImGui::PopStyleColor(3);
+      ImGui::PopStyleColor(2);
    }

-  float xmark_button_pos_x = title_bar_width - title_bar_button_width;
-  ImGui::SetCursorPos(ImVec2(xmark_button_pos_x, 0.0f));
-  ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0, 0, 0, 0));
+    ImGui::SetCursorPosX(
+        (main_window ? main_window_width_ : stream_window_width_) -
+        BUTTON_PADDING);
    ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(1.0f, 0, 0, 1.0f));
    ImGui::PushStyleColor(ImGuiCol_ButtonActive, ImVec4(1.0f, 0, 0, 0.5f));

-  float xmark_pos_x = xmark_button_pos_x + title_bar_button_width * 0.5f;
-  float xmark_pos_y = title_bar_button_height * 0.5f;
-  float xmark_size = title_bar_button_width * 0.33f;
+    float xmark_pos_x = ImGui::GetCursorPosX() + 18;
+    float xmark_pos_y = ImGui::GetCursorPosY() + 16;
+    float xmark_size = 12.0f;
    std::string close_button = "##xmark";  // ICON_FA_XMARK;
-  if (ImGui::Button(close_button.c_str(),
-                    ImVec2(title_bar_button_width, title_bar_button_height))) {
-#if _WIN32
-    if (enable_minimize_to_tray_) {
-      tray_->MinimizeToTray();
-    } else {
-#endif
+    if (ImGui::Button(close_button.c_str(), ImVec2(BUTTON_PADDING, 30))) {
      SDL_Event event;
      event.type = SDL_EVENT_QUIT;
      SDL_PushEvent(&event);
-#if _WIN32
-    }
-#endif
    }
    draw_list->AddLine(ImVec2(xmark_pos_x - xmark_size / 2 - 0.25f,
                              xmark_pos_y - xmark_size / 2 + 0.75f),
                       ImVec2(xmark_pos_x + xmark_size / 2 - 1.5f,
                              xmark_pos_y + xmark_size / 2 - 0.5f),
                       IM_COL32(0, 0, 0, 255));
-  draw_list->AddLine(
-      ImVec2(xmark_pos_x + xmark_size / 2 - 1.75f,
+    draw_list->AddLine(ImVec2(xmark_pos_x + xmark_size / 2 - 1.75f,
                              xmark_pos_y - xmark_size / 2 + 0.75f),
-      ImVec2(xmark_pos_x - xmark_size / 2, xmark_pos_y + xmark_size / 2 - 1.0f),
+                       ImVec2(xmark_pos_x - xmark_size / 2,
+                              xmark_pos_y + xmark_size / 2 - 1.0f),
                       IM_COL32(0, 0, 0, 255));

-  ImGui::PopStyleColor(3);
+    ImGui::PopStyleColor(2);

+    ImGui::PopStyleColor();
+  }
+
+  ImGui::EndMenuBar();
  ImGui::EndChild();
+  ImGui::PopStyleColor();
  return 0;
 }
-}  // namespace crossdesk
--- a/src/gui/tray/win_tray.cpp
+++ b/src/gui/tray/win_tray.cpp
@@ -1,115 +0,0 @@
-#include "win_tray.h"
-
-#include <SDL3/SDL.h>
-
-#include "localization.h"
-
-namespace crossdesk {
-
-// callback for the message-only window that handles tray icon messages
-static LRESULT CALLBACK MsgWndProc(HWND hwnd, UINT msg, WPARAM wParam,
-                                   LPARAM lParam) {
-  WinTray* tray =
-      reinterpret_cast<WinTray*>(GetWindowLongPtr(hwnd, GWLP_USERDATA));
-  if (!tray) {
-    return DefWindowProc(hwnd, msg, wParam, lParam);
-  }
-
-  if (msg == WM_TRAY_CALLBACK) {
-    MSG tmpMsg = {};
-    tmpMsg.message = msg;
-    tmpMsg.wParam = wParam;
-    tmpMsg.lParam = lParam;
-    tray->HandleTrayMessage(&tmpMsg);
-    return 0;
-  }
-
-  return DefWindowProc(hwnd, msg, wParam, lParam);
-}
-
-WinTray::WinTray(HWND app_hwnd, HICON icon, const std::wstring& tooltip,
-                 int language_index)
-    : app_hwnd_(app_hwnd),
-      icon_(icon),
-      tip_(tooltip),
-      hwnd_message_only_(nullptr),
-      language_index_(language_index) {
-  WNDCLASS wc = {};
-  wc.lpfnWndProc = MsgWndProc;
-  wc.hInstance = GetModuleHandle(nullptr);
-  wc.lpszClassName = L"TrayMessageWindow";
-  RegisterClass(&wc);
-
-  // create a message-only window to receive tray messages
-  hwnd_message_only_ =
-      CreateWindowEx(0, wc.lpszClassName, L"TrayMsg", 0, 0, 0, 0, 0,
-                     HWND_MESSAGE, nullptr, wc.hInstance, nullptr);
-
-  // store pointer to this WinTray instance in window data
-  SetWindowLongPtr(hwnd_message_only_, GWLP_USERDATA,
-                   reinterpret_cast<LONG_PTR>(this));
-
-  // initialize NOTIFYICONDATA structure
-  ZeroMemory(&nid_, sizeof(nid_));
-  nid_.cbSize = sizeof(nid_);
-  nid_.hWnd = hwnd_message_only_;
-  nid_.uID = 1;
-  nid_.uFlags = NIF_ICON | NIF_MESSAGE | NIF_TIP;
-  nid_.uCallbackMessage = WM_TRAY_CALLBACK;
-  nid_.hIcon = icon_;
-  wcsncpy_s(nid_.szTip, tip_.c_str(), _TRUNCATE);
-}
-
-WinTray::~WinTray() {
-  RemoveTrayIcon();
-  if (hwnd_message_only_) DestroyWindow(hwnd_message_only_);
-}
-
-void WinTray::MinimizeToTray() {
-  Shell_NotifyIcon(NIM_ADD, &nid_);
-  // hide application window
-  ShowWindow(app_hwnd_, SW_HIDE);
-}
-
-void WinTray::RemoveTrayIcon() { Shell_NotifyIcon(NIM_DELETE, &nid_); }
-
-bool WinTray::HandleTrayMessage(MSG* msg) {
-  if (!msg || msg->message != WM_TRAY_CALLBACK) return false;
-
-  switch (LOWORD(msg->lParam)) {
-    case WM_LBUTTONDBLCLK:
-    case WM_LBUTTONUP: {
-      ShowWindow(app_hwnd_, SW_SHOW);
-      SetForegroundWindow(app_hwnd_);
-      break;
-    }
-
-    case WM_RBUTTONUP: {
-      POINT pt;
-      GetCursorPos(&pt);
-      HMENU menu = CreatePopupMenu();
-      AppendMenuW(menu, MF_STRING, 1001,
-                  localization::exit_program[language_index_]);
-
-      SetForegroundWindow(hwnd_message_only_);
-      int cmd =
-          TrackPopupMenu(menu, TPM_RETURNCMD | TPM_NONOTIFY | TPM_LEFTALIGN,
-                         pt.x, pt.y, 0, hwnd_message_only_, nullptr);
-      DestroyMenu(menu);
-
-      // handle menu command
-      if (cmd == 1001) {
-        // exit application
-        SDL_Event event;
-        event.type = SDL_EVENT_QUIT;
-        SDL_PushEvent(&event);
-      } else if (cmd == 1002) {
-        ShowWindow(app_hwnd_, SW_SHOW);  // show main window
-        SetForegroundWindow(app_hwnd_);
-      }
-      break;
-    }
-  }
-  return true;
-}
-}  // namespace crossdesk
--- a/src/gui/tray/win_tray.h
+++ b/src/gui/tray/win_tray.h
@@ -1,38 +0,0 @@
-/*
- * @Author: DI JUNKUN
- * @Date: 2025-10-22
- * Copyright (c) 2025 by DI JUNKUN, All Rights Reserved.
- */
-
-#ifndef _WIN_TRAY_H_
-#define _WIN_TRAY_H_
-
-#include <Windows.h>
-#include <shellapi.h>
-
-#include <string>
-
-#define WM_TRAY_CALLBACK (WM_USER + 1)
-
-namespace crossdesk {
-
-class WinTray {
- public:
-  WinTray(HWND app_hwnd, HICON icon, const std::wstring& tooltip,
-          int language_index);
-  ~WinTray();
-
-  void MinimizeToTray();
-  void RemoveTrayIcon();
-  bool HandleTrayMessage(MSG* msg);
-
- private:
-  HWND app_hwnd_;
-  HWND hwnd_message_only_;
-  HICON icon_;
-  std::wstring tip_;
-  int language_index_;
-  NOTIFYICONDATA nid_;
-};
-}  // namespace crossdesk
-#endif
--- a/src/gui/windows/about_window.cpp
+++ b/src/gui/windows/about_window.cpp
@@ -1,54 +1,18 @@
-#include <cstdlib>
-#include <string>
-
 #include "layout.h"
 #include "localization.h"
 #include "rd_log.h"
 #include "render.h"

-namespace crossdesk {
-
-void Render::Hyperlink(const std::string& label, const std::string& url,
-                       const float window_width) {
-  ImGui::PushStyleColor(ImGuiCol_Text, IM_COL32(0, 0, 255, 255));
-  ImGui::SetCursorPosX(window_width * 0.1f);
-  ImGui::Text("%s", label.c_str());
-  ImGui::PopStyleColor();
-
-  if (ImGui::IsItemHovered()) {
-    ImGui::SetMouseCursor(ImGuiMouseCursor_Hand);
-    ImGui::BeginTooltip();
-    ImGui::SetWindowFontScale(0.6f);
-    ImGui::TextUnformatted(url.c_str());
-    ImGui::SetWindowFontScale(1.0f);
-    ImGui::EndTooltip();
-    if (ImGui::IsMouseClicked(ImGuiMouseButton_Left)) {
-#if defined(_WIN32)
-      std::string cmd = "start " + url;
-#elif defined(__APPLE__)
-      std::string cmd = "open " + url;
-#else
-      std::string cmd = "xdg-open " + url;
-#endif
-      system(cmd.c_str());  // open browser
-    }
-  }
-}
-
 int Render::AboutWindow() {
  if (show_about_window_) {
-    float about_window_width = title_bar_button_width_ * 7.5f;
-    float about_window_height = latest_version_.empty()
-                                    ? title_bar_button_width_ * 4.0f
-                                    : title_bar_button_width_ * 4.6f;
+    const ImGuiViewport *viewport = ImGui::GetMainViewport();

-    const ImGuiViewport* viewport = ImGui::GetMainViewport();
    ImGui::SetNextWindowPos(ImVec2(
-        (viewport->WorkSize.x - viewport->WorkPos.x - about_window_width) / 2,
-        (viewport->WorkSize.y - viewport->WorkPos.y - about_window_height) /
+        (viewport->WorkSize.x - viewport->WorkPos.x - about_window_width_) / 2,
+        (viewport->WorkSize.y - viewport->WorkPos.y - about_window_height_) /
            2));

-    ImGui::SetNextWindowSize(ImVec2(about_window_width, about_window_height));
+    ImGui::SetNextWindowSize(ImVec2(about_window_width_, about_window_height_));

    ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
    ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 1.0f);
@@ -63,37 +27,18 @@ int Render::AboutWindow() {
    ImGui::SetWindowFontScale(0.5f);

    std::string version;
-#ifdef CROSSDESK_VERSION
-    version = CROSSDESK_VERSION;
+#ifdef RD_VERSION
+    version = RD_VERSION;
 #else
    version = "Unknown";
 #endif

-    std::string text = localization::version[localization_language_index_] +
-                       ": CrossDesk " + version;
-    ImGui::SetCursorPosX(about_window_width * 0.1f);
+    std::string text =
+        localization::version[localization_language_index_] + ": " + version;
    ImGui::Text("%s", text.c_str());

-    if (update_available_) {
-      std::string latest_version =
-          localization::new_version_available[localization_language_index_] +
-          ": " + latest_version_;
-      std::string access_website =
-          localization::access_website[localization_language_index_];
-      Hyperlink(latest_version, "https://crossdesk.cn", about_window_width);
-    }
-
-    ImGui::Text("");
-
-    std::string copyright_text = "© 2025 by JUNKUN DI. All rights reserved.";
-    std::string license_text = "Licensed under GNU LGPL v3.";
-    ImGui::SetCursorPosX(about_window_width * 0.1f);
-    ImGui::Text("%s", copyright_text.c_str());
-    ImGui::SetCursorPosX(about_window_width * 0.1f);
-    ImGui::Text("%s", license_text.c_str());
-
-    ImGui::SetCursorPosX(about_window_width * 0.445f);
-    ImGui::SetCursorPosY(about_window_height * 0.75f);
+    ImGui::SetCursorPosX(about_window_width_ * 0.42f);
+    ImGui::SetCursorPosY(about_window_height_ * 0.75f);
    // OK
    if (ImGui::Button(localization::ok[localization_language_index_].c_str())) {
      show_about_window_ = false;
@@ -108,4 +53,3 @@ int Render::AboutWindow() {
  }
  return 0;
 }
-}  // namespace crossdesk
--- a/src/gui/windows/connection_status_window.cpp
+++ b/src/gui/windows/connection_status_window.cpp
@@ -3,43 +3,44 @@
 #include "rd_log.h"
 #include "render.h"

-namespace crossdesk {
-
 bool Render::ConnectionStatusWindow(
-    std::shared_ptr<SubStreamWindowProperties>& props) {
-  ImGuiIO& io = ImGui::GetIO();
+    std::shared_ptr<SubStreamWindowProperties> &props) {
+  const ImGuiViewport *viewport = ImGui::GetMainViewport();
  bool ret_flag = false;
+  ImGui::SetNextWindowPos(ImVec2((viewport->WorkSize.x - viewport->WorkPos.x -
+                                  connection_status_window_width_) /
+                                     2,
+                                 (viewport->WorkSize.y - viewport->WorkPos.y -
+                                  connection_status_window_height_) /
+                                     2));

-  ImGui::SetNextWindowPos(
-      ImVec2(io.DisplaySize.x * 0.33f, io.DisplaySize.y * 0.33f));
-  ImGui::SetNextWindowSize(
-      ImVec2(io.DisplaySize.x * 0.33f, io.DisplaySize.y * 0.33f));
+  ImGui::SetNextWindowSize(ImVec2(connection_status_window_width_,
+                                  connection_status_window_height_));

  ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 3.0f);
-  ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
+
+  ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(1.0, 1.0, 1.0, 1.0));
  ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 1.0f);
  ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 5.0f);

  ImGui::Begin("ConnectionStatusWindow", nullptr,
-               ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove |
+               ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse |
+                   ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoTitleBar |
                   ImGuiWindowFlags_NoSavedSettings);
  ImGui::PopStyleVar(2);
  ImGui::PopStyleColor();

-  auto connection_status_window_width = ImGui::GetWindowSize().x;
-  auto connection_status_window_height = ImGui::GetWindowSize().y;
-
  ImGui::SetWindowFontScale(0.5f);
  std::string text;

  if (ConnectionStatus::Connecting == props->connection_status_) {
    text = localization::p2p_connecting[localization_language_index_];
-    ImGui::SetCursorPosX(connection_status_window_width * 0.43f);
-    ImGui::SetCursorPosY(connection_status_window_height * 0.67f);
+    ImGui::SetCursorPosX(connection_status_window_width_ * 3 / 7);
+    ImGui::SetCursorPosY(connection_status_window_height_ * 2 / 3);
  } else if (ConnectionStatus::Connected == props->connection_status_) {
    text = localization::p2p_connected[localization_language_index_];
-    ImGui::SetCursorPosX(connection_status_window_width * 0.43f);
-    ImGui::SetCursorPosY(connection_status_window_height * 0.67f);
+    ImGui::SetCursorPosX(connection_status_window_width_ * 3 / 7);
+    ImGui::SetCursorPosY(connection_status_window_height_ * 2 / 3);
    // ok
    if (ImGui::Button(localization::ok[localization_language_index_].c_str()) ||
        ImGui::IsKeyPressed(ImGuiKey_Enter) ||
@@ -48,8 +49,8 @@ bool Render::ConnectionStatusWindow(
    }
  } else if (ConnectionStatus::Disconnected == props->connection_status_) {
    text = localization::p2p_disconnected[localization_language_index_];
-    ImGui::SetCursorPosX(connection_status_window_width * 0.43f);
-    ImGui::SetCursorPosY(connection_status_window_height * 0.67f);
+    ImGui::SetCursorPosX(connection_status_window_width_ * 3 / 7);
+    ImGui::SetCursorPosY(connection_status_window_height_ * 2 / 3);
    // ok
    if (ImGui::Button(localization::ok[localization_language_index_].c_str()) ||
        ImGui::IsKeyPressed(ImGuiKey_Enter) ||
@@ -58,8 +59,8 @@ bool Render::ConnectionStatusWindow(
    }
  } else if (ConnectionStatus::Failed == props->connection_status_) {
    text = localization::p2p_failed[localization_language_index_];
-    ImGui::SetCursorPosX(connection_status_window_width * 0.43f);
-    ImGui::SetCursorPosY(connection_status_window_height * 0.67f);
+    ImGui::SetCursorPosX(connection_status_window_width_ * 3 / 7);
+    ImGui::SetCursorPosY(connection_status_window_height_ * 2 / 3);
    // ok
    if (ImGui::Button(localization::ok[localization_language_index_].c_str()) ||
        ImGui::IsKeyPressed(ImGuiKey_Enter) ||
@@ -68,8 +69,8 @@ bool Render::ConnectionStatusWindow(
    }
  } else if (ConnectionStatus::Closed == props->connection_status_) {
    text = localization::p2p_closed[localization_language_index_];
-    ImGui::SetCursorPosX(connection_status_window_width * 0.43f);
-    ImGui::SetCursorPosY(connection_status_window_height * 0.67f);
+    ImGui::SetCursorPosX(connection_status_window_width_ * 3 / 7);
+    ImGui::SetCursorPosY(connection_status_window_height_ * 2 / 3);
    // ok
    if (ImGui::Button(localization::ok[localization_language_index_].c_str()) ||
        ImGui::IsKeyPressed(ImGuiKey_Enter) ||
@@ -84,9 +85,11 @@ bool Render::ConnectionStatusWindow(
        text = localization::reinput_password[localization_language_index_];
      }

-      ImGui::SetCursorPosX(connection_status_window_width * 0.336f);
-      ImGui::SetCursorPosY(connection_status_window_height * 0.4f);
-      ImGui::SetNextItemWidth(connection_status_window_width * 0.33f);
+      auto window_width = ImGui::GetWindowSize().x;
+      auto window_height = ImGui::GetWindowSize().y;
+      ImGui::SetCursorPosX((window_width - IPUT_WINDOW_WIDTH / 2) * 0.5f);
+      ImGui::SetCursorPosY(window_height * 0.4f);
+      ImGui::SetNextItemWidth(IPUT_WINDOW_WIDTH / 2);

      ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 1.0f);

@@ -104,16 +107,15 @@ bool Render::ConnectionStatusWindow(
      ImVec2 text_size = ImGui::CalcTextSize(
          localization::remember_password[localization_language_index_]
              .c_str());
-      ImGui::SetCursorPosX((connection_status_window_width - text_size.x) *
-                           0.45f);
+      ImGui::SetCursorPosX((window_width - text_size.x) * 0.5f - 13.0f);
      ImGui::Checkbox(
          localization::remember_password[localization_language_index_].c_str(),
          &(props->remember_password_));
      ImGui::SetWindowFontScale(0.5f);
      ImGui::PopStyleVar();

-      ImGui::SetCursorPosX(connection_status_window_width * 0.325f);
-      ImGui::SetCursorPosY(connection_status_window_height * 0.75f);
+      ImGui::SetCursorPosX(window_width * 0.315f);
+      ImGui::SetCursorPosY(window_height * 0.75f);
      // ok
      if (ImGui::Button(
              localization::ok[localization_language_index_].c_str()) ||
@@ -136,14 +138,14 @@ bool Render::ConnectionStatusWindow(
      }
    } else if (password_validating_) {
      text = localization::validate_password[localization_language_index_];
-      ImGui::SetCursorPosX(connection_status_window_width * 0.43f);
-      ImGui::SetCursorPosY(connection_status_window_height * 0.67f);
+      ImGui::SetCursorPosX(connection_status_window_width_ * 3 / 7);
+      ImGui::SetCursorPosY(connection_status_window_height_ * 2 / 3);
    }
  } else if (ConnectionStatus::NoSuchTransmissionId ==
             props->connection_status_) {
    text = localization::no_such_id[localization_language_index_];
-    ImGui::SetCursorPosX(connection_status_window_width * 0.43f);
-    ImGui::SetCursorPosY(connection_status_window_height * 0.67f);
+    ImGui::SetCursorPosX(connection_status_window_width_ * 3 / 7);
+    ImGui::SetCursorPosY(connection_status_window_height_ * 2 / 3);
    // ok
    if (ImGui::Button(localization::ok[localization_language_index_].c_str()) ||
        ImGui::IsKeyPressed(ImGuiKey_Enter)) {
@@ -154,9 +156,11 @@ bool Render::ConnectionStatusWindow(
    }
  }

+  auto window_width = ImGui::GetWindowSize().x;
+  auto window_height = ImGui::GetWindowSize().y;
  auto text_width = ImGui::CalcTextSize(text.c_str()).x;
-  ImGui::SetCursorPosX((connection_status_window_width - text_width) * 0.5f);
-  ImGui::SetCursorPosY(connection_status_window_height * 0.2f);
+  ImGui::SetCursorPosX((window_width - text_width) * 0.5f);
+  ImGui::SetCursorPosY(window_height * 0.2f);
  ImGui::Text("%s", text.c_str());
  ImGui::SetWindowFontScale(1.0f);

@@ -165,4 +169,3 @@ bool Render::ConnectionStatusWindow(

  return ret_flag;
 }
-}  // namespace crossdesk
--- a/src/gui/windows/control_window.cpp
+++ b/src/gui/windows/control_window.cpp
@@ -1,9 +1,7 @@
 #include "rd_log.h"
 #include "render.h"

-namespace crossdesk {
-
-int Render::ControlWindow(std::shared_ptr<SubStreamWindowProperties>& props) {
+int Render::ControlWindow(std::shared_ptr<SubStreamWindowProperties> &props) {
  double time_duration =
      ImGui::GetTime() - props->control_bar_button_pressed_time_;
  if (props->control_window_width_is_changing_) {
@@ -53,11 +51,11 @@ int Render::ControlWindow(std::shared_ptr<SubStreamWindowProperties>& props) {
      ImVec2(props->control_window_width_, props->control_window_height_),
      ImGuiCond_Always);

-  ImGui::SetNextWindowPos(ImVec2(0, title_bar_height_), ImGuiCond_Once);
+  ImGui::SetNextWindowPos(ImVec2(0, title_bar_height_ + 1), ImGuiCond_Once);

  float pos_x = 0;
  float pos_y = 0;
-  float y_boundary = fullscreen_button_pressed_ ? 0 : title_bar_height_;
+  float y_boundary = fullscreen_button_pressed_ ? 0 : (title_bar_height_ + 1);

  if (props->reset_control_bar_pos_) {
    float new_cursor_pos_x = 0;
@@ -94,7 +92,7 @@ int Render::ControlWindow(std::shared_ptr<SubStreamWindowProperties>& props) {
  } else if (!props->reset_control_bar_pos_ &&
                 ImGui::IsMouseReleased(ImGuiMouseButton_Left) ||
             props->control_window_width_is_changing_) {
-    if (props->control_window_pos_.x <= stream_window_width_ * 0.5f) {
+    if (props->control_window_pos_.x <= stream_window_width_ / 2) {
      if (props->control_window_pos_.y + props->control_window_height_ >
          stream_window_height_) {
        pos_y = stream_window_height_ - props->control_window_height_;
@@ -118,16 +116,18 @@ int Render::ControlWindow(std::shared_ptr<SubStreamWindowProperties>& props) {
        }
      }
      props->is_control_bar_in_left_ = true;
-    } else if (props->control_window_pos_.x > stream_window_width_ * 0.5f) {
+    } else if (props->control_window_pos_.x > stream_window_width_ / 2) {
      pos_x = 0;
      pos_y =
          (props->control_window_pos_.y >= y_boundary &&
           props->control_window_pos_.y <=
               stream_window_height_ - props->control_window_height_)
              ? props->control_window_pos_.y
-              : (props->control_window_pos_.y <
-                         (fullscreen_button_pressed_ ? 0 : title_bar_height_)
-                     ? (fullscreen_button_pressed_ ? 0 : title_bar_height_)
+              : (props->control_window_pos_.y < (fullscreen_button_pressed_
+                                                     ? 0
+                                                     : (title_bar_height_ + 1))
+                     ? (fullscreen_button_pressed_ ? 0
+                                                   : (title_bar_height_ + 1))
                     : (stream_window_height_ - props->control_window_height_));

      if (props->control_bar_expand_) {
@@ -200,13 +200,15 @@ int Render::ControlWindow(std::shared_ptr<SubStreamWindowProperties>& props) {
                 : props->control_window_pos_.x,
             props->control_window_pos_.y),
      ImGuiCond_Always);
+  ImGui::SetWindowFontScale(0.5f);

  std::string control_child_window_title =
      props->remote_id_ + "ControlChildWindow";
-  ImGui::BeginChild(control_child_window_title.c_str(),
-                    ImVec2(props->control_window_width_ * 2.0f,
-                           props->control_window_height_),
+  ImGui::BeginChild(
+      control_child_window_title.c_str(),
+      ImVec2(props->control_window_width_ * 2, props->control_window_height_),
      ImGuiChildFlags_Border, ImGuiWindowFlags_NoDecoration);
+  ImGui::SetWindowFontScale(1.0f);
  ImGui::PopStyleColor();

  ControlBar(props);
@@ -219,4 +221,3 @@ int Render::ControlWindow(std::shared_ptr<SubStreamWindowProperties>& props) {

  return 0;
 }
-}  // namespace crossdesk
--- a/src/gui/windows/main_settings_window.cpp
+++ b/src/gui/windows/main_settings_window.cpp
@@ -3,41 +3,32 @@
 #include "rd_log.h"
 #include "render.h"

-namespace crossdesk {
-
 int Render::SettingWindow() {
-  ImGuiIO& io = ImGui::GetIO();
  if (show_settings_window_) {
    if (settings_window_pos_reset_) {
      const ImGuiViewport* viewport = ImGui::GetMainViewport();
      if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
-#if (((defined(_WIN32) || defined(__linux__)) && !defined(__aarch64__) && \
-      !defined(__arm__) && USE_CUDA) ||                                   \
-     defined(__APPLE__))
        ImGui::SetNextWindowPos(
-            ImVec2(io.DisplaySize.x * 0.343f, io.DisplaySize.y * 0.07f));
+            ImVec2((viewport->WorkSize.x - viewport->WorkPos.x -
+                    SETTINGS_WINDOW_WIDTH_CN) /
+                       2,
+                   (viewport->WorkSize.y - viewport->WorkPos.y -
+                    SETTINGS_WINDOW_HEIGHT_CN) /
+                       2));
+
        ImGui::SetNextWindowSize(
-            ImVec2(io.DisplaySize.x * 0.315f, io.DisplaySize.y * 0.85f));
-#else
-        ImGui::SetNextWindowPos(
-            ImVec2(io.DisplaySize.x * 0.343f, io.DisplaySize.y * 0.1f));
-        ImGui::SetNextWindowSize(
-            ImVec2(io.DisplaySize.x * 0.315f, io.DisplaySize.y * 0.8f));
-#endif
+            ImVec2(SETTINGS_WINDOW_WIDTH_CN, SETTINGS_WINDOW_HEIGHT_CN));
      } else {
-#if (((defined(_WIN32) || defined(__linux__)) && !defined(__aarch64__) && \
-      !defined(__arm__) && USE_CUDA) ||                                   \
-     defined(__APPLE__))
        ImGui::SetNextWindowPos(
-            ImVec2(io.DisplaySize.x * 0.297f, io.DisplaySize.y * 0.07f));
+            ImVec2((viewport->WorkSize.x - viewport->WorkPos.x -
+                    SETTINGS_WINDOW_WIDTH_EN) /
+                       2,
+                   (viewport->WorkSize.y - viewport->WorkPos.y -
+                    SETTINGS_WINDOW_HEIGHT_EN) /
+                       2));
+
        ImGui::SetNextWindowSize(
-            ImVec2(io.DisplaySize.x * 0.407f, io.DisplaySize.y * 0.85f));
-#else
-        ImGui::SetNextWindowPos(
-            ImVec2(io.DisplaySize.x * 0.297f, io.DisplaySize.y * 0.1f));
-        ImGui::SetNextWindowSize(
-            ImVec2(io.DisplaySize.x * 0.407f, io.DisplaySize.y * 0.8f));
-#endif
+            ImVec2(SETTINGS_WINDOW_WIDTH_EN, SETTINGS_WINDOW_HEIGHT_EN));
      }

      settings_window_pos_reset_ = false;
@@ -45,9 +36,10 @@ int Render::SettingWindow() {

    // Settings
    {
-      static int settings_items_padding = title_bar_button_width_ * 0.75f;
+      static int settings_items_padding = 30;
      int settings_items_offset = 0;

+      ImGui::SetWindowFontScale(0.5f);
      ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
      ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 5.0f);
      ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 3.0f);
@@ -56,6 +48,7 @@ int Render::SettingWindow() {
                   nullptr,
                   ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse |
                       ImGuiWindowFlags_NoSavedSettings);
+      ImGui::SetWindowFontScale(1.0f);
      ImGui::SetWindowFontScale(0.5f);
      ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 1.0f);
      {
@@ -64,29 +57,19 @@ int Render::SettingWindow() {
            localization::language_en[localization_language_index_].c_str()};

        settings_items_offset += settings_items_padding;
-        ImGui::SetCursorPosY(settings_items_offset);
-        ImGui::AlignTextToFramePadding();
+        ImGui::SetCursorPosY(settings_items_offset + 2);
        ImGui::Text(
            "%s", localization::language[localization_language_index_].c_str());
-        ImGui::SameLine();
        if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
-          ImGui::SetCursorPosX(title_bar_button_width_ * 3.0f);
+          ImGui::SetCursorPosX(LANGUAGE_SELECT_WINDOW_PADDING_CN);
        } else {
-          ImGui::SetCursorPosX(title_bar_button_width_ * 4.5f);
+          ImGui::SetCursorPosX(LANGUAGE_SELECT_WINDOW_PADDING_EN);
        }
+        ImGui::SetCursorPosY(settings_items_offset);
+        ImGui::SetNextItemWidth(SETTINGS_SELECT_WINDOW_WIDTH);

-        ImGui::SetNextItemWidth(title_bar_button_width_ * 1.8f);
-        if (ImGui::BeginCombo("##language",
-                              language_items[language_button_value_])) {
-          ImGui::SetWindowFontScale(0.5f);
-          for (int i = 0; i < IM_ARRAYSIZE(language_items); i++) {
-            bool selected = (i == language_button_value_);
-            if (ImGui::Selectable(language_items[i], selected))
-              language_button_value_ = i;
-          }
-
-          ImGui::EndCombo();
-        }
+        ImGui::Combo("##language", &language_button_value_, language_items,
+                     IM_ARRAYSIZE(language_items));
      }

      ImGui::Separator();
@@ -97,39 +80,29 @@ int Render::SettingWindow() {

      {
        const char* video_quality_items[] = {
-            localization::video_quality_low[localization_language_index_]
+            localization::video_quality_high[localization_language_index_]
                .c_str(),
            localization::video_quality_medium[localization_language_index_]
                .c_str(),
-            localization::video_quality_high[localization_language_index_]
+            localization::video_quality_low[localization_language_index_]
                .c_str()};

        settings_items_offset += settings_items_padding;
-        ImGui::SetCursorPosY(settings_items_offset);
-        ImGui::AlignTextToFramePadding();
+        ImGui::SetCursorPosY(settings_items_offset + 2);
        ImGui::Text(
            "%s",
            localization::video_quality[localization_language_index_].c_str());
-        ImGui::SameLine();
+
        if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
-          ImGui::SetCursorPosX(title_bar_button_width_ * 3.0f);
+          ImGui::SetCursorPosX(VIDEO_QUALITY_SELECT_WINDOW_PADDING_CN);
        } else {
-          ImGui::SetCursorPosX(title_bar_button_width_ * 4.5f);
+          ImGui::SetCursorPosX(VIDEO_QUALITY_SELECT_WINDOW_PADDING_EN);
        }
+        ImGui::SetCursorPosY(settings_items_offset);
+        ImGui::SetNextItemWidth(SETTINGS_SELECT_WINDOW_WIDTH);

-        ImGui::SetNextItemWidth(title_bar_button_width_ * 1.8f);
-        if (ImGui::BeginCombo(
-                "##video_quality",
-                video_quality_items[video_quality_button_value_])) {
-          ImGui::SetWindowFontScale(0.5f);
-          for (int i = 0; i < IM_ARRAYSIZE(video_quality_items); i++) {
-            bool selected = (i == video_quality_button_value_);
-            if (ImGui::Selectable(video_quality_items[i], selected))
-              video_quality_button_value_ = i;
-          }
-
-          ImGui::EndCombo();
-        }
+        ImGui::Combo("##video_quality", &video_quality_button_value_,
+                     video_quality_items, IM_ARRAYSIZE(video_quality_items));
      }

      ImGui::Separator();
@@ -138,31 +111,22 @@ int Render::SettingWindow() {
        const char* video_frame_rate_items[] = {"30 fps", "60 fps"};

        settings_items_offset += settings_items_padding;
-        ImGui::SetCursorPosY(settings_items_offset);
-        ImGui::AlignTextToFramePadding();
+        ImGui::SetCursorPosY(settings_items_offset + 2);
        ImGui::Text("%s",
                    localization::video_frame_rate[localization_language_index_]
                        .c_str());
-        ImGui::SameLine();
+
        if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
-          ImGui::SetCursorPosX(title_bar_button_width_ * 3.0f);
+          ImGui::SetCursorPosX(VIDEO_FRAME_RATE_SELECT_WINDOW_PADDING_CN);
        } else {
-          ImGui::SetCursorPosX(title_bar_button_width_ * 4.5f);
+          ImGui::SetCursorPosX(VIDEO_FRAME_RATE_SELECT_WINDOW_PADDING_EN);
        }
+        ImGui::SetCursorPosY(settings_items_offset);
+        ImGui::SetNextItemWidth(SETTINGS_SELECT_WINDOW_WIDTH);

-        ImGui::SetNextItemWidth(title_bar_button_width_ * 1.8f);
-        if (ImGui::BeginCombo(
-                "##video_frame_rate",
-                video_frame_rate_items[video_frame_rate_button_value_])) {
-          ImGui::SetWindowFontScale(0.5f);
-          for (int i = 0; i < IM_ARRAYSIZE(video_frame_rate_items); i++) {
-            bool selected = (i == video_frame_rate_button_value_);
-            if (ImGui::Selectable(video_frame_rate_items[i], selected))
-              video_frame_rate_button_value_ = i;
-          }
-
-          ImGui::EndCombo();
-        }
+        ImGui::Combo("##video_frame_rate", &video_frame_rate_button_value_,
+                     video_frame_rate_items,
+                     IM_ARRAYSIZE(video_frame_rate_items));
      }

      ImGui::Separator();
@@ -173,74 +137,59 @@ int Render::SettingWindow() {
            localization::av1[localization_language_index_].c_str()};

        settings_items_offset += settings_items_padding;
-        ImGui::SetCursorPosY(settings_items_offset);
-        ImGui::AlignTextToFramePadding();
+        ImGui::SetCursorPosY(settings_items_offset + 2);
        ImGui::Text(
            "%s",
            localization::video_encode_format[localization_language_index_]
                .c_str());
-        ImGui::SameLine();
+
        if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
-          ImGui::SetCursorPosX(title_bar_button_width_ * 3.0f);
+          ImGui::SetCursorPosX(VIDEO_ENCODE_FORMAT_SELECT_WINDOW_PADDING_CN);
        } else {
-          ImGui::SetCursorPosX(title_bar_button_width_ * 4.5f);
+          ImGui::SetCursorPosX(VIDEO_ENCODE_FORMAT_SELECT_WINDOW_PADDING_EN);
+        }
+        ImGui::SetCursorPosY(settings_items_offset);
+        ImGui::SetNextItemWidth(SETTINGS_SELECT_WINDOW_WIDTH);
+
+        ImGui::Combo(
+            "##video_encode_format", &video_encode_format_button_value_,
+            video_encode_format_items, IM_ARRAYSIZE(video_encode_format_items));
      }

-        ImGui::SetNextItemWidth(title_bar_button_width_ * 1.8f);
-        if (ImGui::BeginCombo(
-                "##video_encode_format",
-                video_encode_format_items[video_encode_format_button_value_])) {
-          ImGui::SetWindowFontScale(0.5f);
-          for (int i = 0; i < IM_ARRAYSIZE(video_encode_format_items); i++) {
-            bool selected = (i == video_encode_format_button_value_);
-            if (ImGui::Selectable(video_encode_format_items[i], selected))
-              video_encode_format_button_value_ = i;
-          }
-
-          ImGui::EndCombo();
-        }
-      }
-
-#if (((defined(_WIN32) || defined(__linux__)) && !defined(__aarch64__) && \
-      !defined(__arm__) && USE_CUDA) ||                                   \
-     defined(__APPLE__))
      ImGui::Separator();

      {
        settings_items_offset += settings_items_padding;
-        ImGui::SetCursorPosY(settings_items_offset);
-        ImGui::AlignTextToFramePadding();
+        ImGui::SetCursorPosY(settings_items_offset + 2);
        ImGui::Text("%s", localization::enable_hardware_video_codec
                              [localization_language_index_]
                                  .c_str());
-        ImGui::SameLine();
-        if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
-          ImGui::SetCursorPosX(title_bar_button_width_ * 4.275f);
-        } else {
-          ImGui::SetCursorPosX(title_bar_button_width_ * 5.755f);
-        }

+        if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
+          ImGui::SetCursorPosX(ENABLE_HARDWARE_VIDEO_CODEC_CHECKBOX_PADDING_CN);
+        } else {
+          ImGui::SetCursorPosX(ENABLE_HARDWARE_VIDEO_CODEC_CHECKBOX_PADDING_EN);
+        }
+        ImGui::SetCursorPosY(settings_items_offset);
        ImGui::Checkbox("##enable_hardware_video_codec",
                        &enable_hardware_video_codec_);
      }
-#endif

      ImGui::Separator();

      {
        settings_items_offset += settings_items_padding;
-        ImGui::SetCursorPosY(settings_items_offset);
-        ImGui::AlignTextToFramePadding();
+        ImGui::SetCursorPosY(settings_items_offset + 2);
        ImGui::Text(
            "%s",
            localization::enable_turn[localization_language_index_].c_str());
-        ImGui::SameLine();
-        if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
-          ImGui::SetCursorPosX(title_bar_button_width_ * 4.275f);
-        } else {
-          ImGui::SetCursorPosX(title_bar_button_width_ * 5.755f);
-        }

+        if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
+          ImGui::SetCursorPosX(ENABLE_TURN_CHECKBOX_PADDING_CN);
+        } else {
+          ImGui::SetCursorPosX(ENABLE_TURN_CHECKBOX_PADDING_EN);
+        }
+        ImGui::SetCursorPosY(settings_items_offset);
        ImGui::Checkbox("##enable_turn", &enable_turn_);
      }

@@ -248,18 +197,17 @@ int Render::SettingWindow() {

      {
        settings_items_offset += settings_items_padding;
-        ImGui::SetCursorPosY(settings_items_offset);
-        ImGui::AlignTextToFramePadding();
+        ImGui::SetCursorPosY(settings_items_offset + 2);
        ImGui::Text(
            "%s",
            localization::enable_srtp[localization_language_index_].c_str());
-        ImGui::SameLine();
-        if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
-          ImGui::SetCursorPosX(title_bar_button_width_ * 4.275f);
-        } else {
-          ImGui::SetCursorPosX(title_bar_button_width_ * 5.755f);
-        }

+        if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
+          ImGui::SetCursorPosX(ENABLE_SRTP_CHECKBOX_PADDING_CN);
+        } else {
+          ImGui::SetCursorPosX(ENABLE_SRTP_CHECKBOX_PADDING_EN);
+        }
+        ImGui::SetCursorPosY(settings_items_offset);
        ImGui::Checkbox("##enable_srtp", &enable_srtp_);
      }

@@ -267,104 +215,36 @@ int Render::SettingWindow() {

      {
        settings_items_offset += settings_items_padding;
-        ImGui::SetCursorPosY(settings_items_offset + 1);
-        ImGui::AlignTextToFramePadding();
+        ImGui::SetCursorPosY(settings_items_offset + 2);
+
        if (ImGui::Button(localization::self_hosted_server_config
                              [localization_language_index_]
                                  .c_str())) {
          show_self_hosted_server_config_window_ = true;
        }
-        ImGui::SameLine();
+
        if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
-          ImGui::SetCursorPosX(title_bar_button_width_ * 4.275f);
+          ImGui::SetCursorPosX(ENABLE_SELF_HOSTED_SERVER_CHECKBOX_PADDING_CN);
        } else {
-          ImGui::SetCursorPosX(title_bar_button_width_ * 5.755f);
+          ImGui::SetCursorPosX(ENABLE_SELF_HOSTED_SERVER_CHECKBOX_PADDING_EN);
        }
-
-        ImGui::Checkbox("##enable_self_hosted", &enable_self_hosted_);
-      }
-
-      ImGui::Separator();
-
-      {
-        settings_items_offset += settings_items_padding;
        ImGui::SetCursorPosY(settings_items_offset);
-        ImGui::AlignTextToFramePadding();
-        ImGui::Text("%s",
-                    localization::enable_autostart[localization_language_index_]
-                        .c_str());
-        ImGui::SameLine();
-        if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
-          ImGui::SetCursorPosX(title_bar_button_width_ * 4.275f);
-        } else {
-          ImGui::SetCursorPosX(title_bar_button_width_ * 5.755f);
+        ImGui::Checkbox("##enable_self_hosted_server",
+                        &enable_self_hosted_server_);
      }

-        ImGui::Checkbox("##enable_autostart_", &enable_autostart_);
-      }
-
-      ImGui::Separator();
-
-      {
-        settings_items_offset += settings_items_padding;
-        ImGui::SetCursorPosY(settings_items_offset);
-        ImGui::AlignTextToFramePadding();
-        ImGui::Text(
-            "%s",
-            localization::enable_daemon[localization_language_index_].c_str());
-        ImGui::SameLine();
-        if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
-          ImGui::SetCursorPosX(title_bar_button_width_ * 4.275f);
-        } else {
-          ImGui::SetCursorPosX(title_bar_button_width_ * 5.755f);
-        }
-
-        ImGui::Checkbox("##enable_daemon_", &enable_daemon_);
-        if (ImGui::IsItemHovered()) {
-          ImGui::BeginTooltip();
-          ImGui::SetWindowFontScale(0.5f);
-          ImGui::Text("%s", localization::takes_effect_after_restart
-                                [localization_language_index_]
-                                    .c_str());
-          ImGui::SetWindowFontScale(1.0f);
-          ImGui::EndTooltip();
-        }
-      }
-#if _WIN32
-      ImGui::Separator();
-
-      {
-        settings_items_offset += settings_items_padding;
-        ImGui::SetCursorPosY(settings_items_offset);
-        ImGui::AlignTextToFramePadding();
-        ImGui::Text("%s",
-                    localization::minimize_to_tray[localization_language_index_]
-                        .c_str());
-        ImGui::SameLine();
-        if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
-          ImGui::SetCursorPosX(title_bar_button_width_ * 4.275f);
-        } else {
-          ImGui::SetCursorPosX(title_bar_button_width_ * 5.755f);
-        }
-
-        ImGui::Checkbox("##enable_minimize_to_tray_",
-                        &enable_minimize_to_tray_);
-      }
-#endif
      if (stream_window_inited_) {
        ImGui::EndDisabled();
      }

      if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
-        ImGui::SetCursorPosX(title_bar_button_width_ * 1.59f);
+        ImGui::SetCursorPosX(SETTINGS_OK_BUTTON_PADDING_CN);
      } else {
-        ImGui::SetCursorPosX(title_bar_button_width_ * 2.22f);
+        ImGui::SetCursorPosX(SETTINGS_OK_BUTTON_PADDING_EN);
      }

-      settings_items_offset +=
-          settings_items_padding + title_bar_button_width_ * 0.3f;
+      settings_items_offset += settings_items_padding + 10;
      ImGui::SetCursorPosY(settings_items_offset);
-
      ImGui::PopStyleVar();

      // OK
@@ -387,23 +267,14 @@ int Render::SettingWindow() {

        // Video quality
        if (video_quality_button_value_ == 0) {
-          config_center_->SetVideoQuality(ConfigCenter::VIDEO_QUALITY::LOW);
+          config_center_->SetVideoQuality(ConfigCenter::VIDEO_QUALITY::HIGH);
        } else if (video_quality_button_value_ == 1) {
          config_center_->SetVideoQuality(ConfigCenter::VIDEO_QUALITY::MEDIUM);
        } else {
-          config_center_->SetVideoQuality(ConfigCenter::VIDEO_QUALITY::HIGH);
+          config_center_->SetVideoQuality(ConfigCenter::VIDEO_QUALITY::LOW);
        }
        video_quality_button_value_last_ = video_quality_button_value_;

-        if (video_frame_rate_button_value_ == 0) {
-          config_center_->SetVideoFrameRate(
-              ConfigCenter::VIDEO_FRAME_RATE::FPS_30);
-        } else if (video_frame_rate_button_value_ == 1) {
-          config_center_->SetVideoFrameRate(
-              ConfigCenter::VIDEO_FRAME_RATE::FPS_60);
-        }
-        video_frame_rate_button_value_last_ = video_frame_rate_button_value_;
-
        // Video encode format
        if (video_encode_format_button_value_ == 0) {
          config_center_->SetVideoEncodeFormat(
@@ -439,35 +310,11 @@ int Render::SettingWindow() {
        }
        enable_srtp_last_ = enable_srtp_;

-        if (enable_self_hosted_) {
+        if (enable_self_hosted_server_) {
          config_center_->SetSelfHosted(true);
        } else {
          config_center_->SetSelfHosted(false);
        }
-        enable_self_hosted_last_ = enable_self_hosted_;
-
-        if (enable_autostart_) {
-          config_center_->SetAutostart(true);
-        } else {
-          config_center_->SetAutostart(false);
-        }
-        enable_autostart_last_ = enable_autostart_;
-
-        if (enable_daemon_) {
-          config_center_->SetDaemon(true);
-        } else {
-          config_center_->SetDaemon(false);
-        }
-        enable_daemon_last_ = enable_daemon_;
-
-#if _WIN32
-        if (enable_minimize_to_tray_) {
-          config_center_->SetMinimizeToTray(true);
-        } else {
-          config_center_->SetMinimizeToTray(false);
-        }
-        enable_minimize_to_tray_last_ = enable_minimize_to_tray_;
-#endif

        settings_window_pos_reset_ = true;

@@ -497,11 +344,6 @@ int Render::SettingWindow() {
          video_quality_button_value_ = video_quality_button_value_last_;
        }

-        if (video_frame_rate_button_value_ !=
-            video_frame_rate_button_value_last_) {
-          video_frame_rate_button_value_ = video_frame_rate_button_value_last_;
-        }
-
        if (video_encode_format_button_value_ !=
            video_encode_format_button_value_last_) {
          video_encode_format_button_value_ =
@@ -518,13 +360,14 @@ int Render::SettingWindow() {

        settings_window_pos_reset_ = true;
      }
+      ImGui::SetWindowFontScale(1.0f);
      ImGui::SetWindowFontScale(0.5f);
      ImGui::End();
      ImGui::PopStyleVar(2);
      ImGui::PopStyleColor();
+      ImGui::SetWindowFontScale(1.0f);
    }
  }

  return 0;
 }
-}  // namespace crossdesk
--- a/src/gui/windows/main_window.cpp
+++ b/src/gui/windows/main_window.cpp
@@ -1,25 +1,16 @@
-#include "layout_relative.h"
 #include "localization.h"
 #include "rd_log.h"
 #include "render.h"

-namespace crossdesk {
-
 int Render::MainWindow() {
-  ImGuiIO& io = ImGui::GetIO();
-  float local_remote_window_width = io.DisplaySize.x;
-  float local_remote_window_height =
-      io.DisplaySize.y * (0.56f - TITLE_BAR_HEIGHT);
-
-  ImGui::SetNextWindowPos(ImVec2(0.0f, io.DisplaySize.y * (TITLE_BAR_HEIGHT)),
-                          ImGuiCond_Always);
+  ImGui::SetNextWindowPos(ImVec2(0, title_bar_height_), ImGuiCond_Always);
  ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0.0f, 0.0f));
  ImGui::PushStyleColor(ImGuiCol_ChildBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
-  ImGui::BeginChild(
-      "DeskWindow",
-      ImVec2(local_remote_window_width, local_remote_window_height),
+  ImGui::BeginChild("DeskWindow",
+                    ImVec2(main_window_width_default_, local_window_height_),
                    ImGuiChildFlags_Border,
-      ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove |
+                    ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse |
+                        ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoTitleBar |
                        ImGuiWindowFlags_NoBringToFrontOnFocus);
  ImGui::PopStyleVar();
  ImGui::PopStyleColor();
@@ -27,8 +18,9 @@ int Render::MainWindow() {
  LocalWindow();

  ImDrawList* draw_list = ImGui::GetWindowDrawList();
-  draw_list->AddLine(ImVec2(io.DisplaySize.x * 0.5f, io.DisplaySize.y * 0.1f),
-                     ImVec2(io.DisplaySize.x * 0.5f, io.DisplaySize.y * 0.53f),
+  draw_list->AddLine(
+      ImVec2(main_window_width_default_ / 2, title_bar_height_ + 15.0f),
+      ImVec2(main_window_width_default_ / 2, title_bar_height_ + 225.0f),
      IM_COL32(0, 0, 0, 122), 1.0f);

  RemoteWindow();
@@ -38,7 +30,6 @@ int Render::MainWindow() {
  StatusBar();

  if (show_connection_status_window_) {
-    // std::unique_lock lock(client_properties_mutex_);
    for (auto it = client_properties_.begin();
         it != client_properties_.end();) {
      auto& props = it->second;
@@ -56,4 +47,3 @@ int Render::MainWindow() {

  return 0;
 }
-}  // namespace crossdesk
--- a/src/gui/windows/request_permission_window.mm
+++ b/src/gui/windows/request_permission_window.mm
@@ -1,205 +0,0 @@
-#include "layout.h"
-#include "localization.h"
-#include "rd_log.h"
-#include "render.h"
-
-#include <ApplicationServices/ApplicationServices.h>
-#include <CoreGraphics/CoreGraphics.h>
-#import <Foundation/Foundation.h>
-#include <unistd.h>
-#include <cstdlib>
-
-namespace crossdesk {
-
-bool Render::DrawToggleSwitch(const char* id, bool active, bool enabled) {
-  const float TRACK_HEIGHT = ImGui::GetFrameHeight();
-  const float TRACK_WIDTH = TRACK_HEIGHT * 1.8f;
-  const float TRACK_RADIUS = TRACK_HEIGHT * 0.5f;
-  const float KNOB_PADDING = 2.0f;
-  const float KNOB_HEIGHT = TRACK_HEIGHT - 4.0f;
-  const float KNOB_WIDTH = KNOB_HEIGHT * 1.2f;
-  const float KNOB_RADIUS = KNOB_HEIGHT * 0.5f;
-  const float DISABLED_ALPHA = 0.6f;
-  const float KNOB_ALPHA_DISABLED = 0.9f;
-
-  const ImVec4 COLOR_ACTIVE = ImVec4(0.0f, 0.0f, 1.0f, 1.0f);
-  const ImVec4 COLOR_ACTIVE_HOVER = ImVec4(0.26f, 0.59f, 0.98f, 1.0f);
-  const ImVec4 COLOR_INACTIVE = ImVec4(0.60f, 0.60f, 0.60f, 1.0f);
-  const ImVec4 COLOR_INACTIVE_HOVER = ImVec4(0.70f, 0.70f, 0.70f, 1.0f);
-  const ImVec4 COLOR_KNOB = ImVec4(1.0f, 1.0f, 1.0f, 1.0f);
-
-  ImDrawList* draw_list = ImGui::GetWindowDrawList();
-  ImVec2 track_pos = ImGui::GetCursorScreenPos();
-
-  ImGui::InvisibleButton(id, ImVec2(TRACK_WIDTH, TRACK_HEIGHT));
-  bool hovered = ImGui::IsItemHovered();
-  bool clicked = ImGui::IsItemClicked() && enabled;
-
-  ImVec4 track_color = active ? (hovered && enabled ? COLOR_ACTIVE_HOVER : COLOR_ACTIVE)
-                              : (hovered && enabled ? COLOR_INACTIVE_HOVER : COLOR_INACTIVE);
-
-  if (!enabled) {
-    track_color.w *= DISABLED_ALPHA;
-  }
-
-  ImVec2 track_min = ImVec2(track_pos.x, track_pos.y + 0.5f);
-  ImVec2 track_max = ImVec2(track_pos.x + TRACK_WIDTH, track_pos.y + TRACK_HEIGHT - 0.5f);
-  draw_list->AddRectFilled(track_min, track_max, ImGui::GetColorU32(track_color), TRACK_RADIUS);
-
-  float knob_position = active ? 1.0f : 0.0f;
-  float knob_min_x = track_pos.x + KNOB_PADDING;
-  float knob_max_x = track_pos.x + TRACK_WIDTH - KNOB_WIDTH - KNOB_PADDING;
-  float knob_x = knob_min_x + knob_position * (knob_max_x - knob_min_x);
-  float knob_y = track_pos.y + (TRACK_HEIGHT - KNOB_HEIGHT) * 0.5f;
-
-  ImVec4 knob_color = COLOR_KNOB;
-  if (!enabled) {
-    knob_color.w = KNOB_ALPHA_DISABLED;
-  }
-
-  ImVec2 knob_min = ImVec2(knob_x, knob_y);
-  ImVec2 knob_max = ImVec2(knob_x + KNOB_WIDTH, knob_y + KNOB_HEIGHT);
-  draw_list->AddRectFilled(knob_min, knob_max, ImGui::GetColorU32(knob_color), KNOB_RADIUS);
-
-  return clicked;
-}
-
-bool Render::CheckScreenRecordingPermission() {
-  // CGPreflightScreenCaptureAccess is available on macOS 10.15+
-  if (@available(macOS 10.15, *)) {
-    bool granted = CGPreflightScreenCaptureAccess();
-    return granted;
-  }
-  // for older macOS versions, assume permission is granted
-  return true;
-}
-
-bool Render::CheckAccessibilityPermission() {
-  NSDictionary* options = @{(__bridge id)kAXTrustedCheckOptionPrompt : @NO};
-  bool trusted = AXIsProcessTrustedWithOptions((__bridge CFDictionaryRef)options);
-  return trusted;
-}
-
-void Render::OpenAccessibilityPreferences() {
-  NSDictionary* options = @{(__bridge id)kAXTrustedCheckOptionPrompt : @YES};
-  AXIsProcessTrustedWithOptions((__bridge CFDictionaryRef)options);
-
-  system("open "
-         "\"x-apple.systempreferences:com.apple.preference.security?Privacy_"
-         "Accessibility\"");
-}
-
-void Render::OpenScreenRecordingPreferences() {
-  if (@available(macOS 10.15, *)) {
-    CGRequestScreenCaptureAccess();
-  }
-
-  system("open "
-         "\"x-apple.systempreferences:com.apple.preference.security?Privacy_"
-         "ScreenCapture\"");
-}
-
-int Render::RequestPermissionWindow() {
-  bool screen_recording_granted = CheckScreenRecordingPermission();
-  bool accessibility_granted = CheckAccessibilityPermission();
-
-  show_request_permission_window_ = !screen_recording_granted || !accessibility_granted;
-
-  if (!show_request_permission_window_) {
-    return 0;
-  }
-
-  const ImGuiViewport* viewport = ImGui::GetMainViewport();
-  float window_width = localization_language_index_ == 0 ? REQUEST_PERMISSION_WINDOW_WIDTH_CN
-                                                         : REQUEST_PERMISSION_WINDOW_WIDTH_EN;
-  float window_height = localization_language_index_ == 0 ? REQUEST_PERMISSION_WINDOW_HEIGHT_CN
-                                                          : REQUEST_PERMISSION_WINDOW_HEIGHT_EN;
-
-  float checkbox_padding = localization_language_index_ == 0
-                               ? REQUEST_PERMISSION_WINDOW_CHECKBOX_PADDING_CN
-                               : REQUEST_PERMISSION_WINDOW_CHECKBOX_PADDING_EN;
-
-  ImVec2 center_pos = ImVec2((viewport->WorkSize.x - window_width) * 0.5f + viewport->WorkPos.x,
-                             (viewport->WorkSize.y - window_height) * 0.5f + viewport->WorkPos.y);
-  ImGui::SetNextWindowPos(center_pos, ImGuiCond_Once);
-
-  ImGui::SetNextWindowSize(ImVec2(window_width, window_height), ImGuiCond_Always);
-
-  ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
-  ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 1.0f);
-  ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 5.0f);
-  ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 3.0f);
-  ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0.0f, 0.0f));
-
-  ImGui::Begin(
-      localization::request_permissions[localization_language_index_].c_str(), nullptr,
-      ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoSavedSettings);
-
-  ImGui::SetWindowFontScale(0.3f);
-
-  // use system font
-  if (main_windows_system_chinese_font_ != nullptr) {
-    ImGui::PushFont(main_windows_system_chinese_font_);
-  }
-
-  ImGui::SetCursorPosY(ImGui::GetCursorPosY() + ImGui::GetTextLineHeight() + 5.0f);
-  ImGui::SetCursorPosX(10.0f);
-  ImGui::TextWrapped(
-      "%s", localization::permission_required_message[localization_language_index_].c_str());
-
-  ImGui::Spacing();
-  ImGui::Spacing();
-  ImGui::Spacing();
-
-  // accessibility permission
-  ImGui::SetCursorPosX(10.0f);
-  ImGui::AlignTextToFramePadding();
-  ImGui::Text("1. %s:",
-              localization::accessibility_permission[localization_language_index_].c_str());
-  ImGui::SameLine();
-  ImGui::AlignTextToFramePadding();
-  ImGui::SetCursorPosX(checkbox_padding);
-  if (accessibility_granted) {
-    DrawToggleSwitch("accessibility_toggle_on", true, false);
-  } else {
-    if (DrawToggleSwitch("accessibility_toggle", accessibility_granted, !accessibility_granted)) {
-      OpenAccessibilityPreferences();
-    }
-  }
-
-  ImGui::Spacing();
-
-  // screen recording permission
-  ImGui::SetCursorPosX(10.0f);
-  ImGui::AlignTextToFramePadding();
-  ImGui::Text("2. %s:",
-              localization::screen_recording_permission[localization_language_index_].c_str());
-  ImGui::SameLine();
-  ImGui::AlignTextToFramePadding();
-  ImGui::SetCursorPosX(checkbox_padding);
-  if (screen_recording_granted) {
-    ImGui::SetCursorPosX(ImGui::GetCursorPosX() + 10.0f);
-    DrawToggleSwitch("screen_recording_toggle_on", true, false);
-  } else {
-    if (DrawToggleSwitch("screen_recording_toggle", screen_recording_granted,
-                         !screen_recording_granted)) {
-      OpenScreenRecordingPreferences();
-    }
-  }
-
-  ImGui::SetWindowFontScale(1.0f);
-  ImGui::SetWindowFontScale(0.45f);
-
-  // pop system font
-  if (main_windows_system_chinese_font_ != nullptr) {
-    ImGui::PopFont();
-  }
-
-  ImGui::End();
-  ImGui::SetWindowFontScale(1.0f);
-  ImGui::PopStyleVar(4);
-  ImGui::PopStyleColor();
-
-  return 0;
-}
-}  // namespace crossdesk
--- a/src/gui/windows/server_settings_window.cpp
+++ b/src/gui/windows/server_settings_window.cpp
@@ -10,8 +10,6 @@
 #include "rd_log.h"
 #include "render.h"

-namespace crossdesk {
-
 std::vector<std::string> GetRootEntries() {
  std::vector<std::string> roots;
 #ifdef _WIN32
@@ -30,14 +28,8 @@ std::vector<std::string> GetRootEntries() {

 int Render::ShowSimpleFileBrowser() {
  std::string display_text;
-
-  if (selected_current_file_path_.empty()) {
-    selected_current_file_path_ = std::filesystem::current_path().string();
-  }
-
-  if (!tls_cert_path_self_.empty()) {
-    display_text =
-        std::filesystem::path(tls_cert_path_self_).filename().string();
+  if (!selected_file_.empty()) {
+    display_text = std::filesystem::path(selected_file_).filename().string();
  } else if (selected_current_file_path_ != "Root") {
    display_text =
        std::filesystem::path(selected_current_file_path_).filename().string();
@@ -51,57 +43,40 @@ int Render::ShowSimpleFileBrowser() {
        localization::select_a_file[localization_language_index_].c_str();
  }

-  if (show_file_browser_) {
-    ImGui::PushItemFlag(ImGuiItemFlags_AutoClosePopups, false);
-
-    float fixed_width = title_bar_button_width_ * 3.8f;
-    ImGui::SetNextItemWidth(fixed_width);
-    ImGui::SetNextWindowSizeConstraints(ImVec2(fixed_width, 0),
-                                        ImVec2(fixed_width, 100.0f));
-
-    if (ImGui::BeginCombo("##select_a_file", display_text.c_str(), 0)) {
-      ImGui::SetWindowFontScale(0.5f);
-      bool file_selected = false;
-
-      auto roots = GetRootEntries();
+  if (ImGui::BeginCombo("##select_a_file", display_text.c_str())) {
    if (selected_current_file_path_ == "Root" ||
        !std::filesystem::exists(selected_current_file_path_) ||
        !std::filesystem::is_directory(selected_current_file_path_)) {
+      auto roots = GetRootEntries();
      for (const auto& root : roots) {
        if (ImGui::Selectable(root.c_str())) {
          selected_current_file_path_ = root;
-            tls_cert_path_self_.clear();
+          selected_file_.clear();
        }
      }
    } else {
      std::filesystem::path p(selected_current_file_path_);

      if (ImGui::Selectable("..")) {
-          if (std::find(roots.begin(), roots.end(),
-                        selected_current_file_path_) != roots.end()) {
-            selected_current_file_path_ = "Root";
-          } else if (p.has_parent_path()) {
+        if (p.has_parent_path() && p != p.root_path())
          selected_current_file_path_ = p.parent_path().string();
-          } else {
+        else
          selected_current_file_path_ = "Root";
-          }
-          tls_cert_path_self_.clear();
+        selected_file_.clear();
      }

      try {
-          for (const auto& entry : std::filesystem::directory_iterator(
-                   selected_current_file_path_)) {
+        for (const auto& entry :
+             std::filesystem::directory_iterator(selected_current_file_path_)) {
          std::string name = entry.path().filename().string();
          if (entry.is_directory()) {
            if (ImGui::Selectable(name.c_str())) {
              selected_current_file_path_ = entry.path().string();
-                tls_cert_path_self_.clear();
+              selected_file_.clear();
            }
          } else {
            if (ImGui::Selectable(name.c_str())) {
-                tls_cert_path_self_ = entry.path().string();
-                file_selected = true;
-                show_file_browser_ = false;
+              selected_file_ = entry.path().string();
            }
          }
        }
@@ -112,28 +87,38 @@ int Render::ShowSimpleFileBrowser() {

    ImGui::EndCombo();
  }
-    ImGui::PopItemFlag();
-  } else {
-    show_file_browser_ = true;
-  }

  return 0;
 }

 int Render::SelfHostedServerWindow() {
-  ImGuiIO& io = ImGui::GetIO();
  if (show_self_hosted_server_config_window_) {
    if (self_hosted_server_config_window_pos_reset_) {
+      const ImGuiViewport* viewport = ImGui::GetMainViewport();
      if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
        ImGui::SetNextWindowPos(
-            ImVec2(io.DisplaySize.x * 0.298f, io.DisplaySize.y * 0.25f));
+            ImVec2((viewport->WorkSize.x - viewport->WorkPos.x -
+                    SELF_HOSTED_SERVER_CONFIG_WINDOW_WIDTH_CN) /
+                       2,
+                   (viewport->WorkSize.y - viewport->WorkPos.y -
+                    SELF_HOSTED_SERVER_CONFIG_WINDOW_HEIGHT_CN) /
+                       2));
+
        ImGui::SetNextWindowSize(
-            ImVec2(io.DisplaySize.x * 0.407f, io.DisplaySize.y * 0.41f));
+            ImVec2(SELF_HOSTED_SERVER_CONFIG_WINDOW_WIDTH_CN,
+                   SELF_HOSTED_SERVER_CONFIG_WINDOW_HEIGHT_CN));
      } else {
        ImGui::SetNextWindowPos(
-            ImVec2(io.DisplaySize.x * 0.27f, io.DisplaySize.y * 0.3f));
+            ImVec2((viewport->WorkSize.x - viewport->WorkPos.x -
+                    SELF_HOSTED_SERVER_CONFIG_WINDOW_WIDTH_EN) /
+                       2,
+                   (viewport->WorkSize.y - viewport->WorkPos.y -
+                    SELF_HOSTED_SERVER_CONFIG_WINDOW_HEIGHT_EN) /
+                       2));
+
        ImGui::SetNextWindowSize(
-            ImVec2(io.DisplaySize.x * 0.465f, io.DisplaySize.y * 0.41f));
+            ImVec2(SELF_HOSTED_SERVER_CONFIG_WINDOW_WIDTH_EN,
+                   SELF_HOSTED_SERVER_CONFIG_WINDOW_HEIGHT_EN));
      }

      self_hosted_server_config_window_pos_reset_ = false;
@@ -141,6 +126,9 @@ int Render::SelfHostedServerWindow() {

    // Settings
    {
+      static int settings_items_padding = 30;
+      int settings_items_offset = 0;
+
      ImGui::SetWindowFontScale(0.5f);
      ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
      ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 5.0f);
@@ -156,76 +144,62 @@ int Render::SelfHostedServerWindow() {
      ImGui::SetWindowFontScale(0.5f);
      ImGui::PushStyleVar(ImGuiStyleVar_FrameBorderSize, 1.0f);
      {
-        ImGui::AlignTextToFramePadding();
+        settings_items_offset += settings_items_padding;
+        ImGui::SetCursorPosY(settings_items_offset + 2);
        ImGui::Text("%s", localization::self_hosted_server_address
                              [localization_language_index_]
                                  .c_str());
-        ImGui::SameLine();
        if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
-          ImGui::SetCursorPosX(title_bar_button_width_ * 2.5f);
+          ImGui::SetCursorPosX(SELF_HOSTED_SERVER_HOST_INPUT_BOX_PADDING_CN);
        } else {
-          ImGui::SetCursorPosX(title_bar_button_width_ * 3.43f);
+          ImGui::SetCursorPosX(SELF_HOSTED_SERVER_HOST_INPUT_BOX_PADDING_EN);
        }
-        ImGui::SetNextItemWidth(title_bar_button_width_ * 3.8f);
+        ImGui::SetCursorPosY(settings_items_offset);
+        ImGui::SetNextItemWidth(SELF_HOSTED_SERVER_INPUT_WINDOW_WIDTH);

-        ImGui::InputText("##signal_server_ip_self_", signal_server_ip_self_,
-                         IM_ARRAYSIZE(signal_server_ip_self_),
+        ImGui::InputText("##signal_server_ip_tmp_", signal_server_ip_tmp_,
+                         IM_ARRAYSIZE(signal_server_ip_tmp_),
                         ImGuiInputTextFlags_AlwaysOverwrite);
      }

      ImGui::Separator();

      {
-        ImGui::AlignTextToFramePadding();
+        settings_items_offset += settings_items_padding;
+        ImGui::SetCursorPosY(settings_items_offset + 2);
        ImGui::Text(
            "%s",
            localization::self_hosted_server_port[localization_language_index_]
                .c_str());
-        ImGui::SameLine();
-        if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
-          ImGui::SetCursorPosX(title_bar_button_width_ * 2.5f);
-        } else {
-          ImGui::SetCursorPosX(title_bar_button_width_ * 3.43f);
-        }
-        ImGui::SetNextItemWidth(title_bar_button_width_ * 3.8f);

-        ImGui::InputText("##signal_server_port_self_", signal_server_port_self_,
-                         IM_ARRAYSIZE(signal_server_port_self_));
+        if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
+          ImGui::SetCursorPosX(SELF_HOSTED_SERVER_PORT_INPUT_BOX_PADDING_CN);
+        } else {
+          ImGui::SetCursorPosX(SELF_HOSTED_SERVER_PORT_INPUT_BOX_PADDING_EN);
+        }
+        ImGui::SetCursorPosY(settings_items_offset);
+        ImGui::SetNextItemWidth(SELF_HOSTED_SERVER_INPUT_WINDOW_WIDTH);
+
+        ImGui::InputText("##signal_server_port_tmp_", signal_server_port_tmp_,
+                         IM_ARRAYSIZE(signal_server_port_tmp_));
      }

      ImGui::Separator();

      {
-        ImGui::AlignTextToFramePadding();
-        ImGui::Text("%s", localization::self_hosted_server_coturn_server_port
-                              [localization_language_index_]
-                                  .c_str());
-        ImGui::SameLine();
-        if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
-          ImGui::SetCursorPosX(title_bar_button_width_ * 2.5f);
-        } else {
-          ImGui::SetCursorPosX(title_bar_button_width_ * 3.43f);
-        }
-        ImGui::SetNextItemWidth(title_bar_button_width_ * 3.8f);
-
-        ImGui::InputText("##coturn_server_port_self_", coturn_server_port_self_,
-                         IM_ARRAYSIZE(coturn_server_port_self_));
-      }
-
-      ImGui::Separator();
-
-      {
-        ImGui::AlignTextToFramePadding();
+        settings_items_offset += settings_items_padding;
+        ImGui::SetCursorPosY(settings_items_offset + 2);
        ImGui::Text("%s", localization::self_hosted_server_certificate_path
                              [localization_language_index_]
                                  .c_str());
-        ImGui::SameLine();
+
        if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
-          ImGui::SetCursorPosX(title_bar_button_width_ * 2.5f);
+          ImGui::SetCursorPosX(SELF_HOSTED_SERVER_PORT_INPUT_BOX_PADDING_CN);
        } else {
-          ImGui::SetCursorPosX(title_bar_button_width_ * 3.43f);
+          ImGui::SetCursorPosX(SELF_HOSTED_SERVER_PORT_INPUT_BOX_PADDING_EN);
        }
-        ImGui::SetNextItemWidth(title_bar_button_width_ * 3.8f);
+        ImGui::SetCursorPosY(settings_items_offset);
+        ImGui::SetNextItemWidth(SELF_HOSTED_SERVER_INPUT_WINDOW_WIDTH);

        ShowSimpleFileBrowser();
      }
@@ -234,14 +208,14 @@ int Render::SelfHostedServerWindow() {
        ImGui::EndDisabled();
      }

-      ImGui::Dummy(ImVec2(0.0f, title_bar_button_width_ * 0.25f));
-
      if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
-        ImGui::SetCursorPosX(title_bar_button_width_ * 2.32f);
+        ImGui::SetCursorPosX(SELF_HOSTED_SERVER_CONFIG_OK_BUTTON_PADDING_CN);
      } else {
-        ImGui::SetCursorPosX(title_bar_button_width_ * 2.7f);
+        ImGui::SetCursorPosX(SELF_HOSTED_SERVER_CONFIG_OK_BUTTON_PADDING_EN);
      }

+      settings_items_offset += settings_items_padding + 10;
+      ImGui::SetCursorPosY(settings_items_offset);
      ImGui::PopStyleVar();

      // OK
@@ -249,20 +223,16 @@ int Render::SelfHostedServerWindow() {
              localization::ok[localization_language_index_].c_str())) {
        show_self_hosted_server_config_window_ = false;

-        config_center_->SetServerHost(signal_server_ip_self_);
-        config_center_->SetServerPort(atoi(signal_server_port_self_));
-        config_center_->SetCoturnServerPort(atoi(coturn_server_port_self_));
-        config_center_->SetCertFilePath(tls_cert_path_self_);
-        strncpy(signal_server_ip_, signal_server_ip_self_,
+        config_center_->SetServerHost(signal_server_ip_tmp_);
+        config_center_->SetServerPort(atoi(signal_server_port_tmp_));
+        config_center_->SetCertFilePath(selected_file_);
+        strncpy(signal_server_ip_, signal_server_ip_tmp_,
                sizeof(signal_server_ip_) - 1);
        signal_server_ip_[sizeof(signal_server_ip_) - 1] = '\0';
-        strncpy(signal_server_port_, signal_server_port_self_,
+        strncpy(signal_server_port_, signal_server_port_tmp_,
                sizeof(signal_server_port_) - 1);
        signal_server_port_[sizeof(signal_server_port_) - 1] = '\0';
-        strncpy(coturn_server_port_, coturn_server_port_self_,
-                sizeof(coturn_server_port_) - 1);
-        coturn_server_port_[sizeof(coturn_server_port_) - 1] = '\0';
-        strncpy(cert_file_path_, tls_cert_path_self_.c_str(),
+        strncpy(cert_file_path_, selected_file_.c_str(),
                sizeof(cert_file_path_) - 1);
        cert_file_path_[sizeof(cert_file_path_) - 1] = '\0';

@@ -275,27 +245,16 @@ int Render::SelfHostedServerWindow() {
              localization::cancel[localization_language_index_].c_str())) {
        show_self_hosted_server_config_window_ = false;
        self_hosted_server_config_window_pos_reset_ = true;
-        strncpy(signal_server_ip_self_,
-                config_center_->GetSignalServerHost().c_str(),
-                sizeof(signal_server_ip_self_) - 1);
-        signal_server_ip_self_[sizeof(signal_server_ip_self_) - 1] = '\0';
-        int signal_port = config_center_->GetSignalServerPort();
-        if (signal_port > 0) {
-          strncpy(signal_server_port_self_, std::to_string(signal_port).c_str(),
-                  sizeof(signal_server_port_self_) - 1);
-          signal_server_port_self_[sizeof(signal_server_port_self_) - 1] = '\0';
-        } else {
-          signal_server_port_self_[0] = '\0';
-        }
-        int coturn_port = config_center_->GetCoturnServerPort();
-        if (coturn_port > 0) {
-          strncpy(coturn_server_port_self_, std::to_string(coturn_port).c_str(),
-                  sizeof(coturn_server_port_self_) - 1);
-          coturn_server_port_self_[sizeof(coturn_server_port_self_) - 1] = '\0';
-        } else {
-          coturn_server_port_self_[0] = '\0';
-        }
-        tls_cert_path_self_ = config_center_->GetCertFilePath();
+
+        strncpy(signal_server_ip_tmp_, signal_server_ip_,
+                sizeof(signal_server_ip_tmp_) - 1);
+        signal_server_ip_tmp_[sizeof(signal_server_ip_tmp_) - 1] = '\0';
+        strncpy(signal_server_port_tmp_, signal_server_port_,
+                sizeof(signal_server_port_tmp_) - 1);
+        signal_server_port_tmp_[sizeof(signal_server_port_tmp_) - 1] = '\0';
+        config_center_->SetServerHost(signal_server_ip_tmp_);
+        config_center_->SetServerPort(atoi(signal_server_port_tmp_));
+        selected_file_.clear();
      }

      ImGui::SetWindowFontScale(1.0f);
@@ -309,4 +268,3 @@ int Render::SelfHostedServerWindow() {

  return 0;
 }
-}  // namespace crossdesk
--- a/src/gui/windows/stream_window.cpp
+++ b/src/gui/windows/stream_window.cpp
@@ -2,8 +2,6 @@
 #include "rd_log.h"
 #include "render.h"

-namespace crossdesk {
-
 void Render::DrawConnectionStatusText(
    std::shared_ptr<SubStreamWindowProperties>& props) {
  std::string text;
@@ -32,8 +30,6 @@ void Render::DrawConnectionStatusText(
 }

 void Render::CloseTab(decltype(client_properties_)::iterator& it) {
-  // std::unique_lock lock(client_properties_mutex_);
-  if (it != client_properties_.end()) {
  CleanupPeer(it->second);
  it = client_properties_.erase(it);
  if (client_properties_.empty()) {
@@ -41,7 +37,6 @@ void Render::CloseTab(decltype(client_properties_)::iterator& it) {
    event.type = SDL_EVENT_QUIT;
    SDL_PushEvent(&event);
  }
-  }
 }

 int Render::StreamWindow() {
@@ -53,28 +48,21 @@ int Render::StreamWindow() {
  ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0.0f, 0.0f));
  ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(0, 0, 0, 0));
  ImGui::PushStyleColor(ImGuiCol_Border, ImVec4(0, 0, 0, 0));
-  bool video_bg_opened = ImGui::Begin(
-      "VideoBg", nullptr,
+  ImGui::Begin("VideoBg", nullptr,
               ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoDecoration |
-          ImGuiWindowFlags_NoBringToFrontOnFocus | ImGuiWindowFlags_NoDocking);
+                   ImGuiWindowFlags_NoBringToFrontOnFocus |
+                   ImGuiWindowFlags_NoDocking);
  ImGui::PopStyleColor(2);
  ImGui::PopStyleVar();

-  if (!video_bg_opened) {
-    return 0;
-  }
-
  ImGuiWindowFlags stream_window_flag =
      ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoDecoration |
      ImGuiWindowFlags_NoBringToFrontOnFocus | ImGuiWindowFlags_NoMove;

  if (!fullscreen_button_pressed_) {
-    ImGui::SetNextWindowPos(
-        ImVec2(title_bar_button_width_ * 0.8f, title_bar_button_width_ * 0.1f),
-        ImGuiCond_Always);
-    ImGui::SetNextWindowSize(ImVec2(0, title_bar_button_width_ * 0.8f),
-                             ImGuiCond_Always);
-    ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0.0f, 0.0f));
+    ImGui::SetNextWindowPos(ImVec2(20, 0), ImGuiCond_Always);
+    ImGui::SetNextWindowSize(ImVec2(0, 20), ImGuiCond_Always);
+    ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0.0f, 8.0f));
    ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 0.0f);
    ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(0, 0, 0, 0.0f));
    ImGui::Begin("TabBar", nullptr,
@@ -89,32 +77,22 @@ int Render::StreamWindow() {
                               ImGuiTabBarFlags_AutoSelectNewTabs)) {
      is_tab_bar_hovered_ = ImGui::IsWindowHovered();

-      // std::shared_lock lock(client_properties_mutex_);
      for (auto it = client_properties_.begin();
           it != client_properties_.end();) {
        auto& props = it->second;
        if (!props->tab_opened_) {
-          std::string remote_id_to_close = props->remote_id_;
-          // lock.unlock();
-          {
-            // std::unique_lock unique_lock(client_properties_mutex_);
-            auto close_it = client_properties_.find(remote_id_to_close);
-            if (close_it != client_properties_.end()) {
-              CloseTab(close_it);
-            }
-          }
-          // lock.lock();
-          it = client_properties_.begin();
+          CloseTab(it);
          continue;
        }

+        ImGui::SetWindowFontScale(0.6f);
        std::string tab_label =
            enable_srtp_
                ? std::string(ICON_FA_SHIELD_HALVED) + " " + props->remote_id_
                : props->remote_id_;
        if (ImGui::BeginTabItem(tab_label.c_str(), &props->tab_opened_)) {
          props->tab_selected_ = true;
-          ImGui::SetWindowFontScale(0.6f);
+          ImGui::SetWindowFontScale(1.0f);

          ImGui::SetNextWindowSize(
              ImVec2(stream_window_width_, stream_window_height_),
@@ -142,25 +120,12 @@ int Render::StreamWindow() {
          focused_remote_id_ = props->remote_id_;

          if (!props->peer_) {
-            std::string remote_id_to_erase = props->remote_id_;
-            // lock.unlock();
-            {
-              // std::unique_lock unique_lock(client_properties_mutex_);
-              auto erase_it = client_properties_.find(remote_id_to_erase);
-              if (erase_it != client_properties_.end()) {
-                erase_it = client_properties_.erase(erase_it);
+            it = client_properties_.erase(it);
            if (client_properties_.empty()) {
              SDL_Event event;
              event.type = SDL_EVENT_QUIT;
              SDL_PushEvent(&event);
            }
-              }
-            }
-            // lock.lock();
-            ImGui::End();
-            ImGui::EndTabItem();
-            it = client_properties_.begin();
-            continue;
          } else {
            DrawConnectionStatusText(props);
            ++it;
@@ -170,20 +135,7 @@ int Render::StreamWindow() {
          ImGui::EndTabItem();
        } else {
          props->tab_selected_ = false;
-          if (!props->tab_opened_) {
-            std::string remote_id_to_close = props->remote_id_;
-            // lock.unlock();
-            {
-              // std::unique_lock unique_lock(client_properties_mutex_);
-              auto close_it = client_properties_.find(remote_id_to_close);
-              if (close_it != client_properties_.end()) {
-                CloseTab(close_it);
-              }
-            }
-            // lock.lock();
-            it = client_properties_.begin();
-            continue;
-          }
+          ImGui::SetWindowFontScale(1.0f);
          ++it;
        }
      }
@@ -193,22 +145,11 @@ int Render::StreamWindow() {

    ImGui::End();  // End TabBar
  } else {
-    // std::shared_lock lock(client_properties_mutex_);
    for (auto it = client_properties_.begin();
         it != client_properties_.end();) {
      auto& props = it->second;
      if (!props->tab_opened_) {
-        std::string remote_id_to_close = props->remote_id_;
-        // lock.unlock();
-        {
-          // std::unique_lock unique_lock(client_properties_mutex_);
-          auto close_it = client_properties_.find(remote_id_to_close);
-          if (close_it != client_properties_.end()) {
-            CloseTab(close_it);
-          }
-        }
-        // lock.lock();
-        it = client_properties_.begin();
+        CloseTab(it);
        continue;
      }

@@ -238,23 +179,12 @@ int Render::StreamWindow() {
        if (!props->peer_) {
          fullscreen_button_pressed_ = false;
          SDL_SetWindowFullscreen(stream_window_, false);
-          std::string remote_id_to_erase = props->remote_id_;
-          // lock.unlock();
-          {
-            // std::unique_lock unique_lock(client_properties_mutex_);
-            auto erase_it = client_properties_.find(remote_id_to_erase);
-            if (erase_it != client_properties_.end()) {
-              client_properties_.erase(erase_it);
+          it = client_properties_.erase(it);
          if (client_properties_.empty()) {
            SDL_Event event;
            event.type = SDL_EVENT_QUIT;
            SDL_PushEvent(&event);
          }
-            }
-          }
-          // lock.lock();
-          it = client_properties_.begin();
-          continue;
        } else {
          DrawConnectionStatusText(props);
          ++it;
@@ -270,4 +200,3 @@ int Render::StreamWindow() {

  return 0;
 }
-}  // namespace crossdesk
--- a/src/gui/windows/update_notification_window.cpp
+++ b/src/gui/windows/update_notification_window.cpp
@@ -1,214 +0,0 @@
-#include <algorithm>
-#include <cstdlib>
-#include <string>
-
-#include "layout.h"
-#include "localization.h"
-#include "rd_log.h"
-#include "render.h"
-
-namespace crossdesk {
-
-std::string CleanMarkdown(const std::string& markdown) {
-  std::string result = markdown;
-
-  // remove # title mark
-  size_t pos = 0;
-  while (pos < result.length()) {
-    if (result[pos] == '\n' || pos == 0) {
-      size_t line_start = (result[pos] == '\n') ? pos + 1 : pos;
-      if (line_start < result.length() && result[line_start] == '#') {
-        size_t hash_end = line_start;
-        while (hash_end < result.length() &&
-               (result[hash_end] == '#' || result[hash_end] == ' ')) {
-          hash_end++;
-        }
-
-        result.erase(line_start, hash_end - line_start);
-        pos = line_start;
-        continue;
-      }
-    }
-    pos++;
-  }
-
-  // remove ** bold mark
-  pos = 0;
-  while ((pos = result.find("**", pos)) != std::string::npos) {
-    result.erase(pos, 2);
-  }
-
-  // remove all spaces
-  result.erase(std::remove(result.begin(), result.end(), ' '), result.end());
-
-  // replace . with 、
-  pos = 0;
-  while ((pos = result.find('.', pos)) != std::string::npos) {
-    result.replace(pos, 1, "、");
-    pos += 1;  // Move to next position after the replacement
-  }
-
-  return result;
-}
-
-int Render::UpdateNotificationWindow() {
-  if (show_update_notification_window_ && update_available_) {
-    const ImGuiViewport* viewport = ImGui::GetMainViewport();
-
-    float update_notification_window_width = title_bar_button_width_ * 10.0f;
-    float update_notification_window_height = title_bar_button_width_ * 8.0f;
-
-    // #ifdef __APPLE__
-    //     float font_scale = 0.3f;
-    // #else
-    //     float font_scale = 0.5f;
-    // #endif
-
-    ImGui::SetNextWindowPos(ImVec2((viewport->WorkSize.x - viewport->WorkPos.x -
-                                    update_notification_window_width) /
-                                       2,
-                                   (viewport->WorkSize.y - viewport->WorkPos.y -
-                                    update_notification_window_height) /
-                                       2),
-                            ImGuiCond_FirstUseEver);
-
-    ImGui::SetNextWindowSize(ImVec2(update_notification_window_width,
-                                    update_notification_window_height));
-
-    ImGui::PushStyleColor(ImGuiCol_WindowBg, ImVec4(1.0f, 1.0f, 1.0f, 1.0f));
-    ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 1.0f);
-    ImGui::PushStyleVar(ImGuiStyleVar_WindowRounding, 5.0f);
-    ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 3.0f);
-    ImGui::Begin(
-        localization::notification[localization_language_index_].c_str(),
-        nullptr,
-        ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoCollapse |
-            ImGuiWindowFlags_NoSavedSettings | ImGuiWindowFlags_NoTitleBar);
-
-    ImGui::SetCursorPosY(ImGui::GetCursorPosY() +
-                         update_notification_window_height * 0.05f);
-
-    // title: new version available
-    ImGui::SetCursorPosX(update_notification_window_width * 0.1f);
-    ImGui::SetWindowFontScale(0.55f);
-    std::string title =
-        localization::new_version_available[localization_language_index_] +
-        ": v" + latest_version_;
-    ImGui::Text("%s", title.c_str());
-    ImGui::SetWindowFontScale(0.1f);
-
-    ImGui::Spacing();
-
-    // website link
-    std::string download_text =
-        localization::access_website[localization_language_index_] +
-        "https://crossdesk.cn";
-    ImGui::SetWindowFontScale(0.5f);
-    Hyperlink(download_text, "https://crossdesk.cn",
-              update_notification_window_width);
-    ImGui::SetWindowFontScale(1.0f);
-
-    ImGui::Spacing();
-
-    float scrollable_height =
-        update_notification_window_height - UPDATE_NOTIFICATION_RESERVED_HEIGHT;
-
-    if (main_windows_system_chinese_font_ != nullptr) {
-      ImGui::PushFont(main_windows_system_chinese_font_);
-    }
-    // scrollable content area
-    ImGui::SetCursorPosX(update_notification_window_width * 0.05f);
-    ImGui::BeginChild(
-        "ScrollableContent",
-        ImVec2(update_notification_window_width * 0.9f, scrollable_height),
-        ImGuiChildFlags_Border, ImGuiWindowFlags_None);
-    ImGui::SetWindowFontScale(0.5f);
-    // set text wrap position to current available width (accounts for
-    // scrollbar)
-    float wrap_pos = ImGui::GetContentRegionAvail().x;
-    ImGui::PushTextWrapPos(wrap_pos);
-
-    // release name
-    if (latest_version_info_.contains("releaseName") &&
-        latest_version_info_["releaseName"].is_string() &&
-        !latest_version_info_["releaseName"].empty()) {
-      ImGui::SetCursorPosX(update_notification_window_width * 0.05f);
-      std::string release_name =
-          latest_version_info_["releaseName"].get<std::string>();
-      ImGui::TextWrapped("%s", release_name.c_str());
-      ImGui::Spacing();
-    }
-
-    // release notes
-    if (!release_notes_.empty()) {
-      ImGui::SetCursorPosX(update_notification_window_width * 0.05f);
-      std::string cleaned_notes = CleanMarkdown(release_notes_);
-      ImGui::TextWrapped("%s", cleaned_notes.c_str());
-      ImGui::Spacing();
-    }
-
-    // release date
-    if (latest_version_info_.contains("releaseDate") &&
-        latest_version_info_["releaseDate"].is_string() &&
-        !latest_version_info_["releaseDate"].empty()) {
-      ImGui::SetCursorPosX(update_notification_window_width * 0.05f);
-      std::string date_label =
-          localization::release_date[localization_language_index_];
-      std::string release_date = latest_version_info_["releaseDate"];
-      std::string date_text = date_label + release_date;
-      ImGui::Text("%s", date_text.c_str());
-      ImGui::Spacing();
-    }
-
-    // pop text wrap position
-    ImGui::PopTextWrapPos();
-
-    ImGui::EndChild();
-
-    // pop system font
-    if (main_windows_system_chinese_font_ != nullptr) {
-      ImGui::PopFont();
-    }
-
-    ImGui::Spacing();
-
-    if (ConfigCenter::LANGUAGE::CHINESE == localization_language_) {
-      ImGui::SetCursorPosX(update_notification_window_width * 0.407f);
-    } else {
-      ImGui::SetCursorPosX(update_notification_window_width * 0.367f);
-    }
-
-    ImGui::SetWindowFontScale(0.5f);
-    // update button
-    if (ImGui::Button(
-            localization::update[localization_language_index_].c_str())) {
-      // open download page
-      std::string url = "https://crossdesk.cn";
-#if defined(_WIN32)
-      std::string cmd = "start " + url;
-#elif defined(__APPLE__)
-      std::string cmd = "open " + url;
-#else
-      std::string cmd = "xdg-open " + url;
-#endif
-      system(cmd.c_str());
-      show_update_notification_window_ = false;
-    }
-
-    ImGui::SameLine();
-
-    if (ImGui::Button(
-            localization::cancel[localization_language_index_].c_str())) {
-      show_update_notification_window_ = false;
-    }
-
-    ImGui::SetWindowFontScale(1.0f);
-
-    ImGui::End();
-    ImGui::PopStyleVar(3);
-    ImGui::PopStyleColor();
-  }
-  return 0;
-}
-
-}  // namespace crossdesk
--- a/src/log/rd_log.cpp
+++ b/src/log/rd_log.cpp
@@ -3,8 +3,6 @@
 #include <atomic>
 #include <filesystem>

-namespace crossdesk {
-
 namespace {

 std::string g_log_dir = "logs";
@@ -62,4 +60,3 @@ std::shared_ptr<spdlog::logger> get_logger() {

  return g_logger;
 }
-}  // namespace crossdesk
--- a/src/log/rd_log.h
+++ b/src/log/rd_log.h
@@ -25,8 +25,6 @@

 #define SPDLOG_ACTIVE_LEVEL SPDLOG_LEVEL_INFO

-namespace crossdesk {
-
 constexpr auto LOGGER_NAME = "crossdesk";

 void InitLogger(const std::string& log_dir);
@@ -37,5 +35,5 @@ std::shared_ptr<spdlog::logger> get_logger();
 #define LOG_WARN(...) SPDLOG_LOGGER_WARN(get_logger(), __VA_ARGS__)
 #define LOG_ERROR(...) SPDLOG_LOGGER_ERROR(get_logger(), __VA_ARGS__)
 #define LOG_FATAL(...) SPDLOG_LOGGER_CRITICAL(get_logger(), __VA_ARGS__)
-}  // namespace crossdesk
+
 #endif
--- a/src/path_manager/path_manager.cpp
+++ b/src/path_manager/path_manager.cpp
@@ -2,8 +2,6 @@

 #include <cstdlib>

-namespace crossdesk {
-
 PathManager::PathManager(const std::string& app_name) : app_name_(app_name) {}

 std::filesystem::path PathManager::GetConfigPath() {
@@ -18,11 +16,7 @@ std::filesystem::path PathManager::GetConfigPath() {

 std::filesystem::path PathManager::GetCachePath() {
 #ifdef _WIN32
-#ifdef CROSSDESK_DEBUG
-  return "cache";
-#else
  return GetKnownFolder(FOLDERID_LocalAppData) / app_name_ / "cache";
-#endif
 #elif __APPLE__
  return GetEnvOrDefault("XDG_CACHE_HOME", GetHome() + "/.cache") / app_name_;
 #else
@@ -36,7 +30,7 @@ std::filesystem::path PathManager::GetLogPath() {
 #elif __APPLE__
  return GetHome() + "/Library/Logs/" + app_name_;
 #else
-  return GetCachePath() / "logs";
+  return GetCachePath() / app_name_ / "logs";
 #endif
 }

@@ -76,35 +70,22 @@ std::filesystem::path PathManager::GetKnownFolder(REFKNOWNFOLDERID id) {
 #endif

 std::string PathManager::GetHome() {
+  if (const char* home = getenv("HOME")) {
+    return std::string(home);
+  }
 #ifdef _WIN32
  char path[MAX_PATH];
  if (SUCCEEDED(SHGetFolderPathA(NULL, CSIDL_PROFILE, NULL, 0, path)))
    return std::string(path);
-#else
-  if (const char* home = getenv("HOME")) {
-    return std::string(home);
-  }
 #endif
  return {};
 }

 std::filesystem::path PathManager::GetEnvOrDefault(const char* env_var,
                                                   const std::string& def) {
-#ifdef _WIN32
-  char* buffer = nullptr;
-  size_t size = 0;
-
-  if (_dupenv_s(&buffer, &size, env_var) == 0 && buffer != nullptr) {
-    std::filesystem::path result(buffer);
-    free(buffer);
-    return result;
-  }
-#else
  if (const char* val = getenv(env_var)) {
    return std::filesystem::path(val);
  }
-#endif

  return std::filesystem::path(def);
 }
-}  // namespace crossdesk
--- a/src/path_manager/path_manager.h
+++ b/src/path_manager/path_manager.h
@@ -14,8 +14,6 @@
 #include <windows.h>
 #endif

-namespace crossdesk {
-
 class PathManager {
 public:
  explicit PathManager(const std::string& app_name);
@@ -42,5 +40,5 @@ class PathManager {
 private:
  std::string app_name_;
 };
-}  // namespace crossdesk
+
 #endif
--- a/src/screen_capturer/linux/screen_capturer_x11.cpp
+++ b/src/screen_capturer/linux/screen_capturer_x11.cpp
@@ -1,18 +1,11 @@
 #include "screen_capturer_x11.h"

-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/extensions/Xfixes.h>
-#include <X11/extensions/Xrandr.h>
-
 #include <chrono>
 #include <thread>

 #include "libyuv.h"
 #include "rd_log.h"

-namespace crossdesk {
-
 ScreenCapturerX11::ScreenCapturerX11() {}

 ScreenCapturerX11::~ScreenCapturerX11() { Destroy(); }
@@ -41,21 +34,9 @@ int ScreenCapturerX11::Init(const int fps, cb_desktop_data cb) {
      XRRCrtcInfo* crtc_info =
          XRRGetCrtcInfo(display_, screen_res_, output_info->crtc);

-      std::string name(output_info->name);
-
-      if (name.empty()) {
-        name = "Display" + std::to_string(i + 1);
-      }
-
-      // clean display name, remove non-alphanumeric characters
-      name.erase(
-          std::remove_if(name.begin(), name.end(),
-                         [](unsigned char c) { return !std::isalnum(c); }),
-          name.end());
-
-      display_info_list_.push_back(DisplayInfo(
-          (void*)display_, name, true, crtc_info->x, crtc_info->y,
-          crtc_info->x + crtc_info->width, crtc_info->y + crtc_info->height));
+      display_info_list_.push_back(
+          DisplayInfo((void*)display_, output_info->name, true, crtc_info->x,
+                      crtc_info->y, crtc_info->width, crtc_info->height));

      XRRFreeCrtcInfo(crtc_info);
    }
@@ -103,9 +84,8 @@ int ScreenCapturerX11::Destroy() {
  return 0;
 }

-int ScreenCapturerX11::Start(bool show_cursor) {
+int ScreenCapturerX11::Start() {
  if (running_) return 0;
-  show_cursor_ = show_cursor;
  running_ = true;
  paused_ = false;
  thread_ = std::thread([this]() {
@@ -162,20 +142,6 @@ void ScreenCapturerX11::OnFrame() {
                            AllPlanes, ZPixmap);
  if (!image) return;

-  // if enable show cursor, draw cursor
-  if (show_cursor_) {
-    Window root_return, child_return;
-    int root_x, root_y, win_x, win_y;
-    unsigned int mask;
-    if (XQueryPointer(display_, root_, &root_return, &child_return, &root_x,
-                      &root_y, &win_x, &win_y, &mask)) {
-      if (root_x >= left_ && root_x < left_ + width_ && root_y >= top_ &&
-          root_y < top_ + height_) {
-        DrawCursor(image, root_x - left_, root_y - top_);
-      }
-    }
-  }
-
  bool needs_copy = image->bytes_per_line != width_ * 4;
  std::vector<uint8_t> argb_buf;
  uint8_t* src_argb = nullptr;
@@ -206,82 +172,3 @@ void ScreenCapturerX11::OnFrame() {

  XDestroyImage(image);
 }
-
-void ScreenCapturerX11::DrawCursor(XImage* image, int x, int y) {
-  if (!display_ || !image) {
-    return;
-  }
-
-  // check XFixes extension
-  int event_base, error_base;
-  if (!XFixesQueryExtension(display_, &event_base, &error_base)) {
-    return;
-  }
-
-  XFixesCursorImage* cursor_image = XFixesGetCursorImage(display_);
-  if (!cursor_image) {
-    return;
-  }
-
-  int cursor_width = cursor_image->width;
-  int cursor_height = cursor_image->height;
-
-  int draw_x = x - cursor_image->xhot;
-  int draw_y = y - cursor_image->yhot;
-
-  // draw cursor on image
-  for (int cy = 0; cy < cursor_height; ++cy) {
-    for (int cx = 0; cx < cursor_width; ++cx) {
-      int img_x = draw_x + cx;
-      int img_y = draw_y + cy;
-
-      if (img_x < 0 || img_x >= image->width || img_y < 0 ||
-          img_y >= image->height) {
-        continue;
-      }
-
-      unsigned long cursor_pixel = cursor_image->pixels[cy * cursor_width + cx];
-      unsigned char a = (cursor_pixel >> 24) & 0xFF;
-
-      // if alpha is 0, skip
-      if (a == 0) {
-        continue;
-      }
-
-      unsigned long img_pixel = XGetPixel(image, img_x, img_y);
-
-      unsigned char img_r = (img_pixel >> 16) & 0xFF;
-      unsigned char img_g = (img_pixel >> 8) & 0xFF;
-      unsigned char img_b = img_pixel & 0xFF;
-
-      unsigned char cursor_r = (cursor_pixel >> 16) & 0xFF;
-      unsigned char cursor_g = (cursor_pixel >> 8) & 0xFF;
-      unsigned char cursor_b = cursor_pixel & 0xFF;
-
-      // alpha mix
-      unsigned char final_r, final_g, final_b;
-      if (a == 255) {
-        // if alpha is 255, use cursor color
-        final_r = cursor_r;
-        final_g = cursor_g;
-        final_b = cursor_b;
-      } else {
-        float alpha = a / 255.0f;
-        float inv_alpha = 1.0f - alpha;
-        final_r =
-            static_cast<unsigned char>(cursor_r * alpha + img_r * inv_alpha);
-        final_g =
-            static_cast<unsigned char>(cursor_g * alpha + img_g * inv_alpha);
-        final_b =
-            static_cast<unsigned char>(cursor_b * alpha + img_b * inv_alpha);
-      }
-
-      // set pixel
-      unsigned long new_pixel = (final_r << 16) | (final_g << 8) | final_b;
-      XPutPixel(image, img_x, img_y, new_pixel);
-    }
-  }
-
-  XFree(cursor_image);
-}
-}  // namespace crossdesk
--- a/src/screen_capturer/linux/screen_capturer_x11.h
+++ b/src/screen_capturer/linux/screen_capturer_x11.h
@@ -7,14 +7,9 @@
 #ifndef _SCREEN_CAPTURER_X11_H_
 #define _SCREEN_CAPTURER_X11_H_

-// forward declarations for X11 types
-struct _XDisplay;
-typedef struct _XDisplay Display;
-typedef unsigned long Window;
-struct _XRRScreenResources;
-typedef struct _XRRScreenResources XRRScreenResources;
-struct _XImage;
-typedef struct _XImage XImage;
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <X11/extensions/Xrandr.h>

 #include <atomic>
 #include <cstring>
@@ -25,8 +20,6 @@ typedef struct _XImage XImage;

 #include "screen_capturer.h"

-namespace crossdesk {
-
 class ScreenCapturerX11 : public ScreenCapturer {
 public:
  ScreenCapturerX11();
@@ -35,7 +28,7 @@ class ScreenCapturerX11 : public ScreenCapturer {
 public:
  int Init(const int fps, cb_desktop_data cb) override;
  int Destroy() override;
-  int Start(bool show_cursor) override;
+  int Start() override;
  int Stop() override;

  int Pause(int monitor_index) override;
@@ -47,9 +40,6 @@ class ScreenCapturerX11 : public ScreenCapturer {

  void OnFrame();

- private:
-  void DrawCursor(XImage* image, int x, int y);
-
 private:
  Display* display_ = nullptr;
  Window root_ = 0;
@@ -62,13 +52,13 @@ class ScreenCapturerX11 : public ScreenCapturer {
  std::atomic<bool> running_{false};
  std::atomic<bool> paused_{false};
  std::atomic<int> monitor_index_{0};
-  std::atomic<bool> show_cursor_{true};
  int fps_ = 60;
  cb_desktop_data callback_;
  std::vector<DisplayInfo> display_info_list_;

+  // 缓冲区
  std::vector<uint8_t> y_plane_;
  std::vector<uint8_t> uv_plane_;
 };
-}  // namespace crossdesk
+
 #endif
--- a/src/screen_capturer/macosx/screen_capturer_sck.cpp
+++ b/src/screen_capturer/macosx/screen_capturer_sck.cpp
@@ -2,8 +2,6 @@

 #include "rd_log.h"

-namespace crossdesk {
-
 ScreenCapturerSck::ScreenCapturerSck() {}
 ScreenCapturerSck::~ScreenCapturerSck() {}

@@ -28,8 +26,8 @@ int ScreenCapturerSck::Destroy() {
  return 0;
 }

-int ScreenCapturerSck::Start(bool show_cursor) {
-  screen_capturer_sck_impl_->Start(show_cursor);
+int ScreenCapturerSck::Start() {
+  screen_capturer_sck_impl_->Start();
  return 0;
 }

@@ -73,4 +71,3 @@ std::vector<DisplayInfo> ScreenCapturerSck::GetDisplayInfoList() {
 void ScreenCapturerSck::OnFrame() {}

 void ScreenCapturerSck::CleanUp() {}
-}  // namespace crossdesk
--- a/src/screen_capturer/macosx/screen_capturer_sck.h
+++ b/src/screen_capturer/macosx/screen_capturer_sck.h
@@ -16,8 +16,6 @@

 #include "screen_capturer.h"

-namespace crossdesk {
-
 class ScreenCapturerSck : public ScreenCapturer {
 public:
  ScreenCapturerSck();
@@ -26,7 +24,7 @@ class ScreenCapturerSck : public ScreenCapturer {
 public:
  int Init(const int fps, cb_desktop_data cb) override;
  int Destroy() override;
-  int Start(bool show_cursor) override;
+  int Start() override;
  int Stop() override;

  int Pause(int monitor_index) override;
@@ -57,5 +55,5 @@ class ScreenCapturerSck : public ScreenCapturer {
 private:
  std::unique_ptr<ScreenCapturer> screen_capturer_sck_impl_;
 };
-}  // namespace crossdesk
+
 #endif
--- a/src/screen_capturer/macosx/screen_capturer_sck_impl.mm
+++ b/src/screen_capturer/macosx/screen_capturer_sck_impl.mm
@@ -22,11 +22,8 @@
 #include "display_info.h"
 #include "rd_log.h"

-using namespace crossdesk;
-
-class ScreenCapturerSckImpl;
-
 static const int kFullDesktopScreenId = -1;
+class ScreenCapturerSckImpl;

 // The ScreenCaptureKit API was available in macOS 12.3, but full-screen capture
 // was reported to be broken before macOS 13 - see http://crbug.com/40234870.
@@ -57,7 +54,7 @@ class API_AVAILABLE(macos(14.0)) ScreenCapturerSckImpl : public ScreenCapturer {
 public:
  int Init(const int fps, cb_desktop_data cb) override;

-  int Start(bool show_cursor) override;
+  int Start() override;

  int SwitchTo(int monitor_index) override;

@@ -80,7 +77,6 @@ class API_AVAILABLE(macos(14.0)) ScreenCapturerSckImpl : public ScreenCapturer {
  int width_ = 0;
  int height_ = 0;
  int fps_ = 60;
-  bool show_cursor_ = false;

 public:
  // Called by SckHelper when shareable content is returned by ScreenCaptureKit. `content` will be
@@ -196,26 +192,14 @@ ScreenCapturerSckImpl::~ScreenCapturerSckImpl() {

 int ScreenCapturerSckImpl::Init(const int fps, cb_desktop_data cb) {
  _on_data = cb;
-  fps_ = fps;
-
-  if (@available(macOS 10.15, *)) {
-    bool has_permission = CGPreflightScreenCaptureAccess();
-    if (!has_permission) {
-      LOG_ERROR("Screen recording permission not granted");
-      return -1;
-    }
-  }

  dispatch_semaphore_t sema = dispatch_semaphore_create(0);
  __block SCShareableContent *content = nil;
-  __block NSError *capture_error = nil;

  [SCShareableContent
      getShareableContentWithCompletionHandler:^(SCShareableContent *result, NSError *error) {
        if (error) {
-          capture_error = error;
-          LOG_ERROR("Failed to get shareable content: {}",
-                    std::string([error.localizedDescription UTF8String]));
+          NSLog(@"Failed to get shareable content: %@", error);
        } else {
          content = result;
        }
@@ -223,10 +207,9 @@ int ScreenCapturerSckImpl::Init(const int fps, cb_desktop_data cb) {
      }];
  dispatch_semaphore_wait(sema, DISPATCH_TIME_FOREVER);

-  if (capture_error || !content || content.displays.count == 0) {
-    LOG_ERROR("Failed to get display info, error: {}",
-              std::string([capture_error.localizedDescription UTF8String]));
-    return -1;
+  if (!content || content.displays.count == 0) {
+    LOG_ERROR("Failed to get display info");
+    return 0;
  }

  CGDirectDisplayID displays[10];
@@ -239,17 +222,13 @@ int ScreenCapturerSckImpl::Init(const int fps, cb_desktop_data cb) {
    CGRect bounds = CGDisplayBounds(display_id);
    bool is_primary = CGDisplayIsMain(display_id);

-    std::string name = GetDisplayName(display_id);
+    std::string name;
+    name = GetDisplayName(display_id);

    if (name.empty()) {
-      name = "Display" + std::to_string(unnamed_count++);
+      name = "Display " + std::to_string(unnamed_count++);
    }

-    // clean display name, remove non-alphanumeric characters
-    name.erase(
-        std::remove_if(name.begin(), name.end(), [](unsigned char c) { return !std::isalnum(c); }),
-        name.end());
-
    DisplayInfo info((void *)(uintptr_t)display_id, name, is_primary,
                     static_cast<int>(bounds.origin.x), static_cast<int>(bounds.origin.y),
                     static_cast<int>(bounds.origin.x + bounds.size.width),
@@ -264,18 +243,7 @@ int ScreenCapturerSckImpl::Init(const int fps, cb_desktop_data cb) {
  return 0;
 }

-int ScreenCapturerSckImpl::Start(bool show_cursor) {
-  if (permanent_error_) {
-    LOG_ERROR("Cannot start capturer: permanent error occurred");
-    return -1;
-  }
-
-  if (display_info_list_.empty()) {
-    LOG_ERROR("Cannot start capturer: display info not initialized");
-    return -1;
-  }
-
-  show_cursor_ = show_cursor;
+int ScreenCapturerSckImpl::Start() {
  StartOrReconfigureCapturer();
  return 0;
 }
@@ -330,17 +298,17 @@ void ScreenCapturerSckImpl::OnShareableContentCreated(SCShareableContent *conten
    return;
  }

-  if (!content.displays || content.displays.count == 0) {
+  if (!content.displays.count) {
    LOG_ERROR("getShareableContent returned no displays");
    permanent_error_ = true;
    return;
  }

-  SCDisplay *captured_display = nil;
+  SCDisplay *captured_display;
  {
    std::lock_guard<std::mutex> lock(lock_);
    for (SCDisplay *display in content.displays) {
-      if (current_display_ != 0 && current_display_ == display.displayID) {
+      if (current_display_ == display.displayID) {
        LOG_WARN("current display: {}, name: {}", current_display_,
                 display_id_name_map_[current_display_]);
        captured_display = display;
@@ -349,35 +317,15 @@ void ScreenCapturerSckImpl::OnShareableContentCreated(SCShareableContent *conten
    }
    if (!captured_display) {
      captured_display = content.displays.firstObject;
-      if (captured_display) {
      current_display_ = captured_display.displayID;
    }
  }
-  }
-
-  if (!captured_display) {
-    LOG_ERROR("Failed to find valid display");
-    permanent_error_ = true;
-    return;
-  }

  SCContentFilter *filter = [[SCContentFilter alloc] initWithDisplay:captured_display
                                                    excludingWindows:@[]];
-  if (!filter) {
-    LOG_ERROR("Failed to create SCContentFilter");
-    permanent_error_ = true;
-    return;
-  }
-
  SCStreamConfiguration *config = [[SCStreamConfiguration alloc] init];
-  if (!config) {
-    LOG_ERROR("Failed to create SCStreamConfiguration");
-    permanent_error_ = true;
-    return;
-  }
-
  config.pixelFormat = kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange;
-  config.showsCursor = show_cursor_;
+  config.showsCursor = false;
  config.width = filter.contentRect.size.width * filter.pointPixelScale;
  config.height = filter.contentRect.size.height * filter.pointPixelScale;
  config.captureResolution = SCCaptureResolutionAutomatic;
@@ -466,33 +414,20 @@ void ScreenCapturerSckImpl::OnNewCVPixelBuffer(CVPixelBufferRef pixelBuffer,
 }

 void ScreenCapturerSckImpl::StartOrReconfigureCapturer() {
-  if (permanent_error_) {
-    LOG_ERROR("Cannot reconfigure capturer: permanent error occurred");
-    return;
-  }
-
-  if (@available(macOS 10.15, *)) {
-    bool has_permission = CGPreflightScreenCaptureAccess();
-    if (!has_permission) {
-      LOG_ERROR("Screen recording permission not granted");
-      permanent_error_ = true;
-      return;
-    }
-  }
-
+  // The copy is needed to avoid capturing `this` in the Objective-C block. Accessing `helper_`
+  // inside the block is equivalent to `this->helper_` and would crash (UAF) if `this` is
+  // deleted before the block is executed.
  SckHelper *local_helper = helper_;
  auto handler = ^(SCShareableContent *content, NSError *error) {
-    if (error) {
-      LOG_ERROR("getShareableContent failed: {}",
-                std::string([error.localizedDescription UTF8String]));
-      [local_helper onShareableContentCreated:nil];
-      return;
-    }
    [local_helper onShareableContentCreated:content];
  };
  [SCShareableContent getShareableContentWithCompletionHandler:handler];
 }

+std::unique_ptr<ScreenCapturer> ScreenCapturerSck::CreateScreenCapturerSck() {
+  return std::make_unique<ScreenCapturerSckImpl>();
+}
+
@implementation SckHelper {
  // This lock is to prevent the capturer being destroyed while an instance
  // method is still running on another thread.
@@ -551,7 +486,3 @@ void ScreenCapturerSckImpl::StartOrReconfigureCapturer() {
 }

@end
-
-std::unique_ptr<ScreenCapturer> ScreenCapturerSck::CreateScreenCapturerSck() {
-  return std::make_unique<ScreenCapturerSckImpl>();
-}
--- a/src/screen_capturer/screen_capturer.h
+++ b/src/screen_capturer/screen_capturer.h
@@ -11,8 +11,6 @@

 #include "display_info.h"

-namespace crossdesk {
-
 class ScreenCapturer {
 public:
  typedef std::function<void(unsigned char*, int, int, int, const char*)>
@@ -24,7 +22,7 @@ class ScreenCapturer {
 public:
  virtual int Init(const int fps, cb_desktop_data cb) = 0;
  virtual int Destroy() = 0;
-  virtual int Start(bool show_cursor) = 0;
+  virtual int Start() = 0;
  virtual int Stop() = 0;
  virtual int Pause(int monitor_index) = 0;
  virtual int Resume(int monitor_index) = 0;
@@ -32,5 +30,5 @@ class ScreenCapturer {
  virtual std::vector<DisplayInfo> GetDisplayInfoList() = 0;
  virtual int SwitchTo(int monitor_index) = 0;
 };
-}  // namespace crossdesk
+
 #endif
--- a/src/screen_capturer/screen_capturer_factory.h
+++ b/src/screen_capturer/screen_capturer_factory.h
@@ -16,8 +16,6 @@
 #include "screen_capturer_sck.h"
 #endif

-namespace crossdesk {
-
 class ScreenCapturerFactory {
 public:
  virtual ~ScreenCapturerFactory() {}
@@ -36,5 +34,5 @@ class ScreenCapturerFactory {
 #endif
  }
 };
-}  // namespace crossdesk
+
 #endif
--- a/src/screen_capturer/windows/screen_capturer_wgc.cpp.bak
+++ b/src/screen_capturer/windows/screen_capturer_wgc.cpp.bak
@@ -10,46 +10,35 @@
 #include "libyuv.h"
 #include "rd_log.h"

-namespace crossdesk {
-
 static std::vector<DisplayInfo> gs_display_list;

-std::string WideToUtf8(const std::wstring& wstr) {
-  if (wstr.empty()) return {};
-  int size_needed = WideCharToMultiByte(
-      CP_UTF8, 0, wstr.data(), (int)wstr.size(), nullptr, 0, nullptr, nullptr);
+std::string WideToUtf8(const wchar_t* wideStr) {
+  int size_needed = WideCharToMultiByte(CP_UTF8, 0, wideStr, -1, nullptr, 0,
+                                        nullptr, nullptr);
  std::string result(size_needed, 0);
-  WideCharToMultiByte(CP_UTF8, 0, wstr.data(), (int)wstr.size(), result.data(),
-                      size_needed, nullptr, nullptr);
+  WideCharToMultiByte(CP_UTF8, 0, wideStr, -1, &result[0], size_needed, nullptr,
+                      nullptr);
+  result.pop_back();
  return result;
 }

-std::string CleanDisplayName(const std::wstring& wide_name) {
-  std::string name = WideToUtf8(wide_name);
-  name.erase(std::remove_if(name.begin(), name.end(),
-                            [](unsigned char c) { return !std::isalnum(c); }),
-             name.end());
-  return name;
-}
-
 BOOL WINAPI EnumMonitorProc(HMONITOR hmonitor, [[maybe_unused]] HDC hdc,
                            [[maybe_unused]] LPRECT lprc, LPARAM data) {
  MONITORINFOEX monitor_info_;
  monitor_info_.cbSize = sizeof(MONITORINFOEX);

  if (GetMonitorInfo(hmonitor, &monitor_info_)) {
-    std::string display_name = CleanDisplayName(monitor_info_.szDevice);
    if (monitor_info_.dwFlags & MONITORINFOF_PRIMARY) {
      gs_display_list.insert(
          gs_display_list.begin(),
-          {(void*)hmonitor, display_name,
+          {(void*)hmonitor, WideToUtf8(monitor_info_.szDevice),
           (monitor_info_.dwFlags & MONITORINFOF_PRIMARY) ? true : false,
           monitor_info_.rcMonitor.left, monitor_info_.rcMonitor.top,
           monitor_info_.rcMonitor.right, monitor_info_.rcMonitor.bottom});
      *(HMONITOR*)data = hmonitor;
    } else {
      gs_display_list.push_back(DisplayInfo(
-          (void*)hmonitor, display_name,
+          (void*)hmonitor, WideToUtf8(monitor_info_.szDevice),
          (monitor_info_.dwFlags & MONITORINFOF_PRIMARY) ? true : false,
          monitor_info_.rcMonitor.left, monitor_info_.rcMonitor.top,
          monitor_info_.rcMonitor.right, monitor_info_.rcMonitor.bottom));
@@ -77,14 +66,12 @@ ScreenCapturerWgc::~ScreenCapturerWgc() {
  CleanUp();

  if (nv12_frame_) {
-    delete[] nv12_frame_;
+    delete nv12_frame_;
    nv12_frame_ = nullptr;
-    nv12_width_ = 0;
-    nv12_height_ = 0;
  }

  if (nv12_frame_scaled_) {
-    delete[] nv12_frame_scaled_;
+    delete nv12_frame_scaled_;
    nv12_frame_scaled_ = nullptr;
  }
 }
@@ -154,7 +141,7 @@ int ScreenCapturerWgc::Init(const int fps, cb_desktop_data cb) {

 int ScreenCapturerWgc::Destroy() { return 0; }

-int ScreenCapturerWgc::Start(bool show_cursor) {
+int ScreenCapturerWgc::Start() {
  if (running_ == true) {
    LOG_ERROR("Screen capturer already running");
    return 0;
@@ -174,7 +161,7 @@ int ScreenCapturerWgc::Start(bool show_cursor) {
    if (sessions_[i].running_) {
      LOG_ERROR("Session {} is already running", i);
    } else {
-      sessions_[i].session_->Start(show_cursor);
+      sessions_[i].session_->Start();

      if (i != 0) {
        sessions_[i].session_->Pause();
@@ -217,14 +204,13 @@ int ScreenCapturerWgc::Resume(int monitor_index) {
 }

 int ScreenCapturerWgc::Stop() {
-  running_ = false;
-
  for (int i = 0; i < sessions_.size(); i++) {
    if (sessions_[i].running_) {
      sessions_[i].session_->Stop();
      sessions_[i].running_ = false;
    }
  }
+  running_ = false;

  return 0;
 }
@@ -259,62 +245,21 @@ int ScreenCapturerWgc::SwitchTo(int monitor_index) {

 void ScreenCapturerWgc::OnFrame(const WgcSession::wgc_session_frame& frame,
                                int id) {
-  if (!running_ || !on_data_) {
+  if (!on_data_) {
    return;
  }

-  std::lock_guard<std::mutex> lock(frame_mutex_);
-
-  if (on_data_) {
-    if (id < 0 || id >= static_cast<int>(display_info_list_.size())) {
-      LOG_ERROR("WGC OnFrame invalid display index: {}", id);
-      return;
+  if (!nv12_frame_) {
+    nv12_frame_ = new unsigned char[frame.width * frame.height * 3 / 2];
  }

-    if (!frame.data || frame.row_pitch == 0) {
-      LOG_ERROR("WGC OnFrame received invalid frame: data={}, row_pitch={}",
-                (void*)frame.data, frame.row_pitch);
-      return;
-    }
+  libyuv::ARGBToNV12((const uint8_t*)frame.data, frame.width * 4,
+                     (uint8_t*)nv12_frame_, frame.width,
+                     (uint8_t*)(nv12_frame_ + frame.width * frame.height),
+                     frame.width, frame.width, frame.height);

-    // calculate the maximum width that can be contained in one row according to
-    // row_pitch (BGRA: 4 bytes per pixel), and take the minimum with logical
-    // width to avoid out-of-bounds access.
-    unsigned int max_width_by_pitch = frame.row_pitch / 4u;
-    int logical_width = static_cast<int>(
-        frame.width < max_width_by_pitch ? frame.width : max_width_by_pitch);
-
-    // libyuv::ARGBToNV12 requires even width/height
-    int even_width = logical_width & ~1;
-    int even_height = static_cast<int>(frame.height) & ~1;
-
-    if (even_width <= 0 || even_height <= 0) {
-      LOG_ERROR(
-          "WGC OnFrame invalid frame size after adjust: width={} "
-          "(frame.width={}, max_by_pitch={}), height={}",
-          logical_width, frame.width, max_width_by_pitch, frame.height);
-      return;
-    }
-
-    int nv12_size = even_width * even_height * 3 / 2;
-
-    if (!nv12_frame_ || nv12_width_ != even_width ||
-        nv12_height_ != even_height) {
-      delete[] nv12_frame_;
-      nv12_frame_ = new unsigned char[nv12_size];
-      nv12_width_ = even_width;
-      nv12_height_ = even_height;
-    }
-
-    libyuv::ARGBToNV12((const uint8_t*)frame.data,
-                       static_cast<int>(frame.row_pitch), (uint8_t*)nv12_frame_,
-                       even_width,
-                       (uint8_t*)(nv12_frame_ + even_width * even_height),
-                       even_width, even_width, even_height);
-
-    on_data_(nv12_frame_, nv12_size, even_width, even_height,
-             display_info_list_[id].name.c_str());
-  }
+  on_data_(nv12_frame_, frame.width * frame.height * 3 / 2, frame.width,
+           frame.height, display_info_list_[id].name.c_str());
 }

 void ScreenCapturerWgc::CleanUp() {
@@ -327,4 +272,3 @@ void ScreenCapturerWgc::CleanUp() {
    sessions_.clear();
  }
 }
-}  // namespace crossdesk
--- a/src/screen_capturer/windows/screen_capturer_wgc.h
+++ b/src/screen_capturer/windows/screen_capturer_wgc.h
@@ -3,7 +3,6 @@

 #include <atomic>
 #include <functional>
-#include <mutex>
 #include <string>
 #include <thread>
 #include <vector>
@@ -12,8 +11,6 @@
 #include "wgc_session.h"
 #include "wgc_session_impl.h"

-namespace crossdesk {
-
 class ScreenCapturerWgc : public ScreenCapturer,
                          public WgcSession::wgc_session_observer {
 public:
@@ -25,7 +22,7 @@ class ScreenCapturerWgc : public ScreenCapturer,

  int Init(const int fps, cb_desktop_data cb) override;
  int Destroy() override;
-  int Start(bool show_cursor) override;
+  int Start() override;
  int Stop() override;

  int Pause(int monitor_index) override;
@@ -46,6 +43,8 @@ class ScreenCapturerWgc : public ScreenCapturer,
  std::vector<DisplayInfo> display_info_list_;
  int monitor_index_ = 0;

+  HWND hwnd_ = nullptr;
+
 private:
  class WgcSessionInfo {
   public:
@@ -66,10 +65,9 @@ class ScreenCapturerWgc : public ScreenCapturer,

  unsigned char* nv12_frame_ = nullptr;
  unsigned char* nv12_frame_scaled_ = nullptr;
-  int nv12_width_ = 0;
-  int nv12_height_ = 0;

-  std::mutex frame_mutex_;
+ private:
+  bool CreateHiddenWindow();
 };
-}  // namespace crossdesk
+
 #endif
--- a/src/screen_capturer/windows/screen_capturer_wgc.h.bak
+++ b/src/screen_capturer/windows/screen_capturer_wgc.h.bak
@@ -0,0 +1,68 @@
+#ifndef _SCREEN_CAPTURER_WGC_H_
+#define _SCREEN_CAPTURER_WGC_H_
+
+#include <atomic>
+#include <functional>
+#include <string>
+#include <thread>
+#include <vector>
+
+#include "screen_capturer.h"
+#include "wgc_session.h"
+#include "wgc_session_impl.h"
+
+class ScreenCapturerWgc : public ScreenCapturer,
+                          public WgcSession::wgc_session_observer {
+ public:
+  ScreenCapturerWgc();
+  ~ScreenCapturerWgc();
+
+ public:
+  bool IsWgcSupported();
+
+  int Init(const int fps, cb_desktop_data cb) override;
+  int Destroy() override;
+  int Start() override;
+  int Stop() override;
+
+  int Pause(int monitor_index) override;
+  int Resume(int monitor_index) override;
+
+  std::vector<DisplayInfo> GetDisplayInfoList() { return display_info_list_; }
+
+  int SwitchTo(int monitor_index);
+
+  void OnFrame(const WgcSession::wgc_session_frame& frame, int id);
+
+ protected:
+  void CleanUp();
+
+ private:
+  HMONITOR monitor_;
+  MONITORINFOEX monitor_info_;
+  std::vector<DisplayInfo> display_info_list_;
+  int monitor_index_ = 0;
+
+ private:
+  class WgcSessionInfo {
+   public:
+    std::unique_ptr<WgcSession> session_;
+    bool inited_ = false;
+    bool running_ = false;
+    bool paused_ = false;
+  };
+
+  std::vector<WgcSessionInfo> sessions_;
+
+  std::atomic_bool running_;
+  std::atomic_bool inited_;
+
+  int fps_ = 60;
+
+  cb_desktop_data on_data_ = nullptr;
+
+  unsigned char* nv12_frame_ = nullptr;
+  unsigned char* nv12_frame_scaled_ = nullptr;
+};
+
+#endif
--- a/src/screen_capturer/windows/screen_capturer_wgc_warp.cpp
+++ b/src/screen_capturer/windows/screen_capturer_wgc_warp.cpp
@@ -0,0 +1,187 @@
+#include <Windows.h>
+#include <d3d11_4.h>
+
+#include <iostream>
+#include <thread>
+
+#include "libyuv.h"
+#include "rd_log.h"
+#include "screen_capturer_wgc.h"
+
+// Dummy window proc for hidden window
+static LRESULT CALLBACK DummyWndProc(HWND hwnd, UINT msg, WPARAM wParam,
+                                     LPARAM lParam) {
+  return DefWindowProc(hwnd, msg, wParam, lParam);
+}
+
+// ======================= 构造函数 / 析构函数 =======================
+ScreenCapturerWgc::ScreenCapturerWgc()
+    : monitor_(nullptr),
+      hwnd_(nullptr),
+      monitor_index_(0),
+      running_(false),
+      inited_(false),
+      fps_(60),
+      on_data_(nullptr),
+      nv12_frame_(nullptr),
+      nv12_frame_scaled_(nullptr) {}
+
+ScreenCapturerWgc::~ScreenCapturerWgc() {
+  Stop();
+  CleanUp();
+
+  if (nv12_frame_) {
+    delete[] nv12_frame_;
+    nv12_frame_ = nullptr;
+  }
+
+  if (nv12_frame_scaled_) {
+    delete[] nv12_frame_scaled_;
+    nv12_frame_scaled_ = nullptr;
+  }
+}
+
+// ======================= 隐藏窗口创建 =======================
+bool ScreenCapturerWgc::CreateHiddenWindow() {
+  const wchar_t kClassName[] = L"ScreenCapturerHiddenWindow";
+
+  WNDCLASSW wc = {};
+  wc.lpfnWndProc = DummyWndProc;
+  wc.hInstance = GetModuleHandle(nullptr);
+  wc.lpszClassName = kClassName;
+
+  if (!RegisterClassW(&wc)) {
+    std::cerr << "Failed to register dummy window class\n";
+    return false;
+  }
+
+  hwnd_ = CreateWindowW(kClassName, L"", WS_OVERLAPPEDWINDOW, 0, 0, 1, 1,
+                        nullptr, nullptr, wc.hInstance, nullptr);
+  if (!hwnd_) {
+    std::cerr << "Failed to create dummy window\n";
+    return false;
+  }
+
+  ShowWindow(hwnd_, SW_HIDE);
+  return true;
+}
+
+// ======================= 初始化 =======================
+int ScreenCapturerWgc::Init(const int fps, cb_desktop_data cb) {
+  if (inited_) return 0;
+
+  fps_ = fps;
+  on_data_ = cb;
+
+  // 创建隐藏窗口
+  if (!CreateHiddenWindow()) {
+    return -1;
+  }
+
+  // 初始化 WGC Session
+  sessions_.push_back(
+      {std::make_unique<WgcSessionImpl>(0), false, false, false});
+  sessions_.back().session_->RegisterObserver(this);
+  int error = sessions_.back().session_->Initialize(hwnd_);
+  if (error != 0) {
+    std::cerr << "WGC session init failed\n";
+    return error;
+  }
+  sessions_[0].inited_ = true;
+
+  inited_ = true;
+  return 0;
+}
+
+int ScreenCapturerWgc::Destroy() {
+  Stop();
+  CleanUp();
+  return 0;
+}
+
+int ScreenCapturerWgc::Pause(int monitor_index) {
+  // 目前只支持隐藏窗口，所以忽略 monitor_index
+  if (!running_) return -1;
+  sessions_[0].session_->Pause();
+  sessions_[0].paused_ = true;
+  return 0;
+}
+
+int ScreenCapturerWgc::Resume(int monitor_index) {
+  if (!running_) return -1;
+  sessions_[0].session_->Resume();
+  sessions_[0].paused_ = false;
+  return 0;
+}
+
+int ScreenCapturerWgc::SwitchTo(int monitor_index) {
+  // 单隐藏窗口模式，不支持切换
+  return 0;
+}
+
+// ======================= 开始 =======================
+int ScreenCapturerWgc::Start() {
+  if (!inited_) return -1;
+  if (running_) return 0;
+  if (sessions_.empty()) return -1;
+
+  sessions_[0].session_->Start();
+  sessions_[0].running_ = true;
+  running_ = true;
+
+  return 0;
+}
+
+// ======================= 停止 =======================
+int ScreenCapturerWgc::Stop() {
+  if (!running_) return 0;
+
+  if (!sessions_.empty()) {
+    sessions_[0].session_->Stop();
+    sessions_[0].running_ = false;
+  }
+
+  running_ = false;
+
+  if (hwnd_) {
+    DestroyWindow(hwnd_);
+    hwnd_ = nullptr;
+  }
+
+  inited_ = false;
+  sessions_.clear();
+
+  return 0;
+}
+
+// ======================= 帧回调 =======================
+void ScreenCapturerWgc::OnFrame(const WgcSession::wgc_session_frame& frame,
+                                int id) {
+  if (!on_data_) {
+    return;
+  }
+
+  if (!nv12_frame_) {
+    nv12_frame_ = new unsigned char[frame.width * frame.height * 3 / 2];
+  }
+
+  libyuv::ARGBToNV12((const uint8_t*)frame.data, frame.width * 4,
+                     (uint8_t*)nv12_frame_, frame.width,
+                     (uint8_t*)(nv12_frame_ + frame.width * frame.height),
+                     frame.width, frame.width, frame.height);
+
+  on_data_(nv12_frame_, frame.width * frame.height * 3 / 2, frame.width,
+           frame.height, "hidden_window");
+}
+
+// ======================= 清理 =======================
+void ScreenCapturerWgc::CleanUp() {
+  if (inited_) {
+    for (auto& session : sessions_) {
+      if (session.session_) {
+        session.session_->Stop();
+      }
+    }
+    sessions_.clear();
+  }
+}
--- a/src/screen_capturer/windows/wgc_session.h
+++ b/src/screen_capturer/windows/wgc_session.h
@@ -3,8 +3,6 @@

 #include <Windows.h>

-namespace crossdesk {
-
 class WgcSession {
 public:
  struct wgc_session_frame {
@@ -12,13 +10,13 @@ class WgcSession {
    unsigned int height;
    unsigned int row_pitch;

-    const unsigned char* data;
+    const unsigned char *data;
  };

  class wgc_session_observer {
   public:
    virtual ~wgc_session_observer() {}
-    virtual void OnFrame(const wgc_session_frame& frame, int id) = 0;
+    virtual void OnFrame(const wgc_session_frame &frame, int id) = 0;
  };

 public:
@@ -27,15 +25,15 @@ class WgcSession {
  virtual int Initialize(HWND hwnd) = 0;
  virtual int Initialize(HMONITOR hmonitor) = 0;

-  virtual void RegisterObserver(wgc_session_observer* observer) = 0;
+  virtual void RegisterObserver(wgc_session_observer *observer) = 0;

-  virtual int Start(bool show_cursor) = 0;
+  virtual int Start() = 0;
  virtual int Stop() = 0;

  virtual int Pause() = 0;
  virtual int Resume() = 0;

-  virtual ~WgcSession() {};
+  virtual ~WgcSession(){};
 };
-}  // namespace crossdesk
+
 #endif
--- a/src/screen_capturer/windows/wgc_session_impl.cpp
+++ b/src/screen_capturer/windows/wgc_session_impl.cpp
@@ -7,6 +7,8 @@
 #include <iostream>
 #include <memory>

+#include "rd_log.h"
+
 #define CHECK_INIT                            \
  if (!is_initialized_) {                     \
    std::cout << "AE_NEED_INIT" << std::endl; \
@@ -18,8 +20,6 @@
    throw winrt::hresult_error(RO_E_CLOSED); \
  }

-namespace crossdesk {
-
 extern "C" {
 HRESULT __stdcall CreateDirect3D11DeviceFromDXGIDevice(
    ::IDXGIDevice* dxgiDevice, ::IInspectable** graphicsDevice);
@@ -28,43 +28,47 @@ HRESULT __stdcall CreateDirect3D11DeviceFromDXGIDevice(
 WgcSessionImpl::WgcSessionImpl(int id) : id_(id) {}

 WgcSessionImpl::~WgcSessionImpl() {
+  try {
    Stop();
    CleanUp();
+  } catch (...) {
+  }
 }

 void WgcSessionImpl::Release() { delete this; }

 int WgcSessionImpl::Initialize(HWND hwnd) {
-  std::lock_guard locker(lock_);
-
+  std::scoped_lock locker(lock_);
  target_.hwnd = hwnd;
  target_.is_window = true;
  return Initialize();
 }

 int WgcSessionImpl::Initialize(HMONITOR hmonitor) {
-  std::lock_guard locker(lock_);
-
+  std::scoped_lock locker(lock_);
  target_.hmonitor = hmonitor;
  target_.is_window = false;
  return Initialize();
 }

 void WgcSessionImpl::RegisterObserver(wgc_session_observer* observer) {
-  std::lock_guard locker(lock_);
+  std::scoped_lock locker(lock_);
  observer_ = observer;
 }

-int WgcSessionImpl::Start(bool show_cursor) {
-  std::lock_guard locker(lock_);
+int WgcSessionImpl::Start() {
+  std::scoped_lock locker(lock_);
+  CHECK_INIT;

  if (is_running_) return 0;

-  int error = 1;
-
-  CHECK_INIT;
  try {
-    if (!capture_session_) {
+    if (!capture_item_) {
+      std::cout << "AE_NO_CAPTURE_ITEM" << std::endl;
+      LOG_ERROR("No capture item");
+      return 2;
+    }
+
    auto current_size = capture_item_.Size();
    capture_framepool_ =
        winrt::Windows::Graphics::Capture::Direct3D11CaptureFramePool::
@@ -72,72 +76,64 @@ int WgcSessionImpl::Start(bool show_cursor) {
                               winrt::Windows::Graphics::DirectX::
                                   DirectXPixelFormat::B8G8R8A8UIntNormalized,
                               2, current_size);
+
    capture_session_ = capture_framepool_.CreateCaptureSession(capture_item_);
    capture_frame_size_ = current_size;
+
    capture_framepool_trigger_ = capture_framepool_.FrameArrived(
        winrt::auto_revoke, {this, &WgcSessionImpl::OnFrame});
    capture_close_trigger_ = capture_item_.Closed(
        winrt::auto_revoke, {this, &WgcSessionImpl::OnClosed});
-    }
-
-    if (!capture_framepool_) throw std::exception();
-
-    is_running_ = true;
-
-    // we do not need to crate a thread to enter a message loop coz we use
-    // CreateFreeThreaded instead of Create to create a capture frame pool,
-    // we need to test the performance later
-    // loop_ = std::thread(std::bind(&WgcSessionImpl::message_func, this));

+    capture_session_.IsCursorCaptureEnabled(false);
    capture_session_.StartCapture();

-    capture_session_.IsCursorCaptureEnabled(show_cursor);
-
-    error = 0;
-  } catch (winrt::hresult_error) {
-    std::cout << "AE_WGC_CREATE_CAPTURER_FAILED" << std::endl;
+    is_running_ = true;
+    is_paused_ = false;
+    return 0;
+  } catch (winrt::hresult_error const& e) {
+    LOG_ERROR("Create WGC Capture Failed: {}", winrt::to_string(e.message()));
    return 86;
  } catch (...) {
    return 86;
  }
-
-  return error;
 }

 int WgcSessionImpl::Stop() {
-  std::lock_guard locker(lock_);
-
+  std::scoped_lock locker(lock_);
  CHECK_INIT;

+  if (!is_running_) return 0;
  is_running_ = false;

-  // if (loop_.joinable()) loop_.join();
-
+  try {
    if (capture_framepool_trigger_) capture_framepool_trigger_.revoke();
-
+    if (capture_close_trigger_) capture_close_trigger_.revoke();
    if (capture_session_) {
      capture_session_.Close();
      capture_session_ = nullptr;
    }
+    if (capture_framepool_) {
+      capture_framepool_.Close();
+      capture_framepool_ = nullptr;
+    }
+  } catch (...) {
+  }

  return 0;
 }

 int WgcSessionImpl::Pause() {
-  std::lock_guard locker(lock_);
-
-  is_paused_ = true;
-
+  std::scoped_lock locker(lock_);
  CHECK_INIT;
+  is_paused_ = true;
  return 0;
 }

 int WgcSessionImpl::Resume() {
-  std::lock_guard locker(lock_);
-
-  is_paused_ = false;
-
+  std::scoped_lock locker(lock_);
  CHECK_INIT;
+  is_paused_ = false;
  return 0;
 }

@@ -145,19 +141,15 @@ auto WgcSessionImpl::CreateD3D11Device() {
  winrt::com_ptr<ID3D11Device> d3d_device;
  HRESULT hr;

-  WINRT_ASSERT(!d3d_device);
-
-  D3D_DRIVER_TYPE type = D3D_DRIVER_TYPE_HARDWARE;
  UINT flags = D3D11_CREATE_DEVICE_BGRA_SUPPORT;
-  hr = D3D11CreateDevice(nullptr, type, nullptr, flags, nullptr, 0,
-                         D3D11_SDK_VERSION, d3d_device.put(), nullptr, nullptr);
+  hr = D3D11CreateDevice(nullptr, D3D_DRIVER_TYPE_HARDWARE, nullptr, flags,
+                         nullptr, 0, D3D11_SDK_VERSION, d3d_device.put(),
+                         nullptr, nullptr);

  if (DXGI_ERROR_UNSUPPORTED == hr) {
-    // change D3D_DRIVER_TYPE
-    type = D3D_DRIVER_TYPE_WARP;
-    hr = D3D11CreateDevice(nullptr, type, nullptr, flags, nullptr, 0,
-                           D3D11_SDK_VERSION, d3d_device.put(), nullptr,
-                           nullptr);
+    hr = D3D11CreateDevice(nullptr, D3D_DRIVER_TYPE_WARP, nullptr, flags,
+                           nullptr, 0, D3D11_SDK_VERSION, d3d_device.put(),
+                           nullptr, nullptr);
  }

  winrt::check_hresult(hr);
@@ -170,10 +162,11 @@ auto WgcSessionImpl::CreateD3D11Device() {
 }

 auto WgcSessionImpl::CreateCaptureItemForWindow(HWND hwnd) {
-  auto activation_factory = winrt::get_activation_factory<
-      winrt::Windows::Graphics::Capture::GraphicsCaptureItem>();
-  auto interop_factory = activation_factory.as<IGraphicsCaptureItemInterop>();
-  winrt::Windows::Graphics::Capture::GraphicsCaptureItem item = {nullptr};
+  auto interop_factory =
+      winrt::get_activation_factory<
+          winrt::Windows::Graphics::Capture::GraphicsCaptureItem>()
+          .as<IGraphicsCaptureItemInterop>();
+  winrt::Windows::Graphics::Capture::GraphicsCaptureItem item{nullptr};
  interop_factory->CreateForWindow(
      hwnd,
      winrt::guid_of<ABI::Windows::Graphics::Capture::IGraphicsCaptureItem>(),
@@ -182,10 +175,11 @@ auto WgcSessionImpl::CreateCaptureItemForWindow(HWND hwnd) {
 }

 auto WgcSessionImpl::CreateCaptureItemForMonitor(HMONITOR hmonitor) {
-  auto activation_factory = winrt::get_activation_factory<
-      winrt::Windows::Graphics::Capture::GraphicsCaptureItem>();
-  auto interop_factory = activation_factory.as<IGraphicsCaptureItemInterop>();
-  winrt::Windows::Graphics::Capture::GraphicsCaptureItem item = {nullptr};
+  auto interop_factory =
+      winrt::get_activation_factory<
+          winrt::Windows::Graphics::Capture::GraphicsCaptureItem>()
+          .as<IGraphicsCaptureItemInterop>();
+  winrt::Windows::Graphics::Capture::GraphicsCaptureItem item{nullptr};
  interop_factory->CreateForMonitor(
      hmonitor,
      winrt::guid_of<ABI::Windows::Graphics::Capture::IGraphicsCaptureItem>(),
@@ -198,13 +192,10 @@ HRESULT WgcSessionImpl::CreateMappedTexture(
    unsigned int height) {
  D3D11_TEXTURE2D_DESC src_desc;
  src_texture->GetDesc(&src_desc);
-  D3D11_TEXTURE2D_DESC map_desc;
-  map_desc.Width = width == 0 ? src_desc.Width : width;
-  map_desc.Height = height == 0 ? src_desc.Height : height;
-  map_desc.MipLevels = src_desc.MipLevels;
-  map_desc.ArraySize = src_desc.ArraySize;
-  map_desc.Format = src_desc.Format;
-  map_desc.SampleDesc = src_desc.SampleDesc;
+
+  D3D11_TEXTURE2D_DESC map_desc = src_desc;
+  map_desc.Width = width ? width : src_desc.Width;
+  map_desc.Height = height ? height : src_desc.Height;
  map_desc.Usage = D3D11_USAGE_STAGING;
  map_desc.BindFlags = 0;
  map_desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ;
@@ -220,162 +211,99 @@ HRESULT WgcSessionImpl::CreateMappedTexture(
 void WgcSessionImpl::OnFrame(
    winrt::Windows::Graphics::Capture::Direct3D11CaptureFramePool const& sender,
    [[maybe_unused]] winrt::Windows::Foundation::IInspectable const& args) {
-  std::lock_guard locker(lock_);
+  if (!is_running_ || is_paused_) return;
+  std::scoped_lock locker(lock_);

-  auto is_new_size = false;
+  if (!observer_) return;

-  {
  auto frame = sender.TryGetNextFrame();
+  if (!frame) return;
+
  auto frame_size = frame.ContentSize();
-
-    if (frame_size.Width != capture_frame_size_.Width ||
-        frame_size.Height != capture_frame_size_.Height) {
-      // The thing we have been capturing has changed size.
-      // We need to resize our swap chain first, then blit the pixels.
-      // After we do that, retire the frame and then recreate our frame pool.
-      is_new_size = true;
+  bool size_changed = (frame_size.Width != capture_frame_size_.Width ||
+                       frame_size.Height != capture_frame_size_.Height);
+  if (size_changed) {
    capture_frame_size_ = frame_size;
-    }
-
-    // copy to mapped texture
-    {
-      if (is_paused_) {
-        return;
-      }
-
-      auto frame_captured =
-          GetDXGIInterfaceFromObject<ID3D11Texture2D>(frame.Surface());
-
-      if (!d3d11_texture_mapped_ || is_new_size)
-        CreateMappedTexture(frame_captured);
-
-      d3d11_device_context_->CopyResource(d3d11_texture_mapped_.get(),
-                                          frame_captured.get());
-
-      D3D11_MAPPED_SUBRESOURCE map_result;
-      HRESULT hr = d3d11_device_context_->Map(
-          d3d11_texture_mapped_.get(), 0, D3D11_MAP_READ,
-          0 /*coz we use CreateFreeThreaded, so we cant use flags
-               D3D11_MAP_FLAG_DO_NOT_WAIT*/
-          ,
-          &map_result);
-      if (FAILED(hr)) {
-        OutputDebugStringW(
-            (L"map resource failed: " + std::to_wstring(hr)).c_str());
-      }
-
-      // copy data from map_result.pData
-      if (map_result.pData && observer_) {
-        observer_->OnFrame(
-            wgc_session_frame{static_cast<unsigned int>(frame_size.Width),
-                              static_cast<unsigned int>(frame_size.Height),
-                              map_result.RowPitch,
-                              const_cast<const unsigned char*>(
-                                  (unsigned char*)map_result.pData)},
-            id_);
-      }
-
-      d3d11_device_context_->Unmap(d3d11_texture_mapped_.get(), 0);
-    }
-  }
-
-  if (is_new_size) {
    capture_framepool_.Recreate(d3d11_direct_device_,
                                winrt::Windows::Graphics::DirectX::
                                    DirectXPixelFormat::B8G8R8A8UIntNormalized,
                                2, capture_frame_size_);
  }
+
+  auto frame_surface =
+      GetDXGIInterfaceFromObject<ID3D11Texture2D>(frame.Surface());
+
+  if (!d3d11_texture_mapped_ || size_changed)
+    CreateMappedTexture(frame_surface, frame_size.Width, frame_size.Height);
+
+  d3d11_device_context_->CopyResource(d3d11_texture_mapped_.get(),
+                                      frame_surface.get());
+
+  D3D11_MAPPED_SUBRESOURCE map_result;
+  HRESULT hr = d3d11_device_context_->Map(d3d11_texture_mapped_.get(), 0,
+                                          D3D11_MAP_READ, 0, &map_result);
+  if (SUCCEEDED(hr)) {
+    wgc_session_frame frame_info{
+        static_cast<unsigned int>(frame_size.Width),
+        static_cast<unsigned int>(frame_size.Height), map_result.RowPitch,
+        reinterpret_cast<const unsigned char*>(map_result.pData)};
+    observer_->OnFrame(frame_info, id_);
+    d3d11_device_context_->Unmap(d3d11_texture_mapped_.get(), 0);
+  }
 }

 void WgcSessionImpl::OnClosed(
    winrt::Windows::Graphics::Capture::GraphicsCaptureItem const&,
    winrt::Windows::Foundation::IInspectable const&) {
  OutputDebugStringW(L"WgcSessionImpl::OnClosed");
+  Stop();
 }

 int WgcSessionImpl::Initialize() {
  if (is_initialized_) return 0;

-  if (!(d3d11_direct_device_ = CreateD3D11Device())) {
+  d3d11_direct_device_ = CreateD3D11Device();
+  if (!d3d11_direct_device_) {
    std::cout << "AE_D3D_CREATE_DEVICE_FAILED" << std::endl;
    return 1;
  }

  try {
-    if (target_.is_window)
-      capture_item_ = CreateCaptureItemForWindow(target_.hwnd);
-    else
-      capture_item_ = CreateCaptureItemForMonitor(target_.hmonitor);
+    capture_item_ = target_.is_window
+                        ? CreateCaptureItemForWindow(target_.hwnd)
+                        : CreateCaptureItemForMonitor(target_.hmonitor);

-    // Set up
-    auto d3d11_device =
+    auto d3d_device =
        GetDXGIInterfaceFromObject<ID3D11Device>(d3d11_direct_device_);
-    d3d11_device->GetImmediateContext(d3d11_device_context_.put());
-
-  } catch (winrt::hresult_error) {
-    std::cout << "AE_WGC_CREATE_CAPTURER_FAILED" << std::endl;
-    return 86;
+    d3d_device->GetImmediateContext(d3d11_device_context_.put());
  } catch (...) {
+    LOG_ERROR("AE_WGC_CREATE_CAPTURER_FAILED");
    return 86;
  }

  is_initialized_ = true;
-
  return 0;
 }

 void WgcSessionImpl::CleanUp() {
-  std::lock_guard locker(lock_);
-
-  auto expected = false;
-  if (cleaned_.compare_exchange_strong(expected, true)) {
-    capture_close_trigger_.revoke();
-    capture_framepool_trigger_.revoke();
+  std::scoped_lock locker(lock_);
+  if (cleaned_.exchange(true)) return;

+  try {
+    if (capture_framepool_trigger_) capture_framepool_trigger_.revoke();
+    if (capture_close_trigger_) capture_close_trigger_.revoke();
    if (capture_framepool_) capture_framepool_.Close();
-
    if (capture_session_) capture_session_.Close();
+  } catch (...) {
+  }

  capture_framepool_ = nullptr;
  capture_session_ = nullptr;
  capture_item_ = nullptr;
+  d3d11_texture_mapped_ = nullptr;
+  d3d11_device_context_ = nullptr;
+  d3d11_direct_device_ = nullptr;

  is_initialized_ = false;
-  }
+  is_running_ = false;
 }
-
-LRESULT CALLBACK WindowProc(HWND window, UINT message, WPARAM w_param,
-                            LPARAM l_param) {
-  return DefWindowProc(window, message, w_param, l_param);
-}
-
-// void WgcSessionImpl::message_func() {
-//   const std::wstring kClassName = L"am_fake_window";
-
-//   WNDCLASS wc = {};
-
-//   wc.style = CS_HREDRAW | CS_VREDRAW;
-//   wc.lpfnWndProc = DefWindowProc;
-//   wc.hCursor = LoadCursor(nullptr, IDC_ARROW);
-//   wc.hbrBackground = reinterpret_cast<HBRUSH>(COLOR_WINDOW);
-//   wc.lpszClassName = kClassName.c_str();
-
-//   if (!::RegisterClassW(&wc)) return;
-
-//   hwnd_ = ::CreateWindowW(kClassName.c_str(), nullptr, WS_OVERLAPPEDWINDOW,
-//   0,
-//                           0, 0, 0, nullptr, nullptr, nullptr, nullptr);
-//   MSG msg;
-//   while (is_running_) {
-//     while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) {
-//       if (!is_running_) break;
-//       TranslateMessage(&msg);
-//       DispatchMessage(&msg);
-//     }
-//     Sleep(10);
-//   }
-
-//   ::CloseWindow(hwnd_);
-//   ::DestroyWindow(hwnd_);
-// }
-}  // namespace crossdesk
--- a/src/screen_capturer/windows/wgc_session_impl.cpp.bak
+++ b/src/screen_capturer/windows/wgc_session_impl.cpp.bak
@@ -0,0 +1,380 @@
+#include "wgc_session_impl.h"
+
+#include <Windows.Graphics.Capture.Interop.h>
+
+#include <atomic>
+#include <functional>
+#include <iostream>
+#include <memory>
+
+#include "rd_log.h"
+
+#define CHECK_INIT                            \
+  if (!is_initialized_) {                     \
+    std::cout << "AE_NEED_INIT" << std::endl; \
+    return 4;                                 \
+  }
+
+#define CHECK_CLOSED                         \
+  if (cleaned_.load() == true) {             \
+    throw winrt::hresult_error(RO_E_CLOSED); \
+  }
+
+extern "C" {
+HRESULT __stdcall CreateDirect3D11DeviceFromDXGIDevice(
+    ::IDXGIDevice* dxgiDevice, ::IInspectable** graphicsDevice);
+}
+
+WgcSessionImpl::WgcSessionImpl(int id) : id_(id) {}
+
+WgcSessionImpl::~WgcSessionImpl() {
+  Stop();
+  CleanUp();
+}
+
+void WgcSessionImpl::Release() { delete this; }
+
+int WgcSessionImpl::Initialize(HWND hwnd) {
+  std::lock_guard locker(lock_);
+
+  target_.hwnd = hwnd;
+  target_.is_window = true;
+  return Initialize();
+}
+
+int WgcSessionImpl::Initialize(HMONITOR hmonitor) {
+  std::lock_guard locker(lock_);
+
+  target_.hmonitor = hmonitor;
+  target_.is_window = false;
+  return Initialize();
+}
+
+void WgcSessionImpl::RegisterObserver(wgc_session_observer* observer) {
+  std::lock_guard locker(lock_);
+  observer_ = observer;
+}
+
+int WgcSessionImpl::Start() {
+  std::lock_guard locker(lock_);
+
+  if (is_running_) return 0;
+
+  int error = 1;
+
+  CHECK_INIT;
+  try {
+    if (!capture_session_) {
+      auto current_size = capture_item_.Size();
+      capture_framepool_ =
+          winrt::Windows::Graphics::Capture::Direct3D11CaptureFramePool::
+              CreateFreeThreaded(d3d11_direct_device_,
+                                 winrt::Windows::Graphics::DirectX::
+                                     DirectXPixelFormat::B8G8R8A8UIntNormalized,
+                                 2, current_size);
+      capture_session_ = capture_framepool_.CreateCaptureSession(capture_item_);
+      capture_frame_size_ = current_size;
+      capture_framepool_trigger_ = capture_framepool_.FrameArrived(
+          winrt::auto_revoke, {this, &WgcSessionImpl::OnFrame});
+      capture_close_trigger_ = capture_item_.Closed(
+          winrt::auto_revoke, {this, &WgcSessionImpl::OnClosed});
+    }
+
+    if (!capture_framepool_) throw std::exception();
+
+    is_running_ = true;
+
+    // we do not need to crate a thread to enter a message loop coz we use
+    // CreateFreeThreaded instead of Create to create a capture frame pool,
+    // we need to test the performance later
+    // loop_ = std::thread(std::bind(&WgcSessionImpl::message_func, this));
+
+    capture_session_.StartCapture();
+
+    capture_session_.IsCursorCaptureEnabled(false);
+
+    error = 0;
+  } catch (winrt::hresult_error) {
+    LOG_ERROR("Create WGC Capture Failed");
+    return 86;
+  } catch (...) {
+    return 86;
+  }
+
+  return error;
+}
+
+int WgcSessionImpl::Stop() {
+  std::lock_guard locker(lock_);
+
+  CHECK_INIT;
+
+  is_running_ = false;
+
+  // if (loop_.joinable()) loop_.join();
+
+  if (capture_framepool_trigger_) capture_framepool_trigger_.revoke();
+
+  if (capture_session_) {
+    capture_session_.Close();
+    capture_session_ = nullptr;
+  }
+
+  return 0;
+}
+
+int WgcSessionImpl::Pause() {
+  std::lock_guard locker(lock_);
+
+  is_paused_ = true;
+
+  CHECK_INIT;
+  return 0;
+}
+
+int WgcSessionImpl::Resume() {
+  std::lock_guard locker(lock_);
+
+  is_paused_ = false;
+
+  CHECK_INIT;
+  return 0;
+}
+
+auto WgcSessionImpl::CreateD3D11Device() {
+  winrt::com_ptr<ID3D11Device> d3d_device;
+  HRESULT hr;
+
+  WINRT_ASSERT(!d3d_device);
+
+  D3D_DRIVER_TYPE type = D3D_DRIVER_TYPE_HARDWARE;
+  UINT flags = D3D11_CREATE_DEVICE_BGRA_SUPPORT;
+  hr = D3D11CreateDevice(nullptr, type, nullptr, flags, nullptr, 0,
+                         D3D11_SDK_VERSION, d3d_device.put(), nullptr, nullptr);
+
+  if (DXGI_ERROR_UNSUPPORTED == hr) {
+    // change D3D_DRIVER_TYPE
+    type = D3D_DRIVER_TYPE_WARP;
+    hr = D3D11CreateDevice(nullptr, type, nullptr, flags, nullptr, 0,
+                           D3D11_SDK_VERSION, d3d_device.put(), nullptr,
+                           nullptr);
+  }
+
+  winrt::check_hresult(hr);
+
+  winrt::com_ptr<::IInspectable> d3d11_device;
+  winrt::check_hresult(CreateDirect3D11DeviceFromDXGIDevice(
+      d3d_device.as<IDXGIDevice>().get(), d3d11_device.put()));
+  return d3d11_device
+      .as<winrt::Windows::Graphics::DirectX::Direct3D11::IDirect3DDevice>();
+}
+
+auto WgcSessionImpl::CreateCaptureItemForWindow(HWND hwnd) {
+  auto activation_factory = winrt::get_activation_factory<
+      winrt::Windows::Graphics::Capture::GraphicsCaptureItem>();
+  auto interop_factory = activation_factory.as<IGraphicsCaptureItemInterop>();
+  winrt::Windows::Graphics::Capture::GraphicsCaptureItem item = {nullptr};
+  interop_factory->CreateForWindow(
+      hwnd,
+      winrt::guid_of<ABI::Windows::Graphics::Capture::IGraphicsCaptureItem>(),
+      reinterpret_cast<void**>(winrt::put_abi(item)));
+  return item;
+}
+
+auto WgcSessionImpl::CreateCaptureItemForMonitor(HMONITOR hmonitor) {
+  auto activation_factory = winrt::get_activation_factory<
+      winrt::Windows::Graphics::Capture::GraphicsCaptureItem>();
+  auto interop_factory = activation_factory.as<IGraphicsCaptureItemInterop>();
+  winrt::Windows::Graphics::Capture::GraphicsCaptureItem item = {nullptr};
+  interop_factory->CreateForMonitor(
+      hmonitor,
+      winrt::guid_of<ABI::Windows::Graphics::Capture::IGraphicsCaptureItem>(),
+      reinterpret_cast<void**>(winrt::put_abi(item)));
+  return item;
+}
+
+HRESULT WgcSessionImpl::CreateMappedTexture(
+    winrt::com_ptr<ID3D11Texture2D> src_texture, unsigned int width,
+    unsigned int height) {
+  D3D11_TEXTURE2D_DESC src_desc;
+  src_texture->GetDesc(&src_desc);
+  D3D11_TEXTURE2D_DESC map_desc;
+  map_desc.Width = width == 0 ? src_desc.Width : width;
+  map_desc.Height = height == 0 ? src_desc.Height : height;
+  map_desc.MipLevels = src_desc.MipLevels;
+  map_desc.ArraySize = src_desc.ArraySize;
+  map_desc.Format = src_desc.Format;
+  map_desc.SampleDesc = src_desc.SampleDesc;
+  map_desc.Usage = D3D11_USAGE_STAGING;
+  map_desc.BindFlags = 0;
+  map_desc.CPUAccessFlags = D3D11_CPU_ACCESS_READ;
+  map_desc.MiscFlags = 0;
+
+  auto d3dDevice =
+      GetDXGIInterfaceFromObject<ID3D11Device>(d3d11_direct_device_);
+
+  return d3dDevice->CreateTexture2D(&map_desc, nullptr,
+                                    d3d11_texture_mapped_.put());
+}
+
+void WgcSessionImpl::OnFrame(
+    winrt::Windows::Graphics::Capture::Direct3D11CaptureFramePool const& sender,
+    [[maybe_unused]] winrt::Windows::Foundation::IInspectable const& args) {
+  std::lock_guard locker(lock_);
+
+  auto is_new_size = false;
+
+  {
+    auto frame = sender.TryGetNextFrame();
+    auto frame_size = frame.ContentSize();
+
+    if (frame_size.Width != capture_frame_size_.Width ||
+        frame_size.Height != capture_frame_size_.Height) {
+      // The thing we have been capturing has changed size.
+      // We need to resize our swap chain first, then blit the pixels.
+      // After we do that, retire the frame and then recreate our frame pool.
+      is_new_size = true;
+      capture_frame_size_ = frame_size;
+    }
+
+    // copy to mapped texture
+    {
+      if (is_paused_) {
+        return;
+      }
+
+      auto frame_captured =
+          GetDXGIInterfaceFromObject<ID3D11Texture2D>(frame.Surface());
+
+      if (!d3d11_texture_mapped_ || is_new_size)
+        CreateMappedTexture(frame_captured);
+
+      d3d11_device_context_->CopyResource(d3d11_texture_mapped_.get(),
+                                          frame_captured.get());
+
+      D3D11_MAPPED_SUBRESOURCE map_result;
+      HRESULT hr = d3d11_device_context_->Map(
+          d3d11_texture_mapped_.get(), 0, D3D11_MAP_READ,
+          0 /*coz we use CreateFreeThreaded, so we cant use flags
+               D3D11_MAP_FLAG_DO_NOT_WAIT*/
+          ,
+          &map_result);
+      if (FAILED(hr)) {
+        OutputDebugStringW(
+            (L"map resource failed: " + std::to_wstring(hr)).c_str());
+      }
+
+      // copy data from map_result.pData
+      if (map_result.pData && observer_) {
+        observer_->OnFrame(
+            wgc_session_frame{static_cast<unsigned int>(frame_size.Width),
+                              static_cast<unsigned int>(frame_size.Height),
+                              map_result.RowPitch,
+                              const_cast<const unsigned char*>(
+                                  (unsigned char*)map_result.pData)},
+            id_);
+      }
+
+      d3d11_device_context_->Unmap(d3d11_texture_mapped_.get(), 0);
+    }
+  }
+
+  if (is_new_size) {
+    capture_framepool_.Recreate(d3d11_direct_device_,
+                                winrt::Windows::Graphics::DirectX::
+                                    DirectXPixelFormat::B8G8R8A8UIntNormalized,
+                                2, capture_frame_size_);
+  }
+}
+
+void WgcSessionImpl::OnClosed(
+    winrt::Windows::Graphics::Capture::GraphicsCaptureItem const&,
+    winrt::Windows::Foundation::IInspectable const&) {
+  OutputDebugStringW(L"WgcSessionImpl::OnClosed");
+}
+
+int WgcSessionImpl::Initialize() {
+  if (is_initialized_) return 0;
+
+  if (!(d3d11_direct_device_ = CreateD3D11Device())) {
+    std::cout << "AE_D3D_CREATE_DEVICE_FAILED" << std::endl;
+    return 1;
+  }
+
+  try {
+    if (target_.is_window)
+      capture_item_ = CreateCaptureItemForWindow(target_.hwnd);
+    else
+      capture_item_ = CreateCaptureItemForMonitor(target_.hmonitor);
+
+    // Set up
+    auto d3d11_device =
+        GetDXGIInterfaceFromObject<ID3D11Device>(d3d11_direct_device_);
+    d3d11_device->GetImmediateContext(d3d11_device_context_.put());
+
+  } catch (winrt::hresult_error) {
+    LOG_ERROR("AE_WGC_CREATE_CAPTURER_FAILED");
+    return 86;
+  } catch (...) {
+    return 86;
+  }
+
+  is_initialized_ = true;
+
+  return 0;
+}
+
+void WgcSessionImpl::CleanUp() {
+  std::lock_guard locker(lock_);
+
+  auto expected = false;
+  if (cleaned_.compare_exchange_strong(expected, true)) {
+    capture_close_trigger_.revoke();
+    capture_framepool_trigger_.revoke();
+
+    if (capture_framepool_) capture_framepool_.Close();
+
+    if (capture_session_) capture_session_.Close();
+
+    capture_framepool_ = nullptr;
+    capture_session_ = nullptr;
+    capture_item_ = nullptr;
+
+    is_initialized_ = false;
+  }
+}
+
+LRESULT CALLBACK WindowProc(HWND window, UINT message, WPARAM w_param,
+                            LPARAM l_param) {
+  return DefWindowProc(window, message, w_param, l_param);
+}
+
+// void WgcSessionImpl::message_func() {
+//   const std::wstring kClassName = L"am_fake_window";
+
+//   WNDCLASS wc = {};
+
+//   wc.style = CS_HREDRAW | CS_VREDRAW;
+//   wc.lpfnWndProc = DefWindowProc;
+//   wc.hCursor = LoadCursor(nullptr, IDC_ARROW);
+//   wc.hbrBackground = reinterpret_cast<HBRUSH>(COLOR_WINDOW);
+//   wc.lpszClassName = kClassName.c_str();
+
+//   if (!::RegisterClassW(&wc)) return;
+
+//   hwnd_ = ::CreateWindowW(kClassName.c_str(), nullptr, WS_OVERLAPPEDWINDOW,
+//   0,
+//                           0, 0, 0, nullptr, nullptr, nullptr, nullptr);
+//   MSG msg;
+//   while (is_running_) {
+//     while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) {
+//       if (!is_running_) break;
+//       TranslateMessage(&msg);
+//       DispatchMessage(&msg);
+//     }
+//     Sleep(10);
+//   }
+
+//   ::CloseWindow(hwnd_);
+//   ::DestroyWindow(hwnd_);
+// }
--- a/src/screen_capturer/windows/wgc_session_impl.h
+++ b/src/screen_capturer/windows/wgc_session_impl.h
@@ -10,17 +10,15 @@

 #include "wgc_session.h"

-namespace crossdesk {
-
 class WgcSessionImpl : public WgcSession {
  struct __declspec(uuid("A9B3D012-3DF2-4EE3-B8D1-8695F457D3C1"))
      IDirect3DDxgiInterfaceAccess : ::IUnknown {
-    virtual HRESULT __stdcall GetInterface(GUID const& id, void** object) = 0;
+    virtual HRESULT __stdcall GetInterface(GUID const &id, void **object) = 0;
  };

  template <typename T>
  inline auto GetDXGIInterfaceFromObject(
-      winrt::Windows::Foundation::IInspectable const& object) {
+      winrt::Windows::Foundation::IInspectable const &object) {
    auto access = object.as<IDirect3DDxgiInterfaceAccess>();
    winrt::com_ptr<T> result;
    winrt::check_hresult(
@@ -46,9 +44,9 @@ class WgcSessionImpl : public WgcSession {
  int Initialize(HWND hwnd) override;
  int Initialize(HMONITOR hmonitor) override;

-  void RegisterObserver(wgc_session_observer* observer) override;
+  void RegisterObserver(wgc_session_observer *observer) override;

-  int Start(bool show_cursor) override;
+  int Start() override;
  int Stop() override;

  int Pause() override;
@@ -62,11 +60,11 @@ class WgcSessionImpl : public WgcSession {
  HRESULT CreateMappedTexture(winrt::com_ptr<ID3D11Texture2D> src_texture,
                              unsigned int width = 0, unsigned int height = 0);
  void OnFrame(
-      winrt::Windows::Graphics::Capture::Direct3D11CaptureFramePool const&
-          sender,
-      winrt::Windows::Foundation::IInspectable const& args);
-  void OnClosed(winrt::Windows::Graphics::Capture::GraphicsCaptureItem const&,
-                winrt::Windows::Foundation::IInspectable const&);
+      winrt::Windows::Graphics::Capture::Direct3D11CaptureFramePool const
+          &sender,
+      winrt::Windows::Foundation::IInspectable const &args);
+  void OnClosed(winrt::Windows::Graphics::Capture::GraphicsCaptureItem const &,
+                winrt::Windows::Foundation::IInspectable const &);

  int Initialize();
  void CleanUp();
@@ -80,7 +78,7 @@ class WgcSessionImpl : public WgcSession {
  bool is_running_ = false;
  bool is_paused_ = false;

-  wgc_session_observer* observer_ = nullptr;
+  wgc_session_observer *observer_ = nullptr;

  // wgc
  winrt::Windows::Graphics::Capture::GraphicsCaptureItem capture_item_{nullptr};
@@ -115,5 +113,5 @@ class WgcSessionImpl : public WgcSession {
 //       access->GetInterface(winrt::guid_of<T>(), result.put_void()));
 //   return result;
 // }
-}  // namespace crossdesk
+
 #endif
--- a/src/speaker_capturer/linux/speaker_capturer_linux.cpp
+++ b/src/speaker_capturer/linux/speaker_capturer_linux.cpp
@@ -9,8 +9,6 @@

 #include "rd_log.h"

-namespace crossdesk {
-
 constexpr int kSampleRate = 48000;
 constexpr pa_sample_format_t kFormat = PA_SAMPLE_S16LE;
 constexpr int kChannels = 1;
@@ -268,4 +266,3 @@ int SpeakerCapturerLinux::Resume() {
  paused_ = false;
  return 0;
 }
-}  // namespace crossdesk
--- a/src/speaker_capturer/linux/speaker_capturer_linux.h
+++ b/src/speaker_capturer/linux/speaker_capturer_linux.h
@@ -18,8 +18,6 @@

 #include "speaker_capturer.h"

-namespace crossdesk {
-
 class SpeakerCapturerLinux : public SpeakerCapturer {
 public:
  SpeakerCapturerLinux();
@@ -52,5 +50,5 @@ class SpeakerCapturerLinux : public SpeakerCapturer {
  std::mutex state_mtx_;
  std::vector<uint8_t> frame_cache_;
 };
-}  // namespace crossdesk
+
 #endif
--- a/src/speaker_capturer/macosx/speaker_capturer_macosx.h
+++ b/src/speaker_capturer/macosx/speaker_capturer_macosx.h
@@ -12,8 +12,6 @@

 #include "speaker_capturer.h"

-namespace crossdesk {
-
 class SpeakerCapturerMacosx : public SpeakerCapturer {
 public:
  SpeakerCapturerMacosx();
@@ -35,5 +33,5 @@ class SpeakerCapturerMacosx : public SpeakerCapturer {
  class Impl;
  Impl* impl_ = nullptr;
 };
-}  // namespace crossdesk
+
 #endif
--- a/src/speaker_capturer/macosx/speaker_capturer_macosx.mm
+++ b/src/speaker_capturer/macosx/speaker_capturer_macosx.mm
@@ -5,17 +5,13 @@
 #include "rd_log.h"
 #include "speaker_capturer_macosx.h"

-namespace crossdesk {
-class SpeakerCapturerMacosx;
-}
-
@interface SpeakerCaptureDelegate : NSObject <SCStreamDelegate, SCStreamOutput>
-@property(nonatomic, assign) crossdesk::SpeakerCapturerMacosx* owner;
- (instancetype)initWithOwner:(crossdesk::SpeakerCapturerMacosx*)owner;
+@property(nonatomic, assign) SpeakerCapturerMacosx* owner;
+- (instancetype)initWithOwner:(SpeakerCapturerMacosx*)owner;
@end

@implementation SpeakerCaptureDelegate
- (instancetype)initWithOwner:(crossdesk::SpeakerCapturerMacosx*)owner {
+- (instancetype)initWithOwner:(SpeakerCapturerMacosx*)owner {
  self = [super init];
  if (self) {
    _owner = owner;
@@ -26,8 +22,7 @@ class SpeakerCapturerMacosx;
 - (void)stream:(SCStream*)stream
    didOutputSampleBuffer:(CMSampleBufferRef)sampleBuffer
                   ofType:(SCStreamOutputType)type {
-  if (type != SCStreamOutputTypeAudio) return;
-
+  if (type == SCStreamOutputTypeAudio) {
    CMBlockBufferRef blockBuffer = CMSampleBufferGetDataBuffer(sampleBuffer);
    size_t length = CMBlockBufferGetDataLength(blockBuffer);
    char* dataPtr = NULL;
@@ -89,12 +84,10 @@ class SpeakerCapturerMacosx;
        _owner->cb_(p + offset, frame_bytes, "audio");
      }
    }
+  }
 }
-
@end

-namespace crossdesk {
-
 class SpeakerCapturerMacosx::Impl {
 public:
  SCStreamConfiguration* config = nil;
@@ -269,4 +262,3 @@ int SpeakerCapturerMacosx::Destroy() {
 int SpeakerCapturerMacosx::Pause() { return 0; }

 int SpeakerCapturerMacosx::Resume() { return Start(); }
-}  // namespace crossdesk
--- a/src/speaker_capturer/speaker_capturer.h
+++ b/src/speaker_capturer/speaker_capturer.h
@@ -9,11 +9,9 @@

 #include <functional>

-namespace crossdesk {
-
 class SpeakerCapturer {
 public:
-  typedef std::function<void(unsigned char*, size_t, const char*)>
+  typedef std::function<void(unsigned char *, size_t, const char *)>
      speaker_data_cb;

 public:
@@ -25,5 +23,5 @@ class SpeakerCapturer {
  virtual int Start() = 0;
  virtual int Stop() = 0;
 };
-}  // namespace crossdesk
+
 #endif
--- a/src/speaker_capturer/speaker_capturer_factory.h
+++ b/src/speaker_capturer/speaker_capturer_factory.h
@@ -15,8 +15,6 @@
 #include "speaker_capturer_macosx.h"
 #endif

-namespace crossdesk {
-
 class SpeakerCapturerFactory {
 public:
  virtual ~SpeakerCapturerFactory() {}
@@ -34,5 +32,5 @@ class SpeakerCapturerFactory {
 #endif
  }
 };
-}  // namespace crossdesk
+
 #endif
--- a/src/speaker_capturer/windows/speaker_capturer_wasapi.cpp
+++ b/src/speaker_capturer/windows/speaker_capturer_wasapi.cpp
@@ -7,8 +7,6 @@

 #define SAVE_AUDIO_FILE 0

-namespace crossdesk {
-
 static ma_device_config device_config_;
 static ma_device device_;
 static ma_format format_ = ma_format_s16;
@@ -101,4 +99,3 @@ int SpeakerCapturerWasapi::Destroy() {
 }

 int SpeakerCapturerWasapi::Pause() { return 0; }
-}  // namespace crossdesk
--- a/src/speaker_capturer/windows/speaker_capturer_wasapi.h
+++ b/src/speaker_capturer/windows/speaker_capturer_wasapi.h
@@ -9,8 +9,6 @@

 #include "speaker_capturer.h"

-namespace crossdesk {
-
 class SpeakerCapturerWasapi : public SpeakerCapturer {
 public:
  SpeakerCapturerWasapi();
@@ -33,5 +31,5 @@ class SpeakerCapturerWasapi : public SpeakerCapturer {
 private:
  bool inited_ = false;
 };
-}  // namespace crossdesk
+
 #endif
--- a/src/thumbnail/thumbnail.cpp
+++ b/src/thumbnail/thumbnail.cpp
@@ -21,7 +21,7 @@
 #define STB_IMAGE_WRITE_IMPLEMENTATION
 #include "stb_image_write.h"

-namespace crossdesk {
+static std::string test;

 bool LoadTextureFromMemory(const void* data, size_t data_size,
                           SDL_Renderer* renderer, SDL_Texture** out_texture,
@@ -118,13 +118,13 @@ void ScaleNv12ToABGR(char* src, int src_w, int src_h, int dst_w, int dst_h,

  memset(dst_rgba, 0, dst_w * dst_h * 4);
  for (int i = 0; i < dst_w * dst_h; ++i) {
-    dst_rgba[i * 4 + 3] = static_cast<char>(0xFF);
+    dst_rgba[i * 4 + 3] = 0xFF;
  }

-  for (int row = 0; row < fit_h; ++row) {
+  for (int y = 0; y < fit_h; ++y) {
    int dst_offset =
-        ((row + (dst_h - fit_h) / 2) * dst_w + (dst_w - fit_w) / 2) * 4;
-    memcpy(dst_rgba + dst_offset, abgr.data() + row * fit_w * 4, fit_w * 4);
+        ((y + (dst_h - fit_h) / 2) * dst_w + (dst_w - fit_w) / 2) * 4;
+    memcpy(dst_rgba + dst_offset, abgr.data() + y * fit_w * 4, fit_w * 4);
  }
 }

@@ -156,12 +156,6 @@ Thumbnail::~Thumbnail() {
  }
 }

-int Thumbnail::SetThumbnailDpiScale(float dpi_scale) {
-  thumbnail_width_ = static_cast<int>(thumbnail_width_ * dpi_scale);
-  thumbnail_height_ = static_cast<int>(thumbnail_height_ * dpi_scale);
-  return 0;
-}
-
 int Thumbnail::SaveToThumbnail(const char* yuv420p, int width, int height,
                               const std::string& remote_id,
                               const std::string& host_name,
@@ -178,7 +172,7 @@ int Thumbnail::SaveToThumbnail(const char* yuv420p, int width, int height,
    memset(rgba_buffer_, 0x00, thumbnail_width_ * thumbnail_height_ * 4);
    for (int i = 0; i < thumbnail_width_ * thumbnail_height_; ++i) {
      // Set alpha channel to opaque
-      rgba_buffer_[i * 4 + 3] = static_cast<char>(0xFF);
+      rgba_buffer_[i * 4 + 3] = 0xFF;
    }
  }

@@ -220,7 +214,7 @@ int Thumbnail::LoadThumbnail(
    return -1;
  } else {
    for (int i = 0; i < image_paths.size(); i++) {
-      // size_t pos1 = image_paths[i].string().find('/') + 1;
+      size_t pos1 = image_paths[i].string().find('/') + 1;
      std::string cipher_image_name = image_paths[i].filename().string();
      std::string remote_id;
      std::string cipher_password;
@@ -247,7 +241,7 @@ int Thumbnail::LoadThumbnail(
            AES_decrypt(cipher_password, aes128_key_, aes128_iv_);
      } else {
        size_t pos_n = cipher_image_name.find('N');
-        // size_t pos_at = cipher_image_name.find('@');
+        size_t pos_at = cipher_image_name.find('@');

        if (pos_n == std::string::npos) {
          LOG_ERROR("Invalid filename");
@@ -436,4 +430,3 @@ std::string Thumbnail::AES_decrypt(const std::string& ciphertext,

  return std::string(reinterpret_cast<char*>(plaintext), plaintext_len);
 }
-}  // namespace crossdesk
--- a/src/thumbnail/thumbnail.h
+++ b/src/thumbnail/thumbnail.h
@@ -14,8 +14,6 @@
 #include <unordered_map>
 #include <vector>

-namespace crossdesk {
-
 class Thumbnail {
 public:
  struct RecentConnection {
@@ -33,8 +31,6 @@ class Thumbnail {
  ~Thumbnail();

 public:
-  int SetThumbnailDpiScale(float dpi_scale);
-
  int SaveToThumbnail(const char* yuv420p, int width, int height,
                      const std::string& remote_id,
                      const std::string& host_name,
@@ -87,5 +83,5 @@ class Thumbnail {
  unsigned char ciphertext_[64];
  unsigned char decryptedtext_[64];
 };
-}  // namespace crossdesk
+
 #endif
--- a/src/version_checker/version_checker.cpp
+++ b/src/version_checker/version_checker.cpp
@@ -1,158 +0,0 @@
-/*
- * @Author: DI JUNKUN
- * @Date: 2025-11-11
- * Copyright (c) 2025 by DI JUNKUN, All Rights Reserved.
- */
-
-#include "version_checker.h"
-
-#include <httplib.h>
-
-#include <iostream>
-#include <sstream>
-#include <string>
-#include <vector>
-
-namespace crossdesk {
-
-static std::string latest_release_date_ = "";
-
-std::string ExtractNumericPart(const std::string& ver) {
-  size_t start = 0;
-  while (start < ver.size() && !std::isdigit(ver[start])) start++;
-  size_t end = start;
-  while (end < ver.size() && (std::isdigit(ver[end]) || ver[end] == '.')) end++;
-  return ver.substr(start, end - start);
-}
-
-std::vector<int> SplitVersion(const std::string& ver) {
-  std::vector<int> nums;
-  std::istringstream ss(ver);
-  std::string token;
-  while (std::getline(ss, token, '.')) {
-    try {
-      nums.push_back(std::stoi(token));
-    } catch (...) {
-      nums.push_back(0);
-    }
-  }
-  return nums;
-}
-
-// extract date from version string (format: v1.2.3-20251113-abc
-// or 1.2.3-20251113-abc)
-std::string ExtractDateFromVersion(const std::string& version) {
-  size_t dash1 = version.find('-');
-  if (dash1 != std::string::npos) {
-    size_t dash2 = version.find('-', dash1 + 1);
-    if (dash2 != std::string::npos) {
-      std::string date_part = version.substr(dash1 + 1, dash2 - dash1 - 1);
-
-      bool is_date = true;
-      for (char c : date_part) {
-        if (!std::isdigit(c)) {
-          is_date = false;
-          break;
-        }
-      }
-      if (is_date) {
-        // convert YYYYMMDD to YYYY-MM-DD
-        return date_part.substr(0, 4) + "-" + date_part.substr(4, 2) + "-" +
-               date_part.substr(6, 2);
-      }
-    }
-  }
-  return "";
-}
-
-// compare two dates in YYYY-MM-DD format
-bool IsNewerDate(const std::string& date1, const std::string& date2) {
-  if (date1.empty() || date2.empty()) return false;
-  // simple string comparison works for ISO date format (YYYY-MM-DD)
-  return date2 > date1;
-}
-
-bool IsNewerVersion(const std::string& current, const std::string& latest) {
-  auto v1 = SplitVersion(ExtractNumericPart(current));
-  auto v2 = SplitVersion(ExtractNumericPart(latest));
-
-  size_t len = std::max(v1.size(), v2.size());
-  v1.resize(len, 0);
-  v2.resize(len, 0);
-
-  for (size_t i = 0; i < len; ++i) {
-    if (v2[i] > v1[i]) return true;
-    if (v2[i] < v1[i]) return false;
-  }
-
-  // if versions are equal, compare by release date
-  if (!latest_release_date_.empty()) {
-    // try to extract date from current version string
-    std::string current_date = ExtractDateFromVersion(current);
-    if (!current_date.empty()) {
-      return IsNewerDate(current_date, latest_release_date_);
-    } else {
-      return true;
-    }
-  }
-
-  return false;
-}
-
-bool IsNewerVersionWithDate(const std::string& current_version,
-                            const std::string& current_date,
-                            const std::string& latest_version,
-                            const std::string& latest_date) {
-  // compare versions
-  auto v1 = SplitVersion(ExtractNumericPart(current_version));
-  auto v2 = SplitVersion(ExtractNumericPart(latest_version));
-
-  size_t len = std::max(v1.size(), v2.size());
-  v1.resize(len, 0);
-  v2.resize(len, 0);
-
-  for (size_t i = 0; i < len; ++i) {
-    if (v2[i] > v1[i]) return true;
-    if (v2[i] < v1[i]) return false;
-  }
-
-  // if versions are equal, compare by release date
-  if (!current_date.empty() && !latest_date.empty()) {
-    return IsNewerDate(current_date, latest_date);
-  }
-
-  // if dates are not available, versions are equal
-  return false;
-}
-
-nlohmann::json CheckUpdate() {
-  httplib::Client cli("https://version.crossdesk.cn");
-
-  cli.set_connection_timeout(5);
-  cli.set_read_timeout(5);
-
-  if (auto res = cli.Get("/version.json")) {
-    if (res->status == 200) {
-      try {
-        auto j = nlohmann::json::parse(res->body);
-        if (j.contains("releaseDate") && j["releaseDate"].is_string()) {
-          latest_release_date_ = j["releaseDate"];
-        } else {
-          latest_release_date_ = "";
-        }
-        return j;
-      } catch (std::exception&) {
-        latest_release_date_ = "";
-        return nlohmann::json{};
-      }
-    } else {
-      latest_release_date_ = "";
-      return nlohmann::json{};
-    }
-  } else {
-    latest_release_date_ = "";
-    return nlohmann::json{};
-  }
-}
-
-}  // namespace crossdesk
--- a/src/version_checker/version_checker.h
+++ b/src/version_checker/version_checker.h
@@ -1,21 +0,0 @@
-/*
- * @Author: DI JUNKUN
- * @Date: 2025-11-11
- * Copyright (c) 2025 by DI JUNKUN, All Rights Reserved.
- */
-
-#ifndef _VERSION_CHECKER_H_
-#define _VERSION_CHECKER_H_
-
-#include <nlohmann/json.hpp>
-#include <string>
-
-namespace crossdesk {
-
-nlohmann::json CheckUpdate();
-
-bool IsNewerVersion(const std::string& current, const std::string& latest);
-
-}  // namespace crossdesk
-
-#endif
--- a/submodules/minirtc
+++ b/submodules/minirtc
--- a/submodules/xmake.lua
+++ b/submodules/xmake.lua
@@ -1 +0,0 @@
-includes("minirtc")
--- a/thirdparty/cpp-httplib/patches/v0.26.0/fix-mingw.diff
+++ b/thirdparty/cpp-httplib/patches/v0.26.0/fix-mingw.diff
@@ -1,39 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d39958a..ba21f3c 100644
--- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -117,8 +117,14 @@ if(BUILD_SHARED_LIBS AND WIN32 AND HTTPLIB_COMPILE)
- 	set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
- endif()
- 
-if(CMAKE_SYSTEM_NAME MATCHES "Windows" AND ${CMAKE_SYSTEM_VERSION} VERSION_LESS "10.0.0")
-	message(SEND_ERROR "Windows ${CMAKE_SYSTEM_VERSION} or lower is not supported. Please use Windows 10 or later.")
-+if(CMAKE_SYSTEM_NAME MATCHES "Windows")
-+    if(CMAKE_SYSTEM_VERSION)
-+        if(${CMAKE_SYSTEM_VERSION} VERSION_LESS "10.0.0")
-+            message(SEND_ERROR "Windows ${CMAKE_SYSTEM_VERSION} or lower is not supported. Please use Windows 10 or later.")
-+        endif()
-+    else()
-+        message(WARNING "Cross-compiling for Windows, but CMAKE_SYSTEM_VERSION is not specified. Assuming target is Windows 10 or later.")
-+    endif()
- endif()
- if(CMAKE_SIZEOF_VOID_P LESS 8)
- 	message(WARNING "Pointer size ${CMAKE_SIZEOF_VOID_P} is not supported. Please use a 64-bit compiler.")
-diff --git a/httplib.h b/httplib.h
-index e15ba44..728504a 100644
--- a/httplib.h
-+++ b/httplib.h
-@@ -3083,8 +3083,13 @@ inline bool mmap::open(const char *path) {
-   auto wpath = u8string_to_wstring(path);
-   if (wpath.empty()) { return false; }
- 
-+#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP | WINAPI_PARTITION_SYSTEM | WINAPI_PARTITION_GAMES) && (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
-   hFile_ = ::CreateFile2(wpath.c_str(), GENERIC_READ, FILE_SHARE_READ,
-                          OPEN_EXISTING, NULL);
-+#else
-+  hFile_ = ::CreateFileW(wpath.c_str(), GENERIC_READ, FILE_SHARE_READ, NULL,
-+                        OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
-+#endif
- 
-   if (hFile_ == INVALID_HANDLE_VALUE) { return false; }
- 
--- a/thirdparty/cpp-httplib/xmake.lua
+++ b/thirdparty/cpp-httplib/xmake.lua
@@ -1,117 +0,0 @@
-package("cpp-httplib")
-    set_kind("library", {headeronly = true})
-    set_homepage("https://github.com/yhirose/cpp-httplib")
-    set_description("A C++11 single-file header-only cross platform HTTP/HTTPS library.")
-    set_license("MIT")
-
-    set_urls("https://github.com/yhirose/cpp-httplib/archive/refs/tags/$(version).tar.gz",
-             "https://github.com/yhirose/cpp-httplib.git")
-
-    add_versions("v0.26.0", "a66f908f50ccb119769adce44fe1eac75f81b6ffab7c4ac0211bb663ffeb2688")
-    add_versions("v0.23.1", "410a1347ed6bcbcc4a19af8ed8ad3873fe9fa97731d52db845c4c78f3f9c31e6")
-    add_versions("v0.22.0", "fcfea48c8f2c386e7085ef8545c8a4875efa30fa6d5cf9dd31f03c6ad038da9d")
-    add_versions("v0.21.0", "99cfbce46981994d8f34ed21836510d7d408ffac91315bb22c9584a83e220e60")
-    add_versions("v0.20.1", "b74b1c2c150be2841eba80192f64d93e9a6711985b3ae8aaa1a9cec4863d1dd9")
-    add_versions("v0.20.0", "18064587e0cc6a0d5d56d619f4cbbcaba47aa5d84d86013abbd45d95c6653866")
-    add_versions("v0.19.0", "c9b9e0524666e1cd088f0874c57c1ce7c0eaa8552f9f4e15c755d5201fc8c608")
-    add_versions("v0.18.7", "b7b1e9e4e77565a5a9bc95e761d5df3e7c0e8ca37c90fd78b1b031bc6cb90fc1")
-    add_versions("v0.18.6", "8900747bba3dda8007f1876175be699036e09e4a25ceeab51196d9365bf1993a")
-    add_versions("v0.18.5", "731190e97acd63edce57cc3dacd496f57e7743bfc7933da7137cb3e93ec6c9a0")
-    add_versions("v0.18.3", "a0567bcd6c3fe5cef1b329b96245119047f876b49e06cc129a36a7a8dffe173e")
-    add_versions("v0.18.1", "405abd8170f2a446fc8612ac635d0db5947c0d2e156e32603403a4496255ff00")
-    add_versions("v0.17.3", "95bd6dba4241656c59d6f0854d408d14c220f7c71e673319ee27d30aee741aaa")
-    add_versions("v0.17.0", "dd3ba355b6aa74b7a0bff982ad0de7af6d9672fd83af30aa84eb707974d2a903")
-    add_versions("v0.16.3", "c1742fc7179aaae2a67ad9bba0740b7e9ffaf4f5e62feef53101ecdef1478716")
-    add_versions("v0.16.2", "75565bcdf12522929a26fb57a2c7f8cc0e175e27a9ecf51616075f3ea960da44")
-    add_versions("v0.15.3", "2121bbf38871bb2aafb5f7f2b9b94705366170909f434428352187cb0216124e")
-    add_versions("v0.15.2", "4afbcf4203249d2cbcb698e46e1f6fb61b479013a84844d6bb1c044e233cab6a")
-    add_versions("v0.15.1", "8d6a4a40ee8fd3f553b7e895882e60e674bd910883fc1857587dbbabee3cdb91")
-    add_versions("v0.15.0", "b658e625e283e2c81437a485a95f3acf8b1d32c53d8147b1ccecc8f630e1f7bb")
-    add_versions("v0.14.3", "dcf6486d9030937636d8a4f820ca9531808fd7edb283893dddbaa05f99357e63")
-    add_versions("v0.14.2", "dbcf5590e8ed35c6745c2ad659a5ebec92f05187d1506eec24449d6db95e5084")
-    add_versions("v0.14.1", "2d4fb5544da643e5d0a82585555d8b7502b4137eb321a4abbb075e21d2f00e96")
-    add_versions("v0.14.0", "3a92248ef8cf2c32ad07f910b8e3052ff2427022b2adb871cf326fb620d2438e")
-    add_versions("v0.12.6", "24bc594a9efcc08a5a6f3928e848d046d411a88b07bcd6f7f3851227a1f0133e")
-    add_versions("v0.12.1", "0e56c25c63e730ebd42e2beda6e7cb1b950131d8fc00d3158b1443a8d76f41ca")
-    add_versions("v0.9.2", "bfef2587a2aa31c85fb361df71c720be97076f8083e4f3881da8572f6a58054f")
-    add_versions("v0.8.5", "b353f3e7c124a08940d9425aeb7206183fa29857a8f720c162f8fd820cc18f0e")
-
-    add_patches("v0.26.0", path.join(os.scriptdir(), "patches/v0.26.0/fix-mingw.diff"), "f7b704e86abd8fd04217056e3ffb01427185e0bae72999246a3b8d13ba23c56a")
-    add_patches("v0.23.1", path.join(os.scriptdir(), "patches/v0.23.1/fix-mingw.diff"), "d2d8a4c16de3a00d9872526a187257c7ad344eba2a9f109d10b58eadce1c4059")
-
-    add_configs("ssl",  { description = "Requires OpenSSL", default = false, type = "boolean"})
-    add_configs("zlib",  { description = "Requires Zlib", default = false, type = "boolean"})
-    add_configs("brotli",  { description = "Requires Brotli", default = false, type = "boolean"})
-    add_configs("exceptions", {description = "Enable the use of C++ exceptions", default = true, type = "boolean"})
-
-    add_deps("cmake")
-
-    if on_check then
-        on_check(function (package)
-            local pkg_ver = package:version()
-            if package:is_plat("windows") then
-                local winver = winos.version()
-                local vs = package:toolchain("msvc"):config("vs")
-                assert(winver and winver:gt("win8"), "package(httplib): Windows 8 or lower is neither supported nor tested.")
-                if pkg_ver and pkg_ver:ge("0.19.0") then
-                    assert(vs and tonumber(vs) > 2015, "package(httplib >= 0.19.0): VS 2015 or lower is neither supported nor tested.")
-                elseif pkg_ver and pkg_ver:ge("0.11.0") then
-                    assert(vs and tonumber(vs) > 2013, "package(httplib >= 0.11.0): VS 2013 or lower is neither supported nor tested.")
-                end
-            end
-            if pkg_ver and pkg_ver:ge("0.15.0") and package:is_plat("msys") then
-                wprint("package(httplib): MSYS2 (including MinGW) is not officially supported or tested by httplib.")
-            end
-            if package:is_plat("android") then
-                local ndk = package:toolchain("ndk")
-                local ndk_sdkver = ndk:config("ndk_sdkver")
-                assert(ndk_sdkver and tonumber(ndk_sdkver) >= 24, "package(httplib): need ndk api level >= 24 for android")
-            end
-            if pkg_ver and pkg_ver:ge("0.23.0") then
-                if package:check_sizeof("void*") == "4" then
-                    raise("package(cpp-httplib >=0.23.0) does not support 32-bit")
-                end
-            end
-        end)
-    end
-
-    on_load(function (package)
-        if package:config("ssl") then
-            package:add("deps", "openssl3 3.3.2")
-            package:add("defines", "CPPHTTPLIB_OPENSSL_SUPPORT")
-        end
-        if package:config("zlib") then
-            package:add("deps", "zlib")
-            package:add("defines", "CPPHTTPLIB_ZLIB_SUPPORT")
-        end
-        if package:config("brotli") then
-            package:add("deps", "brotli")
-            package:add("defines", "CPPHTTPLIB_BROTLI_SUPPORT")
-        end
-    end)
-
-    on_install("!cygwin", function (package)
-        local configs = {"-DHTTPLIB_COMPILE=OFF"}
-        table.insert(configs, "-DCMAKE_BUILD_TYPE=" .. (package:is_debug() and "Debug" or "Release"))
-        table.insert(configs, "-DBUILD_SHARED_LIBS=" .. (package:config("shared") and "ON" or "OFF"))
-        table.insert(configs, "-DHTTPLIB_REQUIRE_OPENSSL=" .. (package:config("ssl") and "ON" or "OFF"))
-        table.insert(configs, "-DHTTPLIB_REQUIRE_ZLIB=" .. (package:config("zlib") and "ON" or "OFF"))
-        table.insert(configs, "-DHTTPLIB_REQUIRE_BROTLI=" .. (package:config("brotli") and "ON" or "OFF"))
-        table.insert(configs, "-DHTTPLIB_NO_EXCEPTIONS=" .. (package:config("exceptions") and "OFF" or "ON"))
-
-        if package:config("ssl") then
-            local openssl = package:dep("openssl" .. (package:version():ge("0.15.0") and "3" or ""))
-            if not openssl:is_system() then
-                table.insert(configs, "-DOPENSSL_ROOT_DIR=" .. openssl:installdir())
-            end
-        end
-        import("package.tools.cmake").install(package, configs)
-    end)
-
-    on_test(function (package)
-        assert(package:check_cxxsnippets({test = [[
-            void test() {
-                httplib::Client cli("http://cpp-httplib-server.yhirose.repl.co");
-            }
-        ]]}, {configs = {languages = "c++11"}, includes = "httplib.h"}))
-    end)
--- a/Show More
+++ b/Show More