diff --git a/.editorconfig b/.editorconfig
index 779f99a1..9d08a1a8 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,12 +1,9 @@
 root = true
 
 [*]
-indent_style = space
-indent_size = 4
-end_of_line = lf
 charset = utf-8
-trim_trailing_whitespace = true
+indent_style = space
+indent_size = 2
+end_of_line = lf
 insert_final_newline = true
-
-[*.md]
-trim_trailing_whitespace = false
+trim_trailing_whitespace = true
diff --git a/.erb/configs/.eslintrc b/.erb/configs/.eslintrc
deleted file mode 100644
index 89d242ba..00000000
--- a/.erb/configs/.eslintrc
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "rules": {
-    "no-console": "off",
-    "global-require": "off",
-    "import/no-dynamic-require": "off"
-  }
-}
diff --git a/.erb/configs/webpack.config.base.ts b/.erb/configs/webpack.config.base.ts
deleted file mode 100644
index c998500c..00000000
--- a/.erb/configs/webpack.config.base.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- * Base webpack config used across other specific configs
- */
-
-import webpack from 'webpack';
-import { dependencies as externals } from '../../release/app/package.json';
-import webpackPaths from './webpack.paths';
-import { TsconfigPathsPlugin } from 'tsconfig-paths-webpack-plugin';
-
-const createStyledComponentsTransformer = require('typescript-plugin-styled-components').default;
-
-const styledComponentsTransformer = createStyledComponentsTransformer();
-
-const configuration: webpack.Configuration = {
-    externals: [...Object.keys(externals || {})],
-
-    module: {
-        rules: [
-            {
-                exclude: /node_modules/,
-                test: /\.[jt]sx?$/,
-                use: {
-                    loader: 'ts-loader',
-                    options: {
-                        // Remove this line to enable type checking in webpack builds
-                        transpileOnly: true,
-                        getCustomTransformers: () => ({ before: [styledComponentsTransformer] }),
-                    },
-                },
-            },
-        ],
-    },
-
-    output: {
-        // https://github.com/webpack/webpack/issues/1114
-        library: {
-            type: 'commonjs2',
-        },
-
-        path: webpackPaths.srcPath,
-    },
-
-    plugins: [
-        new webpack.EnvironmentPlugin({
-            NODE_ENV: 'production',
-        }),
-    ],
-
-    /**
-     * Determine the array of extensions that should be used to resolve modules.
-     */
-    resolve: {
-        extensions: ['.js', '.jsx', '.json', '.ts', '.tsx'],
-        fallback: {
-            child_process: false,
-        },
-        plugins: [new TsconfigPathsPlugin({ baseUrl: webpackPaths.srcPath })],
-        modules: [webpackPaths.srcPath, 'node_modules'],
-    },
-
-    stats: 'errors-only',
-};
-
-export default configuration;
diff --git a/.erb/configs/webpack.config.eslint.ts b/.erb/configs/webpack.config.eslint.ts
deleted file mode 100644
index 35a631b7..00000000
--- a/.erb/configs/webpack.config.eslint.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-/* eslint import/no-unresolved: off, import/no-self-import: off */
-
-module.exports = require('./webpack.config.renderer.dev').default;
diff --git a/.erb/configs/webpack.config.main.prod.ts b/.erb/configs/webpack.config.main.prod.ts
deleted file mode 100644
index 10d1ea17..00000000
--- a/.erb/configs/webpack.config.main.prod.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-/**
- * Webpack config for production electron main process
- */
-
-import path from 'path';
-
-import TerserPlugin from 'terser-webpack-plugin';
-import webpack from 'webpack';
-import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
-import { merge } from 'webpack-merge';
-
-import checkNodeEnv from '../scripts/check-node-env';
-import deleteSourceMaps from '../scripts/delete-source-maps';
-import baseConfig from './webpack.config.base';
-import webpackPaths from './webpack.paths';
-
-checkNodeEnv('production');
-deleteSourceMaps();
-
-const devtoolsConfig =
-  process.env.DEBUG_PROD === 'true'
-    ? {
-        devtool: 'source-map',
-      }
-    : {};
-
-const configuration: webpack.Configuration = {
-  ...devtoolsConfig,
-
-  mode: 'production',
-
-  target: 'electron-main',
-
-  entry: {
-    main: path.join(webpackPaths.srcMainPath, 'main.ts'),
-    preload: path.join(webpackPaths.srcMainPath, 'preload.ts'),
-  },
-
-  output: {
-    path: webpackPaths.distMainPath,
-    filename: '[name].js',
-  },
-
-  optimization: {
-    minimizer: [
-      new TerserPlugin({
-        parallel: true,
-      }),
-    ],
-  },
-
-  plugins: [
-    new BundleAnalyzerPlugin({
-      analyzerMode: process.env.ANALYZE === 'true' ? 'server' : 'disabled',
-    }),
-
-    /**
-     * Create global constants which can be configured at compile time.
-     *
-     * Useful for allowing different behaviour between development builds and
-     * release builds
-     *
-     * NODE_ENV should be production so that modules do not perform certain
-     * development checks
-     */
-    new webpack.EnvironmentPlugin({
-      NODE_ENV: 'production',
-      DEBUG_PROD: false,
-      START_MINIMIZED: false,
-    }),
-  ],
-
-  /**
-   * Disables webpack processing of __dirname and __filename.
-   * If you run the bundle in node.js it falls back to these values of node.js.
-   * https://github.com/webpack/webpack/issues/2010
-   */
-  node: {
-    __dirname: false,
-    __filename: false,
-  },
-};
-
-export default merge(baseConfig, configuration);
diff --git a/.erb/configs/webpack.config.preload.dev.ts b/.erb/configs/webpack.config.preload.dev.ts
deleted file mode 100644
index 6abb73f2..00000000
--- a/.erb/configs/webpack.config.preload.dev.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-import path from 'path';
-
-import webpack from 'webpack';
-import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
-import { merge } from 'webpack-merge';
-
-import checkNodeEnv from '../scripts/check-node-env';
-import baseConfig from './webpack.config.base';
-import webpackPaths from './webpack.paths';
-
-// When an ESLint server is running, we can't set the NODE_ENV so we'll check if it's
-// at the dev webpack config is not accidentally run in a production environment
-if (process.env.NODE_ENV === 'production') {
-  checkNodeEnv('development');
-}
-
-const configuration: webpack.Configuration = {
-  devtool: 'inline-source-map',
-
-  mode: 'development',
-
-  target: 'electron-preload',
-
-  entry: path.join(webpackPaths.srcMainPath, 'preload.ts'),
-
-  output: {
-    path: webpackPaths.dllPath,
-    filename: 'preload.js',
-  },
-
-  plugins: [
-    new BundleAnalyzerPlugin({
-      analyzerMode: process.env.ANALYZE === 'true' ? 'server' : 'disabled',
-    }),
-
-    /**
-     * Create global constants which can be configured at compile time.
-     *
-     * Useful for allowing different behaviour between development builds and
-     * release builds
-     *
-     * NODE_ENV should be production so that modules do not perform certain
-     * development checks
-     *
-     * By default, use 'development' as NODE_ENV. This can be overriden with
-     * 'staging', for example, by changing the ENV variables in the npm scripts
-     */
-    new webpack.EnvironmentPlugin({
-      NODE_ENV: 'development',
-    }),
-
-    new webpack.LoaderOptionsPlugin({
-      debug: true,
-    }),
-  ],
-
-  /**
-   * Disables webpack processing of __dirname and __filename.
-   * If you run the bundle in node.js it falls back to these values of node.js.
-   * https://github.com/webpack/webpack/issues/2010
-   */
-  node: {
-    __dirname: false,
-    __filename: false,
-  },
-
-  watch: true,
-};
-
-export default merge(baseConfig, configuration);
diff --git a/.erb/configs/webpack.config.remote.dev.ts b/.erb/configs/webpack.config.remote.dev.ts
deleted file mode 100644
index 3313095e..00000000
--- a/.erb/configs/webpack.config.remote.dev.ts
+++ /dev/null
@@ -1,127 +0,0 @@
-import 'webpack-dev-server';
-import path from 'path';
-
-import HtmlWebpackPlugin from 'html-webpack-plugin';
-import webpack from 'webpack';
-import { merge } from 'webpack-merge';
-
-import checkNodeEnv from '../scripts/check-node-env';
-import baseConfig from './webpack.config.base';
-import webpackPaths from './webpack.paths';
-
-const { version } = require('../../package.json');
-
-// When an ESLint server is running, we can't set the NODE_ENV so we'll check if it's
-// at the dev webpack config is not accidentally run in a production environment
-if (process.env.NODE_ENV === 'production') {
-    checkNodeEnv('development');
-}
-
-const configuration: webpack.Configuration = {
-    devtool: 'inline-source-map',
-
-    mode: 'development',
-
-    target: ['web'],
-
-    entry: {
-        remote: path.join(webpackPaths.srcRemotePath, 'index.tsx'),
-        worker: path.join(webpackPaths.srcRemotePath, 'service-worker.ts'),
-    },
-
-    output: {
-        path: webpackPaths.dllPath,
-        publicPath: '/',
-        filename: '[name].js',
-        library: {
-            type: 'umd',
-        },
-    },
-
-    module: {
-        rules: [
-            {
-                test: /\.s?css$/,
-                use: [
-                    'style-loader',
-                    {
-                        loader: 'css-loader',
-                        options: {
-                            modules: true,
-                            sourceMap: true,
-                            importLoaders: 1,
-                        },
-                    },
-                    'sass-loader',
-                ],
-                include: /\.module\.s?(c|a)ss$/,
-            },
-            {
-                test: /\.s?css$/,
-                use: ['style-loader', 'css-loader', 'sass-loader'],
-                exclude: /\.module\.s?(c|a)ss$/,
-            },
-            // Fonts
-            {
-                test: /\.(woff|woff2|eot|ttf|otf)$/i,
-                type: 'asset/resource',
-            },
-            // Images
-            {
-                test: /\.(png|svg|jpg|jpeg|gif)$/i,
-                type: 'asset/resource',
-            },
-        ],
-    },
-    plugins: [
-        new webpack.NoEmitOnErrorsPlugin(),
-
-        /**
-         * Create global constants which can be configured at compile time.
-         *
-         * Useful for allowing different behaviour between development builds and
-         * release builds
-         *
-         * NODE_ENV should be production so that modules do not perform certain
-         * development checks
-         *
-         * By default, use 'development' as NODE_ENV. This can be overriden with
-         * 'staging', for example, by changing the ENV variables in the npm scripts
-         */
-        new webpack.EnvironmentPlugin({
-            NODE_ENV: 'development',
-        }),
-
-        new webpack.LoaderOptionsPlugin({
-            debug: true,
-        }),
-
-        new HtmlWebpackPlugin({
-            filename: path.join('index.html'),
-            template: path.join(webpackPaths.srcRemotePath, 'index.ejs'),
-            favicon: path.join(webpackPaths.assetsPath, 'icons', 'favicon.ico'),
-            minify: {
-                collapseWhitespace: true,
-                removeAttributeQuotes: true,
-                removeComments: true,
-            },
-            isBrowser: true,
-            env: process.env.NODE_ENV,
-            isDevelopment: process.env.NODE_ENV !== 'production',
-            nodeModules: webpackPaths.appNodeModulesPath,
-            templateParameters: {
-                version,
-                prod: false,
-            },
-        }),
-    ],
-
-    node: {
-        __dirname: false,
-        __filename: false,
-    },
-
-    watch: true,
-};
-
-export default merge(baseConfig, configuration);
diff --git a/.erb/configs/webpack.config.remote.prod.ts b/.erb/configs/webpack.config.remote.prod.ts
deleted file mode 100644
index d96dbe5b..00000000
--- a/.erb/configs/webpack.config.remote.prod.ts
+++ /dev/null
@@ -1,142 +0,0 @@
-/**
- * Build config for electron renderer process
- */
-
-import path from 'path';
-
-import CssMinimizerPlugin from 'css-minimizer-webpack-plugin';
-import HtmlWebpackPlugin from 'html-webpack-plugin';
-import MiniCssExtractPlugin from 'mini-css-extract-plugin';
-import TerserPlugin from 'terser-webpack-plugin';
-import webpack from 'webpack';
-import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
-import { merge } from 'webpack-merge';
-
-import checkNodeEnv from '../scripts/check-node-env';
-import deleteSourceMaps from '../scripts/delete-source-maps';
-import baseConfig from './webpack.config.base';
-import webpackPaths from './webpack.paths';
-
-const { version } = require('../../package.json');
-
-checkNodeEnv('production');
-deleteSourceMaps();
-
-const devtoolsConfig =
-    process.env.DEBUG_PROD === 'true'
-        ? {
-              devtool: 'source-map',
-          }
-        : {};
-
-const configuration: webpack.Configuration = {
-    ...devtoolsConfig,
-
-    mode: 'production',
-
-    target: ['web'],
-
-    entry: {
-        remote: path.join(webpackPaths.srcRemotePath, 'index.tsx'),
-        worker: path.join(webpackPaths.srcRemotePath, 'service-worker.ts'),
-    },
-
-    output: {
-        path: webpackPaths.distRemotePath,
-        publicPath: './',
-        filename: '[name].js',
-        library: {
-            type: 'umd',
-        },
-    },
-
-    module: {
-        rules: [
-            {
-                test: /\.s?(a|c)ss$/,
-                use: [
-                    MiniCssExtractPlugin.loader,
-                    {
-                        loader: 'css-loader',
-                        options: {
-                            modules: true,
-                            sourceMap: true,
-                            importLoaders: 1,
-                        },
-                    },
-                    'sass-loader',
-                ],
-                include: /\.module\.s?(c|a)ss$/,
-            },
-            {
-                test: /\.s?(a|c)ss$/,
-                use: [MiniCssExtractPlugin.loader, 'css-loader', 'sass-loader'],
-                exclude: /\.module\.s?(c|a)ss$/,
-            },
-            // Fonts
-            {
-                test: /\.(woff|woff2|eot|ttf|otf)$/i,
-                type: 'asset/resource',
-            },
-            // Images
-            {
-                test: /\.(png|svg|jpg|jpeg|gif)$/i,
-                type: 'asset/resource',
-            },
-        ],
-    },
-
-    optimization: {
-        minimize: true,
-        minimizer: [
-            new TerserPlugin({
-                parallel: true,
-            }),
-            new CssMinimizerPlugin(),
-        ],
-    },
-
-    plugins: [
-        /**
-         * Create global constants which can be configured at compile time.
-         *
-         * Useful for allowing different behaviour between development builds and
-         * release builds
-         *
-         * NODE_ENV should be production so that modules do not perform certain
-         * development checks
-         */
-        new webpack.EnvironmentPlugin({
-            NODE_ENV: 'production',
-            DEBUG_PROD: false,
-        }),
-
-        new MiniCssExtractPlugin({
-            filename: 'remote.css',
-        }),
-
-        new BundleAnalyzerPlugin({
-            analyzerMode: process.env.ANALYZE === 'true' ? 'server' : 'disabled',
-        }),
-
-        new HtmlWebpackPlugin({
-            filename: 'index.html',
-            template: path.join(webpackPaths.srcRemotePath, 'index.ejs'),
-            favicon: path.join(webpackPaths.assetsPath, 'icons', 'favicon.ico'),
-            minify: {
-                collapseWhitespace: true,
-                removeAttributeQuotes: true,
-                removeComments: true,
-            },
-            isBrowser: true,
-            env: process.env.NODE_ENV,
-            isDevelopment: process.env.NODE_ENV !== 'production',
-            templateParameters: {
-                version,
-                prod: true,
-            },
-        }),
-    ],
-};
-
-export default merge(baseConfig, configuration);
diff --git a/.erb/configs/webpack.config.renderer.dev.dll.ts b/.erb/configs/webpack.config.renderer.dev.dll.ts
deleted file mode 100644
index dea71afb..00000000
--- a/.erb/configs/webpack.config.renderer.dev.dll.ts
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * Builds the DLL for development electron renderer process
- */
-
-import path from 'path';
-
-import webpack from 'webpack';
-import { merge } from 'webpack-merge';
-
-import { dependencies } from '../../package.json';
-import checkNodeEnv from '../scripts/check-node-env';
-import baseConfig from './webpack.config.base';
-import webpackPaths from './webpack.paths';
-
-checkNodeEnv('development');
-
-const dist = webpackPaths.dllPath;
-
-const configuration: webpack.Configuration = {
-  context: webpackPaths.rootPath,
-
-  devtool: 'eval',
-
-  mode: 'development',
-
-  target: 'electron-renderer',
-
-  externals: ['fsevents', 'crypto-browserify'],
-
-  /**
-   * Use `module` from `webpack.config.renderer.dev.js`
-   */
-  module: require('./webpack.config.renderer.dev').default.module,
-
-  entry: {
-    renderer: Object.keys(dependencies || {}),
-  },
-
-  output: {
-    path: dist,
-    filename: '[name].dev.dll.js',
-    library: {
-      name: 'renderer',
-      type: 'var',
-    },
-  },
-
-  plugins: [
-    new webpack.DllPlugin({
-      path: path.join(dist, '[name].json'),
-      name: '[name]',
-    }),
-
-    /**
-     * Create global constants which can be configured at compile time.
-     *
-     * Useful for allowing different behaviour between development builds and
-     * release builds
-     *
-     * NODE_ENV should be production so that modules do not perform certain
-     * development checks
-     */
-    new webpack.EnvironmentPlugin({
-      NODE_ENV: 'development',
-    }),
-
-    new webpack.LoaderOptionsPlugin({
-      debug: true,
-      options: {
-        context: webpackPaths.srcPath,
-        output: {
-          path: webpackPaths.dllPath,
-        },
-      },
-    }),
-  ],
-};
-
-export default merge(baseConfig, configuration);
diff --git a/.erb/configs/webpack.config.renderer.dev.ts b/.erb/configs/webpack.config.renderer.dev.ts
deleted file mode 100644
index 46e51530..00000000
--- a/.erb/configs/webpack.config.renderer.dev.ts
+++ /dev/null
@@ -1,201 +0,0 @@
-import 'webpack-dev-server';
-import { execSync, spawn } from 'child_process';
-import fs from 'fs';
-import path from 'path';
-
-import ReactRefreshWebpackPlugin from '@pmmmwh/react-refresh-webpack-plugin';
-import chalk from 'chalk';
-import HtmlWebpackPlugin from 'html-webpack-plugin';
-import webpack from 'webpack';
-import { merge } from 'webpack-merge';
-
-import checkNodeEnv from '../scripts/check-node-env';
-import baseConfig from './webpack.config.base';
-import webpackPaths from './webpack.paths';
-
-// When an ESLint server is running, we can't set the NODE_ENV so we'll check if it's
-// at the dev webpack config is not accidentally run in a production environment
-if (process.env.NODE_ENV === 'production') {
-    checkNodeEnv('development');
-}
-
-const port = process.env.PORT || 4343;
-const manifest = path.resolve(webpackPaths.dllPath, 'renderer.json');
-// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-const requiredByDLLConfig = module.parent!.filename.includes('webpack.config.renderer.dev.dll');
-
-/**
- * Warn if the DLL is not built
- */
-if (!requiredByDLLConfig && !(fs.existsSync(webpackPaths.dllPath) && fs.existsSync(manifest))) {
-    console.log(
-        chalk.black.bgYellow.bold(
-            'The DLL files are missing. Sit back while we build them for you with "npm run build-dll"',
-        ),
-    );
-    execSync('npm run postinstall');
-}
-
-const configuration: webpack.Configuration = {
-    devtool: 'inline-source-map',
-
-    mode: 'development',
-
-    target: ['web', 'electron-renderer'],
-
-    entry: [
-        `webpack-dev-server/client?http://localhost:${port}/dist`,
-        'webpack/hot/only-dev-server',
-        path.join(webpackPaths.srcRendererPath, 'index.tsx'),
-    ],
-
-    output: {
-        path: webpackPaths.distRendererPath,
-        publicPath: '/',
-        filename: 'renderer.dev.js',
-        library: {
-            type: 'umd',
-        },
-    },
-
-    module: {
-        rules: [
-            {
-                test: /\.s?css$/,
-                use: [
-                    'style-loader',
-                    {
-                        loader: 'css-loader',
-                        options: {
-                            modules: {
-                                localIdentName: '[name]__[local]--[hash:base64:5]',
-                                exportLocalsConvention: 'camelCaseOnly',
-                            },
-                            sourceMap: true,
-                            importLoaders: 1,
-                        },
-                    },
-                    'sass-loader',
-                ],
-                include: /\.module\.s?(c|a)ss$/,
-            },
-            {
-                test: /\.s?css$/,
-                use: ['style-loader', 'css-loader', 'sass-loader'],
-                exclude: /\.module\.s?(c|a)ss$/,
-            },
-            // Fonts
-            {
-                test: /\.(woff|woff2|eot|ttf|otf)$/i,
-                type: 'asset/resource',
-            },
-            // Images
-            {
-                test: /\.(png|svg|jpg|jpeg|gif)$/i,
-                type: 'asset/resource',
-            },
-        ],
-    },
-    plugins: [
-        ...(requiredByDLLConfig
-            ? []
-            : [
-                  new webpack.DllReferencePlugin({
-                      context: webpackPaths.dllPath,
-                      manifest: require(manifest),
-                      sourceType: 'var',
-                  }),
-              ]),
-
-        new webpack.NoEmitOnErrorsPlugin(),
-
-        /**
-         * Create global constants which can be configured at compile time.
-         *
-         * Useful for allowing different behaviour between development builds and
-         * release builds
-         *
-         * NODE_ENV should be production so that modules do not perform certain
-         * development checks
-         *
-         * By default, use 'development' as NODE_ENV. This can be overriden with
-         * 'staging', for example, by changing the ENV variables in the npm scripts
-         */
-        new webpack.EnvironmentPlugin({
-            NODE_ENV: 'development',
-        }),
-
-        new webpack.LoaderOptionsPlugin({
-            debug: true,
-        }),
-
-        new ReactRefreshWebpackPlugin(),
-
-        new HtmlWebpackPlugin({
-            filename: path.join('index.html'),
-            template: path.join(webpackPaths.srcRendererPath, 'index.ejs'),
-            minify: {
-                collapseWhitespace: true,
-                removeAttributeQuotes: true,
-                removeComments: true,
-            },
-            isBrowser: false,
-            env: process.env.NODE_ENV,
-            isDevelopment: process.env.NODE_ENV !== 'production',
-            nodeModules: webpackPaths.appNodeModulesPath,
-            templateParameters: {
-                web: false,
-            },
-        }),
-    ],
-
-    node: {
-        __dirname: false,
-        __filename: false,
-    },
-
-    devServer: {
-        port,
-        compress: true,
-        hot: true,
-        headers: { 'Access-Control-Allow-Origin': '*' },
-        static: {
-            publicPath: '/',
-        },
-        historyApiFallback: {
-            verbose: true,
-        },
-        setupMiddlewares(middlewares) {
-            console.log('Starting preload.js builder...');
-            const preloadProcess = spawn('npm', ['run', 'start:preload'], {
-                shell: true,
-                stdio: 'inherit',
-            })
-                .on('close', (code: number) => process.exit(code!))
-                .on('error', (spawnError) => console.error(spawnError));
-
-            console.log('Starting remote.js builder...');
-            const remoteProcess = spawn('npm', ['run', 'start:remote'], {
-                shell: true,
-                stdio: 'inherit',
-            })
-                .on('close', (code: number) => process.exit(code!))
-                .on('error', (spawnError) => console.error(spawnError));
-
-            console.log('Starting Main Process...');
-            spawn('npm', ['run', 'start:main'], {
-                shell: true,
-                stdio: 'inherit',
-            })
-                .on('close', (code: number) => {
-                    preloadProcess.kill();
-                    remoteProcess.kill();
-                    process.exit(code!);
-                })
-                .on('error', (spawnError) => console.error(spawnError));
-            return middlewares;
-        },
-    },
-};
-
-export default merge(baseConfig, configuration);
diff --git a/.erb/configs/webpack.config.renderer.prod.ts b/.erb/configs/webpack.config.renderer.prod.ts
deleted file mode 100644
index 379bb2d0..00000000
--- a/.erb/configs/webpack.config.renderer.prod.ts
+++ /dev/null
@@ -1,137 +0,0 @@
-/**
- * Build config for electron renderer process
- */
-
-import path from 'path';
-
-import CssMinimizerPlugin from 'css-minimizer-webpack-plugin';
-import HtmlWebpackPlugin from 'html-webpack-plugin';
-import MiniCssExtractPlugin from 'mini-css-extract-plugin';
-import TerserPlugin from 'terser-webpack-plugin';
-import webpack from 'webpack';
-import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
-import { merge } from 'webpack-merge';
-
-import checkNodeEnv from '../scripts/check-node-env';
-import deleteSourceMaps from '../scripts/delete-source-maps';
-import baseConfig from './webpack.config.base';
-import webpackPaths from './webpack.paths';
-
-checkNodeEnv('production');
-deleteSourceMaps();
-
-const devtoolsConfig =
-    process.env.DEBUG_PROD === 'true'
-        ? {
-              devtool: 'source-map',
-          }
-        : {};
-
-const configuration: webpack.Configuration = {
-    ...devtoolsConfig,
-
-    mode: 'production',
-
-    target: ['web', 'electron-renderer'],
-
-    entry: [path.join(webpackPaths.srcRendererPath, 'index.tsx')],
-
-    output: {
-        path: webpackPaths.distRendererPath,
-        publicPath: './',
-        filename: 'renderer.js',
-        library: {
-            type: 'umd',
-        },
-    },
-
-    module: {
-        rules: [
-            {
-                test: /\.s?(a|c)ss$/,
-                use: [
-                    MiniCssExtractPlugin.loader,
-                    {
-                        loader: 'css-loader',
-                        options: {
-                            modules: {
-                                localIdentName: '[name]__[local]--[hash:base64:5]',
-                                exportLocalsConvention: 'camelCaseOnly',
-                            },
-                            sourceMap: true,
-                            importLoaders: 1,
-                        },
-                    },
-                    'sass-loader',
-                ],
-                include: /\.module\.s?(c|a)ss$/,
-            },
-            {
-                test: /\.s?(a|c)ss$/,
-                use: [MiniCssExtractPlugin.loader, 'css-loader', 'sass-loader'],
-                exclude: /\.module\.s?(c|a)ss$/,
-            },
-            // Fonts
-            {
-                test: /\.(woff|woff2|eot|ttf|otf)$/i,
-                type: 'asset/resource',
-            },
-            // Images
-            {
-                test: /\.(png|svg|jpg|jpeg|gif)$/i,
-                type: 'asset/resource',
-            },
-        ],
-    },
-
-    optimization: {
-        minimize: true,
-        minimizer: [
-            new TerserPlugin({
-                parallel: true,
-            }),
-            new CssMinimizerPlugin(),
-        ],
-    },
-
-    plugins: [
-        /**
-         * Create global constants which can be configured at compile time.
-         *
-         * Useful for allowing different behaviour between development builds and
-         * release builds
-         *
-         * NODE_ENV should be production so that modules do not perform certain
-         * development checks
-         */
-        new webpack.EnvironmentPlugin({
-            NODE_ENV: 'production',
-            DEBUG_PROD: false,
-        }),
-
-        new MiniCssExtractPlugin({
-            filename: 'style.css',
-        }),
-
-        new BundleAnalyzerPlugin({
-            analyzerMode: process.env.ANALYZE === 'true' ? 'server' : 'disabled',
-        }),
-
-        new HtmlWebpackPlugin({
-            filename: 'index.html',
-            template: path.join(webpackPaths.srcRendererPath, 'index.ejs'),
-            minify: {
-                collapseWhitespace: true,
-                removeAttributeQuotes: true,
-                removeComments: true,
-            },
-            isBrowser: false,
-            isDevelopment: process.env.NODE_ENV !== 'production',
-            templateParameters: {
-                web: false,
-            },
-        }),
-    ],
-};
-
-export default merge(baseConfig, configuration);
diff --git a/.erb/configs/webpack.config.renderer.web.ts b/.erb/configs/webpack.config.renderer.web.ts
deleted file mode 100644
index 82b5f79a..00000000
--- a/.erb/configs/webpack.config.renderer.web.ts
+++ /dev/null
@@ -1,147 +0,0 @@
-import 'webpack-dev-server';
-import path from 'path';
-
-import ReactRefreshWebpackPlugin from '@pmmmwh/react-refresh-webpack-plugin';
-import HtmlWebpackPlugin from 'html-webpack-plugin';
-import webpack from 'webpack';
-import { merge } from 'webpack-merge';
-
-import checkNodeEnv from '../scripts/check-node-env';
-import baseConfig from './webpack.config.base';
-import webpackPaths from './webpack.paths';
-
-// When an ESLint server is running, we can't set the NODE_ENV so we'll check if it's
-// at the dev webpack config is not accidentally run in a production environment
-if (process.env.NODE_ENV === 'production') {
-    checkNodeEnv('development');
-}
-
-const port = process.env.PORT || 4343;
-
-const configuration: webpack.Configuration = {
-    devtool: 'inline-source-map',
-
-    mode: 'development',
-
-    target: ['web', 'electron-renderer'],
-
-    entry: [
-        `webpack-dev-server/client?http://localhost:${port}/dist`,
-        'webpack/hot/only-dev-server',
-        path.join(webpackPaths.srcRendererPath, 'index.tsx'),
-    ],
-
-    output: {
-        path: webpackPaths.distRendererPath,
-        publicPath: '/',
-        filename: 'renderer.dev.js',
-        library: {
-            type: 'umd',
-        },
-    },
-
-    module: {
-        rules: [
-            {
-                test: /\.s?css$/,
-                use: [
-                    'style-loader',
-                    {
-                        loader: 'css-loader',
-                        options: {
-                            modules: {
-                                localIdentName: '[name]__[local]--[hash:base64:5]',
-                                exportLocalsConvention: 'camelCaseOnly',
-                            },
-                            sourceMap: true,
-                            importLoaders: 1,
-                        },
-                    },
-                    'sass-loader',
-                ],
-                include: /\.module\.s?(c|a)ss$/,
-            },
-            {
-                test: /\.s?css$/,
-                use: ['style-loader', 'css-loader', 'sass-loader'],
-                exclude: /\.module\.s?(c|a)ss$/,
-            },
-            // Fonts
-            {
-                test: /\.(woff|woff2|eot|ttf|otf)$/i,
-                type: 'asset/resource',
-            },
-            // Images
-            {
-                test: /\.(png|svg|jpg|jpeg|gif)$/i,
-                type: 'asset/resource',
-            },
-        ],
-    },
-    plugins: [
-        new webpack.NoEmitOnErrorsPlugin(),
-
-        /**
-         * Create global constants which can be configured at compile time.
-         *
-         * Useful for allowing different behaviour between development builds and
-         * release builds
-         *
-         * NODE_ENV should be production so that modules do not perform certain
-         * development checks
-         *
-         * By default, use 'development' as NODE_ENV. This can be overriden with
-         * 'staging', for example, by changing the ENV variables in the npm scripts
-         */
-        new webpack.EnvironmentPlugin({
-            NODE_ENV: 'development',
-        }),
-
-        new webpack.LoaderOptionsPlugin({
-            debug: true,
-        }),
-
-        new ReactRefreshWebpackPlugin(),
-
-        new HtmlWebpackPlugin({
-            filename: path.join('index.html'),
-            template: path.join(webpackPaths.srcRendererPath, 'index.ejs'),
-            favicon: path.join(webpackPaths.assetsPath, 'icons', 'favicon.ico'),
-            minify: {
-                collapseWhitespace: true,
-                removeAttributeQuotes: true,
-                removeComments: true,
-            },
-            isBrowser: false,
-            env: process.env.NODE_ENV,
-            isDevelopment: process.env.NODE_ENV !== 'production',
-            nodeModules: webpackPaths.appNodeModulesPath,
-            templateParameters: {
-                web: false, // with hot reload, we don't have NGINX injecting variables
-            },
-        }),
-    ],
-
-    node: {
-        __dirname: false,
-        __filename: false,
-    },
-
-    devServer: {
-        port,
-        compress: true,
-        hot: true,
-        headers: { 'Access-Control-Allow-Origin': '*' },
-        static: {
-            publicPath: '/',
-        },
-        historyApiFallback: {
-            verbose: true,
-        },
-        setupMiddlewares(middlewares) {
-            return middlewares;
-        },
-    },
-};
-
-export default merge(baseConfig, configuration);
diff --git a/.erb/configs/webpack.config.web.prod.ts b/.erb/configs/webpack.config.web.prod.ts
deleted file mode 100644
index ed935fd6..00000000
--- a/.erb/configs/webpack.config.web.prod.ts
+++ /dev/null
@@ -1,138 +0,0 @@
-/**
- * Build config for electron renderer process
- */
-
-import path from 'path';
-
-import CssMinimizerPlugin from 'css-minimizer-webpack-plugin';
-import HtmlWebpackPlugin from 'html-webpack-plugin';
-import MiniCssExtractPlugin from 'mini-css-extract-plugin';
-import TerserPlugin from 'terser-webpack-plugin';
-import webpack from 'webpack';
-import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
-import { merge } from 'webpack-merge';
-
-import checkNodeEnv from '../scripts/check-node-env';
-import deleteSourceMaps from '../scripts/delete-source-maps';
-import baseConfig from './webpack.config.base';
-import webpackPaths from './webpack.paths';
-
-checkNodeEnv('production');
-deleteSourceMaps();
-
-const devtoolsConfig =
-    process.env.DEBUG_PROD === 'true'
-        ? {
-              devtool: 'source-map',
-          }
-        : {};
-
-const configuration: webpack.Configuration = {
-    ...devtoolsConfig,
-
-    mode: 'production',
-
-    target: ['web'],
-
-    entry: [path.join(webpackPaths.srcRendererPath, 'index.tsx')],
-
-    output: {
-        path: webpackPaths.distWebPath,
-        publicPath: 'auto',
-        filename: 'renderer.js',
-        library: {
-            type: 'umd',
-        },
-    },
-
-    module: {
-        rules: [
-            {
-                test: /\.s?(a|c)ss$/,
-                use: [
-                    MiniCssExtractPlugin.loader,
-                    {
-                        loader: 'css-loader',
-                        options: {
-                            modules: {
-                                localIdentName: '[name]__[local]--[hash:base64:5]',
-                                exportLocalsConvention: 'camelCaseOnly',
-                            },
-                            sourceMap: true,
-                            importLoaders: 1,
-                        },
-                    },
-                    'sass-loader',
-                ],
-                include: /\.module\.s?(c|a)ss$/,
-            },
-            {
-                test: /\.s?(a|c)ss$/,
-                use: [MiniCssExtractPlugin.loader, 'css-loader', 'sass-loader'],
-                exclude: /\.module\.s?(c|a)ss$/,
-            },
-            // Fonts
-            {
-                test: /\.(woff|woff2|eot|ttf|otf)$/i,
-                type: 'asset/resource',
-            },
-            // Images
-            {
-                test: /\.(png|svg|jpg|jpeg|gif)$/i,
-                type: 'asset/resource',
-            },
-        ],
-    },
-
-    optimization: {
-        minimize: true,
-        minimizer: [
-            new TerserPlugin({
-                parallel: true,
-            }),
-            new CssMinimizerPlugin(),
-        ],
-    },
-
-    plugins: [
-        /**
-         * Create global constants which can be configured at compile time.
-         *
-         * Useful for allowing different behaviour between development builds and
-         * release builds
-         *
-         * NODE_ENV should be production so that modules do not perform certain
-         * development checks
-         */
-        new webpack.EnvironmentPlugin({
-            NODE_ENV: 'production',
-            DEBUG_PROD: false,
-        }),
-
-        new MiniCssExtractPlugin({
-            filename: 'style.css',
-        }),
-
-        new BundleAnalyzerPlugin({
-            analyzerMode: process.env.ANALYZE === 'true' ? 'server' : 'disabled',
-        }),
-
-        new HtmlWebpackPlugin({
-            filename: 'index.html',
-            template: path.join(webpackPaths.srcRendererPath, 'index.ejs'),
-            favicon: path.join(webpackPaths.assetsPath, 'icons', 'favicon.ico'),
-            minify: {
-                collapseWhitespace: true,
-                removeAttributeQuotes: true,
-                removeComments: true,
-            },
-            isBrowser: false,
-            isDevelopment: process.env.NODE_ENV !== 'production',
-            templateParameters: {
-                web: true,
-            },
-        }),
-    ],
-};
-
-export default merge(baseConfig, configuration);
diff --git a/.erb/configs/webpack.paths.ts b/.erb/configs/webpack.paths.ts
deleted file mode 100644
index cb1db0cb..00000000
--- a/.erb/configs/webpack.paths.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-const path = require('path');
-
-const rootPath = path.join(__dirname, '../..');
-
-const dllPath = path.join(__dirname, '../dll');
-
-const srcPath = path.join(rootPath, 'src');
-const assetsPath = path.join(rootPath, 'assets');
-const srcMainPath = path.join(srcPath, 'main');
-const srcRemotePath = path.join(srcPath, 'remote');
-const srcRendererPath = path.join(srcPath, 'renderer');
-
-const releasePath = path.join(rootPath, 'release');
-const appPath = path.join(releasePath, 'app');
-const appPackagePath = path.join(appPath, 'package.json');
-const appNodeModulesPath = path.join(appPath, 'node_modules');
-const srcNodeModulesPath = path.join(srcPath, 'node_modules');
-
-const distPath = path.join(appPath, 'dist');
-const distMainPath = path.join(distPath, 'main');
-const distRemotePath = path.join(distPath, 'remote');
-const distRendererPath = path.join(distPath, 'renderer');
-const distWebPath = path.join(distPath, 'web');
-
-const buildPath = path.join(releasePath, 'build');
-
-export default {
-    assetsPath,
-    rootPath,
-    dllPath,
-    srcPath,
-    srcMainPath,
-    srcRemotePath,
-    srcRendererPath,
-    releasePath,
-    appPath,
-    appPackagePath,
-    appNodeModulesPath,
-    srcNodeModulesPath,
-    distPath,
-    distMainPath,
-    distRemotePath,
-    distRendererPath,
-    distWebPath,
-    buildPath,
-};
diff --git a/.erb/mocks/fileMock.js b/.erb/mocks/fileMock.js
deleted file mode 100644
index 602eb23e..00000000
--- a/.erb/mocks/fileMock.js
+++ /dev/null
@@ -1 +0,0 @@
-export default 'test-file-stub';
diff --git a/.erb/scripts/.eslintrc b/.erb/scripts/.eslintrc
deleted file mode 100644
index 35dc618d..00000000
--- a/.erb/scripts/.eslintrc
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "rules": {
-    "no-console": "off",
-    "global-require": "off",
-    "import/no-dynamic-require": "off",
-    "import/no-extraneous-dependencies": "off"
-  }
-}
diff --git a/.erb/scripts/check-build-exists.ts b/.erb/scripts/check-build-exists.ts
deleted file mode 100644
index 1d299a2f..00000000
--- a/.erb/scripts/check-build-exists.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-// Check if the renderer and main bundles are built
-import path from 'path';
-import chalk from 'chalk';
-import fs from 'fs';
-import webpackPaths from '../configs/webpack.paths';
-
-const mainPath = path.join(webpackPaths.distMainPath, 'main.js');
-const remotePath = path.join(webpackPaths.distMainPath, 'remote.js');
-const rendererPath = path.join(webpackPaths.distRendererPath, 'renderer.js');
-
-if (!fs.existsSync(mainPath)) {
-  throw new Error(
-    chalk.whiteBright.bgRed.bold(
-      'The main process is not built yet. Build it by running "npm run build:main"',
-    ),
-  );
-}
-
-if (!fs.existsSync(remotePath)) {
-  throw new Error(
-    chalk.whiteBright.bgRed.bold(
-      'The remote process is not built yet. Build it by running "npm run build:remote"',
-    ),
-  );
-}
-
-if (!fs.existsSync(rendererPath)) {
-  throw new Error(
-    chalk.whiteBright.bgRed.bold(
-      'The renderer process is not built yet. Build it by running "npm run build:renderer"',
-    ),
-  );
-}
diff --git a/.erb/scripts/check-native-dep.js b/.erb/scripts/check-native-dep.js
deleted file mode 100644
index f5a23268..00000000
--- a/.erb/scripts/check-native-dep.js
+++ /dev/null
@@ -1,54 +0,0 @@
-import fs from 'fs';
-import chalk from 'chalk';
-import { execSync } from 'child_process';
-import { dependencies } from '../../package.json';
-
-if (dependencies) {
-  const dependenciesKeys = Object.keys(dependencies);
-  const nativeDeps = fs
-    .readdirSync('node_modules')
-    .filter((folder) => fs.existsSync(`node_modules/${folder}/binding.gyp`));
-  if (nativeDeps.length === 0) {
-    process.exit(0);
-  }
-  try {
-    // Find the reason for why the dependency is installed. If it is installed
-    // because of a devDependency then that is okay. Warn when it is installed
-    // because of a dependency
-    const { dependencies: dependenciesObject } = JSON.parse(
-      execSync(`npm ls ${nativeDeps.join(' ')} --json`).toString()
-    );
-    const rootDependencies = Object.keys(dependenciesObject);
-    const filteredRootDependencies = rootDependencies.filter((rootDependency) =>
-      dependenciesKeys.includes(rootDependency)
-    );
-    if (filteredRootDependencies.length > 0) {
-      const plural = filteredRootDependencies.length > 1;
-      console.log(`
- ${chalk.whiteBright.bgYellow.bold(
-   'Webpack does not work with native dependencies.'
- )}
-${chalk.bold(filteredRootDependencies.join(', '))} ${
-        plural ? 'are native dependencies' : 'is a native dependency'
-      } and should be installed inside of the "./release/app" folder.
- First, uninstall the packages from "./package.json":
-${chalk.whiteBright.bgGreen.bold('npm uninstall your-package')}
- ${chalk.bold(
-   'Then, instead of installing the package to the root "./package.json":'
- )}
-${chalk.whiteBright.bgRed.bold('npm install your-package')}
- ${chalk.bold('Install the package to "./release/app/package.json"')}
-${chalk.whiteBright.bgGreen.bold(
-  'cd ./release/app && npm install your-package'
-)}
- Read more about native dependencies at:
-${chalk.bold(
-  'https://electron-react-boilerplate.js.org/docs/adding-dependencies/#module-structure'
-)}
- `);
-      process.exit(1);
-    }
-  } catch (e) {
-    console.log('Native dependencies could not be checked');
-  }
-}
diff --git a/.erb/scripts/check-node-env.js b/.erb/scripts/check-node-env.js
deleted file mode 100644
index 0e74b115..00000000
--- a/.erb/scripts/check-node-env.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import chalk from 'chalk';
-
-export default function checkNodeEnv(expectedEnv) {
-  if (!expectedEnv) {
-    throw new Error('"expectedEnv" not set');
-  }
-
-  if (process.env.NODE_ENV !== expectedEnv) {
-    console.log(
-      chalk.whiteBright.bgRed.bold(
-        `"process.env.NODE_ENV" must be "${expectedEnv}" to use this webpack config`
-      )
-    );
-    process.exit(2);
-  }
-}
diff --git a/.erb/scripts/check-port-in-use.js b/.erb/scripts/check-port-in-use.js
deleted file mode 100644
index 9d74213d..00000000
--- a/.erb/scripts/check-port-in-use.js
+++ /dev/null
@@ -1,16 +0,0 @@
-import chalk from 'chalk';
-import detectPort from 'detect-port';
-
-const port = process.env.PORT || '4343';
-
-detectPort(port, (err, availablePort) => {
-  if (port !== String(availablePort)) {
-    throw new Error(
-      chalk.whiteBright.bgRed.bold(
-        `Port "${port}" on "localhost" is already in use. Please use another port. ex: PORT=4343 npm start`
-      )
-    );
-  } else {
-    process.exit(0);
-  }
-});
diff --git a/.erb/scripts/clean.js b/.erb/scripts/clean.js
deleted file mode 100644
index b03b0baf..00000000
--- a/.erb/scripts/clean.js
+++ /dev/null
@@ -1,17 +0,0 @@
-import rimraf from 'rimraf';
-import process from 'process';
-import webpackPaths from '../configs/webpack.paths';
-
-const args = process.argv.slice(2);
-const commandMap = {
-  dist: webpackPaths.distPath,
-  release: webpackPaths.releasePath,
-  dll: webpackPaths.dllPath,
-};
-
-args.forEach((x) => {
-  const pathToRemove = commandMap[x];
-  if (pathToRemove !== undefined) {
-    rimraf.sync(pathToRemove);
-  }
-});
diff --git a/.erb/scripts/delete-source-maps.js b/.erb/scripts/delete-source-maps.js
deleted file mode 100644
index 21d6cb58..00000000
--- a/.erb/scripts/delete-source-maps.js
+++ /dev/null
@@ -1,9 +0,0 @@
-import path from 'path';
-import rimraf from 'rimraf';
-import webpackPaths from '../configs/webpack.paths';
-
-export default function deleteSourceMaps() {
-  rimraf.sync(path.join(webpackPaths.distMainPath, '*.js.map'));
-  rimraf.sync(path.join(webpackPaths.distRemotePath, '*.js.map'));
-  rimraf.sync(path.join(webpackPaths.distRendererPath, '*.js.map'));
-}
diff --git a/.erb/scripts/electron-rebuild.js b/.erb/scripts/electron-rebuild.js
deleted file mode 100644
index 0bea3279..00000000
--- a/.erb/scripts/electron-rebuild.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import { execSync } from 'child_process';
-import fs from 'fs';
-import { dependencies } from '../../release/app/package.json';
-import webpackPaths from '../configs/webpack.paths';
-
-if (
-  Object.keys(dependencies || {}).length > 0 &&
-  fs.existsSync(webpackPaths.appNodeModulesPath)
-) {
-  const electronRebuildCmd =
-    '../../node_modules/.bin/electron-rebuild --force --types prod,dev,optional --module-dir .';
-  const cmd =
-    process.platform === 'win32'
-      ? electronRebuildCmd.replace(/\//g, '\\')
-      : electronRebuildCmd;
-  execSync(cmd, {
-    cwd: webpackPaths.appPath,
-    stdio: 'inherit',
-  });
-}
diff --git a/.erb/scripts/link-modules.ts b/.erb/scripts/link-modules.ts
deleted file mode 100644
index 6cc31e66..00000000
--- a/.erb/scripts/link-modules.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import fs from 'fs';
-import webpackPaths from '../configs/webpack.paths';
-
-const { srcNodeModulesPath } = webpackPaths;
-const { appNodeModulesPath } = webpackPaths;
-
-if (!fs.existsSync(srcNodeModulesPath) && fs.existsSync(appNodeModulesPath)) {
-  fs.symlinkSync(appNodeModulesPath, srcNodeModulesPath, 'junction');
-}
diff --git a/.erb/scripts/notarize.js b/.erb/scripts/notarize.js
deleted file mode 100644
index 4fd3bb8f..00000000
--- a/.erb/scripts/notarize.js
+++ /dev/null
@@ -1,30 +0,0 @@
-const { notarize } = require('electron-notarize');
-const { build } = require('../../package.json');
-
-exports.default = async function notarizeMacos(context) {
-  const { electronPlatformName, appOutDir } = context;
-  if (electronPlatformName !== 'darwin') {
-    return;
-  }
-
-  if (process.env.CI !== 'true') {
-    console.warn('Skipping notarizing step. Packaging is not running in CI');
-    return;
-  }
-
-  if (!('APPLE_ID' in process.env && 'APPLE_ID_PASS' in process.env)) {
-    console.warn(
-      'Skipping notarizing step. APPLE_ID and APPLE_ID_PASS env variables must be set'
-    );
-    return;
-  }
-
-  const appName = context.packager.appInfo.productFilename;
-
-  await notarize({
-    appBundleId: build.appId,
-    appPath: `${appOutDir}/${appName}.app`,
-    appleId: process.env.APPLE_ID,
-    appleIdPassword: process.env.APPLE_ID_PASS,
-  });
-};
diff --git a/.eslintignore b/.eslintignore
deleted file mode 100644
index 19391098..00000000
--- a/.eslintignore
+++ /dev/null
@@ -1,34 +0,0 @@
-# Logs
-logs
-*.log
-
-# Runtime data
-pids
-*.pid
-*.seed
-
-# Coverage directory used by tools like istanbul
-coverage
-.eslintcache
-
-# Dependency directory
-# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
-node_modules
-
-# OSX
-.DS_Store
-
-src/i18n
-release/app/dist
-release/build
-.erb/dll
-
-.idea
-npm-debug.log.*
-*.css.d.ts
-*.sass.d.ts
-*.scss.d.ts
-
-# eslint ignores hidden directories by default:
-# https://github.com/eslint/eslint/issues/8429
-!.erb
diff --git a/.eslintrc.js b/.eslintrc.js
deleted file mode 100644
index ecc54801..00000000
--- a/.eslintrc.js
+++ /dev/null
@@ -1,97 +0,0 @@
-module.exports = {
-    extends: ['erb', 'plugin:typescript-sort-keys/recommended'],
-    ignorePatterns: ['.erb/*', 'server'],
-    parser: '@typescript-eslint/parser',
-    parserOptions: {
-        createDefaultProgram: true,
-        ecmaVersion: 12,
-        parser: '@typescript-eslint/parser',
-        project: './tsconfig.json',
-        sourceType: 'module',
-        tsconfigRootDir: './',
-    },
-    plugins: ['@typescript-eslint', 'import', 'sort-keys-fix'],
-    rules: {
-        '@typescript-eslint/naming-convention': 'off',
-        '@typescript-eslint/no-explicit-any': 'off',
-        '@typescript-eslint/no-non-null-assertion': 'off',
-        '@typescript-eslint/no-shadow': ['off'],
-        '@typescript-eslint/no-unused-vars': ['error'],
-        '@typescript-eslint/no-use-before-define': ['error'],
-        'default-case': 'off',
-        'import/extensions': 'off',
-        'import/no-absolute-path': 'off',
-        // A temporary hack related to IDE not resolving correct package.json
-        'import/no-extraneous-dependencies': 'off',
-        'import/no-unresolved': 'error',
-        'import/order': [
-            'error',
-            {
-                alphabetize: {
-                    caseInsensitive: true,
-                    order: 'asc',
-                },
-                groups: ['builtin', 'external', 'internal', ['parent', 'sibling']],
-                'newlines-between': 'never',
-                pathGroups: [
-                    {
-                        group: 'external',
-                        pattern: 'react',
-                        position: 'before',
-                    },
-                ],
-                pathGroupsExcludedImportTypes: ['react'],
-            },
-        ],
-        'import/prefer-default-export': 'off',
-        'jsx-a11y/click-events-have-key-events': 'off',
-        'jsx-a11y/interactive-supports-focus': 'off',
-        'jsx-a11y/media-has-caption': 'off',
-        'no-await-in-loop': 'off',
-        'no-console': 'off',
-        'no-nested-ternary': 'off',
-        'no-restricted-syntax': 'off',
-        'no-shadow': 'off',
-        'no-underscore-dangle': 'off',
-        'no-unused-vars': 'off',
-        'no-use-before-define': 'off',
-        'prefer-destructuring': 'off',
-        'react/function-component-definition': 'off',
-        'react/jsx-filename-extension': [2, { extensions: ['.js', '.jsx', '.ts', '.tsx'] }],
-        'react/jsx-no-useless-fragment': 'off',
-        'react/jsx-props-no-spreading': 'off',
-        'react/jsx-sort-props': [
-            'error',
-            {
-                callbacksLast: true,
-                ignoreCase: false,
-                noSortAlphabetically: false,
-                reservedFirst: true,
-                shorthandFirst: true,
-                shorthandLast: false,
-            },
-        ],
-        'react/no-array-index-key': 'off',
-        'react/react-in-jsx-scope': 'off',
-        'react/require-default-props': 'off',
-        'sort-keys-fix/sort-keys-fix': 'warn',
-    },
-    settings: {
-        'import/parsers': {
-            '@typescript-eslint/parser': ['.ts', '.tsx'],
-        },
-        'import/resolver': {
-            // See https://github.com/benmosher/eslint-plugin-import/issues/1396#issuecomment-575727774 for line below
-            node: {
-                extensions: ['.js', '.jsx', '.ts', '.tsx'],
-            },
-            typescript: {
-                alwaysTryTypes: true,
-                project: './tsconfig.json',
-            },
-            webpack: {
-                config: require.resolve('./.erb/configs/webpack.config.eslint.ts'),
-            },
-        },
-    },
-};
diff --git a/.gitignore b/.gitignore
index c19e33ce..75ef73cd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,31 +1,6 @@
-# Logs
-logs
-*.log
-
-# Runtime data
-pids
-*.pid
-*.seed
-
-# Coverage directory used by tools like istanbul
-coverage
-.eslintcache
-
-# Dependency directory
-# https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
 node_modules
-
-# OSX
+dist
+out
 .DS_Store
-
-release/app/dist
-release/build
-.erb/dll
-
-.idea
-npm-debug.log.*
-*.css.d.ts
-*.sass.d.ts
-*.scss.d.ts
-
-.env*
+.eslintcache
+*.log*
diff --git a/.husky/pre-commit b/.husky/pre-commit
deleted file mode 100755
index 36af2198..00000000
--- a/.husky/pre-commit
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
-npx lint-staged
diff --git a/.prettierignore b/.prettierignore
new file mode 100644
index 00000000..9c6b791d
--- /dev/null
+++ b/.prettierignore
@@ -0,0 +1,6 @@
+out
+dist
+pnpm-lock.yaml
+LICENSE.md
+tsconfig.json
+tsconfig.*.json
diff --git a/.prettierrc b/.prettierrc
deleted file mode 100644
index d0e0490c..00000000
--- a/.prettierrc
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "printWidth": 100,
-    "semi": true,
-    "singleQuote": true,
-    "tabWidth": 4,
-    "useTabs": false,
-    "overrides": [
-        {
-            "files": ["**/*.css", "**/*.scss", "**/*.html"],
-            "options": {
-                "singleQuote": true
-            }
-        }
-    ],
-    "trailingComma": "all",
-    "bracketSpacing": true,
-    "arrowParens": "always",
-    "proseWrap": "never",
-    "htmlWhitespaceSensitivity": "strict",
-    "endOfLine": "lf",
-    "singleAttributePerLine": true
-}
diff --git a/.prettierrc.yaml b/.prettierrc.yaml
new file mode 100644
index 00000000..357f740e
--- /dev/null
+++ b/.prettierrc.yaml
@@ -0,0 +1,12 @@
+singleQuote: true
+semi: true
+printWidth: 100
+tabWidth: 4
+trailingComma: all
+useTabs: false
+arrowParens: always
+proseWrap: never
+htmlWhitespaceSensitivity: strict
+endOfLine: lf
+singleAttributePerLine: true
+bracketSpacing: true
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index c10cabc4..940260d8 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,10 +1,3 @@
 {
-    "recommendations": [
-        "dbaeumer.vscode-eslint",
-        "EditorConfig.EditorConfig",
-        "stylelint.vscode-stylelint",
-        "esbenp.prettier-vscode",
-        "clinyong.vscode-css-modules",
-        "Huuums.vscode-fast-folder-structure"
-    ]
+  "recommendations": ["dbaeumer.vscode-eslint"]
 }
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 9c06cf39..0b6b9a64 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -1,28 +1,39 @@
 {
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "Electron: Main",
-            "type": "node",
-            "request": "launch",
-            "protocol": "inspector",
-            "runtimeExecutable": "npm",
-            "runtimeArgs": ["run start:main --inspect=5858 --remote-debugging-port=9223"],
-            "preLaunchTask": "Start Webpack Dev"
-        },
-        {
-            "name": "Electron: Renderer",
-            "type": "chrome",
-            "request": "attach",
-            "port": 9223,
-            "webRoot": "${workspaceFolder}",
-            "timeout": 15000
-        }
-    ],
-    "compounds": [
-        {
-            "name": "Electron: All",
-            "configurations": ["Electron: Main", "Electron: Renderer"]
-        }
-    ]
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Debug Main Process",
+      "type": "node",
+      "request": "launch",
+      "cwd": "${workspaceRoot}",
+      "runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron-vite",
+      "windows": {
+        "runtimeExecutable": "${workspaceRoot}/node_modules/.bin/electron-vite.cmd"
+      },
+      "runtimeArgs": ["--sourcemap"],
+      "env": {
+        "REMOTE_DEBUGGING_PORT": "9222"
+      }
+    },
+    {
+      "name": "Debug Renderer Process",
+      "port": 9222,
+      "request": "attach",
+      "type": "chrome",
+      "webRoot": "${workspaceFolder}/src/renderer",
+      "timeout": 60000,
+      "presentation": {
+        "hidden": true
+      }
+    }
+  ],
+  "compounds": [
+    {
+      "name": "Debug All",
+      "configurations": ["Debug Main Process", "Debug Renderer Process"],
+      "presentation": {
+        "order": 1
+      }
+    }
+  ]
 }
diff --git a/.vscode/settings.json b/.vscode/settings.json
index 04145377..89839241 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,4 +1,13 @@
 {
+    "[typescript]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode"
+    },
+    "[javascript]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode"
+    },
+    "[json]": {
+        "editor.defaultFormatter": "esbenp.prettier-vscode"
+    },
     "files.associations": {
         ".eslintrc": "jsonc",
         ".prettierrc": "jsonc",
@@ -40,7 +49,6 @@
     "typescript.preferences.importModuleSpecifier": "non-relative",
     "stylelint.validate": ["css", "scss", "typescript", "typescriptreact"],
     "typescript.updateImportsOnFileMove.enabled": "always",
-    "[typescript]": { "editor.defaultFormatter": "esbenp.prettier-vscode" },
     "[typescriptreact]": { "editor.defaultFormatter": "esbenp.prettier-vscode" },
     "typescript.format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": true,
     "folderTemplates.structures": [
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
deleted file mode 100644
index e0c639bd..00000000
--- a/.vscode/tasks.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "version": "2.0.0",
-    "tasks": [
-        {
-            "type": "npm",
-            "label": "Start Webpack Dev",
-            "script": "start:renderer",
-            "options": {
-                "cwd": "${workspaceFolder}"
-            },
-            "isBackground": true,
-            "problemMatcher": {
-                "owner": "custom",
-                "pattern": {
-                    "regexp": "____________"
-                },
-                "background": {
-                    "activeOnStart": true,
-                    "beginsPattern": "Compiling\\.\\.\\.$",
-                    "endsPattern": "(Compiled successfully|Failed to compile)\\.$"
-                }
-            }
-        }
-    ]
-}
diff --git a/build/entitlements.mac.plist b/build/entitlements.mac.plist
new file mode 100644
index 00000000..38c887b2
--- /dev/null
+++ b/build/entitlements.mac.plist
@@ -0,0 +1,12 @@
+<?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>com.apple.security.cs.allow-jit</key>
+    <true/>
+    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+    <true/>
+    <key>com.apple.security.cs.allow-dyld-environment-variables</key>
+    <true/>
+  </dict>
+</plist>
diff --git a/build/icon.icns b/build/icon.icns
new file mode 100644
index 00000000..93da8771
Binary files /dev/null and b/build/icon.icns differ
diff --git a/build/icon.ico b/build/icon.ico
new file mode 100644
index 00000000..1e9d1e04
Binary files /dev/null and b/build/icon.ico differ
diff --git a/build/icon.png b/build/icon.png
new file mode 100644
index 00000000..f364f2c1
Binary files /dev/null and b/build/icon.png differ
diff --git a/dev-app-update.yml b/dev-app-update.yml
new file mode 100644
index 00000000..44ae7a59
--- /dev/null
+++ b/dev-app-update.yml
@@ -0,0 +1,3 @@
+provider: generic
+url: https://example.com/auto-updates
+updaterCacheDirName: feishin-updater
diff --git a/electron-builder.yml b/electron-builder.yml
new file mode 100644
index 00000000..97210c58
--- /dev/null
+++ b/electron-builder.yml
@@ -0,0 +1,43 @@
+appId: com.electron.app
+productName: feishin
+directories:
+    buildResources: build
+files:
+    - '!**/.vscode/*'
+    - '!src/*'
+    - '!electron.vite.config.{js,ts,mjs,cjs}'
+    - '!{.eslintcache,eslint.config.mjs,.prettierignore,.prettierrc.yaml,dev-app-update.yml,CHANGELOG.md,README.md}'
+    - '!{.env,.env.*,.npmrc,pnpm-lock.yaml}'
+    - '!{tsconfig.json,tsconfig.node.json,tsconfig.web.json}'
+asarUnpack:
+    - resources/**
+win:
+    executableName: feishin
+nsis:
+    artifactName: ${name}-${version}-setup.${ext}
+    shortcutName: ${productName}
+    uninstallDisplayName: ${productName}
+    createDesktopShortcut: always
+mac:
+    entitlementsInherit: build/entitlements.mac.plist
+    extendInfo:
+        - NSCameraUsageDescription: Application requests access to the device's camera.
+        - NSMicrophoneUsageDescription: Application requests access to the device's microphone.
+        - NSDocumentsFolderUsageDescription: Application requests access to the user's Documents folder.
+        - NSDownloadsFolderUsageDescription: Application requests access to the user's Downloads folder.
+    notarize: false
+dmg:
+    artifactName: ${name}-${version}.${ext}
+linux:
+    target:
+        - AppImage
+        - snap
+        - deb
+    maintainer: electronjs.org
+    category: Utility
+appImage:
+    artifactName: ${name}-${version}.${ext}
+npmRebuild: false
+publish:
+    provider: generic
+    url: https://example.com/auto-updates
diff --git a/electron.vite.config.ts b/electron.vite.config.ts
new file mode 100644
index 00000000..c338aacc
--- /dev/null
+++ b/electron.vite.config.ts
@@ -0,0 +1,35 @@
+import react from '@vitejs/plugin-react';
+import { externalizeDepsPlugin, UserConfig } from 'electron-vite';
+import { resolve } from 'path';
+
+const config: UserConfig = {
+    main: {
+        plugins: [externalizeDepsPlugin()],
+    },
+    preload: {
+        plugins: [externalizeDepsPlugin()],
+    },
+    renderer: {
+        css: {
+            modules: {
+                generateScopedName: '[name]__[local]__[hash:base64:5]',
+                localsConvention: 'camelCase',
+            },
+        },
+        plugins: [react()],
+        resolve: {
+            alias: {
+                '/@/i18n': resolve('src/i18n'),
+                '/@/main': resolve('src/main'),
+                '/@/renderer': resolve('src/renderer'),
+                '/@/renderer/api': resolve('src/renderer/api'),
+                '/@/renderer/components': resolve('src/renderer/components'),
+                '/@/renderer/features': resolve('src/renderer/features'),
+                '/@/renderer/hooks': resolve('src/renderer/hooks'),
+                '/@/shared': resolve('src/shared'),
+            },
+        },
+    },
+};
+
+export default config;
diff --git a/eslint.config.mjs b/eslint.config.mjs
new file mode 100644
index 00000000..b286f9b3
--- /dev/null
+++ b/eslint.config.mjs
@@ -0,0 +1,48 @@
+import eslintConfigPrettier from '@electron-toolkit/eslint-config-prettier';
+import tseslint from '@electron-toolkit/eslint-config-ts';
+import perfectionist from 'eslint-plugin-perfectionist';
+import eslintPluginReact from 'eslint-plugin-react';
+import eslintPluginReactHooks from 'eslint-plugin-react-hooks';
+import eslintPluginReactRefresh from 'eslint-plugin-react-refresh';
+
+export default tseslint.config(
+    { ignores: ['**/node_modules', '**/dist', '**/out'] },
+    tseslint.configs.recommended,
+    perfectionist.configs['recommended-natural'],
+    eslintPluginReact.configs.flat.recommended,
+    eslintPluginReact.configs.flat['jsx-runtime'],
+    {
+        settings: {
+            react: {
+                version: 'detect',
+            },
+        },
+    },
+    {
+        files: ['**/*.{ts,tsx}'],
+        plugins: {
+            'react-hooks': eslintPluginReactHooks,
+            'react-refresh': eslintPluginReactRefresh,
+        },
+        rules: {
+            ...eslintPluginReactHooks.configs.recommended.rules,
+            ...eslintPluginReactRefresh.configs.vite.rules,
+            '@typescript-eslint/explicit-function-return-type': 'off',
+            '@typescript-eslint/no-unused-vars': 'warn',
+            curly: ['error', 'all'],
+            indent: [
+                'error',
+                'tab',
+                {
+                    offsetTernaryExpressions: true,
+                    SwitchCase: 1,
+                },
+            ],
+            'no-unused-vars': 'off',
+            'no-use-before-define': 'off',
+            quotes: ['error', 'single'],
+            semi: ['error', 'always'],
+        },
+    },
+    eslintConfigPrettier,
+);
diff --git a/ng.conf.template b/ng.conf.template
deleted file mode 100644
index eb46ff72..00000000
--- a/ng.conf.template
+++ /dev/null
@@ -1,27 +0,0 @@
-server {
-  listen 9180;
-  sendfile on;
-  default_type application/octet-stream;
-
-  gzip on;
-  gzip_http_version 1.1;
-  gzip_disable      "MSIE [1-6]\.";
-  gzip_min_length   256;
-  gzip_vary         on;
-  gzip_proxied      expired no-cache no-store private auth;
-  gzip_types        text/plain text/css application/json application/javascript application/x-javascript text/xml application/xml application/xml+rss text/javascript;
-  gzip_comp_level   9;
-
-  location ${PUBLIC_PATH} {
-    alias /usr/share/nginx/html/;
-    try_files $uri $uri/ /index.html =404;
-  }
-
-  location ${PUBLIC_PATH}settings.js {
-    alias /etc/nginx/conf.d/settings.js;
-  }
-
-  location ${PUBLIC_PATH}/settings.js {
-    alias /etc/nginx/conf.d/settings.js;
-  }
-}
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 2f03474d..9bf65edf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,13 +8,14 @@
             "name": "feishin",
             "version": "0.13.0",
             "hasInstallScript": true,
-            "license": "GPL-3.0",
             "dependencies": {
                 "@ag-grid-community/client-side-row-model": "^28.2.1",
                 "@ag-grid-community/core": "^28.2.1",
                 "@ag-grid-community/infinite-row-model": "^28.2.1",
                 "@ag-grid-community/react": "^28.2.1",
                 "@ag-grid-community/styles": "^28.2.1",
+                "@electron-toolkit/preload": "^3.0.1",
+                "@electron-toolkit/utils": "^4.0.0",
                 "@emotion/react": "^11.10.4",
                 "@mantine/core": "^6.0.17",
                 "@mantine/dates": "^6.0.17",
@@ -31,6 +32,7 @@
                 "audiomotion-analyzer": "^4.5.0",
                 "auto-text-size": "^0.2.3",
                 "axios": "^1.6.0",
+                "cheerio": "^1.0.0",
                 "clsx": "^2.0.0",
                 "cmdk": "^0.2.0",
                 "dayjs": "^1.11.6",
@@ -39,7 +41,7 @@
                 "electron-localshortcut": "^3.2.1",
                 "electron-log": "^5.1.1",
                 "electron-store": "^8.1.0",
-                "electron-updater": "^6.3.1",
+                "electron-updater": "^6.3.9",
                 "fast-average-color": "^9.3.0",
                 "format-duration": "^2.0.0",
                 "framer-motion": "^11.0.0",
@@ -52,11 +54,12 @@
                 "lodash": "^4.17.21",
                 "md5": "^2.3.0",
                 "memoize-one": "^6.0.0",
+                "mpris-service": "^2.1.2",
                 "nanoid": "^3.3.3",
                 "net": "^1.0.2",
                 "node-mpv": "github:jeffvli/Node-MPV#32b4d64395289ad710c41d481d2707a7acfc228f",
-                "overlayscrollbars": "^2.2.1",
-                "overlayscrollbars-react": "^0.5.1",
+                "overlayscrollbars": "^2.11.1",
+                "overlayscrollbars-react": "^0.5.6",
                 "react": "^18.2.0",
                 "react-dom": "^18.2.0",
                 "react-error-boundary": "^3.1.4",
@@ -72,10 +75,14 @@
                 "semver": "^7.5.4",
                 "styled-components": "^6.0.8",
                 "swiper": "^9.3.1",
+                "ws": "^8.18.2",
                 "zod": "^3.22.3",
                 "zustand": "^4.3.9"
             },
             "devDependencies": {
+                "@electron-toolkit/eslint-config-prettier": "^3.0.0",
+                "@electron-toolkit/eslint-config-ts": "^3.0.0",
+                "@electron-toolkit/tsconfig": "^1.0.1",
                 "@electron/rebuild": "^3.6.0",
                 "@pmmmwh/react-refresh-webpack-plugin": "0.5.5",
                 "@stylelint/postcss-css-in-js": "^0.38.0",
@@ -87,9 +94,9 @@
                 "@types/jest": "^27.4.1",
                 "@types/lodash": "^4.14.188",
                 "@types/md5": "^2.3.2",
-                "@types/node": "^17.0.23",
-                "@types/react": "^18.0.25",
-                "@types/react-dom": "^18.0.8",
+                "@types/node": "^22.14.1",
+                "@types/react": "^19.1.1",
+                "@types/react-dom": "^19.1.2",
                 "@types/react-test-renderer": "^17.0.1",
                 "@types/react-virtualized-auto-sizer": "^1.0.1",
                 "@types/react-window": "^1.8.5",
@@ -100,6 +107,7 @@
                 "@types/webpack-env": "^1.16.3",
                 "@typescript-eslint/eslint-plugin": "^5.47.0",
                 "@typescript-eslint/parser": "^5.47.0",
+                "@vitejs/plugin-react": "^4.3.4",
                 "browserslist-config-erb": "^0.0.3",
                 "chalk": "^4.1.2",
                 "concurrently": "^7.1.0",
@@ -108,12 +116,13 @@
                 "css-loader": "^6.7.1",
                 "css-minimizer-webpack-plugin": "^3.4.1",
                 "detect-port": "^1.3.0",
-                "electron": "^36.1.0",
-                "electron-builder": "^24.13.3",
+                "electron": "^35.1.5",
+                "electron-builder": "^25.1.8",
                 "electron-devtools-installer": "^3.2.0",
                 "electron-notarize": "^1.2.1",
+                "electron-vite": "^3.1.0",
                 "electronmon": "^2.0.2",
-                "eslint": "^8.30.0",
+                "eslint": "^9.24.0",
                 "eslint-config-airbnb-base": "^15.0.0",
                 "eslint-config-erb": "^4.0.3",
                 "eslint-import-resolver-typescript": "^2.7.1",
@@ -122,9 +131,12 @@
                 "eslint-plugin-import": "^2.26.0",
                 "eslint-plugin-jest": "^26.1.3",
                 "eslint-plugin-jsx-a11y": "^6.5.1",
+                "eslint-plugin-perfectionist": "^4.13.0",
+                "eslint-plugin-prettier": "^5.4.0",
                 "eslint-plugin-promise": "^6.0.0",
-                "eslint-plugin-react": "^7.29.4",
-                "eslint-plugin-react-hooks": "^4.4.0",
+                "eslint-plugin-react": "^7.37.5",
+                "eslint-plugin-react-hooks": "^5.2.0",
+                "eslint-plugin-react-refresh": "^0.4.19",
                 "eslint-plugin-sort-keys-fix": "^1.1.2",
                 "eslint-plugin-typescript-sort-keys": "^2.1.0",
                 "file-loader": "^6.2.0",
@@ -138,12 +150,15 @@
                 "postcss-scss": "^4.0.4",
                 "postcss-styled-syntax": "^0.5.0",
                 "postcss-syntax": "^0.36.2",
-                "prettier": "^3.3.3",
+                "prettier": "^3.5.3",
+                "react": "^19.1.0",
+                "react-dom": "^19.1.0",
                 "react-refresh": "^0.12.0",
                 "react-refresh-typescript": "^2.0.4",
                 "react-test-renderer": "^18.0.0",
                 "rimraf": "^3.0.2",
                 "sass": "^1.49.11",
+                "sass-embedded": "^1.89.0",
                 "sass-loader": "^12.6.0",
                 "style-loader": "^3.3.1",
                 "stylelint": "^15.10.3",
@@ -158,9 +173,10 @@
                 "ts-node": "^10.9.2",
                 "tsconfig-paths-webpack-plugin": "^4.0.0",
                 "tsx": "^4.16.2",
-                "typescript": "^5.2.2",
+                "typescript": "^5.8.3",
                 "typescript-plugin-styled-components": "^3.0.0",
                 "url-loader": "^4.1.1",
+                "vite": "^6.2.6",
                 "webpack": "^5.94.0",
                 "webpack-bundle-analyzer": "^4.5.0",
                 "webpack-cli": "^4.9.2",
@@ -234,23 +250,23 @@
             }
         },
         "node_modules/@babel/code-frame": {
-            "version": "7.26.2",
-            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz",
-            "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==",
+            "version": "7.27.1",
+            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz",
+            "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==",
             "license": "MIT",
             "dependencies": {
-                "@babel/helper-validator-identifier": "^7.25.9",
+                "@babel/helper-validator-identifier": "^7.27.1",
                 "js-tokens": "^4.0.0",
-                "picocolors": "^1.0.0"
+                "picocolors": "^1.1.1"
             },
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/compat-data": {
-            "version": "7.26.8",
-            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.8.tgz",
-            "integrity": "sha512-oH5UPLMWR3L2wEFLnFJ1TZXqHufiTKAiLfqw5zkhS4dKXLJ10yVztfil/twG8EDTA4F/tvVNw9nOl4ZMslB8rQ==",
+            "version": "7.27.2",
+            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.27.2.tgz",
+            "integrity": "sha512-TUtMJYRPyUb/9aU8f3K0mjmjf6M9N5Woshn2CS6nqJSeJtTtQcpLUXjGt9vbF8ZGff0El99sWkLgzwW3VXnxZQ==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -258,22 +274,22 @@
             }
         },
         "node_modules/@babel/core": {
-            "version": "7.26.10",
-            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.26.10.tgz",
-            "integrity": "sha512-vMqyb7XCDMPvJFFOaT9kxtiRh42GwlZEg1/uIgtZshS5a/8OaduUfCi7kynKgc3Tw/6Uo2D+db9qBttghhmxwQ==",
+            "version": "7.27.1",
+            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.27.1.tgz",
+            "integrity": "sha512-IaaGWsQqfsQWVLqMn9OB92MNN7zukfVA4s7KKAI0KfrrDsZ0yhi5uV4baBuLuN7n3vsZpwP8asPPcVwApxvjBQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@ampproject/remapping": "^2.2.0",
-                "@babel/code-frame": "^7.26.2",
-                "@babel/generator": "^7.26.10",
-                "@babel/helper-compilation-targets": "^7.26.5",
-                "@babel/helper-module-transforms": "^7.26.0",
-                "@babel/helpers": "^7.26.10",
-                "@babel/parser": "^7.26.10",
-                "@babel/template": "^7.26.9",
-                "@babel/traverse": "^7.26.10",
-                "@babel/types": "^7.26.10",
+                "@babel/code-frame": "^7.27.1",
+                "@babel/generator": "^7.27.1",
+                "@babel/helper-compilation-targets": "^7.27.1",
+                "@babel/helper-module-transforms": "^7.27.1",
+                "@babel/helpers": "^7.27.1",
+                "@babel/parser": "^7.27.1",
+                "@babel/template": "^7.27.1",
+                "@babel/traverse": "^7.27.1",
+                "@babel/types": "^7.27.1",
                 "convert-source-map": "^2.0.0",
                 "debug": "^4.1.0",
                 "gensync": "^1.0.0-beta.2",
@@ -306,13 +322,13 @@
             }
         },
         "node_modules/@babel/generator": {
-            "version": "7.27.0",
-            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.27.0.tgz",
-            "integrity": "sha512-VybsKvpiN1gU1sdMZIp7FcqphVVKEwcuj02x73uvcHE0PTihx1nlBcowYWhDwjpoAXRv43+gDzyggGnn1XZhVw==",
+            "version": "7.27.1",
+            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.27.1.tgz",
+            "integrity": "sha512-UnJfnIpc/+JO0/+KRVQNGU+y5taA5vCbwN8+azkX6beii/ZF+enZJSOKo11ZSzGJjlNfJHfQtmQT8H+9TXPG2w==",
             "license": "MIT",
             "dependencies": {
-                "@babel/parser": "^7.27.0",
-                "@babel/types": "^7.27.0",
+                "@babel/parser": "^7.27.1",
+                "@babel/types": "^7.27.1",
                 "@jridgewell/gen-mapping": "^0.3.5",
                 "@jridgewell/trace-mapping": "^0.3.25",
                 "jsesc": "^3.0.2"
@@ -322,14 +338,14 @@
             }
         },
         "node_modules/@babel/helper-compilation-targets": {
-            "version": "7.27.0",
-            "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.0.tgz",
-            "integrity": "sha512-LVk7fbXml0H2xH34dFzKQ7TDZ2G4/rVTOrq9V+icbbadjbVxxeFeDsNHv2SrZeWoA+6ZiTyWYWtScEIW07EAcA==",
+            "version": "7.27.2",
+            "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.2.tgz",
+            "integrity": "sha512-2+1thGUUWWjLTYTHZWK1n8Yga0ijBz1XAhUXcKy81rd5g6yh7hGqMp45v7cadSbEHc9G3OTv45SyneRN3ps4DQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/compat-data": "^7.26.8",
-                "@babel/helper-validator-option": "^7.25.9",
+                "@babel/compat-data": "^7.27.2",
+                "@babel/helper-validator-option": "^7.27.1",
                 "browserslist": "^4.24.0",
                 "lru-cache": "^5.1.1",
                 "semver": "^6.3.1"
@@ -349,28 +365,28 @@
             }
         },
         "node_modules/@babel/helper-module-imports": {
-            "version": "7.25.9",
-            "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz",
-            "integrity": "sha512-tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==",
+            "version": "7.27.1",
+            "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.27.1.tgz",
+            "integrity": "sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w==",
             "license": "MIT",
             "dependencies": {
-                "@babel/traverse": "^7.25.9",
-                "@babel/types": "^7.25.9"
+                "@babel/traverse": "^7.27.1",
+                "@babel/types": "^7.27.1"
             },
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/helper-module-transforms": {
-            "version": "7.26.0",
-            "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz",
-            "integrity": "sha512-xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==",
+            "version": "7.27.1",
+            "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.27.1.tgz",
+            "integrity": "sha512-9yHn519/8KvTU5BjTVEEeIM3w9/2yXNKoD82JifINImhpKkARMJKPP59kLo+BafpdN5zgNeIcS4jsGDmd3l58g==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/helper-module-imports": "^7.25.9",
-                "@babel/helper-validator-identifier": "^7.25.9",
-                "@babel/traverse": "^7.25.9"
+                "@babel/helper-module-imports": "^7.27.1",
+                "@babel/helper-validator-identifier": "^7.27.1",
+                "@babel/traverse": "^7.27.1"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -380,9 +396,9 @@
             }
         },
         "node_modules/@babel/helper-plugin-utils": {
-            "version": "7.26.5",
-            "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.26.5.tgz",
-            "integrity": "sha512-RS+jZcRdZdRFzMyr+wcsaqOmld1/EqTghfaBGQQd/WnRdzdlvSZ//kF7U8VQTxf1ynZ4cjUcYgjVGx13ewNPMg==",
+            "version": "7.27.1",
+            "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.27.1.tgz",
+            "integrity": "sha512-1gn1Up5YXka3YYAHGKpbideQ5Yjf1tDa9qYcgysz+cNCXukyLl6DjPXhD3VRwSb8c0J9tA4b2+rHEZtc6R0tlw==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -390,27 +406,27 @@
             }
         },
         "node_modules/@babel/helper-string-parser": {
-            "version": "7.25.9",
-            "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
-            "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",
+            "version": "7.27.1",
+            "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
+            "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==",
             "license": "MIT",
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/helper-validator-identifier": {
-            "version": "7.25.9",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
-            "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
+            "version": "7.27.1",
+            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz",
+            "integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==",
             "license": "MIT",
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/helper-validator-option": {
-            "version": "7.25.9",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz",
-            "integrity": "sha512-e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==",
+            "version": "7.27.1",
+            "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz",
+            "integrity": "sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -418,26 +434,26 @@
             }
         },
         "node_modules/@babel/helpers": {
-            "version": "7.27.0",
-            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.27.0.tgz",
-            "integrity": "sha512-U5eyP/CTFPuNE3qk+WZMxFkp/4zUzdceQlfzf7DdGdhp+Fezd7HD+i8Y24ZuTMKX3wQBld449jijbGq6OdGNQg==",
+            "version": "7.27.1",
+            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.27.1.tgz",
+            "integrity": "sha512-FCvFTm0sWV8Fxhpp2McP5/W53GPllQ9QeQ7SiqGWjMf/LVG07lFa5+pgK05IRhVwtvafT22KF+ZSnM9I545CvQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/template": "^7.27.0",
-                "@babel/types": "^7.27.0"
+                "@babel/template": "^7.27.1",
+                "@babel/types": "^7.27.1"
             },
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/parser": {
-            "version": "7.27.0",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.0.tgz",
-            "integrity": "sha512-iaepho73/2Pz7w2eMS0Q5f83+0RKI7i4xmiYeBmDzfRVbQtTOG7Ts0S4HzJVsTMGI9keU8rNfuZr8DKfSt7Yyg==",
+            "version": "7.27.2",
+            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.2.tgz",
+            "integrity": "sha512-QYLs8299NA7WM/bZAdp+CviYYkVoYXlDW2rzliy3chxd1PQjej7JORuMJDJXJUb9g0TT+B99EwaVLKmX+sPXWw==",
             "license": "MIT",
             "dependencies": {
-                "@babel/types": "^7.27.0"
+                "@babel/types": "^7.27.1"
             },
             "bin": {
                 "parser": "bin/babel-parser.js"
@@ -502,13 +518,13 @@
             }
         },
         "node_modules/@babel/plugin-syntax-import-attributes": {
-            "version": "7.26.0",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.26.0.tgz",
-            "integrity": "sha512-e2dttdsJ1ZTpi3B9UYGLw41hifAubg19AtCu/2I/F1QNVclOBr1dYpTdmdyZ84Xiz43BS/tCUkMAZNLv12Pi+A==",
+            "version": "7.27.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.27.1.tgz",
+            "integrity": "sha512-oFT0FrKHgF53f4vOsZGi2Hh3I35PfSmVs4IBFLFj4dnafP+hIWDLg3VyKmUHfLoLHlyxY4C7DGtmHuJgn+IGww==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/helper-plugin-utils": "^7.25.9"
+                "@babel/helper-plugin-utils": "^7.27.1"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -654,13 +670,61 @@
             }
         },
         "node_modules/@babel/plugin-syntax-typescript": {
-            "version": "7.25.9",
-            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.9.tgz",
-            "integrity": "sha512-hjMgRy5hb8uJJjUcdWunWVcoi9bGpJp8p5Ol1229PoN6aytsLwNMgmdftO23wnCLMfVmTwZDWMPNq/D1SY60JQ==",
+            "version": "7.27.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.27.1.tgz",
+            "integrity": "sha512-xfYCBMxveHrRMnAWl1ZlPXOZjzkN82THFvLhQhFXFt81Z5HnN+EtUkZhv/zcKpmT3fzmWZB0ywiBrbC3vogbwQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/helper-plugin-utils": "^7.25.9"
+                "@babel/helper-plugin-utils": "^7.27.1"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-arrow-functions": {
+            "version": "7.27.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.27.1.tgz",
+            "integrity": "sha512-8Z4TGic6xW70FKThA5HYEKKyBpOOsucTOD1DjU3fZxDg+K3zBJcXMFnt/4yQiZnf5+MiOMSXQ9PaEK/Ilh1DeA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.27.1"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-react-jsx-self": {
+            "version": "7.27.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.27.1.tgz",
+            "integrity": "sha512-6UzkCs+ejGdZ5mFFC/OCUrv028ab2fp1znZmCZjAOBKiBK2jXD1O+BPSfX8X2qjJ75fZBMSnQn3Rq2mrBJK2mw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.27.1"
+            },
+            "engines": {
+                "node": ">=6.9.0"
+            },
+            "peerDependencies": {
+                "@babel/core": "^7.0.0-0"
+            }
+        },
+        "node_modules/@babel/plugin-transform-react-jsx-source": {
+            "version": "7.27.1",
+            "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.27.1.tgz",
+            "integrity": "sha512-zbwoTsBruTeKB9hSq73ha66iFeJHuaFkUbwvqElnygoNbj/jHRsSeokowZFN3CZ64IvEqcmmkVe89OPXc7ldAw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@babel/helper-plugin-utils": "^7.27.1"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -670,42 +734,39 @@
             }
         },
         "node_modules/@babel/runtime": {
-            "version": "7.27.0",
-            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.27.0.tgz",
-            "integrity": "sha512-VtPOkrdPHZsKc/clNqyi9WUA8TINkZ4cGk63UUE3u4pmB2k+ZMQRDuIOagv8UVd6j7k0T3+RRIb7beKTebNbcw==",
+            "version": "7.27.1",
+            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.27.1.tgz",
+            "integrity": "sha512-1x3D2xEk2fRo3PAhwQwu5UubzgiVWSXTBfWpVd2Mx2AzRqJuDJCsgaDVZ7HB5iGzDW1Hl1sWN2mFyKjmR9uAog==",
             "license": "MIT",
-            "dependencies": {
-                "regenerator-runtime": "^0.14.0"
-            },
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/template": {
-            "version": "7.27.0",
-            "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.0.tgz",
-            "integrity": "sha512-2ncevenBqXI6qRMukPlXwHKHchC7RyMuu4xv5JBXRfOGVcTy1mXCD12qrp7Jsoxll1EV3+9sE4GugBVRjT2jFA==",
+            "version": "7.27.2",
+            "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.2.tgz",
+            "integrity": "sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==",
             "license": "MIT",
             "dependencies": {
-                "@babel/code-frame": "^7.26.2",
-                "@babel/parser": "^7.27.0",
-                "@babel/types": "^7.27.0"
+                "@babel/code-frame": "^7.27.1",
+                "@babel/parser": "^7.27.2",
+                "@babel/types": "^7.27.1"
             },
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/traverse": {
-            "version": "7.27.0",
-            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.27.0.tgz",
-            "integrity": "sha512-19lYZFzYVQkkHkl4Cy4WrAVcqBkgvV2YM2TU3xG6DIwO7O3ecbDPfW3yM3bjAGcqcQHi+CCtjMR3dIEHxsd6bA==",
+            "version": "7.27.1",
+            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.27.1.tgz",
+            "integrity": "sha512-ZCYtZciz1IWJB4U61UPu4KEaqyfj+r5T1Q5mqPo+IBpcG9kHv30Z0aD8LXPgC1trYa6rK0orRyAhqUgk4MjmEg==",
             "license": "MIT",
             "dependencies": {
-                "@babel/code-frame": "^7.26.2",
-                "@babel/generator": "^7.27.0",
-                "@babel/parser": "^7.27.0",
-                "@babel/template": "^7.27.0",
-                "@babel/types": "^7.27.0",
+                "@babel/code-frame": "^7.27.1",
+                "@babel/generator": "^7.27.1",
+                "@babel/parser": "^7.27.1",
+                "@babel/template": "^7.27.1",
+                "@babel/types": "^7.27.1",
                 "debug": "^4.3.1",
                 "globals": "^11.1.0"
             },
@@ -713,14 +774,23 @@
                 "node": ">=6.9.0"
             }
         },
+        "node_modules/@babel/traverse/node_modules/globals": {
+            "version": "11.12.0",
+            "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
+            "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=4"
+            }
+        },
         "node_modules/@babel/types": {
-            "version": "7.27.0",
-            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.27.0.tgz",
-            "integrity": "sha512-H45s8fVLYjbhFH62dIJ3WtmJ6RSPt/3DRO0ZcT2SUiYiQyz3BLVb9ADEnLl91m74aQPS3AzzeajZHYOalWe3bg==",
+            "version": "7.27.1",
+            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.27.1.tgz",
+            "integrity": "sha512-+EzkxvLNfiUeKMgy/3luqfsCWFRXLb7U6wNQTk60tovuckwB15B191tJWvpp4HjiQWdJkCxO3Wbvc6jlk3Xb2Q==",
             "license": "MIT",
             "dependencies": {
-                "@babel/helper-string-parser": "^7.25.9",
-                "@babel/helper-validator-identifier": "^7.25.9"
+                "@babel/helper-string-parser": "^7.27.1",
+                "@babel/helper-validator-identifier": "^7.27.1"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -733,6 +803,13 @@
             "dev": true,
             "license": "MIT"
         },
+        "node_modules/@bufbuild/protobuf": {
+            "version": "2.4.0",
+            "resolved": "https://registry.npmjs.org/@bufbuild/protobuf/-/protobuf-2.4.0.tgz",
+            "integrity": "sha512-RN9M76x7N11QRihKovEglEjjVCQEA9PRBVnDgk9xw8JHLrcUrp4FpAVSPSH91cNbcTft3u2vpLN4GMbiKY9PJw==",
+            "dev": true,
+            "license": "(Apache-2.0 AND BSD-3-Clause)"
+        },
         "node_modules/@cspotcode/source-map-support": {
             "version": "0.8.1",
             "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
@@ -878,9 +955,9 @@
             }
         },
         "node_modules/@discordjs/rest": {
-            "version": "2.4.3",
-            "resolved": "https://registry.npmjs.org/@discordjs/rest/-/rest-2.4.3.tgz",
-            "integrity": "sha512-+SO4RKvWsM+y8uFHgYQrcTl/3+cY02uQOH7/7bKbVZsTfrfpoE62o5p+mmV+s7FVhTX82/kQUGGbu4YlV60RtA==",
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/@discordjs/rest/-/rest-2.5.0.tgz",
+            "integrity": "sha512-PWhchxTzpn9EV3vvPRpwS0EE2rNYB9pvzDU/eLLW3mByJl0ZHZjHI2/wA8EbH2gRMQV7nu+0FoDF84oiPl8VAQ==",
             "license": "Apache-2.0",
             "dependencies": {
                 "@discordjs/collection": "^2.1.1",
@@ -888,7 +965,7 @@
                 "@sapphire/async-queue": "^1.5.3",
                 "@sapphire/snowflake": "^3.5.3",
                 "@vladfrangu/async_event_emitter": "^2.4.6",
-                "discord-api-types": "^0.37.119",
+                "discord-api-types": "^0.38.1",
                 "magic-bytes.js": "^1.10.0",
                 "tslib": "^2.6.3",
                 "undici": "6.21.1"
@@ -900,6 +977,15 @@
                 "url": "https://github.com/discordjs/discord.js?sponsor"
             }
         },
+        "node_modules/@discordjs/rest/node_modules/discord-api-types": {
+            "version": "0.38.8",
+            "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.38.8.tgz",
+            "integrity": "sha512-xuRXPD44FcbKHrQK15FS1HFlMRNJtsaZou/SVws18vQ7zHqmlxyDktMkZpyvD6gE2ctGOVYC/jUyoMMAyBWfcw==",
+            "license": "MIT",
+            "workspaces": [
+                "scripts/actions/documentation"
+            ]
+        },
         "node_modules/@discordjs/util": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/@discordjs/util/-/util-1.1.1.tgz",
@@ -922,6 +1008,70 @@
                 "node": ">=10.0.0"
             }
         },
+        "node_modules/@electron-toolkit/eslint-config-prettier": {
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/@electron-toolkit/eslint-config-prettier/-/eslint-config-prettier-3.0.0.tgz",
+            "integrity": "sha512-YapmIOVkbYdHLuTa+ad1SAVtcqYL9A/SJsc7cxQokmhcwAwonGevNom37jBf9slXegcZ/Slh01I/JARG1yhNFw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "eslint-config-prettier": "^10.0.1",
+                "eslint-plugin-prettier": "^5.2.3"
+            },
+            "peerDependencies": {
+                "eslint": ">= 9.0.0",
+                "prettier": ">= 3.0.0"
+            }
+        },
+        "node_modules/@electron-toolkit/eslint-config-ts": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/@electron-toolkit/eslint-config-ts/-/eslint-config-ts-3.1.0.tgz",
+            "integrity": "sha512-MowZQKd3yxXSDLack5QvjQwYHhpOJFoWBGBwJ/k+DCd7NUSendplECbQGFp86tPQYPUrPBPceR/hdsSAnaY5ZQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@eslint/js": "^9.24.0",
+                "globals": "^16.0.0",
+                "typescript-eslint": "^8.29.1"
+            },
+            "peerDependencies": {
+                "eslint": ">=9.0.0",
+                "typescript": "*"
+            },
+            "peerDependenciesMeta": {
+                "typescript": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@electron-toolkit/preload": {
+            "version": "3.0.2",
+            "resolved": "https://registry.npmjs.org/@electron-toolkit/preload/-/preload-3.0.2.tgz",
+            "integrity": "sha512-TWWPToXd8qPRfSXwzf5KVhpXMfONaUuRAZJHsKthKgZR/+LqX1dZVSSClQ8OTAEduvLGdecljCsoT2jSshfoUg==",
+            "license": "MIT",
+            "peerDependencies": {
+                "electron": ">=13.0.0"
+            }
+        },
+        "node_modules/@electron-toolkit/tsconfig": {
+            "version": "1.0.1",
+            "resolved": "https://registry.npmjs.org/@electron-toolkit/tsconfig/-/tsconfig-1.0.1.tgz",
+            "integrity": "sha512-M0Mol3odspvtCuheyujLNAW7bXq7KFNYVMRtpjFa4ZfES4MuklXBC7Nli/omvc+PRKlrklgAGx3l4VakjNo8jg==",
+            "dev": true,
+            "license": "MIT",
+            "peerDependencies": {
+                "@types/node": "*"
+            }
+        },
+        "node_modules/@electron-toolkit/utils": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/@electron-toolkit/utils/-/utils-4.0.0.tgz",
+            "integrity": "sha512-qXSntwEzluSzKl4z5yFNBknmPGjPa3zFhE4mp9+h0cgokY5ornAeP+CJQDBhKsL1S58aOQfcwkD3NwLZCl+64g==",
+            "license": "MIT",
+            "peerDependencies": {
+                "electron": ">=13.0.0"
+            }
+        },
         "node_modules/@electron/asar": {
             "version": "3.4.1",
             "resolved": "https://registry.npmjs.org/@electron/asar/-/asar-3.4.1.tgz",
@@ -1056,7 +1206,7 @@
         "node_modules/@electron/node-gyp": {
             "version": "10.2.0-electron.1",
             "resolved": "git+ssh://git@github.com/electron/node-gyp.git#06b29aafb7708acef8b3669835c8a7857ebc92d2",
-            "integrity": "sha512-CrYo6TntjpoMO1SHjl5Pa/JoUsECNqNdB7Kx49WLQpWzPw53eEITJ2Hs9fh/ryUYDn4pxZz11StaBYBrLFJdqg==",
+            "integrity": "sha512-4MSBTT8y07YUDqf69/vSh80Hh791epYqGtWHO3zSKhYFwQg+gx9wi1PqbqP6YqC4WMsNxZ5l9oDmnWdK5pfCKQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -1079,9 +1229,9 @@
             }
         },
         "node_modules/@electron/notarize": {
-            "version": "2.2.1",
-            "resolved": "https://registry.npmjs.org/@electron/notarize/-/notarize-2.2.1.tgz",
-            "integrity": "sha512-aL+bFMIkpR0cmmj5Zgy0LMKEpgy43/hw5zadEArgmAMWWlKc5buwFvFT9G/o/YJkvXAJm5q3iuTuLaiaXW39sg==",
+            "version": "2.5.0",
+            "resolved": "https://registry.npmjs.org/@electron/notarize/-/notarize-2.5.0.tgz",
+            "integrity": "sha512-jNT8nwH1f9X5GEITXaQ8IF/KdskvIkOFfB2CvwumsveVidzpSc+mvhhTMdAGSYF3O+Nq49lJ7y+ssODRXu06+A==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -1110,9 +1260,9 @@
             }
         },
         "node_modules/@electron/osx-sign": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/@electron/osx-sign/-/osx-sign-1.0.5.tgz",
-            "integrity": "sha512-k9ZzUQtamSoweGQDV2jILiRIHUu7lYlJ3c6IEmjv1hC17rclE+eb9U+f6UFlOOETo0JzY1HNlXy4YOlCvl+Lww==",
+            "version": "1.3.1",
+            "resolved": "https://registry.npmjs.org/@electron/osx-sign/-/osx-sign-1.3.1.tgz",
+            "integrity": "sha512-BAfviURMHpmb1Yb50YbCxnOY0wfwaLXH5KJ4+80zS0gUkzDX3ec23naTlEqKsN+PwYn+a1cCzM7BJ4Wcd3sGzw==",
             "dev": true,
             "license": "BSD-2-Clause",
             "dependencies": {
@@ -1174,85 +1324,53 @@
             }
         },
         "node_modules/@electron/universal": {
-            "version": "1.5.1",
-            "resolved": "https://registry.npmjs.org/@electron/universal/-/universal-1.5.1.tgz",
-            "integrity": "sha512-kbgXxyEauPJiQQUNG2VgUeyfQNFk6hBF11ISN2PNI6agUgPl55pv4eQmaqHzTAzchBvqZ2tQuRVaPStGf0mxGw==",
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/@electron/universal/-/universal-2.0.1.tgz",
+            "integrity": "sha512-fKpv9kg4SPmt+hY7SVBnIYULE9QJl8L3sCfcBsnqbJwwBwAeTLokJ9TRt9y7bK0JAzIW2y78TVVjvnQEms/yyA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@electron/asar": "^3.2.1",
-                "@malept/cross-spawn-promise": "^1.1.0",
+                "@electron/asar": "^3.2.7",
+                "@malept/cross-spawn-promise": "^2.0.0",
                 "debug": "^4.3.1",
-                "dir-compare": "^3.0.0",
-                "fs-extra": "^9.0.1",
-                "minimatch": "^3.0.4",
-                "plist": "^3.0.4"
+                "dir-compare": "^4.2.0",
+                "fs-extra": "^11.1.1",
+                "minimatch": "^9.0.3",
+                "plist": "^3.1.0"
             },
             "engines": {
-                "node": ">=8.6"
-            }
-        },
-        "node_modules/@electron/universal/node_modules/@malept/cross-spawn-promise": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.1.tgz",
-            "integrity": "sha512-RTBGWL5FWQcg9orDOCcp4LvItNzUPcyEU9bwaeJX0rJ1IQxzucC48Y0/sQLp/g6t99IQgAlGIaesJS+gTn7tVQ==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "individual",
-                    "url": "https://github.com/sponsors/malept"
-                },
-                {
-                    "type": "tidelift",
-                    "url": "https://tidelift.com/subscription/pkg/npm-.malept-cross-spawn-promise?utm_medium=referral&utm_source=npm_fund"
-                }
-            ],
-            "license": "Apache-2.0",
-            "dependencies": {
-                "cross-spawn": "^7.0.1"
-            },
-            "engines": {
-                "node": ">= 10"
-            }
-        },
-        "node_modules/@electron/universal/node_modules/brace-expansion": {
-            "version": "1.1.11",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "balanced-match": "^1.0.0",
-                "concat-map": "0.0.1"
+                "node": ">=16.4"
             }
         },
         "node_modules/@electron/universal/node_modules/fs-extra": {
-            "version": "9.1.0",
-            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
-            "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
+            "version": "11.3.0",
+            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.0.tgz",
+            "integrity": "sha512-Z4XaCL6dUDHfP/jT25jJKMmtxvuwbkrD1vNSMFlo9lNLY2c5FHYSQgHPRZUjAB26TpDEoW9HCOgplrdbaPV/ew==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "at-least-node": "^1.0.0",
                 "graceful-fs": "^4.2.0",
                 "jsonfile": "^6.0.1",
                 "universalify": "^2.0.0"
             },
             "engines": {
-                "node": ">=10"
+                "node": ">=14.14"
             }
         },
         "node_modules/@electron/universal/node_modules/minimatch": {
-            "version": "3.1.2",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-            "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+            "version": "9.0.5",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+            "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
             "dev": true,
             "license": "ISC",
             "dependencies": {
-                "brace-expansion": "^1.1.7"
+                "brace-expansion": "^2.0.1"
             },
             "engines": {
-                "node": "*"
+                "node": ">=16 || 14 >=14.17"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
             }
         },
         "node_modules/@emotion/babel-plugin": {
@@ -1385,9 +1503,9 @@
             "license": "MIT"
         },
         "node_modules/@esbuild/aix-ppc64": {
-            "version": "0.25.3",
-            "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.3.tgz",
-            "integrity": "sha512-W8bFfPA8DowP8l//sxjJLSLkD8iEjMc7cBVyP+u4cEv9sM7mdUCkgsj+t0n/BWPFtv7WWCN5Yzj0N6FJNUUqBQ==",
+            "version": "0.25.4",
+            "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.4.tgz",
+            "integrity": "sha512-1VCICWypeQKhVbE9oW/sJaAmjLxhVqacdkvPLEjwlttjfwENRSClS8EjBz0KzRyFSCPDIkuXW34Je/vk7zdB7Q==",
             "cpu": [
                 "ppc64"
             ],
@@ -1402,9 +1520,9 @@
             }
         },
         "node_modules/@esbuild/android-arm": {
-            "version": "0.25.3",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.3.tgz",
-            "integrity": "sha512-PuwVXbnP87Tcff5I9ngV0lmiSu40xw1At6i3GsU77U7cjDDB4s0X2cyFuBiDa1SBk9DnvWwnGvVaGBqoFWPb7A==",
+            "version": "0.25.4",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.4.tgz",
+            "integrity": "sha512-QNdQEps7DfFwE3hXiU4BZeOV68HHzYwGd0Nthhd3uCkkEKK7/R6MTgM0P7H7FAs5pU/DIWsviMmEGxEoxIZ+ZQ==",
             "cpu": [
                 "arm"
             ],
@@ -1419,9 +1537,9 @@
             }
         },
         "node_modules/@esbuild/android-arm64": {
-            "version": "0.25.3",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.3.tgz",
-            "integrity": "sha512-XelR6MzjlZuBM4f5z2IQHK6LkK34Cvv6Rj2EntER3lwCBFdg6h2lKbtRjpTTsdEjD/WSe1q8UyPBXP1x3i/wYQ==",
+            "version": "0.25.4",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.4.tgz",
+            "integrity": "sha512-bBy69pgfhMGtCnwpC/x5QhfxAz/cBgQ9enbtwjf6V9lnPI/hMyT9iWpR1arm0l3kttTr4L0KSLpKmLp/ilKS9A==",
             "cpu": [
                 "arm64"
             ],
@@ -1436,9 +1554,9 @@
             }
         },
         "node_modules/@esbuild/android-x64": {
-            "version": "0.25.3",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.3.tgz",
-            "integrity": "sha512-ogtTpYHT/g1GWS/zKM0cc/tIebFjm1F9Aw1boQ2Y0eUQ+J89d0jFY//s9ei9jVIlkYi8AfOjiixcLJSGNSOAdQ==",
+            "version": "0.25.4",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.4.tgz",
+            "integrity": "sha512-TVhdVtQIFuVpIIR282btcGC2oGQoSfZfmBdTip2anCaVYcqWlZXGcdcKIUklfX2wj0JklNYgz39OBqh2cqXvcQ==",
             "cpu": [
                 "x64"
             ],
@@ -1453,9 +1571,9 @@
             }
         },
         "node_modules/@esbuild/darwin-arm64": {
-            "version": "0.25.3",
-            "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.3.tgz",
-            "integrity": "sha512-eESK5yfPNTqpAmDfFWNsOhmIOaQA59tAcF/EfYvo5/QWQCzXn5iUSOnqt3ra3UdzBv073ykTtmeLJZGt3HhA+w==",
+            "version": "0.25.4",
+            "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.4.tgz",
+            "integrity": "sha512-Y1giCfM4nlHDWEfSckMzeWNdQS31BQGs9/rouw6Ub91tkK79aIMTH3q9xHvzH8d0wDru5Ci0kWB8b3up/nl16g==",
             "cpu": [
                 "arm64"
             ],
@@ -1470,9 +1588,9 @@
             }
         },
         "node_modules/@esbuild/darwin-x64": {
-            "version": "0.25.3",
-            "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.3.tgz",
-            "integrity": "sha512-Kd8glo7sIZtwOLcPbW0yLpKmBNWMANZhrC1r6K++uDR2zyzb6AeOYtI6udbtabmQpFaxJ8uduXMAo1gs5ozz8A==",
+            "version": "0.25.4",
+            "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.4.tgz",
+            "integrity": "sha512-CJsry8ZGM5VFVeyUYB3cdKpd/H69PYez4eJh1W/t38vzutdjEjtP7hB6eLKBoOdxcAlCtEYHzQ/PJ/oU9I4u0A==",
             "cpu": [
                 "x64"
             ],
@@ -1487,9 +1605,9 @@
             }
         },
         "node_modules/@esbuild/freebsd-arm64": {
-            "version": "0.25.3",
-            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.3.tgz",
-            "integrity": "sha512-EJiyS70BYybOBpJth3M0KLOus0n+RRMKTYzhYhFeMwp7e/RaajXvP+BWlmEXNk6uk+KAu46j/kaQzr6au+JcIw==",
+            "version": "0.25.4",
+            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.4.tgz",
+            "integrity": "sha512-yYq+39NlTRzU2XmoPW4l5Ifpl9fqSk0nAJYM/V/WUGPEFfek1epLHJIkTQM6bBs1swApjO5nWgvr843g6TjxuQ==",
             "cpu": [
                 "arm64"
             ],
@@ -1504,9 +1622,9 @@
             }
         },
         "node_modules/@esbuild/freebsd-x64": {
-            "version": "0.25.3",
-            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.3.tgz",
-            "integrity": "sha512-Q+wSjaLpGxYf7zC0kL0nDlhsfuFkoN+EXrx2KSB33RhinWzejOd6AvgmP5JbkgXKmjhmpfgKZq24pneodYqE8Q==",
+            "version": "0.25.4",
+            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.4.tgz",
+            "integrity": "sha512-0FgvOJ6UUMflsHSPLzdfDnnBBVoCDtBTVyn/MrWloUNvq/5SFmh13l3dvgRPkDihRxb77Y17MbqbCAa2strMQQ==",
             "cpu": [
                 "x64"
             ],
@@ -1521,9 +1639,9 @@
             }
         },
         "node_modules/@esbuild/linux-arm": {
-            "version": "0.25.3",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.3.tgz",
-            "integrity": "sha512-dUOVmAUzuHy2ZOKIHIKHCm58HKzFqd+puLaS424h6I85GlSDRZIA5ycBixb3mFgM0Jdh+ZOSB6KptX30DD8YOQ==",
+            "version": "0.25.4",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.4.tgz",
+            "integrity": "sha512-kro4c0P85GMfFYqW4TWOpvmF8rFShbWGnrLqlzp4X1TNWjRY3JMYUfDCtOxPKOIY8B0WC8HN51hGP4I4hz4AaQ==",
             "cpu": [
                 "arm"
             ],
@@ -1538,9 +1656,9 @@
             }
         },
         "node_modules/@esbuild/linux-arm64": {
-            "version": "0.25.3",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.3.tgz",
-            "integrity": "sha512-xCUgnNYhRD5bb1C1nqrDV1PfkwgbswTTBRbAd8aH5PhYzikdf/ddtsYyMXFfGSsb/6t6QaPSzxtbfAZr9uox4A==",
+            "version": "0.25.4",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.4.tgz",
+            "integrity": "sha512-+89UsQTfXdmjIvZS6nUnOOLoXnkUTB9hR5QAeLrQdzOSWZvNSAXAtcRDHWtqAUtAmv7ZM1WPOOeSxDzzzMogiQ==",
             "cpu": [
                 "arm64"
             ],
@@ -1555,9 +1673,9 @@
             }
         },
         "node_modules/@esbuild/linux-ia32": {
-            "version": "0.25.3",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.3.tgz",
-            "integrity": "sha512-yplPOpczHOO4jTYKmuYuANI3WhvIPSVANGcNUeMlxH4twz/TeXuzEP41tGKNGWJjuMhotpGabeFYGAOU2ummBw==",
+            "version": "0.25.4",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.4.tgz",
+            "integrity": "sha512-yTEjoapy8UP3rv8dB0ip3AfMpRbyhSN3+hY8mo/i4QXFeDxmiYbEKp3ZRjBKcOP862Ua4b1PDfwlvbuwY7hIGQ==",
             "cpu": [
                 "ia32"
             ],
@@ -1572,9 +1690,9 @@
             }
         },
         "node_modules/@esbuild/linux-loong64": {
-            "version": "0.25.3",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.3.tgz",
-            "integrity": "sha512-P4BLP5/fjyihmXCELRGrLd793q/lBtKMQl8ARGpDxgzgIKJDRJ/u4r1A/HgpBpKpKZelGct2PGI4T+axcedf6g==",
+            "version": "0.25.4",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.4.tgz",
+            "integrity": "sha512-NeqqYkrcGzFwi6CGRGNMOjWGGSYOpqwCjS9fvaUlX5s3zwOtn1qwg1s2iE2svBe4Q/YOG1q6875lcAoQK/F4VA==",
             "cpu": [
                 "loong64"
             ],
@@ -1589,9 +1707,9 @@
             }
         },
         "node_modules/@esbuild/linux-mips64el": {
-            "version": "0.25.3",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.3.tgz",
-            "integrity": "sha512-eRAOV2ODpu6P5divMEMa26RRqb2yUoYsuQQOuFUexUoQndm4MdpXXDBbUoKIc0iPa4aCO7gIhtnYomkn2x+bag==",
+            "version": "0.25.4",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.4.tgz",
+            "integrity": "sha512-IcvTlF9dtLrfL/M8WgNI/qJYBENP3ekgsHbYUIzEzq5XJzzVEV/fXY9WFPfEEXmu3ck2qJP8LG/p3Q8f7Zc2Xg==",
             "cpu": [
                 "mips64el"
             ],
@@ -1606,9 +1724,9 @@
             }
         },
         "node_modules/@esbuild/linux-ppc64": {
-            "version": "0.25.3",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.3.tgz",
-            "integrity": "sha512-ZC4jV2p7VbzTlnl8nZKLcBkfzIf4Yad1SJM4ZMKYnJqZFD4rTI+pBG65u8ev4jk3/MPwY9DvGn50wi3uhdaghg==",
+            "version": "0.25.4",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.4.tgz",
+            "integrity": "sha512-HOy0aLTJTVtoTeGZh4HSXaO6M95qu4k5lJcH4gxv56iaycfz1S8GO/5Jh6X4Y1YiI0h7cRyLi+HixMR+88swag==",
             "cpu": [
                 "ppc64"
             ],
@@ -1623,9 +1741,9 @@
             }
         },
         "node_modules/@esbuild/linux-riscv64": {
-            "version": "0.25.3",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.3.tgz",
-            "integrity": "sha512-LDDODcFzNtECTrUUbVCs6j9/bDVqy7DDRsuIXJg6so+mFksgwG7ZVnTruYi5V+z3eE5y+BJZw7VvUadkbfg7QA==",
+            "version": "0.25.4",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.4.tgz",
+            "integrity": "sha512-i8JUDAufpz9jOzo4yIShCTcXzS07vEgWzyX3NH2G7LEFVgrLEhjwL3ajFE4fZI3I4ZgiM7JH3GQ7ReObROvSUA==",
             "cpu": [
                 "riscv64"
             ],
@@ -1640,9 +1758,9 @@
             }
         },
         "node_modules/@esbuild/linux-s390x": {
-            "version": "0.25.3",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.3.tgz",
-            "integrity": "sha512-s+w/NOY2k0yC2p9SLen+ymflgcpRkvwwa02fqmAwhBRI3SC12uiS10edHHXlVWwfAagYSY5UpmT/zISXPMW3tQ==",
+            "version": "0.25.4",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.4.tgz",
+            "integrity": "sha512-jFnu+6UbLlzIjPQpWCNh5QtrcNfMLjgIavnwPQAfoGx4q17ocOU9MsQ2QVvFxwQoWpZT8DvTLooTvmOQXkO51g==",
             "cpu": [
                 "s390x"
             ],
@@ -1657,9 +1775,9 @@
             }
         },
         "node_modules/@esbuild/linux-x64": {
-            "version": "0.25.3",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.3.tgz",
-            "integrity": "sha512-nQHDz4pXjSDC6UfOE1Fw9Q8d6GCAd9KdvMZpfVGWSJztYCarRgSDfOVBY5xwhQXseiyxapkiSJi/5/ja8mRFFA==",
+            "version": "0.25.4",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.4.tgz",
+            "integrity": "sha512-6e0cvXwzOnVWJHq+mskP8DNSrKBr1bULBvnFLpc1KY+d+irZSgZ02TGse5FsafKS5jg2e4pbvK6TPXaF/A6+CA==",
             "cpu": [
                 "x64"
             ],
@@ -1674,9 +1792,9 @@
             }
         },
         "node_modules/@esbuild/netbsd-arm64": {
-            "version": "0.25.3",
-            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.3.tgz",
-            "integrity": "sha512-1QaLtOWq0mzK6tzzp0jRN3eccmN3hezey7mhLnzC6oNlJoUJz4nym5ZD7mDnS/LZQgkrhEbEiTn515lPeLpgWA==",
+            "version": "0.25.4",
+            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.4.tgz",
+            "integrity": "sha512-vUnkBYxZW4hL/ie91hSqaSNjulOnYXE1VSLusnvHg2u3jewJBz3YzB9+oCw8DABeVqZGg94t9tyZFoHma8gWZQ==",
             "cpu": [
                 "arm64"
             ],
@@ -1691,9 +1809,9 @@
             }
         },
         "node_modules/@esbuild/netbsd-x64": {
-            "version": "0.25.3",
-            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.3.tgz",
-            "integrity": "sha512-i5Hm68HXHdgv8wkrt+10Bc50zM0/eonPb/a/OFVfB6Qvpiirco5gBA5bz7S2SHuU+Y4LWn/zehzNX14Sp4r27g==",
+            "version": "0.25.4",
+            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.4.tgz",
+            "integrity": "sha512-XAg8pIQn5CzhOB8odIcAm42QsOfa98SBeKUdo4xa8OvX8LbMZqEtgeWE9P/Wxt7MlG2QqvjGths+nq48TrUiKw==",
             "cpu": [
                 "x64"
             ],
@@ -1708,9 +1826,9 @@
             }
         },
         "node_modules/@esbuild/openbsd-arm64": {
-            "version": "0.25.3",
-            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.3.tgz",
-            "integrity": "sha512-zGAVApJEYTbOC6H/3QBr2mq3upG/LBEXr85/pTtKiv2IXcgKV0RT0QA/hSXZqSvLEpXeIxah7LczB4lkiYhTAQ==",
+            "version": "0.25.4",
+            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.4.tgz",
+            "integrity": "sha512-Ct2WcFEANlFDtp1nVAXSNBPDxyU+j7+tId//iHXU2f/lN5AmO4zLyhDcpR5Cz1r08mVxzt3Jpyt4PmXQ1O6+7A==",
             "cpu": [
                 "arm64"
             ],
@@ -1725,9 +1843,9 @@
             }
         },
         "node_modules/@esbuild/openbsd-x64": {
-            "version": "0.25.3",
-            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.3.tgz",
-            "integrity": "sha512-fpqctI45NnCIDKBH5AXQBsD0NDPbEFczK98hk/aa6HJxbl+UtLkJV2+Bvy5hLSLk3LHmqt0NTkKNso1A9y1a4w==",
+            "version": "0.25.4",
+            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.4.tgz",
+            "integrity": "sha512-xAGGhyOQ9Otm1Xu8NT1ifGLnA6M3sJxZ6ixylb+vIUVzvvd6GOALpwQrYrtlPouMqd/vSbgehz6HaVk4+7Afhw==",
             "cpu": [
                 "x64"
             ],
@@ -1742,9 +1860,9 @@
             }
         },
         "node_modules/@esbuild/sunos-x64": {
-            "version": "0.25.3",
-            "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.3.tgz",
-            "integrity": "sha512-ROJhm7d8bk9dMCUZjkS8fgzsPAZEjtRJqCAmVgB0gMrvG7hfmPmz9k1rwO4jSiblFjYmNvbECL9uhaPzONMfgA==",
+            "version": "0.25.4",
+            "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.4.tgz",
+            "integrity": "sha512-Mw+tzy4pp6wZEK0+Lwr76pWLjrtjmJyUB23tHKqEDP74R3q95luY/bXqXZeYl4NYlvwOqoRKlInQialgCKy67Q==",
             "cpu": [
                 "x64"
             ],
@@ -1759,9 +1877,9 @@
             }
         },
         "node_modules/@esbuild/win32-arm64": {
-            "version": "0.25.3",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.3.tgz",
-            "integrity": "sha512-YWcow8peiHpNBiIXHwaswPnAXLsLVygFwCB3A7Bh5jRkIBFWHGmNQ48AlX4xDvQNoMZlPYzjVOQDYEzWCqufMQ==",
+            "version": "0.25.4",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.4.tgz",
+            "integrity": "sha512-AVUP428VQTSddguz9dO9ngb+E5aScyg7nOeJDrF1HPYu555gmza3bDGMPhmVXL8svDSoqPCsCPjb265yG/kLKQ==",
             "cpu": [
                 "arm64"
             ],
@@ -1776,9 +1894,9 @@
             }
         },
         "node_modules/@esbuild/win32-ia32": {
-            "version": "0.25.3",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.3.tgz",
-            "integrity": "sha512-qspTZOIGoXVS4DpNqUYUs9UxVb04khS1Degaw/MnfMe7goQ3lTfQ13Vw4qY/Nj0979BGvMRpAYbs/BAxEvU8ew==",
+            "version": "0.25.4",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.4.tgz",
+            "integrity": "sha512-i1sW+1i+oWvQzSgfRcxxG2k4I9n3O9NRqy8U+uugaT2Dy7kLO9Y7wI72haOahxceMX8hZAzgGou1FhndRldxRg==",
             "cpu": [
                 "ia32"
             ],
@@ -1793,9 +1911,9 @@
             }
         },
         "node_modules/@esbuild/win32-x64": {
-            "version": "0.25.3",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.3.tgz",
-            "integrity": "sha512-ICgUR+kPimx0vvRzf+N/7L7tVSQeE3BYY+NhHRHXS1kBuPO7z2+7ea2HbhDyZdTephgvNvKrlDDKUexuCVBVvg==",
+            "version": "0.25.4",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.4.tgz",
+            "integrity": "sha512-nOT2vZNw6hJ+z43oP1SPea/G/6AbN6X+bGNhNuq8NtRHy4wsMhw765IKLNmnjek7GvjWBYQ8Q5VBoYTFg9y1UQ==",
             "cpu": [
                 "x64"
             ],
@@ -1810,9 +1928,9 @@
             }
         },
         "node_modules/@eslint-community/eslint-utils": {
-            "version": "4.6.1",
-            "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.6.1.tgz",
-            "integrity": "sha512-KTsJMmobmbrFLe3LDh0PC2FXpcSYJt/MLjlkh/9LEnmKYLSYmT/0EW9JWANjeoemiuZrmogti0tW5Ch+qNUYDw==",
+            "version": "4.7.0",
+            "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz",
+            "integrity": "sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -1838,17 +1956,79 @@
                 "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
             }
         },
+        "node_modules/@eslint/config-array": {
+            "version": "0.20.0",
+            "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.20.0.tgz",
+            "integrity": "sha512-fxlS1kkIjx8+vy2SjuCB94q3htSNrufYTXubwiBFeaQHbH6Ipi43gFJq2zCMt6PHhImH3Xmr0NksKDvchWlpQQ==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@eslint/object-schema": "^2.1.6",
+                "debug": "^4.3.1",
+                "minimatch": "^3.1.2"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            }
+        },
+        "node_modules/@eslint/config-array/node_modules/brace-expansion": {
+            "version": "1.1.11",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "balanced-match": "^1.0.0",
+                "concat-map": "0.0.1"
+            }
+        },
+        "node_modules/@eslint/config-array/node_modules/minimatch": {
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+            "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "brace-expansion": "^1.1.7"
+            },
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/@eslint/config-helpers": {
+            "version": "0.2.2",
+            "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.2.2.tgz",
+            "integrity": "sha512-+GPzk8PlG0sPpzdU5ZvIRMPidzAnZDl/s9L+y13iodqvb8leL53bTannOrQ/Im7UkpsmFU5Ily5U60LWixnmLg==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            }
+        },
+        "node_modules/@eslint/core": {
+            "version": "0.14.0",
+            "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.14.0.tgz",
+            "integrity": "sha512-qIbV0/JZr7iSDjqAc60IqbLdsj9GDt16xQtWD+B78d/HAlvysGdZZ6rpJHGAc2T0FQx1X6thsSPdnoiGKdNtdg==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@types/json-schema": "^7.0.15"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            }
+        },
         "node_modules/@eslint/eslintrc": {
-            "version": "2.1.4",
-            "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz",
-            "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==",
+            "version": "3.3.1",
+            "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.1.tgz",
+            "integrity": "sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "ajv": "^6.12.4",
                 "debug": "^4.3.2",
-                "espree": "^9.6.0",
-                "globals": "^13.19.0",
+                "espree": "^10.0.1",
+                "globals": "^14.0.0",
                 "ignore": "^5.2.0",
                 "import-fresh": "^3.2.1",
                 "js-yaml": "^4.1.0",
@@ -1856,7 +2036,7 @@
                 "strip-json-comments": "^3.1.1"
             },
             "engines": {
-                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
             },
             "funding": {
                 "url": "https://opencollective.com/eslint"
@@ -1874,16 +2054,13 @@
             }
         },
         "node_modules/@eslint/eslintrc/node_modules/globals": {
-            "version": "13.24.0",
-            "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
-            "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
+            "version": "14.0.0",
+            "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz",
+            "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==",
             "dev": true,
             "license": "MIT",
-            "dependencies": {
-                "type-fest": "^0.20.2"
-            },
             "engines": {
-                "node": ">=8"
+                "node": ">=18"
             },
             "funding": {
                 "url": "https://github.com/sponsors/sindresorhus"
@@ -1902,45 +2079,59 @@
                 "node": "*"
             }
         },
-        "node_modules/@eslint/eslintrc/node_modules/type-fest": {
-            "version": "0.20.2",
-            "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-            "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-            "dev": true,
-            "license": "(MIT OR CC0-1.0)",
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
         "node_modules/@eslint/js": {
-            "version": "8.57.1",
-            "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.1.tgz",
-            "integrity": "sha512-d9zaMRSTIKDLhctzH12MtXvJKSSUhaHcjV+2Z+GK+EEY7XKpP5yR4x+N3TAcHTcu963nIr+TMcCb4DBCYX1z6Q==",
+            "version": "9.27.0",
+            "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.27.0.tgz",
+            "integrity": "sha512-G5JD9Tu5HJEu4z2Uo4aHY2sLV64B7CDMXxFzqzjl3NKd6RVzSXNoE80jk7Y0lJkTTkjiIhBAqmlYwjuBY3tvpA==",
             "dev": true,
             "license": "MIT",
             "engines": {
-                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "url": "https://eslint.org/donate"
+            }
+        },
+        "node_modules/@eslint/object-schema": {
+            "version": "2.1.6",
+            "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.6.tgz",
+            "integrity": "sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            }
+        },
+        "node_modules/@eslint/plugin-kit": {
+            "version": "0.3.1",
+            "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.1.tgz",
+            "integrity": "sha512-0J+zgWxHN+xXONWIyPWKFMgVuJoZuGiIFu8yxk7RJjxkzpGmyja5wRFqZIVtjDVOQpV+Rw0iOAjYPE2eQyjr0w==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@eslint/core": "^0.14.0",
+                "levn": "^0.4.1"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
             }
         },
         "node_modules/@floating-ui/core": {
-            "version": "1.6.9",
-            "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.9.tgz",
-            "integrity": "sha512-uMXCuQ3BItDUbAMhIXw7UPXRfAlOAvZzdK9BWpE60MCn+Svt3aLn9jsPTi/WNGlRUu2uI0v5S7JiIUsbsvh3fw==",
+            "version": "1.7.0",
+            "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.7.0.tgz",
+            "integrity": "sha512-FRdBLykrPPA6P76GGGqlex/e7fbe0F1ykgxHYNXQsH/iTEtjMj/f9bpY5oQqbjt5VgZvgz/uKXbGuROijh3VLA==",
             "license": "MIT",
             "dependencies": {
                 "@floating-ui/utils": "^0.2.9"
             }
         },
         "node_modules/@floating-ui/dom": {
-            "version": "1.6.13",
-            "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.13.tgz",
-            "integrity": "sha512-umqzocjDgNRGTuO7Q8CU32dkHkECqI8ZdMZ5Swb6QAM0t5rnlrN3lGo1hdpscRd3WS8T6DKYK4ephgIH9iRh3w==",
+            "version": "1.7.0",
+            "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.7.0.tgz",
+            "integrity": "sha512-lGTor4VlXcesUMh1cupTUTDoCxMb0V6bm3CnxHzQcw8Eaf1jQbgQX4i02fYgT0vJ82tb5MZ4CZk1LRGkktJCzg==",
             "license": "MIT",
             "dependencies": {
-                "@floating-ui/core": "^1.6.0",
+                "@floating-ui/core": "^1.7.0",
                 "@floating-ui/utils": "^0.2.9"
             }
         },
@@ -1998,44 +2189,42 @@
                 "node": ">=10.13.0"
             }
         },
-        "node_modules/@humanwhocodes/config-array": {
-            "version": "0.13.0",
-            "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.13.0.tgz",
-            "integrity": "sha512-DZLEEqFWQFiyK6h5YIeynKx7JlvCYWL0cImfSRXZ9l4Sg2efkFGTuFf6vzXjK1cq6IYkU+Eg/JizXw+TD2vRNw==",
-            "deprecated": "Use @eslint/config-array instead",
+        "node_modules/@humanfs/core": {
+            "version": "0.19.1",
+            "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz",
+            "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "engines": {
+                "node": ">=18.18.0"
+            }
+        },
+        "node_modules/@humanfs/node": {
+            "version": "0.16.6",
+            "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz",
+            "integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
-                "@humanwhocodes/object-schema": "^2.0.3",
-                "debug": "^4.3.1",
-                "minimatch": "^3.0.5"
+                "@humanfs/core": "^0.19.1",
+                "@humanwhocodes/retry": "^0.3.0"
             },
             "engines": {
-                "node": ">=10.10.0"
+                "node": ">=18.18.0"
             }
         },
-        "node_modules/@humanwhocodes/config-array/node_modules/brace-expansion": {
-            "version": "1.1.11",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+        "node_modules/@humanfs/node/node_modules/@humanwhocodes/retry": {
+            "version": "0.3.1",
+            "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz",
+            "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==",
             "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "balanced-match": "^1.0.0",
-                "concat-map": "0.0.1"
-            }
-        },
-        "node_modules/@humanwhocodes/config-array/node_modules/minimatch": {
-            "version": "3.1.2",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-            "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-            "dev": true,
-            "license": "ISC",
-            "dependencies": {
-                "brace-expansion": "^1.1.7"
-            },
+            "license": "Apache-2.0",
             "engines": {
-                "node": "*"
+                "node": ">=18.18"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/nzakas"
             }
         },
         "node_modules/@humanwhocodes/module-importer": {
@@ -2052,18 +2241,25 @@
                 "url": "https://github.com/sponsors/nzakas"
             }
         },
-        "node_modules/@humanwhocodes/object-schema": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz",
-            "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==",
-            "deprecated": "Use @eslint/object-schema instead",
+        "node_modules/@humanwhocodes/retry": {
+            "version": "0.4.3",
+            "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.3.tgz",
+            "integrity": "sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==",
             "dev": true,
-            "license": "BSD-3-Clause"
+            "license": "Apache-2.0",
+            "engines": {
+                "node": ">=18.18"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/nzakas"
+            }
         },
         "node_modules/@isaacs/cliui": {
             "version": "8.0.2",
             "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz",
             "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==",
+            "dev": true,
             "license": "ISC",
             "dependencies": {
                 "string-width": "^5.1.2",
@@ -2081,6 +2277,7 @@
             "version": "6.1.0",
             "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
             "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+            "dev": true,
             "license": "MIT",
             "engines": {
                 "node": ">=12"
@@ -2093,6 +2290,7 @@
             "version": "6.2.1",
             "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
             "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+            "dev": true,
             "license": "MIT",
             "engines": {
                 "node": ">=12"
@@ -2105,6 +2303,7 @@
             "version": "5.1.2",
             "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
             "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==",
+            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "eastasianwidth": "^0.2.0",
@@ -2122,6 +2321,7 @@
             "version": "7.1.0",
             "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
             "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "ansi-regex": "^6.0.1"
@@ -2137,6 +2337,7 @@
             "version": "8.1.0",
             "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz",
             "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==",
+            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "ansi-styles": "^6.1.0",
@@ -2893,6 +3094,15 @@
                 "node": ">= 8"
             }
         },
+        "node_modules/@nornagon/put": {
+            "version": "0.0.8",
+            "resolved": "https://registry.npmjs.org/@nornagon/put/-/put-0.0.8.tgz",
+            "integrity": "sha512-ugvXJjwF5ldtUpa7D95kruNJ41yFQDEKyF5CW4TgKJnh+W/zmlBzXXeKTyqIgwMFrkePN2JqOBqcF0M0oOunow==",
+            "license": "MIT/X11",
+            "engines": {
+                "node": ">=0.3.0"
+            }
+        },
         "node_modules/@npmcli/fs": {
             "version": "2.1.2",
             "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-2.1.2.tgz",
@@ -3756,6 +3966,286 @@
                 "node": ">=14.0.0"
             }
         },
+        "node_modules/@rollup/rollup-android-arm-eabi": {
+            "version": "4.41.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.41.0.tgz",
+            "integrity": "sha512-KxN+zCjOYHGwCl4UCtSfZ6jrq/qi88JDUtiEFk8LELEHq2Egfc/FgW+jItZiOLRuQfb/3xJSgFuNPC9jzggX+A==",
+            "cpu": [
+                "arm"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "android"
+            ]
+        },
+        "node_modules/@rollup/rollup-android-arm64": {
+            "version": "4.41.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.41.0.tgz",
+            "integrity": "sha512-yDvqx3lWlcugozax3DItKJI5j05B0d4Kvnjx+5mwiUpWramVvmAByYigMplaoAQ3pvdprGCTCE03eduqE/8mPQ==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "android"
+            ]
+        },
+        "node_modules/@rollup/rollup-darwin-arm64": {
+            "version": "4.41.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.41.0.tgz",
+            "integrity": "sha512-2KOU574vD3gzcPSjxO0eyR5iWlnxxtmW1F5CkNOHmMlueKNCQkxR6+ekgWyVnz6zaZihpUNkGxjsYrkTJKhkaw==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "darwin"
+            ]
+        },
+        "node_modules/@rollup/rollup-darwin-x64": {
+            "version": "4.41.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.41.0.tgz",
+            "integrity": "sha512-gE5ACNSxHcEZyP2BA9TuTakfZvULEW4YAOtxl/A/YDbIir/wPKukde0BNPlnBiP88ecaN4BJI2TtAd+HKuZPQQ==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "darwin"
+            ]
+        },
+        "node_modules/@rollup/rollup-freebsd-arm64": {
+            "version": "4.41.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.41.0.tgz",
+            "integrity": "sha512-GSxU6r5HnWij7FoSo7cZg3l5GPg4HFLkzsFFh0N/b16q5buW1NAWuCJ+HMtIdUEi6XF0qH+hN0TEd78laRp7Dg==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "freebsd"
+            ]
+        },
+        "node_modules/@rollup/rollup-freebsd-x64": {
+            "version": "4.41.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.41.0.tgz",
+            "integrity": "sha512-KGiGKGDg8qLRyOWmk6IeiHJzsN/OYxO6nSbT0Vj4MwjS2XQy/5emsmtoqLAabqrohbgLWJ5GV3s/ljdrIr8Qjg==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "freebsd"
+            ]
+        },
+        "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
+            "version": "4.41.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.41.0.tgz",
+            "integrity": "sha512-46OzWeqEVQyX3N2/QdiU/CMXYDH/lSHpgfBkuhl3igpZiaB3ZIfSjKuOnybFVBQzjsLwkus2mjaESy8H41SzvA==",
+            "cpu": [
+                "arm"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/@rollup/rollup-linux-arm-musleabihf": {
+            "version": "4.41.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.41.0.tgz",
+            "integrity": "sha512-lfgW3KtQP4YauqdPpcUZHPcqQXmTmH4nYU0cplNeW583CMkAGjtImw4PKli09NFi2iQgChk4e9erkwlfYem6Lg==",
+            "cpu": [
+                "arm"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/@rollup/rollup-linux-arm64-gnu": {
+            "version": "4.41.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.41.0.tgz",
+            "integrity": "sha512-nn8mEyzMbdEJzT7cwxgObuwviMx6kPRxzYiOl6o/o+ChQq23gfdlZcUNnt89lPhhz3BYsZ72rp0rxNqBSfqlqw==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/@rollup/rollup-linux-arm64-musl": {
+            "version": "4.41.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.41.0.tgz",
+            "integrity": "sha512-l+QK99je2zUKGd31Gh+45c4pGDAqZSuWQiuRFCdHYC2CSiO47qUWsCcenrI6p22hvHZrDje9QjwSMAFL3iwXwQ==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
+            "version": "4.41.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.41.0.tgz",
+            "integrity": "sha512-WbnJaxPv1gPIm6S8O/Wg+wfE/OzGSXlBMbOe4ie+zMyykMOeqmgD1BhPxZQuDqwUN+0T/xOFtL2RUWBspnZj3w==",
+            "cpu": [
+                "loong64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
+            "version": "4.41.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.41.0.tgz",
+            "integrity": "sha512-eRDWR5t67/b2g8Q/S8XPi0YdbKcCs4WQ8vklNnUYLaSWF+Cbv2axZsp4jni6/j7eKvMLYCYdcsv8dcU+a6QNFg==",
+            "cpu": [
+                "ppc64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/@rollup/rollup-linux-riscv64-gnu": {
+            "version": "4.41.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.41.0.tgz",
+            "integrity": "sha512-TWrZb6GF5jsEKG7T1IHwlLMDRy2f3DPqYldmIhnA2DVqvvhY2Ai184vZGgahRrg8k9UBWoSlHv+suRfTN7Ua4A==",
+            "cpu": [
+                "riscv64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/@rollup/rollup-linux-riscv64-musl": {
+            "version": "4.41.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.41.0.tgz",
+            "integrity": "sha512-ieQljaZKuJpmWvd8gW87ZmSFwid6AxMDk5bhONJ57U8zT77zpZ/TPKkU9HpnnFrM4zsgr4kiGuzbIbZTGi7u9A==",
+            "cpu": [
+                "riscv64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/@rollup/rollup-linux-s390x-gnu": {
+            "version": "4.41.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.41.0.tgz",
+            "integrity": "sha512-/L3pW48SxrWAlVsKCN0dGLB2bi8Nv8pr5S5ocSM+S0XCn5RCVCXqi8GVtHFsOBBCSeR+u9brV2zno5+mg3S4Aw==",
+            "cpu": [
+                "s390x"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/@rollup/rollup-linux-x64-gnu": {
+            "version": "4.41.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.41.0.tgz",
+            "integrity": "sha512-XMLeKjyH8NsEDCRptf6LO8lJk23o9wvB+dJwcXMaH6ZQbbkHu2dbGIUindbMtRN6ux1xKi16iXWu6q9mu7gDhQ==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/@rollup/rollup-linux-x64-musl": {
+            "version": "4.41.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.41.0.tgz",
+            "integrity": "sha512-m/P7LycHZTvSQeXhFmgmdqEiTqSV80zn6xHaQ1JSqwCtD1YGtwEK515Qmy9DcB2HK4dOUVypQxvhVSy06cJPEg==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ]
+        },
+        "node_modules/@rollup/rollup-win32-arm64-msvc": {
+            "version": "4.41.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.41.0.tgz",
+            "integrity": "sha512-4yodtcOrFHpbomJGVEqZ8fzD4kfBeCbpsUy5Pqk4RluXOdsWdjLnjhiKy2w3qzcASWd04fp52Xz7JKarVJ5BTg==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "win32"
+            ]
+        },
+        "node_modules/@rollup/rollup-win32-ia32-msvc": {
+            "version": "4.41.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.41.0.tgz",
+            "integrity": "sha512-tmazCrAsKzdkXssEc65zIE1oC6xPHwfy9d5Ta25SRCDOZS+I6RypVVShWALNuU9bxIfGA0aqrmzlzoM5wO5SPQ==",
+            "cpu": [
+                "ia32"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "win32"
+            ]
+        },
+        "node_modules/@rollup/rollup-win32-x64-msvc": {
+            "version": "4.41.0",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.41.0.tgz",
+            "integrity": "sha512-h1J+Yzjo/X+0EAvR2kIXJDuTuyT7drc+t2ALY0nIcGPbTatNOf0VWdhEA2Z4AAjv6X1NJV7SYo5oCTYRJhSlVA==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "win32"
+            ]
+        },
         "node_modules/@rtsao/scc": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/@rtsao/scc/-/scc-1.1.0.tgz",
@@ -4038,6 +4528,39 @@
                 "deep-equal": "^2.0.5"
             }
         },
+        "node_modules/@testing-library/dom/node_modules/deep-equal": {
+            "version": "2.2.3",
+            "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.3.tgz",
+            "integrity": "sha512-ZIwpnevOurS8bpT4192sqAowWM76JDKSHYzMLty3BZGSswgq6pBaH3DhCSW5xVAZICZyKdOBPjwww5wfgT/6PA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "array-buffer-byte-length": "^1.0.0",
+                "call-bind": "^1.0.5",
+                "es-get-iterator": "^1.1.3",
+                "get-intrinsic": "^1.2.2",
+                "is-arguments": "^1.1.1",
+                "is-array-buffer": "^3.0.2",
+                "is-date-object": "^1.0.5",
+                "is-regex": "^1.1.4",
+                "is-shared-array-buffer": "^1.0.2",
+                "isarray": "^2.0.5",
+                "object-is": "^1.1.5",
+                "object-keys": "^1.1.1",
+                "object.assign": "^4.1.4",
+                "regexp.prototype.flags": "^1.5.1",
+                "side-channel": "^1.0.4",
+                "which-boxed-primitive": "^1.0.2",
+                "which-collection": "^1.0.1",
+                "which-typed-array": "^1.1.13"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
+            }
+        },
         "node_modules/@testing-library/jest-dom": {
             "version": "5.17.0",
             "resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-5.17.0.tgz",
@@ -4094,14 +4617,24 @@
                 "react-dom": "^18.0.0"
             }
         },
+        "node_modules/@testing-library/react/node_modules/@types/react-dom": {
+            "version": "18.3.7",
+            "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.7.tgz",
+            "integrity": "sha512-MEe3UeoENYVFXzoXEWsvcpg6ZvlrFNlOQ7EOsvhI3CfAXwzPfO8Qwuxd40nepsYKqyyVQnTdEfv68q91yLcKrQ==",
+            "dev": true,
+            "license": "MIT",
+            "peerDependencies": {
+                "@types/react": "^18.0.0"
+            }
+        },
         "node_modules/@tootallnate/once": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
-            "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
+            "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
             "dev": true,
             "license": "MIT",
             "engines": {
-                "node": ">= 10"
+                "node": ">= 6"
             }
         },
         "node_modules/@trysound/sax": {
@@ -4327,9 +4860,9 @@
             "license": "MIT"
         },
         "node_modules/@types/express": {
-            "version": "4.17.21",
-            "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz",
-            "integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==",
+            "version": "4.17.22",
+            "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.22.tgz",
+            "integrity": "sha512-eZUmSnhRX9YRSkplpz0N+k6NljUUn5l3EWZIKZvYzhvMphEuNiyyy1viH/ejgt66JWgALwC/gtSUAeQKtSwW/w==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -4532,11 +5065,14 @@
             "license": "MIT"
         },
         "node_modules/@types/node": {
-            "version": "17.0.45",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.45.tgz",
-            "integrity": "sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==",
+            "version": "22.15.18",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.18.tgz",
+            "integrity": "sha512-v1DKRfUdyW+jJhZNEI1PYy29S2YRxMV5AOO/x/SjKmW0acCIOqmbj6Haf9eHAhsPmrhlHSxEhv/1WszcLWV4cg==",
             "dev": true,
-            "license": "MIT"
+            "license": "MIT",
+            "dependencies": {
+                "undici-types": "~6.21.0"
+            }
         },
         "node_modules/@types/node-forge": {
             "version": "1.3.11",
@@ -4588,9 +5124,9 @@
             "license": "MIT"
         },
         "node_modules/@types/qs": {
-            "version": "6.9.18",
-            "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.18.tgz",
-            "integrity": "sha512-kK7dgTYDyGqS+e2Q4aK9X3D7q234CIZ1Bv0q/7Z5IwRDoADNU81xXJK/YVyLbLTZCoIwUoDoffFeF+p/eIklAA==",
+            "version": "6.14.0",
+            "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.14.0.tgz",
+            "integrity": "sha512-eOunJqu0K1923aExK6y8p6fsihYEn/BYuQ4g0CxAAgFc4b/ZLN4CrsRZ55srTdqoiLzU2B2evC+apEIxprEzkQ==",
             "dev": true,
             "license": "MIT"
         },
@@ -4602,24 +5138,23 @@
             "license": "MIT"
         },
         "node_modules/@types/react": {
-            "version": "18.3.20",
-            "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.20.tgz",
-            "integrity": "sha512-IPaCZN7PShZK/3t6Q87pfTkRm6oLTd4vztyoj+cbHUF1g3FfVb2tFIL79uCRKEfv16AhqDMBywP2VW3KIZUvcg==",
+            "version": "19.1.4",
+            "resolved": "https://registry.npmjs.org/@types/react/-/react-19.1.4.tgz",
+            "integrity": "sha512-EB1yiiYdvySuIITtD5lhW4yPyJ31RkJkkDw794LaQYrxCSaQV/47y5o1FMC4zF9ZyjUjzJMZwbovEnT5yHTW6g==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@types/prop-types": "*",
                 "csstype": "^3.0.2"
             }
         },
         "node_modules/@types/react-dom": {
-            "version": "18.3.6",
-            "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.6.tgz",
-            "integrity": "sha512-nf22//wEbKXusP6E9pfOCDwFdHAX4u172eaJI4YkDRQEZiorm6KfYnSC2SWLDMVWUOWPERmJnN0ujeAfTBLvrw==",
+            "version": "19.1.5",
+            "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-19.1.5.tgz",
+            "integrity": "sha512-CMCjrWucUBZvohgZxkjd6S9h0nZxXjzus6yDfUb+xLxYM7VvjKNH1tQrE9GWLql1XoOP4/Ds3bwFqShHUYraGg==",
             "dev": true,
             "license": "MIT",
             "peerDependencies": {
-                "@types/react": "^18.0.0"
+                "@types/react": "^19.0.0"
             }
         },
         "node_modules/@types/react-test-renderer": {
@@ -5090,12 +5625,35 @@
                 "url": "https://opencollective.com/typescript-eslint"
             }
         },
-        "node_modules/@ungap/structured-clone": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz",
-            "integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==",
+        "node_modules/@vitejs/plugin-react": {
+            "version": "4.4.1",
+            "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.4.1.tgz",
+            "integrity": "sha512-IpEm5ZmeXAP/osiBXVVP5KjFMzbWOonMs0NaQQl+xYnUAcq4oHUBsF2+p4MgKWG4YMmFYJU8A6sxRPuowllm6w==",
             "dev": true,
-            "license": "ISC"
+            "license": "MIT",
+            "dependencies": {
+                "@babel/core": "^7.26.10",
+                "@babel/plugin-transform-react-jsx-self": "^7.25.9",
+                "@babel/plugin-transform-react-jsx-source": "^7.25.9",
+                "@types/babel__core": "^7.20.5",
+                "react-refresh": "^0.17.0"
+            },
+            "engines": {
+                "node": "^14.18.0 || >=16.0.0"
+            },
+            "peerDependencies": {
+                "vite": "^4.2.0 || ^5.0.0 || ^6.0.0"
+            }
+        },
+        "node_modules/@vitejs/plugin-react/node_modules/react-refresh": {
+            "version": "0.17.0",
+            "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.17.0.tgz",
+            "integrity": "sha512-z6F7K9bV85EfseRCp2bzrpyQ0Gkw1uLoCel9XBVWPg/TjRj94SkJzUTGfOa4bs7iJvBWtQG0Wq7wnI0syw3EBQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
         },
         "node_modules/@vladfrangu/async_event_emitter": {
             "version": "2.4.6",
@@ -5368,6 +5926,25 @@
             "dev": true,
             "license": "ISC"
         },
+        "node_modules/abstract-socket": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/abstract-socket/-/abstract-socket-2.1.1.tgz",
+            "integrity": "sha512-YZJizsvS1aBua5Gd01woe4zuyYBGgSMeqDOB6/ChwdTI904KP6QGtJswXl4hcqWxbz86hQBe++HWV0hF1aGUtA==",
+            "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.",
+            "hasInstallScript": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "dependencies": {
+                "bindings": "^1.2.1",
+                "nan": "^2.12.1"
+            },
+            "engines": {
+                "node": ">=4.0.0"
+            }
+        },
         "node_modules/accepts": {
             "version": "1.3.8",
             "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
@@ -5460,16 +6037,13 @@
             }
         },
         "node_modules/agent-base": {
-            "version": "6.0.2",
-            "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
-            "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+            "version": "7.1.3",
+            "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
+            "integrity": "sha512-jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==",
             "dev": true,
             "license": "MIT",
-            "dependencies": {
-                "debug": "4"
-            },
             "engines": {
-                "node": ">= 6.0.0"
+                "node": ">= 14"
             }
         },
         "node_modules/agentkeepalive": {
@@ -5611,6 +6185,7 @@
             "version": "5.0.1",
             "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
             "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+            "dev": true,
             "license": "MIT",
             "engines": {
                 "node": ">=8"
@@ -5620,6 +6195,7 @@
             "version": "4.3.0",
             "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
             "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
+            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "color-convert": "^2.0.1"
@@ -5646,42 +6222,47 @@
             }
         },
         "node_modules/app-builder-bin": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-4.0.0.tgz",
-            "integrity": "sha512-xwdG0FJPQMe0M0UA4Tz0zEB8rBJTRA5a476ZawAqiBkMv16GRK5xpXThOjMaEOFnZ6zabejjG4J3da0SXG63KA==",
+            "version": "5.0.0-alpha.10",
+            "resolved": "https://registry.npmjs.org/app-builder-bin/-/app-builder-bin-5.0.0-alpha.10.tgz",
+            "integrity": "sha512-Ev4jj3D7Bo+O0GPD2NMvJl+PGiBAfS7pUGawntBNpCbxtpncfUixqFj9z9Jme7V7s3LBGqsWZZP54fxBX3JKJw==",
             "dev": true,
             "license": "MIT"
         },
         "node_modules/app-builder-lib": {
-            "version": "24.13.3",
-            "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-24.13.3.tgz",
-            "integrity": "sha512-FAzX6IBit2POXYGnTCT8YHFO/lr5AapAII6zzhQO3Rw4cEDOgK+t1xhLc5tNcKlicTHlo9zxIwnYCX9X2DLkig==",
+            "version": "25.1.8",
+            "resolved": "https://registry.npmjs.org/app-builder-lib/-/app-builder-lib-25.1.8.tgz",
+            "integrity": "sha512-pCqe7dfsQFBABC1jeKZXQWhGcCPF3rPCXDdfqVKjIeWBcXzyC1iOWZdfFhGl+S9MyE/k//DFmC6FzuGAUudNDg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@develar/schema-utils": "~2.6.5",
-                "@electron/notarize": "2.2.1",
-                "@electron/osx-sign": "1.0.5",
-                "@electron/universal": "1.5.1",
+                "@electron/notarize": "2.5.0",
+                "@electron/osx-sign": "1.3.1",
+                "@electron/rebuild": "3.6.1",
+                "@electron/universal": "2.0.1",
                 "@malept/flatpak-bundler": "^0.4.0",
                 "@types/fs-extra": "9.0.13",
                 "async-exit-hook": "^2.0.1",
                 "bluebird-lst": "^1.0.9",
-                "builder-util": "24.13.1",
-                "builder-util-runtime": "9.2.4",
+                "builder-util": "25.1.7",
+                "builder-util-runtime": "9.2.10",
                 "chromium-pickle-js": "^0.2.0",
+                "config-file-ts": "0.2.8-rc1",
                 "debug": "^4.3.4",
+                "dotenv": "^16.4.5",
+                "dotenv-expand": "^11.0.6",
                 "ejs": "^3.1.8",
-                "electron-publish": "24.13.1",
+                "electron-publish": "25.1.7",
                 "form-data": "^4.0.0",
                 "fs-extra": "^10.1.0",
                 "hosted-git-info": "^4.1.0",
                 "is-ci": "^3.0.0",
                 "isbinaryfile": "^5.0.0",
                 "js-yaml": "^4.1.0",
+                "json5": "^2.2.3",
                 "lazy-val": "^1.0.5",
-                "minimatch": "^5.1.1",
-                "read-config-file": "6.3.2",
+                "minimatch": "^10.0.0",
+                "resedit": "^1.7.0",
                 "sanitize-filename": "^1.6.3",
                 "semver": "^7.3.8",
                 "tar": "^6.1.12",
@@ -5691,8 +6272,59 @@
                 "node": ">=14.0.0"
             },
             "peerDependencies": {
-                "dmg-builder": "24.13.3",
-                "electron-builder-squirrel-windows": "24.13.3"
+                "dmg-builder": "25.1.8",
+                "electron-builder-squirrel-windows": "25.1.8"
+            }
+        },
+        "node_modules/app-builder-lib/node_modules/@electron/rebuild": {
+            "version": "3.6.1",
+            "resolved": "https://registry.npmjs.org/@electron/rebuild/-/rebuild-3.6.1.tgz",
+            "integrity": "sha512-f6596ZHpEq/YskUd8emYvOUne89ij8mQgjYFA5ru25QwbrRO+t1SImofdDv7kKOuWCmVOuU5tvfkbgGxIl3E/w==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@malept/cross-spawn-promise": "^2.0.0",
+                "chalk": "^4.0.0",
+                "debug": "^4.1.1",
+                "detect-libc": "^2.0.1",
+                "fs-extra": "^10.0.0",
+                "got": "^11.7.0",
+                "node-abi": "^3.45.0",
+                "node-api-version": "^0.2.0",
+                "node-gyp": "^9.0.0",
+                "ora": "^5.1.0",
+                "read-binary-file-arch": "^1.0.6",
+                "semver": "^7.3.5",
+                "tar": "^6.0.5",
+                "yargs": "^17.0.1"
+            },
+            "bin": {
+                "electron-rebuild": "lib/cli.js"
+            },
+            "engines": {
+                "node": ">=12.13.0"
+            }
+        },
+        "node_modules/aproba": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.0.0.tgz",
+            "integrity": "sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==",
+            "dev": true,
+            "license": "ISC"
+        },
+        "node_modules/are-we-there-yet": {
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz",
+            "integrity": "sha512-QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==",
+            "deprecated": "This package is no longer supported.",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "delegates": "^1.0.0",
+                "readable-stream": "^3.6.0"
+            },
+            "engines": {
+                "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
             }
         },
         "node_modules/arg": {
@@ -5709,11 +6341,12 @@
             "license": "Python-2.0"
         },
         "node_modules/aria-hidden": {
-            "version": "1.2.4",
-            "resolved": "https://registry.npmjs.org/aria-hidden/-/aria-hidden-1.2.4.tgz",
-            "integrity": "sha512-y+CcFFwelSXpLZk/7fMB2mUbGtX9lKycf1MWJ7CaTIERyitVlyQx6C+sxcROU2BAJ24OiZyK+8wj2i8AlBoS3A==",
+            "version": "1.2.5",
+            "resolved": "https://registry.npmjs.org/aria-hidden/-/aria-hidden-1.2.5.tgz",
+            "integrity": "sha512-N+u63/2br5AG+OSrk0rIgFOYPSEYlkD7Yk5fq3LDole6QDIAbAFpbchE5fhBiUdRV2Fa8pWAaXvy+VK/maBeTA==",
             "license": "MIT",
             "dependencies": {
+                "caniuse-lite": "^1.0.30001718",
                 "tslib": "^2.0.0"
             },
             "engines": {
@@ -6197,6 +6830,7 @@
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
             "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+            "dev": true,
             "license": "MIT"
         },
         "node_modules/bare-events": {
@@ -6258,6 +6892,16 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
+        "node_modules/bindings": {
+            "version": "1.5.0",
+            "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
+            "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "file-uri-to-path": "1.0.0"
+            }
+        },
         "node_modules/bl": {
             "version": "4.1.0",
             "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
@@ -6357,7 +7001,6 @@
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
             "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
-            "dev": true,
             "license": "ISC"
         },
         "node_modules/boolean": {
@@ -6373,6 +7016,7 @@
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
             "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "balanced-match": "^1.0.0"
@@ -6485,9 +7129,9 @@
             "license": "BSD-2-Clause"
         },
         "node_modules/browserslist": {
-            "version": "4.24.4",
-            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz",
-            "integrity": "sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==",
+            "version": "4.24.5",
+            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.5.tgz",
+            "integrity": "sha512-FDToo4Wo82hIdgc1CQ+NQD0hEhmpPjrZ3hiUgwgOG6IuTdlpr8jdjyG24P6cNP1yJpTLzS5OcGgSw0xmDU1/Tw==",
             "dev": true,
             "funding": [
                 {
@@ -6505,10 +7149,10 @@
             ],
             "license": "MIT",
             "dependencies": {
-                "caniuse-lite": "^1.0.30001688",
-                "electron-to-chromium": "^1.5.73",
+                "caniuse-lite": "^1.0.30001716",
+                "electron-to-chromium": "^1.5.149",
                 "node-releases": "^2.0.19",
-                "update-browserslist-db": "^1.1.1"
+                "update-browserslist-db": "^1.1.3"
             },
             "bin": {
                 "browserslist": "cli.js"
@@ -6575,6 +7219,13 @@
                 "ieee754": "^1.1.13"
             }
         },
+        "node_modules/buffer-builder": {
+            "version": "0.2.0",
+            "resolved": "https://registry.npmjs.org/buffer-builder/-/buffer-builder-0.2.0.tgz",
+            "integrity": "sha512-7VPMEPuYznPSoR21NE1zvd2Xna6c/CloiZCfcMXR1Jny6PjX0N4Nsa38zcBFo/FMK+BlA+FLKbJCQ0i2yxp+Xg==",
+            "dev": true,
+            "license": "MIT/X11"
+        },
         "node_modules/buffer-crc32": {
             "version": "0.2.13",
             "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
@@ -6585,44 +7236,30 @@
                 "node": "*"
             }
         },
-        "node_modules/buffer-equal": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/buffer-equal/-/buffer-equal-1.0.1.tgz",
-            "integrity": "sha512-QoV3ptgEaQpvVwbXdSO39iqPQTCxSF7A5U99AxbHYqUdCizL/lH2Z0A2y6nbZucxMEOtNyZfG2s6gsVugGpKkg==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
         "node_modules/buffer-from": {
             "version": "1.1.2",
             "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
             "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
-            "dev": true,
             "license": "MIT"
         },
         "node_modules/builder-util": {
-            "version": "24.13.1",
-            "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-24.13.1.tgz",
-            "integrity": "sha512-NhbCSIntruNDTOVI9fdXz0dihaqX2YuE1D6zZMrwiErzH4ELZHE6mdiB40wEgZNprDia+FghRFgKoAqMZRRjSA==",
+            "version": "25.1.7",
+            "resolved": "https://registry.npmjs.org/builder-util/-/builder-util-25.1.7.tgz",
+            "integrity": "sha512-7jPjzBwEGRbwNcep0gGNpLXG9P94VA3CPAZQCzxkFXiV2GMQKlziMbY//rXPI7WKfhsvGgFXjTcXdBEwgXw9ww==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@types/debug": "^4.1.6",
                 "7zip-bin": "~5.2.0",
-                "app-builder-bin": "4.0.0",
+                "app-builder-bin": "5.0.0-alpha.10",
                 "bluebird-lst": "^1.0.9",
-                "builder-util-runtime": "9.2.4",
+                "builder-util-runtime": "9.2.10",
                 "chalk": "^4.1.2",
                 "cross-spawn": "^7.0.3",
                 "debug": "^4.3.4",
                 "fs-extra": "^10.1.0",
-                "http-proxy-agent": "^5.0.0",
-                "https-proxy-agent": "^5.0.1",
+                "http-proxy-agent": "^7.0.0",
+                "https-proxy-agent": "^7.0.0",
                 "is-ci": "^3.0.0",
                 "js-yaml": "^4.1.0",
                 "source-map-support": "^0.5.19",
@@ -6631,9 +7268,9 @@
             }
         },
         "node_modules/builder-util-runtime": {
-            "version": "9.2.4",
-            "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.4.tgz",
-            "integrity": "sha512-upp+biKpN/XZMLim7aguUyW8s0FUpDvOtK6sbanMFDAMBzpHDqdhgVYm6zc9HJ6nWo7u2Lxk60i2M6Jd3aiNrA==",
+            "version": "9.2.10",
+            "resolved": "https://registry.npmjs.org/builder-util-runtime/-/builder-util-runtime-9.2.10.tgz",
+            "integrity": "sha512-6p/gfG1RJSQeIbz8TK5aPNkoztgY1q5TgmGFMAXcY8itsGW6Y2ld1ALsZ5UJn8rog7hKF3zHx5iQbNQ8uLcRlw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -6654,6 +7291,16 @@
                 "node": ">= 0.8"
             }
         },
+        "node_modules/cac": {
+            "version": "6.7.14",
+            "resolved": "https://registry.npmjs.org/cac/-/cac-6.7.14.tgz",
+            "integrity": "sha512-b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8"
+            }
+        },
         "node_modules/cacache": {
             "version": "16.1.3",
             "resolved": "https://registry.npmjs.org/cacache/-/cacache-16.1.3.tgz",
@@ -6727,7 +7374,6 @@
             "version": "1.0.8",
             "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz",
             "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "call-bind-apply-helpers": "^1.0.0",
@@ -6759,7 +7405,6 @@
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz",
             "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "call-bind-apply-helpers": "^1.0.2",
@@ -6870,10 +7515,9 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001715",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001715.tgz",
-            "integrity": "sha512-7ptkFGMm2OAOgvZpwgA4yjQ5SQbrNVGdRjzH0pBdy1Fasvcr+KAeECmbCAECzTuDuoX0FCY8KzUxjf9+9kfZEw==",
-            "dev": true,
+            "version": "1.0.30001718",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001718.tgz",
+            "integrity": "sha512-AflseV1ahcSunK53NfEs9gFWgOEmzr0f+kaMFA4xiLZlr9Hzt7HxcSpIFcnNCUkz6R6dWKa54rUz3HUmI3nVcw==",
             "funding": [
                 {
                     "type": "opencollective",
@@ -6930,7 +7574,6 @@
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0.tgz",
             "integrity": "sha512-quS9HgjQpdaXOvsZz82Oz7uxtXiy6UIsIQcpBj7HRw2M63Skasm9qlDocAM7jNuaxdhpPU7c4kJN+gA5MCu4ww==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "cheerio-select": "^2.1.0",
@@ -6956,7 +7599,6 @@
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/cheerio-select/-/cheerio-select-2.1.0.tgz",
             "integrity": "sha512-9v9kG0LvzrlcungtnJtpGNxY+fzECQKhK4EGJX2vByejiMX84MFNQw4UxPJl3bFbTMw+Dfs37XaIkCwTZfLh4g==",
-            "dev": true,
             "license": "BSD-2-Clause",
             "dependencies": {
                 "boolbase": "^1.0.0",
@@ -7229,6 +7871,7 @@
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
             "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "color-name": "~1.1.4"
@@ -7241,8 +7884,19 @@
             "version": "1.1.4",
             "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
             "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+            "dev": true,
             "license": "MIT"
         },
+        "node_modules/color-support": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/color-support/-/color-support-1.1.3.tgz",
+            "integrity": "sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==",
+            "dev": true,
+            "license": "ISC",
+            "bin": {
+                "color-support": "bin.js"
+            }
+        },
         "node_modules/colord": {
             "version": "2.9.3",
             "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
@@ -7257,6 +7911,13 @@
             "dev": true,
             "license": "MIT"
         },
+        "node_modules/colorjs.io": {
+            "version": "0.5.2",
+            "resolved": "https://registry.npmjs.org/colorjs.io/-/colorjs.io-0.5.2.tgz",
+            "integrity": "sha512-twmVoizEW7ylZSN32OgKdXRmo1qg+wT5/6C3xu5b9QsWzSFAhHLn2xd8ro0diCsKfCj1RdaTP/nrcW+vAoQPIw==",
+            "dev": true,
+            "license": "MIT"
+        },
         "node_modules/colors": {
             "version": "1.4.0",
             "resolved": "https://registry.npmjs.org/colors/-/colors-1.4.0.tgz",
@@ -7453,14 +8114,14 @@
             "license": "MIT"
         },
         "node_modules/config-file-ts": {
-            "version": "0.2.6",
-            "resolved": "https://registry.npmjs.org/config-file-ts/-/config-file-ts-0.2.6.tgz",
-            "integrity": "sha512-6boGVaglwblBgJqGyxm4+xCmEGcWgnWHSWHY5jad58awQhB6gftq0G8HbzU39YqCIYHMLAiL1yjwiZ36m/CL8w==",
+            "version": "0.2.8-rc1",
+            "resolved": "https://registry.npmjs.org/config-file-ts/-/config-file-ts-0.2.8-rc1.tgz",
+            "integrity": "sha512-GtNECbVI82bT4RiDIzBSVuTKoSHufnU7Ce7/42bkWZJZFLjmDF2WBpVsvRkhKCfKBnTBb3qZrBwPpFBU/Myvhg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "glob": "^10.3.10",
-                "typescript": "^5.3.3"
+                "glob": "^10.3.12",
+                "typescript": "^5.4.3"
             }
         },
         "node_modules/config-file-ts/node_modules/glob": {
@@ -7527,6 +8188,13 @@
                 "node": ">=0.8"
             }
         },
+        "node_modules/console-control-strings": {
+            "version": "1.1.0",
+            "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+            "integrity": "sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==",
+            "dev": true,
+            "license": "ISC"
+        },
         "node_modules/content-disposition": {
             "version": "0.5.4",
             "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
@@ -7589,9 +8257,9 @@
             }
         },
         "node_modules/core-js": {
-            "version": "3.41.0",
-            "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.41.0.tgz",
-            "integrity": "sha512-SJ4/EHwS36QMJd6h/Rg+GyR4A5xE0FSI3eZ+iBVpfqf1x0eTSg1smWLHrA+2jQThZSh97fmSgFSU8B61nxosxA==",
+            "version": "3.42.0",
+            "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.42.0.tgz",
+            "integrity": "sha512-Sz4PP4ZA+Rq4II21qkNqOEDTDrCvcANId3xpIgB34NDkWc3UduWj2dqEtN9yZIq8Dk3HyPI33x9sqqU5C8sr0g==",
             "dev": true,
             "hasInstallScript": true,
             "license": "MIT",
@@ -7601,9 +8269,9 @@
             }
         },
         "node_modules/core-js-pure": {
-            "version": "3.41.0",
-            "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.41.0.tgz",
-            "integrity": "sha512-71Gzp96T9YPk63aUvE5Q5qP+DryB4ZloUZPSOebGM88VNw8VNfvdA7z6kGA8iGOTEzAomsRidp4jXSmUIJsL+Q==",
+            "version": "3.42.0",
+            "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.42.0.tgz",
+            "integrity": "sha512-007bM04u91fF4kMgwom2I5cQxAFIy8jVulgr9eozILl/SZE53QOqnW/+vviC+wQWLv+AunBG+8Q0TLoeSsSxRQ==",
             "dev": true,
             "hasInstallScript": true,
             "license": "MIT",
@@ -7676,6 +8344,7 @@
             "version": "7.0.6",
             "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
             "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "path-key": "^3.1.0",
@@ -7873,7 +8542,6 @@
             "version": "5.1.0",
             "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz",
             "integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==",
-            "dev": true,
             "license": "BSD-2-Clause",
             "dependencies": {
                 "boolbase": "^1.0.0",
@@ -7915,7 +8583,6 @@
             "version": "6.1.0",
             "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
             "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
-            "dev": true,
             "license": "BSD-2-Clause",
             "engines": {
                 "node": ">= 6"
@@ -8206,6 +8873,24 @@
             "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==",
             "license": "MIT"
         },
+        "node_modules/dbus-next": {
+            "version": "0.9.2",
+            "resolved": "https://registry.npmjs.org/dbus-next/-/dbus-next-0.9.2.tgz",
+            "integrity": "sha512-tzQq/+wrTZ2yU+U5PoeXc97KABhX2v55C/T0finH3tSKYuI8H/SqppIFymBBrUHcK13LvEGY3vdj3ikPPenL5g==",
+            "license": "MIT",
+            "dependencies": {
+                "@nornagon/put": "0.0.8",
+                "event-stream": "3.3.4",
+                "hexy": "^0.2.10",
+                "jsbi": "^2.0.5",
+                "long": "^4.0.0",
+                "safe-buffer": "^5.1.1",
+                "xml2js": "^0.4.17"
+            },
+            "optionalDependencies": {
+                "abstract-socket": "^2.0.0"
+            }
+        },
         "node_modules/debounce": {
             "version": "1.2.1",
             "resolved": "https://registry.npmjs.org/debounce/-/debounce-1.2.1.tgz",
@@ -8229,9 +8914,9 @@
             }
         },
         "node_modules/debug": {
-            "version": "4.4.0",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
-            "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
+            "version": "4.4.1",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
+            "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
             "license": "MIT",
             "dependencies": {
                 "ms": "^2.1.3"
@@ -8339,30 +9024,17 @@
             "license": "MIT"
         },
         "node_modules/deep-equal": {
-            "version": "2.2.3",
-            "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.3.tgz",
-            "integrity": "sha512-ZIwpnevOurS8bpT4192sqAowWM76JDKSHYzMLty3BZGSswgq6pBaH3DhCSW5xVAZICZyKdOBPjwww5wfgT/6PA==",
-            "dev": true,
+            "version": "1.1.2",
+            "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.2.tgz",
+            "integrity": "sha512-5tdhKF6DbU7iIzrIOa1AOUt39ZRm13cmL1cGEh//aqR8x9+tNfbywRf0n5FD/18OKMdo7DNEtrX2t22ZAkI+eg==",
             "license": "MIT",
             "dependencies": {
-                "array-buffer-byte-length": "^1.0.0",
-                "call-bind": "^1.0.5",
-                "es-get-iterator": "^1.1.3",
-                "get-intrinsic": "^1.2.2",
                 "is-arguments": "^1.1.1",
-                "is-array-buffer": "^3.0.2",
                 "is-date-object": "^1.0.5",
                 "is-regex": "^1.1.4",
-                "is-shared-array-buffer": "^1.0.2",
-                "isarray": "^2.0.5",
                 "object-is": "^1.1.5",
                 "object-keys": "^1.1.1",
-                "object.assign": "^4.1.4",
-                "regexp.prototype.flags": "^1.5.1",
-                "side-channel": "^1.0.4",
-                "which-boxed-primitive": "^1.0.2",
-                "which-collection": "^1.0.1",
-                "which-typed-array": "^1.1.13"
+                "regexp.prototype.flags": "^1.5.1"
             },
             "engines": {
                 "node": ">= 0.4"
@@ -8437,7 +9109,6 @@
             "version": "1.1.4",
             "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
             "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "es-define-property": "^1.0.0",
@@ -8465,7 +9136,6 @@
             "version": "1.2.1",
             "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
             "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "define-data-property": "^1.0.1",
@@ -8488,6 +9158,13 @@
                 "node": ">=0.4.0"
             }
         },
+        "node_modules/delegates": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+            "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==",
+            "dev": true,
+            "license": "MIT"
+        },
         "node_modules/depd": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
@@ -8581,14 +9258,14 @@
             }
         },
         "node_modules/dir-compare": {
-            "version": "3.3.0",
-            "resolved": "https://registry.npmjs.org/dir-compare/-/dir-compare-3.3.0.tgz",
-            "integrity": "sha512-J7/et3WlGUCxjdnD3HAAzQ6nsnc0WL6DD7WcwJb7c39iH1+AWfg+9OqzJNaI6PkBwBvm1mhZNL9iY/nRiZXlPg==",
+            "version": "4.2.0",
+            "resolved": "https://registry.npmjs.org/dir-compare/-/dir-compare-4.2.0.tgz",
+            "integrity": "sha512-2xMCmOoMrdQIPHdsTawECdNPwlVFB9zGcz3kuhmBO6U3oU+UQjsue0i8ayLKpgBcm+hcXPMVSGUN9d+pvJ6+VQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "buffer-equal": "^1.0.0",
-                "minimatch": "^3.0.4"
+                "minimatch": "^3.0.5",
+                "p-limit": "^3.1.0 "
             }
         },
         "node_modules/dir-compare/node_modules/brace-expansion": {
@@ -8635,15 +9312,15 @@
             "license": "MIT"
         },
         "node_modules/dmg-builder": {
-            "version": "24.13.3",
-            "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-24.13.3.tgz",
-            "integrity": "sha512-rcJUkMfnJpfCboZoOOPf4L29TRtEieHNOeAbYPWPxlaBw/Z1RKrRA86dOI9rwaI4tQSc/RD82zTNHprfUHXsoQ==",
+            "version": "25.1.8",
+            "resolved": "https://registry.npmjs.org/dmg-builder/-/dmg-builder-25.1.8.tgz",
+            "integrity": "sha512-NoXo6Liy2heSklTI5OIZbCgXC1RzrDQsZkeEwXhdOro3FT1VBOvbubvscdPnjVuQ4AMwwv61oaH96AbiYg9EnQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "app-builder-lib": "24.13.3",
-                "builder-util": "24.13.1",
-                "builder-util-runtime": "9.2.4",
+                "app-builder-lib": "25.1.8",
+                "builder-util": "25.1.7",
+                "builder-util-runtime": "9.2.10",
                 "fs-extra": "^10.1.0",
                 "iconv-lite": "^0.6.2",
                 "js-yaml": "^4.1.0"
@@ -8693,16 +9370,16 @@
             }
         },
         "node_modules/doctrine": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
-            "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==",
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+            "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
                 "esutils": "^2.0.2"
             },
             "engines": {
-                "node": ">=6.0.0"
+                "node": ">=0.10.0"
             }
         },
         "node_modules/dom-accessibility-api": {
@@ -8736,7 +9413,6 @@
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
             "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "domelementtype": "^2.3.0",
@@ -8747,21 +9423,10 @@
                 "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
             }
         },
-        "node_modules/dom-serializer/node_modules/entities": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-            "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-            "dev": true,
-            "license": "BSD-2-Clause",
-            "funding": {
-                "url": "https://github.com/fb55/entities?sponsor=1"
-            }
-        },
         "node_modules/domelementtype": {
             "version": "2.3.0",
             "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
             "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-            "dev": true,
             "funding": [
                 {
                     "type": "github",
@@ -8798,7 +9463,6 @@
             "version": "5.0.3",
             "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
             "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
-            "dev": true,
             "license": "BSD-2-Clause",
             "dependencies": {
                 "domelementtype": "^2.3.0"
@@ -8823,7 +9487,6 @@
             "version": "3.2.2",
             "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.2.2.tgz",
             "integrity": "sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==",
-            "dev": true,
             "license": "BSD-2-Clause",
             "dependencies": {
                 "dom-serializer": "^2.0.0",
@@ -8861,21 +9524,33 @@
             }
         },
         "node_modules/dotenv": {
-            "version": "9.0.2",
-            "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-9.0.2.tgz",
-            "integrity": "sha512-I9OvvrHp4pIARv4+x9iuewrWycX6CcZtoAu1XrzPxc5UygMJXJZYmBsynku8IkrJwgypE5DGNjDPmPRhDCptUg==",
+            "version": "16.5.0",
+            "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.5.0.tgz",
+            "integrity": "sha512-m/C+AwOAr9/W1UOIZUo232ejMNnJAJtYQjUbHoNTBNTJSvqzzDh7vnrei3o3r3m9blf6ZoDkvcw0VmozNRFJxg==",
             "dev": true,
             "license": "BSD-2-Clause",
             "engines": {
-                "node": ">=10"
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://dotenvx.com"
             }
         },
         "node_modules/dotenv-expand": {
-            "version": "5.1.0",
-            "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-5.1.0.tgz",
-            "integrity": "sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==",
+            "version": "11.0.7",
+            "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-11.0.7.tgz",
+            "integrity": "sha512-zIHwmZPRshsCdpMDyVsqGmgyP0yT8GAgXUnkdAoJisxvf33k7yO6OuoKmcTGuXPWSsm8Oh88nZicRLA9Y0rUeA==",
             "dev": true,
-            "license": "BSD-2-Clause"
+            "license": "BSD-2-Clause",
+            "dependencies": {
+                "dotenv": "^16.4.5"
+            },
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://dotenvx.com"
+            }
         },
         "node_modules/dunder-proto": {
             "version": "1.0.1",
@@ -8895,13 +9570,13 @@
             "version": "0.1.2",
             "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
             "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
-            "dev": true,
             "license": "MIT"
         },
         "node_modules/eastasianwidth": {
             "version": "0.2.0",
             "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
             "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+            "dev": true,
             "license": "MIT"
         },
         "node_modules/ee-first": {
@@ -8928,9 +9603,9 @@
             }
         },
         "node_modules/electron": {
-            "version": "36.1.0",
-            "resolved": "https://registry.npmjs.org/electron/-/electron-36.1.0.tgz",
-            "integrity": "sha512-gnp3BnbKdGsVc7cm1qlEaZc8pJsR08mIs8H/yTo8gHEtFkGGJbDTVZOYNAfbQlL0aXh+ozv+CnyiNeDNkT1Upg==",
+            "version": "35.4.0",
+            "resolved": "https://registry.npmjs.org/electron/-/electron-35.4.0.tgz",
+            "integrity": "sha512-VIPSNcUnic00aaE83w6BW4Dj1kE8A5DU0nVbvwqotN3+gseGunbP4WyHp/kfKXVKQj1S3No3HnYxU5LJmYbAtw==",
             "dev": true,
             "hasInstallScript": true,
             "license": "MIT",
@@ -8947,21 +9622,20 @@
             }
         },
         "node_modules/electron-builder": {
-            "version": "24.13.3",
-            "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-24.13.3.tgz",
-            "integrity": "sha512-yZSgVHft5dNVlo31qmJAe4BVKQfFdwpRw7sFp1iQglDRCDD6r22zfRJuZlhtB5gp9FHUxCMEoWGq10SkCnMAIg==",
+            "version": "25.1.8",
+            "resolved": "https://registry.npmjs.org/electron-builder/-/electron-builder-25.1.8.tgz",
+            "integrity": "sha512-poRgAtUHHOnlzZnc9PK4nzG53xh74wj2Jy7jkTrqZ0MWPoHGh1M2+C//hGeYdA+4K8w4yiVCNYoLXF7ySj2Wig==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "app-builder-lib": "24.13.3",
-                "builder-util": "24.13.1",
-                "builder-util-runtime": "9.2.4",
+                "app-builder-lib": "25.1.8",
+                "builder-util": "25.1.7",
+                "builder-util-runtime": "9.2.10",
                 "chalk": "^4.1.2",
-                "dmg-builder": "24.13.3",
+                "dmg-builder": "25.1.8",
                 "fs-extra": "^10.1.0",
                 "is-ci": "^3.0.0",
                 "lazy-val": "^1.0.5",
-                "read-config-file": "6.3.2",
                 "simple-update-notifier": "2.0.0",
                 "yargs": "^17.6.2"
             },
@@ -9024,9 +9698,9 @@
             }
         },
         "node_modules/electron-log": {
-            "version": "5.3.4",
-            "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-5.3.4.tgz",
-            "integrity": "sha512-QLj0EbsA5R5Yy4vjGlLe7m8hPNZ/Enp7c7a2WH7RUPr0hIOp0vDaC+6bJM0th6+uZKiZGGH5a2aKzvYp3eYwDQ==",
+            "version": "5.4.0",
+            "resolved": "https://registry.npmjs.org/electron-log/-/electron-log-5.4.0.tgz",
+            "integrity": "sha512-AXI5OVppskrWxEAmCxuv8ovX+s2Br39CpCAgkGMNHQtjYT3IiVbSQTncEjFVGPgoH35ZygRm/mvUMBDWwhRxgg==",
             "license": "MIT",
             "engines": {
                 "node": ">= 14"
@@ -9064,15 +9738,15 @@
             }
         },
         "node_modules/electron-publish": {
-            "version": "24.13.1",
-            "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-24.13.1.tgz",
-            "integrity": "sha512-2ZgdEqJ8e9D17Hwp5LEq5mLQPjqU3lv/IALvgp+4W8VeNhryfGhYEQC/PgDPMrnWUp+l60Ou5SJLsu+k4mhQ8A==",
+            "version": "25.1.7",
+            "resolved": "https://registry.npmjs.org/electron-publish/-/electron-publish-25.1.7.tgz",
+            "integrity": "sha512-+jbTkR9m39eDBMP4gfbqglDd6UvBC7RLh5Y0MhFSsc6UkGHj9Vj9TWobxevHYMMqmoujL11ZLjfPpMX+Pt6YEg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@types/fs-extra": "^9.0.11",
-                "builder-util": "24.13.1",
-                "builder-util-runtime": "9.2.4",
+                "builder-util": "25.1.7",
+                "builder-util-runtime": "9.2.10",
                 "chalk": "^4.1.2",
                 "fs-extra": "^10.1.0",
                 "lazy-val": "^1.0.5",
@@ -9093,9 +9767,9 @@
             }
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.142",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.142.tgz",
-            "integrity": "sha512-Ah2HgkTu/9RhTDNThBtzu2Wirdy4DC9b0sMT1pUhbkZQ5U/iwmE+PHZX1MpjD5IkJCc2wSghgGG/B04szAx07w==",
+            "version": "1.5.155",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.155.tgz",
+            "integrity": "sha512-ps5KcGGmwL8VaeJlvlDlu4fORQpv3+GIcF5I3f9tUKUlJ/wsysh6HU8P5L1XWRYeXfA0oJd4PyM8ds8zTFf6Ng==",
             "dev": true,
             "license": "ISC"
         },
@@ -9128,14 +9802,34 @@
                 "node": ">=12.0.0"
             }
         },
-        "node_modules/electron/node_modules/@types/node": {
-            "version": "22.15.12",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.12.tgz",
-            "integrity": "sha512-K0fpC/ZVeb8G9rm7bH7vI0KAec4XHEhBam616nVJCV51bKzJ6oA3luG4WdKoaztxe70QaNjS/xBmcDLmr4PiGw==",
+        "node_modules/electron-vite": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/electron-vite/-/electron-vite-3.1.0.tgz",
+            "integrity": "sha512-M7aAzaRvSl5VO+6KN4neJCYLHLpF/iWo5ztchI/+wMxIieDZQqpbCYfaEHHHPH6eupEzfvZdLYdPdmvGqoVe0Q==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "undici-types": "~6.21.0"
+                "@babel/core": "^7.26.10",
+                "@babel/plugin-transform-arrow-functions": "^7.25.9",
+                "cac": "^6.7.14",
+                "esbuild": "^0.25.1",
+                "magic-string": "^0.30.17",
+                "picocolors": "^1.1.1"
+            },
+            "bin": {
+                "electron-vite": "bin/electron-vite.js"
+            },
+            "engines": {
+                "node": "^18.0.0 || >=20.0.0"
+            },
+            "peerDependencies": {
+                "@swc/core": "^1.0.0",
+                "vite": "^4.0.0 || ^5.0.0 || ^6.0.0"
+            },
+            "peerDependenciesMeta": {
+                "@swc/core": {
+                    "optional": true
+                }
             }
         },
         "node_modules/electronmon": {
@@ -9188,6 +9882,7 @@
             "version": "9.2.2",
             "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
             "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+            "dev": true,
             "license": "MIT"
         },
         "node_modules/emojis-list": {
@@ -9225,7 +9920,6 @@
             "version": "0.2.0",
             "resolved": "https://registry.npmjs.org/encoding-sniffer/-/encoding-sniffer-0.2.0.tgz",
             "integrity": "sha512-ju7Wq1kg04I3HtiYIOrUrdfdDvkyO9s5XM8QAj/bN61Yo/Vb4vgJxy5vi4Yxk01gWHbrofpPtpxM8bKger9jhg==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "iconv-lite": "^0.6.3",
@@ -9276,6 +9970,18 @@
             "dev": true,
             "license": "ISC"
         },
+        "node_modules/entities": {
+            "version": "4.5.0",
+            "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+            "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+            "license": "BSD-2-Clause",
+            "engines": {
+                "node": ">=0.12"
+            },
+            "funding": {
+                "url": "https://github.com/fb55/entities?sponsor=1"
+            }
+        },
         "node_modules/env-paths": {
             "version": "2.2.1",
             "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
@@ -9538,9 +10244,9 @@
             "optional": true
         },
         "node_modules/esbuild": {
-            "version": "0.25.3",
-            "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.3.tgz",
-            "integrity": "sha512-qKA6Pvai73+M2FtftpNKRxJ78GIjmFXFxd/1DVBqGo/qNhLSfv+G12n9pNoWdytJC8U00TrViOwpjT0zgqQS8Q==",
+            "version": "0.25.4",
+            "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.4.tgz",
+            "integrity": "sha512-8pgjLUcUjcgDg+2Q4NYXnPbo/vncAY4UmyaCm0jZevERqCHZIaWwdJHkf8XQtu4AxSKCdvrUbT0XUr1IdZzI8Q==",
             "dev": true,
             "hasInstallScript": true,
             "license": "MIT",
@@ -9551,31 +10257,31 @@
                 "node": ">=18"
             },
             "optionalDependencies": {
-                "@esbuild/aix-ppc64": "0.25.3",
-                "@esbuild/android-arm": "0.25.3",
-                "@esbuild/android-arm64": "0.25.3",
-                "@esbuild/android-x64": "0.25.3",
-                "@esbuild/darwin-arm64": "0.25.3",
-                "@esbuild/darwin-x64": "0.25.3",
-                "@esbuild/freebsd-arm64": "0.25.3",
-                "@esbuild/freebsd-x64": "0.25.3",
-                "@esbuild/linux-arm": "0.25.3",
-                "@esbuild/linux-arm64": "0.25.3",
-                "@esbuild/linux-ia32": "0.25.3",
-                "@esbuild/linux-loong64": "0.25.3",
-                "@esbuild/linux-mips64el": "0.25.3",
-                "@esbuild/linux-ppc64": "0.25.3",
-                "@esbuild/linux-riscv64": "0.25.3",
-                "@esbuild/linux-s390x": "0.25.3",
-                "@esbuild/linux-x64": "0.25.3",
-                "@esbuild/netbsd-arm64": "0.25.3",
-                "@esbuild/netbsd-x64": "0.25.3",
-                "@esbuild/openbsd-arm64": "0.25.3",
-                "@esbuild/openbsd-x64": "0.25.3",
-                "@esbuild/sunos-x64": "0.25.3",
-                "@esbuild/win32-arm64": "0.25.3",
-                "@esbuild/win32-ia32": "0.25.3",
-                "@esbuild/win32-x64": "0.25.3"
+                "@esbuild/aix-ppc64": "0.25.4",
+                "@esbuild/android-arm": "0.25.4",
+                "@esbuild/android-arm64": "0.25.4",
+                "@esbuild/android-x64": "0.25.4",
+                "@esbuild/darwin-arm64": "0.25.4",
+                "@esbuild/darwin-x64": "0.25.4",
+                "@esbuild/freebsd-arm64": "0.25.4",
+                "@esbuild/freebsd-x64": "0.25.4",
+                "@esbuild/linux-arm": "0.25.4",
+                "@esbuild/linux-arm64": "0.25.4",
+                "@esbuild/linux-ia32": "0.25.4",
+                "@esbuild/linux-loong64": "0.25.4",
+                "@esbuild/linux-mips64el": "0.25.4",
+                "@esbuild/linux-ppc64": "0.25.4",
+                "@esbuild/linux-riscv64": "0.25.4",
+                "@esbuild/linux-s390x": "0.25.4",
+                "@esbuild/linux-x64": "0.25.4",
+                "@esbuild/netbsd-arm64": "0.25.4",
+                "@esbuild/netbsd-x64": "0.25.4",
+                "@esbuild/openbsd-arm64": "0.25.4",
+                "@esbuild/openbsd-x64": "0.25.4",
+                "@esbuild/sunos-x64": "0.25.4",
+                "@esbuild/win32-arm64": "0.25.4",
+                "@esbuild/win32-ia32": "0.25.4",
+                "@esbuild/win32-x64": "0.25.4"
             }
         },
         "node_modules/escalade": {
@@ -9641,60 +10347,64 @@
             }
         },
         "node_modules/eslint": {
-            "version": "8.57.1",
-            "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.1.tgz",
-            "integrity": "sha512-ypowyDxpVSYpkXr9WPv2PAZCtNip1Mv5KTW0SCurXv/9iOpcrH9PaqUElksqEB6pChqHGDRCFTyrZlGhnLNGiA==",
-            "deprecated": "This version is no longer supported. Please see https://eslint.org/version-support for other options.",
+            "version": "9.27.0",
+            "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.27.0.tgz",
+            "integrity": "sha512-ixRawFQuMB9DZ7fjU3iGGganFDp3+45bPOdaRurcFHSXO1e/sYwUX/FtQZpLZJR6SjMoJH8hR2pPEAfDyCoU2Q==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@eslint-community/eslint-utils": "^4.2.0",
-                "@eslint-community/regexpp": "^4.6.1",
-                "@eslint/eslintrc": "^2.1.4",
-                "@eslint/js": "8.57.1",
-                "@humanwhocodes/config-array": "^0.13.0",
+                "@eslint-community/regexpp": "^4.12.1",
+                "@eslint/config-array": "^0.20.0",
+                "@eslint/config-helpers": "^0.2.1",
+                "@eslint/core": "^0.14.0",
+                "@eslint/eslintrc": "^3.3.1",
+                "@eslint/js": "9.27.0",
+                "@eslint/plugin-kit": "^0.3.1",
+                "@humanfs/node": "^0.16.6",
                 "@humanwhocodes/module-importer": "^1.0.1",
-                "@nodelib/fs.walk": "^1.2.8",
-                "@ungap/structured-clone": "^1.2.0",
+                "@humanwhocodes/retry": "^0.4.2",
+                "@types/estree": "^1.0.6",
+                "@types/json-schema": "^7.0.15",
                 "ajv": "^6.12.4",
                 "chalk": "^4.0.0",
-                "cross-spawn": "^7.0.2",
+                "cross-spawn": "^7.0.6",
                 "debug": "^4.3.2",
-                "doctrine": "^3.0.0",
                 "escape-string-regexp": "^4.0.0",
-                "eslint-scope": "^7.2.2",
-                "eslint-visitor-keys": "^3.4.3",
-                "espree": "^9.6.1",
-                "esquery": "^1.4.2",
+                "eslint-scope": "^8.3.0",
+                "eslint-visitor-keys": "^4.2.0",
+                "espree": "^10.3.0",
+                "esquery": "^1.5.0",
                 "esutils": "^2.0.2",
                 "fast-deep-equal": "^3.1.3",
-                "file-entry-cache": "^6.0.1",
+                "file-entry-cache": "^8.0.0",
                 "find-up": "^5.0.0",
                 "glob-parent": "^6.0.2",
-                "globals": "^13.19.0",
-                "graphemer": "^1.4.0",
                 "ignore": "^5.2.0",
                 "imurmurhash": "^0.1.4",
                 "is-glob": "^4.0.0",
-                "is-path-inside": "^3.0.3",
-                "js-yaml": "^4.1.0",
                 "json-stable-stringify-without-jsonify": "^1.0.1",
-                "levn": "^0.4.1",
                 "lodash.merge": "^4.6.2",
                 "minimatch": "^3.1.2",
                 "natural-compare": "^1.4.0",
-                "optionator": "^0.9.3",
-                "strip-ansi": "^6.0.1",
-                "text-table": "^0.2.0"
+                "optionator": "^0.9.3"
             },
             "bin": {
                 "eslint": "bin/eslint.js"
             },
             "engines": {
-                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
             },
             "funding": {
-                "url": "https://opencollective.com/eslint"
+                "url": "https://eslint.org/donate"
+            },
+            "peerDependencies": {
+                "jiti": "*"
+            },
+            "peerDependenciesMeta": {
+                "jiti": {
+                    "optional": true
+                }
             }
         },
         "node_modules/eslint-config-airbnb": {
@@ -10036,6 +10746,19 @@
                 "node": ">= 0.4"
             }
         },
+        "node_modules/eslint-config-erb/node_modules/eslint-config-prettier": {
+            "version": "9.1.0",
+            "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz",
+            "integrity": "sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==",
+            "dev": true,
+            "license": "MIT",
+            "bin": {
+                "eslint-config-prettier": "bin/cli.js"
+            },
+            "peerDependencies": {
+                "eslint": ">=7.0.0"
+            }
+        },
         "node_modules/eslint-config-erb/node_modules/eslint-plugin-jest": {
             "version": "27.9.0",
             "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-27.9.0.tgz",
@@ -10127,6 +10850,19 @@
                 "semver": "bin/semver.js"
             }
         },
+        "node_modules/eslint-config-erb/node_modules/eslint-plugin-react-hooks": {
+            "version": "4.6.2",
+            "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.2.tgz",
+            "integrity": "sha512-QzliNJq4GinDBcD8gPB5v0wh6g8q3SUi6EFF0x8N/BL9PoVs0atuGc47ozMRyOWAKdwaZ5OnbOEa3WR+dSGKuQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=10"
+            },
+            "peerDependencies": {
+                "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0"
+            }
+        },
         "node_modules/eslint-config-erb/node_modules/language-tags": {
             "version": "1.0.5",
             "resolved": "https://registry.npmjs.org/language-tags/-/language-tags-1.0.5.tgz",
@@ -10154,14 +10890,17 @@
             }
         },
         "node_modules/eslint-config-prettier": {
-            "version": "9.1.0",
-            "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-9.1.0.tgz",
-            "integrity": "sha512-NSWl5BFQWEPi1j4TjVNItzYV7dZXZ+wP6I6ZhrBGpChQhZRUaElihE9uRRkcbRnNb76UMKDF3r+WTmNcGPKsqw==",
+            "version": "10.1.5",
+            "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-10.1.5.tgz",
+            "integrity": "sha512-zc1UmCpNltmVY34vuLRV61r1K27sWuX39E+uyUnY8xS2Bex88VV9cugG+UZbRSRGtGyFboj+D8JODyme1plMpw==",
             "dev": true,
             "license": "MIT",
             "bin": {
                 "eslint-config-prettier": "bin/cli.js"
             },
+            "funding": {
+                "url": "https://opencollective.com/eslint-config-prettier"
+            },
             "peerDependencies": {
                 "eslint": ">=7.0.0"
             }
@@ -10424,19 +11163,6 @@
                 "ms": "^2.1.1"
             }
         },
-        "node_modules/eslint-plugin-import/node_modules/doctrine": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-            "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-            "dev": true,
-            "license": "Apache-2.0",
-            "dependencies": {
-                "esutils": "^2.0.2"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/eslint-plugin-import/node_modules/minimatch": {
             "version": "3.1.2",
             "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
@@ -10539,10 +11265,171 @@
                 "node": "*"
             }
         },
+        "node_modules/eslint-plugin-perfectionist": {
+            "version": "4.13.0",
+            "resolved": "https://registry.npmjs.org/eslint-plugin-perfectionist/-/eslint-plugin-perfectionist-4.13.0.tgz",
+            "integrity": "sha512-dsPwXwV7IrG26PJ+h1crQ1f5kxay/gQAU0NJnbVTQc91l5Mz9kPjyIZ7fXgie+QSgi8a+0TwGbfaJx+GIhzuoQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@typescript-eslint/types": "^8.32.1",
+                "@typescript-eslint/utils": "^8.32.1",
+                "natural-orderby": "^5.0.0"
+            },
+            "engines": {
+                "node": "^18.0.0 || >=20.0.0"
+            },
+            "peerDependencies": {
+                "eslint": ">=8.45.0"
+            }
+        },
+        "node_modules/eslint-plugin-perfectionist/node_modules/@typescript-eslint/scope-manager": {
+            "version": "8.32.1",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.32.1.tgz",
+            "integrity": "sha512-7IsIaIDeZn7kffk7qXC3o6Z4UblZJKV3UBpkvRNpr5NSyLji7tvTcvmnMNYuYLyh26mN8W723xpo3i4MlD33vA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@typescript-eslint/types": "8.32.1",
+                "@typescript-eslint/visitor-keys": "8.32.1"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            }
+        },
+        "node_modules/eslint-plugin-perfectionist/node_modules/@typescript-eslint/types": {
+            "version": "8.32.1",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.32.1.tgz",
+            "integrity": "sha512-YmybwXUJcgGqgAp6bEsgpPXEg6dcCyPyCSr0CAAueacR/CCBi25G3V8gGQ2kRzQRBNol7VQknxMs9HvVa9Rvfg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            }
+        },
+        "node_modules/eslint-plugin-perfectionist/node_modules/@typescript-eslint/typescript-estree": {
+            "version": "8.32.1",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.32.1.tgz",
+            "integrity": "sha512-Y3AP9EIfYwBb4kWGb+simvPaqQoT5oJuzzj9m0i6FCY6SPvlomY2Ei4UEMm7+FXtlNJbor80ximyslzaQF6xhg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@typescript-eslint/types": "8.32.1",
+                "@typescript-eslint/visitor-keys": "8.32.1",
+                "debug": "^4.3.4",
+                "fast-glob": "^3.3.2",
+                "is-glob": "^4.0.3",
+                "minimatch": "^9.0.4",
+                "semver": "^7.6.0",
+                "ts-api-utils": "^2.1.0"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            },
+            "peerDependencies": {
+                "typescript": ">=4.8.4 <5.9.0"
+            }
+        },
+        "node_modules/eslint-plugin-perfectionist/node_modules/@typescript-eslint/utils": {
+            "version": "8.32.1",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.32.1.tgz",
+            "integrity": "sha512-DsSFNIgLSrc89gpq1LJB7Hm1YpuhK086DRDJSNrewcGvYloWW1vZLHBTIvarKZDcAORIy/uWNx8Gad+4oMpkSA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@eslint-community/eslint-utils": "^4.7.0",
+                "@typescript-eslint/scope-manager": "8.32.1",
+                "@typescript-eslint/types": "8.32.1",
+                "@typescript-eslint/typescript-estree": "8.32.1"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            },
+            "peerDependencies": {
+                "eslint": "^8.57.0 || ^9.0.0",
+                "typescript": ">=4.8.4 <5.9.0"
+            }
+        },
+        "node_modules/eslint-plugin-perfectionist/node_modules/@typescript-eslint/visitor-keys": {
+            "version": "8.32.1",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.32.1.tgz",
+            "integrity": "sha512-ar0tjQfObzhSaW3C3QNmTc5ofj0hDoNQ5XWrCy6zDyabdr0TWhCkClp+rywGNj/odAFBVzzJrK4tEq5M4Hmu4w==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@typescript-eslint/types": "8.32.1",
+                "eslint-visitor-keys": "^4.2.0"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            }
+        },
+        "node_modules/eslint-plugin-perfectionist/node_modules/eslint-visitor-keys": {
+            "version": "4.2.0",
+            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
+            "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/eslint"
+            }
+        },
+        "node_modules/eslint-plugin-perfectionist/node_modules/minimatch": {
+            "version": "9.0.5",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+            "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "brace-expansion": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=16 || 14 >=14.17"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/eslint-plugin-perfectionist/node_modules/ts-api-utils": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz",
+            "integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=18.12"
+            },
+            "peerDependencies": {
+                "typescript": ">=4.8.4"
+            }
+        },
         "node_modules/eslint-plugin-prettier": {
-            "version": "5.2.6",
-            "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.2.6.tgz",
-            "integrity": "sha512-mUcf7QG2Tjk7H055Jk0lGBjbgDnfrvqjhXh9t2xLMSCjZVcw9Rb1V6sVNXO0th3jgeO7zllWPTNRil3JW94TnQ==",
+            "version": "5.4.0",
+            "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-5.4.0.tgz",
+            "integrity": "sha512-BvQOvUhkVQM1i63iMETK9Hjud9QhqBnbtT1Zc642p9ynzBuCe5pybkOnvqZIBypXmMlsGcnU4HZ8sCTPfpAexA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -10620,16 +11507,26 @@
             }
         },
         "node_modules/eslint-plugin-react-hooks": {
-            "version": "4.6.2",
-            "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.6.2.tgz",
-            "integrity": "sha512-QzliNJq4GinDBcD8gPB5v0wh6g8q3SUi6EFF0x8N/BL9PoVs0atuGc47ozMRyOWAKdwaZ5OnbOEa3WR+dSGKuQ==",
+            "version": "5.2.0",
+            "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-5.2.0.tgz",
+            "integrity": "sha512-+f15FfK64YQwZdJNELETdn5ibXEUQmW1DZL6KXhNnc2heoy/sg9VJJeT7n8TlMWouzWqSWavFkIhHyIbIAEapg==",
             "dev": true,
             "license": "MIT",
             "engines": {
                 "node": ">=10"
             },
             "peerDependencies": {
-                "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0"
+                "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 || ^9.0.0"
+            }
+        },
+        "node_modules/eslint-plugin-react-refresh": {
+            "version": "0.4.20",
+            "resolved": "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.20.tgz",
+            "integrity": "sha512-XpbHQ2q5gUF8BGOX4dHe+71qoirYMhApEPZ7sfhF/dNnOF1UXnCMGZf79SFTBO7Bz5YEIT4TMieSlJBWhP9WBA==",
+            "dev": true,
+            "license": "MIT",
+            "peerDependencies": {
+                "eslint": ">=8.40"
             }
         },
         "node_modules/eslint-plugin-react/node_modules/brace-expansion": {
@@ -10643,19 +11540,6 @@
                 "concat-map": "0.0.1"
             }
         },
-        "node_modules/eslint-plugin-react/node_modules/doctrine": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-            "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-            "dev": true,
-            "license": "Apache-2.0",
-            "dependencies": {
-                "esutils": "^2.0.2"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
         "node_modules/eslint-plugin-react/node_modules/minimatch": {
             "version": "3.1.2",
             "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
@@ -10820,9 +11704,9 @@
             }
         },
         "node_modules/eslint/node_modules/eslint-scope": {
-            "version": "7.2.2",
-            "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz",
-            "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==",
+            "version": "8.3.0",
+            "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.3.0.tgz",
+            "integrity": "sha512-pUNxi75F8MJ/GdeKtVLSbYg4ZI34J6C0C7sbL4YOp2exGwen7ZsuBqKzUhXd0qMQ362yET3z+uPwKeg/0C2XCQ==",
             "dev": true,
             "license": "BSD-2-Clause",
             "dependencies": {
@@ -10830,26 +11714,23 @@
                 "estraverse": "^5.2.0"
             },
             "engines": {
-                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
             },
             "funding": {
                 "url": "https://opencollective.com/eslint"
             }
         },
-        "node_modules/eslint/node_modules/globals": {
-            "version": "13.24.0",
-            "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz",
-            "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==",
+        "node_modules/eslint/node_modules/eslint-visitor-keys": {
+            "version": "4.2.0",
+            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
+            "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
             "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "type-fest": "^0.20.2"
-            },
+            "license": "Apache-2.0",
             "engines": {
-                "node": ">=8"
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
             },
             "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
+                "url": "https://opencollective.com/eslint"
             }
         },
         "node_modules/eslint/node_modules/minimatch": {
@@ -10865,32 +11746,32 @@
                 "node": "*"
             }
         },
-        "node_modules/eslint/node_modules/type-fest": {
-            "version": "0.20.2",
-            "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz",
-            "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==",
-            "dev": true,
-            "license": "(MIT OR CC0-1.0)",
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
         "node_modules/espree": {
-            "version": "9.6.1",
-            "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz",
-            "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==",
+            "version": "10.3.0",
+            "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz",
+            "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==",
             "dev": true,
             "license": "BSD-2-Clause",
             "dependencies": {
-                "acorn": "^8.9.0",
+                "acorn": "^8.14.0",
                 "acorn-jsx": "^5.3.2",
-                "eslint-visitor-keys": "^3.4.1"
+                "eslint-visitor-keys": "^4.2.0"
             },
             "engines": {
-                "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/eslint"
+            }
+        },
+        "node_modules/espree/node_modules/eslint-visitor-keys": {
+            "version": "4.2.0",
+            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
+            "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
             },
             "funding": {
                 "url": "https://opencollective.com/eslint"
@@ -10973,6 +11854,21 @@
                 "node": ">= 0.6"
             }
         },
+        "node_modules/event-stream": {
+            "version": "3.3.4",
+            "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
+            "integrity": "sha512-QHpkERcGsR0T7Qm3HNJSyXKEEj8AHNxkY3PK8TS2KJvQ7NiSHe3DDpwVKKtoYprL/AreyzFBeIkBIWChAqn60g==",
+            "license": "MIT",
+            "dependencies": {
+                "duplexer": "~0.1.1",
+                "from": "~0",
+                "map-stream": "~0.1.0",
+                "pause-stream": "0.0.11",
+                "split": "0.3",
+                "stream-combiner": "~0.0.4",
+                "through": "~2.3.1"
+            }
+        },
         "node_modules/eventemitter3": {
             "version": "4.0.7",
             "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
@@ -11297,17 +12193,32 @@
                 "pend": "~1.2.0"
             }
         },
+        "node_modules/fdir": {
+            "version": "6.4.4",
+            "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.4.tgz",
+            "integrity": "sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==",
+            "dev": true,
+            "license": "MIT",
+            "peerDependencies": {
+                "picomatch": "^3 || ^4"
+            },
+            "peerDependenciesMeta": {
+                "picomatch": {
+                    "optional": true
+                }
+            }
+        },
         "node_modules/file-entry-cache": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz",
-            "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==",
+            "version": "8.0.0",
+            "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz",
+            "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "flat-cache": "^3.0.4"
+                "flat-cache": "^4.0.0"
             },
             "engines": {
-                "node": "^10.12.0 || >=12.0.0"
+                "node": ">=16.0.0"
             }
         },
         "node_modules/file-loader": {
@@ -11331,6 +12242,13 @@
                 "webpack": "^4.0.0 || ^5.0.0"
             }
         },
+        "node_modules/file-uri-to-path": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+            "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+            "license": "MIT",
+            "optional": true
+        },
         "node_modules/filelist": {
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz",
@@ -11341,6 +12259,19 @@
                 "minimatch": "^5.0.1"
             }
         },
+        "node_modules/filelist/node_modules/minimatch": {
+            "version": "5.1.6",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+            "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "brace-expansion": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
         "node_modules/fill-range": {
             "version": "7.1.1",
             "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
@@ -11424,18 +12355,17 @@
             }
         },
         "node_modules/flat-cache": {
-            "version": "3.2.0",
-            "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz",
-            "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==",
+            "version": "4.0.1",
+            "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz",
+            "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "flatted": "^3.2.9",
-                "keyv": "^4.5.3",
-                "rimraf": "^3.0.2"
+                "keyv": "^4.5.4"
             },
             "engines": {
-                "node": "^10.12.0 || >=12.0.0"
+                "node": ">=16"
             }
         },
         "node_modules/flatted": {
@@ -11485,6 +12415,7 @@
             "version": "3.3.1",
             "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz",
             "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==",
+            "dev": true,
             "license": "ISC",
             "dependencies": {
                 "cross-spawn": "^7.0.6",
@@ -11501,6 +12432,7 @@
             "version": "4.1.0",
             "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz",
             "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==",
+            "dev": true,
             "license": "ISC",
             "engines": {
                 "node": ">=14"
@@ -11577,6 +12509,12 @@
                 "node": ">= 0.6"
             }
         },
+        "node_modules/from": {
+            "version": "0.1.7",
+            "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz",
+            "integrity": "sha512-twe20eF1OxVxp/ML/kq2p1uc6KvFK/+vs8WjEbeKmV2He22MKm7YF2ANIt+EOqhJ5L3K/SuuPhk0hWQDjOM23g==",
+            "license": "MIT"
+        },
         "node_modules/fs-extra": {
             "version": "10.1.0",
             "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.1.0.tgz",
@@ -11747,7 +12685,6 @@
             "version": "1.2.3",
             "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
             "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
-            "dev": true,
             "license": "MIT",
             "funding": {
                 "url": "https://github.com/sponsors/ljharb"
@@ -11762,6 +12699,27 @@
                 "node": ">=10"
             }
         },
+        "node_modules/gauge": {
+            "version": "4.0.4",
+            "resolved": "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz",
+            "integrity": "sha512-f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==",
+            "deprecated": "This package is no longer supported.",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "aproba": "^1.0.3 || ^2.0.0",
+                "color-support": "^1.1.3",
+                "console-control-strings": "^1.1.0",
+                "has-unicode": "^2.0.1",
+                "signal-exit": "^3.0.7",
+                "string-width": "^4.2.3",
+                "strip-ansi": "^6.0.1",
+                "wide-align": "^1.1.5"
+            },
+            "engines": {
+                "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+            }
+        },
         "node_modules/gensync": {
             "version": "1.0.0-beta.2",
             "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
@@ -11946,6 +12904,19 @@
             "dev": true,
             "license": "BSD-2-Clause"
         },
+        "node_modules/glob/node_modules/minimatch": {
+            "version": "5.1.6",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+            "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "brace-expansion": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=10"
+            }
+        },
         "node_modules/global-agent": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-3.0.0.tgz",
@@ -12007,12 +12978,16 @@
             }
         },
         "node_modules/globals": {
-            "version": "11.12.0",
-            "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-            "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
+            "version": "16.1.0",
+            "resolved": "https://registry.npmjs.org/globals/-/globals-16.1.0.tgz",
+            "integrity": "sha512-aibexHNbb/jiUSObBgpHLj+sIuUmJnYcgXBlrfsiDZ9rt4aF2TFRbyLgZ2iFQuVZ1K5Mx3FVkbKRSgKrbK3K2g==",
+            "dev": true,
             "license": "MIT",
             "engines": {
-                "node": ">=4"
+                "node": ">=18"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
             }
         },
         "node_modules/globalthis": {
@@ -12198,7 +13173,6 @@
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
             "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "es-define-property": "^1.0.0"
@@ -12250,6 +13224,13 @@
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
+        "node_modules/has-unicode": {
+            "version": "2.0.1",
+            "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+            "integrity": "sha512-8Rf9Y83NBReMnx0gFzA8JImQACstCYWUplepDa9xprwwtmgEZUF0h/i5xSA625zB/I37EtrswSST6OXxwaaIJQ==",
+            "dev": true,
+            "license": "ISC"
+        },
         "node_modules/hasown": {
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
@@ -12317,6 +13298,15 @@
             "dev": true,
             "license": "MIT"
         },
+        "node_modules/hexy": {
+            "version": "0.2.11",
+            "resolved": "https://registry.npmjs.org/hexy/-/hexy-0.2.11.tgz",
+            "integrity": "sha512-ciq6hFsSG/Bpt2DmrZJtv+56zpPdnq+NQ4ijEFrveKN0ZG1mhl/LdT1NQZ9se6ty1fACcI4d4vYqC9v8EYpH2A==",
+            "license": "MIT",
+            "bin": {
+                "hexy": "bin/hexy_cmd.js"
+            }
+        },
         "node_modules/history": {
             "version": "5.3.0",
             "resolved": "https://registry.npmjs.org/history/-/history-5.3.0.tgz",
@@ -12572,7 +13562,6 @@
             "version": "9.1.0",
             "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-9.1.0.tgz",
             "integrity": "sha512-5zfg6mHUoaer/97TxnGpxmbR7zJtPwIYFMZ/H5ucTlPZhKvtum05yiPK3Mgai3a0DyVxv7qYqoweaEd2nrYQzQ==",
-            "dev": true,
             "funding": [
                 "https://github.com/fb55/htmlparser2?sponsor=1",
                 {
@@ -12588,20 +13577,10 @@
                 "entities": "^4.5.0"
             }
         },
-        "node_modules/htmlparser2/node_modules/entities": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-            "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-            "dev": true,
-            "license": "BSD-2-Clause",
-            "funding": {
-                "url": "https://github.com/fb55/entities?sponsor=1"
-            }
-        },
         "node_modules/http-cache-semantics": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
-            "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==",
+            "version": "4.2.0",
+            "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.2.0.tgz",
+            "integrity": "sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ==",
             "dev": true,
             "license": "BSD-2-Clause"
         },
@@ -12652,18 +13631,17 @@
             }
         },
         "node_modules/http-proxy-agent": {
-            "version": "5.0.0",
-            "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
-            "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
+            "version": "7.0.2",
+            "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz",
+            "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@tootallnate/once": "2",
-                "agent-base": "6",
-                "debug": "4"
+                "agent-base": "^7.1.0",
+                "debug": "^4.3.4"
             },
             "engines": {
-                "node": ">= 6"
+                "node": ">= 14"
             }
         },
         "node_modules/http-proxy-middleware": {
@@ -12719,17 +13697,17 @@
             }
         },
         "node_modules/https-proxy-agent": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
-            "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+            "version": "7.0.6",
+            "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz",
+            "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "agent-base": "6",
+                "agent-base": "^7.1.2",
                 "debug": "4"
             },
             "engines": {
-                "node": ">= 6"
+                "node": ">= 14"
             }
         },
         "node_modules/human-signals": {
@@ -12917,7 +13895,6 @@
             "version": "0.6.3",
             "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
             "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "safer-buffer": ">= 2.1.2 < 3.0.0"
@@ -12940,9 +13917,9 @@
             }
         },
         "node_modules/idb-keyval": {
-            "version": "6.2.1",
-            "resolved": "https://registry.npmjs.org/idb-keyval/-/idb-keyval-6.2.1.tgz",
-            "integrity": "sha512-8Sb3veuYCyrZL+VBt9LJfZjLUPWVvqn8tG28VqYNFCo43KHcKuq+b4EiXGeuaLAQWL2YmyDgMp2aSpH9JHsEQg==",
+            "version": "6.2.2",
+            "resolved": "https://registry.npmjs.org/idb-keyval/-/idb-keyval-6.2.2.tgz",
+            "integrity": "sha512-yjD9nARJ/jb1g+CvD0tlhUHOrJ9Sy0P8T9MF3YaLlHnSRpwPfpTX0XIvpmw3gAJUmEu3FiICLBDPXVwyEvrleg==",
             "license": "Apache-2.0"
         },
         "node_modules/identity-obj-proxy": {
@@ -13007,9 +13984,9 @@
             }
         },
         "node_modules/immutable": {
-            "version": "5.1.1",
-            "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.1.tgz",
-            "integrity": "sha512-3jatXi9ObIsPGr3N5hGw/vWWcTkq6hUYhpQz4k0wLC+owqWi/LiugIw9x0EdNZ2yGedKN/HzePiBvaJRXa0Ujg==",
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/immutable/-/immutable-5.1.2.tgz",
+            "integrity": "sha512-qHKXW1q6liAk1Oys6umoaZbDRqjcjgSrbnrifHsfsttza7zcvRAsL7mMV6xWcyhwQy7Xj5v4hhbr6b+iDYwlmQ==",
             "dev": true,
             "license": "MIT"
         },
@@ -13188,7 +14165,6 @@
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.2.0.tgz",
             "integrity": "sha512-7bVbi0huj/wrIAOzb8U1aszg9kdi3KN/CyU19CTI7tAoZYEZoL9yCDXpbXN+uPsuWnP02cyug1gleqq+TU+YCA==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "call-bound": "^1.0.2",
@@ -13360,7 +14336,6 @@
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.1.0.tgz",
             "integrity": "sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "call-bound": "^1.0.2",
@@ -13425,6 +14400,7 @@
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
             "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+            "dev": true,
             "license": "MIT",
             "engines": {
                 "node": ">=8"
@@ -13548,16 +14524,6 @@
                 "node": ">=8"
             }
         },
-        "node_modules/is-path-inside": {
-            "version": "3.0.3",
-            "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-            "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=8"
-            }
-        },
         "node_modules/is-plain-obj": {
             "version": "4.1.0",
             "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-4.1.0.tgz",
@@ -13592,7 +14558,6 @@
             "version": "1.2.1",
             "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz",
             "integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "call-bound": "^1.0.2",
@@ -13825,6 +14790,7 @@
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
             "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+            "dev": true,
             "license": "ISC"
         },
         "node_modules/isobject": {
@@ -14790,6 +15756,11 @@
                 "js-yaml": "bin/js-yaml.js"
             }
         },
+        "node_modules/jsbi": {
+            "version": "2.0.5",
+            "resolved": "https://registry.npmjs.org/jsbi/-/jsbi-2.0.5.tgz",
+            "integrity": "sha512-TzO/62Hxeb26QMb4IGlI/5X+QLr9Uqp1FPkwp2+KOICW+Q+vSuFj61c8pkT6wAns4WcK56X7CmSHhJeDGWOqxQ=="
+        },
         "node_modules/jsbn": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-1.1.0.tgz",
@@ -14844,14 +15815,17 @@
                 }
             }
         },
-        "node_modules/jsdom/node_modules/@tootallnate/once": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
-            "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
+        "node_modules/jsdom/node_modules/agent-base": {
+            "version": "6.0.2",
+            "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+            "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
             "dev": true,
             "license": "MIT",
+            "dependencies": {
+                "debug": "4"
+            },
             "engines": {
-                "node": ">= 6"
+                "node": ">= 6.0.0"
             }
         },
         "node_modules/jsdom/node_modules/form-data": {
@@ -14885,6 +15859,20 @@
                 "node": ">= 6"
             }
         },
+        "node_modules/jsdom/node_modules/https-proxy-agent": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+            "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "agent-base": "6",
+                "debug": "4"
+            },
+            "engines": {
+                "node": ">= 6"
+            }
+        },
         "node_modules/jsdom/node_modules/iconv-lite": {
             "version": "0.4.24",
             "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
@@ -15623,6 +16611,12 @@
                 "node": ">=8"
             }
         },
+        "node_modules/long": {
+            "version": "4.0.0",
+            "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz",
+            "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==",
+            "license": "Apache-2.0"
+        },
         "node_modules/loose-envify": {
             "version": "1.4.0",
             "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
@@ -15676,118 +16670,19 @@
             }
         },
         "node_modules/magic-bytes.js": {
-            "version": "1.11.0",
-            "resolved": "https://registry.npmjs.org/magic-bytes.js/-/magic-bytes.js-1.11.0.tgz",
-            "integrity": "sha512-nVmadqN9gam80tdnn74qjFCKgldwzv1+96XmeCvR3bY7wNn2PjHMnRakOWC6+32g133vgZOjUiYgswIxohffzA==",
+            "version": "1.12.1",
+            "resolved": "https://registry.npmjs.org/magic-bytes.js/-/magic-bytes.js-1.12.1.tgz",
+            "integrity": "sha512-ThQLOhN86ZkJ7qemtVRGYM+gRgR8GEXNli9H/PMvpnZsE44Xfh3wx9kGJaldg314v85m+bFW6WBMaVHJc/c3zA==",
+            "license": "MIT"
+        },
+        "node_modules/magic-string": {
+            "version": "0.30.17",
+            "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz",
+            "integrity": "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==",
+            "dev": true,
             "license": "MIT",
             "dependencies": {
-                "rimraf": "^6.0.1"
-            }
-        },
-        "node_modules/magic-bytes.js/node_modules/glob": {
-            "version": "11.0.2",
-            "resolved": "https://registry.npmjs.org/glob/-/glob-11.0.2.tgz",
-            "integrity": "sha512-YT7U7Vye+t5fZ/QMkBFrTJ7ZQxInIUjwyAjVj84CYXqgBdv30MFUPGnBR6sQaVq6Is15wYJUsnzTuWaGRBhBAQ==",
-            "license": "ISC",
-            "dependencies": {
-                "foreground-child": "^3.1.0",
-                "jackspeak": "^4.0.1",
-                "minimatch": "^10.0.0",
-                "minipass": "^7.1.2",
-                "package-json-from-dist": "^1.0.0",
-                "path-scurry": "^2.0.0"
-            },
-            "bin": {
-                "glob": "dist/esm/bin.mjs"
-            },
-            "engines": {
-                "node": "20 || >=22"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/isaacs"
-            }
-        },
-        "node_modules/magic-bytes.js/node_modules/jackspeak": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-4.1.0.tgz",
-            "integrity": "sha512-9DDdhb5j6cpeitCbvLO7n7J4IxnbM6hoF6O1g4HQ5TfhvvKN8ywDM7668ZhMHRqVmxqhps/F6syWK2KcPxYlkw==",
-            "license": "BlueOak-1.0.0",
-            "dependencies": {
-                "@isaacs/cliui": "^8.0.2"
-            },
-            "engines": {
-                "node": "20 || >=22"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/isaacs"
-            }
-        },
-        "node_modules/magic-bytes.js/node_modules/lru-cache": {
-            "version": "11.1.0",
-            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.1.0.tgz",
-            "integrity": "sha512-QIXZUBJUx+2zHUdQujWejBkcD9+cs94tLn0+YL8UrCh+D5sCXZ4c7LaEH48pNwRY3MLDgqUFyhlCyjJPf1WP0A==",
-            "license": "ISC",
-            "engines": {
-                "node": "20 || >=22"
-            }
-        },
-        "node_modules/magic-bytes.js/node_modules/minimatch": {
-            "version": "10.0.1",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.1.tgz",
-            "integrity": "sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==",
-            "license": "ISC",
-            "dependencies": {
-                "brace-expansion": "^2.0.1"
-            },
-            "engines": {
-                "node": "20 || >=22"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/isaacs"
-            }
-        },
-        "node_modules/magic-bytes.js/node_modules/minipass": {
-            "version": "7.1.2",
-            "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
-            "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
-            "license": "ISC",
-            "engines": {
-                "node": ">=16 || 14 >=14.17"
-            }
-        },
-        "node_modules/magic-bytes.js/node_modules/path-scurry": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.0.tgz",
-            "integrity": "sha512-ypGJsmGtdXUOeM5u93TyeIEfEhM6s+ljAhrk5vAvSx8uyY/02OvrZnA0YNGUrPXfpJMgI1ODd3nwz8Npx4O4cg==",
-            "license": "BlueOak-1.0.0",
-            "dependencies": {
-                "lru-cache": "^11.0.0",
-                "minipass": "^7.1.2"
-            },
-            "engines": {
-                "node": "20 || >=22"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/isaacs"
-            }
-        },
-        "node_modules/magic-bytes.js/node_modules/rimraf": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-6.0.1.tgz",
-            "integrity": "sha512-9dkvaxAsk/xNXSJzMgFqqMCuFgt2+KsOFek3TMLfo8NCPfWpBmqwyNn5Y+NX56QUYfCtsyhF3ayiboEoUmJk/A==",
-            "license": "ISC",
-            "dependencies": {
-                "glob": "^11.0.0",
-                "package-json-from-dist": "^1.0.0"
-            },
-            "bin": {
-                "rimraf": "dist/esm/bin.mjs"
-            },
-            "engines": {
-                "node": "20 || >=22"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/isaacs"
+                "@jridgewell/sourcemap-codec": "^1.5.0"
             }
         },
         "node_modules/make-dir": {
@@ -15841,6 +16736,58 @@
                 "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
             }
         },
+        "node_modules/make-fetch-happen/node_modules/@tootallnate/once": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz",
+            "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/make-fetch-happen/node_modules/agent-base": {
+            "version": "6.0.2",
+            "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+            "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "debug": "4"
+            },
+            "engines": {
+                "node": ">= 6.0.0"
+            }
+        },
+        "node_modules/make-fetch-happen/node_modules/http-proxy-agent": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
+            "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@tootallnate/once": "2",
+                "agent-base": "6",
+                "debug": "4"
+            },
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/make-fetch-happen/node_modules/https-proxy-agent": {
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+            "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "agent-base": "6",
+                "debug": "4"
+            },
+            "engines": {
+                "node": ">= 6"
+            }
+        },
         "node_modules/make-fetch-happen/node_modules/lru-cache": {
             "version": "7.18.3",
             "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
@@ -15874,6 +16821,11 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
+        "node_modules/map-stream": {
+            "version": "0.1.0",
+            "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
+            "integrity": "sha512-CkYQrPYZfWnu/DAmVCpTSX/xHpKZ80eKh2lAkyA6AJTef6bW+6JpbQZN5rofum7da+SyN1bi5ctTm+lTfcCW3g=="
+        },
         "node_modules/matcher": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/matcher/-/matcher-3.0.0.tgz",
@@ -16286,16 +17238,19 @@
             "license": "ISC"
         },
         "node_modules/minimatch": {
-            "version": "5.1.6",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
-            "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
+            "version": "10.0.1",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.0.1.tgz",
+            "integrity": "sha512-ethXTt3SGGR+95gudmqJ1eNhRO7eGEGIgYA9vnPatK4/etz2MEVDno5GMCibdMTuBMyElzIlgxMna3K94XDIDQ==",
             "dev": true,
             "license": "ISC",
             "dependencies": {
                 "brace-expansion": "^2.0.1"
             },
             "engines": {
-                "node": ">=10"
+                "node": "20 || >=22"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
             }
         },
         "node_modules/minimist": {
@@ -16482,6 +17437,17 @@
             "integrity": "sha512-49Kt+HKjtbJKLtgO/LKj9Ld+6vw9BjH5d9sc40R/kVyH8GLAXgT42M2NnuPcJNuA3s9ZfZBUcwIgpmZWGEE+hA==",
             "license": "MIT"
         },
+        "node_modules/mpris-service": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmjs.org/mpris-service/-/mpris-service-2.1.2.tgz",
+            "integrity": "sha512-AC6WepCnFWwOME9OWplHZ8ps/BB+g9QrEpUKCv7wX82fDPzR3nPrypOFmL/Fm0JloEAu6QTWSfDLLc6mM/jinw==",
+            "license": "MIT",
+            "dependencies": {
+                "dbus-next": "^0.9.2",
+                "deep-equal": "^1.0.1",
+                "source-map-support": "^0.5.11"
+            }
+        },
         "node_modules/mrmime": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-2.0.1.tgz",
@@ -16512,6 +17478,13 @@
                 "multicast-dns": "cli.js"
             }
         },
+        "node_modules/nan": {
+            "version": "2.22.2",
+            "resolved": "https://registry.npmjs.org/nan/-/nan-2.22.2.tgz",
+            "integrity": "sha512-DANghxFkS1plDdRsX0X9pm0Z6SJNN6gBdtXfanwoZ8hooC5gosGFSBGRYHUVPz1asKA/kMRqDRdHrluZ61SpBQ==",
+            "license": "MIT",
+            "optional": true
+        },
         "node_modules/nanoid": {
             "version": "3.3.11",
             "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
@@ -16544,6 +17517,16 @@
             "dev": true,
             "license": "MIT"
         },
+        "node_modules/natural-orderby": {
+            "version": "5.0.0",
+            "resolved": "https://registry.npmjs.org/natural-orderby/-/natural-orderby-5.0.0.tgz",
+            "integrity": "sha512-kKHJhxwpR/Okycz4HhQKKlhWe4ASEfPgkSWNmKFHd7+ezuQlxkA5cM3+XkBPvm1gmHen3w53qsYAv+8GwRrBlg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=18"
+            }
+        },
         "node_modules/negotiator": {
             "version": "0.6.4",
             "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz",
@@ -16579,9 +17562,9 @@
             }
         },
         "node_modules/node-abi": {
-            "version": "3.74.0",
-            "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.74.0.tgz",
-            "integrity": "sha512-c5XK0MjkGBrQPGYG24GBADZud0NCbznxNx0ZkS+ebUTrmV1qTDxPxSL8zEAPURXSbLRWVexxmP4986BziahL5w==",
+            "version": "3.75.0",
+            "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.75.0.tgz",
+            "integrity": "sha512-OhYaY5sDsIka7H7AtijtI9jwGYLyl29eQn/W623DiN/MIv5sUqc4g7BIDThX+gb7di9f6xK02nkp8sdfFWZLTg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -16619,6 +17602,78 @@
                 "node": ">= 6.13.0"
             }
         },
+        "node_modules/node-gyp": {
+            "version": "9.4.1",
+            "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-9.4.1.tgz",
+            "integrity": "sha512-OQkWKbjQKbGkMf/xqI1jjy3oCTgMKJac58G2+bjZb3fza6gW2YrCSdMQYaoTb70crvE//Gngr4f0AgVHmqHvBQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "env-paths": "^2.2.0",
+                "exponential-backoff": "^3.1.1",
+                "glob": "^7.1.4",
+                "graceful-fs": "^4.2.6",
+                "make-fetch-happen": "^10.0.3",
+                "nopt": "^6.0.0",
+                "npmlog": "^6.0.0",
+                "rimraf": "^3.0.2",
+                "semver": "^7.3.5",
+                "tar": "^6.1.2",
+                "which": "^2.0.2"
+            },
+            "bin": {
+                "node-gyp": "bin/node-gyp.js"
+            },
+            "engines": {
+                "node": "^12.13 || ^14.13 || >=16"
+            }
+        },
+        "node_modules/node-gyp/node_modules/brace-expansion": {
+            "version": "1.1.11",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "balanced-match": "^1.0.0",
+                "concat-map": "0.0.1"
+            }
+        },
+        "node_modules/node-gyp/node_modules/glob": {
+            "version": "7.2.3",
+            "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+            "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+            "deprecated": "Glob versions prior to v9 are no longer supported",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "fs.realpath": "^1.0.0",
+                "inflight": "^1.0.4",
+                "inherits": "2",
+                "minimatch": "^3.1.1",
+                "once": "^1.3.0",
+                "path-is-absolute": "^1.0.0"
+            },
+            "engines": {
+                "node": "*"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
+            }
+        },
+        "node_modules/node-gyp/node_modules/minimatch": {
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+            "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "brace-expansion": "^1.1.7"
+            },
+            "engines": {
+                "node": "*"
+            }
+        },
         "node_modules/node-int64": {
             "version": "0.4.0",
             "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
@@ -16719,11 +17774,27 @@
                 "node": ">=8"
             }
         },
+        "node_modules/npmlog": {
+            "version": "6.0.2",
+            "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz",
+            "integrity": "sha512-/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==",
+            "deprecated": "This package is no longer supported.",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "are-we-there-yet": "^3.0.0",
+                "console-control-strings": "^1.1.0",
+                "gauge": "^4.0.3",
+                "set-blocking": "^2.0.0"
+            },
+            "engines": {
+                "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
+            }
+        },
         "node_modules/nth-check": {
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
             "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
-            "dev": true,
             "license": "BSD-2-Clause",
             "dependencies": {
                 "boolbase": "^1.0.0"
@@ -16765,7 +17836,6 @@
             "version": "1.1.6",
             "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.6.tgz",
             "integrity": "sha512-F8cZ+KfGlSGi09lJT7/Nd6KJZ9ygtvYC0/UYYLI9nmQKLMnydpB9yvbv9K1uSkEu7FU9vYPmVwLg328tX+ot3Q==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "call-bind": "^1.0.7",
@@ -16782,7 +17852,6 @@
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
             "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-            "dev": true,
             "license": "MIT",
             "engines": {
                 "node": ">= 0.4"
@@ -17013,9 +18082,9 @@
             }
         },
         "node_modules/overlayscrollbars": {
-            "version": "2.11.1",
-            "resolved": "https://registry.npmjs.org/overlayscrollbars/-/overlayscrollbars-2.11.1.tgz",
-            "integrity": "sha512-kogaNaBTIizRenQ2GTzt2cpkEH9B0nUBXseRxqQblH/YicJ3TaWuvn8E5TXPPfJCVoHYSgBYZzzva40kCERKHg==",
+            "version": "2.11.3",
+            "resolved": "https://registry.npmjs.org/overlayscrollbars/-/overlayscrollbars-2.11.3.tgz",
+            "integrity": "sha512-8frVuHyBEOoWlO8VPlp7N+5XI1IrMkzWFR4GjPaTlvjdHQ+XN1C+hMQJpIy0QK1jMAK/cSLVRPG0jirqX0gA0A==",
             "license": "MIT"
         },
         "node_modules/overlayscrollbars-react": {
@@ -17141,6 +18210,7 @@
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
             "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
+            "dev": true,
             "license": "BlueOak-1.0.0"
         },
         "node_modules/pako": {
@@ -17195,7 +18265,6 @@
             "version": "7.3.0",
             "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.3.0.tgz",
             "integrity": "sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "entities": "^6.0.0"
@@ -17208,7 +18277,6 @@
             "version": "7.1.0",
             "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-7.1.0.tgz",
             "integrity": "sha512-ruw5xyKs6lrpo9x9rCZqZZnIUntICjQAd0Wsmp396Ul9lN/h+ifgVV1x1gZHi8euej6wTfpqX8j+BFQxF0NS/g==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "domhandler": "^5.0.3",
@@ -17222,7 +18290,6 @@
             "version": "7.1.2",
             "resolved": "https://registry.npmjs.org/parse5-parser-stream/-/parse5-parser-stream-7.1.2.tgz",
             "integrity": "sha512-JyeQc9iwFLn5TbvvqACIF/VXG6abODeB3Fwmv/TGdLk2LfbWkaySGY72at4+Ty7EkPZj854u4CrICqNk2qIbow==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "parse5": "^7.0.0"
@@ -17232,11 +18299,13 @@
             }
         },
         "node_modules/parse5/node_modules/entities": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-            "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-            "dev": true,
+            "version": "6.0.0",
+            "resolved": "https://registry.npmjs.org/entities/-/entities-6.0.0.tgz",
+            "integrity": "sha512-aKstq2TDOndCn4diEyp9Uq/Flu2i1GlLkc6XIDQSDMuaFE3OPW5OphLCyQ5SpSJZTb4reN+kTcYru5yIfXoRPw==",
             "license": "BSD-2-Clause",
+            "engines": {
+                "node": ">=0.12"
+            },
             "funding": {
                 "url": "https://github.com/fb55/entities?sponsor=1"
             }
@@ -17286,6 +18355,7 @@
             "version": "3.1.1",
             "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
             "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+            "dev": true,
             "license": "MIT",
             "engines": {
                 "node": ">=8"
@@ -17354,6 +18424,33 @@
                 "node": ">=8"
             }
         },
+        "node_modules/pause-stream": {
+            "version": "0.0.11",
+            "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
+            "integrity": "sha512-e3FBlXLmN/D1S+zHzanP4E/4Z60oFAa3O051qt1pxa7DEJWKAyil6upYVXCWadEnuoqa4Pkc9oUx9zsxYeRv8A==",
+            "license": [
+                "MIT",
+                "Apache2"
+            ],
+            "dependencies": {
+                "through": "~2.3"
+            }
+        },
+        "node_modules/pe-library": {
+            "version": "0.4.1",
+            "resolved": "https://registry.npmjs.org/pe-library/-/pe-library-0.4.1.tgz",
+            "integrity": "sha512-eRWB5LBz7PpDu4PUlwT0PhnQfTQJlDDdPa35urV4Osrm0t0AqQFGn+UIkU3klZvwJ8KPO3VbBFsXquA6p6kqZw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=12",
+                "npm": ">=6"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/jet2jet"
+            }
+        },
         "node_modules/pend": {
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
@@ -18673,28 +19770,26 @@
             }
         },
         "node_modules/react": {
-            "version": "18.3.1",
-            "resolved": "https://registry.npmjs.org/react/-/react-18.3.1.tgz",
-            "integrity": "sha512-wS+hAgJShR0KhEvPJArfuPVN1+Hz1t0Y6n5jLrGQbkb4urgPE/0Rve+1kMB1v/oWgHgm4WIcV+i7F2pTVj+2iQ==",
+            "version": "19.1.0",
+            "resolved": "https://registry.npmjs.org/react/-/react-19.1.0.tgz",
+            "integrity": "sha512-FS+XFBNvn3GTAWq26joslQgWNoFu08F4kl0J4CgdNKADkdSGXQyTCnKteIAJy96Br6YbpEU1LSzV5dYtjMkMDg==",
+            "dev": true,
             "license": "MIT",
-            "dependencies": {
-                "loose-envify": "^1.1.0"
-            },
             "engines": {
                 "node": ">=0.10.0"
             }
         },
         "node_modules/react-dom": {
-            "version": "18.3.1",
-            "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.3.1.tgz",
-            "integrity": "sha512-5m4nQKp+rZRb09LNH59GM4BxTh9251/ylbKIbpe7TpGxfJ+9kv6BLkLBXIjjspbgbnIBNqlI23tRnTWT0snUIw==",
+            "version": "19.1.0",
+            "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.1.0.tgz",
+            "integrity": "sha512-Xs1hdnE+DyKgeHJeJznQmYMIBG3TKIHJJT95Q58nHLSrElKlGQqDTR2HQ9fx5CN/Gk6Vh/kupBTDLU11/nDk/g==",
+            "dev": true,
             "license": "MIT",
             "dependencies": {
-                "loose-envify": "^1.1.0",
-                "scheduler": "^0.23.2"
+                "scheduler": "^0.26.0"
             },
             "peerDependencies": {
-                "react": "^18.3.1"
+                "react": "^19.1.0"
             }
         },
         "node_modules/react-error-boundary": {
@@ -18800,9 +19895,9 @@
             }
         },
         "node_modules/react-remove-scroll": {
-            "version": "2.6.3",
-            "resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.6.3.tgz",
-            "integrity": "sha512-pnAi91oOk8g8ABQKGF5/M9qxmmOPxaAnopyTHYfqYEwJhyFrbbBtHuSgtKEoH0jpcxx5o3hXqH1mNd9/Oi+8iQ==",
+            "version": "2.7.0",
+            "resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.7.0.tgz",
+            "integrity": "sha512-sGsQtcjMqdQyijAHytfGEELB8FufGbfXIsvUTe+NLx1GDRJCXtCFLBLUI1eyZCKXXvbEU2C6gai0PZKoIE9Vbg==",
             "license": "MIT",
             "dependencies": {
                 "react-remove-scroll-bar": "^2.3.7",
@@ -18946,6 +20041,16 @@
             "dev": true,
             "license": "MIT"
         },
+        "node_modules/react-test-renderer/node_modules/scheduler": {
+            "version": "0.23.2",
+            "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz",
+            "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "loose-envify": "^1.1.0"
+            }
+        },
         "node_modules/react-textarea-autosize": {
             "version": "8.3.4",
             "resolved": "https://registry.npmjs.org/react-textarea-autosize/-/react-textarea-autosize-8.3.4.tgz",
@@ -19038,24 +20143,6 @@
                 "read-binary-file-arch": "cli.js"
             }
         },
-        "node_modules/read-config-file": {
-            "version": "6.3.2",
-            "resolved": "https://registry.npmjs.org/read-config-file/-/read-config-file-6.3.2.tgz",
-            "integrity": "sha512-M80lpCjnE6Wt6zb98DoW8WHR09nzMSpu8XHtPkiTHrJ5Az9CybfeQhTJ8D7saeBHpGhLPIVyA8lcL6ZmdKwY6Q==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "config-file-ts": "^0.2.4",
-                "dotenv": "^9.0.2",
-                "dotenv-expand": "^5.1.0",
-                "js-yaml": "^4.1.0",
-                "json5": "^2.2.0",
-                "lazy-val": "^1.0.4"
-            },
-            "engines": {
-                "node": ">=12.0.0"
-            }
-        },
         "node_modules/read-pkg": {
             "version": "6.0.0",
             "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-6.0.0.tgz",
@@ -19198,17 +20285,10 @@
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "node_modules/regenerator-runtime": {
-            "version": "0.14.1",
-            "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
-            "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==",
-            "license": "MIT"
-        },
         "node_modules/regexp.prototype.flags": {
             "version": "1.5.4",
             "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz",
             "integrity": "sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "call-bind": "^1.0.8",
@@ -19401,6 +20481,24 @@
             "dev": true,
             "license": "MIT"
         },
+        "node_modules/resedit": {
+            "version": "1.7.2",
+            "resolved": "https://registry.npmjs.org/resedit/-/resedit-1.7.2.tgz",
+            "integrity": "sha512-vHjcY2MlAITJhC0eRD/Vv8Vlgmu9Sd3LX9zZvtGzU5ZImdTN3+d6e/4mnTyV8vEbyf1sgNIrWxhWlrys52OkEA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "pe-library": "^0.4.1"
+            },
+            "engines": {
+                "node": ">=12",
+                "npm": ">=6"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/jet2jet"
+            }
+        },
         "node_modules/resolve": {
             "version": "1.22.10",
             "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz",
@@ -19630,6 +20728,46 @@
                 "node": ">=8.0"
             }
         },
+        "node_modules/rollup": {
+            "version": "4.41.0",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.41.0.tgz",
+            "integrity": "sha512-HqMFpUbWlf/tvcxBFNKnJyzc7Lk+XO3FGc3pbNBLqEbOz0gPLRgcrlS3UF4MfUrVlstOaP/q0kM6GVvi+LrLRg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/estree": "1.0.7"
+            },
+            "bin": {
+                "rollup": "dist/bin/rollup"
+            },
+            "engines": {
+                "node": ">=18.0.0",
+                "npm": ">=8.0.0"
+            },
+            "optionalDependencies": {
+                "@rollup/rollup-android-arm-eabi": "4.41.0",
+                "@rollup/rollup-android-arm64": "4.41.0",
+                "@rollup/rollup-darwin-arm64": "4.41.0",
+                "@rollup/rollup-darwin-x64": "4.41.0",
+                "@rollup/rollup-freebsd-arm64": "4.41.0",
+                "@rollup/rollup-freebsd-x64": "4.41.0",
+                "@rollup/rollup-linux-arm-gnueabihf": "4.41.0",
+                "@rollup/rollup-linux-arm-musleabihf": "4.41.0",
+                "@rollup/rollup-linux-arm64-gnu": "4.41.0",
+                "@rollup/rollup-linux-arm64-musl": "4.41.0",
+                "@rollup/rollup-linux-loongarch64-gnu": "4.41.0",
+                "@rollup/rollup-linux-powerpc64le-gnu": "4.41.0",
+                "@rollup/rollup-linux-riscv64-gnu": "4.41.0",
+                "@rollup/rollup-linux-riscv64-musl": "4.41.0",
+                "@rollup/rollup-linux-s390x-gnu": "4.41.0",
+                "@rollup/rollup-linux-x64-gnu": "4.41.0",
+                "@rollup/rollup-linux-x64-musl": "4.41.0",
+                "@rollup/rollup-win32-arm64-msvc": "4.41.0",
+                "@rollup/rollup-win32-ia32-msvc": "4.41.0",
+                "@rollup/rollup-win32-x64-msvc": "4.41.0",
+                "fsevents": "~2.3.2"
+            }
+        },
         "node_modules/rsvp": {
             "version": "4.8.5",
             "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz",
@@ -19708,7 +20846,6 @@
             "version": "5.2.1",
             "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
             "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-            "dev": true,
             "funding": [
                 {
                     "type": "github",
@@ -19764,7 +20901,6 @@
             "version": "2.1.2",
             "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
             "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
-            "dev": true,
             "license": "MIT"
         },
         "node_modules/sanitize-filename": {
@@ -19778,9 +20914,9 @@
             }
         },
         "node_modules/sass": {
-            "version": "1.87.0",
-            "resolved": "https://registry.npmjs.org/sass/-/sass-1.87.0.tgz",
-            "integrity": "sha512-d0NoFH4v6SjEK7BoX810Jsrhj7IQSYHAHLi/iSpgqKc7LaIDshFRlSg5LOymf9FqQhxEHs2W5ZQXlvy0KD45Uw==",
+            "version": "1.89.0",
+            "resolved": "https://registry.npmjs.org/sass/-/sass-1.89.0.tgz",
+            "integrity": "sha512-ld+kQU8YTdGNjOLfRWBzewJpU5cwEv/h5yyqlSeJcj6Yh8U4TDA9UA5FPicqDz/xgRPWRSYIQNiFks21TbA9KQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -19798,6 +20934,407 @@
                 "@parcel/watcher": "^2.4.1"
             }
         },
+        "node_modules/sass-embedded": {
+            "version": "1.89.0",
+            "resolved": "https://registry.npmjs.org/sass-embedded/-/sass-embedded-1.89.0.tgz",
+            "integrity": "sha512-EDrK1el9zdgJFpocCGlxatDWaP18tJBWoM1hxzo2KJBvjdmBichXI6O6KlQrigvQPO3uJ8DfmFmAAx7s7CG6uw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@bufbuild/protobuf": "^2.0.0",
+                "buffer-builder": "^0.2.0",
+                "colorjs.io": "^0.5.0",
+                "immutable": "^5.0.2",
+                "rxjs": "^7.4.0",
+                "supports-color": "^8.1.1",
+                "sync-child-process": "^1.0.2",
+                "varint": "^6.0.0"
+            },
+            "bin": {
+                "sass": "dist/bin/sass.js"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            },
+            "optionalDependencies": {
+                "sass-embedded-android-arm": "1.89.0",
+                "sass-embedded-android-arm64": "1.89.0",
+                "sass-embedded-android-ia32": "1.89.0",
+                "sass-embedded-android-riscv64": "1.89.0",
+                "sass-embedded-android-x64": "1.89.0",
+                "sass-embedded-darwin-arm64": "1.89.0",
+                "sass-embedded-darwin-x64": "1.89.0",
+                "sass-embedded-linux-arm": "1.89.0",
+                "sass-embedded-linux-arm64": "1.89.0",
+                "sass-embedded-linux-ia32": "1.89.0",
+                "sass-embedded-linux-musl-arm": "1.89.0",
+                "sass-embedded-linux-musl-arm64": "1.89.0",
+                "sass-embedded-linux-musl-ia32": "1.89.0",
+                "sass-embedded-linux-musl-riscv64": "1.89.0",
+                "sass-embedded-linux-musl-x64": "1.89.0",
+                "sass-embedded-linux-riscv64": "1.89.0",
+                "sass-embedded-linux-x64": "1.89.0",
+                "sass-embedded-win32-arm64": "1.89.0",
+                "sass-embedded-win32-ia32": "1.89.0",
+                "sass-embedded-win32-x64": "1.89.0"
+            }
+        },
+        "node_modules/sass-embedded-android-arm": {
+            "version": "1.89.0",
+            "resolved": "https://registry.npmjs.org/sass-embedded-android-arm/-/sass-embedded-android-arm-1.89.0.tgz",
+            "integrity": "sha512-s6jxkEZQQrtyIGZX6Sbcu7tEixFG2VkqFgrX11flm/jZex7KaxnZtFace+wnYAgHqzzYpx0kNzJUpT+GXxm8CA==",
+            "cpu": [
+                "arm"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "android"
+            ],
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/sass-embedded-android-arm64": {
+            "version": "1.89.0",
+            "resolved": "https://registry.npmjs.org/sass-embedded-android-arm64/-/sass-embedded-android-arm64-1.89.0.tgz",
+            "integrity": "sha512-pr4R3p5R+Ul9ZA5nzYbBJQFJXW6dMGzgpNBhmaToYDgDhmNX5kg0mZAUlGLHvisLdTiR6oEfDDr9QI6tnD2nqA==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "android"
+            ],
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/sass-embedded-android-ia32": {
+            "version": "1.89.0",
+            "resolved": "https://registry.npmjs.org/sass-embedded-android-ia32/-/sass-embedded-android-ia32-1.89.0.tgz",
+            "integrity": "sha512-GoNnNGYmp1F0ZMHqQbAurlQsjBMZKtDd5H60Ruq86uQFdnuNqQ9wHKJsJABxMnjfAn60IjefytM5PYTMcAmbfA==",
+            "cpu": [
+                "ia32"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "android"
+            ],
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/sass-embedded-android-riscv64": {
+            "version": "1.89.0",
+            "resolved": "https://registry.npmjs.org/sass-embedded-android-riscv64/-/sass-embedded-android-riscv64-1.89.0.tgz",
+            "integrity": "sha512-di+i4KkKAWTNksaQYTqBEERv46qV/tvv14TPswEfak7vcTQ2pj2mvV4KGjLYfU2LqRkX/NTXix9KFthrzFN51Q==",
+            "cpu": [
+                "riscv64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "android"
+            ],
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/sass-embedded-android-x64": {
+            "version": "1.89.0",
+            "resolved": "https://registry.npmjs.org/sass-embedded-android-x64/-/sass-embedded-android-x64-1.89.0.tgz",
+            "integrity": "sha512-1cRRDAnmAS1wLaxfFf6PCHu9sKW8FNxdM7ZkanwxO9mztrCu/uvfqTmaurY9+RaKvPus7sGYFp46/TNtl/wRjg==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "android"
+            ],
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/sass-embedded-darwin-arm64": {
+            "version": "1.89.0",
+            "resolved": "https://registry.npmjs.org/sass-embedded-darwin-arm64/-/sass-embedded-darwin-arm64-1.89.0.tgz",
+            "integrity": "sha512-EUNUzI0UkbQ6dASPyf09S3x7fNT54PjyD594ZGTY14Yh4qTuacIj27ckLmreAJNNu5QxlbhyYuOtz+XN5bMMxA==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/sass-embedded-darwin-x64": {
+            "version": "1.89.0",
+            "resolved": "https://registry.npmjs.org/sass-embedded-darwin-x64/-/sass-embedded-darwin-x64-1.89.0.tgz",
+            "integrity": "sha512-23R8zSuB31Fq/MYpmQ38UR2C26BsYb66VVpJgWmWl/N+sgv/+l9ECuSPMbYNgM3vb9TP9wk9dgL6KkiCS5tAyg==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/sass-embedded-linux-arm": {
+            "version": "1.89.0",
+            "resolved": "https://registry.npmjs.org/sass-embedded-linux-arm/-/sass-embedded-linux-arm-1.89.0.tgz",
+            "integrity": "sha512-KAzA1XD74d8/fiJXxVnLfFwfpmD2XqUJZz+DL6ZAPNLH1sb+yCP7brktaOyClDc/MBu61JERdHaJjIZhfX0Yqw==",
+            "cpu": [
+                "arm"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/sass-embedded-linux-arm64": {
+            "version": "1.89.0",
+            "resolved": "https://registry.npmjs.org/sass-embedded-linux-arm64/-/sass-embedded-linux-arm64-1.89.0.tgz",
+            "integrity": "sha512-g9Lp57qyx51ttKj0AN/edV43Hu1fBObvD7LpYwVfs6u3I95r0Adi90KujzNrUqXxJVmsfUwseY8kA8zvcRjhYA==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/sass-embedded-linux-ia32": {
+            "version": "1.89.0",
+            "resolved": "https://registry.npmjs.org/sass-embedded-linux-ia32/-/sass-embedded-linux-ia32-1.89.0.tgz",
+            "integrity": "sha512-5fxBeXyvBr3pb+vyrx9V6yd7QDRXkAPbwmFVVhjqshBABOXelLysEFea7xokh/tM8JAAQ4O8Ls3eW3Eojb477g==",
+            "cpu": [
+                "ia32"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/sass-embedded-linux-musl-arm": {
+            "version": "1.89.0",
+            "resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-arm/-/sass-embedded-linux-musl-arm-1.89.0.tgz",
+            "integrity": "sha512-0Q1JeEU4/tzH7fwAwarfIh+Swn3aXG/jPhVsZpbR1c1VzkeaPngmXdmLJcVXsdb35tjk84DuYcFtJlE1HYGw4Q==",
+            "cpu": [
+                "arm"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/sass-embedded-linux-musl-arm64": {
+            "version": "1.89.0",
+            "resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-arm64/-/sass-embedded-linux-musl-arm64-1.89.0.tgz",
+            "integrity": "sha512-50oelrOtN64u15vJN9uJryIuT0+UPjyeoq0zdWbY8F7LM9294Wf+Idea+nqDUWDCj1MHndyPFmR1mjeuRouJhw==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/sass-embedded-linux-musl-ia32": {
+            "version": "1.89.0",
+            "resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-ia32/-/sass-embedded-linux-musl-ia32-1.89.0.tgz",
+            "integrity": "sha512-ILWqpTd+0RdsSw977iVAJf4CLetIbcQgLQf17ycS1N4StZKVRZs1bBfZhg/f/HU/4p5HondPAwepgJepZZdnFA==",
+            "cpu": [
+                "ia32"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/sass-embedded-linux-musl-riscv64": {
+            "version": "1.89.0",
+            "resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-riscv64/-/sass-embedded-linux-musl-riscv64-1.89.0.tgz",
+            "integrity": "sha512-n2V+Tdjj7SAuiuElJYhWiHjjB1YU0cuFvL1/m5K+ecdNStfHFWIzvBT6/vzQnBOWjI4eZECNVuQ8GwGWCufZew==",
+            "cpu": [
+                "riscv64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/sass-embedded-linux-musl-x64": {
+            "version": "1.89.0",
+            "resolved": "https://registry.npmjs.org/sass-embedded-linux-musl-x64/-/sass-embedded-linux-musl-x64-1.89.0.tgz",
+            "integrity": "sha512-KOHJdouBK3SLJKZLnFYzuxs3dn+6jaeO3p4p1JUYAcVfndcvh13Sg2sLGfOfpg7Og6ws2Nnqnx0CyL26jPJ7ag==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/sass-embedded-linux-riscv64": {
+            "version": "1.89.0",
+            "resolved": "https://registry.npmjs.org/sass-embedded-linux-riscv64/-/sass-embedded-linux-riscv64-1.89.0.tgz",
+            "integrity": "sha512-0A/UWeKX6MYhVLWLkdX3NPKHO+mvIwzaf6TxGCy3vS3TODWaeDUeBhHShAr7YlOKv5xRGxf7Gx7FXCPV0mUyMA==",
+            "cpu": [
+                "riscv64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/sass-embedded-linux-x64": {
+            "version": "1.89.0",
+            "resolved": "https://registry.npmjs.org/sass-embedded-linux-x64/-/sass-embedded-linux-x64-1.89.0.tgz",
+            "integrity": "sha512-dRBoOFPDWctHPYK3hTk3YzyX/icVrXiw7oOjbtpaDr6JooqIWBe16FslkWyvQzdmfOFy80raKVjgoqT7DsznkQ==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/sass-embedded-win32-arm64": {
+            "version": "1.89.0",
+            "resolved": "https://registry.npmjs.org/sass-embedded-win32-arm64/-/sass-embedded-win32-arm64-1.89.0.tgz",
+            "integrity": "sha512-RnlVZ14hC/W7ubzvhqnbGfjU5PFNoFP/y5qycgCy+Mezb0IKbWvZ2Lyzux8TbL3OIjOikkNpfXoNQrX706WLAA==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/sass-embedded-win32-ia32": {
+            "version": "1.89.0",
+            "resolved": "https://registry.npmjs.org/sass-embedded-win32-ia32/-/sass-embedded-win32-ia32-1.89.0.tgz",
+            "integrity": "sha512-eFe9VMNG+90nuoE3eXDy+38+uEHGf7xcqalq5+0PVZfR+H9RlaEbvIUNflZV94+LOH8Jb4lrfuekhHgWDJLfSg==",
+            "cpu": [
+                "ia32"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/sass-embedded-win32-x64": {
+            "version": "1.89.0",
+            "resolved": "https://registry.npmjs.org/sass-embedded-win32-x64/-/sass-embedded-win32-x64-1.89.0.tgz",
+            "integrity": "sha512-AaGpr5R6MLCuSvkvDdRq49ebifwLcuGPk0/10hbYw9nh3jpy2/CylYubQpIpR4yPcuD1wFwFqufTXC3HJYGb0g==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/sass-embedded/node_modules/supports-color": {
+            "version": "8.1.1",
+            "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+            "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "has-flag": "^4.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/supports-color?sponsor=1"
+            }
+        },
         "node_modules/sass-loader": {
             "version": "12.6.0",
             "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-12.6.0.tgz",
@@ -19857,13 +21394,11 @@
             }
         },
         "node_modules/scheduler": {
-            "version": "0.23.2",
-            "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.23.2.tgz",
-            "integrity": "sha512-UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==",
-            "license": "MIT",
-            "dependencies": {
-                "loose-envify": "^1.1.0"
-            }
+            "version": "0.26.0",
+            "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.26.0.tgz",
+            "integrity": "sha512-NlHwttCI/l5gCPR3D1nNXtWABUmBwvZpEQiD4IXSbIDq8BzLIK/7Ir5gTFSGZDUu37K5cMNp0hFtzO38sC7gWA==",
+            "dev": true,
+            "license": "MIT"
         },
         "node_modules/schema-utils": {
             "version": "3.3.0",
@@ -19906,9 +21441,9 @@
             }
         },
         "node_modules/semver": {
-            "version": "7.7.1",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
-            "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
+            "version": "7.7.2",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+            "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
             "license": "ISC",
             "bin": {
                 "semver": "bin/semver.js"
@@ -20133,11 +21668,17 @@
                 "node": ">= 0.8.0"
             }
         },
+        "node_modules/set-blocking": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+            "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
+            "dev": true,
+            "license": "ISC"
+        },
         "node_modules/set-function-length": {
             "version": "1.2.2",
             "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
             "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "define-data-property": "^1.1.4",
@@ -20155,7 +21696,6 @@
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz",
             "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "define-data-property": "^1.1.4",
@@ -20219,6 +21759,7 @@
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
             "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "shebang-regex": "^3.0.0"
@@ -20231,6 +21772,7 @@
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
             "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+            "dev": true,
             "license": "MIT",
             "engines": {
                 "node": ">=8"
@@ -20445,6 +21987,19 @@
                 "node": ">= 10"
             }
         },
+        "node_modules/socks-proxy-agent/node_modules/agent-base": {
+            "version": "6.0.2",
+            "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+            "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "debug": "4"
+            },
+            "engines": {
+                "node": ">= 6.0.0"
+            }
+        },
         "node_modules/sort-keys": {
             "version": "5.1.0",
             "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-5.1.0.tgz",
@@ -20483,7 +22038,6 @@
             "version": "0.5.21",
             "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
             "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
-            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "buffer-from": "^1.0.0",
@@ -20494,7 +22048,6 @@
             "version": "0.6.1",
             "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
             "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-            "dev": true,
             "license": "BSD-3-Clause",
             "engines": {
                 "node": ">=0.10.0"
@@ -20574,6 +22127,18 @@
                 "wbuf": "^1.7.3"
             }
         },
+        "node_modules/split": {
+            "version": "0.3.3",
+            "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
+            "integrity": "sha512-wD2AeVmxXRBoX44wAycgjVpMhvbwdI2aZjCkvfNcH1YqHQvJVa1duWc73OyVGJUc05fhFaTZeQ/PYsrmyH0JVA==",
+            "license": "MIT",
+            "dependencies": {
+                "through": "2"
+            },
+            "engines": {
+                "node": "*"
+            }
+        },
         "node_modules/sprintf-js": {
             "version": "1.1.3",
             "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.3.tgz",
@@ -20672,6 +22237,15 @@
                 "node": ">= 0.4"
             }
         },
+        "node_modules/stream-combiner": {
+            "version": "0.0.4",
+            "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
+            "integrity": "sha512-rT00SPnTVyRsaSz5zgSPma/aHSOic5U1prhYdRy5HS2kTZviFpmDgzilbtsJsxiroqACmayynDN/9VzIbX5DOw==",
+            "license": "MIT",
+            "dependencies": {
+                "duplexer": "~0.1.1"
+            }
+        },
         "node_modules/stream-composer": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/stream-composer/-/stream-composer-1.0.2.tgz",
@@ -20734,6 +22308,7 @@
             "version": "4.2.3",
             "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
             "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "emoji-regex": "^8.0.0",
@@ -20749,6 +22324,7 @@
             "version": "4.2.3",
             "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
             "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
+            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "emoji-regex": "^8.0.0",
@@ -20763,12 +22339,14 @@
             "version": "8.0.0",
             "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
             "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+            "dev": true,
             "license": "MIT"
         },
         "node_modules/string-width/node_modules/emoji-regex": {
             "version": "8.0.0",
             "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
             "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+            "dev": true,
             "license": "MIT"
         },
         "node_modules/string.prototype.includes": {
@@ -20888,6 +22466,7 @@
             "version": "6.0.1",
             "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
             "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "ansi-regex": "^5.0.1"
@@ -20901,6 +22480,7 @@
             "version": "6.0.1",
             "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
             "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "ansi-regex": "^5.0.1"
@@ -20980,9 +22560,9 @@
             "license": "ISC"
         },
         "node_modules/styled-components": {
-            "version": "6.1.17",
-            "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-6.1.17.tgz",
-            "integrity": "sha512-97D7DwWanI7nN24v0D4SvbfjLE9656umNSJZkBkDIWL37aZqG/wRQ+Y9pWtXyBIM/NSfcBzHLErEsqHmJNSVUg==",
+            "version": "6.1.18",
+            "resolved": "https://registry.npmjs.org/styled-components/-/styled-components-6.1.18.tgz",
+            "integrity": "sha512-Mvf3gJFzZCkhjY2Y/Fx9z1m3dxbza0uI9H1CbNZm/jSHCojzJhQ0R7bByrlFJINnMzz/gPulpoFFGymNwrsMcw==",
             "license": "MIT",
             "dependencies": {
                 "@emotion/is-prop-valid": "1.2.2",
@@ -21284,17 +22864,17 @@
             }
         },
         "node_modules/stylelint-scss": {
-            "version": "6.11.1",
-            "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-6.11.1.tgz",
-            "integrity": "sha512-e4rYo0UY+BIMtGeGanghrvHTjcryxgZbyFxUedp8dLFqC4P70aawNdYjRrQxbnKhu3BNr4+lt5e/53tcKXiwFA==",
+            "version": "6.12.0",
+            "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-6.12.0.tgz",
+            "integrity": "sha512-U7CKhi1YNkM1pXUXl/GMUXi8xKdhl4Ayxdyceie1nZ1XNIdaUgMV6OArpooWcDzEggwgYD0HP/xIgVJo9a655w==",
             "dev": true,
             "license": "MIT",
             "optional": true,
             "dependencies": {
                 "css-tree": "^3.0.1",
                 "is-plain-object": "^5.0.0",
-                "known-css-properties": "^0.35.0",
-                "mdn-data": "^2.15.0",
+                "known-css-properties": "^0.36.0",
+                "mdn-data": "^2.21.0",
                 "postcss-media-query-parser": "^0.2.3",
                 "postcss-resolve-nested-selector": "^0.1.6",
                 "postcss-selector-parser": "^7.1.0",
@@ -21331,9 +22911,9 @@
             "optional": true
         },
         "node_modules/stylelint-scss/node_modules/known-css-properties": {
-            "version": "0.35.0",
-            "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.35.0.tgz",
-            "integrity": "sha512-a/RAk2BfKk+WFGhhOCAYqSiFLc34k8Mt/6NWRI4joER0EYUzXIcFivjjnoD3+XU1DggLn/tZc3DOAgke7l8a4A==",
+            "version": "0.36.0",
+            "resolved": "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.36.0.tgz",
+            "integrity": "sha512-A+9jP+IUmuQsNdsLdcg6Yt7voiMF/D4K83ew0OpJtpu+l34ef7LaohWV0Rc6KNvzw6ZDizkqfyB5JznZnzuKQA==",
             "dev": true,
             "license": "MIT",
             "optional": true
@@ -21408,6 +22988,21 @@
                 "node": ">=12.0.0"
             }
         },
+        "node_modules/stylelint/node_modules/flat-cache": {
+            "version": "3.2.0",
+            "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz",
+            "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "flatted": "^3.2.9",
+                "keyv": "^4.5.3",
+                "rimraf": "^3.0.2"
+            },
+            "engines": {
+                "node": "^10.12.0 || >=12.0.0"
+            }
+        },
         "node_modules/stylelint/node_modules/resolve-from": {
             "version": "5.0.0",
             "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
@@ -21696,15 +23291,37 @@
             "dev": true,
             "license": "MIT"
         },
-        "node_modules/synckit": {
-            "version": "0.11.4",
-            "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.11.4.tgz",
-            "integrity": "sha512-Q/XQKRaJiLiFIBNN+mndW7S/RHxvwzuZS6ZwmRzUBqJBv/5QIKCEwkBC8GBf8EQJKYnaFs0wOZbKTXBPj8L9oQ==",
+        "node_modules/sync-child-process": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/sync-child-process/-/sync-child-process-1.0.2.tgz",
+            "integrity": "sha512-8lD+t2KrrScJ/7KXCSyfhT3/hRq78rC0wBFqNJXv3mZyn6hW2ypM05JmlSvtqRbeq6jqA94oHbxAr2vYsJ8vDA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@pkgr/core": "^0.2.3",
-                "tslib": "^2.8.1"
+                "sync-message-port": "^1.0.0"
+            },
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/sync-message-port": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/sync-message-port/-/sync-message-port-1.1.3.tgz",
+            "integrity": "sha512-GTt8rSKje5FilG+wEdfCkOcLL7LWqpMlr2c3LRuKt/YXxcJ52aGSbGBAdI4L3aaqfrBt6y711El53ItyH1NWzg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=16.0.0"
+            }
+        },
+        "node_modules/synckit": {
+            "version": "0.11.6",
+            "resolved": "https://registry.npmjs.org/synckit/-/synckit-0.11.6.tgz",
+            "integrity": "sha512-2pR2ubZSV64f/vqm9eLPz/KOvR9Dm+Co/5ChLgeHl0yEDRc6h5hXHoxEQH8Y5Ljycozd3p1k5TTSVdzYGkPvLw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@pkgr/core": "^0.2.4"
             },
             "engines": {
                 "node": "^14.18.0 || >=16.0.0"
@@ -21876,14 +23493,14 @@
             }
         },
         "node_modules/terser": {
-            "version": "5.39.0",
-            "resolved": "https://registry.npmjs.org/terser/-/terser-5.39.0.tgz",
-            "integrity": "sha512-LBAhFyLho16harJoWMg/nZsQYgTrg5jXOn2nCYjRUcZZEdE3qa2zb8QEDRUGVZBW4rlazf2fxkg8tztybTaqWw==",
+            "version": "5.39.2",
+            "resolved": "https://registry.npmjs.org/terser/-/terser-5.39.2.tgz",
+            "integrity": "sha512-yEPUmWve+VA78bI71BW70Dh0TuV4HHd+I5SHOAfS1+QBOmvmCiiffgjR8ryyEd3KIfvPGFqoADt8LdQ6XpXIvg==",
             "dev": true,
             "license": "BSD-2-Clause",
             "dependencies": {
                 "@jridgewell/source-map": "^0.3.3",
-                "acorn": "^8.8.2",
+                "acorn": "^8.14.0",
                 "commander": "^2.20.0",
                 "source-map-support": "~0.5.20"
             },
@@ -22064,13 +23681,6 @@
                 "b4a": "^1.6.4"
             }
         },
-        "node_modules/text-table": {
-            "version": "0.2.0",
-            "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-            "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
-            "dev": true,
-            "license": "MIT"
-        },
         "node_modules/throat": {
             "version": "6.0.2",
             "resolved": "https://registry.npmjs.org/throat/-/throat-6.0.2.tgz",
@@ -22082,7 +23692,6 @@
             "version": "2.3.8",
             "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
             "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
-            "dev": true,
             "license": "MIT"
         },
         "node_modules/through2": {
@@ -22149,6 +23758,36 @@
             "integrity": "sha512-qVtvMxeXbVej0cQWKqVSSAHmKZEHAvxdF8HEUBFWts8h+xEo5m/lEiPakuyZ3BnCBjOD8i24kzNOiOLLgsSxhA==",
             "license": "MIT"
         },
+        "node_modules/tinyglobby": {
+            "version": "0.2.13",
+            "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.13.tgz",
+            "integrity": "sha512-mEwzpUgrLySlveBwEVDMKk5B57bhLPYovRfPAXD5gA/98Opn0rCDj3GtLwFvCvH5RK9uPCExUROW5NjDwvqkxw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "fdir": "^6.4.4",
+                "picomatch": "^4.0.2"
+            },
+            "engines": {
+                "node": ">=12.0.0"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/SuperchupuDev"
+            }
+        },
+        "node_modules/tinyglobby/node_modules/picomatch": {
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
+            "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/jonschlinkert"
+            }
+        },
         "node_modules/tmp": {
             "version": "0.2.3",
             "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz",
@@ -22574,9 +24213,9 @@
             "license": "0BSD"
         },
         "node_modules/tsx": {
-            "version": "4.19.3",
-            "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.19.3.tgz",
-            "integrity": "sha512-4H8vUNGNjQ4V2EOoGw005+c+dGuPSnhpPBPHBtsZdGZBk/iJb4kguGlPWaZTZ3q5nMtFOEsY0nRDlh9PJyd6SQ==",
+            "version": "4.19.4",
+            "resolved": "https://registry.npmjs.org/tsx/-/tsx-4.19.4.tgz",
+            "integrity": "sha512-gK5GVzDkJK1SI1zwHf32Mqxf2tSJkNx+eYcNly5+nHvWqXUJYUkWBQtKauoESz3ymezAI++ZwT855x5p5eop+Q==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -22744,724 +24383,130 @@
                 "node": ">=14.17"
             }
         },
-        "node_modules/typescript-plugin-styled-components": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/typescript-plugin-styled-components/-/typescript-plugin-styled-components-3.0.0.tgz",
-            "integrity": "sha512-QWlhTl6NqsFxtJyxn7pJjm3RhgzXSByUftZ3AoQClrMMpa4yAaHuJKTN1gFpH3Ti+Rwm56fNUfG9pXSBU+WW3A==",
-            "dev": true,
-            "license": "MIT",
-            "peerDependencies": {
-                "typescript": "~4.8 || 5"
-            }
-        },
-        "node_modules/unbox-primitive": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.1.0.tgz",
-            "integrity": "sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==",
+        "node_modules/typescript-eslint": {
+            "version": "8.32.1",
+            "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.32.1.tgz",
+            "integrity": "sha512-D7el+eaDHAmXvrZBy1zpzSNIRqnCOrkwTgZxTu3MUqRWk8k0q9m9Ho4+vPf7iHtgUfrK/o8IZaEApsxPlHTFCg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "call-bound": "^1.0.3",
-                "has-bigints": "^1.0.2",
-                "has-symbols": "^1.1.0",
-                "which-boxed-primitive": "^1.1.1"
+                "@typescript-eslint/eslint-plugin": "8.32.1",
+                "@typescript-eslint/parser": "8.32.1",
+                "@typescript-eslint/utils": "8.32.1"
             },
             "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/underscore.string": {
-            "version": "3.3.6",
-            "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-3.3.6.tgz",
-            "integrity": "sha512-VoC83HWXmCrF6rgkyxS9GHv8W9Q5nhMKho+OadDJGzL2oDYbYEppBaCMH6pFlwLeqj2QS+hhkw2kpXkSdD1JxQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "sprintf-js": "^1.1.1",
-                "util-deprecate": "^1.0.2"
-            },
-            "engines": {
-                "node": "*"
-            }
-        },
-        "node_modules/undici": {
-            "version": "6.21.1",
-            "resolved": "https://registry.npmjs.org/undici/-/undici-6.21.1.tgz",
-            "integrity": "sha512-q/1rj5D0/zayJB2FraXdaWxbhWiNKDvu8naDT2dl1yTlvJp4BLtOcp2a5BvgGNQpYYJzau7tf1WgKv3b+7mqpQ==",
-            "license": "MIT",
-            "engines": {
-                "node": ">=18.17"
-            }
-        },
-        "node_modules/undici-types": {
-            "version": "6.21.0",
-            "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
-            "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/unique-filename": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-2.0.1.tgz",
-            "integrity": "sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A==",
-            "dev": true,
-            "license": "ISC",
-            "dependencies": {
-                "unique-slug": "^3.0.0"
-            },
-            "engines": {
-                "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
-            }
-        },
-        "node_modules/unique-slug": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-3.0.0.tgz",
-            "integrity": "sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w==",
-            "dev": true,
-            "license": "ISC",
-            "dependencies": {
-                "imurmurhash": "^0.1.4"
-            },
-            "engines": {
-                "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
-            }
-        },
-        "node_modules/universalify": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
-            "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
-            "license": "MIT",
-            "engines": {
-                "node": ">= 10.0.0"
-            }
-        },
-        "node_modules/unixify": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/unixify/-/unixify-1.0.0.tgz",
-            "integrity": "sha512-6bc58dPYhCMHHuwxldQxO3RRNZ4eCogZ/st++0+fcC1nr0jiGUtAdBJ2qzmLQWSxbtz42pWt4QQMiZ9HvZf5cg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "normalize-path": "^2.1.1"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/unixify/node_modules/normalize-path": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-            "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "remove-trailing-separator": "^1.0.1"
-            },
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/unpipe": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
-            "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">= 0.8"
-            }
-        },
-        "node_modules/unzip-crx-3": {
-            "version": "0.2.0",
-            "resolved": "https://registry.npmjs.org/unzip-crx-3/-/unzip-crx-3-0.2.0.tgz",
-            "integrity": "sha512-0+JiUq/z7faJ6oifVB5nSwt589v1KCduqIJupNVDoWSXZtWDmjDGO3RAEOvwJ07w90aoXoP4enKsR7ecMrJtWQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "jszip": "^3.1.0",
-                "mkdirp": "^0.5.1",
-                "yaku": "^0.16.6"
-            }
-        },
-        "node_modules/unzip-crx-3/node_modules/mkdirp": {
-            "version": "0.5.6",
-            "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-            "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "minimist": "^1.2.6"
-            },
-            "bin": {
-                "mkdirp": "bin/cmd.js"
-            }
-        },
-        "node_modules/update-browserslist-db": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz",
-            "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "opencollective",
-                    "url": "https://opencollective.com/browserslist"
-                },
-                {
-                    "type": "tidelift",
-                    "url": "https://tidelift.com/funding/github/npm/browserslist"
-                },
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/ai"
-                }
-            ],
-            "license": "MIT",
-            "dependencies": {
-                "escalade": "^3.2.0",
-                "picocolors": "^1.1.1"
-            },
-            "bin": {
-                "update-browserslist-db": "cli.js"
-            },
-            "peerDependencies": {
-                "browserslist": ">= 4.21.0"
-            }
-        },
-        "node_modules/uri-js": {
-            "version": "4.4.1",
-            "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
-            "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-            "dev": true,
-            "license": "BSD-2-Clause",
-            "dependencies": {
-                "punycode": "^2.1.0"
-            }
-        },
-        "node_modules/url-loader": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-4.1.1.tgz",
-            "integrity": "sha512-3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "loader-utils": "^2.0.0",
-                "mime-types": "^2.1.27",
-                "schema-utils": "^3.0.0"
-            },
-            "engines": {
-                "node": ">= 10.13.0"
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
             },
             "funding": {
                 "type": "opencollective",
-                "url": "https://opencollective.com/webpack"
+                "url": "https://opencollective.com/typescript-eslint"
             },
             "peerDependencies": {
-                "file-loader": "*",
-                "webpack": "^4.0.0 || ^5.0.0"
-            },
-            "peerDependenciesMeta": {
-                "file-loader": {
-                    "optional": true
-                }
+                "eslint": "^8.57.0 || ^9.0.0",
+                "typescript": ">=4.8.4 <5.9.0"
             }
         },
-        "node_modules/url-parse": {
-            "version": "1.5.10",
-            "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
-            "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
+        "node_modules/typescript-eslint/node_modules/@typescript-eslint/eslint-plugin": {
+            "version": "8.32.1",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.32.1.tgz",
+            "integrity": "sha512-6u6Plg9nP/J1GRpe/vcjjabo6Uc5YQPAMxsgQyGC/I0RuukiG1wIe3+Vtg3IrSCVJDmqK3j8adrtzXSENRtFgg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "querystringify": "^2.1.1",
-                "requires-port": "^1.0.0"
-            }
-        },
-        "node_modules/use-callback-ref": {
-            "version": "1.3.3",
-            "resolved": "https://registry.npmjs.org/use-callback-ref/-/use-callback-ref-1.3.3.tgz",
-            "integrity": "sha512-jQL3lRnocaFtu3V00JToYz/4QkNWswxijDaCVNZRiRTO3HQDLsdu1ZtmIUvV4yPp+rvWm5j0y0TG/S61cuijTg==",
-            "license": "MIT",
-            "dependencies": {
-                "tslib": "^2.0.0"
+                "@eslint-community/regexpp": "^4.10.0",
+                "@typescript-eslint/scope-manager": "8.32.1",
+                "@typescript-eslint/type-utils": "8.32.1",
+                "@typescript-eslint/utils": "8.32.1",
+                "@typescript-eslint/visitor-keys": "8.32.1",
+                "graphemer": "^1.4.0",
+                "ignore": "^7.0.0",
+                "natural-compare": "^1.4.0",
+                "ts-api-utils": "^2.1.0"
             },
             "engines": {
-                "node": ">=10"
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
             },
             "peerDependencies": {
-                "@types/react": "*",
-                "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc"
-            },
-            "peerDependenciesMeta": {
-                "@types/react": {
-                    "optional": true
-                }
+                "@typescript-eslint/parser": "^8.0.0 || ^8.0.0-alpha.0",
+                "eslint": "^8.57.0 || ^9.0.0",
+                "typescript": ">=4.8.4 <5.9.0"
             }
         },
-        "node_modules/use-composed-ref": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/use-composed-ref/-/use-composed-ref-1.4.0.tgz",
-            "integrity": "sha512-djviaxuOOh7wkj0paeO1Q/4wMZ8Zrnag5H6yBvzN7AKKe8beOaED9SF5/ByLqsku8NP4zQqsvM2u3ew/tJK8/w==",
-            "license": "MIT",
-            "peerDependencies": {
-                "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
-            },
-            "peerDependenciesMeta": {
-                "@types/react": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/use-isomorphic-layout-effect": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.2.0.tgz",
-            "integrity": "sha512-q6ayo8DWoPZT0VdG4u3D3uxcgONP3Mevx2i2b0434cwWBoL+aelL1DzkXI6w3PhTZzUeR2kaVlZn70iCiseP6w==",
-            "license": "MIT",
-            "peerDependencies": {
-                "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
-            },
-            "peerDependenciesMeta": {
-                "@types/react": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/use-latest": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/use-latest/-/use-latest-1.3.0.tgz",
-            "integrity": "sha512-mhg3xdm9NaM8q+gLT8KryJPnRFOz1/5XPBhmDEVZK1webPzDjrPk7f/mbpeLqTgB9msytYWANxgALOCJKnLvcQ==",
+        "node_modules/typescript-eslint/node_modules/@typescript-eslint/parser": {
+            "version": "8.32.1",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.32.1.tgz",
+            "integrity": "sha512-LKMrmwCPoLhM45Z00O1ulb6jwyVr2kr3XJp+G+tSEZcbauNnScewcQwtJqXDhXeYPDEjZ8C1SjXm015CirEmGg==",
+            "dev": true,
             "license": "MIT",
             "dependencies": {
-                "use-isomorphic-layout-effect": "^1.1.1"
+                "@typescript-eslint/scope-manager": "8.32.1",
+                "@typescript-eslint/types": "8.32.1",
+                "@typescript-eslint/typescript-estree": "8.32.1",
+                "@typescript-eslint/visitor-keys": "8.32.1",
+                "debug": "^4.3.4"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
             },
             "peerDependencies": {
-                "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
-            },
-            "peerDependenciesMeta": {
-                "@types/react": {
-                    "optional": true
-                }
+                "eslint": "^8.57.0 || ^9.0.0",
+                "typescript": ">=4.8.4 <5.9.0"
             }
         },
-        "node_modules/use-sidecar": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/use-sidecar/-/use-sidecar-1.1.3.tgz",
-            "integrity": "sha512-Fedw0aZvkhynoPYlA5WXrMCAMm+nSWdZt6lzJQ7Ok8S6Q+VsHmHpRWndVRJ8Be0ZbkfPc5LRYH+5XrzXcEeLRQ==",
+        "node_modules/typescript-eslint/node_modules/@typescript-eslint/scope-manager": {
+            "version": "8.32.1",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.32.1.tgz",
+            "integrity": "sha512-7IsIaIDeZn7kffk7qXC3o6Z4UblZJKV3UBpkvRNpr5NSyLji7tvTcvmnMNYuYLyh26mN8W723xpo3i4MlD33vA==",
+            "dev": true,
             "license": "MIT",
             "dependencies": {
-                "detect-node-es": "^1.1.0",
-                "tslib": "^2.0.0"
+                "@typescript-eslint/types": "8.32.1",
+                "@typescript-eslint/visitor-keys": "8.32.1"
             },
             "engines": {
-                "node": ">=10"
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            }
+        },
+        "node_modules/typescript-eslint/node_modules/@typescript-eslint/type-utils": {
+            "version": "8.32.1",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.32.1.tgz",
+            "integrity": "sha512-mv9YpQGA8iIsl5KyUPi+FGLm7+bA4fgXaeRcFKRDRwDMu4iwrSHeDPipwueNXhdIIZltwCJv+NkxftECbIZWfA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@typescript-eslint/typescript-estree": "8.32.1",
+                "@typescript-eslint/utils": "8.32.1",
+                "debug": "^4.3.4",
+                "ts-api-utils": "^2.1.0"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
             },
             "peerDependencies": {
-                "@types/react": "*",
-                "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc"
-            },
-            "peerDependenciesMeta": {
-                "@types/react": {
-                    "optional": true
-                }
+                "eslint": "^8.57.0 || ^9.0.0",
+                "typescript": ">=4.8.4 <5.9.0"
             }
         },
-        "node_modules/use-sync-external-store": {
-            "version": "1.5.0",
-            "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.5.0.tgz",
-            "integrity": "sha512-Rb46I4cGGVBmjamjphe8L/UnvJD+uPPtTkNvX5mZgqdbavhI4EbgIWJiIHXJ8bc/i9EQGPRh4DwEURJ552Do0A==",
-            "license": "MIT",
-            "peerDependencies": {
-                "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
-            }
-        },
-        "node_modules/utf8-byte-length": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/utf8-byte-length/-/utf8-byte-length-1.0.5.tgz",
-            "integrity": "sha512-Xn0w3MtiQ6zoz2vFyUVruaCL53O/DwUvkEeOvj+uulMm0BkUGYWmBYVyElqZaSLhY6ZD0ulfU3aBra2aVT4xfA==",
-            "dev": true,
-            "license": "(WTFPL OR MIT)"
-        },
-        "node_modules/util-deprecate": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-            "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/utila": {
-            "version": "0.4.0",
-            "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
-            "integrity": "sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/utils-merge": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
-            "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">= 0.4.0"
-            }
-        },
-        "node_modules/uuid": {
-            "version": "8.3.2",
-            "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
-            "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-            "dev": true,
-            "license": "MIT",
-            "bin": {
-                "uuid": "dist/bin/uuid"
-            }
-        },
-        "node_modules/v8-compile-cache-lib": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
-            "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/v8-to-istanbul": {
-            "version": "8.1.1",
-            "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.1.1.tgz",
-            "integrity": "sha512-FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w==",
-            "dev": true,
-            "license": "ISC",
-            "dependencies": {
-                "@types/istanbul-lib-coverage": "^2.0.1",
-                "convert-source-map": "^1.6.0",
-                "source-map": "^0.7.3"
-            },
-            "engines": {
-                "node": ">=10.12.0"
-            }
-        },
-        "node_modules/v8-to-istanbul/node_modules/source-map": {
-            "version": "0.7.4",
-            "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
-            "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
-            "dev": true,
-            "license": "BSD-3-Clause",
-            "engines": {
-                "node": ">= 8"
-            }
-        },
-        "node_modules/validate-npm-package-license": {
-            "version": "3.0.4",
-            "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
-            "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
-            "dev": true,
-            "license": "Apache-2.0",
-            "dependencies": {
-                "spdx-correct": "^3.0.0",
-                "spdx-expression-parse": "^3.0.0"
-            }
-        },
-        "node_modules/value-or-function": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-4.0.0.tgz",
-            "integrity": "sha512-aeVK81SIuT6aMJfNo9Vte8Dw0/FZINGBV8BfCraGtqVxIeLAEhJyoWs8SmvRVmXfGss2PmmOwZCuBPbZR+IYWg==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">= 10.13.0"
-            }
-        },
-        "node_modules/vary": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
-            "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">= 0.8"
-            }
-        },
-        "node_modules/verror": {
-            "version": "1.10.1",
-            "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.1.tgz",
-            "integrity": "sha512-veufcmxri4e3XSrT0xwfUR7kguIkaxBeosDg00yDWhk49wdwkSUrvvsm7nc75e1PUyvIeZj6nS8VQRYz2/S4Xg==",
-            "dev": true,
-            "license": "MIT",
-            "optional": true,
-            "dependencies": {
-                "assert-plus": "^1.0.0",
-                "core-util-is": "1.0.2",
-                "extsprintf": "^1.2.0"
-            },
-            "engines": {
-                "node": ">=0.6.0"
-            }
-        },
-        "node_modules/vinyl": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-3.0.0.tgz",
-            "integrity": "sha512-rC2VRfAVVCGEgjnxHUnpIVh3AGuk62rP3tqVrn+yab0YH7UULisC085+NYH+mnqf3Wx4SpSi1RQMwudL89N03g==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "clone": "^2.1.2",
-                "clone-stats": "^1.0.0",
-                "remove-trailing-separator": "^1.1.0",
-                "replace-ext": "^2.0.0",
-                "teex": "^1.0.1"
-            },
-            "engines": {
-                "node": ">=10.13.0"
-            }
-        },
-        "node_modules/vinyl-contents": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/vinyl-contents/-/vinyl-contents-2.0.0.tgz",
-            "integrity": "sha512-cHq6NnGyi2pZ7xwdHSW1v4Jfnho4TEGtxZHw01cmnc8+i7jgR6bRnED/LbrKan/Q7CvVLbnvA5OepnhbpjBZ5Q==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "bl": "^5.0.0",
-                "vinyl": "^3.0.0"
-            },
-            "engines": {
-                "node": ">=10.13.0"
-            }
-        },
-        "node_modules/vinyl-contents/node_modules/bl": {
-            "version": "5.1.0",
-            "resolved": "https://registry.npmjs.org/bl/-/bl-5.1.0.tgz",
-            "integrity": "sha512-tv1ZJHLfTDnXE6tMHv73YgSJaWR2AFuPwMntBe7XL/GBFHnT0CLnsHMogfk5+GzCDC5ZWarSCYaIGATZt9dNsQ==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "buffer": "^6.0.3",
-                "inherits": "^2.0.4",
-                "readable-stream": "^3.4.0"
-            }
-        },
-        "node_modules/vinyl-contents/node_modules/buffer": {
-            "version": "6.0.3",
-            "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
-            "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
-            "dev": true,
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/feross"
-                },
-                {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/feross"
-                },
-                {
-                    "type": "consulting",
-                    "url": "https://feross.org/support"
-                }
-            ],
-            "license": "MIT",
-            "dependencies": {
-                "base64-js": "^1.3.1",
-                "ieee754": "^1.2.1"
-            }
-        },
-        "node_modules/vinyl-fs": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-4.0.0.tgz",
-            "integrity": "sha512-7GbgBnYfaquMk3Qu9g22x000vbYkOex32930rBnc3qByw6HfMEAoELjCjoJv4HuEQxHAurT+nvMHm6MnJllFLw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "fs-mkdirp-stream": "^2.0.1",
-                "glob-stream": "^8.0.0",
-                "graceful-fs": "^4.2.11",
-                "iconv-lite": "^0.6.3",
-                "is-valid-glob": "^1.0.0",
-                "lead": "^4.0.0",
-                "normalize-path": "3.0.0",
-                "resolve-options": "^2.0.0",
-                "stream-composer": "^1.0.2",
-                "streamx": "^2.14.0",
-                "to-through": "^3.0.0",
-                "value-or-function": "^4.0.0",
-                "vinyl": "^3.0.0",
-                "vinyl-sourcemap": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=10.13.0"
-            }
-        },
-        "node_modules/vinyl-sourcemap": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-2.0.0.tgz",
-            "integrity": "sha512-BAEvWxbBUXvlNoFQVFVHpybBbjW1r03WhohJzJDSfgrrK5xVYIDTan6xN14DlyImShgDRv2gl9qhM6irVMsV0Q==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "convert-source-map": "^2.0.0",
-                "graceful-fs": "^4.2.10",
-                "now-and-later": "^3.0.0",
-                "streamx": "^2.12.5",
-                "vinyl": "^3.0.0",
-                "vinyl-contents": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=10.13.0"
-            }
-        },
-        "node_modules/vinyl-sourcemap/node_modules/convert-source-map": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
-            "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/void-elements": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz",
-            "integrity": "sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==",
-            "license": "MIT",
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/w3c-hr-time": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
-            "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
-            "deprecated": "Use your platform's native performance.now() and performance.timeOrigin.",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "browser-process-hrtime": "^1.0.0"
-            }
-        },
-        "node_modules/w3c-xmlserializer": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz",
-            "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "xml-name-validator": "^3.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/walk-sync": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/walk-sync/-/walk-sync-2.2.0.tgz",
-            "integrity": "sha512-IC8sL7aB4/ZgFcGI2T1LczZeFWZ06b3zoHH7jBPyHxOtIIz1jppWHjjEXkOFvFojBVAK9pV7g47xOZ4LW3QLfg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "@types/minimatch": "^3.0.3",
-                "ensure-posix-path": "^1.1.0",
-                "matcher-collection": "^2.0.0",
-                "minimatch": "^3.0.4"
-            },
-            "engines": {
-                "node": "8.* || >= 10.*"
-            }
-        },
-        "node_modules/walk-sync/node_modules/brace-expansion": {
-            "version": "1.1.11",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "balanced-match": "^1.0.0",
-                "concat-map": "0.0.1"
-            }
-        },
-        "node_modules/walk-sync/node_modules/minimatch": {
-            "version": "3.1.2",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-            "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-            "dev": true,
-            "license": "ISC",
-            "dependencies": {
-                "brace-expansion": "^1.1.7"
-            },
-            "engines": {
-                "node": "*"
-            }
-        },
-        "node_modules/walker": {
-            "version": "1.0.8",
-            "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
-            "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
-            "dev": true,
-            "license": "Apache-2.0",
-            "dependencies": {
-                "makeerror": "1.0.12"
-            }
-        },
-        "node_modules/watchboy": {
-            "version": "0.4.3",
-            "resolved": "https://registry.npmjs.org/watchboy/-/watchboy-0.4.3.tgz",
-            "integrity": "sha512-GHs1HxwvxSMBsqd/WfTOZhj5gBdMqf5HQpfgtKxDfZRxrlYPDdVLRB61LCeRzJaWANmvSIMlfmRVDwVmJFgAKA==",
-            "dev": true,
-            "license": "ISC",
-            "dependencies": {
-                "lodash.difference": "^4.5.0",
-                "micromatch": "^4.0.2",
-                "pify": "^4.0.1",
-                "unixify": "^1.0.0"
-            },
-            "engines": {
-                "node": ">=8.0.0"
-            }
-        },
-        "node_modules/watchpack": {
-            "version": "2.4.2",
-            "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz",
-            "integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "glob-to-regexp": "^0.4.1",
-                "graceful-fs": "^4.1.2"
-            },
-            "engines": {
-                "node": ">=10.13.0"
-            }
-        },
-        "node_modules/wbuf": {
-            "version": "1.7.3",
-            "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
-            "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "minimalistic-assert": "^1.0.0"
-            }
-        },
-        "node_modules/wcwidth": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
-            "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "defaults": "^1.0.3"
-            }
-        },
-        "node_modules/webidl-conversions": {
-            "version": "6.1.0",
-            "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
-            "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
-            "dev": true,
-            "license": "BSD-2-Clause",
-            "engines": {
-                "node": ">=10.4"
-            }
-        },
-        "node_modules/webpack": {
-            "version": "5.99.7",
-            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.99.7.tgz",
-            "integrity": "sha512-CNqKBRMQjwcmKR0idID5va1qlhrqVUKpovi+Ec79ksW8ux7iS1+A6VqzfZXgVYCFRKl7XL5ap3ZoMpwBJxcg0w==",
+        "node_modules/typescript-eslint/node_modules/@typescript-eslint/types": {
+            "version": "8.32.1",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.32.1.tgz",
+            "integrity": "sha512-YmybwXUJcgGqgAp6bEsgpPXEg6dcCyPyCSr0CAAueacR/CCBi25G3V8gGQ2kRzQRBNol7VQknxMs9HvVa9Rvfg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -39594,415 +40639,661 @@
             "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz",
             "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA=="
         },
-        "type-is": {
-            "version": "1.6.18",
-            "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-            "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+        "node_modules/typescript-eslint/node_modules/@typescript-eslint/typescript-estree": {
+            "version": "8.32.1",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.32.1.tgz",
+            "integrity": "sha512-Y3AP9EIfYwBb4kWGb+simvPaqQoT5oJuzzj9m0i6FCY6SPvlomY2Ei4UEMm7+FXtlNJbor80ximyslzaQF6xhg==",
             "dev": true,
-            "requires": {
-                "media-typer": "0.3.0",
-                "mime-types": "~2.1.24"
+            "license": "MIT",
+            "dependencies": {
+                "@typescript-eslint/types": "8.32.1",
+                "@typescript-eslint/visitor-keys": "8.32.1",
+                "debug": "^4.3.4",
+                "fast-glob": "^3.3.2",
+                "is-glob": "^4.0.3",
+                "minimatch": "^9.0.4",
+                "semver": "^7.6.0",
+                "ts-api-utils": "^2.1.0"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            },
+            "peerDependencies": {
+                "typescript": ">=4.8.4 <5.9.0"
             }
         },
-        "typed-array-buffer": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz",
-            "integrity": "sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==",
+        "node_modules/typescript-eslint/node_modules/@typescript-eslint/utils": {
+            "version": "8.32.1",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.32.1.tgz",
+            "integrity": "sha512-DsSFNIgLSrc89gpq1LJB7Hm1YpuhK086DRDJSNrewcGvYloWW1vZLHBTIvarKZDcAORIy/uWNx8Gad+4oMpkSA==",
             "dev": true,
-            "requires": {
-                "call-bound": "^1.0.3",
-                "es-errors": "^1.3.0",
-                "is-typed-array": "^1.1.14"
+            "license": "MIT",
+            "dependencies": {
+                "@eslint-community/eslint-utils": "^4.7.0",
+                "@typescript-eslint/scope-manager": "8.32.1",
+                "@typescript-eslint/types": "8.32.1",
+                "@typescript-eslint/typescript-estree": "8.32.1"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
+            },
+            "peerDependencies": {
+                "eslint": "^8.57.0 || ^9.0.0",
+                "typescript": ">=4.8.4 <5.9.0"
             }
         },
-        "typed-array-byte-length": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz",
-            "integrity": "sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==",
+        "node_modules/typescript-eslint/node_modules/@typescript-eslint/visitor-keys": {
+            "version": "8.32.1",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.32.1.tgz",
+            "integrity": "sha512-ar0tjQfObzhSaW3C3QNmTc5ofj0hDoNQ5XWrCy6zDyabdr0TWhCkClp+rywGNj/odAFBVzzJrK4tEq5M4Hmu4w==",
             "dev": true,
-            "requires": {
-                "call-bind": "^1.0.8",
-                "for-each": "^0.3.3",
-                "gopd": "^1.2.0",
-                "has-proto": "^1.2.0",
-                "is-typed-array": "^1.1.14"
+            "license": "MIT",
+            "dependencies": {
+                "@typescript-eslint/types": "8.32.1",
+                "eslint-visitor-keys": "^4.2.0"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/typescript-eslint"
             }
         },
-        "typed-array-byte-offset": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz",
-            "integrity": "sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==",
+        "node_modules/typescript-eslint/node_modules/eslint-visitor-keys": {
+            "version": "4.2.0",
+            "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
+            "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
             "dev": true,
-            "requires": {
-                "available-typed-arrays": "^1.0.7",
-                "call-bind": "^1.0.8",
-                "for-each": "^0.3.3",
-                "gopd": "^1.2.0",
-                "has-proto": "^1.2.0",
-                "is-typed-array": "^1.1.15",
-                "reflect.getprototypeof": "^1.0.9"
+            "license": "Apache-2.0",
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            },
+            "funding": {
+                "url": "https://opencollective.com/eslint"
             }
         },
-        "typed-array-length": {
-            "version": "1.0.7",
-            "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.7.tgz",
-            "integrity": "sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==",
+        "node_modules/typescript-eslint/node_modules/ignore": {
+            "version": "7.0.4",
+            "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.4.tgz",
+            "integrity": "sha512-gJzzk+PQNznz8ysRrC0aOkBNVRBDtE1n53IqyqEf3PXrYwomFs5q4pGMizBMJF+ykh03insJ27hB8gSrD2Hn8A==",
             "dev": true,
-            "requires": {
-                "call-bind": "^1.0.7",
-                "for-each": "^0.3.3",
-                "gopd": "^1.0.1",
-                "is-typed-array": "^1.1.13",
-                "possible-typed-array-names": "^1.0.0",
-                "reflect.getprototypeof": "^1.0.6"
+            "license": "MIT",
+            "engines": {
+                "node": ">= 4"
             }
         },
-        "typedarray-to-buffer": {
-            "version": "3.1.5",
-            "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
-            "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
+        "node_modules/typescript-eslint/node_modules/minimatch": {
+            "version": "9.0.5",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+            "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
             "dev": true,
-            "requires": {
-                "is-typedarray": "^1.0.0"
+            "license": "ISC",
+            "dependencies": {
+                "brace-expansion": "^2.0.1"
+            },
+            "engines": {
+                "node": ">=16 || 14 >=14.17"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/isaacs"
             }
         },
-        "typescript": {
-            "version": "5.8.3",
-            "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.8.3.tgz",
-            "integrity": "sha512-p1diW6TqL9L07nNxvRMM7hMMw4c5XOo/1ibL4aAIGmSAt9slTE1Xgw5KWuof2uTOvCg9BY7ZRi+GaF+7sfgPeQ==",
-            "dev": true
+        "node_modules/typescript-eslint/node_modules/ts-api-utils": {
+            "version": "2.1.0",
+            "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz",
+            "integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=18.12"
+            },
+            "peerDependencies": {
+                "typescript": ">=4.8.4"
+            }
         },
-        "typescript-plugin-styled-components": {
+        "node_modules/typescript-plugin-styled-components": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/typescript-plugin-styled-components/-/typescript-plugin-styled-components-3.0.0.tgz",
             "integrity": "sha512-QWlhTl6NqsFxtJyxn7pJjm3RhgzXSByUftZ3AoQClrMMpa4yAaHuJKTN1gFpH3Ti+Rwm56fNUfG9pXSBU+WW3A==",
-            "dev": true
+            "dev": true,
+            "license": "MIT",
+            "peerDependencies": {
+                "typescript": "~4.8 || 5"
+            }
         },
-        "unbox-primitive": {
+        "node_modules/unbox-primitive": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.1.0.tgz",
             "integrity": "sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==",
             "dev": true,
-            "requires": {
+            "license": "MIT",
+            "dependencies": {
                 "call-bound": "^1.0.3",
                 "has-bigints": "^1.0.2",
                 "has-symbols": "^1.1.0",
                 "which-boxed-primitive": "^1.1.1"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "underscore.string": {
+        "node_modules/underscore.string": {
             "version": "3.3.6",
             "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-3.3.6.tgz",
             "integrity": "sha512-VoC83HWXmCrF6rgkyxS9GHv8W9Q5nhMKho+OadDJGzL2oDYbYEppBaCMH6pFlwLeqj2QS+hhkw2kpXkSdD1JxQ==",
             "dev": true,
-            "requires": {
+            "license": "MIT",
+            "dependencies": {
                 "sprintf-js": "^1.1.1",
                 "util-deprecate": "^1.0.2"
+            },
+            "engines": {
+                "node": "*"
             }
         },
-        "undici": {
+        "node_modules/undici": {
             "version": "6.21.1",
             "resolved": "https://registry.npmjs.org/undici/-/undici-6.21.1.tgz",
-            "integrity": "sha512-q/1rj5D0/zayJB2FraXdaWxbhWiNKDvu8naDT2dl1yTlvJp4BLtOcp2a5BvgGNQpYYJzau7tf1WgKv3b+7mqpQ=="
+            "integrity": "sha512-q/1rj5D0/zayJB2FraXdaWxbhWiNKDvu8naDT2dl1yTlvJp4BLtOcp2a5BvgGNQpYYJzau7tf1WgKv3b+7mqpQ==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=18.17"
+            }
         },
-        "undici-types": {
+        "node_modules/undici-types": {
             "version": "6.21.0",
             "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
             "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
-            "dev": true
+            "dev": true,
+            "license": "MIT"
         },
-        "unique-filename": {
+        "node_modules/unique-filename": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-2.0.1.tgz",
             "integrity": "sha512-ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A==",
             "dev": true,
-            "requires": {
+            "license": "ISC",
+            "dependencies": {
                 "unique-slug": "^3.0.0"
+            },
+            "engines": {
+                "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
             }
         },
-        "unique-slug": {
+        "node_modules/unique-slug": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-3.0.0.tgz",
             "integrity": "sha512-8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w==",
             "dev": true,
-            "requires": {
+            "license": "ISC",
+            "dependencies": {
                 "imurmurhash": "^0.1.4"
+            },
+            "engines": {
+                "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
             }
         },
-        "universalify": {
+        "node_modules/universalify": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
-            "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw=="
+            "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+            "license": "MIT",
+            "engines": {
+                "node": ">= 10.0.0"
+            }
         },
-        "unixify": {
+        "node_modules/unixify": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/unixify/-/unixify-1.0.0.tgz",
             "integrity": "sha512-6bc58dPYhCMHHuwxldQxO3RRNZ4eCogZ/st++0+fcC1nr0jiGUtAdBJ2qzmLQWSxbtz42pWt4QQMiZ9HvZf5cg==",
             "dev": true,
-            "requires": {
+            "license": "MIT",
+            "dependencies": {
                 "normalize-path": "^2.1.1"
             },
-            "dependencies": {
-                "normalize-path": {
-                    "version": "2.1.1",
-                    "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
-                    "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
-                    "dev": true,
-                    "requires": {
-                        "remove-trailing-separator": "^1.0.1"
-                    }
-                }
+            "engines": {
+                "node": ">=0.10.0"
             }
         },
-        "unpipe": {
+        "node_modules/unixify/node_modules/normalize-path": {
+            "version": "2.1.1",
+            "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+            "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "remove-trailing-separator": "^1.0.1"
+            },
+            "engines": {
+                "node": ">=0.10.0"
+            }
+        },
+        "node_modules/unpipe": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
             "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==",
-            "dev": true
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.8"
+            }
         },
-        "unzip-crx-3": {
+        "node_modules/unzip-crx-3": {
             "version": "0.2.0",
             "resolved": "https://registry.npmjs.org/unzip-crx-3/-/unzip-crx-3-0.2.0.tgz",
             "integrity": "sha512-0+JiUq/z7faJ6oifVB5nSwt589v1KCduqIJupNVDoWSXZtWDmjDGO3RAEOvwJ07w90aoXoP4enKsR7ecMrJtWQ==",
             "dev": true,
-            "requires": {
+            "license": "MIT",
+            "dependencies": {
                 "jszip": "^3.1.0",
                 "mkdirp": "^0.5.1",
                 "yaku": "^0.16.6"
-            },
-            "dependencies": {
-                "mkdirp": {
-                    "version": "0.5.6",
-                    "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-                    "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
-                    "dev": true,
-                    "requires": {
-                        "minimist": "^1.2.6"
-                    }
-                }
             }
         },
-        "update-browserslist-db": {
+        "node_modules/unzip-crx-3/node_modules/mkdirp": {
+            "version": "0.5.6",
+            "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+            "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "minimist": "^1.2.6"
+            },
+            "bin": {
+                "mkdirp": "bin/cmd.js"
+            }
+        },
+        "node_modules/update-browserslist-db": {
             "version": "1.1.3",
             "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz",
             "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==",
             "dev": true,
-            "requires": {
+            "funding": [
+                {
+                    "type": "opencollective",
+                    "url": "https://opencollective.com/browserslist"
+                },
+                {
+                    "type": "tidelift",
+                    "url": "https://tidelift.com/funding/github/npm/browserslist"
+                },
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/ai"
+                }
+            ],
+            "license": "MIT",
+            "dependencies": {
                 "escalade": "^3.2.0",
                 "picocolors": "^1.1.1"
+            },
+            "bin": {
+                "update-browserslist-db": "cli.js"
+            },
+            "peerDependencies": {
+                "browserslist": ">= 4.21.0"
             }
         },
-        "uri-js": {
+        "node_modules/uri-js": {
             "version": "4.4.1",
             "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
             "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
             "dev": true,
-            "requires": {
+            "license": "BSD-2-Clause",
+            "dependencies": {
                 "punycode": "^2.1.0"
             }
         },
-        "url-loader": {
+        "node_modules/url-loader": {
             "version": "4.1.1",
             "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-4.1.1.tgz",
             "integrity": "sha512-3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA==",
             "dev": true,
-            "requires": {
+            "license": "MIT",
+            "dependencies": {
                 "loader-utils": "^2.0.0",
                 "mime-types": "^2.1.27",
                 "schema-utils": "^3.0.0"
+            },
+            "engines": {
+                "node": ">= 10.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            },
+            "peerDependencies": {
+                "file-loader": "*",
+                "webpack": "^4.0.0 || ^5.0.0"
+            },
+            "peerDependenciesMeta": {
+                "file-loader": {
+                    "optional": true
+                }
             }
         },
-        "url-parse": {
+        "node_modules/url-parse": {
             "version": "1.5.10",
             "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
             "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
             "dev": true,
-            "requires": {
+            "license": "MIT",
+            "dependencies": {
                 "querystringify": "^2.1.1",
                 "requires-port": "^1.0.0"
             }
         },
-        "use-callback-ref": {
+        "node_modules/use-callback-ref": {
             "version": "1.3.3",
             "resolved": "https://registry.npmjs.org/use-callback-ref/-/use-callback-ref-1.3.3.tgz",
             "integrity": "sha512-jQL3lRnocaFtu3V00JToYz/4QkNWswxijDaCVNZRiRTO3HQDLsdu1ZtmIUvV4yPp+rvWm5j0y0TG/S61cuijTg==",
-            "requires": {
+            "license": "MIT",
+            "dependencies": {
                 "tslib": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                }
             }
         },
-        "use-composed-ref": {
+        "node_modules/use-composed-ref": {
             "version": "1.4.0",
             "resolved": "https://registry.npmjs.org/use-composed-ref/-/use-composed-ref-1.4.0.tgz",
-            "integrity": "sha512-djviaxuOOh7wkj0paeO1Q/4wMZ8Zrnag5H6yBvzN7AKKe8beOaED9SF5/ByLqsku8NP4zQqsvM2u3ew/tJK8/w=="
+            "integrity": "sha512-djviaxuOOh7wkj0paeO1Q/4wMZ8Zrnag5H6yBvzN7AKKe8beOaED9SF5/ByLqsku8NP4zQqsvM2u3ew/tJK8/w==",
+            "license": "MIT",
+            "peerDependencies": {
+                "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                }
+            }
         },
-        "use-isomorphic-layout-effect": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.2.0.tgz",
-            "integrity": "sha512-q6ayo8DWoPZT0VdG4u3D3uxcgONP3Mevx2i2b0434cwWBoL+aelL1DzkXI6w3PhTZzUeR2kaVlZn70iCiseP6w=="
+        "node_modules/use-isomorphic-layout-effect": {
+            "version": "1.2.1",
+            "resolved": "https://registry.npmjs.org/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.2.1.tgz",
+            "integrity": "sha512-tpZZ+EX0gaghDAiFR37hj5MgY6ZN55kLiPkJsKxBMZ6GZdOSPJXiOzPM984oPYZ5AnehYx5WQp1+ME8I/P/pRA==",
+            "license": "MIT",
+            "peerDependencies": {
+                "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                }
+            }
         },
-        "use-latest": {
+        "node_modules/use-latest": {
             "version": "1.3.0",
             "resolved": "https://registry.npmjs.org/use-latest/-/use-latest-1.3.0.tgz",
             "integrity": "sha512-mhg3xdm9NaM8q+gLT8KryJPnRFOz1/5XPBhmDEVZK1webPzDjrPk7f/mbpeLqTgB9msytYWANxgALOCJKnLvcQ==",
-            "requires": {
+            "license": "MIT",
+            "dependencies": {
                 "use-isomorphic-layout-effect": "^1.1.1"
+            },
+            "peerDependencies": {
+                "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                }
             }
         },
-        "use-sidecar": {
+        "node_modules/use-sidecar": {
             "version": "1.1.3",
             "resolved": "https://registry.npmjs.org/use-sidecar/-/use-sidecar-1.1.3.tgz",
             "integrity": "sha512-Fedw0aZvkhynoPYlA5WXrMCAMm+nSWdZt6lzJQ7Ok8S6Q+VsHmHpRWndVRJ8Be0ZbkfPc5LRYH+5XrzXcEeLRQ==",
-            "requires": {
+            "license": "MIT",
+            "dependencies": {
                 "detect-node-es": "^1.1.0",
                 "tslib": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                }
             }
         },
-        "use-sync-external-store": {
+        "node_modules/use-sync-external-store": {
             "version": "1.5.0",
             "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.5.0.tgz",
-            "integrity": "sha512-Rb46I4cGGVBmjamjphe8L/UnvJD+uPPtTkNvX5mZgqdbavhI4EbgIWJiIHXJ8bc/i9EQGPRh4DwEURJ552Do0A=="
+            "integrity": "sha512-Rb46I4cGGVBmjamjphe8L/UnvJD+uPPtTkNvX5mZgqdbavhI4EbgIWJiIHXJ8bc/i9EQGPRh4DwEURJ552Do0A==",
+            "license": "MIT",
+            "peerDependencies": {
+                "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+            }
         },
-        "utf8-byte-length": {
+        "node_modules/utf8-byte-length": {
             "version": "1.0.5",
             "resolved": "https://registry.npmjs.org/utf8-byte-length/-/utf8-byte-length-1.0.5.tgz",
             "integrity": "sha512-Xn0w3MtiQ6zoz2vFyUVruaCL53O/DwUvkEeOvj+uulMm0BkUGYWmBYVyElqZaSLhY6ZD0ulfU3aBra2aVT4xfA==",
-            "dev": true
+            "dev": true,
+            "license": "(WTFPL OR MIT)"
         },
-        "util-deprecate": {
+        "node_modules/util-deprecate": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
             "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
-            "dev": true
+            "dev": true,
+            "license": "MIT"
         },
-        "utila": {
+        "node_modules/utila": {
             "version": "0.4.0",
             "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
             "integrity": "sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA==",
-            "dev": true
+            "dev": true,
+            "license": "MIT"
         },
-        "utils-merge": {
+        "node_modules/utils-merge": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
             "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==",
-            "dev": true
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.4.0"
+            }
         },
-        "uuid": {
+        "node_modules/uuid": {
             "version": "8.3.2",
             "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
             "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
-            "dev": true
+            "dev": true,
+            "license": "MIT",
+            "bin": {
+                "uuid": "dist/bin/uuid"
+            }
         },
-        "v8-compile-cache-lib": {
+        "node_modules/v8-compile-cache-lib": {
             "version": "3.0.1",
             "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
             "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",
-            "dev": true
+            "dev": true,
+            "license": "MIT"
         },
-        "v8-to-istanbul": {
+        "node_modules/v8-to-istanbul": {
             "version": "8.1.1",
             "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.1.1.tgz",
             "integrity": "sha512-FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w==",
             "dev": true,
-            "requires": {
+            "license": "ISC",
+            "dependencies": {
                 "@types/istanbul-lib-coverage": "^2.0.1",
                 "convert-source-map": "^1.6.0",
                 "source-map": "^0.7.3"
             },
-            "dependencies": {
-                "source-map": {
-                    "version": "0.7.4",
-                    "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
-                    "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
-                    "dev": true
-                }
+            "engines": {
+                "node": ">=10.12.0"
             }
         },
-        "validate-npm-package-license": {
+        "node_modules/v8-to-istanbul/node_modules/source-map": {
+            "version": "0.7.4",
+            "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
+            "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
+            "dev": true,
+            "license": "BSD-3-Clause",
+            "engines": {
+                "node": ">= 8"
+            }
+        },
+        "node_modules/validate-npm-package-license": {
             "version": "3.0.4",
             "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
             "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
             "dev": true,
-            "requires": {
+            "license": "Apache-2.0",
+            "dependencies": {
                 "spdx-correct": "^3.0.0",
                 "spdx-expression-parse": "^3.0.0"
             }
         },
-        "value-or-function": {
+        "node_modules/value-or-function": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/value-or-function/-/value-or-function-4.0.0.tgz",
             "integrity": "sha512-aeVK81SIuT6aMJfNo9Vte8Dw0/FZINGBV8BfCraGtqVxIeLAEhJyoWs8SmvRVmXfGss2PmmOwZCuBPbZR+IYWg==",
-            "dev": true
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 10.13.0"
+            }
         },
-        "vary": {
+        "node_modules/varint": {
+            "version": "6.0.0",
+            "resolved": "https://registry.npmjs.org/varint/-/varint-6.0.0.tgz",
+            "integrity": "sha512-cXEIW6cfr15lFv563k4GuVuW/fiwjknytD37jIOLSdSWuOI6WnO/oKwmP2FQTU2l01LP8/M5TSAJpzUaGe3uWg==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/vary": {
             "version": "1.1.2",
             "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
             "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
-            "dev": true
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.8"
+            }
         },
-        "verror": {
+        "node_modules/verror": {
             "version": "1.10.1",
             "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.1.tgz",
             "integrity": "sha512-veufcmxri4e3XSrT0xwfUR7kguIkaxBeosDg00yDWhk49wdwkSUrvvsm7nc75e1PUyvIeZj6nS8VQRYz2/S4Xg==",
             "dev": true,
+            "license": "MIT",
             "optional": true,
-            "requires": {
+            "dependencies": {
                 "assert-plus": "^1.0.0",
                 "core-util-is": "1.0.2",
                 "extsprintf": "^1.2.0"
+            },
+            "engines": {
+                "node": ">=0.6.0"
             }
         },
-        "vinyl": {
+        "node_modules/vinyl": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/vinyl/-/vinyl-3.0.0.tgz",
             "integrity": "sha512-rC2VRfAVVCGEgjnxHUnpIVh3AGuk62rP3tqVrn+yab0YH7UULisC085+NYH+mnqf3Wx4SpSi1RQMwudL89N03g==",
             "dev": true,
-            "requires": {
+            "license": "MIT",
+            "dependencies": {
                 "clone": "^2.1.2",
                 "clone-stats": "^1.0.0",
                 "remove-trailing-separator": "^1.1.0",
                 "replace-ext": "^2.0.0",
                 "teex": "^1.0.1"
+            },
+            "engines": {
+                "node": ">=10.13.0"
             }
         },
-        "vinyl-contents": {
+        "node_modules/vinyl-contents": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/vinyl-contents/-/vinyl-contents-2.0.0.tgz",
             "integrity": "sha512-cHq6NnGyi2pZ7xwdHSW1v4Jfnho4TEGtxZHw01cmnc8+i7jgR6bRnED/LbrKan/Q7CvVLbnvA5OepnhbpjBZ5Q==",
             "dev": true,
-            "requires": {
+            "license": "MIT",
+            "dependencies": {
                 "bl": "^5.0.0",
                 "vinyl": "^3.0.0"
             },
-            "dependencies": {
-                "bl": {
-                    "version": "5.1.0",
-                    "resolved": "https://registry.npmjs.org/bl/-/bl-5.1.0.tgz",
-                    "integrity": "sha512-tv1ZJHLfTDnXE6tMHv73YgSJaWR2AFuPwMntBe7XL/GBFHnT0CLnsHMogfk5+GzCDC5ZWarSCYaIGATZt9dNsQ==",
-                    "dev": true,
-                    "requires": {
-                        "buffer": "^6.0.3",
-                        "inherits": "^2.0.4",
-                        "readable-stream": "^3.4.0"
-                    }
-                },
-                "buffer": {
-                    "version": "6.0.3",
-                    "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
-                    "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
-                    "dev": true,
-                    "requires": {
-                        "base64-js": "^1.3.1",
-                        "ieee754": "^1.2.1"
-                    }
-                }
+            "engines": {
+                "node": ">=10.13.0"
             }
         },
-        "vinyl-fs": {
+        "node_modules/vinyl-contents/node_modules/bl": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/bl/-/bl-5.1.0.tgz",
+            "integrity": "sha512-tv1ZJHLfTDnXE6tMHv73YgSJaWR2AFuPwMntBe7XL/GBFHnT0CLnsHMogfk5+GzCDC5ZWarSCYaIGATZt9dNsQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "buffer": "^6.0.3",
+                "inherits": "^2.0.4",
+                "readable-stream": "^3.4.0"
+            }
+        },
+        "node_modules/vinyl-contents/node_modules/buffer": {
+            "version": "6.0.3",
+            "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz",
+            "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==",
+            "dev": true,
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/feross"
+                },
+                {
+                    "type": "patreon",
+                    "url": "https://www.patreon.com/feross"
+                },
+                {
+                    "type": "consulting",
+                    "url": "https://feross.org/support"
+                }
+            ],
+            "license": "MIT",
+            "dependencies": {
+                "base64-js": "^1.3.1",
+                "ieee754": "^1.2.1"
+            }
+        },
+        "node_modules/vinyl-fs": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-4.0.0.tgz",
             "integrity": "sha512-7GbgBnYfaquMk3Qu9g22x000vbYkOex32930rBnc3qByw6HfMEAoELjCjoJv4HuEQxHAurT+nvMHm6MnJllFLw==",
             "dev": true,
-            "requires": {
+            "license": "MIT",
+            "dependencies": {
                 "fs-mkdirp-stream": "^2.0.1",
                 "glob-stream": "^8.0.0",
                 "graceful-fs": "^4.2.11",
@@ -40017,14 +41308,18 @@
                 "value-or-function": "^4.0.0",
                 "vinyl": "^3.0.0",
                 "vinyl-sourcemap": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=10.13.0"
             }
         },
-        "vinyl-sourcemap": {
+        "node_modules/vinyl-sourcemap": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-2.0.0.tgz",
             "integrity": "sha512-BAEvWxbBUXvlNoFQVFVHpybBbjW1r03WhohJzJDSfgrrK5xVYIDTan6xN14DlyImShgDRv2gl9qhM6irVMsV0Q==",
             "dev": true,
-            "requires": {
+            "license": "MIT",
+            "dependencies": {
                 "convert-source-map": "^2.0.0",
                 "graceful-fs": "^4.2.10",
                 "now-and-later": "^3.0.0",
@@ -40032,132 +41327,255 @@
                 "vinyl": "^3.0.0",
                 "vinyl-contents": "^2.0.0"
             },
+            "engines": {
+                "node": ">=10.13.0"
+            }
+        },
+        "node_modules/vinyl-sourcemap/node_modules/convert-source-map": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+            "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/vite": {
+            "version": "6.3.5",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-6.3.5.tgz",
+            "integrity": "sha512-cZn6NDFE7wdTpINgs++ZJ4N49W2vRp8LCKrn3Ob1kYNtOo21vfDoaV5GzBfLU4MovSAB8uNRm4jgzVQZ+mBzPQ==",
+            "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "convert-source-map": {
-                    "version": "2.0.0",
-                    "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
-                    "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
-                    "dev": true
+                "esbuild": "^0.25.0",
+                "fdir": "^6.4.4",
+                "picomatch": "^4.0.2",
+                "postcss": "^8.5.3",
+                "rollup": "^4.34.9",
+                "tinyglobby": "^0.2.13"
+            },
+            "bin": {
+                "vite": "bin/vite.js"
+            },
+            "engines": {
+                "node": "^18.0.0 || ^20.0.0 || >=22.0.0"
+            },
+            "funding": {
+                "url": "https://github.com/vitejs/vite?sponsor=1"
+            },
+            "optionalDependencies": {
+                "fsevents": "~2.3.3"
+            },
+            "peerDependencies": {
+                "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0",
+                "jiti": ">=1.21.0",
+                "less": "*",
+                "lightningcss": "^1.21.0",
+                "sass": "*",
+                "sass-embedded": "*",
+                "stylus": "*",
+                "sugarss": "*",
+                "terser": "^5.16.0",
+                "tsx": "^4.8.1",
+                "yaml": "^2.4.2"
+            },
+            "peerDependenciesMeta": {
+                "@types/node": {
+                    "optional": true
+                },
+                "jiti": {
+                    "optional": true
+                },
+                "less": {
+                    "optional": true
+                },
+                "lightningcss": {
+                    "optional": true
+                },
+                "sass": {
+                    "optional": true
+                },
+                "sass-embedded": {
+                    "optional": true
+                },
+                "stylus": {
+                    "optional": true
+                },
+                "sugarss": {
+                    "optional": true
+                },
+                "terser": {
+                    "optional": true
+                },
+                "tsx": {
+                    "optional": true
+                },
+                "yaml": {
+                    "optional": true
                 }
             }
         },
-        "void-elements": {
+        "node_modules/vite/node_modules/picomatch": {
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.2.tgz",
+            "integrity": "sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=12"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/jonschlinkert"
+            }
+        },
+        "node_modules/void-elements": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz",
-            "integrity": "sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w=="
+            "integrity": "sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
         },
-        "w3c-hr-time": {
+        "node_modules/w3c-hr-time": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
             "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
+            "deprecated": "Use your platform's native performance.now() and performance.timeOrigin.",
             "dev": true,
-            "requires": {
+            "license": "MIT",
+            "dependencies": {
                 "browser-process-hrtime": "^1.0.0"
             }
         },
-        "w3c-xmlserializer": {
+        "node_modules/w3c-xmlserializer": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz",
             "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==",
             "dev": true,
-            "requires": {
+            "license": "MIT",
+            "dependencies": {
                 "xml-name-validator": "^3.0.0"
+            },
+            "engines": {
+                "node": ">=10"
             }
         },
-        "walk-sync": {
+        "node_modules/walk-sync": {
             "version": "2.2.0",
             "resolved": "https://registry.npmjs.org/walk-sync/-/walk-sync-2.2.0.tgz",
             "integrity": "sha512-IC8sL7aB4/ZgFcGI2T1LczZeFWZ06b3zoHH7jBPyHxOtIIz1jppWHjjEXkOFvFojBVAK9pV7g47xOZ4LW3QLfg==",
             "dev": true,
-            "requires": {
+            "license": "MIT",
+            "dependencies": {
                 "@types/minimatch": "^3.0.3",
                 "ensure-posix-path": "^1.1.0",
                 "matcher-collection": "^2.0.0",
                 "minimatch": "^3.0.4"
             },
-            "dependencies": {
-                "brace-expansion": {
-                    "version": "1.1.11",
-                    "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-                    "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
-                    "dev": true,
-                    "requires": {
-                        "balanced-match": "^1.0.0",
-                        "concat-map": "0.0.1"
-                    }
-                },
-                "minimatch": {
-                    "version": "3.1.2",
-                    "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-                    "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-                    "dev": true,
-                    "requires": {
-                        "brace-expansion": "^1.1.7"
-                    }
-                }
+            "engines": {
+                "node": "8.* || >= 10.*"
             }
         },
-        "walker": {
+        "node_modules/walk-sync/node_modules/brace-expansion": {
+            "version": "1.1.11",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+            "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "balanced-match": "^1.0.0",
+                "concat-map": "0.0.1"
+            }
+        },
+        "node_modules/walk-sync/node_modules/minimatch": {
+            "version": "3.1.2",
+            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+            "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "brace-expansion": "^1.1.7"
+            },
+            "engines": {
+                "node": "*"
+            }
+        },
+        "node_modules/walker": {
             "version": "1.0.8",
             "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
             "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
             "dev": true,
-            "requires": {
+            "license": "Apache-2.0",
+            "dependencies": {
                 "makeerror": "1.0.12"
             }
         },
-        "watchboy": {
+        "node_modules/watchboy": {
             "version": "0.4.3",
             "resolved": "https://registry.npmjs.org/watchboy/-/watchboy-0.4.3.tgz",
             "integrity": "sha512-GHs1HxwvxSMBsqd/WfTOZhj5gBdMqf5HQpfgtKxDfZRxrlYPDdVLRB61LCeRzJaWANmvSIMlfmRVDwVmJFgAKA==",
             "dev": true,
-            "requires": {
+            "license": "ISC",
+            "dependencies": {
                 "lodash.difference": "^4.5.0",
                 "micromatch": "^4.0.2",
                 "pify": "^4.0.1",
                 "unixify": "^1.0.0"
+            },
+            "engines": {
+                "node": ">=8.0.0"
             }
         },
-        "watchpack": {
+        "node_modules/watchpack": {
             "version": "2.4.2",
             "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz",
             "integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==",
             "dev": true,
-            "requires": {
+            "license": "MIT",
+            "dependencies": {
                 "glob-to-regexp": "^0.4.1",
                 "graceful-fs": "^4.1.2"
+            },
+            "engines": {
+                "node": ">=10.13.0"
             }
         },
-        "wbuf": {
+        "node_modules/wbuf": {
             "version": "1.7.3",
             "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
             "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
             "dev": true,
-            "requires": {
+            "license": "MIT",
+            "dependencies": {
                 "minimalistic-assert": "^1.0.0"
             }
         },
-        "wcwidth": {
+        "node_modules/wcwidth": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
             "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==",
             "dev": true,
-            "requires": {
+            "license": "MIT",
+            "dependencies": {
                 "defaults": "^1.0.3"
             }
         },
-        "webidl-conversions": {
+        "node_modules/webidl-conversions": {
             "version": "6.1.0",
             "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
             "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
-            "dev": true
-        },
-        "webpack": {
-            "version": "5.99.7",
-            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.99.7.tgz",
-            "integrity": "sha512-CNqKBRMQjwcmKR0idID5va1qlhrqVUKpovi+Ec79ksW8ux7iS1+A6VqzfZXgVYCFRKl7XL5ap3ZoMpwBJxcg0w==",
             "dev": true,
-            "requires": {
+            "license": "BSD-2-Clause",
+            "engines": {
+                "node": ">=10.4"
+            }
+        },
+        "node_modules/webpack": {
+            "version": "5.99.8",
+            "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.99.8.tgz",
+            "integrity": "sha512-lQ3CPiSTpfOnrEGeXDwoq5hIGzSjmwD72GdfVzF7CQAI7t47rJG9eDWvcEkEn3CUQymAElVvDg3YNTlCYj+qUQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
                 "@types/eslint-scope": "^3.7.7",
                 "@types/estree": "^1.0.6",
                 "@types/json-schema": "^7.0.15",
@@ -40183,64 +41601,29 @@
                 "watchpack": "^2.4.1",
                 "webpack-sources": "^3.2.3"
             },
-            "dependencies": {
-                "ajv": {
-                    "version": "8.17.1",
-                    "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
-                    "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
-                    "dev": true,
-                    "requires": {
-                        "fast-deep-equal": "^3.1.3",
-                        "fast-uri": "^3.0.1",
-                        "json-schema-traverse": "^1.0.0",
-                        "require-from-string": "^2.0.2"
-                    }
-                },
-                "ajv-keywords": {
-                    "version": "5.1.0",
-                    "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-                    "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-                    "dev": true,
-                    "requires": {
-                        "fast-deep-equal": "^3.1.3"
-                    }
-                },
-                "enhanced-resolve": {
-                    "version": "5.18.1",
-                    "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz",
-                    "integrity": "sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==",
-                    "dev": true,
-                    "requires": {
-                        "graceful-fs": "^4.2.4",
-                        "tapable": "^2.2.0"
-                    }
-                },
-                "json-schema-traverse": {
-                    "version": "1.0.0",
-                    "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-                    "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-                    "dev": true
-                },
-                "schema-utils": {
-                    "version": "4.3.2",
-                    "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.2.tgz",
-                    "integrity": "sha512-Gn/JaSk/Mt9gYubxTtSn/QCV4em9mpAPiR1rqy/Ocu19u/G9J5WWdNoUT4SiV6mFC3y6cxyFcFwdzPM3FgxGAQ==",
-                    "dev": true,
-                    "requires": {
-                        "@types/json-schema": "^7.0.9",
-                        "ajv": "^8.9.0",
-                        "ajv-formats": "^2.1.1",
-                        "ajv-keywords": "^5.1.0"
-                    }
+            "bin": {
+                "webpack": "bin/webpack.js"
+            },
+            "engines": {
+                "node": ">=10.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            },
+            "peerDependenciesMeta": {
+                "webpack-cli": {
+                    "optional": true
                 }
             }
         },
-        "webpack-bundle-analyzer": {
+        "node_modules/webpack-bundle-analyzer": {
             "version": "4.10.2",
             "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-4.10.2.tgz",
             "integrity": "sha512-vJptkMm9pk5si4Bv922ZbKLV8UTT4zib4FPgXMhgzUny0bfDDkLXAVQs3ly3fS4/TN9ROFtb0NFrm04UXFE/Vw==",
             "dev": true,
-            "requires": {
+            "license": "MIT",
+            "dependencies": {
                 "@discoveryjs/json-ext": "0.5.7",
                 "acorn": "^8.0.4",
                 "acorn-walk": "^8.0.0",
@@ -40254,36 +41637,65 @@
                 "sirv": "^2.0.3",
                 "ws": "^7.3.1"
             },
+            "bin": {
+                "webpack-bundle-analyzer": "lib/bin/analyzer.js"
+            },
+            "engines": {
+                "node": ">= 10.13.0"
+            }
+        },
+        "node_modules/webpack-bundle-analyzer/node_modules/acorn-walk": {
+            "version": "8.3.4",
+            "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz",
+            "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==",
+            "dev": true,
+            "license": "MIT",
             "dependencies": {
-                "acorn-walk": {
-                    "version": "8.3.4",
-                    "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz",
-                    "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==",
-                    "dev": true,
-                    "requires": {
-                        "acorn": "^8.11.0"
-                    }
+                "acorn": "^8.11.0"
+            },
+            "engines": {
+                "node": ">=0.4.0"
+            }
+        },
+        "node_modules/webpack-bundle-analyzer/node_modules/commander": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+            "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/webpack-bundle-analyzer/node_modules/ws": {
+            "version": "7.5.10",
+            "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
+            "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8.3.0"
+            },
+            "peerDependencies": {
+                "bufferutil": "^4.0.1",
+                "utf-8-validate": "^5.0.2"
+            },
+            "peerDependenciesMeta": {
+                "bufferutil": {
+                    "optional": true
                 },
-                "commander": {
-                    "version": "7.2.0",
-                    "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-                    "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-                    "dev": true
-                },
-                "ws": {
-                    "version": "7.5.10",
-                    "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
-                    "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
-                    "dev": true
+                "utf-8-validate": {
+                    "optional": true
                 }
             }
         },
-        "webpack-cli": {
+        "node_modules/webpack-cli": {
             "version": "4.10.0",
             "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.10.0.tgz",
             "integrity": "sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w==",
             "dev": true,
-            "requires": {
+            "license": "MIT",
+            "dependencies": {
                 "@discoveryjs/json-ext": "^0.5.0",
                 "@webpack-cli/configtest": "^1.2.0",
                 "@webpack-cli/info": "^1.5.0",
@@ -40297,81 +41709,142 @@
                 "rechoir": "^0.7.0",
                 "webpack-merge": "^5.7.3"
             },
-            "dependencies": {
-                "commander": {
-                    "version": "7.2.0",
-                    "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-                    "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-                    "dev": true
+            "bin": {
+                "webpack-cli": "bin/cli.js"
+            },
+            "engines": {
+                "node": ">=10.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            },
+            "peerDependencies": {
+                "webpack": "4.x.x || 5.x.x"
+            },
+            "peerDependenciesMeta": {
+                "@webpack-cli/generators": {
+                    "optional": true
                 },
-                "interpret": {
-                    "version": "2.2.0",
-                    "resolved": "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz",
-                    "integrity": "sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==",
-                    "dev": true
+                "@webpack-cli/migrate": {
+                    "optional": true
+                },
+                "webpack-bundle-analyzer": {
+                    "optional": true
+                },
+                "webpack-dev-server": {
+                    "optional": true
                 }
             }
         },
-        "webpack-dev-middleware": {
+        "node_modules/webpack-cli/node_modules/commander": {
+            "version": "7.2.0",
+            "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+            "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/webpack-cli/node_modules/interpret": {
+            "version": "2.2.0",
+            "resolved": "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz",
+            "integrity": "sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">= 0.10"
+            }
+        },
+        "node_modules/webpack-dev-middleware": {
             "version": "5.3.4",
             "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz",
             "integrity": "sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==",
             "dev": true,
-            "requires": {
+            "license": "MIT",
+            "dependencies": {
                 "colorette": "^2.0.10",
                 "memfs": "^3.4.3",
                 "mime-types": "^2.1.31",
                 "range-parser": "^1.2.1",
                 "schema-utils": "^4.0.0"
             },
-            "dependencies": {
-                "ajv": {
-                    "version": "8.17.1",
-                    "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
-                    "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
-                    "dev": true,
-                    "requires": {
-                        "fast-deep-equal": "^3.1.3",
-                        "fast-uri": "^3.0.1",
-                        "json-schema-traverse": "^1.0.0",
-                        "require-from-string": "^2.0.2"
-                    }
-                },
-                "ajv-keywords": {
-                    "version": "5.1.0",
-                    "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-                    "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-                    "dev": true,
-                    "requires": {
-                        "fast-deep-equal": "^3.1.3"
-                    }
-                },
-                "json-schema-traverse": {
-                    "version": "1.0.0",
-                    "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-                    "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-                    "dev": true
-                },
-                "schema-utils": {
-                    "version": "4.3.2",
-                    "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.2.tgz",
-                    "integrity": "sha512-Gn/JaSk/Mt9gYubxTtSn/QCV4em9mpAPiR1rqy/Ocu19u/G9J5WWdNoUT4SiV6mFC3y6cxyFcFwdzPM3FgxGAQ==",
-                    "dev": true,
-                    "requires": {
-                        "@types/json-schema": "^7.0.9",
-                        "ajv": "^8.9.0",
-                        "ajv-formats": "^2.1.1",
-                        "ajv-keywords": "^5.1.0"
-                    }
-                }
+            "engines": {
+                "node": ">= 12.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            },
+            "peerDependencies": {
+                "webpack": "^4.0.0 || ^5.0.0"
             }
         },
-        "webpack-dev-server": {
+        "node_modules/webpack-dev-middleware/node_modules/ajv": {
+            "version": "8.17.1",
+            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+            "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "fast-deep-equal": "^3.1.3",
+                "fast-uri": "^3.0.1",
+                "json-schema-traverse": "^1.0.0",
+                "require-from-string": "^2.0.2"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/epoberezkin"
+            }
+        },
+        "node_modules/webpack-dev-middleware/node_modules/ajv-keywords": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+            "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "fast-deep-equal": "^3.1.3"
+            },
+            "peerDependencies": {
+                "ajv": "^8.8.2"
+            }
+        },
+        "node_modules/webpack-dev-middleware/node_modules/json-schema-traverse": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+            "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/webpack-dev-middleware/node_modules/schema-utils": {
+            "version": "4.3.2",
+            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.2.tgz",
+            "integrity": "sha512-Gn/JaSk/Mt9gYubxTtSn/QCV4em9mpAPiR1rqy/Ocu19u/G9J5WWdNoUT4SiV6mFC3y6cxyFcFwdzPM3FgxGAQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/json-schema": "^7.0.9",
+                "ajv": "^8.9.0",
+                "ajv-formats": "^2.1.1",
+                "ajv-keywords": "^5.1.0"
+            },
+            "engines": {
+                "node": ">= 10.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            }
+        },
+        "node_modules/webpack-dev-server": {
             "version": "4.15.2",
             "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.2.tgz",
             "integrity": "sha512-0XavAZbNJ5sDrCbkpWL8mia0o5WPOd2YGtxrEiZkBK9FjLppIUK2TgxK6qGD2P3hUXTJNNPVibrerKcx5WkR1g==",
             "dev": true,
-            "requires": {
+            "license": "MIT",
+            "dependencies": {
                 "@types/bonjour": "^3.5.9",
                 "@types/connect-history-api-fallback": "^1.3.5",
                 "@types/express": "^4.17.13",
@@ -40403,169 +41876,336 @@
                 "webpack-dev-middleware": "^5.3.4",
                 "ws": "^8.13.0"
             },
-            "dependencies": {
-                "ajv": {
-                    "version": "8.17.1",
-                    "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
-                    "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
-                    "dev": true,
-                    "requires": {
-                        "fast-deep-equal": "^3.1.3",
-                        "fast-uri": "^3.0.1",
-                        "json-schema-traverse": "^1.0.0",
-                        "require-from-string": "^2.0.2"
-                    }
+            "bin": {
+                "webpack-dev-server": "bin/webpack-dev-server.js"
+            },
+            "engines": {
+                "node": ">= 12.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            },
+            "peerDependencies": {
+                "webpack": "^4.37.0 || ^5.0.0"
+            },
+            "peerDependenciesMeta": {
+                "webpack": {
+                    "optional": true
                 },
-                "ajv-keywords": {
-                    "version": "5.1.0",
-                    "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
-                    "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
-                    "dev": true,
-                    "requires": {
-                        "fast-deep-equal": "^3.1.3"
-                    }
-                },
-                "chokidar": {
-                    "version": "3.6.0",
-                    "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
-                    "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
-                    "dev": true,
-                    "requires": {
-                        "anymatch": "~3.1.2",
-                        "braces": "~3.0.2",
-                        "fsevents": "~2.3.2",
-                        "glob-parent": "~5.1.2",
-                        "is-binary-path": "~2.1.0",
-                        "is-glob": "~4.0.1",
-                        "normalize-path": "~3.0.0",
-                        "readdirp": "~3.6.0"
-                    }
-                },
-                "glob-parent": {
-                    "version": "5.1.2",
-                    "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-                    "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
-                    "dev": true,
-                    "requires": {
-                        "is-glob": "^4.0.1"
-                    }
-                },
-                "json-schema-traverse": {
-                    "version": "1.0.0",
-                    "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
-                    "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
-                    "dev": true
-                },
-                "readdirp": {
-                    "version": "3.6.0",
-                    "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
-                    "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
-                    "dev": true,
-                    "requires": {
-                        "picomatch": "^2.2.1"
-                    }
-                },
-                "schema-utils": {
-                    "version": "4.3.2",
-                    "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.2.tgz",
-                    "integrity": "sha512-Gn/JaSk/Mt9gYubxTtSn/QCV4em9mpAPiR1rqy/Ocu19u/G9J5WWdNoUT4SiV6mFC3y6cxyFcFwdzPM3FgxGAQ==",
-                    "dev": true,
-                    "requires": {
-                        "@types/json-schema": "^7.0.9",
-                        "ajv": "^8.9.0",
-                        "ajv-formats": "^2.1.1",
-                        "ajv-keywords": "^5.1.0"
-                    }
+                "webpack-cli": {
+                    "optional": true
                 }
             }
         },
-        "webpack-merge": {
+        "node_modules/webpack-dev-server/node_modules/ajv": {
+            "version": "8.17.1",
+            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+            "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "fast-deep-equal": "^3.1.3",
+                "fast-uri": "^3.0.1",
+                "json-schema-traverse": "^1.0.0",
+                "require-from-string": "^2.0.2"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/epoberezkin"
+            }
+        },
+        "node_modules/webpack-dev-server/node_modules/ajv-keywords": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+            "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "fast-deep-equal": "^3.1.3"
+            },
+            "peerDependencies": {
+                "ajv": "^8.8.2"
+            }
+        },
+        "node_modules/webpack-dev-server/node_modules/chokidar": {
+            "version": "3.6.0",
+            "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
+            "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "anymatch": "~3.1.2",
+                "braces": "~3.0.2",
+                "glob-parent": "~5.1.2",
+                "is-binary-path": "~2.1.0",
+                "is-glob": "~4.0.1",
+                "normalize-path": "~3.0.0",
+                "readdirp": "~3.6.0"
+            },
+            "engines": {
+                "node": ">= 8.10.0"
+            },
+            "funding": {
+                "url": "https://paulmillr.com/funding/"
+            },
+            "optionalDependencies": {
+                "fsevents": "~2.3.2"
+            }
+        },
+        "node_modules/webpack-dev-server/node_modules/glob-parent": {
+            "version": "5.1.2",
+            "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+            "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "is-glob": "^4.0.1"
+            },
+            "engines": {
+                "node": ">= 6"
+            }
+        },
+        "node_modules/webpack-dev-server/node_modules/json-schema-traverse": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+            "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/webpack-dev-server/node_modules/readdirp": {
+            "version": "3.6.0",
+            "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
+            "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "picomatch": "^2.2.1"
+            },
+            "engines": {
+                "node": ">=8.10.0"
+            }
+        },
+        "node_modules/webpack-dev-server/node_modules/schema-utils": {
+            "version": "4.3.2",
+            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.2.tgz",
+            "integrity": "sha512-Gn/JaSk/Mt9gYubxTtSn/QCV4em9mpAPiR1rqy/Ocu19u/G9J5WWdNoUT4SiV6mFC3y6cxyFcFwdzPM3FgxGAQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/json-schema": "^7.0.9",
+                "ajv": "^8.9.0",
+                "ajv-formats": "^2.1.1",
+                "ajv-keywords": "^5.1.0"
+            },
+            "engines": {
+                "node": ">= 10.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            }
+        },
+        "node_modules/webpack-merge": {
             "version": "5.10.0",
             "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.10.0.tgz",
             "integrity": "sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA==",
             "dev": true,
-            "requires": {
+            "license": "MIT",
+            "dependencies": {
                 "clone-deep": "^4.0.1",
                 "flat": "^5.0.2",
                 "wildcard": "^2.0.0"
+            },
+            "engines": {
+                "node": ">=10.0.0"
             }
         },
-        "webpack-sources": {
+        "node_modules/webpack-sources": {
             "version": "3.2.3",
             "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
             "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
-            "dev": true
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=10.13.0"
+            }
         },
-        "websocket-driver": {
+        "node_modules/webpack/node_modules/ajv": {
+            "version": "8.17.1",
+            "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz",
+            "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "fast-deep-equal": "^3.1.3",
+                "fast-uri": "^3.0.1",
+                "json-schema-traverse": "^1.0.0",
+                "require-from-string": "^2.0.2"
+            },
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/epoberezkin"
+            }
+        },
+        "node_modules/webpack/node_modules/ajv-keywords": {
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
+            "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "fast-deep-equal": "^3.1.3"
+            },
+            "peerDependencies": {
+                "ajv": "^8.8.2"
+            }
+        },
+        "node_modules/webpack/node_modules/enhanced-resolve": {
+            "version": "5.18.1",
+            "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz",
+            "integrity": "sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "graceful-fs": "^4.2.4",
+                "tapable": "^2.2.0"
+            },
+            "engines": {
+                "node": ">=10.13.0"
+            }
+        },
+        "node_modules/webpack/node_modules/json-schema-traverse": {
+            "version": "1.0.0",
+            "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+            "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/webpack/node_modules/schema-utils": {
+            "version": "4.3.2",
+            "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.2.tgz",
+            "integrity": "sha512-Gn/JaSk/Mt9gYubxTtSn/QCV4em9mpAPiR1rqy/Ocu19u/G9J5WWdNoUT4SiV6mFC3y6cxyFcFwdzPM3FgxGAQ==",
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
+                "@types/json-schema": "^7.0.9",
+                "ajv": "^8.9.0",
+                "ajv-formats": "^2.1.1",
+                "ajv-keywords": "^5.1.0"
+            },
+            "engines": {
+                "node": ">= 10.13.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
+            }
+        },
+        "node_modules/websocket-driver": {
             "version": "0.7.4",
             "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
             "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
             "dev": true,
-            "requires": {
+            "license": "Apache-2.0",
+            "dependencies": {
                 "http-parser-js": ">=0.5.1",
                 "safe-buffer": ">=5.1.0",
                 "websocket-extensions": ">=0.1.1"
+            },
+            "engines": {
+                "node": ">=0.8.0"
             }
         },
-        "websocket-extensions": {
+        "node_modules/websocket-extensions": {
             "version": "0.1.4",
             "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
             "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
-            "dev": true
+            "dev": true,
+            "license": "Apache-2.0",
+            "engines": {
+                "node": ">=0.8.0"
+            }
         },
-        "whatwg-encoding": {
+        "node_modules/whatwg-encoding": {
             "version": "3.1.1",
             "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz",
             "integrity": "sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==",
-            "dev": true,
-            "requires": {
+            "license": "MIT",
+            "dependencies": {
                 "iconv-lite": "0.6.3"
+            },
+            "engines": {
+                "node": ">=18"
             }
         },
-        "whatwg-mimetype": {
+        "node_modules/whatwg-mimetype": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz",
             "integrity": "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==",
-            "dev": true
+            "license": "MIT",
+            "engines": {
+                "node": ">=18"
+            }
         },
-        "whatwg-url": {
+        "node_modules/whatwg-url": {
             "version": "8.7.0",
             "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz",
             "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==",
             "dev": true,
-            "requires": {
+            "license": "MIT",
+            "dependencies": {
                 "lodash": "^4.7.0",
                 "tr46": "^2.1.0",
                 "webidl-conversions": "^6.1.0"
+            },
+            "engines": {
+                "node": ">=10"
             }
         },
-        "which": {
+        "node_modules/which": {
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
             "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-            "requires": {
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
                 "isexe": "^2.0.0"
+            },
+            "bin": {
+                "node-which": "bin/node-which"
+            },
+            "engines": {
+                "node": ">= 8"
             }
         },
-        "which-boxed-primitive": {
+        "node_modules/which-boxed-primitive": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz",
             "integrity": "sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==",
             "dev": true,
-            "requires": {
+            "license": "MIT",
+            "dependencies": {
                 "is-bigint": "^1.1.0",
                 "is-boolean-object": "^1.2.1",
                 "is-number-object": "^1.1.1",
                 "is-string": "^1.1.1",
                 "is-symbol": "^1.1.1"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "which-builtin-type": {
+        "node_modules/which-builtin-type": {
             "version": "1.2.1",
             "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.2.1.tgz",
             "integrity": "sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==",
             "dev": true,
-            "requires": {
+            "license": "MIT",
+            "dependencies": {
                 "call-bound": "^1.0.2",
                 "function.prototype.name": "^1.1.6",
                 "has-tostringtag": "^1.0.2",
@@ -40579,26 +42219,40 @@
                 "which-boxed-primitive": "^1.1.0",
                 "which-collection": "^1.0.2",
                 "which-typed-array": "^1.1.16"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "which-collection": {
+        "node_modules/which-collection": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz",
             "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==",
             "dev": true,
-            "requires": {
+            "license": "MIT",
+            "dependencies": {
                 "is-map": "^2.0.3",
                 "is-set": "^2.0.3",
                 "is-weakmap": "^2.0.2",
                 "is-weakset": "^2.0.3"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "which-typed-array": {
+        "node_modules/which-typed-array": {
             "version": "1.1.19",
             "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.19.tgz",
             "integrity": "sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==",
             "dev": true,
-            "requires": {
+            "license": "MIT",
+            "dependencies": {
                 "available-typed-arrays": "^1.0.7",
                 "call-bind": "^1.0.8",
                 "call-bound": "^1.0.4",
@@ -40606,117 +42260,215 @@
                 "get-proto": "^1.0.1",
                 "gopd": "^1.2.0",
                 "has-tostringtag": "^1.0.2"
+            },
+            "engines": {
+                "node": ">= 0.4"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "wildcard": {
+        "node_modules/wide-align": {
+            "version": "1.1.5",
+            "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz",
+            "integrity": "sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==",
+            "dev": true,
+            "license": "ISC",
+            "dependencies": {
+                "string-width": "^1.0.2 || 2 || 3 || 4"
+            }
+        },
+        "node_modules/wildcard": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz",
             "integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==",
-            "dev": true
+            "dev": true,
+            "license": "MIT"
         },
-        "word-wrap": {
+        "node_modules/word-wrap": {
             "version": "1.2.5",
             "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
             "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
-            "dev": true
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.10.0"
+            }
         },
-        "wrap-ansi": {
+        "node_modules/wrap-ansi": {
             "version": "7.0.0",
             "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
             "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
             "dev": true,
-            "requires": {
+            "license": "MIT",
+            "dependencies": {
                 "ansi-styles": "^4.0.0",
                 "string-width": "^4.1.0",
                 "strip-ansi": "^6.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
             }
         },
-        "wrap-ansi-cjs": {
-            "version": "npm:wrap-ansi@7.0.0",
+        "node_modules/wrap-ansi-cjs": {
+            "name": "wrap-ansi",
+            "version": "7.0.0",
             "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
             "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-            "requires": {
+            "dev": true,
+            "license": "MIT",
+            "dependencies": {
                 "ansi-styles": "^4.0.0",
                 "string-width": "^4.1.0",
                 "strip-ansi": "^6.0.0"
+            },
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
             }
         },
-        "wrappy": {
+        "node_modules/wrappy": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
             "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-            "dev": true
+            "dev": true,
+            "license": "ISC"
         },
-        "write-file-atomic": {
+        "node_modules/write-file-atomic": {
             "version": "3.0.3",
             "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
             "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
             "dev": true,
-            "requires": {
+            "license": "ISC",
+            "dependencies": {
                 "imurmurhash": "^0.1.4",
                 "is-typedarray": "^1.0.0",
                 "signal-exit": "^3.0.2",
                 "typedarray-to-buffer": "^3.1.5"
             }
         },
-        "ws": {
-            "version": "8.18.1",
-            "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.1.tgz",
-            "integrity": "sha512-RKW2aJZMXeMxVpnZ6bck+RswznaxmzdULiBr6KY7XkTnW8uvt0iT9H5DkHUChXrc+uurzwa0rVI16n/Xzjdz1w=="
+        "node_modules/ws": {
+            "version": "8.18.2",
+            "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.2.tgz",
+            "integrity": "sha512-DMricUmwGZUVr++AEAe2uiVM7UoO9MAVZMDu05UQOaUII0lp+zOzLLU4Xqh/JvTqklB1T4uELaaPBKyjE1r4fQ==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=10.0.0"
+            },
+            "peerDependencies": {
+                "bufferutil": "^4.0.1",
+                "utf-8-validate": ">=5.0.2"
+            },
+            "peerDependenciesMeta": {
+                "bufferutil": {
+                    "optional": true
+                },
+                "utf-8-validate": {
+                    "optional": true
+                }
+            }
         },
-        "xml-name-validator": {
+        "node_modules/xml-name-validator": {
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
             "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
-            "dev": true
+            "dev": true,
+            "license": "Apache-2.0"
         },
-        "xmlbuilder": {
+        "node_modules/xml2js": {
+            "version": "0.4.23",
+            "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
+            "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
+            "license": "MIT",
+            "dependencies": {
+                "sax": ">=0.6.0",
+                "xmlbuilder": "~11.0.0"
+            },
+            "engines": {
+                "node": ">=4.0.0"
+            }
+        },
+        "node_modules/xml2js/node_modules/xmlbuilder": {
+            "version": "11.0.1",
+            "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
+            "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
+            "license": "MIT",
+            "engines": {
+                "node": ">=4.0"
+            }
+        },
+        "node_modules/xmlbuilder": {
             "version": "15.1.1",
             "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz",
             "integrity": "sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==",
-            "dev": true
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=8.0"
+            }
         },
-        "xmlchars": {
+        "node_modules/xmlchars": {
             "version": "2.2.0",
             "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
             "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
-            "dev": true
+            "dev": true,
+            "license": "MIT"
         },
-        "xtend": {
+        "node_modules/xtend": {
             "version": "4.0.2",
             "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
             "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
-            "dev": true
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=0.4"
+            }
         },
-        "y18n": {
+        "node_modules/y18n": {
             "version": "5.0.8",
             "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
             "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==",
-            "dev": true
+            "dev": true,
+            "license": "ISC",
+            "engines": {
+                "node": ">=10"
+            }
         },
-        "yaku": {
+        "node_modules/yaku": {
             "version": "0.16.7",
             "resolved": "https://registry.npmjs.org/yaku/-/yaku-0.16.7.tgz",
             "integrity": "sha512-Syu3IB3rZvKvYk7yTiyl1bo/jiEFaaStrgv1V2TIJTqYPStSMQVO8EQjg/z+DRzLq/4LIIharNT3iH1hylEIRw==",
-            "dev": true
+            "dev": true,
+            "license": "MIT"
         },
-        "yallist": {
+        "node_modules/yallist": {
             "version": "3.1.1",
             "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
             "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
-            "dev": true
+            "dev": true,
+            "license": "ISC"
         },
-        "yaml": {
+        "node_modules/yaml": {
             "version": "1.10.2",
             "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-            "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg=="
+            "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+            "license": "ISC",
+            "engines": {
+                "node": ">= 6"
+            }
         },
-        "yargs": {
+        "node_modules/yargs": {
             "version": "17.7.2",
             "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz",
             "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==",
             "dev": true,
-            "requires": {
+            "license": "MIT",
+            "dependencies": {
                 "cliui": "^8.0.1",
                 "escalade": "^3.1.1",
                 "get-caller-file": "^2.0.5",
@@ -40725,54 +42477,99 @@
                 "y18n": "^5.0.5",
                 "yargs-parser": "^21.1.1"
             },
-            "dependencies": {
-                "yargs-parser": {
-                    "version": "21.1.1",
-                    "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
-                    "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
-                    "dev": true
-                }
+            "engines": {
+                "node": ">=12"
             }
         },
-        "yargs-parser": {
+        "node_modules/yargs-parser": {
             "version": "20.2.9",
             "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz",
             "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==",
-            "dev": true
+            "dev": true,
+            "license": "ISC",
+            "engines": {
+                "node": ">=10"
+            }
         },
-        "yauzl": {
+        "node_modules/yargs/node_modules/yargs-parser": {
+            "version": "21.1.1",
+            "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz",
+            "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==",
+            "dev": true,
+            "license": "ISC",
+            "engines": {
+                "node": ">=12"
+            }
+        },
+        "node_modules/yauzl": {
             "version": "2.10.0",
             "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
             "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
             "dev": true,
-            "requires": {
+            "license": "MIT",
+            "dependencies": {
                 "buffer-crc32": "~0.2.3",
                 "fd-slicer": "~1.1.0"
             }
         },
-        "yn": {
+        "node_modules/yn": {
             "version": "3.1.1",
             "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
             "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
-            "dev": true
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=6"
+            }
         },
-        "yocto-queue": {
+        "node_modules/yocto-queue": {
             "version": "0.1.0",
             "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
             "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
-            "dev": true
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=10"
+            },
+            "funding": {
+                "url": "https://github.com/sponsors/sindresorhus"
+            }
         },
-        "zod": {
-            "version": "3.24.3",
-            "resolved": "https://registry.npmjs.org/zod/-/zod-3.24.3.tgz",
-            "integrity": "sha512-HhY1oqzWCQWuUqvBFnsyrtZRhyPeR7SUGv+C4+MsisMuVfSPx8HpwWqH8tRahSlt6M3PiFAcoeFhZAqIXTxoSg=="
+        "node_modules/zod": {
+            "version": "3.24.4",
+            "resolved": "https://registry.npmjs.org/zod/-/zod-3.24.4.tgz",
+            "integrity": "sha512-OdqJE9UDRPwWsrHjLN2F8bPxvwJBK22EHLWtanu0LSYr5YqzsaaW3RMgmjwr8Rypg5k+meEJdSPXJZXE/yqOMg==",
+            "license": "MIT",
+            "funding": {
+                "url": "https://github.com/sponsors/colinhacks"
+            }
         },
-        "zustand": {
-            "version": "4.5.6",
-            "resolved": "https://registry.npmjs.org/zustand/-/zustand-4.5.6.tgz",
-            "integrity": "sha512-ibr/n1hBzLLj5Y+yUcU7dYw8p6WnIVzdJbnX+1YpaScvZVF2ziugqHs+LAmHw4lWO9c/zRj+K1ncgWDQuthEdQ==",
-            "requires": {
+        "node_modules/zustand": {
+            "version": "4.5.7",
+            "resolved": "https://registry.npmjs.org/zustand/-/zustand-4.5.7.tgz",
+            "integrity": "sha512-CHOUy7mu3lbD6o6LJLfllpjkzhHXSBlX8B9+qPddUsIfeF5S/UZ5q0kmCsnRqT1UHFQZchNFDDzMbQsuesHWlw==",
+            "license": "MIT",
+            "dependencies": {
                 "use-sync-external-store": "^1.2.2"
+            },
+            "engines": {
+                "node": ">=12.7.0"
+            },
+            "peerDependencies": {
+                "@types/react": ">=16.8",
+                "immer": ">=9.0.6",
+                "react": ">=16.8"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                },
+                "immer": {
+                    "optional": true
+                },
+                "react": {
+                    "optional": true
+                }
             }
         }
     }
diff --git a/package.json b/package.json
index e1f66602..95786724 100644
--- a/package.json
+++ b/package.json
@@ -1,297 +1,25 @@
 {
     "name": "feishin",
-    "productName": "Feishin",
-    "description": "Feishin music server",
-    "version": "0.13.0",
+    "version": "1.0.0",
+    "description": "An Electron application with React and TypeScript",
+    "main": "./out/main/index.js",
+    "author": "example.com",
+    "homepage": "https://electron-vite.org",
     "scripts": {
-        "build": "concurrently \"npm run build:main\" \"npm run build:renderer\" \"npm run build:remote\"",
-        "build:main": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.main.prod.ts",
-        "build:remote": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.remote.prod.ts",
-        "build:renderer": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.renderer.prod.ts",
-        "build:web": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.web.prod.ts",
-        "build:docker": "docker build -t jeffvli/feishin .",
-        "rebuild": "electron-rebuild --parallel --types prod,dev,optional --module-dir release/app",
-        "lint": "concurrently \"npm run lint:code\" \"npm run lint:styles\"",
-        "lint:code": "cross-env NODE_ENV=development eslint . --ext .js,.jsx,.ts,.tsx --fix",
-        "lint:styles": "npx stylelint **/*.tsx --fix",
-        "package": "node --import tsx ./.erb/scripts/clean.js dist && npm run build && electron-builder build --publish never",
-        "package:pr": "node --import tsx ./.erb/scripts/clean.js dist && npm run build && electron-builder build --publish never --win --mac --linux",
-        "package:pr:macos": "node --import tsx ./.erb/scripts/clean.js dist && npm run build && electron-builder build --publish never --mac",
-        "package:pr:windows": "node --import tsx ./.erb/scripts/clean.js dist && npm run build && electron-builder build --publish never --win",
-        "package:pr:linux": "node --import tsx ./.erb/scripts/clean.js dist && npm run build && electron-builder build --publish never --linux",
-        "package:dev": "node --import tsx ./.erb/scripts/clean.js dist && npm run build && electron-builder build --publish never --dir",
-        "postinstall": "node --import tsx .erb/scripts/check-native-dep.js && electron-builder install-app-deps && cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.renderer.dev.dll.ts",
-        "start": "node --import tsx ./.erb/scripts/check-port-in-use.js && npm run start:renderer",
-        "start:main": "cross-env NODE_ENV=development  NODE_OPTIONS=\"--import tsx\" electron -r ts-node/register/transpile-only ./src/main/main.ts",
-        "start:preload": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.preload.dev.ts",
-        "start:remote": "cross-env NODE_ENV=developemnt TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.remote.dev.ts",
-        "start:renderer": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack serve --config ./.erb/configs/webpack.config.renderer.dev.ts",
-        "start:web": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack serve --config ./.erb/configs/webpack.config.renderer.web.ts",
-        "test": "jest",
-        "prepare": "husky install",
-        "i18next": "i18next -c src/i18n/i18next-parser.config.js",
-        "prod:buildserver": "pwsh -c \"./scripts/server-build.ps1\"",
-        "prod:publishserver": "pwsh -c \"./scripts/server-publish.ps1\""
-    },
-    "lint-staged": {
-        "*.{js,jsx,ts,tsx}": [
-            "cross-env NODE_ENV=development eslint --cache"
-        ],
-        "*.json,.{eslintrc,prettierrc}": [
-            "prettier --ignore-path .eslintignore --parser json --write"
-        ],
-        "*.{css,scss}": [
-            "prettier --ignore-path .eslintignore --single-quote --write"
-        ],
-        "*.{html,md,yml}": [
-            "prettier --ignore-path .eslintignore --single-quote --write"
-        ]
-    },
-    "build": {
-        "productName": "Feishin",
-        "appId": "org.jeffvli.feishin",
-        "artifactName": "${productName}-${version}-${os}-${arch}.${ext}",
-        "asar": true,
-        "asarUnpack": "**\\*.{node,dll}",
-        "files": [
-            "dist",
-            "node_modules",
-            "package.json"
-        ],
-        "afterSign": ".erb/scripts/notarize.js",
-        "electronVersion": "36.1.0",
-        "mac": {
-            "target": {
-                "target": "default",
-                "arch": [
-                    "arm64",
-                    "x64"
-                ]
-            },
-            "icon": "assets/icons/icon.icns",
-            "type": "distribution",
-            "hardenedRuntime": true,
-            "entitlements": "assets/entitlements.mac.plist",
-            "entitlementsInherit": "assets/entitlements.mac.plist",
-            "gatekeeperAssess": false
-        },
-        "dmg": {
-            "contents": [
-                {
-                    "x": 130,
-                    "y": 220
-                },
-                {
-                    "x": 410,
-                    "y": 220,
-                    "type": "link",
-                    "path": "/Applications"
-                }
-            ]
-        },
-        "win": {
-            "target": [
-                "nsis",
-                "zip"
-            ],
-            "icon": "assets/icons/icon.ico"
-        },
-        "deb": {
-            "depends": [
-                "libgssapi_krb5.so.2",
-                "libavahi-common.so.3",
-                "libavahi-client.so.3",
-                "libkrb5.so.3",
-                "libkrb5support.so.0",
-                "libkeyutils.so.1",
-                "libcups.so.2"
-            ]
-        },
-        "rpm": {
-            "depends": [
-                "libgssapi_krb5.so.2",
-                "libavahi-common.so.3",
-                "libavahi-client.so.3",
-                "libkrb5.so.3",
-                "libkrb5support.so.0",
-                "libkeyutils.so.1",
-                "libcups.so.2"
-            ]
-        },
-        "freebsd": {
-            "depends": [
-                "libgssapi_krb5.so.2",
-                "libavahi-common.so.3",
-                "libavahi-client.so.3",
-                "libkrb5.so.3",
-                "libkrb5support.so.0",
-                "libkeyutils.so.1",
-                "libcups.so.2"
-            ]
-        },
-        "linux": {
-            "target": [
-                "AppImage",
-                "tar.xz"
-            ],
-            "icon": "assets/icons/icon.png",
-            "category": "AudioVideo;Audio;Player"
-        },
-        "directories": {
-            "app": "release/app",
-            "buildResources": "assets",
-            "output": "release/build"
-        },
-        "extraResources": [
-            "./assets/**"
-        ],
-        "publish": {
-            "provider": "github",
-            "owner": "jeffvli",
-            "repo": "feishin"
-        }
-    },
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/jeffvli/feishin.git"
-    },
-    "author": {
-        "name": "jeffvli",
-        "url": "https://github.com/jeffvli/"
-    },
-    "contributors": [],
-    "license": "GPL-3.0",
-    "bugs": {
-        "url": "https://github.com/jeffvli/feishin/issues"
-    },
-    "keywords": [
-        "subsonic",
-        "navidrome",
-        "airsonic",
-        "jellyfin",
-        "react",
-        "electron"
-    ],
-    "homepage": "https://github.com/jeffvli/feishin",
-    "jest": {
-        "testURL": "http://localhost/",
-        "testEnvironment": "jsdom",
-        "transform": {
-            "\\.(ts|tsx|js|jsx)$": "ts-jest"
-        },
-        "moduleNameMapper": {
-            "\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$": "<rootDir>/.erb/mocks/fileMock.js",
-            "\\.(css|less|sass|scss)$": "identity-obj-proxy"
-        },
-        "moduleFileExtensions": [
-            "js",
-            "jsx",
-            "ts",
-            "tsx",
-            "json"
-        ],
-        "moduleDirectories": [
-            "node_modules",
-            "release/app/node_modules"
-        ],
-        "testPathIgnorePatterns": [
-            "release/app/dist"
-        ],
-        "setupFiles": [
-            "./.erb/scripts/check-build-exists.ts"
-        ]
-    },
-    "devDependencies": {
-        "@electron/rebuild": "^3.6.0",
-        "@pmmmwh/react-refresh-webpack-plugin": "0.5.5",
-        "@stylelint/postcss-css-in-js": "^0.38.0",
-        "@teamsupercell/typings-for-css-modules-loader": "^2.5.1",
-        "@testing-library/jest-dom": "^5.16.4",
-        "@testing-library/react": "^13.0.0",
-        "@types/dompurify": "^3.0.5",
-        "@types/electron-localshortcut": "^3.1.0",
-        "@types/jest": "^27.4.1",
-        "@types/lodash": "^4.14.188",
-        "@types/md5": "^2.3.2",
-        "@types/node": "^17.0.23",
-        "@types/react": "^18.0.25",
-        "@types/react-dom": "^18.0.8",
-        "@types/react-test-renderer": "^17.0.1",
-        "@types/react-virtualized-auto-sizer": "^1.0.1",
-        "@types/react-window": "^1.8.5",
-        "@types/react-window-infinite-loader": "^1.0.6",
-        "@types/styled-components": "^5.1.26",
-        "@types/terser-webpack-plugin": "^5.0.4",
-        "@types/webpack-bundle-analyzer": "^4.4.1",
-        "@types/webpack-env": "^1.16.3",
-        "@typescript-eslint/eslint-plugin": "^5.47.0",
-        "@typescript-eslint/parser": "^5.47.0",
-        "browserslist-config-erb": "^0.0.3",
-        "chalk": "^4.1.2",
-        "concurrently": "^7.1.0",
-        "core-js": "^3.21.1",
-        "cross-env": "^7.0.3",
-        "css-loader": "^6.7.1",
-        "css-minimizer-webpack-plugin": "^3.4.1",
-        "detect-port": "^1.3.0",
-        "electron": "^36.1.0",
-        "electron-builder": "^24.13.3",
-        "electron-devtools-installer": "^3.2.0",
-        "electron-notarize": "^1.2.1",
-        "electronmon": "^2.0.2",
-        "eslint": "^8.30.0",
-        "eslint-config-airbnb-base": "^15.0.0",
-        "eslint-config-erb": "^4.0.3",
-        "eslint-import-resolver-typescript": "^2.7.1",
-        "eslint-import-resolver-webpack": "^0.13.2",
-        "eslint-plugin-compat": "^4.2.0",
-        "eslint-plugin-import": "^2.26.0",
-        "eslint-plugin-jest": "^26.1.3",
-        "eslint-plugin-jsx-a11y": "^6.5.1",
-        "eslint-plugin-promise": "^6.0.0",
-        "eslint-plugin-react": "^7.29.4",
-        "eslint-plugin-react-hooks": "^4.4.0",
-        "eslint-plugin-sort-keys-fix": "^1.1.2",
-        "eslint-plugin-typescript-sort-keys": "^2.1.0",
-        "file-loader": "^6.2.0",
-        "html-webpack-plugin": "^5.5.0",
-        "husky": "^7.0.4",
-        "i18next-parser": "^9.0.2",
-        "identity-obj-proxy": "^3.0.0",
-        "jest": "^27.5.1",
-        "lint-staged": "^12.3.7",
-        "mini-css-extract-plugin": "^2.6.0",
-        "postcss-scss": "^4.0.4",
-        "postcss-styled-syntax": "^0.5.0",
-        "postcss-syntax": "^0.36.2",
-        "prettier": "^3.3.3",
-        "react-refresh": "^0.12.0",
-        "react-refresh-typescript": "^2.0.4",
-        "react-test-renderer": "^18.0.0",
-        "rimraf": "^3.0.2",
-        "sass": "^1.49.11",
-        "sass-loader": "^12.6.0",
-        "style-loader": "^3.3.1",
-        "stylelint": "^15.10.3",
-        "stylelint-config-css-modules": "^4.3.0",
-        "stylelint-config-recess-order": "^4.3.0",
-        "stylelint-config-standard": "^34.0.0",
-        "stylelint-config-standard-scss": "^4.0.0",
-        "stylelint-config-styled-components": "^0.1.1",
-        "terser-webpack-plugin": "^5.3.1",
-        "ts-jest": "^27.1.4",
-        "ts-loader": "^9.2.8",
-        "ts-node": "^10.9.2",
-        "tsconfig-paths-webpack-plugin": "^4.0.0",
-        "tsx": "^4.16.2",
-        "typescript": "^5.2.2",
-        "typescript-plugin-styled-components": "^3.0.0",
-        "url-loader": "^4.1.1",
-        "webpack": "^5.94.0",
-        "webpack-bundle-analyzer": "^4.5.0",
-        "webpack-cli": "^4.9.2",
-        "webpack-dev-server": "^4.8.0",
-        "webpack-merge": "^5.8.0"
+        "format": "prettier --write .",
+        "lint": "eslint --cache --fix .",
+        "typecheck:node": "tsc --noEmit -p tsconfig.node.json --composite false",
+        "typecheck:web": "tsc --noEmit -p tsconfig.web.json --composite false",
+        "typecheck": "npm run typecheck:node && npm run typecheck:web",
+        "start": "electron-vite preview",
+        "dev": "electron-vite dev",
+        "dev:watch": "electron-vite dev --watch",
+        "build": "npm run typecheck && electron-vite build",
+        "postinstall": "electron-builder install-app-deps",
+        "build:unpack": "npm run build && electron-builder --dir",
+        "build:win": "npm run build && electron-builder --win",
+        "build:mac": "electron-vite build && electron-builder --mac",
+        "build:linux": "electron-vite build && electron-builder --linux"
     },
     "dependencies": {
         "@ag-grid-community/client-side-row-model": "^28.2.1",
@@ -299,6 +27,8 @@
         "@ag-grid-community/infinite-row-model": "^28.2.1",
         "@ag-grid-community/react": "^28.2.1",
         "@ag-grid-community/styles": "^28.2.1",
+        "@electron-toolkit/preload": "^3.0.1",
+        "@electron-toolkit/utils": "^4.0.0",
         "@emotion/react": "^11.10.4",
         "@mantine/core": "^6.0.17",
         "@mantine/dates": "^6.0.17",
@@ -315,6 +45,7 @@
         "audiomotion-analyzer": "^4.5.0",
         "auto-text-size": "^0.2.3",
         "axios": "^1.6.0",
+        "cheerio": "^1.0.0",
         "clsx": "^2.0.0",
         "cmdk": "^0.2.0",
         "dayjs": "^1.11.6",
@@ -323,7 +54,7 @@
         "electron-localshortcut": "^3.2.1",
         "electron-log": "^5.1.1",
         "electron-store": "^8.1.0",
-        "electron-updater": "^6.3.1",
+        "electron-updater": "^6.3.9",
         "fast-average-color": "^9.3.0",
         "format-duration": "^2.0.0",
         "framer-motion": "^11.0.0",
@@ -336,11 +67,12 @@
         "lodash": "^4.17.21",
         "md5": "^2.3.0",
         "memoize-one": "^6.0.0",
+        "mpris-service": "^2.1.2",
         "nanoid": "^3.3.3",
         "net": "^1.0.2",
         "node-mpv": "github:jeffvli/Node-MPV#32b4d64395289ad710c41d481d2707a7acfc228f",
-        "overlayscrollbars": "^2.2.1",
-        "overlayscrollbars-react": "^0.5.1",
+        "overlayscrollbars": "^2.11.1",
+        "overlayscrollbars-react": "^0.5.6",
         "react": "^18.2.0",
         "react-dom": "^18.2.0",
         "react-error-boundary": "^3.1.4",
@@ -356,33 +88,112 @@
         "semver": "^7.5.4",
         "styled-components": "^6.0.8",
         "swiper": "^9.3.1",
+        "ws": "^8.18.2",
         "zod": "^3.22.3",
         "zustand": "^4.3.9"
     },
-    "resolutions": {
-        "styled-components": "^6",
-        "entities": "2.2.0"
-    },
-    "overrides": {
-        "entities": "2.2.0"
-    },
-    "devEngines": {
-        "runtime": {
-            "name": "node",
-            "version": ">=18.x",
-            "onFail": "error"
-        },
-        "packageManager": {
-            "name": "npm",
-            "version": ">=7.x",
-            "onFail": "error"
-        }
-    },
-    "browserslist": [],
-    "electronmon": {
-        "patterns": [
-            "!server",
-            "!src/renderer"
-        ]
+    "devDependencies": {
+        "@electron-toolkit/eslint-config-prettier": "^3.0.0",
+        "@electron-toolkit/eslint-config-ts": "^3.0.0",
+        "@electron-toolkit/tsconfig": "^1.0.1",
+        "@electron/rebuild": "^3.6.0",
+        "@pmmmwh/react-refresh-webpack-plugin": "0.5.5",
+        "@stylelint/postcss-css-in-js": "^0.38.0",
+        "@teamsupercell/typings-for-css-modules-loader": "^2.5.1",
+        "@testing-library/jest-dom": "^5.16.4",
+        "@testing-library/react": "^13.0.0",
+        "@types/dompurify": "^3.0.5",
+        "@types/electron-localshortcut": "^3.1.0",
+        "@types/jest": "^27.4.1",
+        "@types/lodash": "^4.14.188",
+        "@types/md5": "^2.3.2",
+        "@types/node": "^22.14.1",
+        "@types/react": "^19.1.1",
+        "@types/react-dom": "^19.1.2",
+        "@types/react-test-renderer": "^17.0.1",
+        "@types/react-virtualized-auto-sizer": "^1.0.1",
+        "@types/react-window": "^1.8.5",
+        "@types/react-window-infinite-loader": "^1.0.6",
+        "@types/styled-components": "^5.1.26",
+        "@types/terser-webpack-plugin": "^5.0.4",
+        "@types/webpack-bundle-analyzer": "^4.4.1",
+        "@types/webpack-env": "^1.16.3",
+        "@typescript-eslint/eslint-plugin": "^5.47.0",
+        "@typescript-eslint/parser": "^5.47.0",
+        "@vitejs/plugin-react": "^4.3.4",
+        "browserslist-config-erb": "^0.0.3",
+        "chalk": "^4.1.2",
+        "concurrently": "^7.1.0",
+        "core-js": "^3.21.1",
+        "cross-env": "^7.0.3",
+        "css-loader": "^6.7.1",
+        "css-minimizer-webpack-plugin": "^3.4.1",
+        "detect-port": "^1.3.0",
+        "electron": "^35.1.5",
+        "electron-builder": "^25.1.8",
+        "electron-devtools-installer": "^3.2.0",
+        "electron-notarize": "^1.2.1",
+        "electron-vite": "^3.1.0",
+        "electronmon": "^2.0.2",
+        "eslint": "^9.24.0",
+        "eslint-config-airbnb-base": "^15.0.0",
+        "eslint-config-erb": "^4.0.3",
+        "eslint-import-resolver-typescript": "^2.7.1",
+        "eslint-import-resolver-webpack": "^0.13.2",
+        "eslint-plugin-compat": "^4.2.0",
+        "eslint-plugin-import": "^2.26.0",
+        "eslint-plugin-jest": "^26.1.3",
+        "eslint-plugin-jsx-a11y": "^6.5.1",
+        "eslint-plugin-perfectionist": "^4.13.0",
+        "eslint-plugin-prettier": "^5.4.0",
+        "eslint-plugin-promise": "^6.0.0",
+        "eslint-plugin-react": "^7.37.5",
+        "eslint-plugin-react-hooks": "^5.2.0",
+        "eslint-plugin-react-refresh": "^0.4.19",
+        "eslint-plugin-sort-keys-fix": "^1.1.2",
+        "eslint-plugin-typescript-sort-keys": "^2.1.0",
+        "file-loader": "^6.2.0",
+        "html-webpack-plugin": "^5.5.0",
+        "husky": "^7.0.4",
+        "i18next-parser": "^9.0.2",
+        "identity-obj-proxy": "^3.0.0",
+        "jest": "^27.5.1",
+        "lint-staged": "^12.3.7",
+        "mini-css-extract-plugin": "^2.6.0",
+        "postcss-scss": "^4.0.4",
+        "postcss-styled-syntax": "^0.5.0",
+        "postcss-syntax": "^0.36.2",
+        "prettier": "^3.5.3",
+        "react": "^19.1.0",
+        "react-dom": "^19.1.0",
+        "react-refresh": "^0.12.0",
+        "react-refresh-typescript": "^2.0.4",
+        "react-test-renderer": "^18.0.0",
+        "rimraf": "^3.0.2",
+        "sass": "^1.49.11",
+        "sass-embedded": "^1.89.0",
+        "sass-loader": "^12.6.0",
+        "style-loader": "^3.3.1",
+        "stylelint": "^15.10.3",
+        "stylelint-config-css-modules": "^4.3.0",
+        "stylelint-config-recess-order": "^4.3.0",
+        "stylelint-config-standard": "^34.0.0",
+        "stylelint-config-standard-scss": "^4.0.0",
+        "stylelint-config-styled-components": "^0.1.1",
+        "terser-webpack-plugin": "^5.3.1",
+        "ts-jest": "^27.1.4",
+        "ts-loader": "^9.2.8",
+        "ts-node": "^10.9.2",
+        "tsconfig-paths-webpack-plugin": "^4.0.0",
+        "tsx": "^4.16.2",
+        "typescript": "^5.8.3",
+        "typescript-plugin-styled-components": "^3.0.0",
+        "url-loader": "^4.1.1",
+        "vite": "^6.2.6",
+        "webpack": "^5.94.0",
+        "webpack-bundle-analyzer": "^4.5.0",
+        "webpack-cli": "^4.9.2",
+        "webpack-dev-server": "^4.8.0",
+        "webpack-merge": "^5.8.0"
     }
 }
diff --git a/release/app/package-lock.json b/release/app/package-lock.json
deleted file mode 100644
index 585958ec..00000000
--- a/release/app/package-lock.json
+++ /dev/null
@@ -1,2352 +0,0 @@
-{
-    "name": "feishin",
-    "version": "0.12.8",
-    "lockfileVersion": 2,
-    "requires": true,
-    "packages": {
-        "": {
-            "name": "feishin",
-            "version": "0.12.8",
-            "hasInstallScript": true,
-            "license": "GPL-3.0",
-            "dependencies": {
-                "cheerio": "^1.0.0-rc.12",
-                "mpris-service": "^2.1.2",
-                "ws": "^8.18.0"
-            },
-            "devDependencies": {
-                "electron": "36.1.0"
-            }
-        },
-        "node_modules/@electron/get": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/@electron/get/-/get-2.0.2.tgz",
-            "integrity": "sha512-eFZVFoRXb3GFGd7Ak7W4+6jBl9wBtiZ4AaYOse97ej6mKj5tkyO0dUnUChs1IhJZtx1BENo4/p4WUTXpi6vT+g==",
-            "dev": true,
-            "dependencies": {
-                "debug": "^4.1.1",
-                "env-paths": "^2.2.0",
-                "fs-extra": "^8.1.0",
-                "got": "^11.8.5",
-                "progress": "^2.0.3",
-                "semver": "^6.2.0",
-                "sumchecker": "^3.0.1"
-            },
-            "engines": {
-                "node": ">=12"
-            },
-            "optionalDependencies": {
-                "global-agent": "^3.0.0"
-            }
-        },
-        "node_modules/@nornagon/put": {
-            "version": "0.0.8",
-            "resolved": "https://registry.npmjs.org/@nornagon/put/-/put-0.0.8.tgz",
-            "integrity": "sha512-ugvXJjwF5ldtUpa7D95kruNJ41yFQDEKyF5CW4TgKJnh+W/zmlBzXXeKTyqIgwMFrkePN2JqOBqcF0M0oOunow==",
-            "engines": {
-                "node": ">=0.3.0"
-            }
-        },
-        "node_modules/@sindresorhus/is": {
-            "version": "4.6.0",
-            "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz",
-            "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==",
-            "dev": true,
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sindresorhus/is?sponsor=1"
-            }
-        },
-        "node_modules/@szmarczak/http-timer": {
-            "version": "4.0.6",
-            "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz",
-            "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==",
-            "dev": true,
-            "dependencies": {
-                "defer-to-connect": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/@types/cacheable-request": {
-            "version": "6.0.3",
-            "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.3.tgz",
-            "integrity": "sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==",
-            "dev": true,
-            "dependencies": {
-                "@types/http-cache-semantics": "*",
-                "@types/keyv": "^3.1.4",
-                "@types/node": "*",
-                "@types/responselike": "^1.0.0"
-            }
-        },
-        "node_modules/@types/http-cache-semantics": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz",
-            "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==",
-            "dev": true
-        },
-        "node_modules/@types/keyv": {
-            "version": "3.1.4",
-            "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.4.tgz",
-            "integrity": "sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==",
-            "dev": true,
-            "dependencies": {
-                "@types/node": "*"
-            }
-        },
-        "node_modules/@types/node": {
-            "version": "22.15.12",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.12.tgz",
-            "integrity": "sha512-K0fpC/ZVeb8G9rm7bH7vI0KAec4XHEhBam616nVJCV51bKzJ6oA3luG4WdKoaztxe70QaNjS/xBmcDLmr4PiGw==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "undici-types": "~6.21.0"
-            }
-        },
-        "node_modules/@types/responselike": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz",
-            "integrity": "sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==",
-            "dev": true,
-            "dependencies": {
-                "@types/node": "*"
-            }
-        },
-        "node_modules/@types/yauzl": {
-            "version": "2.10.0",
-            "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz",
-            "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==",
-            "dev": true,
-            "optional": true,
-            "dependencies": {
-                "@types/node": "*"
-            }
-        },
-        "node_modules/abstract-socket": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/abstract-socket/-/abstract-socket-2.1.1.tgz",
-            "integrity": "sha512-YZJizsvS1aBua5Gd01woe4zuyYBGgSMeqDOB6/ChwdTI904KP6QGtJswXl4hcqWxbz86hQBe++HWV0hF1aGUtA==",
-            "hasInstallScript": true,
-            "optional": true,
-            "os": [
-                "linux"
-            ],
-            "dependencies": {
-                "bindings": "^1.2.1",
-                "nan": "^2.12.1"
-            },
-            "engines": {
-                "node": ">=4.0.0"
-            }
-        },
-        "node_modules/bindings": {
-            "version": "1.5.0",
-            "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
-            "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
-            "optional": true,
-            "dependencies": {
-                "file-uri-to-path": "1.0.0"
-            }
-        },
-        "node_modules/boolbase": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-            "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww=="
-        },
-        "node_modules/boolean": {
-            "version": "3.2.0",
-            "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.2.0.tgz",
-            "integrity": "sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==",
-            "dev": true,
-            "optional": true
-        },
-        "node_modules/buffer-crc32": {
-            "version": "0.2.13",
-            "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-            "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
-            "dev": true,
-            "engines": {
-                "node": "*"
-            }
-        },
-        "node_modules/buffer-from": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-            "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
-        },
-        "node_modules/cacheable-lookup": {
-            "version": "5.0.4",
-            "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz",
-            "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==",
-            "dev": true,
-            "engines": {
-                "node": ">=10.6.0"
-            }
-        },
-        "node_modules/cacheable-request": {
-            "version": "7.0.2",
-            "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.2.tgz",
-            "integrity": "sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==",
-            "dev": true,
-            "dependencies": {
-                "clone-response": "^1.0.2",
-                "get-stream": "^5.1.0",
-                "http-cache-semantics": "^4.0.0",
-                "keyv": "^4.0.0",
-                "lowercase-keys": "^2.0.0",
-                "normalize-url": "^6.0.1",
-                "responselike": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/call-bind": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-            "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-            "dependencies": {
-                "function-bind": "^1.1.1",
-                "get-intrinsic": "^1.0.2"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/cheerio": {
-            "version": "1.0.0-rc.12",
-            "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.12.tgz",
-            "integrity": "sha512-VqR8m68vM46BNnuZ5NtnGBKIE/DfN0cRIzg9n40EIq9NOv90ayxLBXA8fXC5gquFRGJSTRqBq25Jt2ECLR431Q==",
-            "dependencies": {
-                "cheerio-select": "^2.1.0",
-                "dom-serializer": "^2.0.0",
-                "domhandler": "^5.0.3",
-                "domutils": "^3.0.1",
-                "htmlparser2": "^8.0.1",
-                "parse5": "^7.0.0",
-                "parse5-htmlparser2-tree-adapter": "^7.0.0"
-            },
-            "engines": {
-                "node": ">= 6"
-            },
-            "funding": {
-                "url": "https://github.com/cheeriojs/cheerio?sponsor=1"
-            }
-        },
-        "node_modules/cheerio-select": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/cheerio-select/-/cheerio-select-2.1.0.tgz",
-            "integrity": "sha512-9v9kG0LvzrlcungtnJtpGNxY+fzECQKhK4EGJX2vByejiMX84MFNQw4UxPJl3bFbTMw+Dfs37XaIkCwTZfLh4g==",
-            "dependencies": {
-                "boolbase": "^1.0.0",
-                "css-select": "^5.1.0",
-                "css-what": "^6.1.0",
-                "domelementtype": "^2.3.0",
-                "domhandler": "^5.0.3",
-                "domutils": "^3.0.1"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/fb55"
-            }
-        },
-        "node_modules/clone-response": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz",
-            "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==",
-            "dev": true,
-            "dependencies": {
-                "mimic-response": "^1.0.0"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/css-select": {
-            "version": "5.1.0",
-            "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz",
-            "integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==",
-            "dependencies": {
-                "boolbase": "^1.0.0",
-                "css-what": "^6.1.0",
-                "domhandler": "^5.0.2",
-                "domutils": "^3.0.1",
-                "nth-check": "^2.0.1"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/fb55"
-            }
-        },
-        "node_modules/css-what": {
-            "version": "6.1.0",
-            "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
-            "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
-            "engines": {
-                "node": ">= 6"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/fb55"
-            }
-        },
-        "node_modules/dbus-next": {
-            "version": "0.9.2",
-            "resolved": "https://registry.npmjs.org/dbus-next/-/dbus-next-0.9.2.tgz",
-            "integrity": "sha512-tzQq/+wrTZ2yU+U5PoeXc97KABhX2v55C/T0finH3tSKYuI8H/SqppIFymBBrUHcK13LvEGY3vdj3ikPPenL5g==",
-            "dependencies": {
-                "@nornagon/put": "0.0.8",
-                "event-stream": "3.3.4",
-                "hexy": "^0.2.10",
-                "jsbi": "^2.0.5",
-                "long": "^4.0.0",
-                "safe-buffer": "^5.1.1",
-                "xml2js": "^0.4.17"
-            },
-            "optionalDependencies": {
-                "abstract-socket": "^2.0.0"
-            }
-        },
-        "node_modules/debug": {
-            "version": "4.3.4",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-            "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-            "dev": true,
-            "dependencies": {
-                "ms": "2.1.2"
-            },
-            "engines": {
-                "node": ">=6.0"
-            },
-            "peerDependenciesMeta": {
-                "supports-color": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/decompress-response": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
-            "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
-            "dev": true,
-            "dependencies": {
-                "mimic-response": "^3.1.0"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/decompress-response/node_modules/mimic-response": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
-            "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/deep-equal": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",
-            "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==",
-            "dependencies": {
-                "is-arguments": "^1.0.4",
-                "is-date-object": "^1.0.1",
-                "is-regex": "^1.0.4",
-                "object-is": "^1.0.1",
-                "object-keys": "^1.1.1",
-                "regexp.prototype.flags": "^1.2.0"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/defer-to-connect": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",
-            "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==",
-            "dev": true,
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/define-properties": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-            "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-            "dependencies": {
-                "has-property-descriptors": "^1.0.0",
-                "object-keys": "^1.1.1"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/detect-node": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
-            "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
-            "dev": true,
-            "optional": true
-        },
-        "node_modules/dom-serializer": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
-            "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
-            "dependencies": {
-                "domelementtype": "^2.3.0",
-                "domhandler": "^5.0.2",
-                "entities": "^4.2.0"
-            },
-            "funding": {
-                "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
-            }
-        },
-        "node_modules/domelementtype": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-            "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/fb55"
-                }
-            ]
-        },
-        "node_modules/domhandler": {
-            "version": "5.0.3",
-            "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
-            "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
-            "dependencies": {
-                "domelementtype": "^2.3.0"
-            },
-            "engines": {
-                "node": ">= 4"
-            },
-            "funding": {
-                "url": "https://github.com/fb55/domhandler?sponsor=1"
-            }
-        },
-        "node_modules/domutils": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz",
-            "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==",
-            "dependencies": {
-                "dom-serializer": "^2.0.0",
-                "domelementtype": "^2.3.0",
-                "domhandler": "^5.0.3"
-            },
-            "funding": {
-                "url": "https://github.com/fb55/domutils?sponsor=1"
-            }
-        },
-        "node_modules/duplexer": {
-            "version": "0.1.2",
-            "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
-            "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg=="
-        },
-        "node_modules/electron": {
-            "version": "36.1.0",
-            "resolved": "https://registry.npmjs.org/electron/-/electron-36.1.0.tgz",
-            "integrity": "sha512-gnp3BnbKdGsVc7cm1qlEaZc8pJsR08mIs8H/yTo8gHEtFkGGJbDTVZOYNAfbQlL0aXh+ozv+CnyiNeDNkT1Upg==",
-            "dev": true,
-            "hasInstallScript": true,
-            "license": "MIT",
-            "dependencies": {
-                "@electron/get": "^2.0.0",
-                "@types/node": "^22.7.7",
-                "extract-zip": "^2.0.1"
-            },
-            "bin": {
-                "electron": "cli.js"
-            },
-            "engines": {
-                "node": ">= 12.20.55"
-            }
-        },
-        "node_modules/end-of-stream": {
-            "version": "1.4.4",
-            "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-            "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-            "dev": true,
-            "dependencies": {
-                "once": "^1.4.0"
-            }
-        },
-        "node_modules/entities": {
-            "version": "4.5.0",
-            "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
-            "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
-            "engines": {
-                "node": ">=0.12"
-            },
-            "funding": {
-                "url": "https://github.com/fb55/entities?sponsor=1"
-            }
-        },
-        "node_modules/env-paths": {
-            "version": "2.2.1",
-            "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
-            "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
-            "dev": true,
-            "engines": {
-                "node": ">=6"
-            }
-        },
-        "node_modules/es6-error": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
-            "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==",
-            "dev": true,
-            "optional": true
-        },
-        "node_modules/escape-string-regexp": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-            "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-            "dev": true,
-            "optional": true,
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/event-stream": {
-            "version": "3.3.4",
-            "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
-            "integrity": "sha512-QHpkERcGsR0T7Qm3HNJSyXKEEj8AHNxkY3PK8TS2KJvQ7NiSHe3DDpwVKKtoYprL/AreyzFBeIkBIWChAqn60g==",
-            "dependencies": {
-                "duplexer": "~0.1.1",
-                "from": "~0",
-                "map-stream": "~0.1.0",
-                "pause-stream": "0.0.11",
-                "split": "0.3",
-                "stream-combiner": "~0.0.4",
-                "through": "~2.3.1"
-            }
-        },
-        "node_modules/extract-zip": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
-            "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
-            "dev": true,
-            "dependencies": {
-                "debug": "^4.1.1",
-                "get-stream": "^5.1.0",
-                "yauzl": "^2.10.0"
-            },
-            "bin": {
-                "extract-zip": "cli.js"
-            },
-            "engines": {
-                "node": ">= 10.17.0"
-            },
-            "optionalDependencies": {
-                "@types/yauzl": "^2.9.1"
-            }
-        },
-        "node_modules/fd-slicer": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
-            "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
-            "dev": true,
-            "dependencies": {
-                "pend": "~1.2.0"
-            }
-        },
-        "node_modules/file-uri-to-path": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
-            "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
-            "optional": true
-        },
-        "node_modules/from": {
-            "version": "0.1.7",
-            "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz",
-            "integrity": "sha512-twe20eF1OxVxp/ML/kq2p1uc6KvFK/+vs8WjEbeKmV2He22MKm7YF2ANIt+EOqhJ5L3K/SuuPhk0hWQDjOM23g=="
-        },
-        "node_modules/fs-extra": {
-            "version": "8.1.0",
-            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
-            "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
-            "dev": true,
-            "dependencies": {
-                "graceful-fs": "^4.2.0",
-                "jsonfile": "^4.0.0",
-                "universalify": "^0.1.0"
-            },
-            "engines": {
-                "node": ">=6 <7 || >=8"
-            }
-        },
-        "node_modules/function-bind": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-            "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
-        },
-        "node_modules/functions-have-names": {
-            "version": "1.2.3",
-            "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
-            "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/get-intrinsic": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz",
-            "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==",
-            "dependencies": {
-                "function-bind": "^1.1.1",
-                "has": "^1.0.3",
-                "has-symbols": "^1.0.3"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/get-stream": {
-            "version": "5.2.0",
-            "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-            "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-            "dev": true,
-            "dependencies": {
-                "pump": "^3.0.0"
-            },
-            "engines": {
-                "node": ">=8"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/global-agent": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-3.0.0.tgz",
-            "integrity": "sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q==",
-            "dev": true,
-            "optional": true,
-            "dependencies": {
-                "boolean": "^3.0.1",
-                "es6-error": "^4.1.1",
-                "matcher": "^3.0.0",
-                "roarr": "^2.15.3",
-                "semver": "^7.3.2",
-                "serialize-error": "^7.0.1"
-            },
-            "engines": {
-                "node": ">=10.0"
-            }
-        },
-        "node_modules/global-agent/node_modules/semver": {
-            "version": "7.6.0",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
-            "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
-            "dev": true,
-            "optional": true,
-            "dependencies": {
-                "lru-cache": "^6.0.0"
-            },
-            "bin": {
-                "semver": "bin/semver.js"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/globalthis": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
-            "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
-            "dev": true,
-            "optional": true,
-            "dependencies": {
-                "define-properties": "^1.1.3"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/got": {
-            "version": "11.8.6",
-            "resolved": "https://registry.npmjs.org/got/-/got-11.8.6.tgz",
-            "integrity": "sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==",
-            "dev": true,
-            "dependencies": {
-                "@sindresorhus/is": "^4.0.0",
-                "@szmarczak/http-timer": "^4.0.5",
-                "@types/cacheable-request": "^6.0.1",
-                "@types/responselike": "^1.0.0",
-                "cacheable-lookup": "^5.0.3",
-                "cacheable-request": "^7.0.2",
-                "decompress-response": "^6.0.0",
-                "http2-wrapper": "^1.0.0-beta.5.2",
-                "lowercase-keys": "^2.0.0",
-                "p-cancelable": "^2.0.0",
-                "responselike": "^2.0.0"
-            },
-            "engines": {
-                "node": ">=10.19.0"
-            },
-            "funding": {
-                "url": "https://github.com/sindresorhus/got?sponsor=1"
-            }
-        },
-        "node_modules/graceful-fs": {
-            "version": "4.2.10",
-            "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-            "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
-            "dev": true
-        },
-        "node_modules/has": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-            "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-            "dependencies": {
-                "function-bind": "^1.1.1"
-            },
-            "engines": {
-                "node": ">= 0.4.0"
-            }
-        },
-        "node_modules/has-property-descriptors": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
-            "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
-            "dependencies": {
-                "get-intrinsic": "^1.1.1"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/has-symbols": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-            "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/has-tostringtag": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-            "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
-            "dependencies": {
-                "has-symbols": "^1.0.2"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/hexy": {
-            "version": "0.2.11",
-            "resolved": "https://registry.npmjs.org/hexy/-/hexy-0.2.11.tgz",
-            "integrity": "sha512-ciq6hFsSG/Bpt2DmrZJtv+56zpPdnq+NQ4ijEFrveKN0ZG1mhl/LdT1NQZ9se6ty1fACcI4d4vYqC9v8EYpH2A==",
-            "bin": {
-                "hexy": "bin/hexy_cmd.js"
-            }
-        },
-        "node_modules/htmlparser2": {
-            "version": "8.0.2",
-            "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.2.tgz",
-            "integrity": "sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==",
-            "funding": [
-                "https://github.com/fb55/htmlparser2?sponsor=1",
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/fb55"
-                }
-            ],
-            "dependencies": {
-                "domelementtype": "^2.3.0",
-                "domhandler": "^5.0.3",
-                "domutils": "^3.0.1",
-                "entities": "^4.4.0"
-            }
-        },
-        "node_modules/http-cache-semantics": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
-            "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==",
-            "dev": true
-        },
-        "node_modules/http2-wrapper": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz",
-            "integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==",
-            "dev": true,
-            "dependencies": {
-                "quick-lru": "^5.1.1",
-                "resolve-alpn": "^1.0.0"
-            },
-            "engines": {
-                "node": ">=10.19.0"
-            }
-        },
-        "node_modules/is-arguments": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
-            "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
-            "dependencies": {
-                "call-bind": "^1.0.2",
-                "has-tostringtag": "^1.0.0"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/is-date-object": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
-            "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
-            "dependencies": {
-                "has-tostringtag": "^1.0.0"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/is-regex": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-            "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-            "dependencies": {
-                "call-bind": "^1.0.2",
-                "has-tostringtag": "^1.0.0"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/jsbi": {
-            "version": "2.0.5",
-            "resolved": "https://registry.npmjs.org/jsbi/-/jsbi-2.0.5.tgz",
-            "integrity": "sha512-TzO/62Hxeb26QMb4IGlI/5X+QLr9Uqp1FPkwp2+KOICW+Q+vSuFj61c8pkT6wAns4WcK56X7CmSHhJeDGWOqxQ=="
-        },
-        "node_modules/json-buffer": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
-            "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
-            "dev": true
-        },
-        "node_modules/json-stringify-safe": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-            "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",
-            "dev": true,
-            "optional": true
-        },
-        "node_modules/jsonfile": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-            "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
-            "dev": true,
-            "optionalDependencies": {
-                "graceful-fs": "^4.1.6"
-            }
-        },
-        "node_modules/keyv": {
-            "version": "4.5.2",
-            "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.2.tgz",
-            "integrity": "sha512-5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g==",
-            "dev": true,
-            "dependencies": {
-                "json-buffer": "3.0.1"
-            }
-        },
-        "node_modules/long": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz",
-            "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA=="
-        },
-        "node_modules/lowercase-keys": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
-            "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/lru-cache": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-            "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-            "dev": true,
-            "optional": true,
-            "dependencies": {
-                "yallist": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/map-stream": {
-            "version": "0.1.0",
-            "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
-            "integrity": "sha512-CkYQrPYZfWnu/DAmVCpTSX/xHpKZ80eKh2lAkyA6AJTef6bW+6JpbQZN5rofum7da+SyN1bi5ctTm+lTfcCW3g=="
-        },
-        "node_modules/matcher": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/matcher/-/matcher-3.0.0.tgz",
-            "integrity": "sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng==",
-            "dev": true,
-            "optional": true,
-            "dependencies": {
-                "escape-string-regexp": "^4.0.0"
-            },
-            "engines": {
-                "node": ">=10"
-            }
-        },
-        "node_modules/mimic-response": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
-            "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
-            "dev": true,
-            "engines": {
-                "node": ">=4"
-            }
-        },
-        "node_modules/mpris-service": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/mpris-service/-/mpris-service-2.1.2.tgz",
-            "integrity": "sha512-AC6WepCnFWwOME9OWplHZ8ps/BB+g9QrEpUKCv7wX82fDPzR3nPrypOFmL/Fm0JloEAu6QTWSfDLLc6mM/jinw==",
-            "dependencies": {
-                "dbus-next": "^0.9.2",
-                "deep-equal": "^1.0.1",
-                "source-map-support": "^0.5.11"
-            }
-        },
-        "node_modules/ms": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-            "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-            "dev": true
-        },
-        "node_modules/nan": {
-            "version": "2.17.0",
-            "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",
-            "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==",
-            "optional": true
-        },
-        "node_modules/normalize-url": {
-            "version": "6.1.0",
-            "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
-            "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
-            "dev": true,
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/nth-check": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
-            "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
-            "dependencies": {
-                "boolbase": "^1.0.0"
-            },
-            "funding": {
-                "url": "https://github.com/fb55/nth-check?sponsor=1"
-            }
-        },
-        "node_modules/object-is": {
-            "version": "1.1.5",
-            "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
-            "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
-            "dependencies": {
-                "call-bind": "^1.0.2",
-                "define-properties": "^1.1.3"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/object-keys": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-            "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-            "engines": {
-                "node": ">= 0.4"
-            }
-        },
-        "node_modules/once": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-            "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-            "dev": true,
-            "dependencies": {
-                "wrappy": "1"
-            }
-        },
-        "node_modules/p-cancelable": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz",
-            "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==",
-            "dev": true,
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/parse5": {
-            "version": "7.1.2",
-            "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
-            "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==",
-            "dependencies": {
-                "entities": "^4.4.0"
-            },
-            "funding": {
-                "url": "https://github.com/inikulin/parse5?sponsor=1"
-            }
-        },
-        "node_modules/parse5-htmlparser2-tree-adapter": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-7.0.0.tgz",
-            "integrity": "sha512-B77tOZrqqfUfnVcOrUvfdLbz4pu4RopLD/4vmu3HUPswwTA8OH0EMW9BlWR2B0RCoiZRAHEUu7IxeP1Pd1UU+g==",
-            "dependencies": {
-                "domhandler": "^5.0.2",
-                "parse5": "^7.0.0"
-            },
-            "funding": {
-                "url": "https://github.com/inikulin/parse5?sponsor=1"
-            }
-        },
-        "node_modules/pause-stream": {
-            "version": "0.0.11",
-            "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
-            "integrity": "sha512-e3FBlXLmN/D1S+zHzanP4E/4Z60oFAa3O051qt1pxa7DEJWKAyil6upYVXCWadEnuoqa4Pkc9oUx9zsxYeRv8A==",
-            "dependencies": {
-                "through": "~2.3"
-            }
-        },
-        "node_modules/pend": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-            "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
-            "dev": true
-        },
-        "node_modules/progress": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-            "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
-            "dev": true,
-            "engines": {
-                "node": ">=0.4.0"
-            }
-        },
-        "node_modules/pump": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-            "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-            "dev": true,
-            "dependencies": {
-                "end-of-stream": "^1.1.0",
-                "once": "^1.3.1"
-            }
-        },
-        "node_modules/quick-lru": {
-            "version": "5.1.1",
-            "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
-            "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
-            "dev": true,
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/regexp.prototype.flags": {
-            "version": "1.4.3",
-            "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-            "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
-            "dependencies": {
-                "call-bind": "^1.0.2",
-                "define-properties": "^1.1.3",
-                "functions-have-names": "^1.2.2"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
-        "node_modules/resolve-alpn": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz",
-            "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==",
-            "dev": true
-        },
-        "node_modules/responselike": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz",
-            "integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==",
-            "dev": true,
-            "dependencies": {
-                "lowercase-keys": "^2.0.0"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/roarr": {
-            "version": "2.15.4",
-            "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.15.4.tgz",
-            "integrity": "sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A==",
-            "dev": true,
-            "optional": true,
-            "dependencies": {
-                "boolean": "^3.0.1",
-                "detect-node": "^2.0.4",
-                "globalthis": "^1.0.1",
-                "json-stringify-safe": "^5.0.1",
-                "semver-compare": "^1.0.0",
-                "sprintf-js": "^1.1.2"
-            },
-            "engines": {
-                "node": ">=8.0"
-            }
-        },
-        "node_modules/safe-buffer": {
-            "version": "5.2.1",
-            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-            "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-            "funding": [
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/feross"
-                },
-                {
-                    "type": "patreon",
-                    "url": "https://www.patreon.com/feross"
-                },
-                {
-                    "type": "consulting",
-                    "url": "https://feross.org/support"
-                }
-            ]
-        },
-        "node_modules/sax": {
-            "version": "1.2.4",
-            "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-            "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
-        },
-        "node_modules/semver": {
-            "version": "6.3.1",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-            "dev": true,
-            "bin": {
-                "semver": "bin/semver.js"
-            }
-        },
-        "node_modules/semver-compare": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz",
-            "integrity": "sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==",
-            "dev": true,
-            "optional": true
-        },
-        "node_modules/serialize-error": {
-            "version": "7.0.1",
-            "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-7.0.1.tgz",
-            "integrity": "sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==",
-            "dev": true,
-            "optional": true,
-            "dependencies": {
-                "type-fest": "^0.13.1"
-            },
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/source-map": {
-            "version": "0.6.1",
-            "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-            "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/source-map-support": {
-            "version": "0.5.21",
-            "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
-            "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
-            "dependencies": {
-                "buffer-from": "^1.0.0",
-                "source-map": "^0.6.0"
-            }
-        },
-        "node_modules/split": {
-            "version": "0.3.3",
-            "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
-            "integrity": "sha512-wD2AeVmxXRBoX44wAycgjVpMhvbwdI2aZjCkvfNcH1YqHQvJVa1duWc73OyVGJUc05fhFaTZeQ/PYsrmyH0JVA==",
-            "dependencies": {
-                "through": "2"
-            },
-            "engines": {
-                "node": "*"
-            }
-        },
-        "node_modules/sprintf-js": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz",
-            "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==",
-            "dev": true,
-            "optional": true
-        },
-        "node_modules/stream-combiner": {
-            "version": "0.0.4",
-            "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
-            "integrity": "sha512-rT00SPnTVyRsaSz5zgSPma/aHSOic5U1prhYdRy5HS2kTZviFpmDgzilbtsJsxiroqACmayynDN/9VzIbX5DOw==",
-            "dependencies": {
-                "duplexer": "~0.1.1"
-            }
-        },
-        "node_modules/sumchecker": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-3.0.1.tgz",
-            "integrity": "sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==",
-            "dev": true,
-            "dependencies": {
-                "debug": "^4.1.0"
-            },
-            "engines": {
-                "node": ">= 8.0"
-            }
-        },
-        "node_modules/through": {
-            "version": "2.3.8",
-            "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-            "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg=="
-        },
-        "node_modules/type-fest": {
-            "version": "0.13.1",
-            "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz",
-            "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==",
-            "dev": true,
-            "optional": true,
-            "engines": {
-                "node": ">=10"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/sindresorhus"
-            }
-        },
-        "node_modules/undici-types": {
-            "version": "6.21.0",
-            "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
-            "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/universalify": {
-            "version": "0.1.2",
-            "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-            "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
-            "dev": true,
-            "engines": {
-                "node": ">= 4.0.0"
-            }
-        },
-        "node_modules/wrappy": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-            "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-            "dev": true
-        },
-        "node_modules/ws": {
-            "version": "8.18.0",
-            "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
-            "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==",
-            "engines": {
-                "node": ">=10.0.0"
-            },
-            "peerDependencies": {
-                "bufferutil": "^4.0.1",
-                "utf-8-validate": ">=5.0.2"
-            },
-            "peerDependenciesMeta": {
-                "bufferutil": {
-                    "optional": true
-                },
-                "utf-8-validate": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/xml2js": {
-            "version": "0.5.0",
-            "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.5.0.tgz",
-            "integrity": "sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==",
-            "license": "MIT",
-            "dependencies": {
-                "sax": ">=0.6.0",
-                "xmlbuilder": "~11.0.0"
-            },
-            "engines": {
-                "node": ">=4.0.0"
-            }
-        },
-        "node_modules/xmlbuilder": {
-            "version": "11.0.1",
-            "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
-            "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
-            "engines": {
-                "node": ">=4.0"
-            }
-        },
-        "node_modules/yallist": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-            "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-            "dev": true,
-            "optional": true
-        },
-        "node_modules/yauzl": {
-            "version": "2.10.0",
-            "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
-            "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
-            "dev": true,
-            "dependencies": {
-                "buffer-crc32": "~0.2.3",
-                "fd-slicer": "~1.1.0"
-            }
-        }
-    },
-    "dependencies": {
-        "@electron/get": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/@electron/get/-/get-2.0.2.tgz",
-            "integrity": "sha512-eFZVFoRXb3GFGd7Ak7W4+6jBl9wBtiZ4AaYOse97ej6mKj5tkyO0dUnUChs1IhJZtx1BENo4/p4WUTXpi6vT+g==",
-            "dev": true,
-            "requires": {
-                "debug": "^4.1.1",
-                "env-paths": "^2.2.0",
-                "fs-extra": "^8.1.0",
-                "global-agent": "^3.0.0",
-                "got": "^11.8.5",
-                "progress": "^2.0.3",
-                "semver": "^6.2.0",
-                "sumchecker": "^3.0.1"
-            }
-        },
-        "@nornagon/put": {
-            "version": "0.0.8",
-            "resolved": "https://registry.npmjs.org/@nornagon/put/-/put-0.0.8.tgz",
-            "integrity": "sha512-ugvXJjwF5ldtUpa7D95kruNJ41yFQDEKyF5CW4TgKJnh+W/zmlBzXXeKTyqIgwMFrkePN2JqOBqcF0M0oOunow=="
-        },
-        "@sindresorhus/is": {
-            "version": "4.6.0",
-            "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz",
-            "integrity": "sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==",
-            "dev": true
-        },
-        "@szmarczak/http-timer": {
-            "version": "4.0.6",
-            "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz",
-            "integrity": "sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==",
-            "dev": true,
-            "requires": {
-                "defer-to-connect": "^2.0.0"
-            }
-        },
-        "@types/cacheable-request": {
-            "version": "6.0.3",
-            "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.3.tgz",
-            "integrity": "sha512-IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==",
-            "dev": true,
-            "requires": {
-                "@types/http-cache-semantics": "*",
-                "@types/keyv": "^3.1.4",
-                "@types/node": "*",
-                "@types/responselike": "^1.0.0"
-            }
-        },
-        "@types/http-cache-semantics": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz",
-            "integrity": "sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==",
-            "dev": true
-        },
-        "@types/keyv": {
-            "version": "3.1.4",
-            "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.4.tgz",
-            "integrity": "sha512-BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==",
-            "dev": true,
-            "requires": {
-                "@types/node": "*"
-            }
-        },
-        "@types/node": {
-            "version": "22.15.12",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.12.tgz",
-            "integrity": "sha512-K0fpC/ZVeb8G9rm7bH7vI0KAec4XHEhBam616nVJCV51bKzJ6oA3luG4WdKoaztxe70QaNjS/xBmcDLmr4PiGw==",
-            "dev": true,
-            "requires": {
-                "undici-types": "~6.21.0"
-            }
-        },
-        "@types/responselike": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz",
-            "integrity": "sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==",
-            "dev": true,
-            "requires": {
-                "@types/node": "*"
-            }
-        },
-        "@types/yauzl": {
-            "version": "2.10.0",
-            "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz",
-            "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==",
-            "dev": true,
-            "optional": true,
-            "requires": {
-                "@types/node": "*"
-            }
-        },
-        "abstract-socket": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/abstract-socket/-/abstract-socket-2.1.1.tgz",
-            "integrity": "sha512-YZJizsvS1aBua5Gd01woe4zuyYBGgSMeqDOB6/ChwdTI904KP6QGtJswXl4hcqWxbz86hQBe++HWV0hF1aGUtA==",
-            "optional": true,
-            "requires": {
-                "bindings": "^1.2.1",
-                "nan": "^2.12.1"
-            }
-        },
-        "bindings": {
-            "version": "1.5.0",
-            "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
-            "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
-            "optional": true,
-            "requires": {
-                "file-uri-to-path": "1.0.0"
-            }
-        },
-        "boolbase": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
-            "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww=="
-        },
-        "boolean": {
-            "version": "3.2.0",
-            "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.2.0.tgz",
-            "integrity": "sha512-d0II/GO9uf9lfUHH2BQsjxzRJZBdsjgsBiW4BvhWk/3qoKwQFjIDVN19PfX8F2D/r9PCMTtLWjYVCFrpeYUzsw==",
-            "dev": true,
-            "optional": true
-        },
-        "buffer-crc32": {
-            "version": "0.2.13",
-            "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
-            "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
-            "dev": true
-        },
-        "buffer-from": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
-            "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
-        },
-        "cacheable-lookup": {
-            "version": "5.0.4",
-            "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz",
-            "integrity": "sha512-2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==",
-            "dev": true
-        },
-        "cacheable-request": {
-            "version": "7.0.2",
-            "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.2.tgz",
-            "integrity": "sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==",
-            "dev": true,
-            "requires": {
-                "clone-response": "^1.0.2",
-                "get-stream": "^5.1.0",
-                "http-cache-semantics": "^4.0.0",
-                "keyv": "^4.0.0",
-                "lowercase-keys": "^2.0.0",
-                "normalize-url": "^6.0.1",
-                "responselike": "^2.0.0"
-            }
-        },
-        "call-bind": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-            "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
-            "requires": {
-                "function-bind": "^1.1.1",
-                "get-intrinsic": "^1.0.2"
-            }
-        },
-        "cheerio": {
-            "version": "1.0.0-rc.12",
-            "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0-rc.12.tgz",
-            "integrity": "sha512-VqR8m68vM46BNnuZ5NtnGBKIE/DfN0cRIzg9n40EIq9NOv90ayxLBXA8fXC5gquFRGJSTRqBq25Jt2ECLR431Q==",
-            "requires": {
-                "cheerio-select": "^2.1.0",
-                "dom-serializer": "^2.0.0",
-                "domhandler": "^5.0.3",
-                "domutils": "^3.0.1",
-                "htmlparser2": "^8.0.1",
-                "parse5": "^7.0.0",
-                "parse5-htmlparser2-tree-adapter": "^7.0.0"
-            }
-        },
-        "cheerio-select": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/cheerio-select/-/cheerio-select-2.1.0.tgz",
-            "integrity": "sha512-9v9kG0LvzrlcungtnJtpGNxY+fzECQKhK4EGJX2vByejiMX84MFNQw4UxPJl3bFbTMw+Dfs37XaIkCwTZfLh4g==",
-            "requires": {
-                "boolbase": "^1.0.0",
-                "css-select": "^5.1.0",
-                "css-what": "^6.1.0",
-                "domelementtype": "^2.3.0",
-                "domhandler": "^5.0.3",
-                "domutils": "^3.0.1"
-            }
-        },
-        "clone-response": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.3.tgz",
-            "integrity": "sha512-ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==",
-            "dev": true,
-            "requires": {
-                "mimic-response": "^1.0.0"
-            }
-        },
-        "css-select": {
-            "version": "5.1.0",
-            "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz",
-            "integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==",
-            "requires": {
-                "boolbase": "^1.0.0",
-                "css-what": "^6.1.0",
-                "domhandler": "^5.0.2",
-                "domutils": "^3.0.1",
-                "nth-check": "^2.0.1"
-            }
-        },
-        "css-what": {
-            "version": "6.1.0",
-            "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
-            "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw=="
-        },
-        "dbus-next": {
-            "version": "0.9.2",
-            "resolved": "https://registry.npmjs.org/dbus-next/-/dbus-next-0.9.2.tgz",
-            "integrity": "sha512-tzQq/+wrTZ2yU+U5PoeXc97KABhX2v55C/T0finH3tSKYuI8H/SqppIFymBBrUHcK13LvEGY3vdj3ikPPenL5g==",
-            "requires": {
-                "@nornagon/put": "0.0.8",
-                "abstract-socket": "^2.0.0",
-                "event-stream": "3.3.4",
-                "hexy": "^0.2.10",
-                "jsbi": "^2.0.5",
-                "long": "^4.0.0",
-                "safe-buffer": "^5.1.1",
-                "xml2js": "0.5.0"
-            }
-        },
-        "debug": {
-            "version": "4.3.4",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
-            "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
-            "dev": true,
-            "requires": {
-                "ms": "2.1.2"
-            }
-        },
-        "decompress-response": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
-            "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
-            "dev": true,
-            "requires": {
-                "mimic-response": "^3.1.0"
-            },
-            "dependencies": {
-                "mimic-response": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
-                    "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==",
-                    "dev": true
-                }
-            }
-        },
-        "deep-equal": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz",
-            "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==",
-            "requires": {
-                "is-arguments": "^1.0.4",
-                "is-date-object": "^1.0.1",
-                "is-regex": "^1.0.4",
-                "object-is": "^1.0.1",
-                "object-keys": "^1.1.1",
-                "regexp.prototype.flags": "^1.2.0"
-            }
-        },
-        "defer-to-connect": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",
-            "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==",
-            "dev": true
-        },
-        "define-properties": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz",
-            "integrity": "sha512-uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA==",
-            "requires": {
-                "has-property-descriptors": "^1.0.0",
-                "object-keys": "^1.1.1"
-            }
-        },
-        "detect-node": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
-            "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==",
-            "dev": true,
-            "optional": true
-        },
-        "dom-serializer": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
-            "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
-            "requires": {
-                "domelementtype": "^2.3.0",
-                "domhandler": "^5.0.2",
-                "entities": "^4.2.0"
-            }
-        },
-        "domelementtype": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-            "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw=="
-        },
-        "domhandler": {
-            "version": "5.0.3",
-            "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
-            "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
-            "requires": {
-                "domelementtype": "^2.3.0"
-            }
-        },
-        "domutils": {
-            "version": "3.1.0",
-            "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz",
-            "integrity": "sha512-H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==",
-            "requires": {
-                "dom-serializer": "^2.0.0",
-                "domelementtype": "^2.3.0",
-                "domhandler": "^5.0.3"
-            }
-        },
-        "duplexer": {
-            "version": "0.1.2",
-            "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
-            "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg=="
-        },
-        "electron": {
-            "version": "36.1.0",
-            "resolved": "https://registry.npmjs.org/electron/-/electron-36.1.0.tgz",
-            "integrity": "sha512-gnp3BnbKdGsVc7cm1qlEaZc8pJsR08mIs8H/yTo8gHEtFkGGJbDTVZOYNAfbQlL0aXh+ozv+CnyiNeDNkT1Upg==",
-            "dev": true,
-            "requires": {
-                "@electron/get": "^2.0.0",
-                "@types/node": "^22.7.7",
-                "extract-zip": "^2.0.1"
-            }
-        },
-        "end-of-stream": {
-            "version": "1.4.4",
-            "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-            "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-            "dev": true,
-            "requires": {
-                "once": "^1.4.0"
-            }
-        },
-        "entities": {
-            "version": "4.5.0",
-            "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
-            "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw=="
-        },
-        "env-paths": {
-            "version": "2.2.1",
-            "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz",
-            "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==",
-            "dev": true
-        },
-        "es6-error": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
-            "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==",
-            "dev": true,
-            "optional": true
-        },
-        "escape-string-regexp": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-            "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-            "dev": true,
-            "optional": true
-        },
-        "event-stream": {
-            "version": "3.3.4",
-            "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
-            "integrity": "sha512-QHpkERcGsR0T7Qm3HNJSyXKEEj8AHNxkY3PK8TS2KJvQ7NiSHe3DDpwVKKtoYprL/AreyzFBeIkBIWChAqn60g==",
-            "requires": {
-                "duplexer": "~0.1.1",
-                "from": "~0",
-                "map-stream": "~0.1.0",
-                "pause-stream": "0.0.11",
-                "split": "0.3",
-                "stream-combiner": "~0.0.4",
-                "through": "~2.3.1"
-            }
-        },
-        "extract-zip": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
-            "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
-            "dev": true,
-            "requires": {
-                "@types/yauzl": "^2.9.1",
-                "debug": "^4.1.1",
-                "get-stream": "^5.1.0",
-                "yauzl": "^2.10.0"
-            }
-        },
-        "fd-slicer": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
-            "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
-            "dev": true,
-            "requires": {
-                "pend": "~1.2.0"
-            }
-        },
-        "file-uri-to-path": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
-            "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
-            "optional": true
-        },
-        "from": {
-            "version": "0.1.7",
-            "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz",
-            "integrity": "sha512-twe20eF1OxVxp/ML/kq2p1uc6KvFK/+vs8WjEbeKmV2He22MKm7YF2ANIt+EOqhJ5L3K/SuuPhk0hWQDjOM23g=="
-        },
-        "fs-extra": {
-            "version": "8.1.0",
-            "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
-            "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
-            "dev": true,
-            "requires": {
-                "graceful-fs": "^4.2.0",
-                "jsonfile": "^4.0.0",
-                "universalify": "^0.1.0"
-            }
-        },
-        "function-bind": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-            "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
-        },
-        "functions-have-names": {
-            "version": "1.2.3",
-            "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
-            "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ=="
-        },
-        "get-intrinsic": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz",
-            "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==",
-            "requires": {
-                "function-bind": "^1.1.1",
-                "has": "^1.0.3",
-                "has-symbols": "^1.0.3"
-            }
-        },
-        "get-stream": {
-            "version": "5.2.0",
-            "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
-            "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
-            "dev": true,
-            "requires": {
-                "pump": "^3.0.0"
-            }
-        },
-        "global-agent": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-3.0.0.tgz",
-            "integrity": "sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q==",
-            "dev": true,
-            "optional": true,
-            "requires": {
-                "boolean": "^3.0.1",
-                "es6-error": "^4.1.1",
-                "matcher": "^3.0.0",
-                "roarr": "^2.15.3",
-                "semver": "^7.3.2",
-                "serialize-error": "^7.0.1"
-            },
-            "dependencies": {
-                "semver": {
-                    "version": "7.6.0",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.0.tgz",
-                    "integrity": "sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg==",
-                    "dev": true,
-                    "optional": true,
-                    "requires": {
-                        "lru-cache": "^6.0.0"
-                    }
-                }
-            }
-        },
-        "globalthis": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.3.tgz",
-            "integrity": "sha512-sFdI5LyBiNTHjRd7cGPWapiHWMOXKyuBNX/cWJ3NfzrZQVa8GI/8cofCl74AOVqq9W5kNmguTIzJ/1s2gyI9wA==",
-            "dev": true,
-            "optional": true,
-            "requires": {
-                "define-properties": "^1.1.3"
-            }
-        },
-        "got": {
-            "version": "11.8.6",
-            "resolved": "https://registry.npmjs.org/got/-/got-11.8.6.tgz",
-            "integrity": "sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==",
-            "dev": true,
-            "requires": {
-                "@sindresorhus/is": "^4.0.0",
-                "@szmarczak/http-timer": "^4.0.5",
-                "@types/cacheable-request": "^6.0.1",
-                "@types/responselike": "^1.0.0",
-                "cacheable-lookup": "^5.0.3",
-                "cacheable-request": "^7.0.2",
-                "decompress-response": "^6.0.0",
-                "http2-wrapper": "^1.0.0-beta.5.2",
-                "lowercase-keys": "^2.0.0",
-                "p-cancelable": "^2.0.0",
-                "responselike": "^2.0.0"
-            }
-        },
-        "graceful-fs": {
-            "version": "4.2.10",
-            "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
-            "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
-            "dev": true
-        },
-        "has": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-            "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-            "requires": {
-                "function-bind": "^1.1.1"
-            }
-        },
-        "has-property-descriptors": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz",
-            "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==",
-            "requires": {
-                "get-intrinsic": "^1.1.1"
-            }
-        },
-        "has-symbols": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
-            "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="
-        },
-        "has-tostringtag": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz",
-            "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==",
-            "requires": {
-                "has-symbols": "^1.0.2"
-            }
-        },
-        "hexy": {
-            "version": "0.2.11",
-            "resolved": "https://registry.npmjs.org/hexy/-/hexy-0.2.11.tgz",
-            "integrity": "sha512-ciq6hFsSG/Bpt2DmrZJtv+56zpPdnq+NQ4ijEFrveKN0ZG1mhl/LdT1NQZ9se6ty1fACcI4d4vYqC9v8EYpH2A=="
-        },
-        "htmlparser2": {
-            "version": "8.0.2",
-            "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-8.0.2.tgz",
-            "integrity": "sha512-GYdjWKDkbRLkZ5geuHs5NY1puJ+PXwP7+fHPRz06Eirsb9ugf6d8kkXav6ADhcODhFFPMIXyxkxSuMf3D6NCFA==",
-            "requires": {
-                "domelementtype": "^2.3.0",
-                "domhandler": "^5.0.3",
-                "domutils": "^3.0.1",
-                "entities": "^4.4.0"
-            }
-        },
-        "http-cache-semantics": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz",
-            "integrity": "sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ==",
-            "dev": true
-        },
-        "http2-wrapper": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz",
-            "integrity": "sha512-V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==",
-            "dev": true,
-            "requires": {
-                "quick-lru": "^5.1.1",
-                "resolve-alpn": "^1.0.0"
-            }
-        },
-        "is-arguments": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
-            "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
-            "requires": {
-                "call-bind": "^1.0.2",
-                "has-tostringtag": "^1.0.0"
-            }
-        },
-        "is-date-object": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz",
-            "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==",
-            "requires": {
-                "has-tostringtag": "^1.0.0"
-            }
-        },
-        "is-regex": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz",
-            "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==",
-            "requires": {
-                "call-bind": "^1.0.2",
-                "has-tostringtag": "^1.0.0"
-            }
-        },
-        "jsbi": {
-            "version": "2.0.5",
-            "resolved": "https://registry.npmjs.org/jsbi/-/jsbi-2.0.5.tgz",
-            "integrity": "sha512-TzO/62Hxeb26QMb4IGlI/5X+QLr9Uqp1FPkwp2+KOICW+Q+vSuFj61c8pkT6wAns4WcK56X7CmSHhJeDGWOqxQ=="
-        },
-        "json-buffer": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
-            "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
-            "dev": true
-        },
-        "json-stringify-safe": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
-            "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==",
-            "dev": true,
-            "optional": true
-        },
-        "jsonfile": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-            "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
-            "dev": true,
-            "requires": {
-                "graceful-fs": "^4.1.6"
-            }
-        },
-        "keyv": {
-            "version": "4.5.2",
-            "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.2.tgz",
-            "integrity": "sha512-5MHbFaKn8cNSmVW7BYnijeAVlE4cYA/SVkifVgrh7yotnfhKmjuXpDKjrABLnT0SfHWV21P8ow07OGfRrNDg8g==",
-            "dev": true,
-            "requires": {
-                "json-buffer": "3.0.1"
-            }
-        },
-        "long": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz",
-            "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA=="
-        },
-        "lowercase-keys": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
-            "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
-            "dev": true
-        },
-        "lru-cache": {
-            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-            "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-            "dev": true,
-            "optional": true,
-            "requires": {
-                "yallist": "^4.0.0"
-            }
-        },
-        "map-stream": {
-            "version": "0.1.0",
-            "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
-            "integrity": "sha512-CkYQrPYZfWnu/DAmVCpTSX/xHpKZ80eKh2lAkyA6AJTef6bW+6JpbQZN5rofum7da+SyN1bi5ctTm+lTfcCW3g=="
-        },
-        "matcher": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/matcher/-/matcher-3.0.0.tgz",
-            "integrity": "sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng==",
-            "dev": true,
-            "optional": true,
-            "requires": {
-                "escape-string-regexp": "^4.0.0"
-            }
-        },
-        "mimic-response": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
-            "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
-            "dev": true
-        },
-        "mpris-service": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/mpris-service/-/mpris-service-2.1.2.tgz",
-            "integrity": "sha512-AC6WepCnFWwOME9OWplHZ8ps/BB+g9QrEpUKCv7wX82fDPzR3nPrypOFmL/Fm0JloEAu6QTWSfDLLc6mM/jinw==",
-            "requires": {
-                "dbus-next": "^0.9.2",
-                "deep-equal": "^1.0.1",
-                "source-map-support": "^0.5.11"
-            }
-        },
-        "ms": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
-            "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
-            "dev": true
-        },
-        "nan": {
-            "version": "2.17.0",
-            "resolved": "https://registry.npmjs.org/nan/-/nan-2.17.0.tgz",
-            "integrity": "sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==",
-            "optional": true
-        },
-        "normalize-url": {
-            "version": "6.1.0",
-            "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
-            "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
-            "dev": true
-        },
-        "nth-check": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
-            "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
-            "requires": {
-                "boolbase": "^1.0.0"
-            }
-        },
-        "object-is": {
-            "version": "1.1.5",
-            "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
-            "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
-            "requires": {
-                "call-bind": "^1.0.2",
-                "define-properties": "^1.1.3"
-            }
-        },
-        "object-keys": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-            "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
-        },
-        "once": {
-            "version": "1.4.0",
-            "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-            "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-            "dev": true,
-            "requires": {
-                "wrappy": "1"
-            }
-        },
-        "p-cancelable": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz",
-            "integrity": "sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==",
-            "dev": true
-        },
-        "parse5": {
-            "version": "7.1.2",
-            "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.1.2.tgz",
-            "integrity": "sha512-Czj1WaSVpaoj0wbhMzLmWD69anp2WH7FXMB9n1Sy8/ZFF9jolSQVMu1Ij5WIyGmcBmhk7EOndpO4mIpihVqAXw==",
-            "requires": {
-                "entities": "^4.4.0"
-            }
-        },
-        "parse5-htmlparser2-tree-adapter": {
-            "version": "7.0.0",
-            "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-7.0.0.tgz",
-            "integrity": "sha512-B77tOZrqqfUfnVcOrUvfdLbz4pu4RopLD/4vmu3HUPswwTA8OH0EMW9BlWR2B0RCoiZRAHEUu7IxeP1Pd1UU+g==",
-            "requires": {
-                "domhandler": "^5.0.2",
-                "parse5": "^7.0.0"
-            }
-        },
-        "pause-stream": {
-            "version": "0.0.11",
-            "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
-            "integrity": "sha512-e3FBlXLmN/D1S+zHzanP4E/4Z60oFAa3O051qt1pxa7DEJWKAyil6upYVXCWadEnuoqa4Pkc9oUx9zsxYeRv8A==",
-            "requires": {
-                "through": "~2.3"
-            }
-        },
-        "pend": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
-            "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
-            "dev": true
-        },
-        "progress": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
-            "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
-            "dev": true
-        },
-        "pump": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
-            "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-            "dev": true,
-            "requires": {
-                "end-of-stream": "^1.1.0",
-                "once": "^1.3.1"
-            }
-        },
-        "quick-lru": {
-            "version": "5.1.1",
-            "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
-            "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA==",
-            "dev": true
-        },
-        "regexp.prototype.flags": {
-            "version": "1.4.3",
-            "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.4.3.tgz",
-            "integrity": "sha512-fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA==",
-            "requires": {
-                "call-bind": "^1.0.2",
-                "define-properties": "^1.1.3",
-                "functions-have-names": "^1.2.2"
-            }
-        },
-        "resolve-alpn": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.2.1.tgz",
-            "integrity": "sha512-0a1F4l73/ZFZOakJnQ3FvkJ2+gSTQWz/r2KE5OdDY0TxPm5h4GkqkWWfM47T7HsbnOtcJVEF4epCVy6u7Q3K+g==",
-            "dev": true
-        },
-        "responselike": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz",
-            "integrity": "sha512-4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==",
-            "dev": true,
-            "requires": {
-                "lowercase-keys": "^2.0.0"
-            }
-        },
-        "roarr": {
-            "version": "2.15.4",
-            "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.15.4.tgz",
-            "integrity": "sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A==",
-            "dev": true,
-            "optional": true,
-            "requires": {
-                "boolean": "^3.0.1",
-                "detect-node": "^2.0.4",
-                "globalthis": "^1.0.1",
-                "json-stringify-safe": "^5.0.1",
-                "semver-compare": "^1.0.0",
-                "sprintf-js": "^1.1.2"
-            }
-        },
-        "safe-buffer": {
-            "version": "5.2.1",
-            "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-            "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
-        },
-        "sax": {
-            "version": "1.2.4",
-            "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-            "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw=="
-        },
-        "semver": {
-            "version": "6.3.1",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-            "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-            "dev": true
-        },
-        "semver-compare": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz",
-            "integrity": "sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==",
-            "dev": true,
-            "optional": true
-        },
-        "serialize-error": {
-            "version": "7.0.1",
-            "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-7.0.1.tgz",
-            "integrity": "sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==",
-            "dev": true,
-            "optional": true,
-            "requires": {
-                "type-fest": "^0.13.1"
-            }
-        },
-        "source-map": {
-            "version": "0.6.1",
-            "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-            "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
-        },
-        "source-map-support": {
-            "version": "0.5.21",
-            "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
-            "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
-            "requires": {
-                "buffer-from": "^1.0.0",
-                "source-map": "^0.6.0"
-            }
-        },
-        "split": {
-            "version": "0.3.3",
-            "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
-            "integrity": "sha512-wD2AeVmxXRBoX44wAycgjVpMhvbwdI2aZjCkvfNcH1YqHQvJVa1duWc73OyVGJUc05fhFaTZeQ/PYsrmyH0JVA==",
-            "requires": {
-                "through": "2"
-            }
-        },
-        "sprintf-js": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz",
-            "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==",
-            "dev": true,
-            "optional": true
-        },
-        "stream-combiner": {
-            "version": "0.0.4",
-            "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
-            "integrity": "sha512-rT00SPnTVyRsaSz5zgSPma/aHSOic5U1prhYdRy5HS2kTZviFpmDgzilbtsJsxiroqACmayynDN/9VzIbX5DOw==",
-            "requires": {
-                "duplexer": "~0.1.1"
-            }
-        },
-        "sumchecker": {
-            "version": "3.0.1",
-            "resolved": "https://registry.npmjs.org/sumchecker/-/sumchecker-3.0.1.tgz",
-            "integrity": "sha512-MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==",
-            "dev": true,
-            "requires": {
-                "debug": "^4.1.0"
-            }
-        },
-        "through": {
-            "version": "2.3.8",
-            "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-            "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg=="
-        },
-        "type-fest": {
-            "version": "0.13.1",
-            "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz",
-            "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==",
-            "dev": true,
-            "optional": true
-        },
-        "undici-types": {
-            "version": "6.21.0",
-            "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
-            "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
-            "dev": true
-        },
-        "universalify": {
-            "version": "0.1.2",
-            "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-            "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
-            "dev": true
-        },
-        "wrappy": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-            "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
-            "dev": true
-        },
-        "ws": {
-            "version": "8.18.0",
-            "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
-            "integrity": "sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw=="
-        },
-        "xml2js": {
-            "version": "0.5.0",
-            "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.5.0.tgz",
-            "integrity": "sha512-drPFnkQJik/O+uPKpqSgr22mpuFHqKdbS835iAQrUC73L2F5WkboIRd63ai/2Yg6I1jzifPFKH2NTK+cfglkIA==",
-            "requires": {
-                "sax": ">=0.6.0",
-                "xmlbuilder": "~11.0.0"
-            }
-        },
-        "xmlbuilder": {
-            "version": "11.0.1",
-            "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
-            "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA=="
-        },
-        "yallist": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-            "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
-            "dev": true,
-            "optional": true
-        },
-        "yauzl": {
-            "version": "2.10.0",
-            "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
-            "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
-            "dev": true,
-            "requires": {
-                "buffer-crc32": "~0.2.3",
-                "fd-slicer": "~1.1.0"
-            }
-        }
-    }
-}
diff --git a/release/app/package.json b/release/app/package.json
deleted file mode 100644
index 5891dfa0..00000000
--- a/release/app/package.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "name": "feishin",
-    "version": "0.13.0",
-    "description": "",
-    "main": "./dist/main/main.js",
-    "author": {
-        "name": "jeffvli",
-        "url": "https://github.com/jeffvli/"
-    },
-    "scripts": {
-        "electron-rebuild": "node -r ts-node/register ../../.erb/scripts/electron-rebuild.js",
-        "link-modules": "node -r ts-node/register ../../.erb/scripts/link-modules.ts",
-        "postinstall": "npm run electron-rebuild && npm run link-modules"
-    },
-    "dependencies": {
-        "cheerio": "^1.0.0-rc.12",
-        "mpris-service": "^2.1.2",
-        "ws": "^8.18.0"
-    },
-    "devDependencies": {
-        "electron": "36.1.0"
-    },
-    "resolutions": {
-        "xml2js": "0.5.0"
-    },
-    "overrides": {
-        "xml2js": "0.5.0"
-    },
-    "license": "GPL-3.0"
-}
diff --git a/resources/icon.png b/resources/icon.png
new file mode 100644
index 00000000..f364f2c1
Binary files /dev/null and b/resources/icon.png differ
diff --git a/src/__tests__/App.test.tsx b/src/__tests__/App.test.tsx
deleted file mode 100644
index b2f4b7d1..00000000
--- a/src/__tests__/App.test.tsx
+++ /dev/null
@@ -1,9 +0,0 @@
-import '@testing-library/jest-dom';
-import { render } from '@testing-library/react';
-import { App } from '../renderer/app';
-
-describe('App', () => {
-    it('should render', () => {
-        expect(render(<App />)).toBeTruthy();
-    });
-});
diff --git a/src/i18n/i18n.ts b/src/i18n/i18n.ts
index 90fd3013..0656d426 100644
--- a/src/i18n/i18n.ts
+++ b/src/i18n/i18n.ts
@@ -1,52 +1,53 @@
-import { PostProcessorModule, TOptions, StringMap } from 'i18next';
+import { PostProcessorModule, StringMap, TOptions } from 'i18next';
 import i18n from 'i18next';
 import { initReactI18next } from 'react-i18next';
+
+import cs from './locales/cs.json';
+import de from './locales/de.json';
 import en from './locales/en.json';
 import es from './locales/es.json';
+import fa from './locales/fa.json';
+import fi from './locales/fi.json';
 import fr from './locales/fr.json';
-import ja from './locales/ja.json';
-import pl from './locales/pl.json';
-import zhHans from './locales/zh-Hans.json';
-import de from './locales/de.json';
+import hu from './locales/hu.json';
+import id from './locales/id.json';
 import it from './locales/it.json';
-import ru from './locales/ru.json';
-import ptBr from './locales/pt-BR.json';
-import sr from './locales/sr.json';
-import sv from './locales/sv.json';
-import cs from './locales/cs.json';
+import ja from './locales/ja.json';
+import ko from './locales/ko.json';
 import nbNO from './locales/nb-NO.json';
 import nl from './locales/nl.json';
-import zhHant from './locales/zh-Hant.json';
-import fa from './locales/fa.json';
-import ko from './locales/ko.json';
+import pl from './locales/pl.json';
+import ptBr from './locales/pt-BR.json';
+import ru from './locales/ru.json';
+import sr from './locales/sr.json';
+import sv from './locales/sv.json';
 import ta from './locales/ta.json';
-import id from './locales/id.json';
-import fi from './locales/fi.json';
-import hu from './locales/hu.json';
+import zhHans from './locales/zh-Hans.json';
+import zhHant from './locales/zh-Hant.json';
 
 const resources = {
+    cs: { translation: cs },
+    de: { translation: de },
     en: { translation: en },
     es: { translation: es },
-    de: { translation: de },
-    it: { translation: it },
-    ru: { translation: ru },
-    'pt-BR': { translation: ptBr },
     fa: { translation: fa },
+    fi: { translation: fi },
     fr: { translation: fr },
+    hu: { translation: hu },
+    id: { translation: id },
+    it: { translation: it },
     ja: { translation: ja },
     ko: { translation: ko },
+    'nb-NO': { translation: nbNO },
+    nl: { translation: nl },
     pl: { translation: pl },
-    'zh-Hans': { translation: zhHans },
-    'zh-Hant': { translation: zhHant },
+    'pt-BR': { translation: ptBr },
+    ru: { translation: ru },
     sr: { translation: sr },
     sv: { translation: sv },
-    cs: { translation: cs },
-    nl: { translation: nl },
-    'nb-NO': { translation: nbNO },
     ta: { translation: ta },
-    id: { translation: id },
-    fi: { translation: fi },
-    hu: { translation: hu },
+    'zh-Hans': { translation: zhHans },
+    'zh-Hant': { translation: zhHant },
 };
 
 export const languages = [
@@ -141,35 +142,34 @@ export const languages = [
 ];
 
 const lowerCasePostProcessor: PostProcessorModule = {
-    type: 'postProcessor',
     name: 'lowerCase',
     process: (value: string) => {
         return value.toLocaleLowerCase();
     },
+    type: 'postProcessor',
 };
 
 const upperCasePostProcessor: PostProcessorModule = {
-    type: 'postProcessor',
     name: 'upperCase',
     process: (value: string) => {
         return value.toLocaleUpperCase();
     },
+    type: 'postProcessor',
 };
 
 const titleCasePostProcessor: PostProcessorModule = {
-    type: 'postProcessor',
     name: 'titleCase',
     process: (value: string) => {
         return value.replace(/\S\S*/g, (txt) => {
             return txt.charAt(0).toLocaleUpperCase() + txt.slice(1).toLowerCase();
         });
     },
+    type: 'postProcessor',
 };
 
 const ignoreSentenceCaseLanguages = ['de'];
 
 const sentenceCasePostProcessor: PostProcessorModule = {
-    type: 'postProcessor',
     name: 'sentenceCase',
     process: (value: string, _key: string, _options: TOptions<StringMap>, translator: any) => {
         const sentences = value.split('. ');
@@ -185,6 +185,7 @@ const sentenceCasePostProcessor: PostProcessorModule = {
             })
             .join('. ');
     },
+    type: 'postProcessor',
 };
 i18n.use(lowerCasePostProcessor)
     .use(upperCasePostProcessor)
diff --git a/src/main/features/core/lyrics/genius.ts b/src/main/features/core/lyrics/genius.ts
index f79489f5..e6be1964 100644
--- a/src/main/features/core/lyrics/genius.ts
+++ b/src/main/features/core/lyrics/genius.ts
@@ -1,12 +1,13 @@
 import axios, { AxiosResponse } from 'axios';
 import { load } from 'cheerio';
-import { orderSearchResults } from './shared';
+
 import {
-    LyricSource,
     InternetProviderLyricResponse,
     InternetProviderLyricSearchResponse,
     LyricSearchQuery,
-} from '../../../../renderer/api/types';
+    LyricSource,
+} from '.';
+import { orderSearchResults } from './shared';
 
 const SEARCH_URL = 'https://genius.com/api/search/song';
 
@@ -17,20 +18,6 @@ export interface GeniusResponse {
     response: Response;
 }
 
-export interface Meta {
-    status: number;
-}
-
-export interface Response {
-    next_page: number;
-    sections: Section[];
-}
-
-export interface Section {
-    hits: Hit[];
-    type: string;
-}
-
 export interface Hit {
     highlights: any[];
     index: string;
@@ -38,6 +25,35 @@ export interface Hit {
     type: string;
 }
 
+export interface Meta {
+    status: number;
+}
+
+export interface PrimaryArtist {
+    _type: string;
+    api_path: string;
+    header_image_url: string;
+    id: number;
+    image_url: string;
+    index_character: string;
+    is_meme_verified: boolean;
+    is_verified: boolean;
+    name: string;
+    slug: string;
+    url: string;
+}
+
+export interface ReleaseDateComponents {
+    day: number;
+    month: number;
+    year: number;
+}
+
+export interface Response {
+    next_page: number;
+    sections: Section[];
+}
+
 export interface Result {
     _type: string;
     annotation_count: number;
@@ -69,24 +85,9 @@ export interface Result {
     url: string;
 }
 
-export interface PrimaryArtist {
-    _type: string;
-    api_path: string;
-    header_image_url: string;
-    id: number;
-    image_url: string;
-    index_character: string;
-    is_meme_verified: boolean;
-    is_verified: boolean;
-    name: string;
-    slug: string;
-    url: string;
-}
-
-export interface ReleaseDateComponents {
-    day: number;
-    month: number;
-    year: number;
+export interface Section {
+    hits: Hit[];
+    type: string;
 }
 
 export interface Stats {
@@ -94,6 +95,27 @@ export interface Stats {
     unreviewed_annotations: number;
 }
 
+export async function getLyricsBySongId(url: string): Promise<null | string> {
+    let result: AxiosResponse<string, any>;
+    try {
+        result = await axios.get<string>(url, { responseType: 'text' });
+    } catch (e) {
+        console.error('Genius lyrics request got an error!', e);
+        return null;
+    }
+
+    const $ = load(result.data.split('<br/>').join('\n'));
+    const lyricsDiv = $('div.lyrics');
+
+    if (lyricsDiv.length > 0) return lyricsDiv.text().trim();
+
+    const lyricSections = $('div[class^=Lyrics__Container]')
+        .map((_, e) => $(e).text())
+        .toArray()
+        .join('\n');
+    return lyricSections;
+}
+
 export async function getSearchResults(
     params: LyricSearchQuery,
 ): Promise<InternetProviderLyricSearchResponse[] | null> {
@@ -133,9 +155,33 @@ export async function getSearchResults(
     return orderSearchResults({ params, results: songResults });
 }
 
+export async function query(
+    params: LyricSearchQuery,
+): Promise<InternetProviderLyricResponse | null> {
+    const response = await getSongId(params);
+    if (!response) {
+        console.error('Could not find the song on Genius!');
+        return null;
+    }
+
+    const lyrics = await getLyricsBySongId(response.id);
+    if (!lyrics) {
+        console.error('Could not get lyrics on Genius!');
+        return null;
+    }
+
+    return {
+        artist: response.artist,
+        id: response.id,
+        lyrics,
+        name: response.name,
+        source: LyricSource.GENIUS,
+    };
+}
+
 async function getSongId(
     params: LyricSearchQuery,
-): Promise<Omit<InternetProviderLyricResponse, 'lyrics'> | null> {
+): Promise<null | Omit<InternetProviderLyricResponse, 'lyrics'>> {
     let result: AxiosResponse<GeniusResponse>;
     try {
         result = await axios.get(SEARCH_URL, {
@@ -162,48 +208,3 @@ async function getSongId(
         source: LyricSource.GENIUS,
     };
 }
-
-export async function getLyricsBySongId(url: string): Promise<string | null> {
-    let result: AxiosResponse<string, any>;
-    try {
-        result = await axios.get<string>(url, { responseType: 'text' });
-    } catch (e) {
-        console.error('Genius lyrics request got an error!', e);
-        return null;
-    }
-
-    const $ = load(result.data.split('<br/>').join('\n'));
-    const lyricsDiv = $('div.lyrics');
-
-    if (lyricsDiv.length > 0) return lyricsDiv.text().trim();
-
-    const lyricSections = $('div[class^=Lyrics__Container]')
-        .map((_, e) => $(e).text())
-        .toArray()
-        .join('\n');
-    return lyricSections;
-}
-
-export async function query(
-    params: LyricSearchQuery,
-): Promise<InternetProviderLyricResponse | null> {
-    const response = await getSongId(params);
-    if (!response) {
-        console.error('Could not find the song on Genius!');
-        return null;
-    }
-
-    const lyrics = await getLyricsBySongId(response.id);
-    if (!lyrics) {
-        console.error('Could not get lyrics on Genius!');
-        return null;
-    }
-
-    return {
-        artist: response.artist,
-        id: response.id,
-        lyrics,
-        name: response.name,
-        source: LyricSource.GENIUS,
-    };
-}
diff --git a/src/main/features/core/lyrics/index.ts b/src/main/features/core/lyrics/index.ts
index c3fc781e..a4b72c6d 100644
--- a/src/main/features/core/lyrics/index.ts
+++ b/src/main/features/core/lyrics/index.ts
@@ -1,36 +1,76 @@
 import { ipcMain } from 'electron';
+
+import { store } from '../settings/index';
 import {
+    getLyricsBySongId as getGenius,
     query as queryGenius,
     getSearchResults as searchGenius,
-    getLyricsBySongId as getGenius,
 } from './genius';
 import {
+    getLyricsBySongId as getLrcLib,
     query as queryLrclib,
     getSearchResults as searchLrcLib,
-    getLyricsBySongId as getLrcLib,
 } from './lrclib';
 import {
+    getLyricsBySongId as getNetease,
     query as queryNetease,
     getSearchResults as searchNetease,
-    getLyricsBySongId as getNetease,
 } from './netease';
-import {
-    InternetProviderLyricResponse,
-    InternetProviderLyricSearchResponse,
-    LyricSearchQuery,
-    QueueSong,
-    LyricGetQuery,
-    LyricSource,
-} from '../../../../renderer/api/types';
-import { store } from '../settings/index';
 
-type SongFetcher = (params: LyricSearchQuery) => Promise<InternetProviderLyricResponse | null>;
+export enum LyricSource {
+    GENIUS = 'Genius',
+    LRCLIB = 'lrclib.net',
+    NETEASE = 'NetEase',
+}
+
+export type FullLyricsMetadata = Omit<InternetProviderLyricResponse, 'id' | 'lyrics' | 'source'> & {
+    lyrics: LyricsResponse;
+    remote: boolean;
+    source: string;
+};
+
+export type InternetProviderLyricResponse = {
+    artist: string;
+    id: string;
+    lyrics: string;
+    name: string;
+    source: LyricSource;
+};
+
+export type InternetProviderLyricSearchResponse = {
+    artist: string;
+    id: string;
+    name: string;
+    score?: number;
+    source: LyricSource;
+};
+
+export type LyricGetQuery = {
+    remoteSongId: string;
+    remoteSource: LyricSource;
+    song: Song;
+};
+
+export type LyricOverride = Omit<InternetProviderLyricResponse, 'lyrics'>;
+
+export type LyricSearchQuery = {
+    album?: string;
+    artist?: string;
+    duration?: number;
+    name?: string;
+};
+
+export type LyricsResponse = string | SynchronizedLyricsArray;
+
+export type SynchronizedLyricsArray = Array<[number, string]>;
+
+type CachedLyrics = Record<LyricSource, InternetProviderLyricResponse>;
+type GetFetcher = (id: string) => Promise<null | string>;
 type SearchFetcher = (
     params: LyricSearchQuery,
 ) => Promise<InternetProviderLyricSearchResponse[] | null>;
-type GetFetcher = (id: string) => Promise<string | null>;
 
-type CachedLyrics = Record<LyricSource, InternetProviderLyricResponse>;
+type SongFetcher = (params: LyricSearchQuery) => Promise<InternetProviderLyricResponse | null>;
 
 const FETCHERS: Record<LyricSource, SongFetcher> = {
     [LyricSource.GENIUS]: queryGenius,
@@ -54,7 +94,7 @@ const MAX_CACHED_ITEMS = 10;
 
 const lyricCache = new Map<string, CachedLyrics>();
 
-const getRemoteLyrics = async (song: QueueSong) => {
+const getRemoteLyrics = async (song: any) => {
     const sources = store.get('lyrics', []) as LyricSource[];
 
     const cached = lyricCache.get(song.id);
@@ -122,7 +162,7 @@ const searchRemoteLyrics = async (params: LyricSearchQuery) => {
     return results;
 };
 
-const getRemoteLyricsById = async (params: LyricGetQuery): Promise<string | null> => {
+const getRemoteLyricsById = async (params: LyricGetQuery): Promise<null | string> => {
     const { remoteSongId, remoteSource } = params;
     const response = await GET_FETCHERS[remoteSource](remoteSongId);
 
@@ -133,7 +173,7 @@ const getRemoteLyricsById = async (params: LyricGetQuery): Promise<string | null
     return response;
 };
 
-ipcMain.handle('lyric-by-song', async (_event, song: QueueSong) => {
+ipcMain.handle('lyric-by-song', async (_event, song: any) => {
     const lyric = await getRemoteLyrics(song);
     return lyric;
 });
diff --git a/src/main/features/core/lyrics/lrclib.ts b/src/main/features/core/lyrics/lrclib.ts
index 3074b73d..d2ac0512 100644
--- a/src/main/features/core/lyrics/lrclib.ts
+++ b/src/main/features/core/lyrics/lrclib.ts
@@ -1,12 +1,13 @@
 // Credits to https://github.com/tranxuanthang/lrcget for API implementation
 import axios, { AxiosResponse } from 'axios';
-import { orderSearchResults } from './shared';
+
 import {
     InternetProviderLyricResponse,
     InternetProviderLyricSearchResponse,
     LyricSearchQuery,
     LyricSource,
-} from '../../../../renderer/api/types';
+} from '.';
+import { orderSearchResults } from './shared';
 
 const FETCH_URL = 'https://lrclib.net/api/get';
 const SEEARCH_URL = 'https://lrclib.net/api/search';
@@ -29,10 +30,23 @@ export interface LrcLibTrackResponse {
     isrc: string;
     lang: string;
     name: string;
-    plainLyrics: string | null;
+    plainLyrics: null | string;
     releaseDate: string;
     spotifyId: string;
-    syncedLyrics: string | null;
+    syncedLyrics: null | string;
+}
+
+export async function getLyricsBySongId(songId: string): Promise<null | string> {
+    let result: AxiosResponse<LrcLibTrackResponse, any>;
+
+    try {
+        result = await axios.get<LrcLibTrackResponse>(`${FETCH_URL}/${songId}`);
+    } catch (e) {
+        console.error('LrcLib lyrics request got an error!', e);
+        return null;
+    }
+
+    return result.data.syncedLyrics || result.data.plainLyrics || null;
 }
 
 export async function getSearchResults(
@@ -69,19 +83,6 @@ export async function getSearchResults(
     return orderSearchResults({ params, results: songResults });
 }
 
-export async function getLyricsBySongId(songId: string): Promise<string | null> {
-    let result: AxiosResponse<LrcLibTrackResponse, any>;
-
-    try {
-        result = await axios.get<LrcLibTrackResponse>(`${FETCH_URL}/${songId}`);
-    } catch (e) {
-        console.error('LrcLib lyrics request got an error!', e);
-        return null;
-    }
-
-    return result.data.syncedLyrics || result.data.plainLyrics || null;
-}
-
 export async function query(
     params: LyricSearchQuery,
 ): Promise<InternetProviderLyricResponse | null> {
diff --git a/src/main/features/core/lyrics/netease.ts b/src/main/features/core/lyrics/netease.ts
index b97ca3f8..d59f9faf 100644
--- a/src/main/features/core/lyrics/netease.ts
+++ b/src/main/features/core/lyrics/netease.ts
@@ -1,46 +1,18 @@
 import axios, { AxiosResponse } from 'axios';
-import { LyricSource } from '../../../../renderer/api/types';
-import { orderSearchResults } from './shared';
-import type {
+
+import {
     InternetProviderLyricResponse,
     InternetProviderLyricSearchResponse,
     LyricSearchQuery,
-} from '/@/renderer/api/types';
+    LyricSource,
+} from '.';
+import { orderSearchResults } from './shared';
 
 const SEARCH_URL = 'https://music.163.com/api/search/get';
 const LYRICS_URL = 'https://music.163.com/api/song/lyric';
 
 // Adapted from https://github.com/NyaomiDEV/Sunamu/blob/master/src/main/lyricproviders/netease.ts
 
-export interface NetEaseResponse {
-    code: number;
-    result: Result;
-}
-
-export interface Result {
-    hasMore: boolean;
-    songCount: number;
-    songs: Song[];
-}
-
-export interface Song {
-    album: Album;
-    alias: string[];
-    artists: Artist[];
-    copyrightId: number;
-    duration: number;
-    fee: number;
-    ftype: number;
-    id: number;
-    mark: number;
-    mvid: number;
-    name: string;
-    rUrl: null;
-    rtype: number;
-    status: number;
-    transNames?: string[];
-}
-
 export interface Album {
     artist: Artist;
     copyrightId: number;
@@ -67,6 +39,53 @@ export interface Artist {
     trans: null;
 }
 
+export interface NetEaseResponse {
+    code: number;
+    result: Result;
+}
+
+export interface Result {
+    hasMore: boolean;
+    songCount: number;
+    songs: Song[];
+}
+
+export interface Song {
+    album: Album;
+    alias: string[];
+    artists: Artist[];
+    copyrightId: number;
+    duration: number;
+    fee: number;
+    ftype: number;
+    id: number;
+    mark: number;
+    mvid: number;
+    name: string;
+    rtype: number;
+    rUrl: null;
+    status: number;
+    transNames?: string[];
+}
+
+export async function getLyricsBySongId(songId: string): Promise<null | string> {
+    let result: AxiosResponse<any, any>;
+    try {
+        result = await axios.get(LYRICS_URL, {
+            params: {
+                id: songId,
+                kv: '-1',
+                lv: '-1',
+            },
+        });
+    } catch (e) {
+        console.error('NetEase lyrics request got an error!', e);
+        return null;
+    }
+
+    return result.data.klyric?.lyric || result.data.lrc?.lyric;
+}
+
 export async function getSearchResults(
     params: LyricSearchQuery,
 ): Promise<InternetProviderLyricSearchResponse[] | null> {
@@ -110,38 +129,6 @@ export async function getSearchResults(
     return orderSearchResults({ params, results: songResults });
 }
 
-async function getMatchedLyrics(
-    params: LyricSearchQuery,
-): Promise<Omit<InternetProviderLyricResponse, 'lyrics'> | null> {
-    const results = await getSearchResults(params);
-
-    const firstMatch = results?.[0];
-
-    if (!firstMatch || (firstMatch?.score && firstMatch.score > 0.5)) {
-        return null;
-    }
-
-    return firstMatch;
-}
-
-export async function getLyricsBySongId(songId: string): Promise<string | null> {
-    let result: AxiosResponse<any, any>;
-    try {
-        result = await axios.get(LYRICS_URL, {
-            params: {
-                id: songId,
-                kv: '-1',
-                lv: '-1',
-            },
-        });
-    } catch (e) {
-        console.error('NetEase lyrics request got an error!', e);
-        return null;
-    }
-
-    return result.data.klyric?.lyric || result.data.lrc?.lyric;
-}
-
 export async function query(
     params: LyricSearchQuery,
 ): Promise<InternetProviderLyricResponse | null> {
@@ -165,3 +152,17 @@ export async function query(
         source: LyricSource.NETEASE,
     };
 }
+
+async function getMatchedLyrics(
+    params: LyricSearchQuery,
+): Promise<null | Omit<InternetProviderLyricResponse, 'lyrics'>> {
+    const results = await getSearchResults(params);
+
+    const firstMatch = results?.[0];
+
+    if (!firstMatch || (firstMatch?.score && firstMatch.score > 0.5)) {
+        return null;
+    }
+
+    return firstMatch;
+}
diff --git a/src/main/features/core/lyrics/shared.ts b/src/main/features/core/lyrics/shared.ts
index bb926f28..44dc4853 100644
--- a/src/main/features/core/lyrics/shared.ts
+++ b/src/main/features/core/lyrics/shared.ts
@@ -1,4 +1,5 @@
 import Fuse from 'fuse.js';
+
 import {
     InternetProviderLyricSearchResponse,
     LyricSearchQuery,
diff --git a/src/main/features/core/player/index.ts b/src/main/features/core/player/index.ts
index 67152b65..b0e88582 100644
--- a/src/main/features/core/player/index.ts
+++ b/src/main/features/core/player/index.ts
@@ -1,10 +1,11 @@
 import console from 'console';
-import { rm } from 'fs/promises';
-import { pid } from 'node:process';
 import { app, ipcMain } from 'electron';
+import { rm } from 'fs/promises';
 import uniq from 'lodash/uniq';
 import MpvAPI from 'node-mpv';
-import { getMainWindow, sendToastToRenderer } from '../../../main';
+import { pid } from 'node:process';
+
+import { getMainWindow, sendToastToRenderer } from '../../../index';
 import { createLog, isWindows } from '../../../utils';
 import { store } from '../settings';
 
@@ -86,7 +87,7 @@ const createMpv = async (data: {
     extraParameters?: string[];
     properties?: Record<string, any>;
 }): Promise<MpvAPI> => {
-    const { extraParameters, properties, binaryPath } = data;
+    const { binaryPath, extraParameters, properties } = data;
 
     const params = uniq([...DEFAULT_MPV_PARAMETERS(extraParameters), ...(extraParameters || [])]);
 
@@ -174,7 +175,7 @@ ipcMain.on('player-set-properties', async (_event, data: Record<string, any>) =>
         } else {
             getMpvInstance()?.setMultipleProperties(data);
         }
-    } catch (err: NodeMpvError | any) {
+    } catch (err: any | NodeMpvError) {
         mpvLog({ action: `Failed to set properties: ${JSON.stringify(data)}` }, err);
     }
 });
@@ -199,7 +200,7 @@ ipcMain.handle(
             mpvInstance = await createMpv(data);
             mpvLog({ action: 'Restarted mpv', toast: 'success' });
             setAudioPlayerFallback(false);
-        } catch (err: NodeMpvError | any) {
+        } catch (err: any | NodeMpvError) {
             mpvLog({ action: 'Failed to restart mpv, falling back to web player' }, err);
             setAudioPlayerFallback(true);
         }
@@ -215,7 +216,7 @@ ipcMain.handle(
             });
             mpvInstance = await createMpv(data);
             setAudioPlayerFallback(false);
-        } catch (err: NodeMpvError | any) {
+        } catch (err: any | NodeMpvError) {
             mpvLog({ action: 'Failed to initialize mpv, falling back to web player' }, err);
             setAudioPlayerFallback(true);
         }
@@ -226,7 +227,7 @@ ipcMain.on('player-quit', async () => {
     try {
         await getMpvInstance()?.stop();
         await quit();
-    } catch (err: NodeMpvError | any) {
+    } catch (err: any | NodeMpvError) {
         mpvLog({ action: 'Failed to quit mpv' }, err);
     } finally {
         mpvInstance = null;
@@ -245,7 +246,7 @@ ipcMain.handle('player-clean-up', async () => {
 ipcMain.on('player-start', async () => {
     try {
         await getMpvInstance()?.play();
-    } catch (err: NodeMpvError | any) {
+    } catch (err: any | NodeMpvError) {
         mpvLog({ action: 'Failed to start mpv playback' }, err);
     }
 });
@@ -254,7 +255,7 @@ ipcMain.on('player-start', async () => {
 ipcMain.on('player-play', async () => {
     try {
         await getMpvInstance()?.play();
-    } catch (err: NodeMpvError | any) {
+    } catch (err: any | NodeMpvError) {
         mpvLog({ action: 'Failed to start mpv playback' }, err);
     }
 });
@@ -263,7 +264,7 @@ ipcMain.on('player-play', async () => {
 ipcMain.on('player-pause', async () => {
     try {
         await getMpvInstance()?.pause();
-    } catch (err: NodeMpvError | any) {
+    } catch (err: any | NodeMpvError) {
         mpvLog({ action: 'Failed to pause mpv playback' }, err);
     }
 });
@@ -272,7 +273,7 @@ ipcMain.on('player-pause', async () => {
 ipcMain.on('player-stop', async () => {
     try {
         await getMpvInstance()?.stop();
-    } catch (err: NodeMpvError | any) {
+    } catch (err: any | NodeMpvError) {
         mpvLog({ action: 'Failed to stop mpv playback' }, err);
     }
 });
@@ -281,7 +282,7 @@ ipcMain.on('player-stop', async () => {
 ipcMain.on('player-next', async () => {
     try {
         await getMpvInstance()?.next();
-    } catch (err: NodeMpvError | any) {
+    } catch (err: any | NodeMpvError) {
         mpvLog({ action: 'Failed to go to next track' }, err);
     }
 });
@@ -290,7 +291,7 @@ ipcMain.on('player-next', async () => {
 ipcMain.on('player-previous', async () => {
     try {
         await getMpvInstance()?.prev();
-    } catch (err: NodeMpvError | any) {
+    } catch (err: any | NodeMpvError) {
         mpvLog({ action: 'Failed to go to previous track' }, err);
     }
 });
@@ -299,7 +300,7 @@ ipcMain.on('player-previous', async () => {
 ipcMain.on('player-seek', async (_event, time: number) => {
     try {
         await getMpvInstance()?.seek(time);
-    } catch (err: NodeMpvError | any) {
+    } catch (err: any | NodeMpvError) {
         mpvLog({ action: `Failed to seek by ${time} seconds` }, err);
     }
 });
@@ -308,7 +309,7 @@ ipcMain.on('player-seek', async (_event, time: number) => {
 ipcMain.on('player-seek-to', async (_event, time: number) => {
     try {
         await getMpvInstance()?.goToPosition(time);
-    } catch (err: NodeMpvError | any) {
+    } catch (err: any | NodeMpvError) {
         mpvLog({ action: `Failed to seek to ${time} seconds` }, err);
     }
 });
@@ -320,7 +321,7 @@ ipcMain.on('player-set-queue', async (_event, current?: string, next?: string, p
             await getMpvInstance()?.clearPlaylist();
             await getMpvInstance()?.pause();
             return;
-        } catch (err: NodeMpvError | any) {
+        } catch (err: any | NodeMpvError) {
             mpvLog({ action: `Failed to clear play queue` }, err);
         }
     }
@@ -344,7 +345,7 @@ ipcMain.on('player-set-queue', async (_event, current?: string, next?: string, p
             // Only force play if pause is explicitly false
             await getMpvInstance()?.play();
         }
-    } catch (err: NodeMpvError | any) {
+    } catch (err: any | NodeMpvError) {
         mpvLog({ action: `Failed to set play queue` }, err);
     }
 });
@@ -365,7 +366,7 @@ ipcMain.on('player-set-queue-next', async (_event, url?: string) => {
         if (url) {
             await getMpvInstance()?.load(url, 'append');
         }
-    } catch (err: NodeMpvError | any) {
+    } catch (err: any | NodeMpvError) {
         mpvLog({ action: `Failed to set play queue` }, err);
     }
 });
@@ -385,7 +386,7 @@ ipcMain.on('player-auto-next', async (_event, url?: string) => {
         if (url) {
             await getMpvInstance()?.load(url, 'append');
         }
-    } catch (err: NodeMpvError | any) {
+    } catch (err: any | NodeMpvError) {
         mpvLog({ action: `Failed to load next song` }, err);
     }
 });
@@ -398,7 +399,7 @@ ipcMain.on('player-volume', async (_event, value: number) => {
         }
 
         await getMpvInstance()?.volume(value);
-    } catch (err: NodeMpvError | any) {
+    } catch (err: any | NodeMpvError) {
         mpvLog({ action: `Failed to set volume to ${value}` }, err);
     }
 });
@@ -407,7 +408,7 @@ ipcMain.on('player-volume', async (_event, value: number) => {
 ipcMain.on('player-mute', async (_event, mute: boolean) => {
     try {
         await getMpvInstance()?.mute(mute);
-    } catch (err: NodeMpvError | any) {
+    } catch (err: any | NodeMpvError) {
         mpvLog({ action: `Failed to set mute status` }, err);
     }
 });
@@ -415,7 +416,7 @@ ipcMain.on('player-mute', async (_event, mute: boolean) => {
 ipcMain.handle('player-get-time', async (): Promise<number | undefined> => {
     try {
         return getMpvInstance()?.getTimePosition();
-    } catch (err: NodeMpvError | any) {
+    } catch (err: any | NodeMpvError) {
         mpvLog({ action: `Failed to get current time` }, err);
         return 0;
     }
@@ -442,7 +443,7 @@ app.on('before-quit', async (event) => {
                 event.preventDefault();
                 await getMpvInstance()?.stop();
                 await quit();
-            } catch (err: NodeMpvError | any) {
+            } catch (err: any | NodeMpvError) {
                 mpvLog({ action: `Failed to cleanly before-quit` }, err);
             } finally {
                 mpvState = MpvState.DONE;
diff --git a/src/main/features/core/player/media-keys.ts b/src/main/features/core/player/media-keys.ts
index b87f9ee1..e919fb29 100644
--- a/src/main/features/core/player/media-keys.ts
+++ b/src/main/features/core/player/media-keys.ts
@@ -1,5 +1,6 @@
 /* eslint-disable promise/always-return */
 import { BrowserWindow, globalShortcut, systemPreferences } from 'electron';
+
 import { isMacOS } from '../../../utils';
 import { store } from '../settings';
 
diff --git a/src/main/features/core/remote/index.ts b/src/main/features/core/remote/index.ts
index 0adcf835..9fd0a686 100644
--- a/src/main/features/core/remote/index.ts
+++ b/src/main/features/core/remote/index.ts
@@ -1,32 +1,22 @@
-import { Stats, promises } from 'fs';
-import { readFile } from 'fs/promises';
-import { IncomingMessage, Server, ServerResponse, createServer } from 'http';
-import { join } from 'path';
-import { deflate, gzip } from 'zlib';
 import axios from 'axios';
 import { app, ipcMain } from 'electron';
-import { Server as WsServer, WebSocketServer, WebSocket } from 'ws';
-import manifest from './manifest.json';
-import { ClientEvent, ServerEvent } from '../../../../remote/types';
-import { PlayerRepeat, PlayerStatus, SongState } from '../../../../renderer/types';
-import { getMainWindow } from '../../../main';
+import { promises, Stats } from 'fs';
+import { readFile } from 'fs/promises';
+import { createServer, IncomingMessage, Server, ServerResponse } from 'http';
+import { join } from 'path';
+import { WebSocket, WebSocketServer, Server as WsServer } from 'ws';
+import { deflate, gzip } from 'zlib';
+
+import { getMainWindow } from '../../..';
 import { isLinux } from '../../../utils';
-import type { QueueSong } from '/@/renderer/api/types';
+import manifest from './manifest.json';
 
 let mprisPlayer: any | undefined;
 
 if (isLinux()) {
-    // eslint-disable-next-line global-require
     mprisPlayer = require('../../linux/mpris').mprisPlayer;
 }
 
-interface RemoteConfig {
-    enabled: boolean;
-    password: string;
-    port: number;
-    username: string;
-}
-
 interface MimeType {
     css: string;
     html: string;
@@ -34,6 +24,13 @@ interface MimeType {
     js: string;
 }
 
+interface RemoteConfig {
+    enabled: boolean;
+    password: string;
+    port: number;
+    username: string;
+}
+
 declare class StatefulWebSocket extends WebSocket {
     alive: boolean;
 
@@ -41,7 +38,7 @@ declare class StatefulWebSocket extends WebSocket {
 }
 
 let server: Server | undefined;
-let wsServer: WsServer<typeof StatefulWebSocket> | undefined;
+let wsServer: undefined | WsServer<typeof StatefulWebSocket>;
 
 const settings: RemoteConfig = {
     enabled: false,
@@ -54,14 +51,6 @@ type SendData = ServerEvent & {
     client: StatefulWebSocket;
 };
 
-function send({ client, event, data }: SendData): void {
-    if (client.readyState === WebSocket.OPEN) {
-        if (client.alive && client.auth) {
-            client.send(JSON.stringify({ data, event }));
-        }
-    }
-}
-
 function broadcast(message: ServerEvent): void {
     if (wsServer) {
         for (const client of wsServer.clients) {
@@ -70,6 +59,14 @@ function broadcast(message: ServerEvent): void {
     }
 }
 
+function send({ client, data, event }: SendData): void {
+    if (client.readyState === WebSocket.OPEN) {
+        if (client.alive && client.auth) {
+            client.send(JSON.stringify({ data, event }));
+        }
+    }
+}
+
 const shutdownServer = () => {
     if (wsServer) {
         wsServer.clients.forEach((client) => client.close(4000));
@@ -121,21 +118,17 @@ const getEncoding = (encoding: string | string[]): Encoding => {
 
 const cache = new Map<string, Map<Encoding, [number, Buffer]>>();
 
-function setOk(
-    res: ServerResponse,
-    mtimeMs: number,
-    extension: keyof MimeType,
-    encoding: Encoding,
-    data?: Buffer,
-) {
-    res.statusCode = data ? 200 : 304;
+function authorize(req: IncomingMessage): boolean {
+    if (settings.username || settings.password) {
+        // https://stackoverflow.com/questions/23616371/basic-http-authentication-with-node-and-express-4
 
-    res.setHeader('Content-Type', MIME_TYPES[extension]);
-    res.setHeader('ETag', `"${mtimeMs}"`);
-    res.setHeader('Cache-Control', 'public');
+        const authorization = req.headers.authorization?.split(' ')[1] || '';
+        const [login, password] = Buffer.from(authorization, 'base64').toString().split(':');
 
-    if (encoding !== 'none') res.setHeader('Content-Encoding', encoding);
-    res.end(data);
+        return login === settings.username && password === settings.password;
+    }
+
+    return true;
 }
 
 async function serveFile(
@@ -252,17 +245,21 @@ async function serveFile(
     return Promise.resolve();
 }
 
-function authorize(req: IncomingMessage): boolean {
-    if (settings.username || settings.password) {
-        // https://stackoverflow.com/questions/23616371/basic-http-authentication-with-node-and-express-4
+function setOk(
+    res: ServerResponse,
+    mtimeMs: number,
+    extension: keyof MimeType,
+    encoding: Encoding,
+    data?: Buffer,
+) {
+    res.statusCode = data ? 200 : 304;
 
-        const authorization = req.headers.authorization?.split(' ')[1] || '';
-        const [login, password] = Buffer.from(authorization, 'base64').toString().split(':');
+    res.setHeader('Content-Type', MIME_TYPES[extension]);
+    res.setHeader('ETag', `"${mtimeMs}"`);
+    res.setHeader('Cache-Control', 'public');
 
-        return login === settings.username && password === settings.password;
-    }
-
-    return true;
+    if (encoding !== 'none') res.setHeader('Content-Encoding', encoding);
+    res.end(data);
 }
 
 const enableServer = (config: RemoteConfig): Promise<void> => {
@@ -286,28 +283,28 @@ const enableServer = (config: RemoteConfig): Promise<void> => {
                             await serveFile(req, 'index', 'html', res);
                             break;
                         }
+                        case '/credentials': {
+                            res.statusCode = 200;
+                            res.setHeader('Content-Type', 'text/plain');
+                            res.end(req.headers.authorization);
+                            break;
+                        }
                         case '/favicon.ico': {
                             await serveFile(req, 'favicon', 'ico', res);
                             break;
                         }
-                        case '/remote.css': {
-                            await serveFile(req, 'remote', 'css', res);
-                            break;
-                        }
-                        case '/remote.js': {
-                            await serveFile(req, 'remote', 'js', res);
-                            break;
-                        }
                         case '/manifest.json': {
                             res.statusCode = 200;
                             res.setHeader('Content-Type', 'application/json');
                             res.end(JSON.stringify(manifest));
                             break;
                         }
-                        case '/credentials': {
-                            res.statusCode = 200;
-                            res.setHeader('Content-Type', 'text/plain');
-                            res.end(req.headers.authorization);
+                        case '/remote.css': {
+                            await serveFile(req, 'remote', 'css', res);
+                            break;
+                        }
+                        case '/remote.js': {
+                            await serveFile(req, 'remote', 'js', res);
                             break;
                         }
                         default: {
@@ -371,6 +368,21 @@ const enableServer = (config: RemoteConfig): Promise<void> => {
                         }
 
                         switch (event) {
+                            case 'favorite': {
+                                const { favorite, id } = json;
+                                if (id && id === currentState.song?.id) {
+                                    getMainWindow()?.webContents.send('request-favorite', {
+                                        favorite,
+                                        id,
+                                        serverId: currentState.song.serverId,
+                                    });
+                                }
+                                break;
+                            }
+                            case 'next': {
+                                getMainWindow()?.webContents.send('renderer-player-next');
+                                break;
+                            }
                             case 'pause': {
                                 getMainWindow()?.webContents.send('renderer-player-pause');
                                 break;
@@ -379,10 +391,6 @@ const enableServer = (config: RemoteConfig): Promise<void> => {
                                 getMainWindow()?.webContents.send('renderer-player-play');
                                 break;
                             }
-                            case 'next': {
-                                getMainWindow()?.webContents.send('renderer-player-next');
-                                break;
-                            }
                             case 'previous': {
                                 getMainWindow()?.webContents.send('renderer-player-previous');
                                 break;
@@ -421,6 +429,17 @@ const enableServer = (config: RemoteConfig): Promise<void> => {
 
                                 break;
                             }
+                            case 'rating': {
+                                const { id, rating } = json;
+                                if (id && id === currentState.song?.id) {
+                                    getMainWindow()?.webContents.send('request-rating', {
+                                        id,
+                                        rating,
+                                        serverId: currentState.song.serverId,
+                                    });
+                                }
+                                break;
+                            }
                             case 'repeat': {
                                 getMainWindow()?.webContents.send('renderer-player-toggle-repeat');
                                 break;
@@ -450,28 +469,6 @@ const enableServer = (config: RemoteConfig): Promise<void> => {
                                 }
                                 break;
                             }
-                            case 'favorite': {
-                                const { favorite, id } = json;
-                                if (id && id === currentState.song?.id) {
-                                    getMainWindow()?.webContents.send('request-favorite', {
-                                        favorite,
-                                        id,
-                                        serverId: currentState.song.serverId,
-                                    });
-                                }
-                                break;
-                            }
-                            case 'rating': {
-                                const { rating, id } = json;
-                                if (id && id === currentState.song?.id) {
-                                    getMainWindow()?.webContents.send('request-rating', {
-                                        id,
-                                        rating,
-                                        serverId: currentState.song.serverId,
-                                    });
-                                }
-                                break;
-                            }
                             case 'position': {
                                 const { position } = json;
                                 if (mprisPlayer) {
@@ -631,12 +628,7 @@ ipcMain.on('update-volume', (_event, volume: number) => {
 
 if (mprisPlayer) {
     mprisPlayer.on('loopStatus', (event: string) => {
-        const repeat =
-            event === 'Playlist'
-                ? PlayerRepeat.ALL
-                : event === 'Track'
-                  ? PlayerRepeat.ONE
-                  : PlayerRepeat.NONE;
+        const repeat = event === 'Playlist' ? 'all' : event === 'Track' ? 'one' : 'none';
 
         currentState.repeat = repeat;
         broadcast({ data: repeat, event: 'repeat' });
diff --git a/src/main/features/core/settings/index.ts b/src/main/features/core/settings/index.ts
index f829ea58..05cd0ad3 100644
--- a/src/main/features/core/settings/index.ts
+++ b/src/main/features/core/settings/index.ts
@@ -1,6 +1,7 @@
+import type { TitleTheme } from '/@/renderer/types';
+
 import { ipcMain, nativeTheme, safeStorage } from 'electron';
 import Store from 'electron-store';
-import type { TitleTheme } from '/@/renderer/types';
 
 export const store = new Store();
 
@@ -12,7 +13,7 @@ ipcMain.on('settings-set', (__event, data: { property: string; value: any }) =>
     store.set(`${data.property}`, data.value);
 });
 
-ipcMain.handle('password-get', (_event, server: string): string | null => {
+ipcMain.handle('password-get', (_event, server: string): null | string => {
     if (safeStorage.isEncryptionAvailable()) {
         const servers = store.get('server') as Record<string, string> | undefined;
 
diff --git a/src/main/features/index.ts b/src/main/features/index.ts
index e64d7d9f..b80182ff 100644
--- a/src/main/features/index.ts
+++ b/src/main/features/index.ts
@@ -1,4 +1,3 @@
 import './core';
 
-// eslint-disable-next-line import/no-dynamic-require
-require(`./${process.platform}`);
+// require(`./${process.platform}`)
diff --git a/src/main/features/linux/mpris.ts b/src/main/features/linux/mpris.ts
index 6d400f8e..f53eeb8d 100644
--- a/src/main/features/linux/mpris.ts
+++ b/src/main/features/linux/mpris.ts
@@ -1,7 +1,9 @@
 import { ipcMain } from 'electron';
 import Player from 'mpris-service';
+
 import { PlayerRepeat, PlayerStatus } from '../../../renderer/types';
 import { getMainWindow } from '../../main';
+
 import { QueueSong } from '/@/renderer/api/types';
 
 const mprisPlayer = Player({
@@ -124,8 +126,8 @@ ipcMain.on('update-playback', (_event, status: PlayerStatus) => {
 
 const REPEAT_TO_MPRIS: Record<PlayerRepeat, string> = {
     [PlayerRepeat.ALL]: 'Playlist',
-    [PlayerRepeat.ONE]: 'Track',
     [PlayerRepeat.NONE]: 'None',
+    [PlayerRepeat.ONE]: 'Track',
 };
 
 ipcMain.on('update-repeat', (_event, arg: PlayerRepeat) => {
diff --git a/src/main/features/win32/index.ts b/src/main/features/win32/index.ts
index e69de29b..1b7c8727 100644
--- a/src/main/features/win32/index.ts
+++ b/src/main/features/win32/index.ts
@@ -0,0 +1,3 @@
+// Dummy file to satisfy the build system
+
+export {};
diff --git a/src/main/main.ts b/src/main/index.ts
similarity index 91%
rename from src/main/main.ts
rename to src/main/index.ts
index 802fc3b9..ed679488 100644
--- a/src/main/main.ts
+++ b/src/main/index.ts
@@ -1,51 +1,40 @@
-/* eslint global-require: off, no-console: off, promise/always-return: off */
-
-/**
- * This module executes inside of electron's main process. You can start
- * electron renderer process from here and communicate with the other processes
- * through IPC.
- *
- * When running `npm run build` or `npm run build:main`, this file is compiled to
- * `./src/main.js` using webpack. This gives us some performance wins.
- */
-import { access, constants, readFile, writeFile } from 'fs';
-import path, { join } from 'path';
-import { deflate, inflate } from 'zlib';
+import { electronApp, is, optimizer } from '@electron-toolkit/utils';
+import { constants } from 'buffer';
 import {
     app,
     BrowserWindow,
-    shell,
-    ipcMain,
+    BrowserWindowConstructorOptions,
     globalShortcut,
-    Tray,
+    ipcMain,
     Menu,
     nativeImage,
     nativeTheme,
-    BrowserWindowConstructorOptions,
-    protocol,
     net,
+    protocol,
     Rectangle,
     screen,
+    shell,
+    Tray,
 } from 'electron';
 import electronLocalShortcut from 'electron-localshortcut';
 import log from 'electron-log/main';
 import { autoUpdater } from 'electron-updater';
+import { access, readFile, writeFile } from 'fs';
+import path, { join } from 'path';
+import { deflate, inflate } from 'zlib';
+
 import { disableMediaKeys, enableMediaKeys } from './features/core/player/media-keys';
-import { store } from './features/core/settings/index';
+import { store } from './features/core/settings';
 import MenuBuilder from './menu';
 import {
+    autoUpdaterLogInterface,
+    createLog,
     hotkeyToElectronAccelerator,
     isLinux,
     isMacOS,
     isWindows,
-    resolveHtmlPath,
-    createLog,
-    autoUpdaterLogInterface,
 } from './utils';
 import './features';
-import type { TitleTheme } from '/@/renderer/types';
-
-declare module 'node-mpv';
 
 export default class AppUpdater {
     constructor() {
@@ -72,7 +61,7 @@ if (isLinux() && !process.argv.some((a) => a.startsWith('--password-store='))) {
 }
 
 let mainWindow: BrowserWindow | null = null;
-let tray: Tray | null = null;
+let tray: null | Tray = null;
 let exitFromTray = false;
 let forceQuit = false;
 
@@ -117,7 +106,7 @@ export const sendToastToRenderer = ({
     type,
 }: {
     message: string;
-    type: 'success' | 'error' | 'warning' | 'info';
+    type: 'error' | 'info' | 'success' | 'warning';
 }) => {
     getMainWindow()?.webContents.send('toast-from-main', {
         message,
@@ -208,7 +197,7 @@ const createTray = () => {
     tray.setContextMenu(contextMenu);
 };
 
-const createWindow = async (first = true) => {
+async function createWindow(first = true): Promise<void> {
     if (isDevelopment) {
         await installExtensions().catch(console.log);
     }
@@ -233,6 +222,7 @@ const createWindow = async (first = true) => {
         },
     };
 
+    // Create the browser window.
     mainWindow = new BrowserWindow({
         autoHideMenuBar: true,
         frame: false,
@@ -247,9 +237,8 @@ const createWindow = async (first = true) => {
             contextIsolation: true,
             devTools: true,
             nodeIntegration: true,
-            preload: app.isPackaged
-                ? path.join(__dirname, 'preload.js')
-                : path.join(__dirname, '../../.erb/dll/preload.js'),
+            preload: join(__dirname, '../preload/index.js'),
+            sandbox: false,
             webSecurity: !store.get('ignore_cors'),
         },
         width: 1440,
@@ -374,11 +363,11 @@ const createWindow = async (first = true) => {
         enableMediaKeys(mainWindow);
     }
 
-    mainWindow.loadURL(resolveHtmlPath('index.html'));
-
     const startWindowMinimized = store.get('window_start_minimized', false) as boolean;
 
     mainWindow.on('ready-to-show', () => {
+        // mainWindow.show()
+
         if (!mainWindow) {
             throw new Error('"mainWindow" is not defined');
         }
@@ -404,7 +393,7 @@ const createWindow = async (first = true) => {
         mainWindow = null;
     });
 
-    let saved = false;
+    const saved = false;
 
     mainWindow.on('close', (event) => {
         store.set('bounds', mainWindow?.getNormalBounds());
@@ -484,13 +473,25 @@ const createWindow = async (first = true) => {
     });
 
     if (store.get('disable_auto_updates') !== true) {
-        // eslint-disable-next-line
         new AppUpdater();
     }
 
     const theme = store.get('theme') as TitleTheme | undefined;
     nativeTheme.themeSource = theme || 'dark';
-};
+
+    mainWindow.webContents.setWindowOpenHandler((details) => {
+        shell.openExternal(details.url);
+        return { action: 'deny' };
+    });
+
+    // HMR for renderer base on electron-vite cli.
+    // Load the remote URL for development or the local html file for production.
+    if (is.dev && process.env['ELECTRON_RENDERER_URL']) {
+        mainWindow.loadURL(process.env['ELECTRON_RENDERER_URL']);
+    } else {
+        mainWindow.loadFile(join(__dirname, '../renderer/index.html'));
+    }
+}
 
 app.commandLine.appendSwitch('disable-features', 'HardwareMediaKeyHandling,MediaSessionService');
 
@@ -519,6 +520,8 @@ enum BindingActions {
 }
 
 const HOTKEY_ACTIONS: Record<BindingActions, () => void> = {
+    [BindingActions.GLOBAL_SEARCH]: () => {},
+    [BindingActions.LOCAL_SEARCH]: () => {},
     [BindingActions.MUTE]: () => getMainWindow()?.webContents.send('renderer-player-volume-mute'),
     [BindingActions.NEXT]: () => getMainWindow()?.webContents.send('renderer-player-next'),
     [BindingActions.PAUSE]: () => getMainWindow()?.webContents.send('renderer-player-pause'),
@@ -533,16 +536,14 @@ const HOTKEY_ACTIONS: Record<BindingActions, () => void> = {
     [BindingActions.SKIP_FORWARD]: () =>
         getMainWindow()?.webContents.send('renderer-player-skip-forward'),
     [BindingActions.STOP]: () => getMainWindow()?.webContents.send('renderer-player-stop'),
+    [BindingActions.TOGGLE_FULLSCREEN_PLAYER]: () => {},
+    [BindingActions.TOGGLE_QUEUE]: () => {},
     [BindingActions.TOGGLE_REPEAT]: () =>
         getMainWindow()?.webContents.send('renderer-player-toggle-repeat'),
-    [BindingActions.VOLUME_UP]: () =>
-        getMainWindow()?.webContents.send('renderer-player-volume-up'),
     [BindingActions.VOLUME_DOWN]: () =>
         getMainWindow()?.webContents.send('renderer-player-volume-down'),
-    [BindingActions.GLOBAL_SEARCH]: () => {},
-    [BindingActions.LOCAL_SEARCH]: () => {},
-    [BindingActions.TOGGLE_QUEUE]: () => {},
-    [BindingActions.TOGGLE_FULLSCREEN_PLAYER]: () => {},
+    [BindingActions.VOLUME_UP]: () =>
+        getMainWindow()?.webContents.send('renderer-player-volume-up'),
 };
 
 ipcMain.on(
@@ -585,7 +586,7 @@ ipcMain.on(
         _event,
         data: {
             message: string;
-            type: 'debug' | 'verbose' | 'success' | 'error' | 'warning' | 'info';
+            type: 'debug' | 'error' | 'info' | 'success' | 'verbose' | 'warning';
         },
     ) => {
         createLog(data);
@@ -597,7 +598,6 @@ app.on('window-all-closed', () => {
     // Respect the OSX convention of having the application in memory even
     // after all windows have been closed
     if (isMacOS()) {
-        ipcMain.removeHandler('window-clear-cache');
         mainWindow = null;
     } else {
         app.quit();
@@ -632,22 +632,22 @@ if (!singleInstance) {
 
     app.whenReady()
         .then(() => {
-            protocol.handle('feishin', async (request) => {
-                const filePath = `file://${request.url.slice('feishin://'.length)}`;
-                const response = await net.fetch(filePath);
-                const contentType = response.headers.get('content-type');
+            //   protocol.handle('feishin', async (request) => {
+            //     const filePath = `file://${request.url.slice('feishin://'.length)}`
+            //     const response = await net.fetch(filePath)
+            //     const contentType = response.headers.get('content-type')
 
-                if (!contentType || !FONT_HEADERS.includes(contentType)) {
-                    getMainWindow()?.webContents.send('custom-font-error', filePath);
+            //     if (!contentType || !FONT_HEADERS.includes(contentType)) {
+            //       getMainWindow()?.webContents.send('custom-font-error', filePath)
 
-                    return new Response(null, {
-                        status: 403,
-                        statusText: 'Forbidden',
-                    });
-                }
+            //       return new Response(null, {
+            //         status: 403,
+            //         statusText: 'Forbidden'
+            //       })
+            //     }
 
-                return response;
-            });
+            //     return response
+            //   })
 
             createWindow();
             if (store.get('window_enable_tray', true)) {
diff --git a/src/main/menu.ts b/src/main/menu.ts
index c8c5f77b..f3f12cf0 100644
--- a/src/main/menu.ts
+++ b/src/main/menu.ts
@@ -1,4 +1,4 @@
-import { app, Menu, shell, BrowserWindow, MenuItemConstructorOptions } from 'electron';
+import { app, BrowserWindow, Menu, MenuItemConstructorOptions, shell } from 'electron';
 
 interface DarwinMenuItemConstructorOptions extends MenuItemConstructorOptions {
     selector?: string;
@@ -12,37 +12,6 @@ export default class MenuBuilder {
         this.mainWindow = mainWindow;
     }
 
-    buildMenu(): Menu {
-        if (process.env.NODE_ENV === 'development' || process.env.DEBUG_PROD === 'true') {
-            this.setupDevelopmentEnvironment();
-        }
-
-        const template =
-            process.platform === 'darwin'
-                ? this.buildDarwinTemplate()
-                : this.buildDefaultTemplate();
-
-        const menu = Menu.buildFromTemplate(template);
-        Menu.setApplicationMenu(menu);
-
-        return menu;
-    }
-
-    setupDevelopmentEnvironment(): void {
-        this.mainWindow.webContents.on('context-menu', (_, props) => {
-            const { x, y } = props;
-
-            Menu.buildFromTemplate([
-                {
-                    click: () => {
-                        this.mainWindow.webContents.inspectElement(x, y);
-                    },
-                    label: 'Inspect element',
-                },
-            ]).popup({ window: this.mainWindow });
-        });
-    }
-
     buildDarwinTemplate(): MenuItemConstructorOptions[] {
         const subMenuAbout: DarwinMenuItemConstructorOptions = {
             label: 'Electron',
@@ -276,4 +245,35 @@ export default class MenuBuilder {
 
         return templateDefault;
     }
+
+    buildMenu(): Menu {
+        if (process.env.NODE_ENV === 'development' || process.env.DEBUG_PROD === 'true') {
+            this.setupDevelopmentEnvironment();
+        }
+
+        const template =
+            process.platform === 'darwin'
+                ? this.buildDarwinTemplate()
+                : this.buildDefaultTemplate();
+
+        const menu = Menu.buildFromTemplate(template);
+        Menu.setApplicationMenu(menu);
+
+        return menu;
+    }
+
+    setupDevelopmentEnvironment(): void {
+        this.mainWindow.webContents.on('context-menu', (_, props) => {
+            const { x, y } = props;
+
+            Menu.buildFromTemplate([
+                {
+                    click: () => {
+                        this.mainWindow.webContents.inspectElement(x, y);
+                    },
+                    label: 'Inspect element',
+                },
+            ]).popup({ window: this.mainWindow });
+        });
+    }
 }
diff --git a/src/main/preload.ts b/src/main/preload.ts
deleted file mode 100644
index d2183785..00000000
--- a/src/main/preload.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { contextBridge } from 'electron';
-import { browser } from './preload/browser';
-import { discordRpc } from './preload/discord-rpc';
-import { ipc } from './preload/ipc';
-import { localSettings } from './preload/local-settings';
-import { lyrics } from './preload/lyrics';
-import { mpris } from './preload/mpris';
-import { mpvPlayer, mpvPlayerListener } from './preload/mpv-player';
-import { remote } from './preload/remote';
-import { utils } from './preload/utils';
-
-contextBridge.exposeInMainWorld('electron', {
-    browser,
-    discordRpc,
-    ipc,
-    localSettings,
-    lyrics,
-    mpris,
-    mpvPlayer,
-    mpvPlayerListener,
-    remote,
-    utils,
-});
diff --git a/src/main/utils.ts b/src/main/utils.ts
index aa3196eb..fe5ea808 100644
--- a/src/main/utils.ts
+++ b/src/main/utils.ts
@@ -1,8 +1,7 @@
-/* eslint import/prefer-default-export: off, import/no-mutable-exports: off */
+import log from 'electron-log/main';
 import path from 'path';
 import process from 'process';
 import { URL } from 'url';
-import log from 'electron-log/main';
 
 export let resolveHtmlPath: (htmlFileName: string) => string;
 
@@ -76,7 +75,7 @@ const logColor = {
 
 export const createLog = (data: {
     message: string;
-    type: 'debug' | 'verbose' | 'success' | 'error' | 'warning' | 'info';
+    type: 'debug' | 'error' | 'info' | 'success' | 'verbose' | 'warning';
 }) => {
     logMethod[data.type](`%c${data.message}`, `color: ${logColor[data.type]}`);
 };
diff --git a/src/main/preload/browser.ts b/src/preload/browser.ts
similarity index 100%
rename from src/main/preload/browser.ts
rename to src/preload/browser.ts
diff --git a/src/main/preload/discord-rpc.ts b/src/preload/discord-rpc.ts
similarity index 100%
rename from src/main/preload/discord-rpc.ts
rename to src/preload/discord-rpc.ts
diff --git a/src/preload/index.d.ts b/src/preload/index.d.ts
new file mode 100644
index 00000000..caecdb7b
--- /dev/null
+++ b/src/preload/index.d.ts
@@ -0,0 +1,10 @@
+import { ElectronAPI } from '@electron-toolkit/preload';
+
+import { PreloadApi } from './index';
+
+declare global {
+    interface Window {
+        api: PreloadApi;
+        electron: ElectronAPI;
+    }
+}
diff --git a/src/preload/index.ts b/src/preload/index.ts
new file mode 100644
index 00000000..7115f7b3
--- /dev/null
+++ b/src/preload/index.ts
@@ -0,0 +1,45 @@
+import { electronAPI } from '@electron-toolkit/preload';
+import { contextBridge } from 'electron';
+
+import { browser } from './browser';
+import { discordRpc } from './discord-rpc';
+import { ipc } from './ipc';
+import { localSettings } from './local-settings';
+import { lyrics } from './lyrics';
+import { mpris } from './mpris';
+import { mpvPlayer, mpvPlayerListener } from './mpv-player';
+import { remote } from './remote';
+import { utils } from './utils';
+
+// Custom APIs for renderer
+const api = {
+    browser,
+    discordRpc,
+    ipc,
+    localSettings,
+    lyrics,
+    mpris,
+    mpvPlayer,
+    mpvPlayerListener,
+    remote,
+    utils,
+};
+
+export type PreloadApi = typeof api;
+
+// Use `contextBridge` APIs to expose Electron APIs to
+// renderer only if context isolation is enabled, otherwise
+// just add to the DOM global.
+if (process.contextIsolated) {
+    try {
+        contextBridge.exposeInMainWorld('electron', electronAPI);
+        contextBridge.exposeInMainWorld('api', api);
+    } catch (error) {
+        console.error(error);
+    }
+} else {
+    // @ts-ignore (define in dts)
+    window.electron = electronAPI;
+    // @ts-ignore (define in dts)
+    window.api = api;
+}
diff --git a/src/main/preload/ipc.ts b/src/preload/ipc.ts
similarity index 100%
rename from src/main/preload/ipc.ts
rename to src/preload/ipc.ts
diff --git a/src/main/preload/local-settings.ts b/src/preload/local-settings.ts
similarity index 77%
rename from src/main/preload/local-settings.ts
rename to src/preload/local-settings.ts
index 5f20e574..986f5203 100644
--- a/src/main/preload/local-settings.ts
+++ b/src/preload/local-settings.ts
@@ -1,12 +1,11 @@
-import { IpcRendererEvent, ipcRenderer, webFrame } from 'electron';
+import { ipcRenderer, IpcRendererEvent, webFrame } from 'electron';
 import Store from 'electron-store';
-import { toServerType, type TitleTheme } from '/@/renderer/types';
 
 const store = new Store();
 
 const set = (
     property: string,
-    value: string | Record<string, unknown> | boolean | string[] | undefined,
+    value: boolean | Record<string, unknown> | string | string[] | undefined,
 ) => {
     if (value === undefined) {
         store.delete(property);
@@ -32,7 +31,7 @@ const disableMediaKeys = () => {
     ipcRenderer.send('global-media-keys-disable');
 };
 
-const passwordGet = async (server: string): Promise<string | null> => {
+const passwordGet = async (server: string): Promise<null | string> => {
     return ipcRenderer.invoke('password-get', server);
 };
 
@@ -56,6 +55,19 @@ const themeSet = (theme: TitleTheme): void => {
     ipcRenderer.send('theme-set', theme);
 };
 
+export const toServerType = (value?: string): null | string => {
+    switch (value?.toLowerCase()) {
+        case 'jellyfin':
+            return 'jellyfin';
+        case 'navidrome':
+            return 'navidrome';
+        case 'subsonic':
+            return 'subsonic';
+        default:
+            return null;
+    }
+};
+
 const SERVER_TYPE = toServerType(process.env.SERVER_TYPE);
 
 const env = {
diff --git a/src/main/preload/lyrics.ts b/src/preload/lyrics.ts
similarity index 94%
rename from src/main/preload/lyrics.ts
rename to src/preload/lyrics.ts
index 1b6694cc..3c0cbb75 100644
--- a/src/main/preload/lyrics.ts
+++ b/src/preload/lyrics.ts
@@ -1,11 +1,11 @@
 import { ipcRenderer } from 'electron';
+
 import {
     InternetProviderLyricSearchResponse,
     LyricGetQuery,
     LyricSearchQuery,
     LyricSource,
-    QueueSong,
-} from '/@/renderer/api/types';
+} from '../main/features/core/lyrics';
 
 const getRemoteLyricsBySong = (song: QueueSong) => {
     const result = ipcRenderer.invoke('lyric-by-song', song);
diff --git a/src/main/preload/mpris.ts b/src/preload/mpris.ts
similarity index 88%
rename from src/main/preload/mpris.ts
rename to src/preload/mpris.ts
index 9777201e..0edb90c3 100644
--- a/src/main/preload/mpris.ts
+++ b/src/preload/mpris.ts
@@ -1,5 +1,4 @@
-import { IpcRendererEvent, ipcRenderer } from 'electron';
-import type { PlayerRepeat } from '/@/renderer/types';
+import { ipcRenderer, IpcRendererEvent } from 'electron';
 
 const updatePosition = (timeSec: number) => {
     ipcRenderer.send('mpris-update-position', timeSec);
diff --git a/src/main/preload/mpv-player.ts b/src/preload/mpv-player.ts
similarity index 99%
rename from src/main/preload/mpv-player.ts
rename to src/preload/mpv-player.ts
index e0be6fd9..8370db3c 100644
--- a/src/main/preload/mpv-player.ts
+++ b/src/preload/mpv-player.ts
@@ -1,5 +1,4 @@
 import { ipcRenderer, IpcRendererEvent } from 'electron';
-import { PlayerData } from '/@/renderer/store';
 
 const initialize = (data: { extraParameters?: string[]; properties?: Record<string, any> }) => {
     return ipcRenderer.invoke('player-initialize', data);
@@ -187,8 +186,8 @@ export const mpvPlayerListener = {
     rendererNext,
     rendererPause,
     rendererPlay,
-    rendererPlayPause,
     rendererPlayerFallback,
+    rendererPlayPause,
     rendererPrevious,
     rendererQuit,
     rendererSkipBackward,
diff --git a/src/main/preload/remote.ts b/src/preload/remote.ts
similarity index 89%
rename from src/main/preload/remote.ts
rename to src/preload/remote.ts
index a589be68..95f3849f 100644
--- a/src/main/preload/remote.ts
+++ b/src/preload/remote.ts
@@ -1,6 +1,4 @@
-import { IpcRendererEvent, ipcRenderer } from 'electron';
-import { QueueSong } from '/@/renderer/api/types';
-import { PlayerStatus } from '/@/renderer/types';
+import { ipcRenderer, IpcRendererEvent } from 'electron';
 
 const requestFavorite = (
     cb: (
@@ -29,12 +27,12 @@ const requestVolume = (cb: (event: IpcRendererEvent, data: { volume: number }) =
     ipcRenderer.on('request-volume', cb);
 };
 
-const setRemoteEnabled = (enabled: boolean): Promise<string | null> => {
+const setRemoteEnabled = (enabled: boolean): Promise<null | string> => {
     const result = ipcRenderer.invoke('remote-enable', enabled);
     return result;
 };
 
-const setRemotePort = (port: number): Promise<string | null> => {
+const setRemotePort = (port: number): Promise<null | string> => {
     const result = ipcRenderer.invoke('remote-port', port);
     return result;
 };
@@ -56,7 +54,7 @@ const updateSetting = (
     port: number,
     username: string,
     password: string,
-): Promise<string | null> => {
+): Promise<null | string> => {
     return ipcRenderer.invoke('remote-settings', enabled, port, username, password);
 };
 
diff --git a/src/main/preload/utils.ts b/src/preload/utils.ts
similarity index 79%
rename from src/main/preload/utils.ts
rename to src/preload/utils.ts
index bd90f956..17fcfb80 100644
--- a/src/main/preload/utils.ts
+++ b/src/preload/utils.ts
@@ -1,6 +1,6 @@
-import { IpcRendererEvent, ipcRenderer } from 'electron';
-import { isMacOS, isWindows, isLinux } from '../utils';
-import { PlayerState } from '/@/renderer/store';
+import { ipcRenderer, IpcRendererEvent } from 'electron';
+
+import { isLinux, isMacOS, isWindows } from '../main/utils';
 
 const saveQueue = (data: Record<string, any>) => {
     ipcRenderer.send('player-save-queue', data);
@@ -18,7 +18,7 @@ const onSaveQueue = (cb: (event: IpcRendererEvent) => void) => {
     ipcRenderer.on('renderer-save-queue', cb);
 };
 
-const onRestoreQueue = (cb: (event: IpcRendererEvent, data: Partial<PlayerState>) => void) => {
+const onRestoreQueue = (cb: (event: IpcRendererEvent, data: Partial<any>) => void) => {
     ipcRenderer.on('renderer-restore-queue', cb);
 };
 
@@ -29,7 +29,7 @@ const playerErrorListener = (cb: (event: IpcRendererEvent, data: { code: number
 const mainMessageListener = (
     cb: (
         event: IpcRendererEvent,
-        data: { message: string; type: 'success' | 'error' | 'warning' | 'info' },
+        data: { message: string; type: 'error' | 'info' | 'success' | 'warning' },
     ) => void,
 ) => {
     ipcRenderer.on('toast-from-main', cb);
@@ -40,7 +40,7 @@ const logger = (
         event: IpcRendererEvent,
         data: {
             message: string;
-            type: 'debug' | 'verbose' | 'error' | 'warning' | 'info';
+            type: 'debug' | 'error' | 'info' | 'verbose' | 'warning';
         },
     ) => void,
 ) => {
diff --git a/src/renderer/api/controller.ts b/src/renderer/api/controller.ts
index 0eb9958e..c42281f9 100644
--- a/src/renderer/api/controller.ts
+++ b/src/renderer/api/controller.ts
@@ -1,10 +1,11 @@
-import { useAuthStore } from '/@/renderer/store';
-import { toast } from '/@/renderer/components/toast/index';
-import type { ServerType, ControllerEndpoint, AuthenticationResponse } from '/@/renderer/api/types';
+import type { AuthenticationResponse, ControllerEndpoint, ServerType } from '/@/renderer/api/types';
+
+import i18n from '/@/i18n/i18n';
+import { JellyfinController } from '/@/renderer/api/jellyfin/jellyfin-controller';
 import { NavidromeController } from '/@/renderer/api/navidrome/navidrome-controller';
 import { SubsonicController } from '/@/renderer/api/subsonic/subsonic-controller';
-import { JellyfinController } from '/@/renderer/api/jellyfin/jellyfin-controller';
-import i18n from '/@/i18n/i18n';
+import { toast } from '/@/renderer/components/toast/index';
+import { useAuthStore } from '/@/renderer/store';
 
 type ApiController = {
     jellyfin: ControllerEndpoint;
diff --git a/src/renderer/api/jellyfin.types.ts b/src/renderer/api/jellyfin.types.ts
index f22febba..216011db 100644
--- a/src/renderer/api/jellyfin.types.ts
+++ b/src/renderer/api/jellyfin.types.ts
@@ -1,97 +1,56 @@
-export type JFBasePaginatedResponse = {
-    StartIndex: number;
-    TotalRecordCount: number;
-};
-
-export interface JFMusicFolderListResponse extends JFBasePaginatedResponse {
-    Items: JFMusicFolder[];
+export enum JFAlbumArtistListSort {
+    ALBUM = 'Album,SortName',
+    DURATION = 'Runtime,AlbumArtist,Album,SortName',
+    NAME = 'SortName,Name',
+    RANDOM = 'Random,SortName',
+    RECENTLY_ADDED = 'DateCreated,SortName',
+    RELEASE_DATE = 'PremiereDate,AlbumArtist,Album,SortName',
 }
 
-export type JFMusicFolderList = JFMusicFolder[];
-
-export interface JFGenreListResponse extends JFBasePaginatedResponse {
-    Items: JFGenre[];
+export enum JFAlbumListSort {
+    ALBUM_ARTIST = 'AlbumArtist,SortName',
+    COMMUNITY_RATING = 'CommunityRating,SortName',
+    CRITIC_RATING = 'CriticRating,SortName',
+    NAME = 'SortName',
+    PLAY_COUNT = 'PlayCount',
+    RANDOM = 'Random,SortName',
+    RECENTLY_ADDED = 'DateCreated,SortName',
+    RELEASE_DATE = 'ProductionYear,PremiereDate,SortName',
 }
 
-export type JFGenreList = JFGenreListResponse;
+export enum JFArtistListSort {
+    ALBUM = 'Album,SortName',
+    DURATION = 'Runtime,AlbumArtist,Album,SortName',
+    NAME = 'SortName,Name',
+    RANDOM = 'Random,SortName',
+    RECENTLY_ADDED = 'DateCreated,SortName',
+    RELEASE_DATE = 'PremiereDate,AlbumArtist,Album,SortName',
+}
+
+export enum JFCollectionType {
+    MUSIC = 'music',
+    PLAYLISTS = 'playlists',
+}
+
+export enum JFExternalType {
+    MUSICBRAINZ = 'MusicBrainz',
+    THEAUDIODB = 'TheAudioDb',
+}
 
 export enum JFGenreListSort {
     NAME = 'SortName',
 }
 
-export type JFAlbumArtistDetailResponse = JFAlbumArtist;
-
-export type JFAlbumArtistDetail = JFAlbumArtistDetailResponse;
-
-export interface JFAlbumArtistListResponse extends JFBasePaginatedResponse {
-    Items: JFAlbumArtist[];
+export enum JFImageType {
+    LOGO = 'Logo',
+    PRIMARY = 'Primary',
 }
 
-export type JFAlbumArtistList = {
-    items: JFAlbumArtist[];
-    startIndex: number;
-    totalRecordCount: number;
-};
-
-export interface JFArtistListResponse extends JFBasePaginatedResponse {
-    Items: JFAlbumArtist[];
+export enum JFItemType {
+    AUDIO = 'Audio',
+    MUSICALBUM = 'MusicAlbum',
 }
 
-export type JFArtistList = JFArtistListResponse;
-
-export interface JFAlbumListResponse extends JFBasePaginatedResponse {
-    Items: JFAlbum[];
-}
-
-export type JFAlbumList = {
-    items: JFAlbum[];
-    startIndex: number;
-    totalRecordCount: number;
-};
-
-export type JFAlbumDetailResponse = JFAlbum;
-
-export type JFAlbumDetail = JFAlbum & { songs?: JFSong[] };
-
-export interface JFSongListResponse extends JFBasePaginatedResponse {
-    Items: JFSong[];
-}
-
-export type JFSongList = {
-    items: JFSong[];
-    startIndex: number;
-    totalRecordCount: number;
-};
-
-export type JFAddToPlaylistResponse = {
-    added: number;
-};
-
-export type JFAddToPlaylistParams = {
-    ids: string[];
-    userId: string;
-};
-
-export type JFAddToPlaylist = null;
-
-export type JFRemoveFromPlaylistResponse = null;
-
-export type JFRemoveFromPlaylistParams = {
-    entryIds: string[];
-};
-
-export type JFRemoveFromPlaylist = null;
-
-export interface JFPlaylistListResponse extends JFBasePaginatedResponse {
-    Items: JFPlaylist[];
-}
-
-export type JFPlaylistList = {
-    items: JFPlaylist[];
-    startIndex: number;
-    totalRecordCount: number;
-};
-
 export enum JFPlaylistListSort {
     ALBUM_ARTIST = 'AlbumArtist,SortName',
     DURATION = 'Runtime',
@@ -100,124 +59,34 @@ export enum JFPlaylistListSort {
     SONG_COUNT = 'ChildCount',
 }
 
-export type JFPlaylistDetailResponse = JFPlaylist;
+export enum JFSongListSort {
+    ALBUM = 'Album,SortName',
+    ALBUM_ARTIST = 'AlbumArtist,Album,SortName',
+    ARTIST = 'Artist,Album,SortName',
+    COMMUNITY_RATING = 'CommunityRating,SortName',
+    DURATION = 'Runtime,AlbumArtist,Album,SortName',
+    NAME = 'Name',
+    PLAY_COUNT = 'PlayCount,SortName',
+    RANDOM = 'Random,SortName',
+    RECENTLY_ADDED = 'DateCreated,SortName',
+    RECENTLY_PLAYED = 'DatePlayed,SortName',
+    RELEASE_DATE = 'PremiereDate,AlbumArtist,Album,SortName',
+}
 
-export type JFPlaylistDetail = JFPlaylist & { songs?: JFSong[] };
+export enum JFSortOrder {
+    ASC = 'Ascending',
+    DESC = 'Descending',
+}
 
-export type JFPlaylist = {
-    BackdropImageTags: string[];
-    ChannelId: null;
-    ChildCount?: number;
-    DateCreated: string;
-    GenreItems: GenreItem[];
-    Genres: string[];
-    Id: string;
-    ImageBlurHashes: ImageBlurHashes;
-    ImageTags: ImageTags;
-    IsFolder: boolean;
-    LocationType: string;
-    MediaType: string;
-    Name: string;
-    Overview?: string;
-    RunTimeTicks: number;
-    ServerId: string;
-    Type: string;
-    UserData: UserData;
+export type JFAddToPlaylist = null;
+
+export type JFAddToPlaylistParams = {
+    ids: string[];
+    userId: string;
 };
 
-export type JFRequestParams = {
-    albumArtistIds?: string;
-    artistIds?: string;
-    enableImageTypes?: string;
-    enableTotalRecordCount?: boolean;
-    enableUserData?: boolean;
-    excludeItemTypes?: string;
-    fields?: string;
-    imageTypeLimit?: number;
-    includeItemTypes?: string;
-    isFavorite?: boolean;
-    limit?: number;
-    parentId?: string;
-    recursive?: boolean;
-    searchTerm?: string;
-    sortBy?: string;
-    sortOrder?: 'Ascending' | 'Descending';
-    startIndex?: number;
-    userId?: string;
-};
-
-export type JFMusicFolder = {
-    BackdropImageTags: string[];
-    ChannelId: null;
-    CollectionType: string;
-    Id: string;
-    ImageBlurHashes: ImageBlurHashes;
-    ImageTags: ImageTags;
-    IsFolder: boolean;
-    LocationType: string;
-    Name: string;
-    ServerId: string;
-    Type: string;
-    UserData: UserData;
-};
-
-export type JFGenre = {
-    BackdropImageTags: any[];
-    ChannelId: null;
-    Id: string;
-    ImageBlurHashes: any;
-    ImageTags: ImageTags;
-    LocationType: string;
-    Name: string;
-    ServerId: string;
-    Type: string;
-};
-
-export type JFAlbumArtist = {
-    BackdropImageTags: string[];
-    ChannelId: null;
-    DateCreated: string;
-    ExternalUrls: ExternalURL[];
-    GenreItems: GenreItem[];
-    Genres: string[];
-    Id: string;
-    ImageBlurHashes: any;
-    ImageTags: ImageTags;
-    LocationType: string;
-    Name: string;
-    Overview?: string;
-    RunTimeTicks: number;
-    ServerId: string;
-    Type: string;
-    UserData: {
-        IsFavorite: boolean;
-        Key: string;
-        PlayCount: number;
-        PlaybackPositionTicks: number;
-        Played: boolean;
-    };
-} & {
-    similarArtists: {
-        items: JFAlbumArtist[];
-    };
-};
-
-export type JFArtist = {
-    BackdropImageTags: string[];
-    ChannelId: null;
-    DateCreated: string;
-    ExternalUrls: ExternalURL[];
-    GenreItems: GenreItem[];
-    Genres: string[];
-    Id: string;
-    ImageBlurHashes: any;
-    ImageTags: string[];
-    LocationType: string;
-    Name: string;
-    Overview?: string;
-    RunTimeTicks: number;
-    ServerId: string;
-    Type: string;
+export type JFAddToPlaylistResponse = {
+    added: number;
 };
 
 export type JFAlbum = {
@@ -251,6 +120,244 @@ export type JFAlbum = {
     songs?: JFSong[];
 };
 
+export type JFAlbumArtist = {
+    BackdropImageTags: string[];
+    ChannelId: null;
+    DateCreated: string;
+    ExternalUrls: ExternalURL[];
+    GenreItems: GenreItem[];
+    Genres: string[];
+    Id: string;
+    ImageBlurHashes: any;
+    ImageTags: ImageTags;
+    LocationType: string;
+    Name: string;
+    Overview?: string;
+    RunTimeTicks: number;
+    ServerId: string;
+    Type: string;
+    UserData: {
+        IsFavorite: boolean;
+        Key: string;
+        PlaybackPositionTicks: number;
+        PlayCount: number;
+        Played: boolean;
+    };
+} & {
+    similarArtists: {
+        items: JFAlbumArtist[];
+    };
+};
+
+export type JFAlbumArtistDetail = JFAlbumArtistDetailResponse;
+
+export type JFAlbumArtistDetailResponse = JFAlbumArtist;
+
+export type JFAlbumArtistList = {
+    items: JFAlbumArtist[];
+    startIndex: number;
+    totalRecordCount: number;
+};
+
+export type JFAlbumArtistListParams = JFBaseParams &
+    JFPaginationParams & {
+        filters?: string;
+        genres?: string;
+        sortBy?: JFAlbumArtistListSort;
+        years?: string;
+    };
+
+export interface JFAlbumArtistListResponse extends JFBasePaginatedResponse {
+    Items: JFAlbumArtist[];
+}
+
+export type JFAlbumDetail = JFAlbum & { songs?: JFSong[] };
+
+export type JFAlbumDetailResponse = JFAlbum;
+
+export type JFAlbumList = {
+    items: JFAlbum[];
+    startIndex: number;
+    totalRecordCount: number;
+};
+
+export type JFAlbumListParams = JFBaseParams &
+    JFPaginationParams & {
+        albumArtistIds?: string;
+        artistIds?: string;
+        filters?: string;
+        genreIds?: string;
+        genres?: string;
+        includeItemTypes: 'MusicAlbum';
+        isFavorite?: boolean;
+        searchTerm?: string;
+        sortBy?: JFAlbumListSort;
+        tags?: string;
+        years?: string;
+    };
+
+export interface JFAlbumListResponse extends JFBasePaginatedResponse {
+    Items: JFAlbum[];
+}
+
+export type JFArtist = {
+    BackdropImageTags: string[];
+    ChannelId: null;
+    DateCreated: string;
+    ExternalUrls: ExternalURL[];
+    GenreItems: GenreItem[];
+    Genres: string[];
+    Id: string;
+    ImageBlurHashes: any;
+    ImageTags: string[];
+    LocationType: string;
+    Name: string;
+    Overview?: string;
+    RunTimeTicks: number;
+    ServerId: string;
+    Type: string;
+};
+
+export type JFArtistList = JFArtistListResponse;
+
+export type JFArtistListParams = JFBaseParams &
+    JFPaginationParams & {
+        filters?: string;
+        genres?: string;
+        sortBy?: JFArtistListSort;
+        years?: string;
+    };
+
+export interface JFArtistListResponse extends JFBasePaginatedResponse {
+    Items: JFAlbumArtist[];
+}
+
+export interface JFAuthenticate {
+    AccessToken: string;
+    ServerId: string;
+    SessionInfo: SessionInfo;
+    User: User;
+}
+
+export type JFBasePaginatedResponse = {
+    StartIndex: number;
+    TotalRecordCount: number;
+};
+
+export type JFCreatePlaylist = JFCreatePlaylistResponse;
+
+export type JFCreatePlaylistResponse = {
+    Id: string;
+};
+
+export type JFGenericItem = {
+    Id: string;
+    Name: string;
+};
+
+export type JFGenre = {
+    BackdropImageTags: any[];
+    ChannelId: null;
+    Id: string;
+    ImageBlurHashes: any;
+    ImageTags: ImageTags;
+    LocationType: string;
+    Name: string;
+    ServerId: string;
+    Type: string;
+};
+
+export type JFGenreList = JFGenreListResponse;
+
+export interface JFGenreListResponse extends JFBasePaginatedResponse {
+    Items: JFGenre[];
+}
+
+export type JFMusicFolder = {
+    BackdropImageTags: string[];
+    ChannelId: null;
+    CollectionType: string;
+    Id: string;
+    ImageBlurHashes: ImageBlurHashes;
+    ImageTags: ImageTags;
+    IsFolder: boolean;
+    LocationType: string;
+    Name: string;
+    ServerId: string;
+    Type: string;
+    UserData: UserData;
+};
+
+export type JFMusicFolderList = JFMusicFolder[];
+
+export interface JFMusicFolderListResponse extends JFBasePaginatedResponse {
+    Items: JFMusicFolder[];
+}
+
+export type JFPlaylist = {
+    BackdropImageTags: string[];
+    ChannelId: null;
+    ChildCount?: number;
+    DateCreated: string;
+    GenreItems: GenreItem[];
+    Genres: string[];
+    Id: string;
+    ImageBlurHashes: ImageBlurHashes;
+    ImageTags: ImageTags;
+    IsFolder: boolean;
+    LocationType: string;
+    MediaType: string;
+    Name: string;
+    Overview?: string;
+    RunTimeTicks: number;
+    ServerId: string;
+    Type: string;
+    UserData: UserData;
+};
+
+export type JFPlaylistDetail = JFPlaylist & { songs?: JFSong[] };
+
+export type JFPlaylistDetailResponse = JFPlaylist;
+
+export type JFPlaylistList = {
+    items: JFPlaylist[];
+    startIndex: number;
+    totalRecordCount: number;
+};
+
+export interface JFPlaylistListResponse extends JFBasePaginatedResponse {
+    Items: JFPlaylist[];
+}
+
+export type JFRemoveFromPlaylist = null;
+
+export type JFRemoveFromPlaylistParams = {
+    entryIds: string[];
+};
+
+export type JFRemoveFromPlaylistResponse = null;
+
+export type JFRequestParams = {
+    albumArtistIds?: string;
+    artistIds?: string;
+    enableImageTypes?: string;
+    enableTotalRecordCount?: boolean;
+    enableUserData?: boolean;
+    excludeItemTypes?: string;
+    fields?: string;
+    imageTypeLimit?: number;
+    includeItemTypes?: string;
+    isFavorite?: boolean;
+    limit?: number;
+    parentId?: string;
+    recursive?: boolean;
+    searchTerm?: string;
+    sortBy?: string;
+    sortOrder?: 'Ascending' | 'Descending';
+    startIndex?: number;
+    userId?: string;
+};
+
 export type JFSong = {
     Album: string;
     AlbumArtist: string;
@@ -285,23 +392,56 @@ export type JFSong = {
     UserData?: UserData;
 };
 
-type ImageBlurHashes = {
-    Backdrop?: any;
-    Logo?: any;
-    Primary?: any;
+export type JFSongList = {
+    items: JFSong[];
+    startIndex: number;
+    totalRecordCount: number;
 };
 
-type ImageTags = {
-    Logo?: string;
-    Primary?: string;
+export type JFSongListParams = JFBaseParams &
+    JFPaginationParams & {
+        albumArtistIds?: string;
+        albumIds?: string;
+        artistIds?: string;
+        contributingArtistIds?: string;
+        filters?: string;
+        genreIds?: string;
+        genres?: string;
+        ids?: string;
+        includeItemTypes: 'Audio';
+        searchTerm?: string;
+        sortBy?: JFSongListSort;
+        years?: string;
+    };
+
+export interface JFSongListResponse extends JFBasePaginatedResponse {
+    Items: JFSong[];
+}
+
+type Capabilities = {
+    PlayableMediaTypes: any[];
+    SupportedCommands: any[];
+    SupportsContentUploading: boolean;
+    SupportsMediaControl: boolean;
+    SupportsPersistentIdentifier: boolean;
+    SupportsSync: boolean;
 };
 
-type UserData = {
-    IsFavorite: boolean;
-    Key: string;
-    PlayCount: number;
-    PlaybackPositionTicks: number;
-    Played: boolean;
+type Configuration = {
+    DisplayCollectionsView: boolean;
+    DisplayMissingEpisodes: boolean;
+    EnableLocalPassword: boolean;
+    EnableNextEpisodeAutoPlay: boolean;
+    GroupedFolders: any[];
+    HidePlayedInLatest: boolean;
+    LatestItemsExcludes: any[];
+    MyMediaExcludes: any[];
+    OrderedViews: any[];
+    PlayDefaultAudioTrack: boolean;
+    RememberAudioSelections: boolean;
+    RememberSubtitleSelections: boolean;
+    SubtitleLanguagePreference: string;
+    SubtitleMode: string;
 };
 
 type ExternalURL = {
@@ -314,9 +454,32 @@ type GenreItem = {
     Name: string;
 };
 
-export type JFGenericItem = {
-    Id: string;
-    Name: string;
+type ImageBlurHashes = {
+    Backdrop?: any;
+    Logo?: any;
+    Primary?: any;
+};
+
+type ImageTags = {
+    Logo?: string;
+    Primary?: string;
+};
+
+type JFBaseParams = {
+    enableImageTypes?: JFImageType[];
+    fields?: string;
+    imageTypeLimit?: number;
+    parentId?: string;
+    recursive?: boolean;
+    searchTerm?: string;
+    userId?: string;
+};
+
+type JFPaginationParams = {
+    limit?: number;
+    nameStartsWith?: string;
+    sortOrder?: JFSortOrder;
+    startIndex?: number;
 };
 
 type MediaSources = {
@@ -380,32 +543,53 @@ type MediaStream = {
     Width?: number;
 };
 
-export enum JFExternalType {
-    MUSICBRAINZ = 'MusicBrainz',
-    THEAUDIODB = 'TheAudioDb',
-}
+type PlayState = {
+    CanSeek: boolean;
+    IsMuted: boolean;
+    IsPaused: boolean;
+    RepeatMode: string;
+};
 
-export enum JFImageType {
-    LOGO = 'Logo',
-    PRIMARY = 'Primary',
-}
-
-export enum JFItemType {
-    AUDIO = 'Audio',
-    MUSICALBUM = 'MusicAlbum',
-}
-
-export enum JFCollectionType {
-    MUSIC = 'music',
-    PLAYLISTS = 'playlists',
-}
-
-export interface JFAuthenticate {
-    AccessToken: string;
-    ServerId: string;
-    SessionInfo: SessionInfo;
-    User: User;
-}
+type Policy = {
+    AccessSchedules: any[];
+    AuthenticationProviderId: string;
+    BlockedChannels: any[];
+    BlockedMediaFolders: any[];
+    BlockedTags: any[];
+    BlockUnratedItems: any[];
+    EnableAllChannels: boolean;
+    EnableAllDevices: boolean;
+    EnableAllFolders: boolean;
+    EnableAudioPlaybackTranscoding: boolean;
+    EnableContentDeletion: boolean;
+    EnableContentDeletionFromFolders: any[];
+    EnableContentDownloading: boolean;
+    EnabledChannels: any[];
+    EnabledDevices: any[];
+    EnabledFolders: any[];
+    EnableLiveTvAccess: boolean;
+    EnableLiveTvManagement: boolean;
+    EnableMediaConversion: boolean;
+    EnableMediaPlayback: boolean;
+    EnablePlaybackRemuxing: boolean;
+    EnablePublicSharing: boolean;
+    EnableRemoteAccess: boolean;
+    EnableRemoteControlOfOtherUsers: boolean;
+    EnableSharedDeviceControl: boolean;
+    EnableSyncTranscoding: boolean;
+    EnableUserPreferenceAccess: boolean;
+    EnableVideoPlaybackTranscoding: boolean;
+    ForceRemoteSourceTranscoding: boolean;
+    InvalidLoginAttemptCount: number;
+    IsAdministrator: boolean;
+    IsDisabled: boolean;
+    IsHidden: boolean;
+    LoginAttemptsBeforeLockout: number;
+    MaxActiveSessions: number;
+    PasswordResetProviderId: string;
+    RemoteClientBitrateLimit: number;
+    SyncPlayAccess: string;
+};
 
 type SessionInfo = {
     AdditionalUsers: any[];
@@ -421,8 +605,8 @@ type SessionInfo = {
     LastPlaybackCheckIn: string;
     NowPlayingQueue: any[];
     NowPlayingQueueFullItems: any[];
-    PlayState: PlayState;
     PlayableMediaTypes: any[];
+    PlayState: PlayState;
     RemoteEndPoint: string;
     ServerId: string;
     SupportedCommands: any[];
@@ -432,22 +616,6 @@ type SessionInfo = {
     UserName: string;
 };
 
-type Capabilities = {
-    PlayableMediaTypes: any[];
-    SupportedCommands: any[];
-    SupportsContentUploading: boolean;
-    SupportsMediaControl: boolean;
-    SupportsPersistentIdentifier: boolean;
-    SupportsSync: boolean;
-};
-
-type PlayState = {
-    CanSeek: boolean;
-    IsMuted: boolean;
-    IsPaused: boolean;
-    RepeatMode: string;
-};
-
 type User = {
     Configuration: Configuration;
     EnableAutoLogin: boolean;
@@ -462,178 +630,10 @@ type User = {
     ServerId: string;
 };
 
-type Configuration = {
-    DisplayCollectionsView: boolean;
-    DisplayMissingEpisodes: boolean;
-    EnableLocalPassword: boolean;
-    EnableNextEpisodeAutoPlay: boolean;
-    GroupedFolders: any[];
-    HidePlayedInLatest: boolean;
-    LatestItemsExcludes: any[];
-    MyMediaExcludes: any[];
-    OrderedViews: any[];
-    PlayDefaultAudioTrack: boolean;
-    RememberAudioSelections: boolean;
-    RememberSubtitleSelections: boolean;
-    SubtitleLanguagePreference: string;
-    SubtitleMode: string;
+type UserData = {
+    IsFavorite: boolean;
+    Key: string;
+    PlaybackPositionTicks: number;
+    PlayCount: number;
+    Played: boolean;
 };
-
-type Policy = {
-    AccessSchedules: any[];
-    AuthenticationProviderId: string;
-    BlockUnratedItems: any[];
-    BlockedChannels: any[];
-    BlockedMediaFolders: any[];
-    BlockedTags: any[];
-    EnableAllChannels: boolean;
-    EnableAllDevices: boolean;
-    EnableAllFolders: boolean;
-    EnableAudioPlaybackTranscoding: boolean;
-    EnableContentDeletion: boolean;
-    EnableContentDeletionFromFolders: any[];
-    EnableContentDownloading: boolean;
-    EnableLiveTvAccess: boolean;
-    EnableLiveTvManagement: boolean;
-    EnableMediaConversion: boolean;
-    EnableMediaPlayback: boolean;
-    EnablePlaybackRemuxing: boolean;
-    EnablePublicSharing: boolean;
-    EnableRemoteAccess: boolean;
-    EnableRemoteControlOfOtherUsers: boolean;
-    EnableSharedDeviceControl: boolean;
-    EnableSyncTranscoding: boolean;
-    EnableUserPreferenceAccess: boolean;
-    EnableVideoPlaybackTranscoding: boolean;
-    EnabledChannels: any[];
-    EnabledDevices: any[];
-    EnabledFolders: any[];
-    ForceRemoteSourceTranscoding: boolean;
-    InvalidLoginAttemptCount: number;
-    IsAdministrator: boolean;
-    IsDisabled: boolean;
-    IsHidden: boolean;
-    LoginAttemptsBeforeLockout: number;
-    MaxActiveSessions: number;
-    PasswordResetProviderId: string;
-    RemoteClientBitrateLimit: number;
-    SyncPlayAccess: string;
-};
-
-type JFBaseParams = {
-    enableImageTypes?: JFImageType[];
-    fields?: string;
-    imageTypeLimit?: number;
-    parentId?: string;
-    recursive?: boolean;
-    searchTerm?: string;
-    userId?: string;
-};
-
-type JFPaginationParams = {
-    limit?: number;
-    nameStartsWith?: string;
-    sortOrder?: JFSortOrder;
-    startIndex?: number;
-};
-
-export enum JFSortOrder {
-    ASC = 'Ascending',
-    DESC = 'Descending',
-}
-
-export enum JFAlbumListSort {
-    ALBUM_ARTIST = 'AlbumArtist,SortName',
-    COMMUNITY_RATING = 'CommunityRating,SortName',
-    CRITIC_RATING = 'CriticRating,SortName',
-    NAME = 'SortName',
-    PLAY_COUNT = 'PlayCount',
-    RANDOM = 'Random,SortName',
-    RECENTLY_ADDED = 'DateCreated,SortName',
-    RELEASE_DATE = 'ProductionYear,PremiereDate,SortName',
-}
-
-export type JFAlbumListParams = {
-    albumArtistIds?: string;
-    artistIds?: string;
-    filters?: string;
-    genreIds?: string;
-    genres?: string;
-    includeItemTypes: 'MusicAlbum';
-    isFavorite?: boolean;
-    searchTerm?: string;
-    sortBy?: JFAlbumListSort;
-    tags?: string;
-    years?: string;
-} & JFBaseParams &
-    JFPaginationParams;
-
-export enum JFSongListSort {
-    ALBUM = 'Album,SortName',
-    ALBUM_ARTIST = 'AlbumArtist,Album,SortName',
-    ARTIST = 'Artist,Album,SortName',
-    COMMUNITY_RATING = 'CommunityRating,SortName',
-    DURATION = 'Runtime,AlbumArtist,Album,SortName',
-    NAME = 'Name',
-    PLAY_COUNT = 'PlayCount,SortName',
-    RANDOM = 'Random,SortName',
-    RECENTLY_ADDED = 'DateCreated,SortName',
-    RECENTLY_PLAYED = 'DatePlayed,SortName',
-    RELEASE_DATE = 'PremiereDate,AlbumArtist,Album,SortName',
-}
-
-export type JFSongListParams = {
-    albumArtistIds?: string;
-    albumIds?: string;
-    artistIds?: string;
-    contributingArtistIds?: string;
-    filters?: string;
-    genreIds?: string;
-    genres?: string;
-    ids?: string;
-    includeItemTypes: 'Audio';
-    searchTerm?: string;
-    sortBy?: JFSongListSort;
-    years?: string;
-} & JFBaseParams &
-    JFPaginationParams;
-
-export enum JFAlbumArtistListSort {
-    ALBUM = 'Album,SortName',
-    DURATION = 'Runtime,AlbumArtist,Album,SortName',
-    NAME = 'SortName,Name',
-    RANDOM = 'Random,SortName',
-    RECENTLY_ADDED = 'DateCreated,SortName',
-    RELEASE_DATE = 'PremiereDate,AlbumArtist,Album,SortName',
-}
-
-export type JFAlbumArtistListParams = {
-    filters?: string;
-    genres?: string;
-    sortBy?: JFAlbumArtistListSort;
-    years?: string;
-} & JFBaseParams &
-    JFPaginationParams;
-
-export enum JFArtistListSort {
-    ALBUM = 'Album,SortName',
-    DURATION = 'Runtime,AlbumArtist,Album,SortName',
-    NAME = 'SortName,Name',
-    RANDOM = 'Random,SortName',
-    RECENTLY_ADDED = 'DateCreated,SortName',
-    RELEASE_DATE = 'PremiereDate,AlbumArtist,Album,SortName',
-}
-
-export type JFArtistListParams = {
-    filters?: string;
-    genres?: string;
-    sortBy?: JFArtistListSort;
-    years?: string;
-} & JFBaseParams &
-    JFPaginationParams;
-
-export type JFCreatePlaylistResponse = {
-    Id: string;
-};
-
-export type JFCreatePlaylist = JFCreatePlaylistResponse;
diff --git a/src/renderer/api/jellyfin/jellyfin-api.ts b/src/renderer/api/jellyfin/jellyfin-api.ts
index acb50b51..82fc61cc 100644
--- a/src/renderer/api/jellyfin/jellyfin-api.ts
+++ b/src/renderer/api/jellyfin/jellyfin-api.ts
@@ -1,15 +1,17 @@
-import { useAuthStore } from '/@/renderer/store';
-import { jfType } from '/@/renderer/api/jellyfin/jellyfin-types';
 import { initClient, initContract } from '@ts-rest/core';
 import axios, { AxiosError, AxiosResponse, isAxiosError, Method } from 'axios';
-import qs from 'qs';
-import { ServerListItem } from '/@/renderer/api/types';
 import omitBy from 'lodash/omitBy';
+import qs from 'qs';
 import { z } from 'zod';
-import { authenticationFailure, getClientType } from '/@/renderer/api/utils';
-import i18n from '/@/i18n/i18n';
+
 import packageJson from '../../../../package.json';
 
+import i18n from '/@/i18n/i18n';
+import { jfType } from '/@/renderer/api/jellyfin/jellyfin-types';
+import { ServerListItem } from '/@/renderer/api/types';
+import { authenticationFailure, getClientType } from '/@/renderer/api/utils';
+import { useAuthStore } from '/@/renderer/store';
+
 const c = initContract();
 
 export const contract = c.router({
@@ -356,14 +358,14 @@ export const createAuthHeader = (): string => {
 };
 
 export const jfApiClient = (args: {
-    server: ServerListItem | null;
+    server: null | ServerListItem;
     signal?: AbortSignal;
     url?: string;
 }) => {
-    const { server, url, signal } = args;
+    const { server, signal, url } = args;
 
     return initClient(contract, {
-        api: async ({ path, method, headers, body }) => {
+        api: async ({ body, headers, method, path }) => {
             let baseUrl: string | undefined;
             let token: string | undefined;
 
@@ -395,7 +397,7 @@ export const jfApiClient = (args: {
                     headers: result.headers as any,
                     status: result.status,
                 };
-            } catch (e: Error | AxiosError | any) {
+            } catch (e: any | AxiosError | Error) {
                 if (isAxiosError(e)) {
                     if (e.code === 'ERR_NETWORK') {
                         throw new Error(
diff --git a/src/renderer/api/jellyfin/jellyfin-controller.ts b/src/renderer/api/jellyfin/jellyfin-controller.ts
index be1136cd..564c6cba 100644
--- a/src/renderer/api/jellyfin/jellyfin-controller.ts
+++ b/src/renderer/api/jellyfin/jellyfin-controller.ts
@@ -1,23 +1,25 @@
+import chunk from 'lodash/chunk';
+import { z } from 'zod';
+
+import { jfNormalize } from './jellyfin-normalize';
+
+import { ServerFeature } from '/@/renderer/api/features-types';
+import { JFSongListSort, JFSortOrder } from '/@/renderer/api/jellyfin.types';
+import { jfApiClient } from '/@/renderer/api/jellyfin/jellyfin-api';
+import { jfType } from '/@/renderer/api/jellyfin/jellyfin-types';
 import {
     albumArtistListSortMap,
-    sortOrderMap,
     albumListSortMap,
-    songListSortMap,
-    playlistListSortMap,
-    genreListSortMap,
-    Song,
-    Played,
     ControllerEndpoint,
+    genreListSortMap,
     LibraryItem,
+    Played,
+    playlistListSortMap,
+    Song,
+    songListSortMap,
+    sortOrderMap,
 } from '/@/renderer/api/types';
-import { jfApiClient } from '/@/renderer/api/jellyfin/jellyfin-api';
-import { jfNormalize } from './jellyfin-normalize';
-import { jfType } from '/@/renderer/api/jellyfin/jellyfin-types';
-import { z } from 'zod';
-import { JFSongListSort, JFSortOrder } from '/@/renderer/api/jellyfin.types';
-import { ServerFeature } from '/@/renderer/api/features-types';
-import { VersionInfo, getFeatures, hasFeature } from '/@/renderer/api/utils';
-import chunk from 'lodash/chunk';
+import { getFeatures, hasFeature, VersionInfo } from '/@/renderer/api/utils';
 
 const formatCommaDelimitedString = (value: string[]) => {
     return value.join(',');
@@ -41,7 +43,7 @@ const VERSION_INFO: VersionInfo = [
 
 export const JellyfinController: ControllerEndpoint = {
     addToPlaylist: async (args) => {
-        const { query, body, apiClientProps } = args;
+        const { apiClientProps, body, query } = args;
 
         if (!apiClientProps.server?.userId) {
             throw new Error('No userId found');
@@ -89,7 +91,7 @@ export const JellyfinController: ControllerEndpoint = {
         };
     },
     createFavorite: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         if (!apiClientProps.server?.userId) {
             throw new Error('No userId found');
@@ -108,7 +110,7 @@ export const JellyfinController: ControllerEndpoint = {
         return null;
     },
     createPlaylist: async (args) => {
-        const { body, apiClientProps } = args;
+        const { apiClientProps, body } = args;
 
         if (!apiClientProps.server?.userId) {
             throw new Error('No userId found');
@@ -132,7 +134,7 @@ export const JellyfinController: ControllerEndpoint = {
         };
     },
     deleteFavorite: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         if (!apiClientProps.server?.userId) {
             throw new Error('No userId found');
@@ -151,7 +153,7 @@ export const JellyfinController: ControllerEndpoint = {
         return null;
     },
     deletePlaylist: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         const res = await jfApiClient(apiClientProps).deletePlaylist({
             params: {
@@ -166,7 +168,7 @@ export const JellyfinController: ControllerEndpoint = {
         return null;
     },
     getAlbumArtistDetail: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         if (!apiClientProps.server?.userId) {
             throw new Error('No userId found');
@@ -201,7 +203,7 @@ export const JellyfinController: ControllerEndpoint = {
         );
     },
     getAlbumArtistList: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         const res = await jfApiClient(apiClientProps).getAlbumArtistList({
             query: {
@@ -236,7 +238,7 @@ export const JellyfinController: ControllerEndpoint = {
             query: { ...query, limit: 1, startIndex: 0 },
         }).then((result) => result!.totalRecordCount!),
     getAlbumDetail: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         if (!apiClientProps.server?.userId) {
             throw new Error('No userId found');
@@ -274,7 +276,7 @@ export const JellyfinController: ControllerEndpoint = {
         );
     },
     getAlbumList: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         if (!apiClientProps.server?.userId) {
             throw new Error('No userId found');
@@ -334,7 +336,7 @@ export const JellyfinController: ControllerEndpoint = {
             query: { ...query, limit: 1, startIndex: 0 },
         }).then((result) => result!.totalRecordCount!),
     getArtistList: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         const res = await jfApiClient(apiClientProps).getArtistList({
             query: {
@@ -404,7 +406,7 @@ export const JellyfinController: ControllerEndpoint = {
         };
     },
     getLyrics: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         if (!apiClientProps.server?.userId) {
             throw new Error('No userId found');
@@ -453,7 +455,7 @@ export const JellyfinController: ControllerEndpoint = {
         };
     },
     getPlaylistDetail: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         if (!apiClientProps.server?.userId) {
             throw new Error('No userId found');
@@ -477,7 +479,7 @@ export const JellyfinController: ControllerEndpoint = {
         return jfNormalize.playlist(res.body, apiClientProps.server);
     },
     getPlaylistList: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         if (!apiClientProps.server?.userId) {
             throw new Error('No userId found');
@@ -515,7 +517,7 @@ export const JellyfinController: ControllerEndpoint = {
             query: { ...query, limit: 1, startIndex: 0 },
         }).then((result) => result!.totalRecordCount!),
     getPlaylistSongList: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         if (!apiClientProps.server?.userId) {
             throw new Error('No userId found');
@@ -547,7 +549,7 @@ export const JellyfinController: ControllerEndpoint = {
         };
     },
     getRandomSongList: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         if (!apiClientProps.server?.userId) {
             throw new Error('No userId found');
@@ -668,7 +670,7 @@ export const JellyfinController: ControllerEndpoint = {
         }, []);
     },
     getSongDetail: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         const res = await jfApiClient(apiClientProps).getSongDetail({
             params: {
@@ -684,7 +686,7 @@ export const JellyfinController: ControllerEndpoint = {
         return jfNormalize.song(res.body, apiClientProps.server, '');
     },
     getSongList: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         if (!apiClientProps.server?.userId) {
             throw new Error('No userId found');
@@ -864,7 +866,7 @@ export const JellyfinController: ControllerEndpoint = {
         };
     },
     getTranscodingUrl: (args) => {
-        const { base, format, bitrate } = args.query;
+        const { base, bitrate, format } = args.query;
         let url = base.replace('transcodingProtocol=hls', 'transcodingProtocol=http');
         if (format) {
             url = url.replace('audioCodec=aac', `audioCodec=${format}`);
@@ -892,7 +894,7 @@ export const JellyfinController: ControllerEndpoint = {
         }
     },
     removeFromPlaylist: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         const chunks = chunk(query.songId, MAX_ITEMS_PER_PLAYLIST_ADD);
 
@@ -914,7 +916,7 @@ export const JellyfinController: ControllerEndpoint = {
         return null;
     },
     scrobble: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         const position = query.position && Math.round(query.position);
 
@@ -978,7 +980,7 @@ export const JellyfinController: ControllerEndpoint = {
         return null;
     },
     search: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         if (!apiClientProps.server?.userId) {
             throw new Error('No userId found');
@@ -1071,7 +1073,7 @@ export const JellyfinController: ControllerEndpoint = {
         };
     },
     updatePlaylist: async (args) => {
-        const { query, body, apiClientProps } = args;
+        const { apiClientProps, body, query } = args;
 
         if (!apiClientProps.server?.userId) {
             throw new Error('No userId found');
diff --git a/src/renderer/api/jellyfin/jellyfin-normalize.ts b/src/renderer/api/jellyfin/jellyfin-normalize.ts
index 5bfd7b25..f61d86bb 100644
--- a/src/renderer/api/jellyfin/jellyfin-normalize.ts
+++ b/src/renderer/api/jellyfin/jellyfin-normalize.ts
@@ -1,18 +1,19 @@
 import { nanoid } from 'nanoid';
 import { z } from 'zod';
-import { JFAlbum, JFPlaylist, JFMusicFolder, JFGenre } from '/@/renderer/api/jellyfin.types';
+
+import { JFAlbum, JFGenre, JFMusicFolder, JFPlaylist } from '/@/renderer/api/jellyfin.types';
 import { jfType } from '/@/renderer/api/jellyfin/jellyfin-types';
 import {
-    Song,
-    LibraryItem,
     Album,
     AlbumArtist,
-    Playlist,
-    MusicFolder,
     Genre,
+    LibraryItem,
+    MusicFolder,
+    Playlist,
+    RelatedArtist,
     ServerListItem,
     ServerType,
-    RelatedArtist,
+    Song,
 } from '/@/renderer/api/types';
 
 const getStreamUrl = (args: {
@@ -21,9 +22,9 @@ const getStreamUrl = (args: {
     eTag?: string;
     id: string;
     mediaSourceId?: string;
-    server: ServerListItem | null;
+    server: null | ServerListItem;
 }) => {
-    const { id, server, deviceId } = args;
+    const { deviceId, id, server } = args;
 
     return (
         `${server?.url}/audio` +
@@ -122,9 +123,9 @@ const getPlaylistCoverArtUrl = (args: { baseUrl: string; item: JFPlaylist; size:
     );
 };
 
-type AlbumOrSong = z.infer<typeof jfType._response.song> | z.infer<typeof jfType._response.album>;
+type AlbumOrSong = z.infer<typeof jfType._response.album> | z.infer<typeof jfType._response.song>;
 
-const getPeople = (item: AlbumOrSong): Record<string, RelatedArtist[]> | null => {
+const getPeople = (item: AlbumOrSong): null | Record<string, RelatedArtist[]> => {
     if (item.People) {
         const participants: Record<string, RelatedArtist[]> = {};
 
@@ -151,7 +152,7 @@ const getPeople = (item: AlbumOrSong): Record<string, RelatedArtist[]> | null =>
     return null;
 };
 
-const getTags = (item: AlbumOrSong): Record<string, string[]> | null => {
+const getTags = (item: AlbumOrSong): null | Record<string, string[]> => {
     if (item.Tags) {
         const tags: Record<string, string[]> = {};
         for (const tag of item.Tags) {
@@ -166,7 +167,7 @@ const getTags = (item: AlbumOrSong): Record<string, string[]> | null => {
 
 const normalizeSong = (
     item: z.infer<typeof jfType._response.song>,
-    server: ServerListItem | null,
+    server: null | ServerListItem,
     deviceId: string,
     imageSize?: number,
 ): Song => {
@@ -252,7 +253,7 @@ const normalizeSong = (
 
 const normalizeAlbum = (
     item: z.infer<typeof jfType._response.album>,
-    server: ServerListItem | null,
+    server: null | ServerListItem,
     imageSize?: number,
 ): Album => {
     return {
@@ -312,7 +313,7 @@ const normalizeAlbumArtist = (
     item: z.infer<typeof jfType._response.albumArtist> & {
         similarArtists?: z.infer<typeof jfType._response.albumArtistList>;
     },
-    server: ServerListItem | null,
+    server: null | ServerListItem,
     imageSize?: number,
 ): AlbumArtist => {
     const similarArtists =
@@ -361,7 +362,7 @@ const normalizeAlbumArtist = (
 
 const normalizePlaylist = (
     item: z.infer<typeof jfType._response.playlist>,
-    server: ServerListItem | null,
+    server: null | ServerListItem,
     imageSize?: number,
 ): Playlist => {
     const imageUrl = getPlaylistCoverArtUrl({
@@ -445,7 +446,7 @@ const getGenreCoverArtUrl = (args: {
     );
 };
 
-const normalizeGenre = (item: JFGenre, server: ServerListItem | null): Genre => {
+const normalizeGenre = (item: JFGenre, server: null | ServerListItem): Genre => {
     return {
         albumCount: undefined,
         id: item.Id,
diff --git a/src/renderer/api/jellyfin/jellyfin-types.ts b/src/renderer/api/jellyfin/jellyfin-types.ts
index 4b3e80f4..074a71ba 100644
--- a/src/renderer/api/jellyfin/jellyfin-types.ts
+++ b/src/renderer/api/jellyfin/jellyfin-types.ts
@@ -95,8 +95,8 @@ const imageBlurHashes = z.object({
 const userData = z.object({
     IsFavorite: z.boolean(),
     Key: z.string(),
-    PlayCount: z.number(),
     PlaybackPositionTicks: z.number(),
+    PlayCount: z.number(),
     Played: z.boolean(),
 });
 
@@ -187,13 +187,13 @@ const sessionInfo = z.object({
     LastPlaybackCheckIn: z.string(),
     NowPlayingQueue: z.array(z.any()),
     NowPlayingQueueFullItems: z.array(z.any()),
+    PlayableMediaTypes: z.array(z.any()),
     PlayState: z.object({
         CanSeek: z.boolean(),
         IsMuted: z.boolean(),
         IsPaused: z.boolean(),
         RepeatMode: z.string(),
     }),
-    PlayableMediaTypes: z.array(z.any()),
     RemoteEndPoint: z.string(),
     ServerId: z.string(),
     SupportedCommands: z.array(z.any()),
@@ -223,10 +223,10 @@ const configuration = z.object({
 const policy = z.object({
     AccessSchedules: z.array(z.any()),
     AuthenticationProviderId: z.string(),
-    BlockUnratedItems: z.array(z.any()),
     BlockedChannels: z.array(z.any()),
     BlockedMediaFolders: z.array(z.any()),
     BlockedTags: z.array(z.any()),
+    BlockUnratedItems: z.array(z.any()),
     EnableAllChannels: z.boolean(),
     EnableAllDevices: z.boolean(),
     EnableAllFolders: z.boolean(),
@@ -234,6 +234,9 @@ const policy = z.object({
     EnableContentDeletion: z.boolean(),
     EnableContentDeletionFromFolders: z.array(z.any()),
     EnableContentDownloading: z.boolean(),
+    EnabledChannels: z.array(z.any()),
+    EnabledDevices: z.array(z.any()),
+    EnabledFolders: z.array(z.any()),
     EnableLiveTvAccess: z.boolean(),
     EnableLiveTvManagement: z.boolean(),
     EnableMediaConversion: z.boolean(),
@@ -246,9 +249,6 @@ const policy = z.object({
     EnableSyncTranscoding: z.boolean(),
     EnableUserPreferenceAccess: z.boolean(),
     EnableVideoPlaybackTranscoding: z.boolean(),
-    EnabledChannels: z.array(z.any()),
-    EnabledDevices: z.array(z.any()),
-    EnabledFolders: z.array(z.any()),
     ForceRemoteSourceTranscoding: z.boolean(),
     InvalidLoginAttemptCount: z.number(),
     IsAdministrator: z.boolean(),
@@ -414,8 +414,8 @@ const song = z.object({
     ImageTags: imageTags,
     IndexNumber: z.number(),
     IsFolder: z.boolean(),
-    LUFS: z.number().optional(),
     LocationType: z.string(),
+    LUFS: z.number().optional(),
     MediaSources: z.array(mediaSources),
     MediaType: z.string(),
     Name: z.string(),
@@ -654,8 +654,8 @@ const favorite = z.object({
     Key: z.string(),
     LastPlayedDate: z.string(),
     Likes: z.boolean(),
-    PlayCount: z.number(),
     PlaybackPositionTicks: z.number(),
+    PlayCount: z.number(),
     Played: z.boolean(),
     PlayedPercentage: z.number(),
     Rating: z.number(),
diff --git a/src/renderer/api/navidrome.types.ts b/src/renderer/api/navidrome.types.ts
index 81eef3a0..15473f6a 100644
--- a/src/renderer/api/navidrome.types.ts
+++ b/src/renderer/api/navidrome.types.ts
@@ -1,30 +1,77 @@
 import { SSArtistInfo } from '/@/renderer/api/subsonic.types';
 
-export type NDAuthenticate = {
-    id: string;
-    isAdmin: boolean;
-    name: string;
-    subsonicSalt: string;
-    subsonicToken: string;
-    token: string;
-    username: string;
+export enum NDAlbumArtistListSort {
+    ALBUM_COUNT = 'albumCount',
+    FAVORITED = 'starred_at',
+    NAME = 'name',
+    PLAY_COUNT = 'playCount',
+    RATING = 'rating',
+    SONG_COUNT = 'songCount',
+}
+
+export enum NDAlbumListSort {
+    ALBUM_ARTIST = 'album_artist',
+    ARTIST = 'artist',
+    DURATION = 'duration',
+    NAME = 'name',
+    PLAY_COUNT = 'play_count',
+    PLAY_DATE = 'play_date',
+    RANDOM = 'random',
+    RATING = 'rating',
+    RECENTLY_ADDED = 'recently_added',
+    SONG_COUNT = 'songCount',
+    STARRED = 'starred_at',
+    YEAR = 'max_year',
+}
+
+export enum NDGenreListSort {
+    NAME = 'name',
+}
+
+export enum NDPlaylistListSort {
+    DURATION = 'duration',
+    NAME = 'name',
+    OWNER = 'owner_name',
+    PUBLIC = 'public',
+    SONG_COUNT = 'songCount',
+    UPDATED_AT = 'updatedAt',
+}
+
+export enum NDSongListSort {
+    ALBUM = 'album',
+    ALBUM_ARTIST = 'order_album_artist_name',
+    ALBUM_SONGS = 'album',
+    ARTIST = 'artist',
+    BPM = 'bpm',
+    CHANNELS = 'channels',
+    COMMENT = 'comment',
+    DURATION = 'duration',
+    FAVORITED = 'starred_at',
+    GENRE = 'genre',
+    ID = 'id',
+    PLAY_COUNT = 'playCount',
+    PLAY_DATE = 'playDate',
+    RANDOM = 'random',
+    RATING = 'rating',
+    RECENTLY_ADDED = 'createdAt',
+    TITLE = 'title',
+    TRACK = 'track',
+    YEAR = 'year',
+}
+
+export enum NDSortOrder {
+    ASC = 'ASC',
+    DESC = 'DESC',
+}
+
+export type NDAddToPlaylist = null;
+
+export type NDAddToPlaylistBody = {
+    ids: string[];
 };
 
-export type NDUser = {
-    createdAt: string;
-    email: string;
-    id: string;
-    isAdmin: boolean;
-    lastAccessAt: string;
-    lastLoginAt: string;
-    name: string;
-    updatedAt: string;
-    userName: string;
-};
-
-export type NDGenre = {
-    id: string;
-    name: string;
+export type NDAddToPlaylistResponse = {
+    added: number;
 };
 
 export type NDAlbum = {
@@ -61,6 +108,193 @@ export type NDAlbum = {
     updatedAt: string;
 } & { songs?: NDSong[] };
 
+export type NDAlbumArtist = {
+    albumCount: number;
+    biography: string;
+    externalInfoUpdatedAt: string;
+    externalUrl: string;
+    fullText: string;
+    genres: NDGenre[];
+    id: string;
+    largeImageUrl?: string;
+    mbzArtistId: string;
+    mediumImageUrl?: string;
+    name: string;
+    orderArtistName: string;
+    playCount: number;
+    playDate: string;
+    rating: number;
+    size: number;
+    smallImageUrl?: string;
+    songCount: number;
+    starred: boolean;
+    starredAt: string;
+} & {
+    similarArtists?: SSArtistInfo['similarArtist'];
+};
+
+export type NDAlbumArtistDetail = NDAlbumArtist;
+
+export type NDAlbumArtistDetailResponse = NDAlbumArtist;
+
+export type NDAlbumArtistList = {
+    items: NDAlbumArtist[];
+    startIndex: number;
+    totalRecordCount: number;
+};
+
+export type NDAlbumArtistListParams = NDOrder &
+    NDPagination & {
+        _sort?: NDAlbumArtistListSort;
+        genre_id?: string;
+        starred?: boolean;
+    };
+
+export type NDAlbumDetail = NDAlbum & { songs?: NDSongListResponse };
+
+export type NDAlbumDetailResponse = NDAlbum;
+
+export type NDAlbumList = {
+    items: NDAlbum[];
+    startIndex: number;
+    totalRecordCount: number;
+};
+
+export type NDAlbumListParams = NDOrder &
+    NDPagination & {
+        _sort?: NDAlbumListSort;
+        album_id?: string;
+        artist_id?: string;
+        compilation?: boolean;
+        genre_id?: string;
+        has_rating?: boolean;
+        id?: string;
+        name?: string;
+        recently_played?: boolean;
+        starred?: boolean;
+        year?: number;
+    };
+
+export type NDAlbumListResponse = NDAlbum[];
+
+export type NDArtistListResponse = NDAlbumArtist[];
+
+export type NDAuthenticate = {
+    id: string;
+    isAdmin: boolean;
+    name: string;
+    subsonicSalt: string;
+    subsonicToken: string;
+    token: string;
+    username: string;
+};
+
+export type NDAuthenticationResponse = NDAuthenticate;
+
+export type NDCreatePlaylist = NDCreatePlaylistResponse;
+
+export type NDCreatePlaylistParams = {
+    comment?: string;
+    name: string;
+    public?: boolean;
+    rules?: null | Record<string, any>;
+};
+
+export type NDCreatePlaylistResponse = {
+    id: string;
+};
+
+export type NDDeletePlaylist = NDDeletePlaylistResponse;
+
+export type NDDeletePlaylistParams = {
+    id: string;
+};
+
+export type NDDeletePlaylistResponse = null;
+
+export type NDGenre = {
+    id: string;
+    name: string;
+};
+
+export type NDGenreList = NDGenre[];
+
+export type NDGenreListParams = NDOrder &
+    NDPagination & {
+        _sort?: NDGenreListSort;
+        id?: string;
+    };
+
+export type NDGenreListResponse = NDGenre[];
+
+export type NDOrder = {
+    _order?: NDSortOrder;
+};
+
+export type NDPagination = {
+    _end?: number;
+    _start?: number;
+};
+
+export type NDPlaylist = {
+    comment: string;
+    createdAt: string;
+    duration: number;
+    evaluatedAt: string;
+    id: string;
+    name: string;
+    ownerId: string;
+    ownerName: string;
+    path: string;
+    public: boolean;
+    rules: null | Record<string, any>;
+    size: number;
+    songCount: number;
+    sync: boolean;
+    updatedAt: string;
+};
+
+export type NDPlaylistDetail = NDPlaylist;
+
+export type NDPlaylistDetailResponse = NDPlaylist;
+
+export type NDPlaylistList = {
+    items: NDPlaylist[];
+    startIndex: number;
+    totalRecordCount: number;
+};
+
+export type NDPlaylistListParams = NDOrder &
+    NDPagination & {
+        _sort?: NDPlaylistListSort;
+        owner_id?: string;
+    };
+
+export type NDPlaylistListResponse = NDPlaylist[];
+
+export type NDPlaylistSong = NDSong & {
+    mediaFileId: string;
+    playlistId: string;
+};
+
+export type NDPlaylistSongList = {
+    items: NDPlaylistSong[];
+    startIndex: number;
+    totalRecordCount: number;
+};
+
+export type NDPlaylistSongListResponse = NDPlaylistSong[];
+
+export type NDRemoveFromPlaylist = null;
+
+export type NDRemoveFromPlaylistParams = {
+    id: string[];
+};
+
+export type NDRemoveFromPlaylistResponse = {
+    ids: string[];
+};
+
 export type NDSong = {
     album: string;
     albumArtist: string;
@@ -107,275 +341,41 @@ export type NDSong = {
     year: number;
 };
 
-export type NDAlbumArtist = {
-    albumCount: number;
-    biography: string;
-    externalInfoUpdatedAt: string;
-    externalUrl: string;
-    fullText: string;
-    genres: NDGenre[];
-    id: string;
-    largeImageUrl?: string;
-    mbzArtistId: string;
-    mediumImageUrl?: string;
-    name: string;
-    orderArtistName: string;
-    playCount: number;
-    playDate: string;
-    rating: number;
-    size: number;
-    smallImageUrl?: string;
-    songCount: number;
-    starred: boolean;
-    starredAt: string;
-} & {
-    similarArtists?: SSArtistInfo['similarArtist'];
-};
-
-export type NDAuthenticationResponse = NDAuthenticate;
-
-export type NDAlbumArtistList = {
-    items: NDAlbumArtist[];
-    startIndex: number;
-    totalRecordCount: number;
-};
-
-export type NDAlbumArtistDetail = NDAlbumArtist;
-
-export type NDAlbumArtistDetailResponse = NDAlbumArtist;
-
-export type NDGenreList = NDGenre[];
-
-export type NDGenreListResponse = NDGenre[];
-
-export type NDAlbumDetailResponse = NDAlbum;
-
-export type NDAlbumDetail = NDAlbum & { songs?: NDSongListResponse };
-
-export type NDAlbumListResponse = NDAlbum[];
-
-export type NDAlbumList = {
-    items: NDAlbum[];
-    startIndex: number;
-    totalRecordCount: number;
-};
-
 export type NDSongDetail = NDSong;
 
 export type NDSongDetailResponse = NDSong;
 
-export type NDSongListResponse = NDSong[];
-
 export type NDSongList = {
     items: NDSong[];
     startIndex: number;
     totalRecordCount: number;
 };
 
-export type NDArtistListResponse = NDAlbumArtist[];
+export type NDSongListParams = NDOrder &
+    NDPagination & {
+        _sort?: NDSongListSort;
+        album_id?: string[];
+        artist_id?: string[];
+        genre_id?: string;
+        starred?: boolean;
+    };
 
-export type NDPagination = {
-    _end?: number;
-    _start?: number;
-};
-
-export enum NDSortOrder {
-    ASC = 'ASC',
-    DESC = 'DESC',
-}
-
-export type NDOrder = {
-    _order?: NDSortOrder;
-};
-
-export enum NDGenreListSort {
-    NAME = 'name',
-}
-
-export type NDGenreListParams = {
-    _sort?: NDGenreListSort;
-    id?: string;
-} & NDPagination &
-    NDOrder;
-
-export enum NDAlbumListSort {
-    ALBUM_ARTIST = 'album_artist',
-    ARTIST = 'artist',
-    DURATION = 'duration',
-    NAME = 'name',
-    PLAY_COUNT = 'play_count',
-    PLAY_DATE = 'play_date',
-    RANDOM = 'random',
-    RATING = 'rating',
-    RECENTLY_ADDED = 'recently_added',
-    SONG_COUNT = 'songCount',
-    STARRED = 'starred_at',
-    YEAR = 'max_year',
-}
-
-export type NDAlbumListParams = {
-    _sort?: NDAlbumListSort;
-    album_id?: string;
-    artist_id?: string;
-    compilation?: boolean;
-    genre_id?: string;
-    has_rating?: boolean;
-    id?: string;
-    name?: string;
-    recently_played?: boolean;
-    starred?: boolean;
-    year?: number;
-} & NDPagination &
-    NDOrder;
-
-export enum NDSongListSort {
-    ALBUM = 'album',
-    ALBUM_ARTIST = 'order_album_artist_name',
-    ALBUM_SONGS = 'album',
-    ARTIST = 'artist',
-    BPM = 'bpm',
-    CHANNELS = 'channels',
-    COMMENT = 'comment',
-    DURATION = 'duration',
-    FAVORITED = 'starred_at',
-    GENRE = 'genre',
-    ID = 'id',
-    PLAY_COUNT = 'playCount',
-    PLAY_DATE = 'playDate',
-    RANDOM = 'random',
-    RATING = 'rating',
-    RECENTLY_ADDED = 'createdAt',
-    TITLE = 'title',
-    TRACK = 'track',
-    YEAR = 'year',
-}
-
-export type NDSongListParams = {
-    _sort?: NDSongListSort;
-    album_id?: string[];
-    artist_id?: string[];
-    genre_id?: string;
-    starred?: boolean;
-} & NDPagination &
-    NDOrder;
-
-export enum NDAlbumArtistListSort {
-    ALBUM_COUNT = 'albumCount',
-    FAVORITED = 'starred_at',
-    NAME = 'name',
-    PLAY_COUNT = 'playCount',
-    RATING = 'rating',
-    SONG_COUNT = 'songCount',
-}
-
-export type NDAlbumArtistListParams = {
-    _sort?: NDAlbumArtistListSort;
-    genre_id?: string;
-    starred?: boolean;
-} & NDPagination &
-    NDOrder;
-
-export type NDAddToPlaylistResponse = {
-    added: number;
-};
-
-export type NDAddToPlaylistBody = {
-    ids: string[];
-};
-
-export type NDAddToPlaylist = null;
-
-export type NDRemoveFromPlaylistResponse = {
-    ids: string[];
-};
-
-export type NDRemoveFromPlaylistParams = {
-    id: string[];
-};
-
-export type NDRemoveFromPlaylist = null;
-
-export type NDCreatePlaylistParams = {
-    comment?: string;
-    name: string;
-    public?: boolean;
-    rules?: Record<string, any> | null;
-};
-
-export type NDCreatePlaylistResponse = {
-    id: string;
-};
-
-export type NDCreatePlaylist = NDCreatePlaylistResponse;
+export type NDSongListResponse = NDSong[];
 
 export type NDUpdatePlaylistParams = Partial<NDPlaylist>;
 
 export type NDUpdatePlaylistResponse = NDPlaylist;
 
-export type NDDeletePlaylistParams = {
-    id: string;
-};
-
-export type NDDeletePlaylistResponse = null;
-
-export type NDDeletePlaylist = NDDeletePlaylistResponse;
-
-export type NDPlaylist = {
-    comment: string;
+export type NDUser = {
     createdAt: string;
-    duration: number;
-    evaluatedAt: string;
+    email: string;
     id: string;
+    isAdmin: boolean;
+    lastAccessAt: string;
+    lastLoginAt: string;
     name: string;
-    ownerId: string;
-    ownerName: string;
-    path: string;
-    public: boolean;
-    rules: Record<string, any> | null;
-    size: number;
-    songCount: number;
-    sync: boolean;
     updatedAt: string;
-};
-
-export type NDPlaylistDetail = NDPlaylist;
-
-export type NDPlaylistDetailResponse = NDPlaylist;
-
-export type NDPlaylistList = {
-    items: NDPlaylist[];
-    startIndex: number;
-    totalRecordCount: number;
-};
-
-export type NDPlaylistListResponse = NDPlaylist[];
-
-export enum NDPlaylistListSort {
-    DURATION = 'duration',
-    NAME = 'name',
-    OWNER = 'owner_name',
-    PUBLIC = 'public',
-    SONG_COUNT = 'songCount',
-    UPDATED_AT = 'updatedAt',
-}
-
-export type NDPlaylistListParams = {
-    _sort?: NDPlaylistListSort;
-    owner_id?: string;
-} & NDPagination &
-    NDOrder;
-
-export type NDPlaylistSong = NDSong & {
-    mediaFileId: string;
-    playlistId: string;
-};
-
-export type NDPlaylistSongListResponse = NDPlaylistSong[];
-
-export type NDPlaylistSongList = {
-    items: NDPlaylistSong[];
-    startIndex: number;
-    totalRecordCount: number;
+    userName: string;
 };
 
 export const NDSongQueryFields = [
@@ -515,12 +515,9 @@ export const NDSongQueryNumberOperators = [
     { label: 'is in the range', value: 'inTheRange' },
 ];
 
-export type NDUserListParams = {
-    _sort?: NDUserListSort;
-} & NDPagination &
-    NDOrder;
-
-export type NDUserListResponse = NDUser[];
+export enum NDUserListSort {
+    NAME = 'name',
+}
 
 export type NDUserList = {
     items: NDUser[];
@@ -528,6 +525,9 @@ export type NDUserList = {
     totalRecordCount: number;
 };
 
-export enum NDUserListSort {
-    NAME = 'name',
-}
+export type NDUserListParams = NDOrder &
+    NDPagination & {
+        _sort?: NDUserListSort;
+    };
+
+export type NDUserListResponse = NDUser[];
diff --git a/src/renderer/api/navidrome/navidrome-api.ts b/src/renderer/api/navidrome/navidrome-api.ts
index 8e5e7529..551d5bea 100644
--- a/src/renderer/api/navidrome/navidrome-api.ts
+++ b/src/renderer/api/navidrome/navidrome-api.ts
@@ -1,17 +1,19 @@
 import { initClient, initContract } from '@ts-rest/core';
-import axios, { Method, AxiosError, AxiosResponse, isAxiosError } from 'axios';
+import axios, { AxiosError, AxiosResponse, isAxiosError, Method } from 'axios';
 import isElectron from 'is-electron';
 import debounce from 'lodash/debounce';
 import omitBy from 'lodash/omitBy';
 import qs from 'qs';
-import { ndType } from './navidrome-types';
-import { authenticationFailure, resultWithHeaders } from '/@/renderer/api/utils';
-import { useAuthStore } from '/@/renderer/store';
-import { ServerListItem } from '/@/renderer/api/types';
-import { toast } from '/@/renderer/components/toast';
-import i18n from '/@/i18n/i18n';
 
-const localSettings = isElectron() ? window.electron.localSettings : null;
+import { ndType } from './navidrome-types';
+
+import i18n from '/@/i18n/i18n';
+import { ServerListItem } from '/@/renderer/api/types';
+import { authenticationFailure, resultWithHeaders } from '/@/renderer/api/utils';
+import { toast } from '/@/renderer/components/toast';
+import { useAuthStore } from '/@/renderer/store';
+
+const localSettings = isElectron() ? window.api.localSettings : null;
 
 const c = initContract();
 
@@ -275,7 +277,7 @@ axiosClient.interceptors.response.use(
                 // eslint-disable-next-line promise/no-promise-in-callback
                 return localSettings
                     .passwordGet(currentServer.id)
-                    .then(async (password: string | null) => {
+                    .then(async (password: null | string) => {
                         authSuccess = false;
 
                         if (password === null) {
@@ -367,14 +369,14 @@ axiosClient.interceptors.response.use(
 );
 
 export const ndApiClient = (args: {
-    server: ServerListItem | null;
+    server: null | ServerListItem;
     signal?: AbortSignal;
     url?: string;
 }) => {
-    const { server, url, signal } = args;
+    const { server, signal, url } = args;
 
     return initClient(contract, {
-        api: async ({ path, method, headers, body }) => {
+        api: async ({ body, headers, method, path }) => {
             let baseUrl: string | undefined;
             let token: string | undefined;
 
@@ -406,7 +408,7 @@ export const ndApiClient = (args: {
                     headers: result.headers as any,
                     status: result.status,
                 };
-            } catch (e: Error | AxiosError | any) {
+            } catch (e: any | AxiosError | Error) {
                 if (isAxiosError(e)) {
                     if (e.code === 'ERR_NETWORK') {
                         throw new Error(
diff --git a/src/renderer/api/navidrome/navidrome-controller.ts b/src/renderer/api/navidrome/navidrome-controller.ts
index 2d50be8c..84b2b986 100644
--- a/src/renderer/api/navidrome/navidrome-controller.ts
+++ b/src/renderer/api/navidrome/navidrome-controller.ts
@@ -1,28 +1,29 @@
+import {
+    albumArtistListSortMap,
+    albumListSortMap,
+    AuthenticationResponse,
+    ControllerEndpoint,
+    genreListSortMap,
+    playlistListSortMap,
+    PlaylistSongListArgs,
+    PlaylistSongListResponse,
+    ServerListItem,
+    Song,
+    songListSortMap,
+    sortOrderMap,
+    userListSortMap,
+} from '../types';
+
+import { ServerFeature, ServerFeatures } from '/@/renderer/api/features-types';
+import { NDSongListSort } from '/@/renderer/api/navidrome.types';
 import { ndApiClient } from '/@/renderer/api/navidrome/navidrome-api';
 import { ndNormalize } from '/@/renderer/api/navidrome/navidrome-normalize';
 import { ndType } from '/@/renderer/api/navidrome/navidrome-types';
 import { ssApiClient } from '/@/renderer/api/subsonic/subsonic-api';
-import {
-    albumArtistListSortMap,
-    sortOrderMap,
-    AuthenticationResponse,
-    userListSortMap,
-    albumListSortMap,
-    songListSortMap,
-    playlistListSortMap,
-    PlaylistSongListArgs,
-    PlaylistSongListResponse,
-    genreListSortMap,
-    Song,
-    ControllerEndpoint,
-    ServerListItem,
-} from '../types';
-import { VersionInfo, getFeatures, hasFeature } from '/@/renderer/api/utils';
-import { ServerFeature, ServerFeatures } from '/@/renderer/api/features-types';
-import { SubsonicExtensions } from '/@/renderer/api/subsonic/subsonic-types';
-import { NDSongListSort } from '/@/renderer/api/navidrome.types';
-import { ssNormalize } from '/@/renderer/api/subsonic/subsonic-normalize';
 import { SubsonicController } from '/@/renderer/api/subsonic/subsonic-controller';
+import { ssNormalize } from '/@/renderer/api/subsonic/subsonic-normalize';
+import { SubsonicExtensions } from '/@/renderer/api/subsonic/subsonic-types';
+import { getFeatures, hasFeature, VersionInfo } from '/@/renderer/api/utils';
 
 const VERSION_INFO: VersionInfo = [
     ['0.55.0', { [ServerFeature.BFR]: [1] }],
@@ -48,7 +49,7 @@ const NAVIDROME_ROLES: Array<string | { label: string; value: string }> = [
 
 const EXCLUDED_TAGS = new Set<string>(['disctotal', 'genre', 'tracktotal']);
 
-const excludeMissing = (server: ServerListItem | null) => {
+const excludeMissing = (server: null | ServerListItem) => {
     if (hasFeature(server, ServerFeature.BFR)) {
         return { missing: false };
     }
@@ -58,7 +59,7 @@ const excludeMissing = (server: ServerListItem | null) => {
 
 export const NavidromeController: ControllerEndpoint = {
     addToPlaylist: async (args) => {
-        const { body, query, apiClientProps } = args;
+        const { apiClientProps, body, query } = args;
 
         const res = await ndApiClient(apiClientProps).addToPlaylist({
             body: {
@@ -98,7 +99,7 @@ export const NavidromeController: ControllerEndpoint = {
     },
     createFavorite: SubsonicController.createFavorite,
     createPlaylist: async (args) => {
-        const { body, apiClientProps } = args;
+        const { apiClientProps, body } = args;
 
         const res = await ndApiClient(apiClientProps).createPlaylist({
             body: {
@@ -120,7 +121,7 @@ export const NavidromeController: ControllerEndpoint = {
     },
     deleteFavorite: SubsonicController.deleteFavorite,
     deletePlaylist: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         const res = await ndApiClient(apiClientProps).deletePlaylist({
             params: {
@@ -135,7 +136,7 @@ export const NavidromeController: ControllerEndpoint = {
         return null;
     },
     getAlbumArtistDetail: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         const res = await ndApiClient(apiClientProps).getAlbumArtistDetail({
             params: {
@@ -176,7 +177,7 @@ export const NavidromeController: ControllerEndpoint = {
         );
     },
     getAlbumArtistList: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         const res = await ndApiClient(apiClientProps).getAlbumArtistList({
             query: {
@@ -217,7 +218,7 @@ export const NavidromeController: ControllerEndpoint = {
             query: { ...query, limit: 1, startIndex: 0 },
         }).then((result) => result!.totalRecordCount!),
     getAlbumDetail: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         const albumRes = await ndApiClient(apiClientProps).getAlbumDetail({
             params: {
@@ -245,7 +246,7 @@ export const NavidromeController: ControllerEndpoint = {
         );
     },
     getAlbumInfo: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         const albumInfo = await ssApiClient(apiClientProps).getAlbumInfo2({
             query: {
@@ -265,7 +266,7 @@ export const NavidromeController: ControllerEndpoint = {
         };
     },
     getAlbumList: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         const res = await ndApiClient(apiClientProps).getAlbumList({
             query: {
@@ -299,7 +300,7 @@ export const NavidromeController: ControllerEndpoint = {
             query: { ...query, limit: 1, startIndex: 0 },
         }).then((result) => result!.totalRecordCount!),
     getArtistList: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         const res = await ndApiClient(apiClientProps).getAlbumArtistList({
             query: {
@@ -341,7 +342,7 @@ export const NavidromeController: ControllerEndpoint = {
         }).then((result) => result!.totalRecordCount!),
     getDownloadUrl: SubsonicController.getDownloadUrl,
     getGenreList: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         const res = await ndApiClient(apiClientProps).getGenreList({
             query: {
@@ -366,7 +367,7 @@ export const NavidromeController: ControllerEndpoint = {
     getLyrics: SubsonicController.getLyrics,
     getMusicFolderList: SubsonicController.getMusicFolderList,
     getPlaylistDetail: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         const res = await ndApiClient(apiClientProps).getPlaylistDetail({
             params: {
@@ -381,7 +382,7 @@ export const NavidromeController: ControllerEndpoint = {
         return ndNormalize.playlist(res.body.data, apiClientProps.server);
     },
     getPlaylistList: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
         const customQuery = query._custom?.navidrome;
 
         // Smart playlists only became available in 0.48.0. Do not filter for previous versions
@@ -420,7 +421,7 @@ export const NavidromeController: ControllerEndpoint = {
             query: { ...query, limit: 1, startIndex: 0 },
         }).then((result) => result!.totalRecordCount!),
     getPlaylistSongList: async (args: PlaylistSongListArgs): Promise<PlaylistSongListResponse> => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         const res = await ndApiClient(apiClientProps).getPlaylistSongList({
             params: {
@@ -548,7 +549,7 @@ export const NavidromeController: ControllerEndpoint = {
         }, []);
     },
     getSongDetail: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         const res = await ndApiClient(apiClientProps).getSongDetail({
             params: {
@@ -563,7 +564,7 @@ export const NavidromeController: ControllerEndpoint = {
         return ndNormalize.song(res.body.data, apiClientProps.server);
     },
     getSongList: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         const res = await ndApiClient(apiClientProps).getSongList({
             query: {
@@ -642,7 +643,7 @@ export const NavidromeController: ControllerEndpoint = {
     getTopSongs: SubsonicController.getTopSongs,
     getTranscodingUrl: SubsonicController.getTranscodingUrl,
     getUserList: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         const res = await ndApiClient(apiClientProps).getUserList({
             query: {
@@ -682,7 +683,7 @@ export const NavidromeController: ControllerEndpoint = {
         }
     },
     removeFromPlaylist: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         const res = await ndApiClient(apiClientProps).removeFromPlaylist({
             params: {
@@ -703,7 +704,7 @@ export const NavidromeController: ControllerEndpoint = {
     search: SubsonicController.search,
     setRating: SubsonicController.setRating,
     shareItem: async (args) => {
-        const { body, apiClientProps } = args;
+        const { apiClientProps, body } = args;
 
         const res = await ndApiClient(apiClientProps).shareItem({
             body: {
@@ -724,7 +725,7 @@ export const NavidromeController: ControllerEndpoint = {
         };
     },
     updatePlaylist: async (args) => {
-        const { query, body, apiClientProps } = args;
+        const { apiClientProps, body, query } = args;
 
         const res = await ndApiClient(apiClientProps).updatePlaylist({
             body: {
diff --git a/src/renderer/api/navidrome/navidrome-normalize.ts b/src/renderer/api/navidrome/navidrome-normalize.ts
index d5f4f4ab..70d69cee 100644
--- a/src/renderer/api/navidrome/navidrome-normalize.ts
+++ b/src/renderer/api/navidrome/navidrome-normalize.ts
@@ -1,22 +1,24 @@
 import { nanoid } from 'nanoid';
+import z from 'zod';
+
+import { ndType } from './navidrome-types';
+
+import { NDGenre } from '/@/renderer/api/navidrome.types';
+import { ssType } from '/@/renderer/api/subsonic/subsonic-types';
 import {
-    Song,
-    LibraryItem,
     Album,
-    Playlist,
-    User,
     AlbumArtist,
     Genre,
+    LibraryItem,
+    Playlist,
+    RelatedArtist,
     ServerListItem,
     ServerType,
-    RelatedArtist,
+    Song,
+    User,
 } from '/@/renderer/api/types';
-import z from 'zod';
-import { ndType } from './navidrome-types';
-import { ssType } from '/@/renderer/api/subsonic/subsonic-types';
-import { NDGenre } from '/@/renderer/api/navidrome.types';
 
-const getImageUrl = (args: { url: string | null }) => {
+const getImageUrl = (args: { url: null | string }) => {
     const { url } = args;
     if (url === '/app/artist-placeholder.webp') {
         return null;
@@ -51,19 +53,19 @@ interface WithDate {
     playDate?: string;
 }
 
-const normalizePlayDate = (item: WithDate): string | null => {
+const normalizePlayDate = (item: WithDate): null | string => {
     return !item.playDate || item.playDate.includes('0001-') ? null : item.playDate;
 };
 
 const getArtists = (
     item:
-        | z.infer<typeof ndType._response.song>
+        | z.infer<typeof ndType._response.album>
         | z.infer<typeof ndType._response.playlistSong>
-        | z.infer<typeof ndType._response.album>,
+        | z.infer<typeof ndType._response.song>,
 ) => {
     let albumArtists: RelatedArtist[] | undefined;
     let artists: RelatedArtist[] | undefined;
-    let participants: Record<string, RelatedArtist[]> | null = null;
+    let participants: null | Record<string, RelatedArtist[]> = null;
 
     if (item.participants) {
         participants = {};
@@ -120,8 +122,8 @@ const getArtists = (
 };
 
 const normalizeSong = (
-    item: z.infer<typeof ndType._response.song> | z.infer<typeof ndType._response.playlistSong>,
-    server: ServerListItem | null,
+    item: z.infer<typeof ndType._response.playlistSong> | z.infer<typeof ndType._response.song>,
+    server: null | ServerListItem,
     imageSize?: number,
 ): Song => {
     let id;
@@ -204,7 +206,7 @@ const normalizeAlbum = (
     item: z.infer<typeof ndType._response.album> & {
         songs?: z.infer<typeof ndType._response.songList>;
     },
-    server: ServerListItem | null,
+    server: null | ServerListItem,
     imageSize?: number,
 ): Album => {
     const imageUrl = getCoverArtUrl({
@@ -268,7 +270,7 @@ const normalizeAlbumArtist = (
     item: z.infer<typeof ndType._response.albumArtist> & {
         similarArtists?: z.infer<typeof ssType._response.artistInfo>['artistInfo']['similarArtist'];
     },
-    server: ServerListItem | null,
+    server: null | ServerListItem,
 ): AlbumArtist => {
     let imageUrl = getImageUrl({ url: item?.largeImageUrl || null });
 
@@ -332,7 +334,7 @@ const normalizeAlbumArtist = (
 
 const normalizePlaylist = (
     item: z.infer<typeof ndType._response.playlist>,
-    server: ServerListItem | null,
+    server: null | ServerListItem,
     imageSize?: number,
 ): Playlist => {
     const imageUrl = getCoverArtUrl({
diff --git a/src/renderer/api/navidrome/navidrome-types.ts b/src/renderer/api/navidrome/navidrome-types.ts
index 253aa9a8..125f1263 100644
--- a/src/renderer/api/navidrome/navidrome-types.ts
+++ b/src/renderer/api/navidrome/navidrome-types.ts
@@ -1,4 +1,5 @@
 import { z } from 'zod';
+
 import {
     NDAlbumArtistListSort,
     NDAlbumListSort,
diff --git a/src/renderer/api/query-keys.ts b/src/renderer/api/query-keys.ts
index db453566..1c071e3a 100644
--- a/src/renderer/api/query-keys.ts
+++ b/src/renderer/api/query-keys.ts
@@ -1,28 +1,30 @@
 import { QueryFunctionContext } from '@tanstack/react-query';
-import { LyricSource } from './types';
+
 import type {
-    AlbumListQuery,
-    SongListQuery,
-    AlbumDetailQuery,
-    AlbumArtistListQuery,
-    ArtistListQuery,
-    PlaylistListQuery,
-    PlaylistDetailQuery,
-    PlaylistSongListQuery,
-    UserListQuery,
     AlbumArtistDetailQuery,
-    TopSongListQuery,
-    SearchQuery,
-    SongDetailQuery,
-    RandomSongListQuery,
-    LyricsQuery,
-    LyricSearchQuery,
+    AlbumArtistListQuery,
+    AlbumDetailQuery,
+    AlbumListQuery,
+    ArtistListQuery,
     GenreListQuery,
+    LyricSearchQuery,
+    LyricsQuery,
+    PlaylistDetailQuery,
+    PlaylistListQuery,
+    PlaylistSongListQuery,
+    RandomSongListQuery,
+    SearchQuery,
     SimilarSongsQuery,
+    SongDetailQuery,
+    SongListQuery,
+    TopSongListQuery,
+    UserListQuery,
 } from './types';
 
+import { LyricSource } from './types';
+
 export const splitPaginatedQuery = (key: any) => {
-    const { startIndex, limit, ...filter } = key || {};
+    const { limit, startIndex, ...filter } = key || {};
 
     if (startIndex !== undefined || limit !== undefined) {
         return {
@@ -51,7 +53,7 @@ export const queryKeys: Record<
 > = {
     albumArtists: {
         count: (serverId: string, query?: AlbumArtistListQuery) => {
-            const { pagination, filter } = splitPaginatedQuery(query);
+            const { filter, pagination } = splitPaginatedQuery(query);
 
             if (query && pagination) {
                 return [serverId, 'albumArtists', 'count', filter, pagination] as const;
@@ -68,7 +70,7 @@ export const queryKeys: Record<
             return [serverId, 'albumArtists', 'detail'] as const;
         },
         list: (serverId: string, query?: AlbumArtistListQuery) => {
-            const { pagination, filter } = splitPaginatedQuery(query);
+            const { filter, pagination } = splitPaginatedQuery(query);
             if (query && pagination) {
                 return [serverId, 'albumArtists', 'list', filter, pagination] as const;
             }
@@ -87,7 +89,7 @@ export const queryKeys: Record<
     },
     albums: {
         count: (serverId: string, query?: AlbumListQuery, artistId?: string) => {
-            const { pagination, filter } = splitPaginatedQuery(query);
+            const { filter, pagination } = splitPaginatedQuery(query);
 
             if (query && pagination && artistId) {
                 return [serverId, 'albums', 'count', artistId, filter, pagination] as const;
@@ -110,7 +112,7 @@ export const queryKeys: Record<
         detail: (serverId: string, query?: AlbumDetailQuery) =>
             [serverId, 'albums', 'detail', query] as const,
         list: (serverId: string, query?: AlbumListQuery, artistId?: string) => {
-            const { pagination, filter } = splitPaginatedQuery(query);
+            const { filter, pagination } = splitPaginatedQuery(query);
 
             if (query && pagination && artistId) {
                 return [serverId, 'albums', 'list', artistId, filter, pagination] as const;
@@ -144,7 +146,7 @@ export const queryKeys: Record<
     },
     artists: {
         list: (serverId: string, query?: ArtistListQuery) => {
-            const { pagination, filter } = splitPaginatedQuery(query);
+            const { filter, pagination } = splitPaginatedQuery(query);
             if (query && pagination) {
                 return [serverId, 'artists', 'list', filter, pagination] as const;
             }
@@ -159,7 +161,7 @@ export const queryKeys: Record<
     },
     genres: {
         list: (serverId: string, query?: GenreListQuery) => {
-            const { pagination, filter } = splitPaginatedQuery(query);
+            const { filter, pagination } = splitPaginatedQuery(query);
             if (query && pagination) {
                 return [serverId, 'genres', 'list', filter, pagination] as const;
             }
@@ -177,7 +179,7 @@ export const queryKeys: Record<
     },
     playlists: {
         detail: (serverId: string, id?: string, query?: PlaylistDetailQuery) => {
-            const { pagination, filter } = splitPaginatedQuery(query);
+            const { filter, pagination } = splitPaginatedQuery(query);
             if (query && pagination) {
                 return [serverId, 'playlists', id, 'detail', filter, pagination] as const;
             }
@@ -190,7 +192,7 @@ export const queryKeys: Record<
             return [serverId, 'playlists', 'detail'] as const;
         },
         detailSongList: (serverId: string, id: string, query?: PlaylistSongListQuery) => {
-            const { pagination, filter } = splitPaginatedQuery(query);
+            const { filter, pagination } = splitPaginatedQuery(query);
 
             if (query && id && pagination) {
                 return [serverId, 'playlists', id, 'detailSongList', filter, pagination] as const;
@@ -205,7 +207,7 @@ export const queryKeys: Record<
             return [serverId, 'playlists', 'detailSongList'] as const;
         },
         list: (serverId: string, query?: PlaylistListQuery) => {
-            const { pagination, filter } = splitPaginatedQuery(query);
+            const { filter, pagination } = splitPaginatedQuery(query);
             if (query && pagination) {
                 return [serverId, 'playlists', 'list', filter, pagination] as const;
             }
@@ -218,7 +220,7 @@ export const queryKeys: Record<
         },
         root: (serverId: string) => [serverId, 'playlists'] as const,
         songList: (serverId: string, id?: string, query?: PlaylistSongListQuery) => {
-            const { pagination, filter } = splitPaginatedQuery(query);
+            const { filter, pagination } = splitPaginatedQuery(query);
             if (query && id && pagination) {
                 return [serverId, 'playlists', id, 'songList', filter, pagination] as const;
             }
@@ -246,7 +248,7 @@ export const queryKeys: Record<
     },
     songs: {
         count: (serverId: string, query?: SongListQuery) => {
-            const { pagination, filter } = splitPaginatedQuery(query);
+            const { filter, pagination } = splitPaginatedQuery(query);
             if (query && pagination) {
                 return [serverId, 'songs', 'count', filter, pagination] as const;
             }
@@ -262,7 +264,7 @@ export const queryKeys: Record<
             return [serverId, 'songs', 'detail'] as const;
         },
         list: (serverId: string, query?: SongListQuery) => {
-            const { pagination, filter } = splitPaginatedQuery(query);
+            const { filter, pagination } = splitPaginatedQuery(query);
             if (query && pagination) {
                 return [serverId, 'songs', 'list', filter, pagination] as const;
             }
diff --git a/src/renderer/api/subsonic.types.ts b/src/renderer/api/subsonic.types.ts
index 89d103f3..803450df 100644
--- a/src/renderer/api/subsonic.types.ts
+++ b/src/renderer/api/subsonic.types.ts
@@ -1,32 +1,13 @@
-export type SSBaseResponse = {
-    serverVersion?: 'string';
-    status: 'string';
-    type?: 'string';
-    version: 'string';
+export type SSAlbum = SSAlbumListEntry & {
+    song: SSSong[];
 };
 
-export type SSMusicFolderList = SSMusicFolder[];
-
-export type SSMusicFolderListResponse = {
-    musicFolders: {
-        musicFolder: SSMusicFolder[];
-    };
-};
-
-export type SSGenreList = SSGenre[];
-
-export type SSGenreListResponse = {
-    genres: {
-        genre: SSGenre[];
-    };
-};
+export type SSAlbumArtistDetail = SSAlbumArtistListEntry & { album: SSAlbumListEntry[] };
 
 export type SSAlbumArtistDetailParams = {
     id: string;
 };
 
-export type SSAlbumArtistDetail = SSAlbumArtistListEntry & { album: SSAlbumListEntry[] };
-
 export type SSAlbumArtistDetailResponse = {
     artist: SSAlbumArtistListEntry & {
         album: SSAlbumListEntry[];
@@ -36,7 +17,19 @@ export type SSAlbumArtistDetailResponse = {
 export type SSAlbumArtistList = {
     items: SSAlbumArtistListEntry[];
     startIndex: number;
-    totalRecordCount: number | null;
+    totalRecordCount: null | number;
+};
+
+export type SSAlbumArtistListEntry = {
+    albumCount: string;
+    artistImageUrl?: string;
+    coverArt?: string;
+    id: string;
+    name: string;
+};
+
+export type SSAlbumArtistListParams = {
+    musicFolderId?: string;
 };
 
 export type SSAlbumArtistListResponse = {
@@ -47,72 +40,16 @@ export type SSAlbumArtistListResponse = {
     };
 };
 
-export type SSAlbumList = {
-    items: SSAlbumListEntry[];
-    startIndex: number;
-    totalRecordCount: number | null;
-};
-
-export type SSAlbumListResponse = {
-    albumList2: {
-        album: SSAlbumListEntry[];
-    };
-};
-
 export type SSAlbumDetail = Omit<SSAlbum, 'song'> & { songs: SSSong[] };
 
 export type SSAlbumDetailResponse = {
     album: SSAlbum;
 };
 
-export type SSArtistInfoParams = {
-    count?: number;
-    id: string;
-    includeNotPresent?: boolean;
-};
-
-export type SSArtistInfoResponse = {
-    artistInfo2: SSArtistInfo;
-};
-
-export type SSArtistInfo = {
-    biography: string;
-    largeImageUrl?: string;
-    lastFmUrl?: string;
-    mediumImageUrl?: string;
-    musicBrainzId?: string;
-    similarArtist?: {
-        albumCount: string;
-        artistImageUrl?: string;
-        coverArt?: string;
-        id: string;
-        name: string;
-    }[];
-    smallImageUrl?: string;
-};
-
-export type SSMusicFolder = {
-    id: number;
-    name: string;
-};
-
-export type SSGenre = {
-    albumCount?: number;
-    songCount?: number;
-    value: string;
-};
-
-export type SSArtistIndex = {
-    artist: SSAlbumArtistListEntry[];
-    name: string;
-};
-
-export type SSAlbumArtistListEntry = {
-    albumCount: string;
-    artistImageUrl?: string;
-    coverArt?: string;
-    id: string;
-    name: string;
+export type SSAlbumList = {
+    items: SSAlbumListEntry[];
+    startIndex: number;
+    totalRecordCount: null | number;
 };
 
 export type SSAlbumListEntry = {
@@ -135,9 +72,111 @@ export type SSAlbumListEntry = {
     year: number;
 };
 
-export type SSAlbum = {
-    song: SSSong[];
-} & SSAlbumListEntry;
+export type SSAlbumListParams = {
+    fromYear?: number;
+    genre?: string;
+    musicFolderId?: string;
+    offset?: number;
+    size?: number;
+    toYear?: number;
+    type: string;
+};
+
+export type SSAlbumListResponse = {
+    albumList2: {
+        album: SSAlbumListEntry[];
+    };
+};
+
+export type SSArtistIndex = {
+    artist: SSAlbumArtistListEntry[];
+    name: string;
+};
+
+export type SSArtistInfo = {
+    biography: string;
+    largeImageUrl?: string;
+    lastFmUrl?: string;
+    mediumImageUrl?: string;
+    musicBrainzId?: string;
+    similarArtist?: {
+        albumCount: string;
+        artistImageUrl?: string;
+        coverArt?: string;
+        id: string;
+        name: string;
+    }[];
+    smallImageUrl?: string;
+};
+
+export type SSArtistInfoParams = {
+    count?: number;
+    id: string;
+    includeNotPresent?: boolean;
+};
+
+export type SSArtistInfoResponse = {
+    artistInfo2: SSArtistInfo;
+};
+
+export type SSBaseResponse = {
+    serverVersion?: 'string';
+    status: 'string';
+    type?: 'string';
+    version: 'string';
+};
+
+export type SSFavorite = null;
+
+export type SSFavoriteParams = {
+    albumId?: string;
+    artistId?: string;
+    id?: string;
+};
+
+export type SSFavoriteResponse = null;
+
+export type SSGenre = {
+    albumCount?: number;
+    songCount?: number;
+    value: string;
+};
+
+export type SSGenreList = SSGenre[];
+
+export type SSGenreListResponse = {
+    genres: {
+        genre: SSGenre[];
+    };
+};
+
+export type SSMusicFolder = {
+    id: number;
+    name: string;
+};
+
+export type SSMusicFolderList = SSMusicFolder[];
+
+export type SSMusicFolderListResponse = {
+    musicFolders: {
+        musicFolder: SSMusicFolder[];
+    };
+};
+
+export type SSRating = null;
+
+export type SSRatingParams = {
+    id: string;
+    rating: number;
+};
+
+export type SSRatingResponse = null;
+
+export type SSScrobbleParams = {
+    id: string;
+    submission?: boolean;
+    time?: number;
+};
 
 export type SSSong = {
     album: string;
@@ -167,39 +206,12 @@ export type SSSong = {
     year: number;
 };
 
-export type SSAlbumListParams = {
-    fromYear?: number;
-    genre?: string;
-    musicFolderId?: string;
-    offset?: number;
-    size?: number;
-    toYear?: number;
-    type: string;
+export type SSTopSongList = {
+    items: SSSong[];
+    startIndex: number;
+    totalRecordCount: null | number;
 };
 
-export type SSAlbumArtistListParams = {
-    musicFolderId?: string;
-};
-
-export type SSFavoriteParams = {
-    albumId?: string;
-    artistId?: string;
-    id?: string;
-};
-
-export type SSFavorite = null;
-
-export type SSFavoriteResponse = null;
-
-export type SSRatingParams = {
-    id: string;
-    rating: number;
-};
-
-export type SSRating = null;
-
-export type SSRatingResponse = null;
-
 export type SSTopSongListParams = {
     artist: string;
     count?: number;
@@ -210,15 +222,3 @@ export type SSTopSongListResponse = {
         song: SSSong[];
     };
 };
-
-export type SSTopSongList = {
-    items: SSSong[];
-    startIndex: number;
-    totalRecordCount: number | null;
-};
-
-export type SSScrobbleParams = {
-    id: string;
-    submission?: boolean;
-    time?: number;
-};
diff --git a/src/renderer/api/subsonic/subsonic-api.ts b/src/renderer/api/subsonic/subsonic-api.ts
index 23c919d1..f11d5734 100644
--- a/src/renderer/api/subsonic/subsonic-api.ts
+++ b/src/renderer/api/subsonic/subsonic-api.ts
@@ -1,12 +1,13 @@
 import { initClient, initContract } from '@ts-rest/core';
-import axios, { Method, AxiosError, isAxiosError, AxiosResponse } from 'axios';
+import axios, { AxiosError, AxiosResponse, isAxiosError, Method } from 'axios';
 import omitBy from 'lodash/omitBy';
 import qs from 'qs';
 import { z } from 'zod';
+
+import i18n from '/@/i18n/i18n';
 import { ssType } from '/@/renderer/api/subsonic/subsonic-types';
 import { ServerListItem } from '/@/renderer/api/types';
 import { toast } from '/@/renderer/components/toast/index';
-import i18n from '/@/i18n/i18n';
 
 const c = initContract();
 
@@ -284,15 +285,15 @@ const silentlyTransformResponse = (data: any) => {
 };
 
 export const ssApiClient = (args: {
-    server: ServerListItem | null;
+    server: null | ServerListItem;
     signal?: AbortSignal;
     silent?: boolean;
     url?: string;
 }) => {
-    const { server, url, signal, silent } = args;
+    const { server, signal, silent, url } = args;
 
     return initClient(contract, {
-        api: async ({ path, method, headers, body }) => {
+        api: async ({ body, headers, method, path }) => {
             let baseUrl: string | undefined;
             const authParams: Record<string, any> = {};
 
@@ -339,7 +340,7 @@ export const ssApiClient = (args: {
                     headers: result.headers as any,
                     status: result.status,
                 };
-            } catch (e: Error | AxiosError | any) {
+            } catch (e: any | AxiosError | Error) {
                 if (isAxiosError(e)) {
                     if (e.code === 'ERR_NETWORK') {
                         throw new Error(
diff --git a/src/renderer/api/subsonic/subsonic-controller.ts b/src/renderer/api/subsonic/subsonic-controller.ts
index b63698b8..6bea97f8 100644
--- a/src/renderer/api/subsonic/subsonic-controller.ts
+++ b/src/renderer/api/subsonic/subsonic-controller.ts
@@ -2,44 +2,45 @@ import dayjs from 'dayjs';
 import filter from 'lodash/filter';
 import orderBy from 'lodash/orderBy';
 import md5 from 'md5';
+
+import { ServerFeatures } from '/@/renderer/api/features-types';
 import { ssApiClient } from '/@/renderer/api/subsonic/subsonic-api';
 import { ssNormalize } from '/@/renderer/api/subsonic/subsonic-normalize';
 import { AlbumListSortType, SubsonicExtensions } from '/@/renderer/api/subsonic/subsonic-types';
 import {
-    LibraryItem,
-    Song,
-    ControllerEndpoint,
-    sortSongList,
-    sortAlbumArtistList,
-    PlaylistListSort,
-    GenreListSort,
     AlbumListSort,
+    ControllerEndpoint,
+    GenreListSort,
+    LibraryItem,
+    PlaylistListSort,
+    Song,
+    sortAlbumArtistList,
     sortAlbumList,
     SortOrder,
+    sortSongList,
 } from '/@/renderer/api/types';
 import { randomString } from '/@/renderer/utils';
-import { ServerFeatures } from '/@/renderer/api/features-types';
 
 const ALBUM_LIST_SORT_MAPPING: Record<AlbumListSort, AlbumListSortType | undefined> = {
-    [AlbumListSort.RANDOM]: AlbumListSortType.RANDOM,
     [AlbumListSort.ALBUM_ARTIST]: AlbumListSortType.ALPHABETICAL_BY_ARTIST,
-    [AlbumListSort.PLAY_COUNT]: AlbumListSortType.FREQUENT,
-    [AlbumListSort.RECENTLY_ADDED]: AlbumListSortType.NEWEST,
-    [AlbumListSort.FAVORITED]: AlbumListSortType.STARRED,
-    [AlbumListSort.YEAR]: AlbumListSortType.BY_YEAR,
-    [AlbumListSort.NAME]: AlbumListSortType.ALPHABETICAL_BY_NAME,
-    [AlbumListSort.COMMUNITY_RATING]: undefined,
-    [AlbumListSort.DURATION]: undefined,
-    [AlbumListSort.CRITIC_RATING]: undefined,
-    [AlbumListSort.RATING]: undefined,
     [AlbumListSort.ARTIST]: undefined,
+    [AlbumListSort.COMMUNITY_RATING]: undefined,
+    [AlbumListSort.CRITIC_RATING]: undefined,
+    [AlbumListSort.DURATION]: undefined,
+    [AlbumListSort.FAVORITED]: AlbumListSortType.STARRED,
+    [AlbumListSort.NAME]: AlbumListSortType.ALPHABETICAL_BY_NAME,
+    [AlbumListSort.PLAY_COUNT]: AlbumListSortType.FREQUENT,
+    [AlbumListSort.RANDOM]: AlbumListSortType.RANDOM,
+    [AlbumListSort.RATING]: undefined,
+    [AlbumListSort.RECENTLY_ADDED]: AlbumListSortType.NEWEST,
     [AlbumListSort.RECENTLY_PLAYED]: AlbumListSortType.RECENT,
     [AlbumListSort.RELEASE_DATE]: undefined,
     [AlbumListSort.SONG_COUNT]: undefined,
+    [AlbumListSort.YEAR]: AlbumListSortType.BY_YEAR,
 };
 
 export const SubsonicController: ControllerEndpoint = {
-    addToPlaylist: async ({ body, query, apiClientProps }) => {
+    addToPlaylist: async ({ apiClientProps, body, query }) => {
         const res = await ssApiClient(apiClientProps).updatePlaylist({
             query: {
                 playlistId: query.id,
@@ -98,7 +99,7 @@ export const SubsonicController: ControllerEndpoint = {
         };
     },
     createFavorite: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         const res = await ssApiClient(apiClientProps).createFavorite({
             query: {
@@ -114,7 +115,7 @@ export const SubsonicController: ControllerEndpoint = {
 
         return null;
     },
-    createPlaylist: async ({ body, apiClientProps }) => {
+    createPlaylist: async ({ apiClientProps, body }) => {
         const res = await ssApiClient(apiClientProps).createPlaylist({
             query: {
                 name: body.name,
@@ -131,7 +132,7 @@ export const SubsonicController: ControllerEndpoint = {
         };
     },
     deleteFavorite: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         const res = await ssApiClient(apiClientProps).removeFavorite({
             query: {
@@ -148,7 +149,7 @@ export const SubsonicController: ControllerEndpoint = {
         return null;
     },
     deletePlaylist: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         const res = await ssApiClient(apiClientProps).deletePlaylist({
             query: {
@@ -163,7 +164,7 @@ export const SubsonicController: ControllerEndpoint = {
         return null;
     },
     getAlbumArtistDetail: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         const artistInfoRes = await ssApiClient(apiClientProps).getArtistInfo({
             query: {
@@ -198,7 +199,7 @@ export const SubsonicController: ControllerEndpoint = {
         };
     },
     getAlbumArtistList: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         const res = await ssApiClient(apiClientProps).getArtists({
             query: {
@@ -237,7 +238,7 @@ export const SubsonicController: ControllerEndpoint = {
     getAlbumArtistListCount: (args) =>
         SubsonicController.getAlbumArtistList(args).then((res) => res!.totalRecordCount!),
     getAlbumDetail: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         const res = await ssApiClient(apiClientProps).getAlbum({
             query: {
@@ -252,7 +253,7 @@ export const SubsonicController: ControllerEndpoint = {
         return ssNormalize.album(res.body.album, apiClientProps.server);
     },
     getAlbumList: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         if (query.searchTerm) {
             const res = await ssApiClient(apiClientProps).search3({
@@ -398,7 +399,7 @@ export const SubsonicController: ControllerEndpoint = {
         };
     },
     getAlbumListCount: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         if (query.searchTerm) {
             let fetchNextPage = true;
@@ -516,7 +517,7 @@ export const SubsonicController: ControllerEndpoint = {
         return totalRecordCount;
     },
     getArtistList: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         const res = await ssApiClient(apiClientProps).getArtists({
             query: {
@@ -570,7 +571,7 @@ export const SubsonicController: ControllerEndpoint = {
             '&c=Feishin'
         );
     },
-    getGenreList: async ({ query, apiClientProps }) => {
+    getGenreList: async ({ apiClientProps, query }) => {
         const sortOrder = query.sortOrder.toLowerCase() as 'asc' | 'desc';
 
         const res = await ssApiClient(apiClientProps).getGenres({});
@@ -624,7 +625,7 @@ export const SubsonicController: ControllerEndpoint = {
         };
     },
     getPlaylistDetail: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         const res = await ssApiClient(apiClientProps).getPlaylist({
             query: {
@@ -638,7 +639,7 @@ export const SubsonicController: ControllerEndpoint = {
 
         return ssNormalize.playlist(res.body.playlist, apiClientProps.server);
     },
-    getPlaylistList: async ({ query, apiClientProps }) => {
+    getPlaylistList: async ({ apiClientProps, query }) => {
         const sortOrder = query.sortOrder.toLowerCase() as 'asc' | 'desc';
 
         const res = await ssApiClient(apiClientProps).getPlaylists({});
@@ -686,7 +687,7 @@ export const SubsonicController: ControllerEndpoint = {
             totalRecordCount: results.length,
         };
     },
-    getPlaylistListCount: async ({ query, apiClientProps }) => {
+    getPlaylistListCount: async ({ apiClientProps, query }) => {
         const res = await ssApiClient(apiClientProps).getPlaylists({});
 
         if (res.status !== 200) {
@@ -705,7 +706,7 @@ export const SubsonicController: ControllerEndpoint = {
 
         return results.length;
     },
-    getPlaylistSongList: async ({ query, apiClientProps }) => {
+    getPlaylistSongList: async ({ apiClientProps, query }) => {
         const res = await ssApiClient(apiClientProps).getPlaylist({
             query: {
                 id: query.id,
@@ -731,7 +732,7 @@ export const SubsonicController: ControllerEndpoint = {
         };
     },
     getRandomSongList: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         const res = await ssApiClient(apiClientProps).getRandomSongList({
             query: {
@@ -842,7 +843,7 @@ export const SubsonicController: ControllerEndpoint = {
         }, []);
     },
     getSongDetail: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         const res = await ssApiClient(apiClientProps).getSong({
             query: {
@@ -856,7 +857,7 @@ export const SubsonicController: ControllerEndpoint = {
 
         return ssNormalize.song(res.body.song, apiClientProps.server);
     },
-    getSongList: async ({ query, apiClientProps }) => {
+    getSongList: async ({ apiClientProps, query }) => {
         const fromAlbumPromises = [];
         const artistDetailPromises = [];
         let results: any[] = [];
@@ -1028,7 +1029,7 @@ export const SubsonicController: ControllerEndpoint = {
         };
     },
     getSongListCount: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         let fetchNextPage = true;
         let startIndex = 0;
@@ -1196,7 +1197,7 @@ export const SubsonicController: ControllerEndpoint = {
         return totalRecordCount;
     },
     getStructuredLyrics: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         const res = await ssApiClient(apiClientProps).getStructuredLyrics({
             query: {
@@ -1238,7 +1239,7 @@ export const SubsonicController: ControllerEndpoint = {
         });
     },
     getTopSongs: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         const res = await ssApiClient(apiClientProps).getTopSongsList({
             query: {
@@ -1261,7 +1262,7 @@ export const SubsonicController: ControllerEndpoint = {
         };
     },
     getTranscodingUrl: (args) => {
-        const { base, format, bitrate } = args.query;
+        const { base, bitrate, format } = args.query;
         let url = base;
         if (format) {
             url += `&format=${format}`;
@@ -1272,7 +1273,7 @@ export const SubsonicController: ControllerEndpoint = {
 
         return url;
     },
-    removeFromPlaylist: async ({ query, apiClientProps }) => {
+    removeFromPlaylist: async ({ apiClientProps, query }) => {
         const res = await ssApiClient(apiClientProps).updatePlaylist({
             query: {
                 playlistId: query.id,
@@ -1287,7 +1288,7 @@ export const SubsonicController: ControllerEndpoint = {
         return null;
     },
     scrobble: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         const res = await ssApiClient(apiClientProps).scrobble({
             query: {
@@ -1304,7 +1305,7 @@ export const SubsonicController: ControllerEndpoint = {
     },
 
     search: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         const res = await ssApiClient(apiClientProps).search3({
             query: {
@@ -1335,7 +1336,7 @@ export const SubsonicController: ControllerEndpoint = {
         };
     },
     setRating: async (args) => {
-        const { query, apiClientProps } = args;
+        const { apiClientProps, query } = args;
 
         const itemIds = query.item.map((item) => item.id);
 
@@ -1351,7 +1352,7 @@ export const SubsonicController: ControllerEndpoint = {
         return null;
     },
     updatePlaylist: async (args) => {
-        const { body, query, apiClientProps } = args;
+        const { apiClientProps, body, query } = args;
 
         const res = await ssApiClient(apiClientProps).updatePlaylist({
             query: {
diff --git a/src/renderer/api/subsonic/subsonic-normalize.ts b/src/renderer/api/subsonic/subsonic-normalize.ts
index 7f0e2b56..beb98643 100644
--- a/src/renderer/api/subsonic/subsonic-normalize.ts
+++ b/src/renderer/api/subsonic/subsonic-normalize.ts
@@ -1,16 +1,17 @@
 import { nanoid } from 'nanoid';
 import { z } from 'zod';
+
 import { ssType } from '/@/renderer/api/subsonic/subsonic-types';
 import {
-    QueueSong,
-    LibraryItem,
-    AlbumArtist,
     Album,
+    AlbumArtist,
+    Genre,
+    LibraryItem,
+    Playlist,
+    QueueSong,
+    RelatedArtist,
     ServerListItem,
     ServerType,
-    Playlist,
-    Genre,
-    RelatedArtist,
 } from '/@/renderer/api/types';
 
 const getCoverArtUrl = (args: {
@@ -37,9 +38,9 @@ const getCoverArtUrl = (args: {
 
 const getArtists = (
     item:
-        | z.infer<typeof ssType._response.song>
         | z.infer<typeof ssType._response.album>
-        | z.infer<typeof ssType._response.albumListEntry>,
+        | z.infer<typeof ssType._response.albumListEntry>
+        | z.infer<typeof ssType._response.song>,
 ) => {
     const albumArtists: RelatedArtist[] = item.albumArtists
         ? item.albumArtists.map((item) => ({
@@ -69,7 +70,7 @@ const getArtists = (
               },
           ];
 
-    let participants: Record<string, RelatedArtist[]> | null = null;
+    let participants: null | Record<string, RelatedArtist[]> = null;
 
     if (item.contributors) {
         participants = {};
@@ -98,9 +99,9 @@ const getArtists = (
 
 const getGenres = (
     item:
-        | z.infer<typeof ssType._response.song>
         | z.infer<typeof ssType._response.album>
-        | z.infer<typeof ssType._response.albumListEntry>,
+        | z.infer<typeof ssType._response.albumListEntry>
+        | z.infer<typeof ssType._response.song>,
 ): Genre[] => {
     return item.genres
         ? item.genres.map((genre) => ({
@@ -123,7 +124,7 @@ const getGenres = (
 
 const normalizeSong = (
     item: z.infer<typeof ssType._response.song>,
-    server: ServerListItem | null,
+    server: null | ServerListItem,
     size?: number,
 ): QueueSong => {
     const imageUrl =
@@ -194,7 +195,7 @@ const normalizeAlbumArtist = (
     item:
         | z.infer<typeof ssType._response.albumArtist>
         | z.infer<typeof ssType._response.artistListEntry>,
-    server: ServerListItem | null,
+    server: null | ServerListItem,
     imageSize?: number,
 ): AlbumArtist => {
     const imageUrl =
@@ -229,7 +230,7 @@ const normalizeAlbumArtist = (
 
 const normalizeAlbum = (
     item: z.infer<typeof ssType._response.album> | z.infer<typeof ssType._response.albumListEntry>,
-    server: ServerListItem | null,
+    server: null | ServerListItem,
     imageSize?: number,
 ): Album => {
     const imageUrl =
@@ -280,7 +281,7 @@ const normalizePlaylist = (
     item:
         | z.infer<typeof ssType._response.playlist>
         | z.infer<typeof ssType._response.playlistListEntry>,
-    server: ServerListItem | null,
+    server: null | ServerListItem,
 ): Playlist => {
     return {
         description: item.comment || null,
diff --git a/src/renderer/api/types.ts b/src/renderer/api/types.ts
index a24abd9e..854721f2 100644
--- a/src/renderer/api/types.ts
+++ b/src/renderer/api/types.ts
@@ -2,28 +2,29 @@ import orderBy from 'lodash/orderBy';
 import reverse from 'lodash/reverse';
 import shuffle from 'lodash/shuffle';
 import { z } from 'zod';
+
 import { ServerFeatures } from './features-types';
+import {
+    JFAlbumArtistListSort,
+    JFAlbumListSort,
+    JFArtistListSort,
+    JFGenreListSort,
+    JFPlaylistListSort,
+    JFSongListSort,
+    JFSortOrder,
+} from './jellyfin.types';
 import { jfType } from './jellyfin/jellyfin-types';
 import {
-    JFSortOrder,
-    JFAlbumListSort,
-    JFSongListSort,
-    JFAlbumArtistListSort,
-    JFArtistListSort,
-    JFPlaylistListSort,
-    JFGenreListSort,
-} from './jellyfin.types';
-import { ndType } from './navidrome/navidrome-types';
-import {
-    NDSortOrder,
-    NDOrder,
-    NDAlbumListSort,
     NDAlbumArtistListSort,
+    NDAlbumListSort,
+    NDGenreListSort,
+    NDOrder,
     NDPlaylistListSort,
     NDSongListSort,
+    NDSortOrder,
     NDUserListSort,
-    NDGenreListSort,
 } from './navidrome.types';
+import { ndType } from './navidrome/navidrome-types';
 
 export enum LibraryItem {
     ALBUM = 'album',
@@ -34,29 +35,29 @@ export enum LibraryItem {
     SONG = 'song',
 }
 
-export type AnyLibraryItem = Album | AlbumArtist | Artist | Playlist | Song | QueueSong;
-
-export type AnyLibraryItems =
-    | Album[]
-    | AlbumArtist[]
-    | Artist[]
-    | Playlist[]
-    | Song[]
-    | QueueSong[];
+export enum ServerType {
+    JELLYFIN = 'jellyfin',
+    NAVIDROME = 'navidrome',
+    SUBSONIC = 'subsonic',
+}
 
 export enum SortOrder {
     ASC = 'ASC',
     DESC = 'DESC',
 }
 
-export type User = {
-    createdAt: string | null;
-    email: string | null;
-    id: string;
-    isAdmin: boolean | null;
-    lastLoginAt: string | null;
-    name: string;
-    updatedAt: string | null;
+export type AnyLibraryItem = Album | AlbumArtist | Artist | Playlist | QueueSong | Song;
+
+export type AnyLibraryItems =
+    | Album[]
+    | AlbumArtist[]
+    | Artist[]
+    | Playlist[]
+    | QueueSong[]
+    | Song[];
+
+export type QueueSong = Song & {
+    uniqueId: string;
 };
 
 export type ServerListItem = {
@@ -68,19 +69,19 @@ export type ServerListItem = {
     savePassword?: boolean;
     type: ServerType;
     url: string;
-    userId: string | null;
+    userId: null | string;
     username: string;
     version?: string;
 };
 
-export enum ServerType {
-    JELLYFIN = 'jellyfin',
-    NAVIDROME = 'navidrome',
-    SUBSONIC = 'subsonic',
-}
-
-export type QueueSong = Song & {
-    uniqueId: string;
+export type User = {
+    createdAt: null | string;
+    email: null | string;
+    id: string;
+    isAdmin: boolean | null;
+    lastLoginAt: null | string;
+    name: string;
+    updatedAt: null | string;
 };
 
 type SortOrderMap = {
@@ -116,6 +117,10 @@ export enum ExternalType {
     LINK = 'LINK',
 }
 
+export enum GenreListSort {
+    NAME = 'name',
+}
+
 export enum ImageType {
     BACKDROP = 'BACKDROP',
     LOGO = 'LOGO',
@@ -123,212 +128,112 @@ export enum ImageType {
     SCREENSHOT = 'SCREENSHOT',
 }
 
-export type EndpointDetails = {
-    server: ServerListItem;
-};
-
-export interface BasePaginatedResponse<T> {
-    error?: string | any;
-    items: T;
-    startIndex: number;
-    totalRecordCount: number | null;
-}
-
-export type AuthenticationResponse = {
-    credential: string;
-    ndCredential?: string;
-    userId: string | null;
-    username: string;
-};
-
-export type Genre = {
-    albumCount?: number;
-    id: string;
-    imageUrl: string | null;
-    itemType: LibraryItem.GENRE;
-    name: string;
-    songCount?: number;
-};
-
 export type Album = {
     albumArtist: string;
     albumArtists: RelatedArtist[];
     artists: RelatedArtist[];
-    backdropImageUrl: string | null;
-    comment: string | null;
+    backdropImageUrl: null | string;
+    comment: null | string;
     createdAt: string;
-    duration: number | null;
+    duration: null | number;
     genres: Genre[];
     id: string;
-    imagePlaceholderUrl: string | null;
-    imageUrl: string | null;
+    imagePlaceholderUrl: null | string;
+    imageUrl: null | string;
     isCompilation: boolean | null;
     itemType: LibraryItem.ALBUM;
-    lastPlayedAt: string | null;
-    mbzId: string | null;
+    lastPlayedAt: null | string;
+    mbzId: null | string;
     name: string;
-    originalDate: string | null;
-    participants: Record<string, RelatedArtist[]> | null;
-    playCount: number | null;
-    releaseDate: string | null;
-    releaseYear: number | null;
+    originalDate: null | string;
+    participants: null | Record<string, RelatedArtist[]>;
+    playCount: null | number;
+    releaseDate: null | string;
+    releaseYear: null | number;
     serverId: string;
     serverType: ServerType;
-    size: number | null;
-    songCount: number | null;
+    size: null | number;
+    songCount: null | number;
     songs?: Song[];
-    tags: Record<string, string[]> | null;
+    tags: null | Record<string, string[]>;
     uniqueId: string;
     updatedAt: string;
     userFavorite: boolean;
-    userRating: number | null;
+    userRating: null | number;
 } & { songs?: Song[] };
 
-export type GainInfo = {
-    album?: number;
-    track?: number;
-};
-
-export type Song = {
-    album: string | null;
-    albumArtists: RelatedArtist[];
-    albumId: string;
-    artistName: string;
-    artists: RelatedArtist[];
-    bitRate: number;
-    bpm: number | null;
-    channels: number | null;
-    comment: string | null;
-    compilation: boolean | null;
-    container: string | null;
-    createdAt: string;
-    discNumber: number;
-    discSubtitle: string | null;
-    duration: number;
-    gain: GainInfo | null;
-    genres: Genre[];
-    id: string;
-    imagePlaceholderUrl: string | null;
-    imageUrl: string | null;
-    itemType: LibraryItem.SONG;
-    lastPlayedAt: string | null;
-    lyrics: string | null;
-    name: string;
-    participants: Record<string, RelatedArtist[]> | null;
-    path: string | null;
-    peak: GainInfo | null;
-    playCount: number;
-    playlistItemId?: string;
-    releaseDate: string | null;
-    releaseYear: string | null;
-    serverId: string;
-    serverType: ServerType;
-    size: number;
-    streamUrl: string;
-    tags: Record<string, string[]> | null;
-    trackNumber: number;
-    uniqueId: string;
-    updatedAt: string;
-    userFavorite: boolean;
-    userRating: number | null;
-};
-
 export type AlbumArtist = {
-    albumCount: number | null;
-    backgroundImageUrl: string | null;
-    biography: string | null;
-    duration: number | null;
+    albumCount: null | number;
+    backgroundImageUrl: null | string;
+    biography: null | string;
+    duration: null | number;
     genres: Genre[];
     id: string;
-    imageUrl: string | null;
+    imageUrl: null | string;
     itemType: LibraryItem.ALBUM_ARTIST;
-    lastPlayedAt: string | null;
-    mbz: string | null;
+    lastPlayedAt: null | string;
+    mbz: null | string;
     name: string;
-    playCount: number | null;
+    playCount: null | number;
     serverId: string;
     serverType: ServerType;
-    similarArtists: RelatedArtist[] | null;
-    songCount: number | null;
+    similarArtists: null | RelatedArtist[];
+    songCount: null | number;
     userFavorite: boolean;
-    userRating: number | null;
-};
-
-export type RelatedAlbumArtist = {
-    id: string;
-    name: string;
+    userRating: null | number;
 };
 
 export type Artist = {
-    biography: string | null;
+    biography: null | string;
     createdAt: string;
     id: string;
     itemType: LibraryItem.ARTIST;
     name: string;
-    remoteCreatedAt: string | null;
+    remoteCreatedAt: null | string;
     serverFolderId: string;
     serverId: string;
     serverType: ServerType;
     updatedAt: string;
 };
 
-export type RelatedArtist = {
-    id: string;
-    imageUrl: string | null;
-    name: string;
+export type AuthenticationResponse = {
+    credential: string;
+    ndCredential?: string;
+    userId: null | string;
+    username: string;
 };
 
-export type MusicFolder = {
-    id: string;
-    name: string;
-};
-
-export type Playlist = {
-    description: string | null;
-    duration: number | null;
-    genres: Genre[];
-    id: string;
-    imagePlaceholderUrl: string | null;
-    imageUrl: string | null;
-    itemType: LibraryItem.PLAYLIST;
-    name: string;
-    owner: string | null;
-    ownerId: string | null;
-    public: boolean | null;
-    rules?: Record<string, any> | null;
-    serverId: string;
-    serverType: ServerType;
-    size: number | null;
-    songCount: number | null;
-    sync?: boolean | null;
-};
-
-export type GenresResponse = Genre[];
-
-export type MusicFoldersResponse = MusicFolder[];
-
-export type ListSortOrder = NDOrder | JFSortOrder;
-
-type BaseEndpointArgs = {
-    apiClientProps: {
-        server: ServerListItem | null;
-        signal?: AbortSignal;
-    };
-};
+export interface BasePaginatedResponse<T> {
+    error?: any | string;
+    items: T;
+    startIndex: number;
+    totalRecordCount: null | number;
+}
 
 export interface BaseQuery<T> {
     sortBy: T;
     sortOrder: SortOrder;
 }
 
-// Genre List
-export type GenreListResponse = BasePaginatedResponse<Genre[]> | null | undefined;
+export type EndpointDetails = {
+    server: ServerListItem;
+};
 
-export type GenreListArgs = { query: GenreListQuery } & BaseEndpointArgs;
+export type GainInfo = {
+    album?: number;
+    track?: number;
+};
 
-export enum GenreListSort {
-    NAME = 'name',
-}
+export type Genre = {
+    albumCount?: number;
+    id: string;
+    imageUrl: null | string;
+    itemType: LibraryItem.GENRE;
+    name: string;
+    songCount?: number;
+};
+
+export type GenreListArgs = BaseEndpointArgs & { query: GenreListQuery };
 
 export interface GenreListQuery extends BaseQuery<GenreListSort> {
     _custom?: {
@@ -341,6 +246,102 @@ export interface GenreListQuery extends BaseQuery<GenreListSort> {
     startIndex: number;
 }
 
+// Genre List
+export type GenreListResponse = BasePaginatedResponse<Genre[]> | null | undefined;
+
+export type GenresResponse = Genre[];
+
+export type ListSortOrder = JFSortOrder | NDOrder;
+
+export type MusicFolder = {
+    id: string;
+    name: string;
+};
+
+export type MusicFoldersResponse = MusicFolder[];
+
+export type Playlist = {
+    description: null | string;
+    duration: null | number;
+    genres: Genre[];
+    id: string;
+    imagePlaceholderUrl: null | string;
+    imageUrl: null | string;
+    itemType: LibraryItem.PLAYLIST;
+    name: string;
+    owner: null | string;
+    ownerId: null | string;
+    public: boolean | null;
+    rules?: null | Record<string, any>;
+    serverId: string;
+    serverType: ServerType;
+    size: null | number;
+    songCount: null | number;
+    sync?: boolean | null;
+};
+
+export type RelatedAlbumArtist = {
+    id: string;
+    name: string;
+};
+
+export type RelatedArtist = {
+    id: string;
+    imageUrl: null | string;
+    name: string;
+};
+
+export type Song = {
+    album: null | string;
+    albumArtists: RelatedArtist[];
+    albumId: string;
+    artistName: string;
+    artists: RelatedArtist[];
+    bitRate: number;
+    bpm: null | number;
+    channels: null | number;
+    comment: null | string;
+    compilation: boolean | null;
+    container: null | string;
+    createdAt: string;
+    discNumber: number;
+    discSubtitle: null | string;
+    duration: number;
+    gain: GainInfo | null;
+    genres: Genre[];
+    id: string;
+    imagePlaceholderUrl: null | string;
+    imageUrl: null | string;
+    itemType: LibraryItem.SONG;
+    lastPlayedAt: null | string;
+    lyrics: null | string;
+    name: string;
+    participants: null | Record<string, RelatedArtist[]>;
+    path: null | string;
+    peak: GainInfo | null;
+    playCount: number;
+    playlistItemId?: string;
+    releaseDate: null | string;
+    releaseYear: null | string;
+    serverId: string;
+    serverType: ServerType;
+    size: number;
+    streamUrl: string;
+    tags: null | Record<string, string[]>;
+    trackNumber: number;
+    uniqueId: string;
+    updatedAt: string;
+    userFavorite: boolean;
+    userRating: null | number;
+};
+
+type BaseEndpointArgs = {
+    apiClientProps: {
+        server: null | ServerListItem;
+        signal?: AbortSignal;
+    };
+};
+
 type GenreListSortMap = {
     jellyfin: Record<GenreListSort, JFGenreListSort | undefined>;
     navidrome: Record<GenreListSort, NDGenreListSort | undefined>;
@@ -359,9 +360,6 @@ export const genreListSortMap: GenreListSortMap = {
     },
 };
 
-// Album List
-export type AlbumListResponse = BasePaginatedResponse<Album[]> | null | undefined;
-
 export enum AlbumListSort {
     ALBUM_ARTIST = 'albumArtist',
     ARTIST = 'artist',
@@ -380,6 +378,8 @@ export enum AlbumListSort {
     YEAR = 'year',
 }
 
+export type AlbumListArgs = BaseEndpointArgs & { query: AlbumListQuery };
+
 export interface AlbumListQuery extends BaseQuery<AlbumListSort> {
     _custom?: {
         jellyfin?: Partial<z.infer<typeof jfType._parameters.albumList>>;
@@ -397,7 +397,8 @@ export interface AlbumListQuery extends BaseQuery<AlbumListSort> {
     startIndex: number;
 }
 
-export type AlbumListArgs = { query: AlbumListQuery } & BaseEndpointArgs;
+// Album List
+export type AlbumListResponse = BasePaginatedResponse<Album[]> | null | undefined;
 
 type AlbumListSortMap = {
     jellyfin: Record<AlbumListSort, JFAlbumListSort | undefined>;
@@ -460,21 +461,6 @@ export const albumListSortMap: AlbumListSortMap = {
     },
 };
 
-// Album Detail
-export type AlbumDetailResponse = Album | null | undefined;
-
-export type AlbumDetailQuery = { id: string };
-
-export type AlbumDetailArgs = { query: AlbumDetailQuery } & BaseEndpointArgs;
-
-export type AlbumInfo = {
-    imageUrl: string | null;
-    notes: string | null;
-};
-
-// Song List
-export type SongListResponse = BasePaginatedResponse<Song[]> | null | undefined;
-
 export enum SongListSort {
     ALBUM = 'album',
     ALBUM_ARTIST = 'albumArtist',
@@ -496,6 +482,20 @@ export enum SongListSort {
     YEAR = 'year',
 }
 
+export type AlbumDetailArgs = BaseEndpointArgs & { query: AlbumDetailQuery };
+
+export type AlbumDetailQuery = { id: string };
+
+// Album Detail
+export type AlbumDetailResponse = Album | null | undefined;
+
+export type AlbumInfo = {
+    imageUrl: null | string;
+    notes: null | string;
+};
+
+export type SongListArgs = BaseEndpointArgs & { query: SongListQuery };
+
 export interface SongListQuery extends BaseQuery<SongListSort> {
     _custom?: {
         jellyfin?: Partial<z.infer<typeof jfType._parameters.songList>>;
@@ -516,7 +516,8 @@ export interface SongListQuery extends BaseQuery<SongListSort> {
     startIndex: number;
 }
 
-export type SongListArgs = { query: SongListQuery } & BaseEndpointArgs;
+// Song List
+export type SongListResponse = BasePaginatedResponse<Song[]> | null | undefined;
 
 type SongListSortMap = {
     jellyfin: Record<SongListSort, JFSongListSort | undefined>;
@@ -587,16 +588,6 @@ export const songListSortMap: SongListSortMap = {
     },
 };
 
-// Song Detail
-export type SongDetailResponse = Song | null | undefined;
-
-export type SongDetailQuery = { id: string };
-
-export type SongDetailArgs = { query: SongDetailQuery } & BaseEndpointArgs;
-
-// Album Artist List
-export type AlbumArtistListResponse = BasePaginatedResponse<AlbumArtist[]> | null | undefined;
-
 export enum AlbumArtistListSort {
     ALBUM = 'album',
     ALBUM_COUNT = 'albumCount',
@@ -611,6 +602,8 @@ export enum AlbumArtistListSort {
     SONG_COUNT = 'songCount',
 }
 
+export type AlbumArtistListArgs = BaseEndpointArgs & { query: AlbumArtistListQuery };
+
 export interface AlbumArtistListQuery extends BaseQuery<AlbumArtistListSort> {
     _custom?: {
         jellyfin?: Partial<z.infer<typeof jfType._parameters.albumArtistList>>;
@@ -622,7 +615,15 @@ export interface AlbumArtistListQuery extends BaseQuery<AlbumArtistListSort> {
     startIndex: number;
 }
 
-export type AlbumArtistListArgs = { query: AlbumArtistListQuery } & BaseEndpointArgs;
+// Album Artist List
+export type AlbumArtistListResponse = BasePaginatedResponse<AlbumArtist[]> | null | undefined;
+
+export type SongDetailArgs = BaseEndpointArgs & { query: SongDetailQuery };
+
+export type SongDetailQuery = { id: string };
+
+// Song Detail
+export type SongDetailResponse = null | Song | undefined;
 
 type AlbumArtistListSortMap = {
     jellyfin: Record<AlbumArtistListSort, JFAlbumArtistListSort | undefined>;
@@ -674,15 +675,6 @@ export const albumArtistListSortMap: AlbumArtistListSortMap = {
 
 // Album Artist Detail
 
-export type AlbumArtistDetailResponse = AlbumArtist | null;
-
-export type AlbumArtistDetailQuery = { id: string };
-
-export type AlbumArtistDetailArgs = { query: AlbumArtistDetailQuery } & BaseEndpointArgs;
-
-// Artist List
-export type ArtistListResponse = BasePaginatedResponse<AlbumArtist[]> | null | undefined;
-
 export enum ArtistListSort {
     ALBUM = 'album',
     ALBUM_COUNT = 'albumCount',
@@ -697,6 +689,14 @@ export enum ArtistListSort {
     SONG_COUNT = 'songCount',
 }
 
+export type AlbumArtistDetailArgs = BaseEndpointArgs & { query: AlbumArtistDetailQuery };
+
+export type AlbumArtistDetailQuery = { id: string };
+
+export type AlbumArtistDetailResponse = AlbumArtist | null;
+
+export type ArtistListArgs = BaseEndpointArgs & { query: ArtistListQuery };
+
 export interface ArtistListQuery extends BaseQuery<ArtistListSort> {
     _custom?: {
         jellyfin?: Partial<z.infer<typeof jfType._parameters.albumArtistList>>;
@@ -709,7 +709,8 @@ export interface ArtistListQuery extends BaseQuery<ArtistListSort> {
     startIndex: number;
 }
 
-export type ArtistListArgs = { query: ArtistListQuery } & BaseEndpointArgs;
+// Artist List
+export type ArtistListResponse = BasePaginatedResponse<AlbumArtist[]> | null | undefined;
 
 type ArtistListSortMap = {
     jellyfin: Record<ArtistListSort, JFArtistListSort | undefined>;
@@ -761,71 +762,33 @@ export const artistListSortMap: ArtistListSortMap = {
 
 // Artist Detail
 
-// Favorite
-export type FavoriteResponse = null | undefined;
+export enum PlaylistListSort {
+    DURATION = 'duration',
+    NAME = 'name',
+    OWNER = 'owner',
+    PUBLIC = 'public',
+    SONG_COUNT = 'songCount',
+    UPDATED_AT = 'updatedAt',
+}
 
-export type FavoriteQuery = {
-    id: string[];
-    type: LibraryItem;
-};
-
-export type FavoriteArgs = { query: FavoriteQuery; serverId?: string } & BaseEndpointArgs;
-
-// Rating
-export type RatingResponse = null | undefined;
-
-export type RatingQuery = {
-    item: AnyLibraryItems;
-    rating: number;
-};
-
-export type SetRatingArgs = { query: RatingQuery; serverId?: string } & BaseEndpointArgs;
-
-// Sharing
-export type ShareItemResponse = { id: string } | undefined;
-
-export type ShareItemBody = {
-    description: string;
-    downloadable: boolean;
-    expires: number;
-    resourceIds: string;
-    resourceType: string;
-};
-
-export type ShareItemArgs = { body: ShareItemBody; serverId?: string } & BaseEndpointArgs;
-
-// Add to playlist
-export type AddToPlaylistResponse = null | undefined;
-
-export type AddToPlaylistQuery = {
-    id: string;
+export type AddToPlaylistArgs = BaseEndpointArgs & {
+    body: AddToPlaylistBody;
+    query: AddToPlaylistQuery;
+    serverId?: string;
 };
 
 export type AddToPlaylistBody = {
     songId: string[];
 };
 
-export type AddToPlaylistArgs = {
-    body: AddToPlaylistBody;
-    query: AddToPlaylistQuery;
-    serverId?: string;
-} & BaseEndpointArgs;
-
-// Remove from playlist
-export type RemoveFromPlaylistResponse = null | undefined;
-
-export type RemoveFromPlaylistQuery = {
+export type AddToPlaylistQuery = {
     id: string;
-    songId: string[];
 };
 
-export type RemoveFromPlaylistArgs = {
-    query: RemoveFromPlaylistQuery;
-    serverId?: string;
-} & BaseEndpointArgs;
+// Add to playlist
+export type AddToPlaylistResponse = null | undefined;
 
-// Create Playlist
-export type CreatePlaylistResponse = { id: string } | undefined;
+export type CreatePlaylistArgs = BaseEndpointArgs & { body: CreatePlaylistBody; serverId?: string };
 
 export type CreatePlaylistBody = {
     _custom?: {
@@ -841,13 +804,84 @@ export type CreatePlaylistBody = {
     public?: boolean;
 };
 
-export type CreatePlaylistArgs = { body: CreatePlaylistBody; serverId?: string } & BaseEndpointArgs;
+// Create Playlist
+export type CreatePlaylistResponse = undefined | { id: string };
 
-// Update Playlist
-export type UpdatePlaylistResponse = null | undefined;
+export type DeletePlaylistArgs = BaseEndpointArgs & {
+    query: DeletePlaylistQuery;
+    serverId?: string;
+};
 
-export type UpdatePlaylistQuery = {
+export type DeletePlaylistQuery = { id: string };
+
+// Delete Playlist
+export type DeletePlaylistResponse = null | undefined;
+
+export type FavoriteArgs = BaseEndpointArgs & { query: FavoriteQuery; serverId?: string };
+
+export type FavoriteQuery = {
+    id: string[];
+    type: LibraryItem;
+};
+
+// Favorite
+export type FavoriteResponse = null | undefined;
+
+export type PlaylistListArgs = BaseEndpointArgs & { query: PlaylistListQuery };
+
+export interface PlaylistListQuery extends BaseQuery<PlaylistListSort> {
+    _custom?: {
+        jellyfin?: Partial<z.infer<typeof jfType._parameters.playlistList>>;
+        navidrome?: Partial<z.infer<typeof ndType._parameters.playlistList>>;
+    };
+    limit?: number;
+    searchTerm?: string;
+    startIndex: number;
+}
+
+// Playlist List
+export type PlaylistListResponse = BasePaginatedResponse<Playlist[]> | null | undefined;
+
+export type RatingQuery = {
+    item: AnyLibraryItems;
+    rating: number;
+};
+
+// Rating
+export type RatingResponse = null | undefined;
+
+export type RemoveFromPlaylistArgs = BaseEndpointArgs & {
+    query: RemoveFromPlaylistQuery;
+    serverId?: string;
+};
+
+export type RemoveFromPlaylistQuery = {
     id: string;
+    songId: string[];
+};
+
+// Remove from playlist
+export type RemoveFromPlaylistResponse = null | undefined;
+
+export type SetRatingArgs = BaseEndpointArgs & { query: RatingQuery; serverId?: string };
+
+export type ShareItemArgs = BaseEndpointArgs & { body: ShareItemBody; serverId?: string };
+
+export type ShareItemBody = {
+    description: string;
+    downloadable: boolean;
+    expires: number;
+    resourceIds: string;
+    resourceType: string;
+};
+
+// Sharing
+export type ShareItemResponse = undefined | { id: string };
+
+export type UpdatePlaylistArgs = BaseEndpointArgs & {
+    body: UpdatePlaylistBody;
+    query: UpdatePlaylistQuery;
+    serverId?: string;
 };
 
 export type UpdatePlaylistBody = {
@@ -865,45 +899,12 @@ export type UpdatePlaylistBody = {
     public?: boolean;
 };
 
-export type UpdatePlaylistArgs = {
-    body: UpdatePlaylistBody;
-    query: UpdatePlaylistQuery;
-    serverId?: string;
-} & BaseEndpointArgs;
+export type UpdatePlaylistQuery = {
+    id: string;
+};
 
-// Delete Playlist
-export type DeletePlaylistResponse = null | undefined;
-
-export type DeletePlaylistQuery = { id: string };
-
-export type DeletePlaylistArgs = {
-    query: DeletePlaylistQuery;
-    serverId?: string;
-} & BaseEndpointArgs;
-
-// Playlist List
-export type PlaylistListResponse = BasePaginatedResponse<Playlist[]> | null | undefined;
-
-export enum PlaylistListSort {
-    DURATION = 'duration',
-    NAME = 'name',
-    OWNER = 'owner',
-    PUBLIC = 'public',
-    SONG_COUNT = 'songCount',
-    UPDATED_AT = 'updatedAt',
-}
-
-export interface PlaylistListQuery extends BaseQuery<PlaylistListSort> {
-    _custom?: {
-        jellyfin?: Partial<z.infer<typeof jfType._parameters.playlistList>>;
-        navidrome?: Partial<z.infer<typeof ndType._parameters.playlistList>>;
-    };
-    limit?: number;
-    searchTerm?: string;
-    startIndex: number;
-}
-
-export type PlaylistListArgs = { query: PlaylistListQuery } & BaseEndpointArgs;
+// Update Playlist
+export type UpdatePlaylistResponse = null | undefined;
 
 type PlaylistListSortMap = {
     jellyfin: Record<PlaylistListSort, JFPlaylistListSort | undefined>;
@@ -938,17 +939,27 @@ export const playlistListSortMap: PlaylistListSortMap = {
     },
 };
 
-// Playlist Detail
-export type PlaylistDetailResponse = Playlist;
+export enum UserListSort {
+    NAME = 'name',
+}
+
+export type MusicFolderListArgs = BaseEndpointArgs;
+
+export type MusicFolderListQuery = null;
+
+// Music Folder List
+export type MusicFolderListResponse = BasePaginatedResponse<MusicFolder[]> | null | undefined;
+
+export type PlaylistDetailArgs = BaseEndpointArgs & { query: PlaylistDetailQuery };
 
 export type PlaylistDetailQuery = {
     id: string;
 };
 
-export type PlaylistDetailArgs = { query: PlaylistDetailQuery } & BaseEndpointArgs;
+// Playlist Detail
+export type PlaylistDetailResponse = Playlist;
 
-// Playlist Songs
-export type PlaylistSongListResponse = BasePaginatedResponse<Song[]> | null | undefined;
+export type PlaylistSongListArgs = BaseEndpointArgs & { query: PlaylistSongListQuery };
 
 export type PlaylistSongListQuery = {
     id: string;
@@ -958,22 +969,10 @@ export type PlaylistSongListQuery = {
     startIndex: number;
 };
 
-export type PlaylistSongListArgs = { query: PlaylistSongListQuery } & BaseEndpointArgs;
+// Playlist Songs
+export type PlaylistSongListResponse = BasePaginatedResponse<Song[]> | null | undefined;
 
-// Music Folder List
-export type MusicFolderListResponse = BasePaginatedResponse<MusicFolder[]> | null | undefined;
-
-export type MusicFolderListQuery = null;
-
-export type MusicFolderListArgs = BaseEndpointArgs;
-
-// User list
-// Playlist List
-export type UserListResponse = BasePaginatedResponse<User[]> | null | undefined;
-
-export enum UserListSort {
-    NAME = 'name',
-}
+export type UserListArgs = BaseEndpointArgs & { query: UserListQuery };
 
 export interface UserListQuery extends BaseQuery<UserListSort> {
     _custom?: {
@@ -986,7 +985,9 @@ export interface UserListQuery extends BaseQuery<UserListSort> {
     startIndex: number;
 }
 
-export type UserListArgs = { query: UserListQuery } & BaseEndpointArgs;
+// User list
+// Playlist List
+export type UserListResponse = BasePaginatedResponse<User[]> | null | undefined;
 
 type UserListSortMap = {
     jellyfin: Record<UserListSort, undefined>;
@@ -1006,16 +1007,13 @@ export const userListSortMap: UserListSortMap = {
     },
 };
 
-// Top Songs List
-export type TopSongListResponse = BasePaginatedResponse<Song[]> | null | undefined;
+export enum Played {
+    All = 'all',
+    Never = 'never',
+    Played = 'played',
+}
 
-export type TopSongListQuery = {
-    artist: string;
-    artistId: string;
-    limit?: number;
-};
-
-export type TopSongListArgs = { query: TopSongListQuery } & BaseEndpointArgs;
+export type ArtistInfoArgs = BaseEndpointArgs & { query: ArtistInfoQuery };
 
 // Artist Info
 export type ArtistInfoQuery = {
@@ -1024,98 +1022,12 @@ export type ArtistInfoQuery = {
     musicFolderId?: string;
 };
 
-export type ArtistInfoArgs = { query: ArtistInfoQuery } & BaseEndpointArgs;
-
-// Scrobble
-export type ScrobbleResponse = null | undefined;
-
-export type ScrobbleArgs = {
-    query: ScrobbleQuery;
-    serverId?: string;
-} & BaseEndpointArgs;
-
-export type ScrobbleQuery = {
-    event?: 'pause' | 'unpause' | 'timeupdate' | 'start';
-    id: string;
-    position?: number;
-    submission: boolean;
+export type FullLyricsMetadata = Omit<InternetProviderLyricResponse, 'id' | 'lyrics' | 'source'> & {
+    lyrics: LyricsResponse;
+    remote: boolean;
+    source: string;
 };
 
-export type SearchQuery = {
-    albumArtistLimit?: number;
-    albumArtistStartIndex?: number;
-    albumLimit?: number;
-    albumStartIndex?: number;
-    musicFolderId?: string;
-    query?: string;
-    songLimit?: number;
-    songStartIndex?: number;
-};
-
-export type SearchSongsQuery = {
-    musicFolderId?: string;
-    query?: string;
-    songLimit?: number;
-    songStartIndex?: number;
-};
-
-export type SearchAlbumsQuery = {
-    albumLimit?: number;
-    albumStartIndex?: number;
-    musicFolderId?: string;
-    query?: string;
-};
-
-export type SearchAlbumArtistsQuery = {
-    albumArtistLimit?: number;
-    albumArtistStartIndex?: number;
-    musicFolderId?: string;
-    query?: string;
-};
-
-export type SearchArgs = {
-    query: SearchQuery;
-} & BaseEndpointArgs;
-
-export type SearchResponse = {
-    albumArtists: AlbumArtist[];
-    albums: Album[];
-    songs: Song[];
-};
-
-export enum Played {
-    All = 'all',
-    Never = 'never',
-    Played = 'played',
-}
-
-export type RandomSongListQuery = {
-    genre?: string;
-    limit?: number;
-    maxYear?: number;
-    minYear?: number;
-    musicFolderId?: string;
-    played: Played;
-};
-
-export type RandomSongListArgs = {
-    query: RandomSongListQuery;
-} & BaseEndpointArgs;
-
-export type RandomSongListResponse = SongListResponse;
-
-export type LyricsQuery = {
-    songId: string;
-};
-
-export type LyricsArgs = {
-    query: LyricsQuery;
-} & BaseEndpointArgs;
-
-export type SynchronizedLyricsArray = Array<[number, string]>;
-
-export type LyricsResponse = SynchronizedLyricsArray | string;
-
 export type InternetProviderLyricResponse = {
     artist: string;
     id: string;
@@ -1132,132 +1044,113 @@ export type InternetProviderLyricSearchResponse = {
     source: LyricSource;
 };
 
-export type FullLyricsMetadata = {
-    lyrics: LyricsResponse;
-    remote: boolean;
-    source: string;
-} & Omit<InternetProviderLyricResponse, 'id' | 'lyrics' | 'source'>;
-
 export type LyricOverride = Omit<InternetProviderLyricResponse, 'lyrics'>;
 
+export type LyricsArgs = BaseEndpointArgs & {
+    query: LyricsQuery;
+};
+
+export type LyricsQuery = {
+    songId: string;
+};
+
+export type LyricsResponse = string | SynchronizedLyricsArray;
+
+export type RandomSongListArgs = BaseEndpointArgs & {
+    query: RandomSongListQuery;
+};
+
+export type RandomSongListQuery = {
+    genre?: string;
+    limit?: number;
+    maxYear?: number;
+    minYear?: number;
+    musicFolderId?: string;
+    played: Played;
+};
+
+export type RandomSongListResponse = SongListResponse;
+
+export type ScrobbleArgs = BaseEndpointArgs & {
+    query: ScrobbleQuery;
+    serverId?: string;
+};
+
+export type ScrobbleQuery = {
+    event?: 'pause' | 'start' | 'timeupdate' | 'unpause';
+    id: string;
+    position?: number;
+    submission: boolean;
+};
+
+// Scrobble
+export type ScrobbleResponse = null | undefined;
+
+export type SearchAlbumArtistsQuery = {
+    albumArtistLimit?: number;
+    albumArtistStartIndex?: number;
+    musicFolderId?: string;
+    query?: string;
+};
+
+export type SearchAlbumsQuery = {
+    albumLimit?: number;
+    albumStartIndex?: number;
+    musicFolderId?: string;
+    query?: string;
+};
+
+export type SearchArgs = BaseEndpointArgs & {
+    query: SearchQuery;
+};
+
+export type SearchQuery = {
+    albumArtistLimit?: number;
+    albumArtistStartIndex?: number;
+    albumLimit?: number;
+    albumStartIndex?: number;
+    musicFolderId?: string;
+    query?: string;
+    songLimit?: number;
+    songStartIndex?: number;
+};
+
+export type SearchResponse = {
+    albumArtists: AlbumArtist[];
+    albums: Album[];
+    songs: Song[];
+};
+
+export type SearchSongsQuery = {
+    musicFolderId?: string;
+    query?: string;
+    songLimit?: number;
+    songStartIndex?: number;
+};
+
+export type SynchronizedLyricsArray = Array<[number, string]>;
+
+export type TopSongListArgs = BaseEndpointArgs & { query: TopSongListQuery };
+
+export type TopSongListQuery = {
+    artist: string;
+    artistId: string;
+    limit?: number;
+};
+
+// Top Songs List
+export type TopSongListResponse = BasePaginatedResponse<Song[]> | null | undefined;
+
 export const instanceOfCancellationError = (error: any) => {
     return 'revert' in error;
 };
 
-export type LyricSearchQuery = {
-    album?: string;
-    artist?: string;
-    duration?: number;
-    name?: string;
-};
-
-export type LyricGetQuery = {
-    remoteSongId: string;
-    remoteSource: LyricSource;
-    song: Song;
-};
-
 export enum LyricSource {
     GENIUS = 'Genius',
     LRCLIB = 'lrclib.net',
     NETEASE = 'NetEase',
 }
 
-export type LyricsOverride = Omit<FullLyricsMetadata, 'lyrics'> & { id: string };
-
-// This type from https://wicg.github.io/local-font-access/#fontdata
-// NOTE: it is still experimental, so this should be updates as appropriate
-export type FontData = {
-    family: string;
-    fullName: string;
-    postscriptName: string;
-    style: string;
-};
-
-export type ServerInfoArgs = BaseEndpointArgs;
-
-export type ServerInfo = {
-    features: ServerFeatures;
-    id?: string;
-    version: string;
-};
-
-export type StructuredLyricsArgs = {
-    query: LyricsQuery;
-} & BaseEndpointArgs;
-
-export type StructuredUnsyncedLyric = {
-    lyrics: string;
-    synced: false;
-} & Omit<FullLyricsMetadata, 'lyrics'>;
-
-export type StructuredSyncedLyric = {
-    lyrics: SynchronizedLyricsArray;
-    synced: true;
-} & Omit<FullLyricsMetadata, 'lyrics'>;
-
-export type StructuredLyric = {
-    lang: string;
-} & (StructuredUnsyncedLyric | StructuredSyncedLyric);
-
-export type SimilarSongsQuery = {
-    albumArtistIds: string[];
-    count?: number;
-    songId: string;
-};
-
-export type SimilarSongsArgs = {
-    query: SimilarSongsQuery;
-} & BaseEndpointArgs;
-
-export type MoveItemQuery = {
-    endingIndex: number;
-    playlistId: string;
-    startingIndex: number;
-    trackId: string;
-};
-
-export type MoveItemArgs = {
-    query: MoveItemQuery;
-} & BaseEndpointArgs;
-
-export type DownloadQuery = {
-    id: string;
-};
-
-export type DownloadArgs = {
-    query: DownloadQuery;
-} & BaseEndpointArgs;
-
-export type TranscodingQuery = {
-    base: string;
-    bitrate?: number;
-    format?: string;
-};
-
-export type TranscodingArgs = {
-    query: TranscodingQuery;
-} & BaseEndpointArgs;
-
-export type TagQuery = {
-    folder?: string;
-    type: LibraryItem.ALBUM | LibraryItem.SONG;
-};
-
-export type TagArgs = {
-    query: TagQuery;
-} & BaseEndpointArgs;
-
-export type Tag = {
-    name: string;
-    options: string[];
-};
-
-export type TagResponses = {
-    boolTags?: string[];
-    enumTags?: Tag[];
-};
-
 export type ControllerEndpoint = {
     addToPlaylist: (args: AddToPlaylistArgs) => Promise<AddToPlaylistResponse>;
     authenticate: (
@@ -1307,6 +1200,114 @@ export type ControllerEndpoint = {
     updatePlaylist: (args: UpdatePlaylistArgs) => Promise<UpdatePlaylistResponse>;
 };
 
+export type DownloadArgs = BaseEndpointArgs & {
+    query: DownloadQuery;
+};
+
+export type DownloadQuery = {
+    id: string;
+};
+
+// This type from https://wicg.github.io/local-font-access/#fontdata
+// NOTE: it is still experimental, so this should be updates as appropriate
+export type FontData = {
+    family: string;
+    fullName: string;
+    postscriptName: string;
+    style: string;
+};
+
+export type LyricGetQuery = {
+    remoteSongId: string;
+    remoteSource: LyricSource;
+    song: Song;
+};
+
+export type LyricSearchQuery = {
+    album?: string;
+    artist?: string;
+    duration?: number;
+    name?: string;
+};
+
+export type LyricsOverride = Omit<FullLyricsMetadata, 'lyrics'> & { id: string };
+
+export type MoveItemArgs = BaseEndpointArgs & {
+    query: MoveItemQuery;
+};
+
+export type MoveItemQuery = {
+    endingIndex: number;
+    playlistId: string;
+    startingIndex: number;
+    trackId: string;
+};
+
+export type ServerInfo = {
+    features: ServerFeatures;
+    id?: string;
+    version: string;
+};
+
+export type ServerInfoArgs = BaseEndpointArgs;
+
+export type SimilarSongsArgs = BaseEndpointArgs & {
+    query: SimilarSongsQuery;
+};
+
+export type SimilarSongsQuery = {
+    albumArtistIds: string[];
+    count?: number;
+    songId: string;
+};
+
+export type StructuredLyric = (StructuredSyncedLyric | StructuredUnsyncedLyric) & {
+    lang: string;
+};
+
+export type StructuredLyricsArgs = BaseEndpointArgs & {
+    query: LyricsQuery;
+};
+
+export type StructuredSyncedLyric = Omit<FullLyricsMetadata, 'lyrics'> & {
+    lyrics: SynchronizedLyricsArray;
+    synced: true;
+};
+
+export type StructuredUnsyncedLyric = Omit<FullLyricsMetadata, 'lyrics'> & {
+    lyrics: string;
+    synced: false;
+};
+
+export type Tag = {
+    name: string;
+    options: string[];
+};
+
+export type TagArgs = BaseEndpointArgs & {
+    query: TagQuery;
+};
+
+export type TagQuery = {
+    folder?: string;
+    type: LibraryItem.ALBUM | LibraryItem.SONG;
+};
+
+export type TagResponses = {
+    boolTags?: string[];
+    enumTags?: Tag[];
+};
+
+export type TranscodingArgs = BaseEndpointArgs & {
+    query: TranscodingQuery;
+};
+
+export type TranscodingQuery = {
+    base: string;
+    bitrate?: number;
+    format?: string;
+};
+
 export const sortAlbumList = (albums: Album[], sortBy: AlbumListSort, sortOrder: SortOrder) => {
     let results = albums;
 
@@ -1335,21 +1336,21 @@ export const sortAlbumList = (albums: Album[], sortBy: AlbumListSort, sortOrder:
         case AlbumListSort.RANDOM:
             results = shuffle(results);
             break;
+        case AlbumListSort.RATING:
+            results = orderBy(results, ['userRating'], [order]);
+            break;
         case AlbumListSort.RECENTLY_ADDED:
             results = orderBy(results, ['createdAt'], [order]);
             break;
         case AlbumListSort.RECENTLY_PLAYED:
             results = orderBy(results, ['lastPlayedAt'], [order]);
             break;
-        case AlbumListSort.RATING:
-            results = orderBy(results, ['userRating'], [order]);
+        case AlbumListSort.SONG_COUNT:
+            results = orderBy(results, ['songCount'], [order]);
             break;
         case AlbumListSort.YEAR:
             results = orderBy(results, ['releaseYear'], [order]);
             break;
-        case AlbumListSort.SONG_COUNT:
-            results = orderBy(results, ['songCount'], [order]);
-            break;
         default:
             break;
     }
@@ -1463,14 +1464,14 @@ export const sortAlbumArtistList = (
             results = orderBy(artists, ['albumCount', (v) => v.name.toLowerCase()], [order, 'asc']);
             break;
 
-        case AlbumArtistListSort.NAME:
-            results = orderBy(artists, [(v) => v.name.toLowerCase()], [order]);
-            break;
-
         case AlbumArtistListSort.FAVORITED:
             results = orderBy(artists, ['starred'], [order]);
             break;
 
+        case AlbumArtistListSort.NAME:
+            results = orderBy(artists, [(v) => v.name.toLowerCase()], [order]);
+            break;
+
         case AlbumArtistListSort.RATING:
             results = orderBy(artists, ['userRating'], [order]);
             break;
diff --git a/src/renderer/api/utils.ts b/src/renderer/api/utils.ts
index d995b18b..00914d12 100644
--- a/src/renderer/api/utils.ts
+++ b/src/renderer/api/utils.ts
@@ -3,10 +3,11 @@ import isElectron from 'is-electron';
 import semverCoerce from 'semver/functions/coerce';
 import semverGte from 'semver/functions/gte';
 import { z } from 'zod';
+
+import { ServerFeature } from '/@/renderer/api/features-types';
+import { ServerListItem } from '/@/renderer/api/types';
 import { toast } from '/@/renderer/components/toast';
 import { useAuthStore } from '/@/renderer/store';
-import { ServerListItem } from '/@/renderer/api/types';
-import { ServerFeature } from '/@/renderer/api/features-types';
 
 // Since ts-rest client returns a strict response type, we need to add the headers to the body object
 export const resultWithHeaders = <ItemType extends z.ZodTypeAny>(itemSchema: ItemType) => {
@@ -29,7 +30,7 @@ export const resultSubsonicBaseResponse = <ItemType extends z.ZodRawShape>(
     });
 };
 
-export const authenticationFailure = (currentServer: ServerListItem | null) => {
+export const authenticationFailure = (currentServer: null | ServerListItem) => {
     toast.error({
         message: 'Your session has expired.',
     });
@@ -43,7 +44,7 @@ export const authenticationFailure = (currentServer: ServerListItem | null) => {
     }
 };
 
-export const hasFeature = (server: ServerListItem | null, feature: ServerFeature): boolean => {
+export const hasFeature = (server: null | ServerListItem, feature: ServerFeature): boolean => {
     if (!server || !server.features) {
         return false;
     }
diff --git a/src/renderer/app.tsx b/src/renderer/app.tsx
index 6637b28b..b5deb049 100644
--- a/src/renderer/app.tsx
+++ b/src/renderer/app.tsx
@@ -1,33 +1,39 @@
-import { useEffect, useMemo, useState, useRef } from 'react';
 import { ClientSideRowModelModule } from '@ag-grid-community/client-side-row-model';
 import { ModuleRegistry } from '@ag-grid-community/core';
 import { InfiniteRowModelModule } from '@ag-grid-community/infinite-row-model';
 import { MantineProvider } from '@mantine/core';
 import isElectron from 'is-electron';
+import { useEffect, useMemo, useRef, useState } from 'react';
 import { initSimpleImg } from 'react-simple-img';
+
+import i18n from '../i18n/i18n';
 import { toast } from './components';
 import { useTheme } from './hooks';
-import { IsUpdatedDialog } from './is-updated-dialog';
 import { AppRouter } from './router/app-router';
+import './styles/global.scss';
+
+import '@ag-grid-community/styles/ag-grid.css';
+import 'overlayscrollbars/overlayscrollbars.css';
+
 import {
+    useCssSettings,
     useHotkeySettings,
     usePlaybackSettings,
     useRemoteSettings,
     useSettingsStore,
 } from './store/settings.store';
-import './styles/global.scss';
+
 import { ContextMenuProvider } from '/@/renderer/features/context-menu';
-import { useHandlePlayQueueAdd } from '/@/renderer/features/player/hooks/use-handle-playqueue-add';
-import { PlayQueueHandlerContext } from '/@/renderer/features/player';
-import { getMpvProperties } from '/@/renderer/features/settings/components/playback/mpv-settings';
-import { PlayerState, useCssSettings, usePlayerStore, useQueueControls } from '/@/renderer/store';
-import { FontType, PlaybackType, PlayerStatus, WebAudio } from '/@/renderer/types';
-import '@ag-grid-community/styles/ag-grid.css';
-import { WebAudioContext } from '/@/renderer/features/player/context/webaudio-context';
 import { useDiscordRpc } from '/@/renderer/features/discord-rpc/use-discord-rpc';
-import i18n from '/@/i18n/i18n';
-import { useServerVersion } from '/@/renderer/hooks/use-server-version';
+import { PlayQueueHandlerContext } from '/@/renderer/features/player';
+import { WebAudioContext } from '/@/renderer/features/player/context/webaudio-context';
+import { useHandlePlayQueueAdd } from '/@/renderer/features/player/hooks/use-handle-playqueue-add';
 import { updateSong } from '/@/renderer/features/player/update-remote-song';
+import { getMpvProperties } from '/@/renderer/features/settings/components/playback/mpv-settings';
+import { useServerVersion } from '/@/renderer/hooks/use-server-version';
+import { IsUpdatedDialog } from '/@/renderer/is-updated-dialog';
+import { PlayerState, usePlayerStore, useQueueControls } from '/@/renderer/store';
+import { FontType, PlaybackType, PlayerStatus, WebAudio } from '/@/renderer/types';
 import { sanitizeCss } from '/@/renderer/utils/sanitize';
 import { setQueue } from '/@/renderer/utils/set-transcoded-queue-data';
 
@@ -35,10 +41,10 @@ ModuleRegistry.registerModules([ClientSideRowModelModule, InfiniteRowModelModule
 
 initSimpleImg({ threshold: 0.05 }, true);
 
-const mpvPlayer = isElectron() ? window.electron.mpvPlayer : null;
-const ipc = isElectron() ? window.electron.ipc : null;
-const remote = isElectron() ? window.electron.remote : null;
-const utils = isElectron() ? window.electron.utils : null;
+const mpvPlayer = isElectron() ? window.api.mpvPlayer : null;
+const ipc = isElectron() ? window.api.ipc : null;
+const remote = isElectron() ? window.api.remote : null;
+const utils = isElectron() ? window.api.utils : null;
 
 export const App = () => {
     const theme = useTheme();
@@ -46,7 +52,7 @@ export const App = () => {
     const language = useSettingsStore((store) => store.general.language);
     const nativeImageAspect = useSettingsStore((store) => store.general.nativeAspectRatio);
     const { builtIn, custom, system, type } = useSettingsStore((state) => state.font);
-    const { enabled, content } = useCssSettings();
+    const { content, enabled } = useCssSettings();
     const { type: playbackType } = usePlaybackSettings();
     const { bindings } = useHotkeySettings();
     const handlePlayQueueAdd = useHandlePlayQueueAdd();
@@ -230,10 +236,8 @@ export const App = () => {
 
     return (
         <MantineProvider
-            withGlobalStyles
-            withNormalizeCSS
             theme={{
-                colorScheme: theme as 'light' | 'dark',
+                colorScheme: theme as 'dark' | 'light',
                 components: {
                     Modal: {
                         styles: {
@@ -282,6 +286,8 @@ export const App = () => {
                     xs: '0rem',
                 },
             }}
+            withGlobalStyles
+            withNormalizeCSS
         >
             <PlayQueueHandlerContext.Provider value={providerValue}>
                 <ContextMenuProvider>
diff --git a/src/renderer/assets/assets.d.ts b/src/renderer/assets/assets.d.ts
new file mode 100644
index 00000000..cf652454
--- /dev/null
+++ b/src/renderer/assets/assets.d.ts
@@ -0,0 +1,31 @@
+type Styles = Record<string, string>;
+
+declare module '*.svg' {
+    const content: string;
+    export default content;
+}
+
+declare module '*.png' {
+    const content: string;
+    export default content;
+}
+
+declare module '*.jpg' {
+    const content: string;
+    export default content;
+}
+
+declare module '*.scss' {
+    const content: Styles;
+    export default content;
+}
+
+declare module '*.sass' {
+    const content: Styles;
+    export default content;
+}
+
+declare module '*.css' {
+    const content: Styles;
+    export default content;
+}
diff --git a/src/renderer/assets/entitlements.mac.plist b/src/renderer/assets/entitlements.mac.plist
new file mode 100644
index 00000000..dad3e20e
--- /dev/null
+++ b/src/renderer/assets/entitlements.mac.plist
@@ -0,0 +1,10 @@
+<?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>com.apple.security.cs.allow-unsigned-executable-memory</key>
+    <true/>
+    <key>com.apple.security.cs.allow-jit</key>
+    <true/>
+  </dict>
+</plist>
diff --git a/src/renderer/assets/icons/1024x1024.png b/src/renderer/assets/icons/1024x1024.png
new file mode 100644
index 00000000..62563d85
Binary files /dev/null and b/src/renderer/assets/icons/1024x1024.png differ
diff --git a/src/renderer/assets/icons/128x128.png b/src/renderer/assets/icons/128x128.png
new file mode 100644
index 00000000..6bb49a9b
Binary files /dev/null and b/src/renderer/assets/icons/128x128.png differ
diff --git a/src/renderer/assets/icons/256x256.png b/src/renderer/assets/icons/256x256.png
new file mode 100644
index 00000000..932f7d33
Binary files /dev/null and b/src/renderer/assets/icons/256x256.png differ
diff --git a/src/renderer/assets/icons/32x32.png b/src/renderer/assets/icons/32x32.png
new file mode 100644
index 00000000..ecdac26b
Binary files /dev/null and b/src/renderer/assets/icons/32x32.png differ
diff --git a/src/renderer/assets/icons/512x512.png b/src/renderer/assets/icons/512x512.png
new file mode 100644
index 00000000..f364f2c1
Binary files /dev/null and b/src/renderer/assets/icons/512x512.png differ
diff --git a/src/renderer/assets/icons/64x64.png b/src/renderer/assets/icons/64x64.png
new file mode 100644
index 00000000..7534b9f5
Binary files /dev/null and b/src/renderer/assets/icons/64x64.png differ
diff --git a/src/renderer/assets/icons/favicon.ico b/src/renderer/assets/icons/favicon.ico
new file mode 100644
index 00000000..50d1d236
Binary files /dev/null and b/src/renderer/assets/icons/favicon.ico differ
diff --git a/src/renderer/assets/icons/icon.icns b/src/renderer/assets/icons/icon.icns
new file mode 100644
index 00000000..93da8771
Binary files /dev/null and b/src/renderer/assets/icons/icon.icns differ
diff --git a/src/renderer/assets/icons/icon.ico b/src/renderer/assets/icons/icon.ico
new file mode 100644
index 00000000..1e9d1e04
Binary files /dev/null and b/src/renderer/assets/icons/icon.ico differ
diff --git a/src/renderer/assets/icons/icon.png b/src/renderer/assets/icons/icon.png
new file mode 100644
index 00000000..f364f2c1
Binary files /dev/null and b/src/renderer/assets/icons/icon.png differ
diff --git a/src/renderer/assets/pause-circle.png b/src/renderer/assets/pause-circle.png
new file mode 100644
index 00000000..2636f00b
Binary files /dev/null and b/src/renderer/assets/pause-circle.png differ
diff --git a/src/renderer/assets/play-circle.png b/src/renderer/assets/play-circle.png
new file mode 100644
index 00000000..0d10870e
Binary files /dev/null and b/src/renderer/assets/play-circle.png differ
diff --git a/src/renderer/assets/skip-next.png b/src/renderer/assets/skip-next.png
new file mode 100644
index 00000000..438fb3a3
Binary files /dev/null and b/src/renderer/assets/skip-next.png differ
diff --git a/src/renderer/assets/skip-previous.png b/src/renderer/assets/skip-previous.png
new file mode 100644
index 00000000..14088508
Binary files /dev/null and b/src/renderer/assets/skip-previous.png differ
diff --git a/src/renderer/components/accordion/index.tsx b/src/renderer/components/accordion/index.tsx
index 63132d23..8a579c72 100644
--- a/src/renderer/components/accordion/index.tsx
+++ b/src/renderer/components/accordion/index.tsx
@@ -1,4 +1,5 @@
 import type { AccordionProps as MantineAccordionProps } from '@mantine/core';
+
 import { Accordion as MantineAccordion } from '@mantine/core';
 import styled from 'styled-components';
 
diff --git a/src/renderer/components/audio-player/index.tsx b/src/renderer/components/audio-player/index.tsx
index 87e0e20e..fedb6c9a 100644
--- a/src/renderer/components/audio-player/index.tsx
+++ b/src/renderer/components/audio-player/index.tsx
@@ -1,27 +1,36 @@
+import type { Song } from '/@/renderer/api/types';
+import type { CrossfadeStyle } from '/@/renderer/types';
+import type { ReactPlayerProps } from 'react-player';
+
+import isElectron from 'is-electron';
 import {
-    useImperativeHandle,
     forwardRef,
-    useRef,
-    useState,
     useCallback,
     useEffect,
+    useImperativeHandle,
     useMemo,
+    useRef,
+    useState,
 } from 'react';
-import isElectron from 'is-electron';
-import type { ReactPlayerProps } from 'react-player';
 import ReactPlayer from 'react-player/lazy';
-import type { Song } from '/@/renderer/api/types';
+
+import { api } from '/@/renderer/api';
 import {
     crossfadeHandler,
     gaplessHandler,
 } from '/@/renderer/components/audio-player/utils/list-handlers';
-import { useSettingsStore, useSettingsStoreActions } from '/@/renderer/store/settings.store';
-import type { CrossfadeStyle } from '/@/renderer/types';
-import { PlaybackStyle, PlayerStatus } from '/@/renderer/types';
+import { toast } from '/@/renderer/components/toast';
 import { useWebAudio } from '/@/renderer/features/player/hooks/use-webaudio';
 import { getServerById, TranscodingConfig, usePlaybackSettings, useSpeed } from '/@/renderer/store';
-import { toast } from '/@/renderer/components/toast';
-import { api } from '/@/renderer/api';
+import { useSettingsStore, useSettingsStoreActions } from '/@/renderer/store/settings.store';
+import { PlaybackStyle, PlayerStatus } from '/@/renderer/types';
+
+export type AudioPlayerProgress = {
+    loaded: number;
+    loadedSeconds: number;
+    played: number;
+    playedSeconds: number;
+};
 
 interface AudioPlayerProps extends ReactPlayerProps {
     crossfadeDuration: number;
@@ -34,13 +43,6 @@ interface AudioPlayerProps extends ReactPlayerProps {
     volume: number;
 }
 
-export type AudioPlayerProgress = {
-    loaded: number;
-    loadedSeconds: number;
-    played: number;
-    playedSeconds: number;
-};
-
 const getDuration = (ref: any) => {
     return ref.current?.player?.player?.player?.duration;
 };
@@ -53,7 +55,7 @@ const getDuration = (ref: any) => {
 const EMPTY_SOURCE =
     'data:audio/mp3;base64,SUQzBAAAAAAAI1RTU0UAAAAPAAADTGF2ZjU2LjM2LjEwMAAAAAAAAAAAAAAA//OEAAAAAAAAAAAAAAAAAAAAAAAASW5mbwAAAA8AAAAEAAABIADAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDV1dXV1dXV1dXV1dXV1dXV1dXV1dXV1dXV6urq6urq6urq6urq6urq6urq6urq6urq6v////////////////////////////////8AAAAATGF2YzU2LjQxAAAAAAAAAAAAAAAAJAAAAAAAAAAAASDs90hvAAAAAAAAAAAAAAAAAAAA//MUZAAAAAGkAAAAAAAAA0gAAAAATEFN//MUZAMAAAGkAAAAAAAAA0gAAAAARTMu//MUZAYAAAGkAAAAAAAAA0gAAAAAOTku//MUZAkAAAGkAAAAAAAAA0gAAAAANVVV';
 
-const useSongUrl = (transcode: TranscodingConfig, current: boolean, song?: Song): string | null => {
+const useSongUrl = (transcode: TranscodingConfig, current: boolean, song?: Song): null | string => {
     const prior = useRef(['', '']);
 
     return useMemo(() => {
@@ -94,15 +96,15 @@ const useSongUrl = (transcode: TranscodingConfig, current: boolean, song?: Song)
 export const AudioPlayer = forwardRef(
     (
         {
-            status,
-            playbackStyle,
-            crossfadeStyle,
-            crossfadeDuration,
-            currentPlayer,
             autoNext,
+            crossfadeDuration,
+            crossfadeStyle,
+            currentPlayer,
+            muted,
+            playbackStyle,
             player1,
             player2,
-            muted,
+            status,
             volume,
         }: AudioPlayerProps,
         ref: any,
@@ -120,7 +122,7 @@ export const AudioPlayer = forwardRef(
         const stream1 = useSongUrl(transcode, currentPlayer === 1, player1);
         const stream2 = useSongUrl(transcode, currentPlayer === 2, player2);
 
-        const { webAudio, setWebAudio } = useWebAudio();
+        const { setWebAudio, webAudio } = useWebAudio();
         const [player1Source, setPlayer1Source] = useState<MediaElementAudioSourceNode | null>(
             null,
         );
@@ -415,43 +417,43 @@ export const AudioPlayer = forwardRef(
         return (
             <>
                 <ReactPlayer
-                    ref={player1Ref}
                     config={{
                         file: { attributes: { crossOrigin: 'anonymous' }, forceAudio: true },
                     }}
                     height={0}
                     muted={muted}
-                    playbackRate={playbackSpeed}
-                    playing={currentPlayer === 1 && status === PlayerStatus.PLAYING}
-                    progressInterval={isTransitioning ? 10 : 250}
-                    url={stream1 || EMPTY_SOURCE}
-                    volume={webAudio ? 1 : volume}
-                    width={0}
                     // If there is no stream url, we do not need to handle when the audio finishes
                     onEnded={stream1 ? handleOnEnded : undefined}
                     onProgress={
                         playbackStyle === PlaybackStyle.GAPLESS ? handleGapless1 : handleCrossfade1
                     }
                     onReady={handlePlayer1Start}
+                    playbackRate={playbackSpeed}
+                    playing={currentPlayer === 1 && status === PlayerStatus.PLAYING}
+                    progressInterval={isTransitioning ? 10 : 250}
+                    ref={player1Ref}
+                    url={stream1 || EMPTY_SOURCE}
+                    volume={webAudio ? 1 : volume}
+                    width={0}
                 />
                 <ReactPlayer
-                    ref={player2Ref}
                     config={{
                         file: { attributes: { crossOrigin: 'anonymous' }, forceAudio: true },
                     }}
                     height={0}
                     muted={muted}
-                    playbackRate={playbackSpeed}
-                    playing={currentPlayer === 2 && status === PlayerStatus.PLAYING}
-                    progressInterval={isTransitioning ? 10 : 250}
-                    url={stream2 || EMPTY_SOURCE}
-                    volume={webAudio ? 1 : volume}
-                    width={0}
                     onEnded={stream2 ? handleOnEnded : undefined}
                     onProgress={
                         playbackStyle === PlaybackStyle.GAPLESS ? handleGapless2 : handleCrossfade2
                     }
                     onReady={handlePlayer2Start}
+                    playbackRate={playbackSpeed}
+                    playing={currentPlayer === 2 && status === PlayerStatus.PLAYING}
+                    progressInterval={isTransitioning ? 10 : 250}
+                    ref={player2Ref}
+                    url={stream2 || EMPTY_SOURCE}
+                    volume={webAudio ? 1 : volume}
+                    width={0}
                 />
             </>
         );
diff --git a/src/renderer/components/audio-player/utils/list-handlers.ts b/src/renderer/components/audio-player/utils/list-handlers.ts
index a22b0fa9..89c96bb6 100644
--- a/src/renderer/components/audio-player/utils/list-handlers.ts
+++ b/src/renderer/components/audio-player/utils/list-handlers.ts
@@ -1,5 +1,5 @@
-/* eslint-disable no-nested-ternary */
 import type { Dispatch } from 'react';
+
 import { CrossfadeStyle } from '/@/renderer/types';
 
 export const gaplessHandler = (args: {
@@ -10,7 +10,7 @@ export const gaplessHandler = (args: {
     nextPlayerRef: any;
     setIsTransitioning: Dispatch<boolean>;
 }) => {
-    const { nextPlayerRef, currentTime, duration, isTransitioning, setIsTransitioning, isFlac } =
+    const { currentTime, duration, isFlac, isTransitioning, nextPlayerRef, setIsTransitioning } =
         args;
 
     if (!isTransitioning) {
@@ -46,17 +46,17 @@ export const crossfadeHandler = (args: {
     volume: number;
 }) => {
     const {
-        currentTime,
-        player,
         currentPlayer,
         currentPlayerRef,
-        nextPlayerRef,
+        currentTime,
+        duration,
         fadeDuration,
         fadeType,
-        duration,
-        volume,
         isTransitioning,
+        nextPlayerRef,
+        player,
         setIsTransitioning,
+        volume,
     } = args;
 
     if (!isTransitioning || currentPlayer !== player) {
@@ -79,22 +79,18 @@ export const crossfadeHandler = (args: {
     let percentageOfFadeLeft;
     let n;
     switch (fadeType) {
-        case 'equalPower':
-            // https://dsp.stackexchange.com/a/14755
-            percentageOfFadeLeft = (timeLeft / fadeDuration) * 2;
-            currentPlayerVolumeCalculation = Math.sqrt(0.5 * percentageOfFadeLeft) * volume;
-            nextPlayerVolumeCalculation = Math.sqrt(0.5 * (2 - percentageOfFadeLeft)) * volume;
-            break;
-        case 'linear':
-            currentPlayerVolumeCalculation = (timeLeft / fadeDuration) * volume;
-            nextPlayerVolumeCalculation = ((fadeDuration - timeLeft) / fadeDuration) * volume;
-            break;
         case 'dipped':
             // https://math.stackexchange.com/a/4622
             percentageOfFadeLeft = timeLeft / fadeDuration;
             currentPlayerVolumeCalculation = percentageOfFadeLeft ** 2 * volume;
             nextPlayerVolumeCalculation = (percentageOfFadeLeft - 1) ** 2 * volume;
             break;
+        case 'equalPower':
+            // https://dsp.stackexchange.com/a/14755
+            percentageOfFadeLeft = (timeLeft / fadeDuration) * 2;
+            currentPlayerVolumeCalculation = Math.sqrt(0.5 * percentageOfFadeLeft) * volume;
+            nextPlayerVolumeCalculation = Math.sqrt(0.5 * (2 - percentageOfFadeLeft)) * volume;
+            break;
         case fadeType.match(/constantPower.*/)?.input:
             // https://math.stackexchange.com/a/26159
             n =
@@ -114,6 +110,10 @@ export const crossfadeHandler = (args: {
                 Math.cos((Math.PI / 4) * ((2 * percentageOfFadeLeft - 1) ** (2 * n + 1) + 1)) *
                 volume;
             break;
+        case 'linear':
+            currentPlayerVolumeCalculation = (timeLeft / fadeDuration) * volume;
+            nextPlayerVolumeCalculation = ((fadeDuration - timeLeft) / fadeDuration) * volume;
+            break;
 
         default:
             currentPlayerVolumeCalculation = (timeLeft / fadeDuration) * volume;
diff --git a/src/renderer/components/badge/index.tsx b/src/renderer/components/badge/index.tsx
index 2343f744..309298db 100644
--- a/src/renderer/components/badge/index.tsx
+++ b/src/renderer/components/badge/index.tsx
@@ -1,4 +1,5 @@
 import type { BadgeProps as MantineBadgeProps } from '@mantine/core';
+
 import { createPolymorphicComponent, Badge as MantineBadge } from '@mantine/core';
 import styled from 'styled-components';
 
diff --git a/src/renderer/components/button/index.tsx b/src/renderer/components/button/index.tsx
index 41bf1638..29d67b6d 100644
--- a/src/renderer/components/button/index.tsx
+++ b/src/renderer/components/button/index.tsx
@@ -1,9 +1,11 @@
-import type { Ref } from 'react';
-import React, { useRef, useCallback, useState, forwardRef } from 'react';
 import type { ButtonProps as MantineButtonProps, TooltipProps } from '@mantine/core';
-import { Button as MantineButton, createPolymorphicComponent } from '@mantine/core';
+import type { Ref } from 'react';
+
+import { createPolymorphicComponent, Button as MantineButton } from '@mantine/core';
 import { useTimeout } from '@mantine/hooks';
+import React, { forwardRef, useCallback, useRef, useState } from 'react';
 import styled from 'styled-components';
+
 import { Spinner } from '/@/renderer/components/spinner';
 import { Tooltip } from '/@/renderer/components/tooltip';
 
@@ -94,8 +96,8 @@ export const _Button = forwardRef<HTMLButtonElement, ButtonProps>(
                     {...tooltip}
                 >
                     <StyledButton
-                        ref={ref}
                         loaderPosition="center"
+                        ref={ref}
                         {...props}
                     >
                         <ButtonChildWrapper $loading={props.loading}>{children}</ButtonChildWrapper>
@@ -111,8 +113,8 @@ export const _Button = forwardRef<HTMLButtonElement, ButtonProps>(
 
         return (
             <StyledButton
-                ref={ref}
                 loaderPosition="center"
+                ref={ref}
                 {...props}
             >
                 <ButtonChildWrapper $loading={props.loading}>{children}</ButtonChildWrapper>
@@ -153,7 +155,7 @@ export const TimeoutButton = ({ timeoutProps, ...props }: HoldButtonProps) => {
         setIsRunning(false);
     };
 
-    const { start, clear } = useTimeout(callback, timeoutProps.duration);
+    const { clear, start } = useTimeout(callback, timeoutProps.duration);
 
     const startTimeout = useCallback(() => {
         if (isRunning) {
@@ -174,8 +176,8 @@ export const TimeoutButton = ({ timeoutProps, ...props }: HoldButtonProps) => {
 
     return (
         <Button
-            sx={{ color: 'var(--danger-color)' }}
             onClick={startTimeout}
+            sx={{ color: 'var(--danger-color)' }}
             {...props}
         >
             {isRunning ? 'Cancel' : props.children}
diff --git a/src/renderer/components/card/album-card.tsx b/src/renderer/components/card/album-card.tsx
index 7e58cc4d..a322cbe4 100644
--- a/src/renderer/components/card/album-card.tsx
+++ b/src/renderer/components/card/album-card.tsx
@@ -1,14 +1,16 @@
-import { useCallback } from 'react';
+import type { CardRoute, CardRow, Play, PlayQueueAddOptions } from '/@/renderer/types';
+
 import { Center } from '@mantine/core';
+import { useCallback } from 'react';
 import { RiAlbumFill } from 'react-icons/ri';
 import { generatePath, useNavigate } from 'react-router';
 import { SimpleImg } from 'react-simple-img';
 import styled from 'styled-components';
-import type { CardRow, CardRoute, Play, PlayQueueAddOptions } from '/@/renderer/types';
-import { Skeleton } from '/@/renderer/components/skeleton';
-import { CardControls } from '/@/renderer/components/card/card-controls';
+
 import { Album, AlbumArtist, Artist, LibraryItem } from '/@/renderer/api/types';
+import { CardControls } from '/@/renderer/components/card/card-controls';
 import { CardRows } from '/@/renderer/components/card/card-rows';
+import { Skeleton } from '/@/renderer/components/skeleton';
 
 const CardWrapper = styled.div<{
     link?: boolean;
@@ -104,7 +106,7 @@ const Row = styled.div<{ $secondary?: boolean }>`
 
 interface BaseGridCardProps {
     controls: {
-        cardRows: CardRow<Album | Artist | AlbumArtist>[];
+        cardRows: CardRow<Album | AlbumArtist | Artist>[];
         itemType: LibraryItem;
         playButtonBehavior: Play;
         route: CardRoute;
@@ -116,14 +118,14 @@ interface BaseGridCardProps {
 }
 
 export const AlbumCard = ({
+    controls,
+    data,
+    handlePlayQueueAdd,
     loading,
     size,
-    handlePlayQueueAdd,
-    data,
-    controls,
 }: BaseGridCardProps) => {
     const navigate = useNavigate();
-    const { itemType, cardRows, route } = controls;
+    const { cardRows, itemType, route } = controls;
 
     const handleNavigate = useCallback(() => {
         navigate(
@@ -194,9 +196,9 @@ export const AlbumCard = ({
         <CardWrapper>
             <StyledCard style={{ alignItems: 'center', display: 'flex' }}>
                 <Skeleton
-                    visible
                     height={size}
                     radius="sm"
+                    visible
                     width={size}
                 >
                     <ImageSection />
@@ -204,10 +206,10 @@ export const AlbumCard = ({
                 <DetailSection style={{ width: '100%' }}>
                     {(cardRows || []).map((_row: CardRow<Album>, index: number) => (
                         <Skeleton
-                            visible
                             height={15}
                             my={3}
                             radius="md"
+                            visible
                             width={!data ? (index > 0 ? '50%' : '90%') : '100%'}
                         >
                             <Row />
diff --git a/src/renderer/components/card/card-controls.tsx b/src/renderer/components/card/card-controls.tsx
index 70e9e132..ffa57e95 100644
--- a/src/renderer/components/card/card-controls.tsx
+++ b/src/renderer/components/card/card-controls.tsx
@@ -1,21 +1,23 @@
-import type { MouseEvent } from 'react';
-import React from 'react';
-import type { UnstyledButtonProps } from '@mantine/core';
-import { Group } from '@mantine/core';
-import { RiPlayFill, RiMore2Fill, RiHeartFill, RiHeartLine } from 'react-icons/ri';
-import styled from 'styled-components';
-import { _Button } from '/@/renderer/components/button';
 import type { PlayQueueAddOptions } from '/@/renderer/types';
-import { Play } from '/@/renderer/types';
-import { usePlayButtonBehavior } from '/@/renderer/store/settings.store';
+import type { UnstyledButtonProps } from '@mantine/core';
+import type { MouseEvent } from 'react';
+
+import { Group } from '@mantine/core';
+import React from 'react';
+import { RiHeartFill, RiHeartLine, RiMore2Fill, RiPlayFill } from 'react-icons/ri';
+import styled from 'styled-components';
+
 import { LibraryItem } from '/@/renderer/api/types';
-import { useHandleGeneralContextMenu } from '/@/renderer/features/context-menu/hooks/use-handle-context-menu';
+import { _Button } from '/@/renderer/components/button';
 import {
     ALBUM_CONTEXT_MENU_ITEMS,
     ARTIST_CONTEXT_MENU_ITEMS,
 } from '/@/renderer/features/context-menu/context-menu-items';
+import { useHandleGeneralContextMenu } from '/@/renderer/features/context-menu/hooks/use-handle-context-menu';
+import { usePlayButtonBehavior } from '/@/renderer/store/settings.store';
+import { Play } from '/@/renderer/types';
 
-type PlayButtonType = UnstyledButtonProps & React.ComponentPropsWithoutRef<'button'>;
+type PlayButtonType = React.ComponentPropsWithoutRef<'button'> & UnstyledButtonProps;
 
 const PlayButton = styled.button<PlayButtonType>`
     display: flex;
@@ -104,9 +106,9 @@ const FavoriteWrapper = styled.span<{ isFavorite: boolean }>`
 `;
 
 export const CardControls = ({
+    handlePlayQueueAdd,
     itemData,
     itemType,
-    handlePlayQueueAdd,
 }: {
     handlePlayQueueAdd?: (options: PlayQueueAddOptions) => void;
     itemData: any;
@@ -156,14 +158,14 @@ export const CardControls = ({
                         </FavoriteWrapper>
                     </SecondaryButton>
                     <SecondaryButton
-                        p={5}
-                        sx={{ svg: { fill: 'white !important' } }}
-                        variant="subtle"
                         onClick={(e) => {
                             e.preventDefault();
                             e.stopPropagation();
                             handleContextMenu(e, [itemData]);
                         }}
+                        p={5}
+                        sx={{ svg: { fill: 'white !important' } }}
+                        variant="subtle"
                     >
                         <RiMore2Fill
                             color="white"
diff --git a/src/renderer/components/card/card-rows.tsx b/src/renderer/components/card/card-rows.tsx
index 6e7e3b11..9e667d06 100644
--- a/src/renderer/components/card/card-rows.tsx
+++ b/src/renderer/components/card/card-rows.tsx
@@ -1,8 +1,9 @@
-import React from 'react';
 import formatDuration from 'format-duration';
+import React from 'react';
 import { generatePath } from 'react-router';
 import { Link } from 'react-router-dom';
 import styled from 'styled-components';
+
 import { Album, AlbumArtist, Artist, Playlist, Song } from '/@/renderer/api/types';
 import { Text } from '/@/renderer/components/text';
 import { AppRoute } from '/@/renderer/router/routes';
@@ -23,7 +24,7 @@ const Row = styled.div<{ $secondary?: boolean }>`
 
 interface CardRowsProps {
     data: any;
-    rows: CardRow<Album>[] | CardRow<Artist>[] | CardRow<AlbumArtist>[];
+    rows: CardRow<Album>[] | CardRow<AlbumArtist>[] | CardRow<Artist>[];
 }
 
 export const CardRows = ({ data, rows }: CardRowsProps) => {
@@ -33,8 +34,8 @@ export const CardRows = ({ data, rows }: CardRowsProps) => {
                 if (row.arrayProperty && row.route) {
                     return (
                         <Row
-                            key={`row-${row.property}-${index}`}
                             $secondary={index > 0}
+                            key={`row-${row.property}-${index}`}
                         >
                             {data[row.property].map((item: any, itemIndex: number) => (
                                 <React.Fragment key={`${data.id}-${item.id}`}>
@@ -55,6 +56,7 @@ export const CardRows = ({ data, rows }: CardRowsProps) => {
                                         $noSelect
                                         $secondary={index > 0}
                                         component={Link}
+                                        onClick={(e) => e.stopPropagation()}
                                         overflow="hidden"
                                         size={index > 0 ? 'sm' : 'md'}
                                         to={generatePath(
@@ -69,7 +71,6 @@ export const CardRows = ({ data, rows }: CardRowsProps) => {
                                                 };
                                             }, {}),
                                         )}
-                                        onClick={(e) => e.stopPropagation()}
                                     >
                                         {row.arrayProperty &&
                                             (row.format
@@ -87,9 +88,9 @@ export const CardRows = ({ data, rows }: CardRowsProps) => {
                         <Row key={`row-${row.property}`}>
                             {data[row.property].map((item: any) => (
                                 <Text
-                                    key={`${data.id}-${item.id}`}
                                     $noSelect
                                     $secondary={index > 0}
+                                    key={`${data.id}-${item.id}`}
                                     overflow="hidden"
                                     size={index > 0 ? 'sm' : 'md'}
                                 >
@@ -108,6 +109,7 @@ export const CardRows = ({ data, rows }: CardRowsProps) => {
                                 $link
                                 $noSelect
                                 component={Link}
+                                onClick={(e) => e.stopPropagation()}
                                 overflow="hidden"
                                 to={generatePath(
                                     row.route.route,
@@ -118,7 +120,6 @@ export const CardRows = ({ data, rows }: CardRowsProps) => {
                                         };
                                     }, {}),
                                 )}
-                                onClick={(e) => e.stopPropagation()}
                             >
                                 {data && (row.format ? row.format(data) : data[row.property])}
                             </Text>
diff --git a/src/renderer/components/card/poster-card.tsx b/src/renderer/components/card/poster-card.tsx
index 11bb6e0e..baf0a13f 100644
--- a/src/renderer/components/card/poster-card.tsx
+++ b/src/renderer/components/card/poster-card.tsx
@@ -3,15 +3,16 @@ import { RiAlbumFill, RiPlayListFill, RiUserVoiceFill } from 'react-icons/ri';
 import { generatePath, Link } from 'react-router-dom';
 import { SimpleImg } from 'react-simple-img';
 import styled, { css } from 'styled-components';
+
 import { Album, AlbumArtist, Artist, LibraryItem } from '/@/renderer/api/types';
 import { CardRows } from '/@/renderer/components/card';
 import { Skeleton } from '/@/renderer/components/skeleton';
 import { GridCardControls } from '/@/renderer/components/virtual-grid/grid-card/grid-card-controls';
-import { CardRow, PlayQueueAddOptions, Play, CardRoute } from '/@/renderer/types';
+import { CardRoute, CardRow, Play, PlayQueueAddOptions } from '/@/renderer/types';
 
 interface BaseGridCardProps {
     controls: {
-        cardRows: CardRow<Album>[] | CardRow<Artist>[] | CardRow<AlbumArtist>[];
+        cardRows: CardRow<Album>[] | CardRow<AlbumArtist>[] | CardRow<Artist>[];
         handleFavorite: (options: {
             id: string[];
             isFavorite: boolean;
@@ -101,8 +102,8 @@ const DetailContainer = styled.div`
 `;
 
 export const PosterCard = ({
-    data,
     controls,
+    data,
     isLoading,
     uniqueId,
 }: BaseGridCardProps & { uniqueId: string }) => {
@@ -123,10 +124,10 @@ export const PosterCard = ({
             case LibraryItem.ALBUM:
                 Placeholder = RiAlbumFill;
                 break;
-            case LibraryItem.ARTIST:
+            case LibraryItem.ALBUM_ARTIST:
                 Placeholder = RiUserVoiceFill;
                 break;
-            case LibraryItem.ALBUM_ARTIST:
+            case LibraryItem.ARTIST:
                 Placeholder = RiUserVoiceFill;
                 break;
             case LibraryItem.PLAYLIST:
@@ -184,8 +185,8 @@ export const PosterCard = ({
     return (
         <PosterCardContainer key={`placeholder-${uniqueId}-${data.id}`}>
             <Skeleton
-                visible
                 radius="sm"
+                visible
             >
                 <ImageContainerSkeleton />
             </Skeleton>
@@ -193,10 +194,10 @@ export const PosterCard = ({
                 <Stack spacing="sm">
                     {(controls?.cardRows || []).map((row, index) => (
                         <Skeleton
-                            key={`${index}-${row.arrayProperty}`}
-                            visible
                             height={14}
+                            key={`${index}-${row.arrayProperty}`}
                             radius="sm"
+                            visible
                         />
                     ))}
                 </Stack>
diff --git a/src/renderer/components/checkbox/index.tsx b/src/renderer/components/checkbox/index.tsx
index dff0c054..bb453692 100644
--- a/src/renderer/components/checkbox/index.tsx
+++ b/src/renderer/components/checkbox/index.tsx
@@ -1,5 +1,5 @@
+import { CheckboxProps, Checkbox as MantineCheckbox } from '@mantine/core';
 import { forwardRef } from 'react';
-import { Checkbox as MantineCheckbox, CheckboxProps } from '@mantine/core';
 import styled from 'styled-components';
 
 const StyledCheckbox = styled(MantineCheckbox)`
diff --git a/src/renderer/components/context-menu/index.tsx b/src/renderer/components/context-menu/index.tsx
index 97f83db3..ef88a507 100644
--- a/src/renderer/components/context-menu/index.tsx
+++ b/src/renderer/components/context-menu/index.tsx
@@ -1,6 +1,6 @@
-import { ComponentPropsWithoutRef, forwardRef, ReactNode, Ref } from 'react';
 import { Box, Group, UnstyledButton, UnstyledButtonProps } from '@mantine/core';
 import { motion, Variants } from 'framer-motion';
+import { ComponentPropsWithoutRef, forwardRef, ReactNode, Ref } from 'react';
 import styled from 'styled-components';
 
 interface ContextMenuProps {
@@ -61,11 +61,11 @@ export const ContextMenuButton = forwardRef(
     (
         {
             children,
-            rightIcon,
             leftIcon,
+            rightIcon,
             ...props
-        }: UnstyledButtonProps &
-            ComponentPropsWithoutRef<'button'> & {
+        }: ComponentPropsWithoutRef<'button'> &
+            UnstyledButtonProps & {
                 leftIcon?: ReactNode;
                 rightIcon?: ReactNode;
             },
@@ -74,11 +74,11 @@ export const ContextMenuButton = forwardRef(
         return (
             <StyledContextMenuButton
                 {...props}
-                key={props.key}
-                ref={ref}
                 as="button"
                 disabled={props.disabled}
+                key={props.key}
                 onClick={props.onClick}
+                ref={ref}
             >
                 <Group position="apart">
                     <Group spacing="md">
@@ -108,14 +108,14 @@ const variants: Variants = {
 };
 
 export const ContextMenu = forwardRef(
-    ({ yPos, xPos, minWidth, maxWidth, children }: ContextMenuProps, ref: Ref<HTMLDivElement>) => {
+    ({ children, maxWidth, minWidth, xPos, yPos }: ContextMenuProps, ref: Ref<HTMLDivElement>) => {
         return (
             <ContextMenuContainer
-                ref={ref}
                 animate="open"
                 initial="closed"
                 maxWidth={maxWidth}
                 minWidth={minWidth}
+                ref={ref}
                 variants={variants}
                 xPos={xPos}
                 yPos={yPos}
diff --git a/src/renderer/components/date-picker/index.tsx b/src/renderer/components/date-picker/index.tsx
index bd96fe53..55baac9d 100644
--- a/src/renderer/components/date-picker/index.tsx
+++ b/src/renderer/components/date-picker/index.tsx
@@ -1,4 +1,5 @@
 import type { DatePickerProps as MantineDatePickerProps } from '@mantine/dates';
+
 import { DatePicker as MantineDatePicker } from '@mantine/dates';
 import styled from 'styled-components';
 
@@ -34,7 +35,7 @@ const StyledDatePicker = styled(MantineDatePicker)<DatePickerProps>`
     }
 `;
 
-export const DatePicker = ({ width, maxWidth, ...props }: DatePickerProps) => {
+export const DatePicker = ({ maxWidth, width, ...props }: DatePickerProps) => {
     return (
         <StyledDatePicker
             {...props}
diff --git a/src/renderer/components/dialog/index.tsx b/src/renderer/components/dialog/index.tsx
index c026f4a9..138de285 100644
--- a/src/renderer/components/dialog/index.tsx
+++ b/src/renderer/components/dialog/index.tsx
@@ -1,4 +1,5 @@
 import type { DialogProps as MantineDialogProps } from '@mantine/core';
+
 import { Dialog as MantineDialog } from '@mantine/core';
 import styled from 'styled-components';
 
diff --git a/src/renderer/components/dropdown-menu/index.tsx b/src/renderer/components/dropdown-menu/index.tsx
index fa5f49ff..0df315a6 100644
--- a/src/renderer/components/dropdown-menu/index.tsx
+++ b/src/renderer/components/dropdown-menu/index.tsx
@@ -1,24 +1,25 @@
-import { ReactNode } from 'react';
 import type {
-    MenuProps as MantineMenuProps,
-    MenuItemProps as MantineMenuItemProps,
-    MenuLabelProps as MantineMenuLabelProps,
     MenuDividerProps as MantineMenuDividerProps,
     MenuDropdownProps as MantineMenuDropdownProps,
+    MenuItemProps as MantineMenuItemProps,
+    MenuLabelProps as MantineMenuLabelProps,
+    MenuProps as MantineMenuProps,
 } from '@mantine/core';
-import { Menu as MantineMenu, createPolymorphicComponent } from '@mantine/core';
+
+import { createPolymorphicComponent, Menu as MantineMenu } from '@mantine/core';
+import { ReactNode } from 'react';
 import { RiArrowLeftSFill } from 'react-icons/ri';
 import styled from 'styled-components';
 
-type MenuProps = MantineMenuProps;
-type MenuLabelProps = MantineMenuLabelProps;
+type MenuDividerProps = MantineMenuDividerProps;
+type MenuDropdownProps = MantineMenuDropdownProps;
 interface MenuItemProps extends MantineMenuItemProps {
     $danger?: boolean;
     $isActive?: boolean;
     children: ReactNode;
 }
-type MenuDividerProps = MantineMenuDividerProps;
-type MenuDropdownProps = MantineMenuDropdownProps;
+type MenuLabelProps = MantineMenuLabelProps;
+type MenuProps = MantineMenuProps;
 
 const StyledMenu = styled(MantineMenu)<MenuProps>``;
 
@@ -81,7 +82,6 @@ const StyledMenuDivider = styled(MantineMenu.Divider)`
 export const DropdownMenu = ({ children, ...props }: MenuProps) => {
     return (
         <StyledMenu
-            withinPortal
             styles={{
                 dropdown: {
                     filter: 'drop-shadow(0 0 5px rgb(0, 0, 0, 50%))',
@@ -90,6 +90,7 @@ export const DropdownMenu = ({ children, ...props }: MenuProps) => {
             transitionProps={{
                 transition: 'fade',
             }}
+            withinPortal
             {...props}
         >
             {children}
@@ -101,7 +102,7 @@ const MenuLabel = ({ children, ...props }: MenuLabelProps) => {
     return <StyledMenuLabel {...props}>{children}</StyledMenuLabel>;
 };
 
-const pMenuItem = ({ $isActive, $danger, children, ...props }: MenuItemProps) => {
+const pMenuItem = ({ $danger, $isActive, children, ...props }: MenuItemProps) => {
     return (
         <StyledMenuItem
             $danger={$danger}
diff --git a/src/renderer/components/feature-carousel/index.tsx b/src/renderer/components/feature-carousel/index.tsx
index 01ed1b18..506b66b0 100644
--- a/src/renderer/components/feature-carousel/index.tsx
+++ b/src/renderer/components/feature-carousel/index.tsx
@@ -1,20 +1,22 @@
-import type { MouseEvent } from 'react';
-import { useState } from 'react';
-import { Group, Image, Stack } from '@mantine/core';
 import type { Variants } from 'framer-motion';
+import type { MouseEvent } from 'react';
+
+import { Group, Image, Stack } from '@mantine/core';
 import { AnimatePresence, motion } from 'framer-motion';
+import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { RiArrowLeftSLine, RiArrowRightSLine } from 'react-icons/ri';
-import { Link, generatePath } from 'react-router-dom';
+import { generatePath, Link } from 'react-router-dom';
 import styled from 'styled-components';
+
 import { Album, LibraryItem } from '/@/renderer/api/types';
+import { Badge } from '/@/renderer/components/badge';
 import { Button } from '/@/renderer/components/button';
 import { TextTitle } from '/@/renderer/components/text-title';
-import { Badge } from '/@/renderer/components/badge';
-import { AppRoute } from '/@/renderer/router/routes';
 import { usePlayQueueAdd } from '/@/renderer/features/player/hooks/use-playqueue-add';
-import { Play } from '/@/renderer/types';
+import { AppRoute } from '/@/renderer/router/routes';
 import { usePlayButtonBehavior } from '/@/renderer/store';
+import { Play } from '/@/renderer/types';
 
 const Carousel = styled(motion.div)`
     position: relative;
@@ -152,11 +154,11 @@ export const FeatureCarousel = ({ data }: FeatureCarouselProps) => {
             >
                 {data && (
                     <Carousel
-                        key={`image-${itemIndex}`}
                         animate="animate"
                         custom={direction}
                         exit="exit"
                         initial="initial"
+                        key={`image-${itemIndex}`}
                         variants={variants}
                     >
                         <Grid>
@@ -218,9 +220,6 @@ export const FeatureCarousel = ({ data }: FeatureCarouselProps) => {
                                     </Group>
                                     <Group position="apart">
                                         <Button
-                                            size="lg"
-                                            style={{ borderRadius: '5rem' }}
-                                            variant="outline"
                                             onClick={(e) => {
                                                 e.preventDefault();
                                                 e.stopPropagation();
@@ -234,6 +233,9 @@ export const FeatureCarousel = ({ data }: FeatureCarouselProps) => {
                                                     playType,
                                                 });
                                             }}
+                                            size="lg"
+                                            style={{ borderRadius: '5rem' }}
+                                            variant="outline"
                                         >
                                             {t(
                                                 playType === Play.NOW
@@ -246,18 +248,18 @@ export const FeatureCarousel = ({ data }: FeatureCarouselProps) => {
                                         </Button>
                                         <Group spacing="sm">
                                             <Button
+                                                onClick={handlePrevious}
                                                 radius="lg"
                                                 size="sm"
                                                 variant="outline"
-                                                onClick={handlePrevious}
                                             >
                                                 <RiArrowLeftSLine size="2rem" />
                                             </Button>
                                             <Button
+                                                onClick={handleNext}
                                                 radius="lg"
                                                 size="sm"
                                                 variant="outline"
-                                                onClick={handleNext}
                                             >
                                                 <RiArrowRightSLine size="2rem" />
                                             </Button>
diff --git a/src/renderer/components/grid-carousel/index.tsx b/src/renderer/components/grid-carousel/index.tsx
index 78f5bd17..6bf6e94c 100644
--- a/src/renderer/components/grid-carousel/index.tsx
+++ b/src/renderer/components/grid-carousel/index.tsx
@@ -1,3 +1,5 @@
+import { Group, Stack } from '@mantine/core';
+import throttle from 'lodash/throttle';
 import {
     isValidElement,
     memo,
@@ -9,14 +11,13 @@ import {
     useRef,
     useState,
 } from 'react';
-import { Group, Stack } from '@mantine/core';
-import throttle from 'lodash/throttle';
 import { RiArrowLeftSLine, RiArrowRightSLine } from 'react-icons/ri';
 import styled from 'styled-components';
 import { SwiperOptions, Virtual } from 'swiper';
 import 'swiper/css';
 import { Swiper, SwiperSlide } from 'swiper/react';
 import { Swiper as SwiperCore } from 'swiper/types';
+
 import { Album, AlbumArtist, Artist, LibraryItem, RelatedArtist } from '/@/renderer/api/types';
 import { Button } from '/@/renderer/components/button';
 import { PosterCard } from '/@/renderer/components/card/poster-card';
@@ -44,14 +45,14 @@ const CarouselContainer = styled(Stack)`
 interface TitleProps {
     handleNext?: () => void;
     handlePrev?: () => void;
-    label?: string | ReactNode;
+    label?: ReactNode | string;
     pagination: {
         hasNextPage: boolean;
         hasPreviousPage: boolean;
     };
 }
 
-const Title = ({ label, handleNext, handlePrev, pagination }: TitleProps) => {
+const Title = ({ handleNext, handlePrev, label, pagination }: TitleProps) => {
     return (
         <Group position="apart">
             {isValidElement(label) ? (
@@ -69,18 +70,18 @@ const Title = ({ label, handleNext, handlePrev, pagination }: TitleProps) => {
                 <Button
                     compact
                     disabled={!pagination.hasPreviousPage}
+                    onClick={handlePrev}
                     size="lg"
                     variant="default"
-                    onClick={handlePrev}
                 >
                     <RiArrowLeftSLine />
                 </Button>
                 <Button
                     compact
                     disabled={!pagination.hasNextPage}
+                    onClick={handleNext}
                     size="lg"
                     variant="default"
-                    onClick={handleNext}
                 >
                     <RiArrowRightSLine />
                 </Button>
@@ -90,7 +91,7 @@ const Title = ({ label, handleNext, handlePrev, pagination }: TitleProps) => {
 };
 
 export interface SwiperGridCarouselProps {
-    cardRows: CardRow<Album>[] | CardRow<Artist>[] | CardRow<AlbumArtist>[];
+    cardRows: CardRow<Album>[] | CardRow<AlbumArtist>[] | CardRow<Artist>[];
     data: Album[] | AlbumArtist[] | Artist[] | RelatedArtist[] | undefined;
     isLoading?: boolean;
     itemType: LibraryItem;
@@ -100,7 +101,7 @@ export interface SwiperGridCarouselProps {
         children?: ReactNode;
         hasPagination?: boolean;
         icon?: ReactNode;
-        label: string | ReactNode;
+        label: ReactNode | string;
     };
     uniqueId: string;
 }
@@ -108,15 +109,15 @@ export interface SwiperGridCarouselProps {
 export const SwiperGridCarousel = ({
     cardRows,
     data,
+    isLoading,
     itemType,
     route,
     swiperProps,
     title,
-    isLoading,
     uniqueId,
 }: SwiperGridCarouselProps) => {
     const containerRef = useRef<HTMLDivElement>(null);
-    const swiperRef = useRef<SwiperCore | any>(null);
+    const swiperRef = useRef<any | SwiperCore>(null);
     const playButtonBehavior = usePlayButtonBehavior();
     const handlePlayQueueAdd = usePlayQueueAdd();
     const [slideCount, setSlideCount] = useState(4);
@@ -140,7 +141,7 @@ export const SwiperGridCarousel = ({
             itemType: LibraryItem;
             serverId: string;
         }) => {
-            const { id, itemType, isFavorite, serverId } = options;
+            const { id, isFavorite, itemType, serverId } = options;
             if (isFavorite) {
                 deleteFavoriteMutation.mutate({
                     query: {
@@ -205,7 +206,7 @@ export const SwiperGridCarousel = ({
     }, [slideCount, swiperProps?.slidesPerView]);
 
     const handleOnSlideChange = useCallback((e: SwiperCore) => {
-        const { slides, isEnd, isBeginning, params } = e;
+        const { isBeginning, isEnd, params, slides } = e;
         if (isEnd || isBeginning) return;
 
         const slideCount = (params.slidesPerView as number | undefined) || 4;
@@ -216,7 +217,7 @@ export const SwiperGridCarousel = ({
     }, []);
 
     const handleOnZoomChange = useCallback((e: SwiperCore) => {
-        const { slides, isEnd, isBeginning, params } = e;
+        const { isBeginning, isEnd, params, slides } = e;
         if (isEnd || isBeginning) return;
 
         const slideCount = (params.slidesPerView as number | undefined) || 4;
@@ -227,7 +228,7 @@ export const SwiperGridCarousel = ({
     }, []);
 
     const handleOnReachEnd = useCallback((e: SwiperCore) => {
-        const { slides, params } = e;
+        const { params, slides } = e;
 
         const slideCount = (params.slidesPerView as number | undefined) || 4;
         setPagination({
@@ -237,7 +238,7 @@ export const SwiperGridCarousel = ({
     }, []);
 
     const handleOnReachBeginning = useCallback((e: SwiperCore) => {
-        const { slides, params } = e;
+        const { params, slides } = e;
 
         const slideCount = (params.slidesPerView as number | undefined) || 4;
         setPagination({
@@ -279,8 +280,8 @@ export const SwiperGridCarousel = ({
 
     return (
         <CarouselContainer
-            ref={containerRef}
             className="grid-carousel"
+            ref={containerRef}
             spacing="md"
         >
             {title ? (
@@ -292,12 +293,7 @@ export const SwiperGridCarousel = ({
                 />
             ) : null}
             <Swiper
-                ref={swiperRef}
-                resizeObserver
                 modules={[Virtual]}
-                slidesPerView={slideCount}
-                spaceBetween={20}
-                style={{ height: '100%', width: '100%' }}
                 onBeforeInit={(swiper) => {
                     swiperRef.current = swiper;
                 }}
@@ -305,6 +301,11 @@ export const SwiperGridCarousel = ({
                 onReachEnd={handleOnReachEnd}
                 onSlideChange={handleOnSlideChange}
                 onZoomChange={handleOnZoomChange}
+                ref={swiperRef}
+                resizeObserver
+                slidesPerView={slideCount}
+                spaceBetween={20}
+                style={{ height: '100%', width: '100%' }}
                 {...swiperProps}
             >
                 {slides.map((slideContent, index) => {
diff --git a/src/renderer/components/hover-card/index.tsx b/src/renderer/components/hover-card/index.tsx
index 7de932b7..713800b8 100644
--- a/src/renderer/components/hover-card/index.tsx
+++ b/src/renderer/components/hover-card/index.tsx
@@ -1,4 +1,4 @@
-import { HoverCard as MantineHoverCard, HoverCardProps } from '@mantine/core';
+import { HoverCardProps, HoverCard as MantineHoverCard } from '@mantine/core';
 
 export const HoverCard = ({ children, ...props }: HoverCardProps) => {
     return (
diff --git a/src/renderer/components/input/index.tsx b/src/renderer/components/input/index.tsx
index 94e1d1e1..9cd82ef4 100644
--- a/src/renderer/components/input/index.tsx
+++ b/src/renderer/components/input/index.tsx
@@ -1,23 +1,30 @@
-import React, { forwardRef } from 'react';
 import type {
-    TextInputProps as MantineTextInputProps,
-    NumberInputProps as MantineNumberInputProps,
-    PasswordInputProps as MantinePasswordInputProps,
     FileInputProps as MantineFileInputProps,
     JsonInputProps as MantineJsonInputProps,
+    NumberInputProps as MantineNumberInputProps,
+    PasswordInputProps as MantinePasswordInputProps,
     TextareaProps as MantineTextareaProps,
+    TextInputProps as MantineTextInputProps,
 } from '@mantine/core';
+
 import {
-    TextInput as MantineTextInput,
-    NumberInput as MantineNumberInput,
-    PasswordInput as MantinePasswordInput,
     FileInput as MantineFileInput,
     JsonInput as MantineJsonInput,
+    NumberInput as MantineNumberInput,
+    PasswordInput as MantinePasswordInput,
     Textarea as MantineTextarea,
+    TextInput as MantineTextInput,
 } from '@mantine/core';
+import React, { forwardRef } from 'react';
 import styled from 'styled-components';
 
-interface TextInputProps extends MantineTextInputProps {
+interface FileInputProps extends MantineFileInputProps {
+    children?: React.ReactNode;
+    maxWidth?: number | string;
+    width?: number | string;
+}
+
+interface JsonInputProps extends MantineJsonInputProps {
     children?: React.ReactNode;
     maxWidth?: number | string;
     width?: number | string;
@@ -35,24 +42,18 @@ interface PasswordInputProps extends MantinePasswordInputProps {
     width?: number | string;
 }
 
-interface FileInputProps extends MantineFileInputProps {
-    children?: React.ReactNode;
-    maxWidth?: number | string;
-    width?: number | string;
-}
-
-interface JsonInputProps extends MantineJsonInputProps {
-    children?: React.ReactNode;
-    maxWidth?: number | string;
-    width?: number | string;
-}
-
 interface TextareaProps extends MantineTextareaProps {
     children?: React.ReactNode;
     maxWidth?: number | string;
     width?: number | string;
 }
 
+interface TextInputProps extends MantineTextInputProps {
+    children?: React.ReactNode;
+    maxWidth?: number | string;
+    width?: number | string;
+}
+
 const StyledTextInput = styled(MantineTextInput)<TextInputProps>`
     & .mantine-TextInput-wrapper {
         border-color: var(--primary-color);
@@ -276,7 +277,7 @@ const StyledTextarea = styled(MantineTextarea)<TextareaProps>`
 `;
 
 export const TextInput = forwardRef<HTMLInputElement, TextInputProps>(
-    ({ children, width, maxWidth, ...props }: TextInputProps, ref) => {
+    ({ children, maxWidth, width, ...props }: TextInputProps, ref) => {
         return (
             <StyledTextInput
                 ref={ref}
@@ -291,11 +292,11 @@ export const TextInput = forwardRef<HTMLInputElement, TextInputProps>(
 );
 
 export const NumberInput = forwardRef<HTMLInputElement, NumberInputProps>(
-    ({ children, width, maxWidth, ...props }: NumberInputProps, ref) => {
+    ({ children, maxWidth, width, ...props }: NumberInputProps, ref) => {
         return (
             <StyledNumberInput
-                ref={ref}
                 hideControls
+                ref={ref}
                 spellCheck={false}
                 {...props}
                 sx={{ maxWidth, width }}
@@ -307,7 +308,7 @@ export const NumberInput = forwardRef<HTMLInputElement, NumberInputProps>(
 );
 
 export const PasswordInput = forwardRef<HTMLInputElement, PasswordInputProps>(
-    ({ children, width, maxWidth, ...props }: PasswordInputProps, ref) => {
+    ({ children, maxWidth, width, ...props }: PasswordInputProps, ref) => {
         return (
             <StyledPasswordInput
                 ref={ref}
@@ -321,7 +322,7 @@ export const PasswordInput = forwardRef<HTMLInputElement, PasswordInputProps>(
 );
 
 export const FileInput = forwardRef<HTMLButtonElement, FileInputProps>(
-    ({ children, width, maxWidth, ...props }: FileInputProps, ref) => {
+    ({ children, maxWidth, width, ...props }: FileInputProps, ref) => {
         return (
             <StyledFileInput
                 ref={ref}
@@ -340,7 +341,7 @@ export const FileInput = forwardRef<HTMLButtonElement, FileInputProps>(
 );
 
 export const JsonInput = forwardRef<HTMLTextAreaElement, JsonInputProps>(
-    ({ children, width, maxWidth, ...props }: JsonInputProps, ref) => {
+    ({ children, maxWidth, width, ...props }: JsonInputProps, ref) => {
         return (
             <StyledJsonInput
                 ref={ref}
@@ -354,7 +355,7 @@ export const JsonInput = forwardRef<HTMLTextAreaElement, JsonInputProps>(
 );
 
 export const Textarea = forwardRef<HTMLTextAreaElement, TextareaProps>(
-    ({ children, width, maxWidth, ...props }: TextareaProps, ref) => {
+    ({ children, maxWidth, width, ...props }: TextareaProps, ref) => {
         return (
             <StyledTextarea
                 ref={ref}
diff --git a/src/renderer/components/modal/index.tsx b/src/renderer/components/modal/index.tsx
index 2eae7bc7..ab528f91 100644
--- a/src/renderer/components/modal/index.tsx
+++ b/src/renderer/components/modal/index.tsx
@@ -1,12 +1,13 @@
-import React, { ReactNode } from 'react';
 import {
-    ModalProps as MantineModalProps,
-    Stack,
-    Modal as MantineModal,
     Flex,
     Group,
+    Modal as MantineModal,
+    ModalProps as MantineModalProps,
+    Stack,
 } from '@mantine/core';
 import { closeAllModals, ContextModalProps } from '@mantine/modals';
+import React, { ReactNode } from 'react';
+
 import { Button } from '/@/renderer/components/button';
 
 export interface ModalProps extends Omit<MantineModalProps, 'onClose'> {
@@ -59,12 +60,12 @@ interface ConfirmModalProps {
 }
 
 export const ConfirmModal = ({
-    loading,
+    children,
     disabled,
     labels,
+    loading,
     onCancel,
     onConfirm,
-    children,
 }: ConfirmModalProps) => {
     const handleCancel = () => {
         if (onCancel) {
@@ -80,16 +81,16 @@ export const ConfirmModal = ({
             <Group position="right">
                 <Button
                     data-focus
-                    variant="default"
                     onClick={handleCancel}
+                    variant="default"
                 >
                     {labels?.cancel ? labels.cancel : 'Cancel'}
                 </Button>
                 <Button
                     disabled={disabled}
                     loading={loading}
-                    variant="filled"
                     onClick={onConfirm}
+                    variant="filled"
                 >
                     {labels?.confirm ? labels.confirm : 'Confirm'}
                 </Button>
diff --git a/src/renderer/components/option/index.tsx b/src/renderer/components/option/index.tsx
index cf814a90..5e7e141b 100644
--- a/src/renderer/components/option/index.tsx
+++ b/src/renderer/components/option/index.tsx
@@ -1,5 +1,5 @@
-import { ReactNode } from 'react';
 import { Flex, Group } from '@mantine/core';
+import { ReactNode } from 'react';
 
 export const Option = ({ children }: any) => {
     return (
diff --git a/src/renderer/components/page-header/index.tsx b/src/renderer/components/page-header/index.tsx
index 3605075a..82fa0bac 100644
--- a/src/renderer/components/page-header/index.tsx
+++ b/src/renderer/components/page-header/index.tsx
@@ -2,6 +2,7 @@ import { Flex, FlexProps } from '@mantine/core';
 import { AnimatePresence, motion, Variants } from 'framer-motion';
 import { ReactNode, useRef } from 'react';
 import styled from 'styled-components';
+
 import { useShouldPadTitlebar, useTheme } from '/@/renderer/hooks';
 import { useWindowSettings } from '/@/renderer/store/settings.store';
 import { Platform } from '/@/renderer/types';
@@ -49,7 +50,7 @@ const BackgroundImage = styled.div<{ $background: string }>`
     background: ${(props) => props.$background || 'var(--titlebar-bg)'};
 `;
 
-const BackgroundImageOverlay = styled.div<{ theme: 'light' | 'dark' }>`
+const BackgroundImageOverlay = styled.div<{ theme: 'dark' | 'light' }>`
     position: absolute;
     top: 0;
     left: 0;
@@ -63,7 +64,7 @@ const BackgroundImageOverlay = styled.div<{ theme: 'light' | 'dark' }>`
 `;
 
 export interface PageHeaderProps
-    extends Omit<FlexProps, 'onAnimationStart' | 'onDragStart' | 'onDragEnd' | 'onDrag'> {
+    extends Omit<FlexProps, 'onAnimationStart' | 'onDrag' | 'onDragEnd' | 'onDragStart'> {
     animated?: boolean;
     backgroundColor?: string;
     children?: ReactNode;
@@ -93,11 +94,11 @@ const variants: Variants = {
 
 export const PageHeader = ({
     animated,
-    position,
-    height,
     backgroundColor,
-    isHidden,
     children,
+    height,
+    isHidden,
+    position,
     ...props
 }: PageHeaderProps) => {
     const ref = useRef(null);
@@ -108,9 +109,9 @@ export const PageHeader = ({
     return (
         <>
             <Container
-                ref={ref}
                 $height={height}
                 $position={position}
+                ref={ref}
                 {...props}
             >
                 <Header
@@ -132,7 +133,7 @@ export const PageHeader = ({
                 {backgroundColor && (
                     <>
                         <BackgroundImage $background={backgroundColor || 'var(--titlebar-bg)'} />
-                        <BackgroundImageOverlay theme={theme as 'light' | 'dark'} />
+                        <BackgroundImageOverlay theme={theme as 'dark' | 'light'} />
                     </>
                 )}
             </Container>
diff --git a/src/renderer/components/paper/index.tsx b/src/renderer/components/paper/index.tsx
index cad38ff2..4162a76a 100644
--- a/src/renderer/components/paper/index.tsx
+++ b/src/renderer/components/paper/index.tsx
@@ -1,6 +1,7 @@
-import { ReactNode } from 'react';
 import type { PaperProps as MantinePaperProps } from '@mantine/core';
+
 import { Paper as MantinePaper } from '@mantine/core';
+import { ReactNode } from 'react';
 import styled from 'styled-components';
 
 export interface PaperProps extends MantinePaperProps {
diff --git a/src/renderer/components/popover/index.tsx b/src/renderer/components/popover/index.tsx
index 9d30dbba..c72b098d 100644
--- a/src/renderer/components/popover/index.tsx
+++ b/src/renderer/components/popover/index.tsx
@@ -1,12 +1,13 @@
 import type {
-    PopoverProps as MantinePopoverProps,
     PopoverDropdownProps as MantinePopoverDropdownProps,
+    PopoverProps as MantinePopoverProps,
 } from '@mantine/core';
+
 import { Popover as MantinePopover } from '@mantine/core';
 import styled from 'styled-components';
 
-type PopoverProps = MantinePopoverProps;
 type PopoverDropdownProps = MantinePopoverDropdownProps;
+type PopoverProps = MantinePopoverProps;
 
 const StyledPopover = styled(MantinePopover)``;
 
@@ -21,13 +22,13 @@ const StyledDropdown = styled(MantinePopover.Dropdown)<PopoverDropdownProps>`
 export const Popover = ({ children, ...props }: PopoverProps) => {
     return (
         <StyledPopover
-            withinPortal
             styles={{
                 dropdown: {
                     filter: 'drop-shadow(0 0 5px rgb(0, 0, 0, 50%))',
                 },
             }}
             transitionProps={{ transition: 'fade' }}
+            withinPortal
             {...props}
         >
             {children}
diff --git a/src/renderer/components/query-builder/index.tsx b/src/renderer/components/query-builder/index.tsx
index f6dab1d9..f2bb3afe 100644
--- a/src/renderer/components/query-builder/index.tsx
+++ b/src/renderer/components/query-builder/index.tsx
@@ -1,12 +1,13 @@
 import { Group, Stack } from '@mantine/core';
-import { Select } from '/@/renderer/components/select';
 import { AnimatePresence, motion } from 'framer-motion';
 import { RiAddFill, RiAddLine, RiDeleteBinFill, RiMore2Line, RiRestartLine } from 'react-icons/ri';
+
+import i18n from '/@/i18n/i18n';
 import { Button } from '/@/renderer/components/button';
 import { DropdownMenu } from '/@/renderer/components/dropdown-menu';
 import { QueryBuilderOption } from '/@/renderer/components/query-builder/query-builder-option';
+import { Select } from '/@/renderer/components/select';
 import { QueryBuilderGroup, QueryBuilderRule } from '/@/renderer/types';
-import i18n from '/@/i18n/i18n';
 
 const FILTER_GROUP_OPTIONS_DATA = [
     {
@@ -63,22 +64,22 @@ interface QueryBuilderProps {
 
 export const QueryBuilder = ({
     data,
+    filters,
+    groupIndex,
     level,
     onAddRule,
-    onDeleteRuleGroup,
-    onDeleteRule,
     onAddRuleGroup,
-    onChangeType,
     onChangeField,
-    operators,
     onChangeOperator,
+    onChangeType,
     onChangeValue,
     onClearFilters,
+    onDeleteRule,
+    onDeleteRuleGroup,
     onResetFilters,
+    operators,
     playlists,
-    groupIndex,
     uniqueId,
-    filters,
 }: QueryBuilderProps) => {
     const handleAddRule = () => {
         onAddRule({ groupIndex, level });
@@ -92,7 +93,7 @@ export const QueryBuilder = ({
         onDeleteRuleGroup({ groupIndex, level, uniqueId });
     };
 
-    const handleChangeType = (value: string | null) => {
+    const handleChangeType = (value: null | string) => {
         onChangeType({ groupIndex, level, value });
     };
 
@@ -105,17 +106,17 @@ export const QueryBuilder = ({
                 <Select
                     data={FILTER_GROUP_OPTIONS_DATA}
                     maxWidth={175}
+                    onChange={handleChangeType}
                     size="sm"
                     value={data.type}
                     width="20%"
-                    onChange={handleChangeType}
                 />
                 <Button
+                    onClick={handleAddRule}
                     px={5}
                     size="sm"
                     tooltip={{ label: 'Add rule' }}
                     variant="default"
-                    onClick={handleAddRule}
                 >
                     <RiAddLine size={20} />
                 </Button>
@@ -170,10 +171,10 @@ export const QueryBuilder = ({
             <AnimatePresence initial={false}>
                 {data?.rules?.map((rule: QueryBuilderRule) => (
                     <motion.div
-                        key={rule.uniqueId}
                         animate={{ opacity: 1, x: 0 }}
                         exit={{ opacity: 0, x: -25 }}
                         initial={{ opacity: 0, x: -25 }}
+                        key={rule.uniqueId}
                         transition={{ duration: 0.2, ease: 'easeInOut' }}
                     >
                         <QueryBuilderOption
@@ -182,12 +183,12 @@ export const QueryBuilder = ({
                             groupIndex={groupIndex || []}
                             level={level}
                             noRemove={data?.rules?.length === 1}
-                            operators={operators}
-                            selectData={playlists}
                             onChangeField={onChangeField}
                             onChangeOperator={onChangeOperator}
                             onChangeValue={onChangeValue}
                             onDeleteRule={onDeleteRule}
+                            operators={operators}
+                            selectData={playlists}
                         />
                     </motion.div>
                 ))}
@@ -196,10 +197,10 @@ export const QueryBuilder = ({
                 <AnimatePresence initial={false}>
                     {data.group?.map((group: QueryBuilderGroup, index: number) => (
                         <motion.div
-                            key={group.uniqueId}
                             animate={{ opacity: 1, x: 0 }}
                             exit={{ opacity: 0, x: -25 }}
                             initial={{ opacity: 0, x: -25 }}
+                            key={group.uniqueId}
                             transition={{ duration: 0.2, ease: 'easeInOut' }}
                         >
                             <QueryBuilder
@@ -207,9 +208,6 @@ export const QueryBuilder = ({
                                 filters={filters}
                                 groupIndex={[...(groupIndex || []), index]}
                                 level={level + 1}
-                                operators={operators}
-                                playlists={playlists}
-                                uniqueId={group.uniqueId}
                                 onAddRule={onAddRule}
                                 onAddRuleGroup={onAddRuleGroup}
                                 onChangeField={onChangeField}
@@ -220,6 +218,9 @@ export const QueryBuilder = ({
                                 onDeleteRule={onDeleteRule}
                                 onDeleteRuleGroup={onDeleteRuleGroup}
                                 onResetFilters={onResetFilters}
+                                operators={operators}
+                                playlists={playlists}
+                                uniqueId={group.uniqueId}
                             />
                         </motion.div>
                     ))}
diff --git a/src/renderer/components/query-builder/query-builder-option.tsx b/src/renderer/components/query-builder/query-builder-option.tsx
index c558766e..24594f72 100644
--- a/src/renderer/components/query-builder/query-builder-option.tsx
+++ b/src/renderer/components/query-builder/query-builder-option.tsx
@@ -1,6 +1,7 @@
 import { Group } from '@mantine/core';
 import { useState } from 'react';
 import { RiSubtractLine } from 'react-icons/ri';
+
 import { Button } from '/@/renderer/components/button';
 import { NumberInput, TextInput } from '/@/renderer/components/input';
 import { Select } from '/@/renderer/components/select';
@@ -31,62 +32,10 @@ interface QueryOptionProps {
     selectData?: { label: string; value: string }[];
 }
 
-const QueryValueInput = ({ onChange, type, data, ...props }: any) => {
+const QueryValueInput = ({ data, onChange, type, ...props }: any) => {
     const [numberRange, setNumberRange] = useState([0, 0]);
 
     switch (type) {
-        case 'string':
-            return (
-                <TextInput
-                    size="sm"
-                    onChange={onChange}
-                    {...props}
-                />
-            );
-        case 'number':
-            return (
-                <NumberInput
-                    size="sm"
-                    onChange={onChange}
-                    {...props}
-                    defaultValue={props.defaultValue && Number(props.defaultValue)}
-                />
-            );
-        case 'date':
-            return (
-                <TextInput
-                    size="sm"
-                    onChange={onChange}
-                    {...props}
-                />
-            );
-        case 'dateRange':
-            return (
-                <>
-                    <NumberInput
-                        {...props}
-                        defaultValue={props.defaultValue && Number(props.defaultValue?.[0])}
-                        maxWidth={81}
-                        width="10%"
-                        onChange={(e) => {
-                            const newRange = [e || 0, numberRange[1]];
-                            setNumberRange(newRange);
-                            onChange(newRange);
-                        }}
-                    />
-                    <NumberInput
-                        {...props}
-                        defaultValue={props.defaultValue && Number(props.defaultValue?.[1])}
-                        maxWidth={81}
-                        width="10%"
-                        onChange={(e) => {
-                            const newRange = [numberRange[0], e || 0];
-                            setNumberRange(newRange);
-                            onChange(newRange);
-                        }}
-                    />
-                </>
-            );
         case 'boolean':
             return (
                 <Select
@@ -98,6 +47,50 @@ const QueryValueInput = ({ onChange, type, data, ...props }: any) => {
                     {...props}
                 />
             );
+        case 'date':
+            return (
+                <TextInput
+                    onChange={onChange}
+                    size="sm"
+                    {...props}
+                />
+            );
+        case 'dateRange':
+            return (
+                <>
+                    <NumberInput
+                        {...props}
+                        defaultValue={props.defaultValue && Number(props.defaultValue?.[0])}
+                        maxWidth={81}
+                        onChange={(e) => {
+                            const newRange = [e || 0, numberRange[1]];
+                            setNumberRange(newRange);
+                            onChange(newRange);
+                        }}
+                        width="10%"
+                    />
+                    <NumberInput
+                        {...props}
+                        defaultValue={props.defaultValue && Number(props.defaultValue?.[1])}
+                        maxWidth={81}
+                        onChange={(e) => {
+                            const newRange = [numberRange[0], e || 0];
+                            setNumberRange(newRange);
+                            onChange(newRange);
+                        }}
+                        width="10%"
+                    />
+                </>
+            );
+        case 'number':
+            return (
+                <NumberInput
+                    onChange={onChange}
+                    size="sm"
+                    {...props}
+                    defaultValue={props.defaultValue && Number(props.defaultValue)}
+                />
+            );
         case 'playlist':
             return (
                 <Select
@@ -106,6 +99,14 @@ const QueryValueInput = ({ onChange, type, data, ...props }: any) => {
                     {...props}
                 />
             );
+        case 'string':
+            return (
+                <TextInput
+                    onChange={onChange}
+                    size="sm"
+                    {...props}
+                />
+            );
 
         default:
             return <></>;
@@ -115,14 +116,14 @@ const QueryValueInput = ({ onChange, type, data, ...props }: any) => {
 export const QueryBuilderOption = ({
     data,
     filters,
-    level,
-    onDeleteRule,
-    operators,
     groupIndex,
+    level,
     noRemove,
     onChangeField,
     onChangeOperator,
     onChangeValue,
+    onDeleteRule,
+    operators,
     selectData,
 }: QueryOptionProps) => {
     const { field, operator, uniqueId, value } = data;
@@ -192,51 +193,51 @@ export const QueryBuilderOption = ({
             spacing="sm"
         >
             <Select
-                searchable
                 data={filters}
                 maxWidth={170}
+                onChange={handleChangeField}
+                searchable
                 size="sm"
                 value={field}
                 width="25%"
-                onChange={handleChangeField}
             />
             <Select
-                searchable
                 data={operatorsByFieldType || []}
                 disabled={!field}
                 maxWidth={170}
+                onChange={handleChangeOperator}
+                searchable
                 size="sm"
                 value={operator}
                 width="25%"
-                onChange={handleChangeOperator}
             />
             {field ? (
                 <QueryValueInput
                     data={selectData || []}
                     defaultValue={value}
                     maxWidth={170}
+                    onChange={handleChangeValue}
                     size="sm"
                     type={operator === 'inTheRange' ? 'dateRange' : fieldType}
                     width="25%"
-                    onChange={handleChangeValue}
                 />
             ) : (
                 <TextInput
-                    disabled
                     defaultValue={value}
+                    disabled
                     maxWidth={170}
+                    onChange={handleChangeValue}
                     size="sm"
                     width="25%"
-                    onChange={handleChangeValue}
                 />
             )}
             <Button
                 disabled={noRemove}
+                onClick={handleDeleteRule}
                 px={5}
                 size="sm"
                 tooltip={{ label: 'Remove rule' }}
                 variant="default"
-                onClick={handleDeleteRule}
             >
                 <RiSubtractLine size={20} />
             </Button>
diff --git a/src/renderer/components/rating/index.tsx b/src/renderer/components/rating/index.tsx
index 73b44f64..0e8fb274 100644
--- a/src/renderer/components/rating/index.tsx
+++ b/src/renderer/components/rating/index.tsx
@@ -1,7 +1,7 @@
 /* eslint-disable jsx-a11y/no-static-element-interactions */
-import { useCallback } from 'react';
 import { Rating as MantineRating, RatingProps } from '@mantine/core';
 import debounce from 'lodash/debounce';
+import { useCallback } from 'react';
 import styled from 'styled-components';
 
 const StyledRating = styled(MantineRating)`
diff --git a/src/renderer/components/scroll-area/index.tsx b/src/renderer/components/scroll-area/index.tsx
index aa0b7fff..ef635e6a 100644
--- a/src/renderer/components/scroll-area/index.tsx
+++ b/src/renderer/components/scroll-area/index.tsx
@@ -1,10 +1,13 @@
+/* eslint-disable react/display-name */
 import type { ScrollAreaProps as MantineScrollAreaProps } from '@mantine/core';
+
 import { ScrollArea as MantineScrollArea } from '@mantine/core';
 import { useMergedRef } from '@mantine/hooks';
 import { useInView } from 'framer-motion';
 import { useOverlayScrollbars } from 'overlayscrollbars-react';
 import { CSSProperties, forwardRef, ReactNode, Ref, useEffect, useRef, useState } from 'react';
 import styled from 'styled-components';
+
 import { PageHeader, PageHeaderProps } from '/@/renderer/components/page-header';
 import { useWindowSettings } from '/@/renderer/store/settings.store';
 import { Platform } from '/@/renderer/types';
@@ -51,7 +54,7 @@ const StyledNativeScrollArea = styled.div<{
     $scrollBarOffset?: string;
     $windowBarStyle?: Platform;
 }>`
-    height: 100%;
+    height: calc(100vh - 90px);
 `;
 
 export const ScrollArea = forwardRef(({ children, ...props }: ScrollAreaProps, ref: Ref<any>) => {
@@ -80,10 +83,10 @@ export const NativeScrollArea = forwardRef(
     (
         {
             children,
+            noHeader,
             pageHeaderProps,
             scrollBarOffset,
             scrollHideDelay,
-            noHeader,
             ...props
         }: NativeScrollAreaProps,
         ref: Ref<HTMLDivElement>,
@@ -156,9 +159,9 @@ export const NativeScrollArea = forwardRef(
                     />
                 )}
                 <StyledNativeScrollArea
-                    ref={mergedRef}
                     $scrollBarOffset={scrollBarOffset}
                     $windowBarStyle={windowBarStyle}
+                    ref={mergedRef}
                     {...props}
                 >
                     {children}
diff --git a/src/renderer/components/search-input/index.tsx b/src/renderer/components/search-input/index.tsx
index c9dceb43..9e2782a7 100644
--- a/src/renderer/components/search-input/index.tsx
+++ b/src/renderer/components/search-input/index.tsx
@@ -1,10 +1,11 @@
-import { ChangeEvent, KeyboardEvent } from 'react';
 import { ActionIcon, TextInputProps } from '@mantine/core';
 import { useFocusWithin, useHotkeys, useMergedRef } from '@mantine/hooks';
+import { ChangeEvent, KeyboardEvent } from 'react';
 import { RiCloseFill, RiSearchLine } from 'react-icons/ri';
+import { shallow } from 'zustand/shallow';
+
 import { TextInput } from '/@/renderer/components/input';
 import { useSettingsStore } from '/@/renderer/store';
-import { shallow } from 'zustand/shallow';
 
 interface SearchInputProps extends TextInputProps {
     initialWidth?: number;
@@ -18,7 +19,7 @@ export const SearchInput = ({
     openedWidth,
     ...props
 }: SearchInputProps) => {
-    const { ref, focused } = useFocusWithin();
+    const { focused, ref } = useFocusWithin();
     const mergedRef = useMergedRef<HTMLInputElement>(ref);
     const binding = useSettingsStore((state) => state.hotkeys.bindings.localSearch, shallow);
 
@@ -40,6 +41,8 @@ export const SearchInput = ({
             ref={mergedRef}
             {...props}
             icon={showIcon && <RiSearchLine />}
+            onChange={onChange}
+            onKeyDown={handleEscape}
             rightSection={
                 isOpened ? (
                     <ActionIcon
@@ -64,8 +67,6 @@ export const SearchInput = ({
                 },
             }}
             width={isOpened ? openedWidth || 150 : initialWidth || 35}
-            onChange={onChange}
-            onKeyDown={handleEscape}
         />
     );
 };
diff --git a/src/renderer/components/segmented-control/index.tsx b/src/renderer/components/segmented-control/index.tsx
index 4aba92d2..30feb66e 100644
--- a/src/renderer/components/segmented-control/index.tsx
+++ b/src/renderer/components/segmented-control/index.tsx
@@ -1,6 +1,7 @@
-import { forwardRef } from 'react';
 import type { SegmentedControlProps as MantineSegmentedControlProps } from '@mantine/core';
+
 import { SegmentedControl as MantineSegmentedControl } from '@mantine/core';
+import { forwardRef } from 'react';
 import styled from 'styled-components';
 
 type SegmentedControlProps = MantineSegmentedControlProps;
diff --git a/src/renderer/components/select-with-invalid-data/index.tsx b/src/renderer/components/select-with-invalid-data/index.tsx
index 46053094..89b02bf6 100644
--- a/src/renderer/components/select-with-invalid-data/index.tsx
+++ b/src/renderer/components/select-with-invalid-data/index.tsx
@@ -1,6 +1,7 @@
-import { MultiSelect, MultiSelectProps, Select, SelectProps } from '/@/renderer/components/select';
-import { useTranslation } from 'react-i18next';
 import { useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { MultiSelect, MultiSelectProps, Select, SelectProps } from '/@/renderer/components/select';
 
 export const SelectWithInvalidData = ({ data, defaultValue, ...props }: SelectProps) => {
     const { t } = useTranslation();
diff --git a/src/renderer/components/select/index.tsx b/src/renderer/components/select/index.tsx
index a5cfc952..bbe000c0 100644
--- a/src/renderer/components/select/index.tsx
+++ b/src/renderer/components/select/index.tsx
@@ -1,16 +1,17 @@
 import type {
-    SelectProps as MantineSelectProps,
     MultiSelectProps as MantineMultiSelectProps,
+    SelectProps as MantineSelectProps,
 } from '@mantine/core';
-import { Select as MantineSelect, MultiSelect as MantineMultiSelect } from '@mantine/core';
+
+import { MultiSelect as MantineMultiSelect, Select as MantineSelect } from '@mantine/core';
 import styled from 'styled-components';
 
-export interface SelectProps extends MantineSelectProps {
+export interface MultiSelectProps extends MantineMultiSelectProps {
     maxWidth?: number | string;
     width?: number | string;
 }
 
-export interface MultiSelectProps extends MantineMultiSelectProps {
+export interface SelectProps extends MantineSelectProps {
     maxWidth?: number | string;
     width?: number | string;
 }
@@ -37,10 +38,9 @@ const StyledSelect = styled(MantineSelect)`
     }
 `;
 
-export const Select = ({ width, maxWidth, ...props }: SelectProps) => {
+export const Select = ({ maxWidth, width, ...props }: SelectProps) => {
     return (
         <StyledSelect
-            withinPortal
             styles={{
                 dropdown: {
                     background: 'var(--dropdown-menu-bg)',
@@ -70,6 +70,7 @@ export const Select = ({ width, maxWidth, ...props }: SelectProps) => {
             }}
             sx={{ maxWidth, width }}
             transitionProps={{ duration: 100, transition: 'fade' }}
+            withinPortal
             {...props}
         />
     );
@@ -92,10 +93,9 @@ const StyledMultiSelect = styled(MantineMultiSelect)`
     }
 `;
 
-export const MultiSelect = ({ width, maxWidth, ...props }: MultiSelectProps) => {
+export const MultiSelect = ({ maxWidth, width, ...props }: MultiSelectProps) => {
     return (
         <StyledMultiSelect
-            withinPortal
             styles={{
                 dropdown: {
                     background: 'var(--dropdown-menu-bg)',
@@ -131,6 +131,7 @@ export const MultiSelect = ({ width, maxWidth, ...props }: MultiSelectProps) =>
             }}
             sx={{ maxWidth, width }}
             transitionProps={{ duration: 100, transition: 'fade' }}
+            withinPortal
             {...props}
         />
     );
diff --git a/src/renderer/components/skeleton/index.tsx b/src/renderer/components/skeleton/index.tsx
index f60c1104..b1e4b3ab 100644
--- a/src/renderer/components/skeleton/index.tsx
+++ b/src/renderer/components/skeleton/index.tsx
@@ -1,4 +1,5 @@
 import type { SkeletonProps as MantineSkeletonProps } from '@mantine/core';
+
 import { Skeleton as MantineSkeleton } from '@mantine/core';
 import styled from 'styled-components';
 
diff --git a/src/renderer/components/slider/index.tsx b/src/renderer/components/slider/index.tsx
index abbe34fc..c82890f8 100644
--- a/src/renderer/components/slider/index.tsx
+++ b/src/renderer/components/slider/index.tsx
@@ -1,4 +1,5 @@
 import type { SliderProps as MantineSliderProps } from '@mantine/core';
+
 import { Slider as MantineSlider } from '@mantine/core';
 import styled from 'styled-components';
 
diff --git a/src/renderer/components/spinner/index.tsx b/src/renderer/components/spinner/index.tsx
index b3cff709..721c44a5 100644
--- a/src/renderer/components/spinner/index.tsx
+++ b/src/renderer/components/spinner/index.tsx
@@ -1,7 +1,9 @@
-import { Center } from '@mantine/core';
 import type { IconType } from 'react-icons';
+
+import { Center } from '@mantine/core';
 import { RiLoader5Fill } from 'react-icons/ri';
 import styled from 'styled-components';
+
 import { rotating } from '/@/renderer/styles';
 
 interface SpinnerProps extends IconType {
diff --git a/src/renderer/components/spoiler/index.tsx b/src/renderer/components/spoiler/index.tsx
index 72968f1b..c7bc3548 100644
--- a/src/renderer/components/spoiler/index.tsx
+++ b/src/renderer/components/spoiler/index.tsx
@@ -1,6 +1,8 @@
 import clsx from 'clsx';
 import { HTMLAttributes, ReactNode, useRef, useState } from 'react';
+
 import styles from './spoiler.module.scss';
+
 import { useIsOverflow } from '/@/renderer/hooks';
 
 interface SpoilerProps extends HTMLAttributes<HTMLDivElement> {
@@ -9,7 +11,7 @@ interface SpoilerProps extends HTMLAttributes<HTMLDivElement> {
     maxHeight?: number;
 }
 
-export const Spoiler = ({ maxHeight, defaultOpened, children, ...props }: SpoilerProps) => {
+export const Spoiler = ({ children, defaultOpened, maxHeight, ...props }: SpoilerProps) => {
     const ref = useRef(null);
     const isOverflow = useIsOverflow(ref);
     const [isExpanded, setIsExpanded] = useState(!!defaultOpened);
@@ -25,12 +27,12 @@ export const Spoiler = ({ maxHeight, defaultOpened, children, ...props }: Spoile
 
     return (
         <div
-            ref={ref}
             className={spoilerClassNames}
+            onClick={handleToggleExpand}
+            ref={ref}
             role="button"
             style={{ maxHeight: maxHeight ?? '100px', whiteSpace: 'pre-wrap' }}
             tabIndex={-1}
-            onClick={handleToggleExpand}
             {...props}
         >
             {children}
diff --git a/src/renderer/components/switch/index.tsx b/src/renderer/components/switch/index.tsx
index 08e0d36f..c23d6307 100644
--- a/src/renderer/components/switch/index.tsx
+++ b/src/renderer/components/switch/index.tsx
@@ -1,4 +1,5 @@
 import type { SwitchProps as MantineSwitchProps } from '@mantine/core';
+
 import { Switch as MantineSwitch } from '@mantine/core';
 import styled from 'styled-components';
 
diff --git a/src/renderer/components/tabs/index.tsx b/src/renderer/components/tabs/index.tsx
index 7790b346..9efc96cc 100644
--- a/src/renderer/components/tabs/index.tsx
+++ b/src/renderer/components/tabs/index.tsx
@@ -1,5 +1,5 @@
+import { Tabs as MantineTabs, TabsProps as MantineTabsProps, TabsPanelProps } from '@mantine/core';
 import { Suspense } from 'react';
-import { TabsPanelProps, TabsProps as MantineTabsProps, Tabs as MantineTabs } from '@mantine/core';
 import styled from 'styled-components';
 
 type TabsProps = MantineTabsProps;
diff --git a/src/renderer/components/text-title/index.tsx b/src/renderer/components/text-title/index.tsx
index 3820d125..84605c5a 100644
--- a/src/renderer/components/text-title/index.tsx
+++ b/src/renderer/components/text-title/index.tsx
@@ -1,10 +1,12 @@
-import type { ComponentPropsWithoutRef, ReactNode } from 'react';
 import type { TitleProps as MantineTitleProps } from '@mantine/core';
+import type { ComponentPropsWithoutRef, ReactNode } from 'react';
+
 import { createPolymorphicComponent, Title as MantineHeader } from '@mantine/core';
 import styled from 'styled-components';
+
 import { textEllipsis } from '/@/renderer/styles';
 
-type MantineTextTitleDivProps = MantineTitleProps & ComponentPropsWithoutRef<'div'>;
+type MantineTextTitleDivProps = ComponentPropsWithoutRef<'div'> & MantineTitleProps;
 
 interface TextTitleProps extends MantineTextTitleDivProps {
     $link?: boolean;
@@ -30,7 +32,7 @@ const StyledTextTitle = styled(MantineHeader)<TextTitleProps>`
     }
 `;
 
-const _TextTitle = ({ children, $secondary, overflow, $noSelect, ...rest }: TextTitleProps) => {
+const _TextTitle = ({ $noSelect, $secondary, children, overflow, ...rest }: TextTitleProps) => {
     return (
         <StyledTextTitle
             $noSelect={$noSelect}
diff --git a/src/renderer/components/text/index.tsx b/src/renderer/components/text/index.tsx
index 5788de8b..fa6c7bfa 100644
--- a/src/renderer/components/text/index.tsx
+++ b/src/renderer/components/text/index.tsx
@@ -1,11 +1,13 @@
-import type { ComponentPropsWithoutRef, ReactNode } from 'react';
+import type { Font } from '/@/renderer/styles';
 import type { TextProps as MantineTextProps } from '@mantine/core';
+import type { ComponentPropsWithoutRef, ReactNode } from 'react';
+
 import { createPolymorphicComponent, Text as MantineText } from '@mantine/core';
 import styled from 'styled-components';
-import type { Font } from '/@/renderer/styles';
+
 import { textEllipsis } from '/@/renderer/styles';
 
-type MantineTextDivProps = MantineTextProps & ComponentPropsWithoutRef<'div'>;
+type MantineTextDivProps = ComponentPropsWithoutRef<'div'> & MantineTextProps;
 
 interface TextProps extends MantineTextDivProps {
     $link?: boolean;
@@ -32,7 +34,7 @@ const StyledText = styled(MantineText)<TextProps>`
     }
 `;
 
-export const _Text = ({ children, $secondary, overflow, font, $noSelect, ...rest }: TextProps) => {
+export const _Text = ({ $noSelect, $secondary, children, font, overflow, ...rest }: TextProps) => {
     return (
         <StyledText
             $noSelect={$noSelect}
diff --git a/src/renderer/components/toast/index.tsx b/src/renderer/components/toast/index.tsx
index d732868a..c4a6f74f 100644
--- a/src/renderer/components/toast/index.tsx
+++ b/src/renderer/components/toast/index.tsx
@@ -1,14 +1,15 @@
 import type { NotificationProps as MantineNotificationProps } from '@mantine/notifications';
+
 import {
-    showNotification,
-    updateNotification,
-    hideNotification,
     cleanNotifications,
     cleanNotificationsQueue,
+    hideNotification,
+    showNotification,
+    updateNotification,
 } from '@mantine/notifications';
 
 interface NotificationProps extends MantineNotificationProps {
-    type?: 'success' | 'error' | 'warning' | 'info';
+    type?: 'error' | 'info' | 'success' | 'warning';
 }
 
 const showToast = ({ type, ...props }: NotificationProps) => {
diff --git a/src/renderer/components/tooltip/index.tsx b/src/renderer/components/tooltip/index.tsx
index cd4e90a5..f60af6be 100644
--- a/src/renderer/components/tooltip/index.tsx
+++ b/src/renderer/components/tooltip/index.tsx
@@ -1,4 +1,5 @@
 import type { TooltipProps } from '@mantine/core';
+
 import { Tooltip as MantineTooltip } from '@mantine/core';
 import styled from 'styled-components';
 
@@ -12,7 +13,6 @@ export const Tooltip = ({ children, ...rest }: TooltipProps) => {
     return (
         <StyledTooltip
             multiline
-            withinPortal
             pl={10}
             pr={10}
             py={5}
@@ -31,6 +31,7 @@ export const Tooltip = ({ children, ...rest }: TooltipProps) => {
                 duration: 250,
                 transition: 'fade',
             }}
+            withinPortal
             {...rest}
         >
             {children}
diff --git a/src/renderer/components/virtual-grid/grid-card/default-card.tsx b/src/renderer/components/virtual-grid/grid-card/default-card.tsx
index 6c2dffcc..40c53e6c 100644
--- a/src/renderer/components/virtual-grid/grid-card/default-card.tsx
+++ b/src/renderer/components/virtual-grid/grid-card/default-card.tsx
@@ -1,14 +1,15 @@
 import { Center, Stack } from '@mantine/core';
-import { RiAlbumFill, RiUserVoiceFill, RiPlayListFill } from 'react-icons/ri';
+import { RiAlbumFill, RiPlayListFill, RiUserVoiceFill } from 'react-icons/ri';
 import { generatePath, useNavigate } from 'react-router-dom';
 import { SimpleImg } from 'react-simple-img';
 import { ListChildComponentProps } from 'react-window';
 import styled from 'styled-components';
+
 import { Album, AlbumArtist, Artist, LibraryItem, Playlist, Song } from '/@/renderer/api/types';
 import { CardRows } from '/@/renderer/components/card';
 import { Skeleton } from '/@/renderer/components/skeleton';
 import { GridCardControls } from '/@/renderer/components/virtual-grid/grid-card/grid-card-controls';
-import { CardRow, PlayQueueAddOptions, Play, CardRoute } from '/@/renderer/types';
+import { CardRoute, CardRow, Play, PlayQueueAddOptions } from '/@/renderer/types';
 
 interface BaseGridCardProps {
     columnIndex: number;
@@ -131,11 +132,11 @@ const DetailContainer = styled.div`
 `;
 
 export const DefaultCard = ({
-    listChildProps,
-    data,
     columnIndex,
     controls,
+    data,
     isHidden,
+    listChildProps,
 }: BaseGridCardProps) => {
     const navigate = useNavigate();
 
@@ -156,10 +157,10 @@ export const DefaultCard = ({
             case LibraryItem.ALBUM:
                 Placeholder = RiAlbumFill;
                 break;
-            case LibraryItem.ARTIST:
+            case LibraryItem.ALBUM_ARTIST:
                 Placeholder = RiUserVoiceFill;
                 break;
-            case LibraryItem.ALBUM_ARTIST:
+            case LibraryItem.ARTIST:
                 Placeholder = RiUserVoiceFill;
                 break;
             case LibraryItem.PLAYLIST:
@@ -172,8 +173,8 @@ export const DefaultCard = ({
 
         return (
             <DefaultCardContainer
-                key={`card-${columnIndex}-${listChildProps.index}`}
                 $itemGap={controls.itemGap}
+                key={`card-${columnIndex}-${listChildProps.index}`}
                 onClick={() => navigate(path)}
             >
                 <InnerCardContainer>
@@ -221,25 +222,25 @@ export const DefaultCard = ({
 
     return (
         <DefaultCardContainer
-            key={`card-${columnIndex}-${listChildProps.index}`}
             $isHidden={isHidden}
             $itemGap={controls.itemGap}
+            key={`card-${columnIndex}-${listChildProps.index}`}
         >
             <InnerCardContainer>
                 <ImageContainer>
                     <Skeleton
-                        visible
                         radius="sm"
+                        visible
                     />
                 </ImageContainer>
                 <DetailContainer>
                     <Stack spacing="sm">
                         {(controls?.cardRows || []).map((row, index) => (
                             <Skeleton
-                                key={`${index}-${columnIndex}-${row.arrayProperty}`}
-                                visible
                                 height={14}
+                                key={`${index}-${columnIndex}-${row.arrayProperty}`}
                                 radius="sm"
+                                visible
                             />
                         ))}
                     </Stack>
diff --git a/src/renderer/components/virtual-grid/grid-card/grid-card-controls.tsx b/src/renderer/components/virtual-grid/grid-card/grid-card-controls.tsx
index 81564d20..04601e5e 100644
--- a/src/renderer/components/virtual-grid/grid-card/grid-card-controls.tsx
+++ b/src/renderer/components/virtual-grid/grid-card/grid-card-controls.tsx
@@ -1,20 +1,23 @@
-import React, { MouseEvent, useState } from 'react';
-import type { UnstyledButtonProps } from '@mantine/core';
-import { RiPlayFill, RiHeartFill, RiHeartLine, RiMoreFill } from 'react-icons/ri';
-import styled from 'styled-components';
-import { _Button } from '/@/renderer/components/button';
 import type { PlayQueueAddOptions } from '/@/renderer/types';
-import { Play } from '/@/renderer/types';
-import { usePlayButtonBehavior } from '/@/renderer/store/settings.store';
-import { LibraryItem } from '/@/renderer/api/types';
-import { useHandleGridContextMenu } from '/@/renderer/features/context-menu/hooks/use-handle-context-menu';
+import type { UnstyledButtonProps } from '@mantine/core';
+
+import React, { MouseEvent, useState } from 'react';
+import { RiHeartFill, RiHeartLine, RiMoreFill, RiPlayFill } from 'react-icons/ri';
+import styled from 'styled-components';
+
 import {
-    PLAYLIST_CONTEXT_MENU_ITEMS,
     ALBUM_CONTEXT_MENU_ITEMS,
     ARTIST_CONTEXT_MENU_ITEMS,
+    PLAYLIST_CONTEXT_MENU_ITEMS,
 } from '../../../features/context-menu/context-menu-items';
 
-type PlayButtonType = UnstyledButtonProps & React.ComponentPropsWithoutRef<'button'>;
+import { LibraryItem } from '/@/renderer/api/types';
+import { _Button } from '/@/renderer/components/button';
+import { useHandleGridContextMenu } from '/@/renderer/features/context-menu/hooks/use-handle-context-menu';
+import { usePlayButtonBehavior } from '/@/renderer/store/settings.store';
+import { Play } from '/@/renderer/types';
+
+type PlayButtonType = React.ComponentPropsWithoutRef<'button'> & UnstyledButtonProps;
 
 const PlayButton = styled.button<PlayButtonType>`
     position: absolute;
@@ -108,10 +111,10 @@ const FavoriteWrapper = styled.span<{ isFavorite: boolean }>`
 `;
 
 export const GridCardControls = ({
+    handleFavorite,
+    handlePlayQueueAdd,
     itemData,
     itemType,
-    handlePlayQueueAdd,
-    handleFavorite,
     resetInfiniteLoaderCache,
 }: {
     handleFavorite: (options: {
@@ -178,9 +181,9 @@ export const GridCardControls = ({
                 <BottomControls>
                     {itemType !== LibraryItem.PLAYLIST && (
                         <SecondaryButton
+                            onClick={(e) => handleFavorites(e, itemData?.serverId)}
                             p={5}
                             variant="subtle"
-                            onClick={(e) => handleFavorites(e, itemData?.serverId)}
                         >
                             <FavoriteWrapper isFavorite={itemData?.isFavorite}>
                                 {isFavorite ? (
@@ -196,13 +199,13 @@ export const GridCardControls = ({
                     )}
 
                     <SecondaryButton
-                        p={5}
-                        variant="subtle"
                         onClick={(e) => {
                             e.preventDefault();
                             e.stopPropagation();
                             handleContextMenu(e, [itemData]);
                         }}
+                        p={5}
+                        variant="subtle"
                     >
                         <RiMoreFill
                             color="white"
diff --git a/src/renderer/components/virtual-grid/grid-card/index.tsx b/src/renderer/components/virtual-grid/grid-card/index.tsx
index b9abfa5d..6482a6c2 100644
--- a/src/renderer/components/virtual-grid/grid-card/index.tsx
+++ b/src/renderer/components/virtual-grid/grid-card/index.tsx
@@ -1,24 +1,26 @@
-import { memo } from 'react';
 import type { ListChildComponentProps } from 'react-window';
+
+import { memo } from 'react';
 import { areEqual } from 'react-window';
+
 import { DefaultCard } from '/@/renderer/components/virtual-grid/grid-card/default-card';
 import { PosterCard } from '/@/renderer/components/virtual-grid/grid-card/poster-card';
 import { GridCardData, ListDisplayType } from '/@/renderer/types';
 
 export const GridCard = memo(({ data, index, style }: ListChildComponentProps) => {
     const {
-        columnCount,
-        itemCount,
         cardRows,
-        itemData,
-        itemType,
-        itemGap,
-        playButtonBehavior,
-        handlePlayQueueAdd,
-        handleFavorite,
-        route,
+        columnCount,
         display,
+        handleFavorite,
+        handlePlayQueueAdd,
+        itemCount,
+        itemData,
+        itemGap,
+        itemType,
+        playButtonBehavior,
         resetInfiniteLoaderCache,
+        route,
     } = data as GridCardData;
 
     const cards = [];
@@ -35,7 +37,6 @@ export const GridCard = memo(({ data, index, style }: ListChildComponentProps) =
     for (let i = startIndex; i <= stopIndex + columnCountToAdd; i += 1) {
         cards.push(
             <View
-                key={`card-${i}-${index}`}
                 columnIndex={i}
                 controls={{
                     cardRows,
@@ -49,6 +50,7 @@ export const GridCard = memo(({ data, index, style }: ListChildComponentProps) =
                 }}
                 data={itemData[i]}
                 isHidden={i > stopIndex}
+                key={`card-${i}-${index}`}
                 listChildProps={{ index }}
             />,
         );
diff --git a/src/renderer/components/virtual-grid/grid-card/poster-card.tsx b/src/renderer/components/virtual-grid/grid-card/poster-card.tsx
index bf3f56e1..1505cd20 100644
--- a/src/renderer/components/virtual-grid/grid-card/poster-card.tsx
+++ b/src/renderer/components/virtual-grid/grid-card/poster-card.tsx
@@ -4,11 +4,12 @@ import { generatePath, useNavigate } from 'react-router-dom';
 import { SimpleImg } from 'react-simple-img';
 import { ListChildComponentProps } from 'react-window';
 import styled from 'styled-components';
+
 import { Album, AlbumArtist, Artist, LibraryItem, Playlist, Song } from '/@/renderer/api/types';
 import { CardRows } from '/@/renderer/components/card';
 import { Skeleton } from '/@/renderer/components/skeleton';
 import { GridCardControls } from '/@/renderer/components/virtual-grid/grid-card/grid-card-controls';
-import { CardRow, PlayQueueAddOptions, Play, CardRoute } from '/@/renderer/types';
+import { CardRoute, CardRow, Play, PlayQueueAddOptions } from '/@/renderer/types';
 
 interface BaseGridCardProps {
     columnIndex: number;
@@ -119,11 +120,11 @@ const DetailContainer = styled.div`
 `;
 
 export const PosterCard = ({
-    listChildProps,
-    data,
     columnIndex,
     controls,
+    data,
     isHidden,
+    listChildProps,
 }: BaseGridCardProps) => {
     const navigate = useNavigate();
 
@@ -144,10 +145,10 @@ export const PosterCard = ({
             case LibraryItem.ALBUM:
                 Placeholder = RiAlbumFill;
                 break;
-            case LibraryItem.ARTIST:
+            case LibraryItem.ALBUM_ARTIST:
                 Placeholder = RiUserVoiceFill;
                 break;
-            case LibraryItem.ALBUM_ARTIST:
+            case LibraryItem.ARTIST:
                 Placeholder = RiUserVoiceFill;
                 break;
             case LibraryItem.PLAYLIST:
@@ -160,8 +161,8 @@ export const PosterCard = ({
 
         return (
             <PosterCardContainer
-                key={`card-${columnIndex}-${listChildProps.index}`}
                 $itemGap={controls.itemGap}
+                key={`card-${columnIndex}-${listChildProps.index}`}
             >
                 <LinkContainer onClick={() => navigate(path)}>
                     <ImageContainer $isFavorite={data?.userFavorite}>
@@ -207,13 +208,13 @@ export const PosterCard = ({
 
     return (
         <PosterCardContainer
-            key={`card-${columnIndex}-${listChildProps.index}`}
             $isHidden={isHidden}
             $itemGap={controls.itemGap}
+            key={`card-${columnIndex}-${listChildProps.index}`}
         >
             <Skeleton
-                visible
                 radius="sm"
+                visible
             >
                 <ImageContainer />
             </Skeleton>
@@ -221,10 +222,10 @@ export const PosterCard = ({
                 <Stack spacing="sm">
                     {(controls?.cardRows || []).map((row, index) => (
                         <Skeleton
-                            key={`${index}-${columnIndex}-${row.arrayProperty}`}
-                            visible
                             height={14}
+                            key={`${index}-${columnIndex}-${row.arrayProperty}`}
                             radius="sm"
+                            visible
                         />
                     ))}
                 </Stack>
diff --git a/src/renderer/components/virtual-grid/virtual-grid-wrapper.tsx b/src/renderer/components/virtual-grid/virtual-grid-wrapper.tsx
index 8d7f85fe..9d99ba2e 100644
--- a/src/renderer/components/virtual-grid/virtual-grid-wrapper.tsx
+++ b/src/renderer/components/virtual-grid/virtual-grid-wrapper.tsx
@@ -1,12 +1,14 @@
+import type { CardRoute, CardRow, ListDisplayType, PlayQueueAddOptions } from '/@/renderer/types';
 import type { Ref } from 'react';
+import type { FixedSizeListProps } from 'react-window';
+
 import debounce from 'lodash/debounce';
 import memoize from 'memoize-one';
-import type { FixedSizeListProps } from 'react-window';
 import { FixedSizeList } from 'react-window';
 import styled from 'styled-components';
-import { GridCard } from '/@/renderer/components/virtual-grid/grid-card';
-import type { CardRow, ListDisplayType, CardRoute, PlayQueueAddOptions } from '/@/renderer/types';
+
 import { Album, AlbumArtist, Artist, LibraryItem } from '/@/renderer/api/types';
+import { GridCard } from '/@/renderer/components/virtual-grid/grid-card';
 
 const createItemData = memoize(
     (
@@ -43,27 +45,27 @@ const createItemData = memoize(
 const createScrollHandler = memoize((onScroll) => debounce(onScroll, 250));
 
 export const VirtualGridWrapper = ({
-    refInstance,
     cardRows,
-    itemGap,
-    itemType,
-    itemWidth,
-    display,
-    itemHeight,
-    itemCount,
     columnCount,
-    rowCount,
-    initialScrollOffset,
+    display,
     handleFavorite,
     handlePlayQueueAdd,
-    itemData,
-    route,
-    onScroll,
     height,
-    width,
+    initialScrollOffset,
+    itemCount,
+    itemData,
+    itemGap,
+    itemHeight,
+    itemType,
+    itemWidth,
+    onScroll,
+    refInstance,
     resetInfiniteLoaderCache,
+    route,
+    rowCount,
+    width,
     ...rest
-}: Omit<FixedSizeListProps, 'ref' | 'itemSize' | 'children' | 'height' | 'width'> & {
+}: Omit<FixedSizeListProps, 'children' | 'height' | 'itemSize' | 'ref' | 'width'> & {
     cardRows: CardRow<Album | AlbumArtist | Artist>[];
     columnCount: number;
     display: ListDisplayType;
@@ -112,9 +114,9 @@ export const VirtualGridWrapper = ({
             itemCount={rowCount}
             itemData={memoizedItemData}
             itemSize={itemHeight}
+            onScroll={memoizedOnScroll}
             overscanCount={5}
             width={(width && Number(width)) || 0}
-            onScroll={memoizedOnScroll}
         >
             {GridCard}
         </FixedSizeList>
diff --git a/src/renderer/components/virtual-grid/virtual-infinite-grid.tsx b/src/renderer/components/virtual-grid/virtual-infinite-grid.tsx
index 611e7907..a801179d 100644
--- a/src/renderer/components/virtual-grid/virtual-infinite-grid.tsx
+++ b/src/renderer/components/virtual-grid/virtual-infinite-grid.tsx
@@ -1,21 +1,21 @@
+import type { CardRoute, CardRow, PlayQueueAddOptions } from '/@/renderer/types';
+import type { FixedSizeListProps } from 'react-window';
+
+import debounce from 'lodash/debounce';
 import {
-    useState,
-    useRef,
-    useMemo,
-    useCallback,
     forwardRef,
     Ref,
+    useCallback,
     useImperativeHandle,
+    useMemo,
+    useRef,
+    useState,
 } from 'react';
-import debounce from 'lodash/debounce';
-import type { FixedSizeListProps } from 'react-window';
 import InfiniteLoader from 'react-window-infinite-loader';
-import { VirtualGridWrapper } from '/@/renderer/components/virtual-grid/virtual-grid-wrapper';
-import type { CardRoute, CardRow, PlayQueueAddOptions } from '/@/renderer/types';
-import { ListDisplayType } from '/@/renderer/types';
-import { AnyLibraryItem, Genre, LibraryItem } from '/@/renderer/api/types';
 
-type LibraryItemOrGenre = AnyLibraryItem | Genre;
+import { AnyLibraryItem, Genre, LibraryItem } from '/@/renderer/api/types';
+import { VirtualGridWrapper } from '/@/renderer/components/virtual-grid/virtual-grid-wrapper';
+import { ListDisplayType } from '/@/renderer/types';
 
 export type VirtualInfiniteGridRef = {
     resetLoadMoreItemsCache: () => void;
@@ -24,8 +24,10 @@ export type VirtualInfiniteGridRef = {
     updateItemData: (rule: (item: LibraryItemOrGenre) => LibraryItemOrGenre) => void;
 };
 
+type LibraryItemOrGenre = AnyLibraryItem | Genre;
+
 interface VirtualGridProps
-    extends Omit<FixedSizeListProps, 'children' | 'itemSize' | 'height' | 'width'> {
+    extends Omit<FixedSizeListProps, 'children' | 'height' | 'itemSize' | 'width'> {
     cardRows: CardRow<any>[];
     display?: ListDisplayType;
     fetchFn: (options: { columnCount: number; skip: number; take: number }) => Promise<any>;
@@ -49,22 +51,22 @@ interface VirtualGridProps
 export const VirtualInfiniteGrid = forwardRef(
     (
         {
+            cardRows,
+            display,
+            fetchFn,
+            fetchInitialData,
+            handleFavorite,
+            handlePlayQueueAdd,
+            height,
+            initialScrollOffset,
             itemCount,
             itemGap,
             itemSize,
             itemType,
-            cardRows,
-            route,
-            onScroll,
-            display,
-            handlePlayQueueAdd,
-            minimumBatchSize,
-            fetchFn,
-            fetchInitialData,
             loading,
-            initialScrollOffset,
-            handleFavorite,
-            height,
+            minimumBatchSize,
+            onScroll,
+            route,
             width,
         }: VirtualGridProps,
         ref: Ref<VirtualInfiniteGridRef>,
@@ -78,7 +80,7 @@ export const VirtualInfiniteGrid = forwardRef(
             fetchInitialData?.() || [],
         );
 
-        const { itemHeight, rowCount, columnCount } = useMemo(() => {
+        const { columnCount, itemHeight, rowCount } = useMemo(() => {
             const itemsPerRow = width ? Math.floor(width / (itemSize + itemGap * 2)) : 5;
             const widthPerItem = Number(width) / itemsPerRow;
             const itemHeight = widthPerItem + cardRows.length * 26;
@@ -165,11 +167,11 @@ export const VirtualInfiniteGrid = forwardRef(
         return (
             <>
                 <InfiniteLoader
-                    ref={loader}
                     isItemLoaded={(index) => isItemLoaded(index)}
                     itemCount={itemCount || 0}
                     loadMoreItems={debouncedLoadMoreItems}
                     minimumBatchSize={minimumBatchSize}
+                    ref={loader}
                     threshold={30}
                 >
                     {({ onItemsRendered, ref: infiniteLoaderRef }) => (
@@ -187,6 +189,8 @@ export const VirtualInfiniteGrid = forwardRef(
                             itemHeight={itemHeight}
                             itemType={itemType}
                             itemWidth={itemSize}
+                            onItemsRendered={onItemsRendered}
+                            onScroll={onScroll}
                             refInstance={(list) => {
                                 infiniteLoaderRef(list);
                                 listRef.current = list;
@@ -200,8 +204,6 @@ export const VirtualInfiniteGrid = forwardRef(
                             route={route}
                             rowCount={rowCount}
                             width={width}
-                            onItemsRendered={onItemsRendered}
-                            onScroll={onScroll}
                         />
                     )}
                 </InfiniteLoader>
diff --git a/src/renderer/components/virtual-table/cells/actions-cell.tsx b/src/renderer/components/virtual-table/cells/actions-cell.tsx
index 225f16a8..48e73d28 100644
--- a/src/renderer/components/virtual-table/cells/actions-cell.tsx
+++ b/src/renderer/components/virtual-table/cells/actions-cell.tsx
@@ -1,19 +1,21 @@
 import type { ICellRendererParams } from '@ag-grid-community/core';
+
 import { RiMoreFill } from 'react-icons/ri';
+
 import { Button } from '/@/renderer/components/button';
 import { CellContainer } from '/@/renderer/components/virtual-table/cells/generic-cell';
 
-export const ActionsCell = ({ context, api }: ICellRendererParams) => {
+export const ActionsCell = ({ api, context }: ICellRendererParams) => {
     return (
         <CellContainer $position="center">
             <Button
                 compact
-                variant="subtle"
                 onClick={(e) => {
                     e.stopPropagation();
                     e.preventDefault();
                     context.onCellContextMenu(undefined, api, e);
                 }}
+                variant="subtle"
             >
                 <RiMoreFill />
             </Button>
diff --git a/src/renderer/components/virtual-table/cells/album-artist-cell.tsx b/src/renderer/components/virtual-table/cells/album-artist-cell.tsx
index ea9a49f0..4b3c82d1 100644
--- a/src/renderer/components/virtual-table/cells/album-artist-cell.tsx
+++ b/src/renderer/components/virtual-table/cells/album-artist-cell.tsx
@@ -1,15 +1,17 @@
-import React from 'react';
+import type { AlbumArtist, Artist } from '/@/renderer/api/types';
 import type { ICellRendererParams } from '@ag-grid-community/core';
+
+import React from 'react';
 import { generatePath } from 'react-router';
 import { Link } from 'react-router-dom';
-import type { AlbumArtist, Artist } from '/@/renderer/api/types';
+
+import { Separator } from '/@/renderer/components/separator';
+import { Skeleton } from '/@/renderer/components/skeleton';
 import { Text } from '/@/renderer/components/text';
 import { CellContainer } from '/@/renderer/components/virtual-table/cells/generic-cell';
 import { AppRoute } from '/@/renderer/router/routes';
-import { Skeleton } from '/@/renderer/components/skeleton';
-import { Separator } from '/@/renderer/components/separator';
 
-export const AlbumArtistCell = ({ value, data }: ICellRendererParams) => {
+export const AlbumArtistCell = ({ data, value }: ICellRendererParams) => {
     if (value === undefined) {
         return (
             <CellContainer $position="left">
@@ -28,7 +30,7 @@ export const AlbumArtistCell = ({ value, data }: ICellRendererParams) => {
                 overflow="hidden"
                 size="md"
             >
-                {value?.map((item: Artist | AlbumArtist, index: number) => (
+                {value?.map((item: AlbumArtist | Artist, index: number) => (
                     <React.Fragment key={`row-${item.id}-${data.uniqueId}`}>
                         {index > 0 && <Separator />}
                         {item.id ? (
diff --git a/src/renderer/components/virtual-table/cells/artist-cell.tsx b/src/renderer/components/virtual-table/cells/artist-cell.tsx
index 82a3e6ff..f2b2d186 100644
--- a/src/renderer/components/virtual-table/cells/artist-cell.tsx
+++ b/src/renderer/components/virtual-table/cells/artist-cell.tsx
@@ -1,15 +1,17 @@
-import React from 'react';
+import type { AlbumArtist, Artist } from '/@/renderer/api/types';
 import type { ICellRendererParams } from '@ag-grid-community/core';
+
+import React from 'react';
 import { generatePath } from 'react-router';
 import { Link } from 'react-router-dom';
-import type { AlbumArtist, Artist } from '/@/renderer/api/types';
+
+import { Separator } from '/@/renderer/components/separator';
+import { Skeleton } from '/@/renderer/components/skeleton';
 import { Text } from '/@/renderer/components/text';
 import { CellContainer } from '/@/renderer/components/virtual-table/cells/generic-cell';
 import { AppRoute } from '/@/renderer/router/routes';
-import { Skeleton } from '/@/renderer/components/skeleton';
-import { Separator } from '/@/renderer/components/separator';
 
-export const ArtistCell = ({ value, data }: ICellRendererParams) => {
+export const ArtistCell = ({ data, value }: ICellRendererParams) => {
     if (value === undefined) {
         return (
             <CellContainer $position="left">
@@ -28,7 +30,7 @@ export const ArtistCell = ({ value, data }: ICellRendererParams) => {
                 overflow="hidden"
                 size="md"
             >
-                {value?.map((item: Artist | AlbumArtist, index: number) => (
+                {value?.map((item: AlbumArtist | Artist, index: number) => (
                     <React.Fragment key={`row-${item.id}-${data.uniqueId}`}>
                         {index > 0 && <Separator />}
                         {item.id ? (
diff --git a/src/renderer/components/virtual-table/cells/combined-title-cell-controls.tsx b/src/renderer/components/virtual-table/cells/combined-title-cell-controls.tsx
index c12b9704..bd91f53f 100644
--- a/src/renderer/components/virtual-table/cells/combined-title-cell-controls.tsx
+++ b/src/renderer/components/virtual-table/cells/combined-title-cell-controls.tsx
@@ -1,13 +1,15 @@
-import React, { MouseEvent } from 'react';
 import type { UnstyledButtonProps } from '@mantine/core';
+
+import React, { MouseEvent } from 'react';
 import { RiPlayFill } from 'react-icons/ri';
 import styled from 'styled-components';
-import { Play } from '/@/renderer/types';
-import { usePlayButtonBehavior } from '/@/renderer/store/settings.store';
+
 import { LibraryItem } from '/@/renderer/api/types';
 import { usePlayQueueAdd } from '/@/renderer/features/player';
+import { usePlayButtonBehavior } from '/@/renderer/store/settings.store';
+import { Play } from '/@/renderer/types';
 
-type PlayButtonType = UnstyledButtonProps & React.ComponentPropsWithoutRef<'button'>;
+type PlayButtonType = React.ComponentPropsWithoutRef<'button'> & UnstyledButtonProps;
 
 const PlayButton = styled.button<PlayButtonType>`
     position: absolute;
@@ -50,9 +52,9 @@ const ListConverControlsContainer = styled.div`
 `;
 
 export const ListCoverControls = ({
+    context,
     itemData,
     itemType,
-    context,
     uniqueId,
 }: {
     context: Record<string, any>;
diff --git a/src/renderer/components/virtual-table/cells/combined-title-cell.tsx b/src/renderer/components/virtual-table/cells/combined-title-cell.tsx
index c04af2cc..b322c9b2 100644
--- a/src/renderer/components/virtual-table/cells/combined-title-cell.tsx
+++ b/src/renderer/components/virtual-table/cells/combined-title-cell.tsx
@@ -1,18 +1,20 @@
-import React, { useMemo } from 'react';
 import type { ICellRendererParams } from '@ag-grid-community/core';
+
 import { Center } from '@mantine/core';
 import { motion } from 'framer-motion';
+import React, { useMemo } from 'react';
 import { RiAlbumFill } from 'react-icons/ri';
 import { generatePath } from 'react-router';
 import { Link } from 'react-router-dom';
 import { SimpleImg } from 'react-simple-img';
 import styled from 'styled-components';
+
 import { AlbumArtist, Artist } from '/@/renderer/api/types';
-import { Text } from '/@/renderer/components/text';
-import { AppRoute } from '/@/renderer/router/routes';
-import { Skeleton } from '/@/renderer/components/skeleton';
 import { SEPARATOR_STRING } from '/@/renderer/api/utils';
+import { Skeleton } from '/@/renderer/components/skeleton';
+import { Text } from '/@/renderer/components/text';
 import { ListCoverControls } from '/@/renderer/components/virtual-table/cells/combined-title-cell-controls';
+import { AppRoute } from '/@/renderer/router/routes';
 
 const CellContainer = styled(motion.div)<{ height: number }>`
     display: grid;
@@ -61,11 +63,11 @@ const StyledImage = styled(SimpleImg)`
 `;
 
 export const CombinedTitleCell = ({
-    value,
-    rowIndex,
-    node,
     context,
     data,
+    node,
+    rowIndex,
+    value,
 }: ICellRendererParams) => {
     const artists = useMemo(() => {
         if (!value) return null;
@@ -141,7 +143,7 @@ export const CombinedTitleCell = ({
                     size="md"
                 >
                     {artists?.length ? (
-                        artists.map((artist: Artist | AlbumArtist, index: number) => (
+                        artists.map((artist: AlbumArtist | Artist, index: number) => (
                             <React.Fragment key={`queue-${rowIndex}-artist-${artist.id}`}>
                                 {index > 0 ? SEPARATOR_STRING : null}
                                 {artist.id ? (
diff --git a/src/renderer/components/virtual-table/cells/favorite-cell.tsx b/src/renderer/components/virtual-table/cells/favorite-cell.tsx
index c64cce27..516a076d 100644
--- a/src/renderer/components/virtual-table/cells/favorite-cell.tsx
+++ b/src/renderer/components/virtual-table/cells/favorite-cell.tsx
@@ -1,11 +1,13 @@
 /* eslint-disable import/no-cycle */
 import type { ICellRendererParams } from '@ag-grid-community/core';
+
 import { RiHeartFill, RiHeartLine } from 'react-icons/ri';
+
 import { Button } from '/@/renderer/components/button';
 import { CellContainer } from '/@/renderer/components/virtual-table/cells/generic-cell';
 import { useCreateFavorite, useDeleteFavorite } from '/@/renderer/features/shared';
 
-export const FavoriteCell = ({ value, data, node }: ICellRendererParams) => {
+export const FavoriteCell = ({ data, node, value }: ICellRendererParams) => {
     const createMutation = useCreateFavorite({});
     const deleteMutation = useDeleteFavorite({});
 
@@ -49,6 +51,7 @@ export const FavoriteCell = ({ value, data, node }: ICellRendererParams) => {
         <CellContainer $position="center">
             <Button
                 compact
+                onClick={handleToggleFavorite}
                 sx={{
                     svg: {
                         fill: !value
@@ -57,7 +60,6 @@ export const FavoriteCell = ({ value, data, node }: ICellRendererParams) => {
                     },
                 }}
                 variant="subtle"
-                onClick={handleToggleFavorite}
             >
                 {!value ? <RiHeartLine size="1.3em" /> : <RiHeartFill size="1.3em" />}
             </Button>
diff --git a/src/renderer/components/virtual-table/cells/full-width-disc-cell.tsx b/src/renderer/components/virtual-table/cells/full-width-disc-cell.tsx
index 9ad46dcc..fe4b2c98 100644
--- a/src/renderer/components/virtual-table/cells/full-width-disc-cell.tsx
+++ b/src/renderer/components/virtual-table/cells/full-width-disc-cell.tsx
@@ -1,11 +1,13 @@
-import { useState } from 'react';
 import { ICellRendererParams } from '@ag-grid-community/core';
 import { Group } from '@mantine/core';
+import { useState } from 'react';
 import { RiCheckboxBlankLine, RiCheckboxLine } from 'react-icons/ri';
 import styled from 'styled-components';
+
+import { getNodesByDiscNumber, setNodeSelection } from '../utils';
+
 import { Button } from '/@/renderer/components/button';
 import { Paper } from '/@/renderer/components/paper';
-import { getNodesByDiscNumber, setNodeSelection } from '../utils';
 
 const Container = styled(Paper)`
     display: flex;
@@ -14,7 +16,7 @@ const Container = styled(Paper)`
     border: 1px solid transparent;
 `;
 
-export const FullWidthDiscCell = ({ node, data, api }: ICellRendererParams) => {
+export const FullWidthDiscCell = ({ api, data, node }: ICellRendererParams) => {
     const [isSelected, setIsSelected] = useState(false);
 
     const handleToggleDiscNodes = () => {
@@ -38,9 +40,9 @@ export const FullWidthDiscCell = ({ node, data, api }: ICellRendererParams) => {
                 <Button
                     compact
                     leftIcon={isSelected ? <RiCheckboxLine /> : <RiCheckboxBlankLine />}
+                    onClick={handleToggleDiscNodes}
                     size="md"
                     variant="subtle"
-                    onClick={handleToggleDiscNodes}
                 >
                     {data.name}
                 </Button>
diff --git a/src/renderer/components/virtual-table/cells/generic-cell.tsx b/src/renderer/components/virtual-table/cells/generic-cell.tsx
index 917b42d8..3e49c845 100644
--- a/src/renderer/components/virtual-table/cells/generic-cell.tsx
+++ b/src/renderer/components/virtual-table/cells/generic-cell.tsx
@@ -1,10 +1,12 @@
 import type { ICellRendererParams } from '@ag-grid-community/core';
+
 import { Link } from 'react-router-dom';
 import styled from 'styled-components';
+
 import { Skeleton } from '/@/renderer/components/skeleton';
 import { Text } from '/@/renderer/components/text';
 
-export const CellContainer = styled.div<{ $position?: 'left' | 'center' | 'right' }>`
+export const CellContainer = styled.div<{ $position?: 'center' | 'left' | 'right' }>`
     display: flex;
     align-items: center;
     justify-content: ${(props) =>
@@ -22,13 +24,13 @@ type Options = {
     array?: boolean;
     isArray?: boolean;
     isLink?: boolean;
-    position?: 'left' | 'center' | 'right';
+    position?: 'center' | 'left' | 'right';
     primary?: boolean;
 };
 
 export const GenericCell = (
     { value, valueFormatted }: ICellRendererParams,
-    { position, primary, isLink }: Options,
+    { isLink, position, primary }: Options,
 ) => {
     const displayedValue = valueFormatted || value;
 
diff --git a/src/renderer/components/virtual-table/cells/genre-cell.tsx b/src/renderer/components/virtual-table/cells/genre-cell.tsx
index 9990f2e4..77ccd41b 100644
--- a/src/renderer/components/virtual-table/cells/genre-cell.tsx
+++ b/src/renderer/components/virtual-table/cells/genre-cell.tsx
@@ -1,13 +1,15 @@
-import React from 'react';
-import type { ICellRendererParams } from '@ag-grid-community/core';
-import { generatePath, Link } from 'react-router-dom';
 import type { AlbumArtist, Artist } from '/@/renderer/api/types';
+import type { ICellRendererParams } from '@ag-grid-community/core';
+
+import React from 'react';
+import { generatePath, Link } from 'react-router-dom';
+
+import { Separator } from '/@/renderer/components/separator';
 import { Text } from '/@/renderer/components/text';
 import { CellContainer } from '/@/renderer/components/virtual-table/cells/generic-cell';
-import { Separator } from '/@/renderer/components/separator';
 import { useGenreRoute } from '/@/renderer/hooks/use-genre-route';
 
-export const GenreCell = ({ value, data }: ICellRendererParams) => {
+export const GenreCell = ({ data, value }: ICellRendererParams) => {
     const genrePath = useGenreRoute();
     return (
         <CellContainer $position="left">
@@ -16,7 +18,7 @@ export const GenreCell = ({ value, data }: ICellRendererParams) => {
                 overflow="hidden"
                 size="md"
             >
-                {value?.map((item: Artist | AlbumArtist, index: number) => (
+                {value?.map((item: AlbumArtist | Artist, index: number) => (
                     <React.Fragment key={`row-${item.id}-${data.uniqueId}`}>
                         {index > 0 && <Separator />}
                         <Text
diff --git a/src/renderer/components/virtual-table/cells/note-cell.tsx b/src/renderer/components/virtual-table/cells/note-cell.tsx
index eaa1b5f7..0eb07950 100644
--- a/src/renderer/components/virtual-table/cells/note-cell.tsx
+++ b/src/renderer/components/virtual-table/cells/note-cell.tsx
@@ -1,8 +1,10 @@
 import type { ICellRendererParams } from '@ag-grid-community/core';
-import { Skeleton } from '/@/renderer/components/skeleton';
-import { CellContainer } from '/@/renderer/components/virtual-table/cells/generic-cell';
+
 import { useMemo } from 'react';
+
+import { Skeleton } from '/@/renderer/components/skeleton';
 import { Text } from '/@/renderer/components/text';
+import { CellContainer } from '/@/renderer/components/virtual-table/cells/generic-cell';
 import { replaceURLWithHTMLLinks } from '/@/renderer/utils/linkify';
 
 export const NoteCell = ({ value }: ICellRendererParams) => {
diff --git a/src/renderer/components/virtual-table/cells/rating-cell.tsx b/src/renderer/components/virtual-table/cells/rating-cell.tsx
index 5663cf50..445a54d9 100644
--- a/src/renderer/components/virtual-table/cells/rating-cell.tsx
+++ b/src/renderer/components/virtual-table/cells/rating-cell.tsx
@@ -1,10 +1,11 @@
 /* eslint-disable import/no-cycle */
 import type { ICellRendererParams } from '@ag-grid-community/core';
+
 import { Rating } from '/@/renderer/components/rating';
 import { CellContainer } from '/@/renderer/components/virtual-table/cells/generic-cell';
 import { useSetRating } from '/@/renderer/features/shared';
 
-export const RatingCell = ({ value, node }: ICellRendererParams) => {
+export const RatingCell = ({ node, value }: ICellRendererParams) => {
     const updateRatingMutation = useSetRating({});
 
     const handleUpdateRating = (rating: number) => {
@@ -27,9 +28,9 @@ export const RatingCell = ({ value, node }: ICellRendererParams) => {
     return (
         <CellContainer $position="center">
             <Rating
+                onChange={handleUpdateRating}
                 size="xs"
                 value={value?.userRating}
-                onChange={handleUpdateRating}
             />
         </CellContainer>
     );
diff --git a/src/renderer/components/virtual-table/cells/row-index-cell.tsx b/src/renderer/components/virtual-table/cells/row-index-cell.tsx
index 9307e788..bd18de2a 100644
--- a/src/renderer/components/virtual-table/cells/row-index-cell.tsx
+++ b/src/renderer/components/virtual-table/cells/row-index-cell.tsx
@@ -1,4 +1,5 @@
 import type { ICellRendererParams } from '@ag-grid-community/core';
+
 import { Text } from '/@/renderer/components/text';
 import { CellContainer } from '/@/renderer/components/virtual-table/cells/generic-cell';
 
@@ -132,7 +133,7 @@ const StaticSvg = () => {
     );
 };
 
-export const RowIndexCell = ({ value, eGridCell }: ICellRendererParams) => {
+export const RowIndexCell = ({ eGridCell, value }: ICellRendererParams) => {
     const classList = eGridCell.classList;
     // const isFocused = classList.contains('focused');
     const isPlaying = classList.contains('playing');
diff --git a/src/renderer/components/virtual-table/cells/title-cell.tsx b/src/renderer/components/virtual-table/cells/title-cell.tsx
index 46e2c796..f48a89b8 100644
--- a/src/renderer/components/virtual-table/cells/title-cell.tsx
+++ b/src/renderer/components/virtual-table/cells/title-cell.tsx
@@ -1,4 +1,5 @@
 import type { ICellRendererParams } from '@ag-grid-community/core';
+
 import { Skeleton } from '/@/renderer/components/skeleton';
 import { Text } from '/@/renderer/components/text';
 import { CellContainer } from '/@/renderer/components/virtual-table/cells/generic-cell';
diff --git a/src/renderer/components/virtual-table/headers/duration-header.tsx b/src/renderer/components/virtual-table/headers/duration-header.tsx
index 3963e10d..bfc36d60 100644
--- a/src/renderer/components/virtual-table/headers/duration-header.tsx
+++ b/src/renderer/components/virtual-table/headers/duration-header.tsx
@@ -1,4 +1,5 @@
 import type { IHeaderParams } from '@ag-grid-community/core';
+
 import { FiClock } from 'react-icons/fi';
 
 export interface ICustomHeaderParams extends IHeaderParams {
diff --git a/src/renderer/components/virtual-table/headers/generic-table-header.tsx b/src/renderer/components/virtual-table/headers/generic-table-header.tsx
index 47361306..82a3b5e6 100644
--- a/src/renderer/components/virtual-table/headers/generic-table-header.tsx
+++ b/src/renderer/components/virtual-table/headers/generic-table-header.tsx
@@ -1,19 +1,21 @@
-import type { ReactNode } from 'react';
 import type { IHeaderParams } from '@ag-grid-community/core';
+import type { ReactNode } from 'react';
+
 import { AiOutlineNumber } from 'react-icons/ai';
 import { FiClock } from 'react-icons/fi';
 import { RiHeartLine, RiMoreFill, RiStarLine } from 'react-icons/ri';
 import styled from 'styled-components';
-import { _Text } from '/@/renderer/components/text';
 
-type Presets = 'duration' | 'rowIndex' | 'userFavorite' | 'userRating' | 'actions';
+import { _Text } from '/@/renderer/components/text';
 
 type Options = {
     children?: ReactNode;
-    position?: 'left' | 'center' | 'right';
+    position?: 'center' | 'left' | 'right';
     preset?: Presets;
 };
 
+type Presets = 'actions' | 'duration' | 'rowIndex' | 'userFavorite' | 'userRating';
+
 export const HeaderWrapper = styled.div<{ $position: Options['position'] }>`
     display: flex;
     justify-content: ${(props) =>
@@ -77,7 +79,7 @@ const headerPresets = {
 
 export const GenericTableHeader = (
     { displayName }: IHeaderParams,
-    { preset, children, position }: Options,
+    { children, position, preset }: Options,
 ) => {
     if (preset) {
         return <HeaderWrapper $position={position}>{headerPresets[preset]}</HeaderWrapper>;
diff --git a/src/renderer/components/virtual-table/hooks/use-click-outside-deselect.tsx b/src/renderer/components/virtual-table/hooks/use-click-outside-deselect.tsx
index 1a8f959a..b67b20f9 100644
--- a/src/renderer/components/virtual-table/hooks/use-click-outside-deselect.tsx
+++ b/src/renderer/components/virtual-table/hooks/use-click-outside-deselect.tsx
@@ -1,6 +1,7 @@
-import { MutableRefObject } from 'react';
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
+
 import { useClickOutside } from '@mantine/hooks';
+import { MutableRefObject } from 'react';
 
 export const useClickOutsideDeselect = (tableRef: MutableRefObject<AgGridReactType | null>) => {
     const handleDeselect = () => {
diff --git a/src/renderer/components/virtual-table/hooks/use-current-song-row-styles.ts b/src/renderer/components/virtual-table/hooks/use-current-song-row-styles.ts
index fba985f0..517b5443 100644
--- a/src/renderer/components/virtual-table/hooks/use-current-song-row-styles.ts
+++ b/src/renderer/components/virtual-table/hooks/use-current-song-row-styles.ts
@@ -1,6 +1,8 @@
-import { MutableRefObject, useEffect, useMemo, useRef } from 'react';
-import { RowClassRules, RowNode } from '@ag-grid-community/core';
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
+
+import { RowClassRules, RowNode } from '@ag-grid-community/core';
+import { MutableRefObject, useEffect, useMemo, useRef } from 'react';
+
 import { Song } from '/@/renderer/api/types';
 import { useAppFocus } from '/@/renderer/hooks';
 import { useCurrentSong, usePlayerStore } from '/@/renderer/store';
diff --git a/src/renderer/components/virtual-table/hooks/use-fixed-table-header.tsx b/src/renderer/components/virtual-table/hooks/use-fixed-table-header.tsx
index 4edeb66f..48c8450a 100644
--- a/src/renderer/components/virtual-table/hooks/use-fixed-table-header.tsx
+++ b/src/renderer/components/virtual-table/hooks/use-fixed-table-header.tsx
@@ -1,5 +1,6 @@
 import { useInView } from 'framer-motion';
 import { useEffect, useRef } from 'react';
+
 import { useWindowSettings } from '/@/renderer/store/settings.store';
 import { Platform } from '/@/renderer/types';
 
diff --git a/src/renderer/components/virtual-table/hooks/use-virtual-table.ts b/src/renderer/components/virtual-table/hooks/use-virtual-table.ts
index e7e1be84..ef65dec1 100644
--- a/src/renderer/components/virtual-table/hooks/use-virtual-table.ts
+++ b/src/renderer/components/virtual-table/hooks/use-virtual-table.ts
@@ -1,4 +1,5 @@
-import { MutableRefObject, useCallback, useMemo } from 'react';
+import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
+
 import {
     BodyScrollEvent,
     ColDef,
@@ -8,13 +9,17 @@ import {
     PaginationChangedEvent,
     RowDoubleClickedEvent,
 } from '@ag-grid-community/core';
-import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
 import { QueryKey, useQueryClient } from '@tanstack/react-query';
 import debounce from 'lodash/debounce';
 import orderBy from 'lodash/orderBy';
+import { MutableRefObject, useCallback, useMemo } from 'react';
 import { generatePath, useNavigate } from 'react-router';
+import { useSearchParams } from 'react-router-dom';
+
+import { ListKey, useListStoreByKey } from '../../../store/list.store';
+
 import { api } from '/@/renderer/api';
-import { QueryPagination, queryKeys } from '/@/renderer/api/query-keys';
+import { queryKeys, QueryPagination } from '/@/renderer/api/query-keys';
 import {
     BasePaginatedResponse,
     BaseQuery,
@@ -26,8 +31,6 @@ import { SetContextMenuItems, useHandleTableContextMenu } from '/@/renderer/feat
 import { AppRoute } from '/@/renderer/router/routes';
 import { useListStoreActions } from '/@/renderer/store';
 import { ListDisplayType, TablePagination } from '/@/renderer/types';
-import { useSearchParams } from 'react-router-dom';
-import { ListKey, useListStoreByKey } from '../../../store/list.store';
 
 export type AgGridFetchFn<TResponse, TFilter> = (
     args: { filter: TFilter; limit: number; startIndex: number },
@@ -44,24 +47,24 @@ interface UseAgGridProps<TFilter> {
     itemCount?: number;
     itemType: LibraryItem;
     pageKey: string;
-    server: ServerListItem | null;
+    server: null | ServerListItem;
     tableRef: MutableRefObject<AgGridReactType | null>;
 }
 
 const BLOCK_SIZE = 500;
 
 export const useVirtualTable = <TFilter extends BaseQuery<any>>({
-    server,
-    tableRef,
-    pageKey,
-    itemType,
+    columnType,
     contextMenu,
-    itemCount,
     customFilters,
-    isSearchParams,
     isClientSide,
     isClientSideSort,
-    columnType,
+    isSearchParams,
+    itemCount,
+    itemType,
+    pageKey,
+    server,
+    tableRef,
 }: UseAgGridProps<TFilter>) => {
     const queryClient = useQueryClient();
     const navigate = useNavigate();
diff --git a/src/renderer/components/virtual-table/index.tsx b/src/renderer/components/virtual-table/index.tsx
index 42717eec..dfd557e4 100644
--- a/src/renderer/components/virtual-table/index.tsx
+++ b/src/renderer/components/virtual-table/index.tsx
@@ -1,30 +1,42 @@
-import { Ref, forwardRef, useRef, useEffect, useCallback, useMemo } from 'react';
 import type {
-    ICellRendererParams,
-    ValueGetterParams,
-    IHeaderParams,
-    ValueFormatterParams,
     ColDef,
     ColumnMovedEvent,
-    NewColumnsLoadedEvent,
     GridReadyEvent,
     GridSizeChangedEvent,
+    ICellRendererParams,
+    IHeaderParams,
     ModelUpdatedEvent,
+    NewColumnsLoadedEvent,
+    ValueFormatterParams,
+    ValueGetterParams,
 } from '@ag-grid-community/core';
 import type { AgGridReactProps } from '@ag-grid-community/react';
-import { AgGridReact } from '@ag-grid-community/react';
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
+
+import { AgGridReact } from '@ag-grid-community/react';
 import { useClickOutside, useMergedRef } from '@mantine/hooks';
 import formatDuration from 'format-duration';
 import { AnimatePresence } from 'framer-motion';
+import { forwardRef, Ref, useCallback, useEffect, useMemo, useRef } from 'react';
 import { generatePath } from 'react-router';
 import styled from 'styled-components';
+
+import i18n from '/@/i18n/i18n';
+import { ActionsCell } from '/@/renderer/components/virtual-table/cells/actions-cell';
 import { AlbumArtistCell } from '/@/renderer/components/virtual-table/cells/album-artist-cell';
 import { ArtistCell } from '/@/renderer/components/virtual-table/cells/artist-cell';
 import { CombinedTitleCell } from '/@/renderer/components/virtual-table/cells/combined-title-cell';
+import { FavoriteCell } from '/@/renderer/components/virtual-table/cells/favorite-cell';
 import { GenericCell } from '/@/renderer/components/virtual-table/cells/generic-cell';
 import { GenreCell } from '/@/renderer/components/virtual-table/cells/genre-cell';
+import { NoteCell } from '/@/renderer/components/virtual-table/cells/note-cell';
+import { RatingCell } from '/@/renderer/components/virtual-table/cells/rating-cell';
+import { RowIndexCell } from '/@/renderer/components/virtual-table/cells/row-index-cell';
+import { TitleCell } from '/@/renderer/components/virtual-table/cells/title-cell';
 import { GenericTableHeader } from '/@/renderer/components/virtual-table/headers/generic-table-header';
+import { useFixedTableHeader } from '/@/renderer/components/virtual-table/hooks/use-fixed-table-header';
+import { TablePagination } from '/@/renderer/components/virtual-table/table-pagination';
+import { useTableChange } from '/@/renderer/hooks/use-song-change';
 import { AppRoute } from '/@/renderer/router/routes';
 import { PersistedTableColumn } from '/@/renderer/store/settings.store';
 import {
@@ -32,27 +44,17 @@ import {
     TableColumn,
     TablePagination as TablePaginationType,
 } from '/@/renderer/types';
-import { FavoriteCell } from '/@/renderer/components/virtual-table/cells/favorite-cell';
-import { RatingCell } from '/@/renderer/components/virtual-table/cells/rating-cell';
-import { TablePagination } from '/@/renderer/components/virtual-table/table-pagination';
-import { ActionsCell } from '/@/renderer/components/virtual-table/cells/actions-cell';
-import { TitleCell } from '/@/renderer/components/virtual-table/cells/title-cell';
-import { useFixedTableHeader } from '/@/renderer/components/virtual-table/hooks/use-fixed-table-header';
-import { NoteCell } from '/@/renderer/components/virtual-table/cells/note-cell';
-import { RowIndexCell } from '/@/renderer/components/virtual-table/cells/row-index-cell';
-import i18n from '/@/i18n/i18n';
 import {
     formatDateAbsolute,
     formatDateAbsoluteUTC,
     formatDateRelative,
     formatSizeString,
 } from '/@/renderer/utils/format';
-import { useTableChange } from '/@/renderer/hooks/use-song-change';
 
+export * from './hooks/use-click-outside-deselect';
+export * from './hooks/use-fixed-table-header';
 export * from './table-config-dropdown';
 export * from './table-pagination';
-export * from './hooks/use-fixed-table-header';
-export * from './hooks/use-click-outside-deselect';
 export * from './utils';
 
 const TableWrapper = styled.div`
@@ -491,16 +493,16 @@ export const VirtualTable = forwardRef(
     (
         {
             autoFitColumns,
-            deselectOnClickOutside,
             autoHeight,
-            stickyHeader,
-            transparentHeader,
+            deselectOnClickOutside,
             onColumnMoved,
-            onNewColumnsLoaded,
             onGridReady,
             onGridSizeChanged,
+            onNewColumnsLoaded,
             paginationProps,
             shouldUpdateSong,
+            stickyHeader,
+            transparentHeader,
             ...rest
         }: VirtualTableProps,
         ref: Ref<AgGridReactType | null>,
@@ -584,7 +586,7 @@ export const VirtualTable = forwardRef(
             [autoFitColumns],
         );
 
-        const { tableHeaderRef, tableContainerRef } = useFixedTableHeader({
+        const { tableContainerRef, tableHeaderRef } = useFixedTableHeader({
             enabled: stickyHeader || false,
         });
 
@@ -592,32 +594,32 @@ export const VirtualTable = forwardRef(
 
         return (
             <TableWrapper
-                ref={mergedWrapperRef}
                 className={
                     transparentHeader
                         ? 'ag-theme-alpine-dark ag-header-transparent'
                         : 'ag-theme-alpine-dark'
                 }
+                ref={mergedWrapperRef}
             >
                 <DummyHeader ref={tableHeaderRef} />
                 <AgGridReact
-                    ref={mergedRef}
                     animateRows
-                    maintainColumnOrder
-                    suppressAsyncEvents
-                    suppressContextMenu
-                    suppressCopyRowsToClipboard
-                    suppressMoveWhenRowDragging
-                    suppressPaginationPanel
-                    suppressScrollOnNewData
                     blockLoadDebounceMillis={200}
                     cacheBlockSize={300}
                     cacheOverflowSize={1}
                     defaultColDef={defaultColumnDefs}
                     enableCellChangeFlash={false}
                     headerHeight={36}
+                    maintainColumnOrder
+                    ref={mergedRef}
                     rowBuffer={30}
                     rowSelection="multiple"
+                    suppressAsyncEvents
+                    suppressContextMenu
+                    suppressCopyRowsToClipboard
+                    suppressMoveWhenRowDragging
+                    suppressPaginationPanel
+                    suppressScrollOnNewData
                     {...rest}
                     onColumnMoved={handleColumnMoved}
                     onGridReady={handleGridReady}
@@ -627,9 +629,9 @@ export const VirtualTable = forwardRef(
                 />
                 {paginationProps && (
                     <AnimatePresence
-                        presenceAffectsLayout
                         initial={false}
                         mode="wait"
+                        presenceAffectsLayout
                     >
                         <TablePagination
                             {...paginationProps}
diff --git a/src/renderer/components/virtual-table/table-config-dropdown.tsx b/src/renderer/components/virtual-table/table-config-dropdown.tsx
index 1fd3d971..4c8b7aa4 100644
--- a/src/renderer/components/virtual-table/table-config-dropdown.tsx
+++ b/src/renderer/components/virtual-table/table-config-dropdown.tsx
@@ -1,12 +1,14 @@
 import type { ChangeEvent } from 'react';
+
+import { useTranslation } from 'react-i18next';
+
+import i18n from '/@/i18n/i18n';
+import { Option } from '/@/renderer/components/option';
 import { MultiSelect } from '/@/renderer/components/select';
 import { Slider } from '/@/renderer/components/slider';
 import { Switch } from '/@/renderer/components/switch';
-import { useSettingsStoreActions, useSettingsStore } from '/@/renderer/store/settings.store';
+import { useSettingsStore, useSettingsStoreActions } from '/@/renderer/store/settings.store';
 import { TableColumn, TableType } from '/@/renderer/types';
-import { Option } from '/@/renderer/components/option';
-import i18n from '/@/i18n/i18n';
-import { useTranslation } from 'react-i18next';
 
 export const SONG_TABLE_COLUMNS = [
     {
@@ -408,8 +410,8 @@ export const TableConfigDropdown = ({ type }: TableConfigDropdownProps) => {
                         label={(value) => `Item size: ${value}`}
                         max={100}
                         min={25}
-                        w="100%"
                         onChangeEnd={handleUpdateRowHeight}
+                        w="100%"
                     />
                 </Option.Control>
             </Option>
@@ -420,8 +422,8 @@ export const TableConfigDropdown = ({ type }: TableConfigDropdownProps) => {
                         data={SONG_TABLE_COLUMNS}
                         defaultValue={tableConfig[type]?.columns.map((column) => column.column)}
                         dropdownPosition="bottom"
-                        width={300}
                         onChange={handleAddOrRemoveColumns}
+                        width={300}
                     />
                 </Option.Control>
             </Option>
diff --git a/src/renderer/components/virtual-table/table-pagination.tsx b/src/renderer/components/virtual-table/table-pagination.tsx
index 1dba051d..7d3a04ec 100644
--- a/src/renderer/components/virtual-table/table-pagination.tsx
+++ b/src/renderer/components/virtual-table/table-pagination.tsx
@@ -1,19 +1,22 @@
-import { MutableRefObject } from 'react';
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
+
 import { Group } from '@mantine/core';
 import { useForm } from '@mantine/form';
 import { useDisclosure } from '@mantine/hooks';
+import { MutableRefObject } from 'react';
 import { useTranslation } from 'react-i18next';
 import { RiHashtag } from 'react-icons/ri';
-import { Button } from '/@/renderer/components/button';
+
 import { MotionFlex } from '../motion';
+
+import { Button } from '/@/renderer/components/button';
 import { NumberInput } from '/@/renderer/components/input';
 import { Pagination } from '/@/renderer/components/pagination';
 import { Popover } from '/@/renderer/components/popover';
 import { Text } from '/@/renderer/components/text';
 import { useContainerQuery } from '/@/renderer/hooks';
-import { TablePagination as TablePaginationType } from '/@/renderer/types';
 import { ListKey } from '/@/renderer/store';
+import { TablePagination as TablePaginationType } from '/@/renderer/types';
 
 interface TablePaginationProps {
     pageKey: ListKey;
@@ -25,10 +28,10 @@ interface TablePaginationProps {
 
 export const TablePagination = ({
     pageKey,
-    tableRef,
     pagination,
-    setPagination,
     setIdPagination,
+    setPagination,
+    tableRef,
 }: TablePaginationProps) => {
     const { t } = useTranslation();
     const [isGoToPageOpen, handlers] = useDisclosure(false);
@@ -70,14 +73,14 @@ export const TablePagination = ({
 
     return (
         <MotionFlex
-            ref={containerQuery.ref}
-            layout
             align="center"
             animate={{ y: 0 }}
             exit={{ y: 50 }}
             initial={{ y: 50 }}
             justify="space-between"
+            layout
             p="1rem"
+            ref={containerQuery.ref}
             sx={{ borderTop: '1px solid var(--generic-border-color)' }}
         >
             <Text
@@ -102,18 +105,19 @@ export const TablePagination = ({
                 )}
             </Text>
             <Group
-                ref={containerQuery.ref}
                 noWrap
+                ref={containerQuery.ref}
                 spacing="sm"
             >
                 <Popover
-                    trapFocus
+                    onClose={() => handlers.close()}
                     opened={isGoToPageOpen}
                     position="bottom-start"
-                    onClose={() => handlers.close()}
+                    trapFocus
                 >
                     <Popover.Target>
                         <Button
+                            onClick={() => handlers.toggle()}
                             radius="sm"
                             size="sm"
                             sx={{ height: '26px', padding: '0', width: '26px' }}
@@ -121,7 +125,6 @@ export const TablePagination = ({
                                 label: t('action.goToPage', { postProcess: 'sentenceCase' }),
                             }}
                             variant="default"
-                            onClick={() => handlers.toggle()}
                         >
                             <RiHashtag size={15} />
                         </Button>
@@ -147,14 +150,14 @@ export const TablePagination = ({
                     </Popover.Dropdown>
                 </Popover>
                 <Pagination
-                    noWrap
                     $hideDividers={!containerQuery.isSm}
                     boundaries={1}
+                    noWrap
+                    onChange={handlePagination}
                     radius="sm"
                     siblings={containerQuery.isMd ? 2 : containerQuery.isSm ? 1 : 0}
                     total={pagination.totalPages - 1}
                     value={pagination.currentPage + 1}
-                    onChange={handlePagination}
                 />
             </Group>
         </MotionFlex>
diff --git a/src/renderer/components/virtual-table/utils.ts b/src/renderer/components/virtual-table/utils.ts
index 6618ea73..fd7b71d8 100644
--- a/src/renderer/components/virtual-table/utils.ts
+++ b/src/renderer/components/virtual-table/utils.ts
@@ -3,7 +3,7 @@ import { GridApi, RowNode } from '@ag-grid-community/core';
 export const getNodesByDiscNumber = (args: {
     api: GridApi;
     discNumber: number;
-    subtitle: string | null;
+    subtitle: null | string;
 }) => {
     const { api, discNumber, subtitle } = args;
 
@@ -21,7 +21,7 @@ export const setNodeSelection = (args: {
     isSelected: boolean;
     nodes: RowNode<any>[];
 }) => {
-    const { nodes, isSelected } = args;
+    const { isSelected, nodes } = args;
 
     nodes.forEach((node) => {
         node.setSelected(isSelected);
diff --git a/src/renderer/context/list-context.tsx b/src/renderer/context/list-context.tsx
index ad6870ec..87cd5e1c 100644
--- a/src/renderer/context/list-context.tsx
+++ b/src/renderer/context/list-context.tsx
@@ -1,4 +1,5 @@
 import { createContext, useContext } from 'react';
+
 import { ListKey } from '/@/renderer/store';
 import { Play } from '/@/renderer/types';
 
diff --git a/src/renderer/env.d.ts b/src/renderer/env.d.ts
new file mode 100644
index 00000000..11f02fe2
--- /dev/null
+++ b/src/renderer/env.d.ts
@@ -0,0 +1 @@
+/// <reference types="vite/client" />
diff --git a/src/renderer/features/action-required/components/action-required-container.tsx b/src/renderer/features/action-required/components/action-required-container.tsx
index a3648b20..5513cad9 100644
--- a/src/renderer/features/action-required/components/action-required-container.tsx
+++ b/src/renderer/features/action-required/components/action-required-container.tsx
@@ -1,14 +1,15 @@
-import { Stack, Group } from '@mantine/core';
-import { RiAlertFill } from 'react-icons/ri';
-import { Text } from '/@/renderer/components';
+import { Group, Stack } from '@mantine/core';
 import { ReactNode } from 'react';
+import { RiAlertFill } from 'react-icons/ri';
+
+import { Text } from '/@/renderer/components';
 
 interface ActionRequiredContainerProps {
     children: ReactNode;
     title: string;
 }
 
-export const ActionRequiredContainer = ({ title, children }: ActionRequiredContainerProps) => (
+export const ActionRequiredContainer = ({ children, title }: ActionRequiredContainerProps) => (
     <Stack sx={{ cursor: 'default', maxWidth: '700px' }}>
         <Group>
             <RiAlertFill
diff --git a/src/renderer/features/action-required/components/error-fallback.tsx b/src/renderer/features/action-required/components/error-fallback.tsx
index c8954afd..632f9001 100644
--- a/src/renderer/features/action-required/components/error-fallback.tsx
+++ b/src/renderer/features/action-required/components/error-fallback.tsx
@@ -1,8 +1,10 @@
-import { Box, Center, Group, Stack } from '@mantine/core';
 import type { FallbackProps } from 'react-error-boundary';
+
+import { Box, Center, Group, Stack } from '@mantine/core';
 import { RiErrorWarningLine } from 'react-icons/ri';
 import { useRouteError } from 'react-router';
 import styled from 'styled-components';
+
 import { Button, Text } from '/@/renderer/components';
 
 const Container = styled(Box)`
@@ -25,8 +27,8 @@ export const ErrorFallback = ({ resetErrorBoundary }: FallbackProps) => {
                     </Group>
                     <Text>{error?.message}</Text>
                     <Button
-                        variant="filled"
                         onClick={resetErrorBoundary}
+                        variant="filled"
                     >
                         Reload
                     </Button>
diff --git a/src/renderer/features/action-required/components/mpv-required.tsx b/src/renderer/features/action-required/components/mpv-required.tsx
index aff386a9..38d41af2 100644
--- a/src/renderer/features/action-required/components/mpv-required.tsx
+++ b/src/renderer/features/action-required/components/mpv-required.tsx
@@ -1,11 +1,12 @@
-import { useEffect, useState } from 'react';
 import isElectron from 'is-electron';
-import { FileInput, Text, Button, Checkbox } from '/@/renderer/components';
-import { usePlaybackSettings, useSettingsStoreActions } from '/@/renderer/store';
-import { PlaybackType } from '/@/renderer/types';
+import { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
-const localSettings = isElectron() ? window.electron.localSettings : null;
+import { Button, Checkbox, FileInput, Text } from '/@/renderer/components';
+import { usePlaybackSettings, useSettingsStoreActions } from '/@/renderer/store';
+import { PlaybackType } from '/@/renderer/types';
+
+const localSettings = isElectron() ? window.api.localSettings : null;
 
 export const MpvRequired = () => {
     const [mpvPath, setMpvPath] = useState('');
@@ -48,8 +49,8 @@ export const MpvRequired = () => {
             </Text>
             <FileInput
                 disabled={disabled}
-                placeholder={mpvPath}
                 onChange={handleSetMpvPath}
+                placeholder={mpvPath}
             />
             <Text>{t('setting.disable_mpv', { context: 'description' })}</Text>
             <Checkbox
diff --git a/src/renderer/features/action-required/components/route-error-boundary.tsx b/src/renderer/features/action-required/components/route-error-boundary.tsx
index 20d83c8b..dc6990cd 100644
--- a/src/renderer/features/action-required/components/route-error-boundary.tsx
+++ b/src/renderer/features/action-required/components/route-error-boundary.tsx
@@ -1,6 +1,7 @@
-import { Center, Stack, Group, Divider, Box } from '@mantine/core';
+import { Box, Center, Divider, Group, Stack } from '@mantine/core';
 import { RiArrowLeftSLine, RiErrorWarningLine, RiHome4Line, RiMenuFill } from 'react-icons/ri';
 import { useNavigate, useRouteError } from 'react-router';
+
 import { Button, DropdownMenu, Text } from '/@/renderer/components';
 import { AppMenu } from '/@/renderer/features/titlebar/components/app-menu';
 import { AppRoute } from '/@/renderer/router/routes';
@@ -28,9 +29,9 @@ const RouteErrorBoundary = () => {
                 <Stack sx={{ maxWidth: '50%' }}>
                     <Group>
                         <Button
+                            onClick={handleReturn}
                             px={10}
                             variant="subtle"
-                            onClick={handleReturn}
                         >
                             <RiArrowLeftSLine size={20} />
                         </Button>
@@ -48,10 +49,10 @@ const RouteErrorBoundary = () => {
                     >
                         <Button
                             leftIcon={<RiHome4Line />}
+                            onClick={handleHome}
                             size="md"
                             sx={{ flex: 0.5 }}
                             variant="default"
-                            onClick={handleHome}
                         >
                             Go home
                         </Button>
@@ -73,9 +74,9 @@ const RouteErrorBoundary = () => {
                     </Group>
                     <Group grow>
                         <Button
+                            onClick={handleReload}
                             size="md"
                             variant="filled"
-                            onClick={handleReload}
                         >
                             Reload
                         </Button>
diff --git a/src/renderer/features/action-required/components/server-required.tsx b/src/renderer/features/action-required/components/server-required.tsx
index 4e07353b..dfbca5d7 100644
--- a/src/renderer/features/action-required/components/server-required.tsx
+++ b/src/renderer/features/action-required/components/server-required.tsx
@@ -1,4 +1,5 @@
 import { RiMenuFill } from 'react-icons/ri';
+
 import { Button, DropdownMenu, Text } from '/@/renderer/components';
 import { AppMenu } from '/@/renderer/features/titlebar/components/app-menu';
 
diff --git a/src/renderer/features/action-required/routes/action-required-route.tsx b/src/renderer/features/action-required/routes/action-required-route.tsx
index 7dfb6a6c..c8037fe4 100644
--- a/src/renderer/features/action-required/routes/action-required-route.tsx
+++ b/src/renderer/features/action-required/routes/action-required-route.tsx
@@ -1,16 +1,17 @@
 import { Center, Group, Stack } from '@mantine/core';
+import { openModal } from '@mantine/modals';
 import { useTranslation } from 'react-i18next';
 import { RiCheckFill, RiEdit2Line, RiHome4Line } from 'react-icons/ri';
 import { Link } from 'react-router-dom';
+
 import { Button, PageHeader, Text } from '/@/renderer/components';
 import { ActionRequiredContainer } from '/@/renderer/features/action-required/components/action-required-container';
 import { ServerCredentialRequired } from '/@/renderer/features/action-required/components/server-credential-required';
 import { ServerRequired } from '/@/renderer/features/action-required/components/server-required';
+import { ServerList } from '/@/renderer/features/servers';
 import { AnimatedPage } from '/@/renderer/features/shared';
 import { AppRoute } from '/@/renderer/router/routes';
 import { useCurrentServer } from '/@/renderer/store';
-import { openModal } from '@mantine/modals';
-import { ServerList } from '/@/renderer/features/servers';
 
 const ActionRequiredRoute = () => {
     const { t } = useTranslation();
@@ -88,8 +89,8 @@ const ActionRequiredRoute = () => {
                                 <Button
                                     fullWidth
                                     leftIcon={<RiEdit2Line />}
-                                    variant="filled"
                                     onClick={handleManageServersModal}
+                                    variant="filled"
                                 >
                                     {t('page.appMenu.manageServers', {
                                         postProcess: 'sentenceCase',
diff --git a/src/renderer/features/action-required/routes/invalid-route.tsx b/src/renderer/features/action-required/routes/invalid-route.tsx
index da58f13d..66e1f5de 100644
--- a/src/renderer/features/action-required/routes/invalid-route.tsx
+++ b/src/renderer/features/action-required/routes/invalid-route.tsx
@@ -1,6 +1,7 @@
 import { Center, Group, Stack } from '@mantine/core';
 import { RiQuestionLine } from 'react-icons/ri';
 import { useLocation, useNavigate } from 'react-router-dom';
+
 import { Button, Text } from '/@/renderer/components';
 import { AnimatedPage } from '/@/renderer/features/shared';
 
@@ -24,8 +25,8 @@ const InvalidRoute = () => {
                     </Group>
                     <Text>{location.pathname}</Text>
                     <Button
-                        variant="filled"
                         onClick={() => navigate(-1)}
+                        variant="filled"
                     >
                         Go back
                     </Button>
diff --git a/src/renderer/features/albums/components/album-detail-content.tsx b/src/renderer/features/albums/components/album-detail-content.tsx
index c4cb7159..70131976 100644
--- a/src/renderer/features/albums/components/album-detail-content.tsx
+++ b/src/renderer/features/albums/components/album-detail-content.tsx
@@ -1,8 +1,9 @@
-import { MutableRefObject, useCallback, useMemo } from 'react';
-import { RowDoubleClickedEvent, RowHeightParams, RowNode } from '@ag-grid-community/core';
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
+
+import { RowDoubleClickedEvent, RowHeightParams, RowNode } from '@ag-grid-community/core';
 import { Box, Group, Stack } from '@mantine/core';
 import { useSetState } from '@mantine/hooks';
+import { MutableRefObject, useCallback, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { FaLastfmSquare } from 'react-icons/fa';
 import { RiHeartFill, RiHeartLine, RiMoreFill, RiSettings2Fill } from 'react-icons/ri';
@@ -10,6 +11,7 @@ import { SiMusicbrainz } from 'react-icons/si';
 import { generatePath, useParams } from 'react-router';
 import { Link } from 'react-router-dom';
 import styled from 'styled-components';
+
 import { queryKeys } from '/@/renderer/api/query-keys';
 import {
     AlbumListQuery,
@@ -21,9 +23,9 @@ import {
 import { Button, Popover, Spoiler } from '/@/renderer/components';
 import { MemoizedSwiperGridCarousel } from '/@/renderer/components/grid-carousel';
 import {
+    getColumnDefs,
     TableConfigDropdown,
     VirtualTable,
-    getColumnDefs,
 } from '/@/renderer/components/virtual-table';
 import { FullWidthDiscCell } from '/@/renderer/components/virtual-table/cells/full-width-disc-cell';
 import { useCurrentSongRowStyles } from '/@/renderer/components/virtual-table/hooks/use-current-song-row-styles';
@@ -41,6 +43,7 @@ import { usePlayQueueAdd } from '/@/renderer/features/player';
 import { PlayButton, useCreateFavorite, useDeleteFavorite } from '/@/renderer/features/shared';
 import { LibraryBackgroundOverlay } from '/@/renderer/features/shared/components/library-background-overlay';
 import { useAppFocus, useContainerQuery } from '/@/renderer/hooks';
+import { useGenreRoute } from '/@/renderer/hooks/use-genre-route';
 import { AppRoute } from '/@/renderer/router/routes';
 import { useCurrentServer, useCurrentSong, useCurrentStatus } from '/@/renderer/store';
 import {
@@ -51,7 +54,6 @@ import {
 } from '/@/renderer/store/settings.store';
 import { Play } from '/@/renderer/types';
 import { replaceURLWithHTMLLinks } from '/@/renderer/utils/linkify';
-import { useGenreRoute } from '/@/renderer/hooks/use-genre-route';
 
 const isFullWidthRow = (node: RowNode) => {
     return node.id?.startsWith('disc-');
@@ -75,7 +77,7 @@ interface AlbumDetailContentProps {
     tableRef: MutableRefObject<AgGridReactType | null>;
 }
 
-export const AlbumDetailContent = ({ tableRef, background }: AlbumDetailContentProps) => {
+export const AlbumDetailContent = ({ background, tableRef }: AlbumDetailContentProps) => {
     const { t } = useTranslation();
     const { albumId } = useParams() as { albumId: string };
     const server = useCurrentServer();
@@ -112,7 +114,7 @@ export const AlbumDetailContent = ({ tableRef, background }: AlbumDetailContentP
         }
 
         let discNumber = -1;
-        let discSubtitle: string | null = null;
+        let discSubtitle: null | string = null;
 
         const rowData: (QueueSong | { id: string; name: string })[] = [];
         const discTranslated = t('common.disc', { postProcess: 'upperCase' });
@@ -343,8 +345,8 @@ export const AlbumDetailContent = ({ tableRef, background }: AlbumDetailContentP
                                     createFavoriteMutation.isLoading ||
                                     deleteFavoriteMutation.isLoading
                                 }
-                                variant="subtle"
                                 onClick={handleFavorite}
+                                variant="subtle"
                             >
                                 {detailQuery?.data?.userFavorite ? (
                                     <RiHeartFill
@@ -357,11 +359,11 @@ export const AlbumDetailContent = ({ tableRef, background }: AlbumDetailContentP
                             </Button>
                             <Button
                                 compact
-                                variant="subtle"
                                 onClick={(e) => {
                                     if (!detailQuery?.data) return;
                                     handleGeneralContextMenu(e, [detailQuery.data!]);
                                 }}
+                                variant="subtle"
                             >
                                 <RiMoreFill size={20} />
                             </Button>
@@ -388,9 +390,9 @@ export const AlbumDetailContent = ({ tableRef, background }: AlbumDetailContentP
                         <Group spacing="sm">
                             {detailQuery?.data?.genres?.map((genre) => (
                                 <Button
-                                    key={`genre-${genre.id}`}
                                     compact
                                     component={Link}
+                                    key={`genre-${genre.id}`}
                                     radius={0}
                                     size="md"
                                     to={generatePath(genreRoute, {
@@ -451,15 +453,8 @@ export const AlbumDetailContent = ({ tableRef, background }: AlbumDetailContentP
                 )}
                 <Box style={{ minHeight: '300px' }}>
                     <VirtualTable
-                        key={`table-${tableConfig.rowHeight}`}
-                        ref={tableRef}
-                        autoHeight
-                        shouldUpdateSong
-                        stickyHeader
-                        suppressCellFocus
-                        suppressLoadingOverlay
-                        suppressRowDrag
                         autoFitColumns={tableConfig.autoFit}
+                        autoHeight
                         columnDefs={columnDefs}
                         context={{
                             currentSong,
@@ -479,17 +474,24 @@ export const AlbumDetailContent = ({ tableRef, background }: AlbumDetailContentP
                             if (isFullWidthRow(data.data)) return false;
                             return true;
                         }}
-                        rowClassRules={rowClassRules}
-                        rowData={songsRowData}
-                        rowSelection="multiple"
+                        key={`table-${tableConfig.rowHeight}`}
                         onCellContextMenu={onCellContextMenu}
                         onColumnMoved={onColumnMoved}
                         onRowDoubleClicked={handleRowDoubleClick}
+                        ref={tableRef}
+                        rowClassRules={rowClassRules}
+                        rowData={songsRowData}
+                        rowSelection="multiple"
+                        shouldUpdateSong
+                        stickyHeader
+                        suppressCellFocus
+                        suppressLoadingOverlay
+                        suppressRowDrag
                     />
                 </Box>
                 <Stack
-                    ref={cq.ref}
                     mt="3rem"
+                    ref={cq.ref}
                     spacing="lg"
                 >
                     {cq.height || cq.width ? (
@@ -498,7 +500,6 @@ export const AlbumDetailContent = ({ tableRef, background }: AlbumDetailContentP
                                 .filter((c) => !c.isHidden)
                                 .map((carousel, index) => (
                                     <MemoizedSwiperGridCarousel
-                                        key={`carousel-${carousel.uniqueId}-${index}`}
                                         cardRows={[
                                             {
                                                 property: 'name',
@@ -529,6 +530,7 @@ export const AlbumDetailContent = ({ tableRef, background }: AlbumDetailContentP
                                         data={carousel.data}
                                         isLoading={carousel.loading}
                                         itemType={LibraryItem.ALBUM}
+                                        key={`carousel-${carousel.uniqueId}-${index}`}
                                         route={{
                                             route: AppRoute.LIBRARY_ALBUMS_DETAIL,
                                             slugs: [{ idProperty: 'id', slugProperty: 'albumId' }],
diff --git a/src/renderer/features/albums/components/album-detail-header.tsx b/src/renderer/features/albums/components/album-detail-header.tsx
index 0d2d5db1..b4ea2c03 100644
--- a/src/renderer/features/albums/components/album-detail-header.tsx
+++ b/src/renderer/features/albums/components/album-detail-header.tsx
@@ -1,19 +1,20 @@
-import { forwardRef, Fragment, Ref, useCallback, useMemo } from 'react';
 import { Group, Stack } from '@mantine/core';
+import { forwardRef, Fragment, Ref, useCallback, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { generatePath, useParams } from 'react-router';
 import { Link } from 'react-router-dom';
+
+import { queryKeys } from '/@/renderer/api/query-keys';
 import { AlbumDetailResponse, LibraryItem, ServerType } from '/@/renderer/api/types';
 import { Rating, Text } from '/@/renderer/components';
 import { useAlbumDetail } from '/@/renderer/features/albums/queries/album-detail-query';
 import { LibraryHeader, useSetRating } from '/@/renderer/features/shared';
 import { useContainerQuery } from '/@/renderer/hooks';
+import { useSongChange } from '/@/renderer/hooks/use-song-change';
+import { queryClient } from '/@/renderer/lib/react-query';
 import { AppRoute } from '/@/renderer/router/routes';
 import { useCurrentServer } from '/@/renderer/store';
 import { formatDateAbsoluteUTC, formatDurationString } from '/@/renderer/utils';
-import { useSongChange } from '/@/renderer/hooks/use-song-change';
-import { queryKeys } from '/@/renderer/api/query-keys';
-import { queryClient } from '/@/renderer/lib/react-query';
 
 interface AlbumDetailHeaderProps {
     background: {
@@ -121,9 +122,9 @@ export const AlbumDetailHeader = forwardRef(
         return (
             <Stack ref={cq.ref}>
                 <LibraryHeader
-                    ref={ref}
                     imageUrl={detailQuery?.data?.imageUrl}
                     item={{ route: AppRoute.LIBRARY_ALBUMS, type: LibraryItem.ALBUM }}
+                    ref={ref}
                     title={detailQuery?.data?.name || ''}
                     {...background}
                 >
@@ -139,12 +140,12 @@ export const AlbumDetailHeader = forwardRef(
                                 <>
                                     <Text $noSelect>•</Text>
                                     <Rating
+                                        onChange={handleUpdateRating}
                                         readOnly={
                                             detailQuery?.isFetching ||
                                             updateRatingMutation.isLoading
                                         }
                                         value={detailQuery?.data?.userRating || 0}
-                                        onChange={handleUpdateRating}
                                     />
                                 </>
                             )}
@@ -153,17 +154,17 @@ export const AlbumDetailHeader = forwardRef(
                             mah="4rem"
                             spacing="md"
                             sx={{
+                                overflow: 'hidden',
                                 WebkitBoxOrient: 'vertical',
                                 WebkitLineClamp: 2,
-                                overflow: 'hidden',
                             }}
                         >
                             {detailQuery?.data?.albumArtists.map((artist) => (
                                 <Text
-                                    key={`artist-${artist.id}`}
                                     $link
                                     component={Link}
                                     fw={600}
+                                    key={`artist-${artist.id}`}
                                     to={generatePath(AppRoute.LIBRARY_ALBUM_ARTISTS_DETAIL, {
                                         albumArtistId: artist.id,
                                     })}
diff --git a/src/renderer/features/albums/components/album-list-content.tsx b/src/renderer/features/albums/components/album-list-content.tsx
index c82d1891..4ddcd94a 100644
--- a/src/renderer/features/albums/components/album-list-content.tsx
+++ b/src/renderer/features/albums/components/album-list-content.tsx
@@ -1,5 +1,7 @@
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
+
 import { lazy, MutableRefObject, Suspense } from 'react';
+
 import { Spinner } from '/@/renderer/components';
 import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid';
 import { useListContext } from '/@/renderer/context/list-context';
@@ -19,12 +21,12 @@ const AlbumListTableView = lazy(() =>
 );
 
 interface AlbumListContentProps {
-    gridRef: MutableRefObject<VirtualInfiniteGridRef | null>;
+    gridRef: MutableRefObject<null | VirtualInfiniteGridRef>;
     itemCount?: number;
     tableRef: MutableRefObject<AgGridReactType | null>;
 }
 
-export const AlbumListContent = ({ itemCount, gridRef, tableRef }: AlbumListContentProps) => {
+export const AlbumListContent = ({ gridRef, itemCount, tableRef }: AlbumListContentProps) => {
     const { pageKey } = useListContext();
     const { display } = useListStoreByKey({ key: pageKey });
 
diff --git a/src/renderer/features/albums/components/album-list-grid-view.tsx b/src/renderer/features/albums/components/album-list-grid-view.tsx
index 1f96665b..835b74f1 100644
--- a/src/renderer/features/albums/components/album-list-grid-view.tsx
+++ b/src/renderer/features/albums/components/album-list-grid-view.tsx
@@ -3,6 +3,7 @@ import { useCallback, useMemo } from 'react';
 import { useSearchParams } from 'react-router-dom';
 import AutoSizer, { Size } from 'react-virtualized-auto-sizer';
 import { ListOnScrollProps } from 'react-window';
+
 import { controller } from '/@/renderer/api/controller';
 import { queryKeys } from '/@/renderer/api/query-keys';
 import {
@@ -19,17 +20,17 @@ import {
 } from '/@/renderer/components/virtual-grid';
 import { useListContext } from '/@/renderer/context/list-context';
 import { usePlayQueueAdd } from '/@/renderer/features/player';
+import { useHandleFavorite } from '/@/renderer/features/shared/hooks/use-handle-favorite';
 import { AppRoute } from '/@/renderer/router/routes';
 import { useCurrentServer, useListStoreActions, useListStoreByKey } from '/@/renderer/store';
 import { CardRow, ListDisplayType } from '/@/renderer/types';
-import { useHandleFavorite } from '/@/renderer/features/shared/hooks/use-handle-favorite';
 
 export const AlbumListGridView = ({ gridRef, itemCount }: any) => {
     const queryClient = useQueryClient();
     const server = useCurrentServer();
     const handlePlayQueueAdd = usePlayQueueAdd();
-    const { pageKey, customFilters, id } = useListContext();
-    const { grid, display, filter } = useListStoreByKey<AlbumListQuery>({ key: pageKey });
+    const { customFilters, id, pageKey } = useListContext();
+    const { display, filter, grid } = useListStoreByKey<AlbumListQuery>({ key: pageKey });
     const { setGrid } = useListStoreActions();
 
     const [searchParams, setSearchParams] = useSearchParams();
@@ -189,8 +190,6 @@ export const AlbumListGridView = ({ gridRef, itemCount }: any) => {
             <AutoSizer>
                 {({ height, width }: Size) => (
                     <VirtualInfiniteGrid
-                        key={`album-list-${server?.id}-${display}`}
-                        ref={gridRef}
                         cardRows={cardRows}
                         display={display || ListDisplayType.CARD}
                         fetchFn={fetch}
@@ -203,14 +202,16 @@ export const AlbumListGridView = ({ gridRef, itemCount }: any) => {
                         itemGap={grid?.itemGap ?? 10}
                         itemSize={grid?.itemSize || 200}
                         itemType={LibraryItem.ALBUM}
+                        key={`album-list-${server?.id}-${display}`}
                         loading={itemCount === undefined || itemCount === null}
                         minimumBatchSize={40}
+                        onScroll={handleGridScroll}
+                        ref={gridRef}
                         route={{
                             route: AppRoute.LIBRARY_ALBUMS_DETAIL,
                             slugs: [{ idProperty: 'id', slugProperty: 'albumId' }],
                         }}
                         width={width}
-                        onScroll={handleGridScroll}
                     />
                 )}
             </AutoSizer>
diff --git a/src/renderer/features/albums/components/album-list-header-filters.tsx b/src/renderer/features/albums/components/album-list-header-filters.tsx
index 61970c49..ee97c6e6 100644
--- a/src/renderer/features/albums/components/album-list-header-filters.tsx
+++ b/src/renderer/features/albums/components/album-list-header-filters.tsx
@@ -1,8 +1,9 @@
-import { ChangeEvent, MouseEvent, MutableRefObject, useCallback, useMemo } from 'react';
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
+
 import { Divider, Flex, Group, Stack } from '@mantine/core';
 import { openModal } from '@mantine/modals';
 import { useQueryClient } from '@tanstack/react-query';
+import { ChangeEvent, MouseEvent, MutableRefObject, useCallback, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import {
     RiAddBoxFill,
@@ -14,6 +15,8 @@ import {
     RiRefreshLine,
     RiSettings3Fill,
 } from 'react-icons/ri';
+
+import i18n from '/@/i18n/i18n';
 import { queryKeys } from '/@/renderer/api/query-keys';
 import {
     AlbumListQuery,
@@ -39,7 +42,6 @@ import {
     useListStoreByKey,
 } from '/@/renderer/store';
 import { ListDisplayType, Play, TableColumn } from '/@/renderer/types';
-import i18n from '/@/i18n/i18n';
 
 const FILTERS = {
     jellyfin: [
@@ -191,7 +193,7 @@ const FILTERS = {
 };
 
 interface AlbumListHeaderFiltersProps {
-    gridRef: MutableRefObject<VirtualInfiniteGridRef | null>;
+    gridRef: MutableRefObject<null | VirtualInfiniteGridRef>;
     itemCount: number | undefined;
     tableRef: MutableRefObject<AgGridReactType | null>;
 }
@@ -203,16 +205,16 @@ export const AlbumListHeaderFilters = ({
 }: AlbumListHeaderFiltersProps) => {
     const { t } = useTranslation();
     const queryClient = useQueryClient();
-    const { pageKey, customFilters, handlePlay } = useListContext();
+    const { customFilters, handlePlay, pageKey } = useListContext();
     const server = useCurrentServer();
-    const { setFilter, setTable, setGrid, setDisplayType } = useListStoreActions();
-    const { display, filter, table, grid } = useListStoreByKey<AlbumListQuery>({
+    const { setDisplayType, setFilter, setGrid, setTable } = useListStoreActions();
+    const { display, filter, grid, table } = useListStoreByKey<AlbumListQuery>({
         filter: customFilters,
         key: pageKey,
     });
     const cq = useContainerQuery();
 
-    const { handleRefreshTable, handleRefreshGrid } = useListFilterRefresh({
+    const { handleRefreshGrid, handleRefreshTable } = useListFilterRefresh({
         itemCount,
         itemType: LibraryItem.ALBUM,
         server,
@@ -249,12 +251,12 @@ export const AlbumListHeaderFilters = ({
         let FilterComponent;
 
         switch (server?.type) {
-            case ServerType.NAVIDROME:
-                FilterComponent = NavidromeAlbumFilters;
-                break;
             case ServerType.JELLYFIN:
                 FilterComponent = JellyfinAlbumFilters;
                 break;
+            case ServerType.NAVIDROME:
+                FilterComponent = NavidromeAlbumFilters;
+                break;
             case ServerType.SUBSONIC:
                 FilterComponent = SubsonicAlbumFilters;
                 break;
@@ -271,9 +273,9 @@ export const AlbumListHeaderFilters = ({
                 <FilterComponent
                     customFilters={customFilters}
                     disableArtistFilter={!!customFilters}
+                    onFilterChange={onFilterChange}
                     pageKey={pageKey}
                     serverId={server?.id}
-                    onFilterChange={onFilterChange}
                 />
             ),
             title: 'Album Filters',
@@ -450,10 +452,10 @@ export const AlbumListHeaderFilters = ({
                     <DropdownMenu.Dropdown>
                         {FILTERS[server?.type as keyof typeof FILTERS].map((f) => (
                             <DropdownMenu.Item
-                                key={`filter-${f.name}`}
                                 $isActive={f.value === filter.sortBy}
-                                value={f.value}
+                                key={`filter-${f.name}`}
                                 onClick={handleSetSortBy}
+                                value={f.value}
                             >
                                 {f.name}
                             </DropdownMenu.Item>
@@ -462,8 +464,8 @@ export const AlbumListHeaderFilters = ({
                 </DropdownMenu>
                 <Divider orientation="vertical" />
                 <OrderToggleButton
-                    sortOrder={filter.sortOrder}
                     onToggle={handleToggleSortOrder}
+                    sortOrder={filter.sortOrder}
                 />
                 {server?.type === ServerType.JELLYFIN && (
                     <>
@@ -489,10 +491,10 @@ export const AlbumListHeaderFilters = ({
                             <DropdownMenu.Dropdown>
                                 {musicFoldersQuery.data?.items.map((folder) => (
                                     <DropdownMenu.Item
-                                        key={`musicFolder-${folder.id}`}
                                         $isActive={filter.musicFolderId === folder.id}
-                                        value={folder.id}
+                                        key={`musicFolder-${folder.id}`}
                                         onClick={handleSetMusicFolder}
+                                        value={folder.id}
                                     >
                                         {folder.name}
                                     </DropdownMenu.Item>
@@ -504,6 +506,7 @@ export const AlbumListHeaderFilters = ({
                 <Divider orientation="vertical" />
                 <Button
                     compact
+                    onClick={handleOpenFiltersModal}
                     size="md"
                     sx={{
                         svg: {
@@ -514,17 +517,16 @@ export const AlbumListHeaderFilters = ({
                         label: t('common.filters', { count: 2, postProcess: 'sentenceCase' }),
                     }}
                     variant="subtle"
-                    onClick={handleOpenFiltersModal}
                 >
                     <RiFilterFill size="1.3rem" />
                 </Button>
                 <Divider orientation="vertical" />
                 <Button
                     compact
+                    onClick={handleRefresh}
                     size="md"
                     tooltip={{ label: t('common.refresh', { postProcess: 'sentenceCase' }) }}
                     variant="subtle"
-                    onClick={handleRefresh}
                 >
                     <RiRefreshLine size="1.3rem" />
                 </Button>
@@ -594,22 +596,22 @@ export const AlbumListHeaderFilters = ({
                         </DropdownMenu.Label>
                         <DropdownMenu.Item
                             $isActive={display === ListDisplayType.CARD}
-                            value={ListDisplayType.CARD}
                             onClick={handleSetViewType}
+                            value={ListDisplayType.CARD}
                         >
                             {t('table.config.view.card', { postProcess: 'sentenceCase' })}
                         </DropdownMenu.Item>
                         <DropdownMenu.Item
                             $isActive={display === ListDisplayType.POSTER}
-                            value={ListDisplayType.POSTER}
                             onClick={handleSetViewType}
+                            value={ListDisplayType.POSTER}
                         >
                             {t('table.config.view.poster', { postProcess: 'sentenceCase' })}
                         </DropdownMenu.Item>
                         <DropdownMenu.Item
                             $isActive={display === ListDisplayType.TABLE}
-                            value={ListDisplayType.TABLE}
                             onClick={handleSetViewType}
+                            value={ListDisplayType.TABLE}
                         >
                             {t('table.config.view.table', { postProcess: 'sentenceCase' })}
                         </DropdownMenu.Item>
@@ -665,8 +667,8 @@ export const AlbumListHeaderFilters = ({
                                             defaultValue={table?.columns.map(
                                                 (column) => column.column,
                                             )}
-                                            width={300}
                                             onChange={handleTableColumns}
+                                            width={300}
                                         />
                                         <Group position="apart">
                                             <Text>Auto Fit Columns</Text>
diff --git a/src/renderer/features/albums/components/album-list-header.tsx b/src/renderer/features/albums/components/album-list-header.tsx
index 58265056..5e93f1fb 100644
--- a/src/renderer/features/albums/components/album-list-header.tsx
+++ b/src/renderer/features/albums/components/album-list-header.tsx
@@ -1,21 +1,23 @@
-import { useEffect, useRef, type ChangeEvent, type MutableRefObject } from 'react';
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
+
 import { Flex, Group, Stack } from '@mantine/core';
 import debounce from 'lodash/debounce';
+import { type ChangeEvent, type MutableRefObject, useEffect, useRef } from 'react';
 import { useTranslation } from 'react-i18next';
+
 import { AlbumListQuery, LibraryItem } from '/@/renderer/api/types';
 import { PageHeader, SearchInput } from '/@/renderer/components';
 import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid';
 import { AlbumListHeaderFilters } from '/@/renderer/features/albums/components/album-list-header-filters';
 import { FilterBar, LibraryHeaderBar } from '/@/renderer/features/shared';
 import { useContainerQuery } from '/@/renderer/hooks';
+import { useDisplayRefresh } from '/@/renderer/hooks/use-display-refresh';
 import { AlbumListFilter, useCurrentServer, usePlayButtonBehavior } from '/@/renderer/store';
 import { titleCase } from '/@/renderer/utils';
-import { useDisplayRefresh } from '/@/renderer/hooks/use-display-refresh';
 
 interface AlbumListHeaderProps {
     genreId?: string;
-    gridRef: MutableRefObject<VirtualInfiniteGridRef | null>;
+    gridRef: MutableRefObject<null | VirtualInfiniteGridRef>;
     itemCount?: number;
     tableRef: MutableRefObject<AgGridReactType | null>;
     title?: string;
@@ -23,8 +25,8 @@ interface AlbumListHeaderProps {
 
 export const AlbumListHeader = ({
     genreId,
-    itemCount,
     gridRef,
+    itemCount,
     tableRef,
     title,
 }: AlbumListHeaderProps) => {
@@ -82,8 +84,8 @@ export const AlbumListHeader = ({
                     <Group>
                         <SearchInput
                             defaultValue={filter.searchTerm}
-                            openedWidth={cq.isMd ? 250 : cq.isSm ? 200 : 150}
                             onChange={handleSearch}
+                            openedWidth={cq.isMd ? 250 : cq.isSm ? 200 : 150}
                         />
                     </Group>
                 </Flex>
diff --git a/src/renderer/features/albums/components/album-list-table-view.tsx b/src/renderer/features/albums/components/album-list-table-view.tsx
index 9ddb90db..2742063e 100644
--- a/src/renderer/features/albums/components/album-list-table-view.tsx
+++ b/src/renderer/features/albums/components/album-list-table-view.tsx
@@ -1,4 +1,5 @@
 import { useVirtualTable } from '../../../components/virtual-table/hooks/use-virtual-table';
+
 import { LibraryItem } from '/@/renderer/api/types';
 import { VirtualGridAutoSizerContainer } from '/@/renderer/components/virtual-grid';
 import { VirtualTable } from '/@/renderer/components/virtual-table';
@@ -6,9 +7,9 @@ import { useListContext } from '/@/renderer/context/list-context';
 import { ALBUM_CONTEXT_MENU_ITEMS } from '/@/renderer/features/context-menu/context-menu-items';
 import { useCurrentServer } from '/@/renderer/store';
 
-export const AlbumListTableView = ({ tableRef, itemCount }: any) => {
+export const AlbumListTableView = ({ itemCount, tableRef }: any) => {
     const server = useCurrentServer();
-    const { pageKey, customFilters, id } = useListContext();
+    const { customFilters, id, pageKey } = useListContext();
 
     const tableProps = useVirtualTable({
         contextMenu: ALBUM_CONTEXT_MENU_ITEMS,
diff --git a/src/renderer/features/albums/components/jellyfin-album-filters.tsx b/src/renderer/features/albums/components/jellyfin-album-filters.tsx
index 5b0a8fbe..88f0e03a 100644
--- a/src/renderer/features/albums/components/jellyfin-album-filters.tsx
+++ b/src/renderer/features/albums/components/jellyfin-album-filters.tsx
@@ -1,8 +1,10 @@
-import { ChangeEvent, useMemo, useState } from 'react';
 import { Divider, Group, Stack } from '@mantine/core';
 import debounce from 'lodash/debounce';
+import { ChangeEvent, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
+
 import { useListFilterByKey } from '../../../store/list.store';
+
 import {
     AlbumArtistListSort,
     AlbumListQuery,
@@ -11,11 +13,11 @@ import {
     SortOrder,
 } from '/@/renderer/api/types';
 import { NumberInput, SpinnerIcon, Switch, Text } from '/@/renderer/components';
+import { MultiSelectWithInvalidData } from '/@/renderer/components/select-with-invalid-data';
 import { useAlbumArtistList } from '/@/renderer/features/artists/queries/album-artist-list-query';
 import { useGenreList } from '/@/renderer/features/genres';
-import { AlbumListFilter, useListStoreActions } from '/@/renderer/store';
 import { useTagList } from '/@/renderer/features/tag/queries/use-tag-list';
-import { MultiSelectWithInvalidData } from '/@/renderer/components/select-with-invalid-data';
+import { AlbumListFilter, useListStoreActions } from '/@/renderer/store';
 
 interface JellyfinAlbumFiltersProps {
     customFilters?: Partial<AlbumListFilter>;
@@ -151,7 +153,7 @@ export const JellyfinAlbumFilters = ({
         }));
     }, [albumArtistListQuery?.data?.items]);
 
-    const handleAlbumArtistFilter = (e: string[] | null) => {
+    const handleAlbumArtistFilter = (e: null | string[]) => {
         const updatedFilters = setFilter({
             customFilters,
             data: {
@@ -192,8 +194,8 @@ export const JellyfinAlbumFilters = ({
                     <Text>{filter.label}</Text>
                     <Switch
                         checked={filter?.value || false}
-                        size="xs"
                         onChange={filter.onChange}
+                        size="xs"
                     />
                 </Group>
             ))}
@@ -205,8 +207,8 @@ export const JellyfinAlbumFilters = ({
                     label={t('filter.fromYear', { postProcess: 'sentenceCase' })}
                     max={2300}
                     min={1700}
-                    required={!!filter?.maxYear}
                     onChange={(e) => handleMinYearFilter(e)}
+                    required={!!filter?.maxYear}
                 />
                 <NumberInput
                     defaultValue={filter?.maxYear}
@@ -214,47 +216,47 @@ export const JellyfinAlbumFilters = ({
                     label={t('filter.toYear', { postProcess: 'sentenceCase' })}
                     max={2300}
                     min={1700}
-                    required={!!filter?.minYear}
                     onChange={(e) => handleMaxYearFilter(e)}
+                    required={!!filter?.minYear}
                 />
             </Group>
             <Group grow>
                 <MultiSelectWithInvalidData
                     clearable
-                    searchable
                     data={genreList}
                     defaultValue={filter.genres}
                     label={t('entity.genre', { count: 2, postProcess: 'sentenceCase' })}
                     onChange={handleGenresFilter}
+                    searchable
                 />
             </Group>
 
             <Group grow>
                 <MultiSelectWithInvalidData
                     clearable
-                    searchable
                     data={selectableAlbumArtists}
                     defaultValue={filter?._custom?.jellyfin?.AlbumArtistIds?.split(',')}
                     disabled={disableArtistFilter}
                     label={t('entity.artist', { count: 2, postProcess: 'sentenceCase' })}
                     limit={300}
-                    placeholder="Type to search for an artist"
-                    rightSection={albumArtistListQuery.isFetching ? <SpinnerIcon /> : undefined}
-                    searchValue={albumArtistSearchTerm}
                     onChange={handleAlbumArtistFilter}
                     onSearchChange={setAlbumArtistSearchTerm}
+                    placeholder="Type to search for an artist"
+                    rightSection={albumArtistListQuery.isFetching ? <SpinnerIcon /> : undefined}
+                    searchable
+                    searchValue={albumArtistSearchTerm}
                 />
             </Group>
             {tagsQuery.data?.boolTags?.length && (
                 <Group grow>
                     <MultiSelectWithInvalidData
                         clearable
-                        searchable
                         data={tagsQuery.data.boolTags}
                         defaultValue={selectedTags}
                         label={t('common.tags', { postProcess: 'sentenceCase' })}
-                        width={250}
                         onChange={handleTagFilter}
+                        searchable
+                        width={250}
                     />
                 </Group>
             )}
diff --git a/src/renderer/features/albums/components/navidrome-album-filters.tsx b/src/renderer/features/albums/components/navidrome-album-filters.tsx
index 04b795be..1a704dbf 100644
--- a/src/renderer/features/albums/components/navidrome-album-filters.tsx
+++ b/src/renderer/features/albums/components/navidrome-album-filters.tsx
@@ -1,10 +1,8 @@
-import { ChangeEvent, useMemo, useState } from 'react';
 import { Divider, Group, Stack } from '@mantine/core';
-import { NumberInput, Switch, Text, SpinnerIcon } from '/@/renderer/components';
-import { AlbumListFilter, useListStoreActions, useListStoreByKey } from '/@/renderer/store';
 import debounce from 'lodash/debounce';
-import { useGenreList } from '/@/renderer/features/genres';
-import { useAlbumArtistList } from '/@/renderer/features/artists/queries/album-artist-list-query';
+import { ChangeEvent, useMemo, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+
 import {
     AlbumArtistListSort,
     AlbumListQuery,
@@ -12,9 +10,12 @@ import {
     LibraryItem,
     SortOrder,
 } from '/@/renderer/api/types';
-import { useTranslation } from 'react-i18next';
-import { useTagList } from '/@/renderer/features/tag/queries/use-tag-list';
+import { NumberInput, SpinnerIcon, Switch, Text } from '/@/renderer/components';
 import { SelectWithInvalidData } from '/@/renderer/components/select-with-invalid-data';
+import { useAlbumArtistList } from '/@/renderer/features/artists/queries/album-artist-list-query';
+import { useGenreList } from '/@/renderer/features/genres';
+import { useTagList } from '/@/renderer/features/tag/queries/use-tag-list';
+import { AlbumListFilter, useListStoreActions, useListStoreByKey } from '/@/renderer/store';
 
 interface NavidromeAlbumFiltersProps {
     customFilters?: Partial<AlbumListFilter>;
@@ -26,8 +27,8 @@ interface NavidromeAlbumFiltersProps {
 
 export const NavidromeAlbumFilters = ({
     customFilters,
-    onFilterChange,
     disableArtistFilter,
+    onFilterChange,
     pageKey,
     serverId,
 }: NavidromeAlbumFiltersProps) => {
@@ -52,7 +53,7 @@ export const NavidromeAlbumFilters = ({
         }));
     }, [genreListQuery.data]);
 
-    const handleGenresFilter = debounce((e: string | null) => {
+    const handleGenresFilter = debounce((e: null | string) => {
         const updatedFilters = setFilter({
             customFilters,
             data: {
@@ -192,7 +193,7 @@ export const NavidromeAlbumFilters = ({
         }));
     }, [albumArtistListQuery?.data?.items]);
 
-    const handleAlbumArtistFilter = (e: string | null) => {
+    const handleAlbumArtistFilter = (e: null | string) => {
         const updatedFilters = setFilter({
             data: {
                 _custom: {
@@ -209,7 +210,7 @@ export const NavidromeAlbumFilters = ({
         onFilterChange(updatedFilters);
     };
 
-    const handleTagFilter = debounce((tag: string, e: string | null) => {
+    const handleTagFilter = debounce((tag: string, e: null | string) => {
         const updatedFilters = setFilter({
             customFilters,
             data: {
@@ -254,44 +255,44 @@ export const NavidromeAlbumFilters = ({
                 />
                 <SelectWithInvalidData
                     clearable
-                    searchable
                     data={genreList}
                     defaultValue={filter._custom?.navidrome?.genre_id}
                     label={t('entity.genre', { count: 1, postProcess: 'titleCase' })}
                     onChange={handleGenresFilter}
+                    searchable
                 />
             </Group>
             <Group grow>
                 <SelectWithInvalidData
                     clearable
-                    searchable
                     data={selectableAlbumArtists}
                     defaultValue={filter._custom?.navidrome?.artist_id}
                     disabled={disableArtistFilter}
                     label={t('entity.artist', { count: 1, postProcess: 'titleCase' })}
                     limit={300}
-                    rightSection={albumArtistListQuery.isFetching ? <SpinnerIcon /> : undefined}
-                    searchValue={albumArtistSearchTerm}
                     onChange={handleAlbumArtistFilter}
                     onSearchChange={setAlbumArtistSearchTerm}
+                    rightSection={albumArtistListQuery.isFetching ? <SpinnerIcon /> : undefined}
+                    searchable
+                    searchValue={albumArtistSearchTerm}
                 />
             </Group>
             {tagsQuery.data?.enumTags?.length &&
                 tagsQuery.data.enumTags.map((tag) => (
                     <Group
-                        key={tag.name}
                         grow
+                        key={tag.name}
                     >
                         <SelectWithInvalidData
                             clearable
-                            searchable
                             data={tag.options}
                             defaultValue={
                                 filter._custom?.navidrome?.[tag.name] as string | undefined
                             }
                             label={tag.name}
-                            width={150}
                             onChange={(value) => handleTagFilter(tag.name, value)}
+                            searchable
+                            width={150}
                         />
                     </Group>
                 ))}
diff --git a/src/renderer/features/albums/components/subsonic-album-filters.tsx b/src/renderer/features/albums/components/subsonic-album-filters.tsx
index bd1eb57d..74f35f77 100644
--- a/src/renderer/features/albums/components/subsonic-album-filters.tsx
+++ b/src/renderer/features/albums/components/subsonic-album-filters.tsx
@@ -2,6 +2,7 @@ import { Divider, Group, Stack } from '@mantine/core';
 import debounce from 'lodash/debounce';
 import { ChangeEvent, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
+
 import { AlbumListQuery, GenreListSort, LibraryItem, SortOrder } from '/@/renderer/api/types';
 import { NumberInput, Select, Switch, Text } from '/@/renderer/components';
 import { useGenreList } from '/@/renderer/features/genres';
@@ -39,7 +40,7 @@ export const SubsonicAlbumFilters = ({
         }));
     }, [genreListQuery.data]);
 
-    const handleGenresFilter = debounce((e: string | null) => {
+    const handleGenresFilter = debounce((e: null | string) => {
         const updatedFilters = setFilter({
             data: {
                 genres: e ? [e] : undefined,
@@ -68,7 +69,7 @@ export const SubsonicAlbumFilters = ({
         },
     ];
 
-    const handleYearFilter = debounce((e: number | string, type: 'min' | 'max') => {
+    const handleYearFilter = debounce((e: number | string, type: 'max' | 'min') => {
         let data: Partial<AlbumListQuery> = {};
 
         if (type === 'min') {
@@ -128,12 +129,12 @@ export const SubsonicAlbumFilters = ({
             <Group grow>
                 <Select
                     clearable
-                    searchable
                     data={genreList}
                     defaultValue={filter.genres?.length ? filter.genres[0] : undefined}
                     disabled={Boolean(filter.minYear || filter.maxYear)}
                     label={t('entity.genre', { count: 1, postProcess: 'titleCase' })}
                     onChange={handleGenresFilter}
+                    searchable
                 />
             </Group>
         </Stack>
diff --git a/src/renderer/features/albums/context/album-list-context.tsx b/src/renderer/features/albums/context/album-list-context.tsx
index 8a232c31..bd7a6bbb 100644
--- a/src/renderer/features/albums/context/album-list-context.tsx
+++ b/src/renderer/features/albums/context/album-list-context.tsx
@@ -1,4 +1,5 @@
 import { createContext, useContext } from 'react';
+
 import { ListKey } from '/@/renderer/store';
 
 export const AlbumListContext = createContext<{ id?: string; pageKey: ListKey }>({
diff --git a/src/renderer/features/albums/queries/album-detail-query.ts b/src/renderer/features/albums/queries/album-detail-query.ts
index 96d7726f..648dd65b 100644
--- a/src/renderer/features/albums/queries/album-detail-query.ts
+++ b/src/renderer/features/albums/queries/album-detail-query.ts
@@ -1,9 +1,12 @@
-import { useQuery } from '@tanstack/react-query';
-import { queryKeys } from '/@/renderer/api/query-keys';
-import type { QueryHookArgs } from '/@/renderer/lib/react-query';
-import { getServerById } from '../../../store/auth.store';
 import type { AlbumDetailQuery } from '/@/renderer/api/types';
+import type { QueryHookArgs } from '/@/renderer/lib/react-query';
+
+import { useQuery } from '@tanstack/react-query';
+
+import { getServerById } from '../../../store/auth.store';
+
 import { controller } from '/@/renderer/api/controller';
+import { queryKeys } from '/@/renderer/api/query-keys';
 
 export const useAlbumDetail = (args: QueryHookArgs<AlbumDetailQuery>) => {
     const { options, query, serverId } = args;
diff --git a/src/renderer/features/albums/queries/album-list-count-query.ts b/src/renderer/features/albums/queries/album-list-count-query.ts
index e4c13042..2282cb6a 100644
--- a/src/renderer/features/albums/queries/album-list-count-query.ts
+++ b/src/renderer/features/albums/queries/album-list-count-query.ts
@@ -1,8 +1,10 @@
-import { useQuery } from '@tanstack/react-query';
-import { api } from '/@/renderer/api';
-import { queryKeys } from '/@/renderer/api/query-keys';
 import type { AlbumListQuery } from '/@/renderer/api/types';
 import type { QueryHookArgs } from '/@/renderer/lib/react-query';
+
+import { useQuery } from '@tanstack/react-query';
+
+import { api } from '/@/renderer/api';
+import { queryKeys } from '/@/renderer/api/query-keys';
 import { getServerById } from '/@/renderer/store';
 
 export const useAlbumListCount = (args: QueryHookArgs<AlbumListQuery>) => {
diff --git a/src/renderer/features/albums/queries/album-list-query.ts b/src/renderer/features/albums/queries/album-list-query.ts
index 8c65b744..7e9c6e63 100644
--- a/src/renderer/features/albums/queries/album-list-query.ts
+++ b/src/renderer/features/albums/queries/album-list-query.ts
@@ -1,9 +1,11 @@
+import type { AlbumListQuery, AlbumListResponse } from '/@/renderer/api/types';
+import type { QueryHookArgs } from '/@/renderer/lib/react-query';
+
 import { useInfiniteQuery, useQuery } from '@tanstack/react-query';
+
 import { api } from '/@/renderer/api';
 import { controller } from '/@/renderer/api/controller';
 import { queryKeys } from '/@/renderer/api/query-keys';
-import type { AlbumListQuery, AlbumListResponse } from '/@/renderer/api/types';
-import type { QueryHookArgs } from '/@/renderer/lib/react-query';
 import { getServerById } from '/@/renderer/store';
 
 export const useAlbumList = (args: QueryHookArgs<AlbumListQuery>) => {
diff --git a/src/renderer/features/albums/routes/album-detail-route.tsx b/src/renderer/features/albums/routes/album-detail-route.tsx
index 8dab5922..660675ac 100644
--- a/src/renderer/features/albums/routes/album-detail-route.tsx
+++ b/src/renderer/features/albums/routes/album-detail-route.tsx
@@ -1,16 +1,18 @@
-import { NativeScrollArea, Spinner } from '/@/renderer/components';
-import { AnimatedPage, LibraryHeaderBar } from '/@/renderer/features/shared';
-import { useRef } from 'react';
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
-import { useAlbumDetail } from '/@/renderer/features/albums/queries/album-detail-query';
+
+import { useRef } from 'react';
 import { useParams } from 'react-router';
-import { useFastAverageColor } from '/@/renderer/hooks';
+
+import { LibraryItem } from '/@/renderer/api/types';
+import { NativeScrollArea, Spinner } from '/@/renderer/components';
 import { AlbumDetailContent } from '/@/renderer/features/albums/components/album-detail-content';
 import { AlbumDetailHeader } from '/@/renderer/features/albums/components/album-detail-header';
+import { useAlbumDetail } from '/@/renderer/features/albums/queries/album-detail-query';
 import { usePlayQueueAdd } from '/@/renderer/features/player';
-import { usePlayButtonBehavior } from '/@/renderer/store/settings.store';
-import { LibraryItem } from '/@/renderer/api/types';
+import { AnimatedPage, LibraryHeaderBar } from '/@/renderer/features/shared';
+import { useFastAverageColor } from '/@/renderer/hooks';
 import { useCurrentServer, useGeneralSettings } from '/@/renderer/store';
+import { usePlayButtonBehavior } from '/@/renderer/store/settings.store';
 
 const AlbumDetailRoute = () => {
     const tableRef = useRef<AgGridReactType | null>(null);
@@ -49,7 +51,6 @@ const AlbumDetailRoute = () => {
     return (
         <AnimatedPage key={`album-detail-${albumId}`}>
             <NativeScrollArea
-                ref={scrollAreaRef}
                 pageHeaderProps={{
                     backgroundColor: backgroundColor || undefined,
                     children: (
@@ -63,13 +64,14 @@ const AlbumDetailRoute = () => {
                     offset: 200,
                     target: headerRef,
                 }}
+                ref={scrollAreaRef}
             >
                 <AlbumDetailHeader
-                    ref={headerRef}
                     background={{
                         background,
                         blur: (albumBackground && albumBackgroundBlur) || 0,
                     }}
+                    ref={headerRef}
                 />
                 <AlbumDetailContent
                     background={background}
diff --git a/src/renderer/features/albums/routes/album-list-route.tsx b/src/renderer/features/albums/routes/album-list-route.tsx
index 160788a1..d308b79d 100644
--- a/src/renderer/features/albums/routes/album-list-route.tsx
+++ b/src/renderer/features/albums/routes/album-list-route.tsx
@@ -1,8 +1,10 @@
-import { useCallback, useMemo, useRef } from 'react';
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
+
 import isEmpty from 'lodash/isEmpty';
+import { useCallback, useMemo, useRef } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useParams, useSearchParams } from 'react-router-dom';
+
 import { api } from '/@/renderer/api';
 import { queryKeys } from '/@/renderer/api/query-keys';
 import { AlbumListQuery, GenreListSort, LibraryItem, SortOrder } from '/@/renderer/api/types';
@@ -21,7 +23,7 @@ import { useAlbumListCount } from '/@/renderer/features/albums/queries/album-lis
 
 const AlbumListRoute = () => {
     const { t } = useTranslation();
-    const gridRef = useRef<VirtualInfiniteGridRef | null>(null);
+    const gridRef = useRef<null | VirtualInfiniteGridRef>(null);
     const tableRef = useRef<AgGridReactType | null>(null);
     const server = useCurrentServer();
     const [searchParams] = useSearchParams();
diff --git a/src/renderer/features/albums/routes/dummy-album-detail-route.tsx b/src/renderer/features/albums/routes/dummy-album-detail-route.tsx
index e199a22c..998485fc 100644
--- a/src/renderer/features/albums/routes/dummy-album-detail-route.tsx
+++ b/src/renderer/features/albums/routes/dummy-album-detail-route.tsx
@@ -1,4 +1,19 @@
+import { Box, Center, Group, Stack } from '@mantine/core';
+import { useQuery } from '@tanstack/react-query';
+import { Fragment } from 'react';
+import { useTranslation } from 'react-i18next';
+import { RiErrorWarningLine, RiHeartFill, RiHeartLine, RiMoreFill } from 'react-icons/ri';
+import { generatePath, useParams } from 'react-router';
+import { Link } from 'react-router-dom';
+import { styled } from 'styled-components';
+
+import { api } from '/@/renderer/api';
+import { queryKeys } from '/@/renderer/api/query-keys';
+import { LibraryItem, SongDetailResponse } from '/@/renderer/api/types';
 import { Button, Spinner, Spoiler, Text } from '/@/renderer/components';
+import { useHandleGeneralContextMenu } from '/@/renderer/features/context-menu';
+import { SONG_ALBUM_PAGE } from '/@/renderer/features/context-menu/context-menu-items';
+import { usePlayQueueAdd } from '/@/renderer/features/player';
 import {
     AnimatedPage,
     LibraryHeader,
@@ -6,27 +21,13 @@ import {
     useCreateFavorite,
     useDeleteFavorite,
 } from '/@/renderer/features/shared';
-import { Fragment } from 'react';
-import { generatePath, useParams } from 'react-router';
 import { useContainerQuery, useFastAverageColor } from '/@/renderer/hooks';
-import { usePlayQueueAdd } from '/@/renderer/features/player';
-import { usePlayButtonBehavior } from '/@/renderer/store/settings.store';
-import { LibraryItem, SongDetailResponse } from '/@/renderer/api/types';
-import { useCurrentServer } from '/@/renderer/store';
-import { Stack, Group, Box, Center } from '@mantine/core';
-import { Link } from 'react-router-dom';
-import { AppRoute } from '/@/renderer/router/routes';
-import { formatDurationString } from '/@/renderer/utils';
-import { RiErrorWarningLine, RiHeartFill, RiHeartLine, RiMoreFill } from 'react-icons/ri';
-import { replaceURLWithHTMLLinks } from '/@/renderer/utils/linkify';
-import { SONG_ALBUM_PAGE } from '/@/renderer/features/context-menu/context-menu-items';
-import { useHandleGeneralContextMenu } from '/@/renderer/features/context-menu';
-import { styled } from 'styled-components';
 import { queryClient } from '/@/renderer/lib/react-query';
-import { useQuery } from '@tanstack/react-query';
-import { api } from '/@/renderer/api';
-import { queryKeys } from '/@/renderer/api/query-keys';
-import { useTranslation } from 'react-i18next';
+import { AppRoute } from '/@/renderer/router/routes';
+import { useCurrentServer } from '/@/renderer/store';
+import { usePlayButtonBehavior } from '/@/renderer/store/settings.store';
+import { formatDurationString } from '/@/renderer/utils';
+import { replaceURLWithHTMLLinks } from '/@/renderer/utils/linkify';
 
 const DetailContainer = styled.div`
     display: flex;
@@ -152,17 +153,17 @@ const DummyAlbumDetailRoute = () => {
                             mah="4rem"
                             spacing="md"
                             sx={{
+                                overflow: 'hidden',
                                 WebkitBoxOrient: 'vertical',
                                 WebkitLineClamp: 2,
-                                overflow: 'hidden',
                             }}
                         >
                             {detailQuery?.data?.albumArtists.map((artist) => (
                                 <Text
-                                    key={`artist-${artist.id}`}
                                     $link
                                     component={Link}
                                     fw={600}
+                                    key={`artist-${artist.id}`}
                                     size="md"
                                     to={generatePath(AppRoute.LIBRARY_ALBUM_ARTISTS_DETAIL, {
                                         albumArtistId: artist.id,
@@ -190,8 +191,8 @@ const DummyAlbumDetailRoute = () => {
                                     createFavoriteMutation.isLoading ||
                                     deleteFavoriteMutation.isLoading
                                 }
-                                variant="subtle"
                                 onClick={handleFavorite}
+                                variant="subtle"
                             >
                                 {detailQuery?.data?.userFavorite ? (
                                     <RiHeartFill
@@ -204,11 +205,11 @@ const DummyAlbumDetailRoute = () => {
                             </Button>
                             <Button
                                 compact
-                                variant="subtle"
                                 onClick={(e) => {
                                     if (!detailQuery?.data) return;
                                     handleGeneralContextMenu(e, [detailQuery.data!]);
                                 }}
+                                variant="subtle"
                             >
                                 <RiMoreFill size={20} />
                             </Button>
@@ -220,9 +221,9 @@ const DummyAlbumDetailRoute = () => {
                         <Group spacing="sm">
                             {detailQuery?.data?.genres?.map((genre) => (
                                 <Button
-                                    key={`genre-${genre.id}`}
                                     compact
                                     component={Link}
+                                    key={`genre-${genre.id}`}
                                     radius={0}
                                     size="md"
                                     to={generatePath(AppRoute.LIBRARY_GENRES_SONGS, {
diff --git a/src/renderer/features/artists/components/album-artist-detail-content.tsx b/src/renderer/features/artists/components/album-artist-detail-content.tsx
index e1de5674..9ddd4c33 100644
--- a/src/renderer/features/artists/components/album-artist-detail-content.tsx
+++ b/src/renderer/features/artists/components/album-artist-detail-content.tsx
@@ -1,6 +1,6 @@
-import { useMemo } from 'react';
 import { ColDef, RowDoubleClickedEvent } from '@ag-grid-community/core';
 import { Box, Grid, Group, Stack } from '@mantine/core';
+import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { FaLastfmSquare } from 'react-icons/fa';
 import { RiHeartFill, RiHeartLine, RiMoreFill } from 'react-icons/ri';
@@ -8,6 +8,7 @@ import { SiMusicbrainz } from 'react-icons/si';
 import { generatePath, useParams } from 'react-router';
 import { createSearchParams, Link } from 'react-router-dom';
 import styled from 'styled-components';
+
 import {
     Album,
     AlbumArtist,
@@ -35,12 +36,12 @@ import { usePlayQueueAdd } from '/@/renderer/features/player';
 import { PlayButton, useCreateFavorite, useDeleteFavorite } from '/@/renderer/features/shared';
 import { LibraryBackgroundOverlay } from '/@/renderer/features/shared/components/library-background-overlay';
 import { useContainerQuery } from '/@/renderer/hooks';
+import { useGenreRoute } from '/@/renderer/hooks/use-genre-route';
 import { AppRoute } from '/@/renderer/router/routes';
 import { ArtistItem, useCurrentServer } from '/@/renderer/store';
 import { useGeneralSettings, usePlayButtonBehavior } from '/@/renderer/store/settings.store';
 import { CardRow, Play, TableColumn } from '/@/renderer/types';
 import { sanitize } from '/@/renderer/utils/sanitize';
-import { useGenreRoute } from '/@/renderer/hooks/use-genre-route';
 
 const ContentContainer = styled.div`
     position: relative;
@@ -224,9 +225,9 @@ export const AlbumArtistDetailContent = ({ background }: AlbumArtistDetailConten
                         </TextTitle>
                         <Button
                             compact
-                            uppercase
                             component={Link}
                             to={artistDiscographyLink}
+                            uppercase
                             variant="subtle"
                         >
                             {t('page.albumArtistDetail.viewDiscography')}
@@ -385,8 +386,8 @@ export const AlbumArtistDetailContent = ({ background }: AlbumArtistDetailConten
                             loading={
                                 createFavoriteMutation.isLoading || deleteFavoriteMutation.isLoading
                             }
-                            variant="subtle"
                             onClick={handleFavorite}
+                            variant="subtle"
                         >
                             {detailQuery?.data?.userFavorite ? (
                                 <RiHeartFill
@@ -399,11 +400,11 @@ export const AlbumArtistDetailContent = ({ background }: AlbumArtistDetailConten
                         </Button>
                         <Button
                             compact
-                            variant="subtle"
                             onClick={(e) => {
                                 if (!detailQuery?.data) return;
                                 handleGeneralContextMenu(e, [detailQuery.data!]);
                             }}
+                            variant="subtle"
                         >
                             <RiMoreFill size={20} />
                         </Button>
@@ -412,18 +413,18 @@ export const AlbumArtistDetailContent = ({ background }: AlbumArtistDetailConten
                 <Group spacing="md">
                     <Button
                         compact
-                        uppercase
                         component={Link}
                         to={artistDiscographyLink}
+                        uppercase
                         variant="subtle"
                     >
                         {t('page.albumArtistDetail.viewDiscography')}
                     </Button>
                     <Button
                         compact
-                        uppercase
                         component={Link}
                         to={artistSongsLink}
+                        uppercase
                         variant="subtle"
                     >
                         {t('page.albumArtistDetail.viewAllTracks')}
@@ -434,9 +435,9 @@ export const AlbumArtistDetailContent = ({ background }: AlbumArtistDetailConten
                         <Group spacing="sm">
                             {detailQuery?.data?.genres?.map((genre) => (
                                 <Button
-                                    key={`genre-${genre.id}`}
                                     compact
                                     component={Link}
+                                    key={`genre-${genre.id}`}
                                     radius="md"
                                     size="md"
                                     to={generatePath(genrePath, {
@@ -523,8 +524,8 @@ export const AlbumArtistDetailContent = ({ background }: AlbumArtistDetailConten
                                     position="apart"
                                 >
                                     <Group
-                                        noWrap
                                         align="flex-end"
+                                        noWrap
                                     >
                                         <TextTitle
                                             order={2}
@@ -536,7 +537,6 @@ export const AlbumArtistDetailContent = ({ background }: AlbumArtistDetailConten
                                         </TextTitle>
                                         <Button
                                             compact
-                                            uppercase
                                             component={Link}
                                             to={generatePath(
                                                 AppRoute.LIBRARY_ALBUM_ARTISTS_DETAIL_TOP_SONGS,
@@ -544,6 +544,7 @@ export const AlbumArtistDetailContent = ({ background }: AlbumArtistDetailConten
                                                     albumArtistId: routeId,
                                                 },
                                             )}
+                                            uppercase
                                             variant="subtle"
                                         >
                                             {t('page.albumArtistDetail.viewAll', {
@@ -555,24 +556,24 @@ export const AlbumArtistDetailContent = ({ background }: AlbumArtistDetailConten
                                 <VirtualTable
                                     autoFitColumns
                                     autoHeight
+                                    columnDefs={topSongsColumnDefs}
+                                    context={{
+                                        itemType: LibraryItem.SONG,
+                                    }}
                                     deselectOnClickOutside
+                                    enableCellChangeFlash={false}
+                                    getRowId={(data) => data.data.uniqueId}
+                                    onCellContextMenu={handleContextMenu}
+                                    onRowDoubleClicked={handleRowDoubleClick}
+                                    rowData={topSongs}
+                                    rowHeight={60}
+                                    rowSelection="multiple"
                                     shouldUpdateSong
                                     stickyHeader
                                     suppressCellFocus
                                     suppressHorizontalScroll
                                     suppressLoadingOverlay
                                     suppressRowDrag
-                                    columnDefs={topSongsColumnDefs}
-                                    context={{
-                                        itemType: LibraryItem.SONG,
-                                    }}
-                                    enableCellChangeFlash={false}
-                                    getRowId={(data) => data.data.uniqueId}
-                                    rowData={topSongs}
-                                    rowHeight={60}
-                                    rowSelection="multiple"
-                                    onCellContextMenu={handleContextMenu}
-                                    onRowDoubleClicked={handleRowDoubleClick}
                                 />
                             </Box>
                         </Grid.Col>
diff --git a/src/renderer/features/artists/components/album-artist-detail-header.tsx b/src/renderer/features/artists/components/album-artist-detail-header.tsx
index b273e9c5..67693538 100644
--- a/src/renderer/features/artists/components/album-artist-detail-header.tsx
+++ b/src/renderer/features/artists/components/album-artist-detail-header.tsx
@@ -1,14 +1,16 @@
-import { forwardRef, Fragment, Ref } from 'react';
 import { Group, Rating, Stack } from '@mantine/core';
+import { forwardRef, Fragment, Ref } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useParams } from 'react-router';
+
+import { useCurrentServer } from '../../../store/auth.store';
+
 import { LibraryItem, ServerType } from '/@/renderer/api/types';
 import { Text } from '/@/renderer/components';
 import { useAlbumArtistDetail } from '/@/renderer/features/artists/queries/album-artist-detail-query';
 import { LibraryHeader, useSetRating } from '/@/renderer/features/shared';
 import { AppRoute } from '/@/renderer/router/routes';
 import { formatDurationString } from '/@/renderer/utils';
-import { useCurrentServer } from '../../../store/auth.store';
 
 interface AlbumArtistDetailHeaderProps {
     background: string;
@@ -72,10 +74,10 @@ export const AlbumArtistDetailHeader = forwardRef(
 
         return (
             <LibraryHeader
-                ref={ref}
                 background={background}
                 imageUrl={detailQuery?.data?.imageUrl}
                 item={{ route: AppRoute.LIBRARY_ALBUM_ARTISTS, type: LibraryItem.ALBUM_ARTIST }}
+                ref={ref}
                 title={detailQuery?.data?.name || ''}
             >
                 <Stack>
@@ -92,11 +94,11 @@ export const AlbumArtistDetailHeader = forwardRef(
                             <>
                                 <Text $noSelect>•</Text>
                                 <Rating
+                                    onChange={handleUpdateRating}
                                     readOnly={
                                         detailQuery?.isFetching || updateRatingMutation.isLoading
                                     }
                                     value={detailQuery?.data?.userRating || 0}
-                                    onChange={handleUpdateRating}
                                 />
                             </>
                         )}
diff --git a/src/renderer/features/artists/components/album-artist-detail-top-songs-list-content.tsx b/src/renderer/features/artists/components/album-artist-detail-top-songs-list-content.tsx
index 77f456ed..d3f76c76 100644
--- a/src/renderer/features/artists/components/album-artist-detail-top-songs-list-content.tsx
+++ b/src/renderer/features/artists/components/album-artist-detail-top-songs-list-content.tsx
@@ -1,7 +1,10 @@
 import type { RowDoubleClickedEvent } from '@ag-grid-community/core';
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
+
 import { MutableRefObject } from 'react';
+
 import { useListContext } from '../../../context/list-context';
+
 import { LibraryItem, QueueSong, SongListQuery } from '/@/renderer/api/types';
 import { VirtualGridAutoSizerContainer } from '/@/renderer/components/virtual-grid';
 import { VirtualTable } from '/@/renderer/components/virtual-table';
@@ -18,8 +21,8 @@ interface AlbumArtistSongListContentProps {
 }
 
 export const AlbumArtistDetailTopSongsListContent = ({
-    tableRef,
     data,
+    tableRef,
 }: AlbumArtistSongListContentProps) => {
     const server = useCurrentServer();
     const { id, pageKey } = useListContext();
@@ -67,11 +70,11 @@ export const AlbumArtistDetailTopSongsListContent = ({
                     shouldUpdateSong
                     {...tableProps}
                     getRowId={(data) => data.data.uniqueId}
+                    onRowDoubleClicked={handleRowDoubleClick}
                     rowClassRules={rowClassRules}
                     rowData={data}
                     rowModelType="clientSide"
                     rowSelection="multiple"
-                    onRowDoubleClicked={handleRowDoubleClick}
                 />
             </VirtualGridAutoSizerContainer>
         </>
diff --git a/src/renderer/features/artists/components/album-artist-detail-top-songs-list-header.tsx b/src/renderer/features/artists/components/album-artist-detail-top-songs-list-header.tsx
index bec3e7dc..55f44b3e 100644
--- a/src/renderer/features/artists/components/album-artist-detail-top-songs-list-header.tsx
+++ b/src/renderer/features/artists/components/album-artist-detail-top-songs-list-header.tsx
@@ -1,7 +1,8 @@
 import { useTranslation } from 'react-i18next';
 import { RiAddBoxFill, RiAddCircleFill, RiMoreFill, RiPlayFill } from 'react-icons/ri';
+
 import { QueueSong } from '/@/renderer/api/types';
-import { Button, DropdownMenu, PageHeader, SpinnerIcon, Paper } from '/@/renderer/components';
+import { Button, DropdownMenu, PageHeader, Paper, SpinnerIcon } from '/@/renderer/components';
 import { usePlayQueueAdd } from '/@/renderer/features/player';
 import { LibraryHeaderBar } from '/@/renderer/features/shared';
 import { usePlayButtonBehavior } from '/@/renderer/store/settings.store';
@@ -14,9 +15,9 @@ interface AlbumArtistDetailTopSongsListHeaderProps {
 }
 
 export const AlbumArtistDetailTopSongsListHeader = ({
-    title,
-    itemCount,
     data,
+    itemCount,
+    title,
 }: AlbumArtistDetailTopSongsListHeaderProps) => {
     const { t } = useTranslation();
     const handlePlayQueueAdd = usePlayQueueAdd();
diff --git a/src/renderer/features/artists/components/album-artist-list-content.tsx b/src/renderer/features/artists/components/album-artist-list-content.tsx
index 98168639..b4eaba50 100644
--- a/src/renderer/features/artists/components/album-artist-list-content.tsx
+++ b/src/renderer/features/artists/components/album-artist-list-content.tsx
@@ -1,10 +1,13 @@
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
+
 import { lazy, MutableRefObject, Suspense } from 'react';
+
+import { useListStoreByKey } from '../../../store/list.store';
+
 import { Spinner } from '/@/renderer/components';
 import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid';
-import { ListDisplayType } from '/@/renderer/types';
-import { useListStoreByKey } from '../../../store/list.store';
 import { useListContext } from '/@/renderer/context/list-context';
+import { ListDisplayType } from '/@/renderer/types';
 
 const AlbumArtistListGridView = lazy(() =>
     import('/@/renderer/features/artists/components/album-artist-list-grid-view').then(
@@ -23,14 +26,14 @@ const AlbumArtistListTableView = lazy(() =>
 );
 
 interface AlbumArtistListContentProps {
-    gridRef: MutableRefObject<VirtualInfiniteGridRef | null>;
+    gridRef: MutableRefObject<null | VirtualInfiniteGridRef>;
     itemCount?: number;
     tableRef: MutableRefObject<AgGridReactType | null>;
 }
 
 export const AlbumArtistListContent = ({
-    itemCount,
     gridRef,
+    itemCount,
     tableRef,
 }: AlbumArtistListContentProps) => {
     const { pageKey } = useListContext();
diff --git a/src/renderer/features/artists/components/album-artist-list-grid-view.tsx b/src/renderer/features/artists/components/album-artist-list-grid-view.tsx
index 890df18b..905f86a7 100644
--- a/src/renderer/features/artists/components/album-artist-list-grid-view.tsx
+++ b/src/renderer/features/artists/components/album-artist-list-grid-view.tsx
@@ -2,8 +2,10 @@ import { QueryKey, useQueryClient } from '@tanstack/react-query';
 import { MutableRefObject, useCallback, useMemo } from 'react';
 import AutoSizer, { Size } from 'react-virtualized-auto-sizer';
 import { ListOnScrollProps } from 'react-window';
+
 import { VirtualGridAutoSizerContainer } from '../../../components/virtual-grid/virtual-grid-wrapper';
 import { useListStoreByKey } from '../../../store/list.store';
+
 import { api } from '/@/renderer/api';
 import { queryKeys } from '/@/renderer/api/query-keys';
 import {
@@ -17,28 +19,28 @@ import { ALBUMARTIST_CARD_ROWS } from '/@/renderer/components';
 import { VirtualInfiniteGrid, VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid';
 import { useListContext } from '/@/renderer/context/list-context';
 import { usePlayQueueAdd } from '/@/renderer/features/player';
+import { useHandleFavorite } from '/@/renderer/features/shared/hooks/use-handle-favorite';
 import { AppRoute } from '/@/renderer/router/routes';
 import { useCurrentServer, useListStoreActions } from '/@/renderer/store';
 import { CardRow, ListDisplayType } from '/@/renderer/types';
-import { useHandleFavorite } from '/@/renderer/features/shared/hooks/use-handle-favorite';
 
 interface AlbumArtistListGridViewProps {
-    gridRef: MutableRefObject<VirtualInfiniteGridRef | null>;
+    gridRef: MutableRefObject<null | VirtualInfiniteGridRef>;
     itemCount?: number;
 }
 
-export const AlbumArtistListGridView = ({ itemCount, gridRef }: AlbumArtistListGridViewProps) => {
+export const AlbumArtistListGridView = ({ gridRef, itemCount }: AlbumArtistListGridViewProps) => {
     const queryClient = useQueryClient();
     const server = useCurrentServer();
     const handlePlayQueueAdd = usePlayQueueAdd();
 
     const { pageKey } = useListContext();
-    const { grid, display, filter } = useListStoreByKey<AlbumArtistListQuery>({ key: pageKey });
+    const { display, filter, grid } = useListStoreByKey<AlbumArtistListQuery>({ key: pageKey });
     const { setGrid } = useListStoreActions();
     const handleFavorite = useHandleFavorite({ gridRef, server });
 
     const fetchInitialData = useCallback(() => {
-        const query: Omit<AlbumArtistListQuery, 'startIndex' | 'limit'> = {
+        const query: Omit<AlbumArtistListQuery, 'limit' | 'startIndex'> = {
             ...filter,
         };
 
@@ -109,6 +111,9 @@ export const AlbumArtistListGridView = ({ itemCount, gridRef }: AlbumArtistListG
         const rows: CardRow<AlbumArtist>[] = [ALBUMARTIST_CARD_ROWS.name];
 
         switch (filter.sortBy) {
+            case AlbumArtistListSort.ALBUM_COUNT:
+                rows.push(ALBUMARTIST_CARD_ROWS.albumCount);
+                break;
             case AlbumArtistListSort.DURATION:
                 rows.push(ALBUMARTIST_CARD_ROWS.duration);
                 break;
@@ -116,9 +121,6 @@ export const AlbumArtistListGridView = ({ itemCount, gridRef }: AlbumArtistListG
                 break;
             case AlbumArtistListSort.NAME:
                 break;
-            case AlbumArtistListSort.ALBUM_COUNT:
-                rows.push(ALBUMARTIST_CARD_ROWS.albumCount);
-                break;
             case AlbumArtistListSort.PLAY_COUNT:
                 rows.push(ALBUMARTIST_CARD_ROWS.playCount);
                 break;
@@ -129,11 +131,11 @@ export const AlbumArtistListGridView = ({ itemCount, gridRef }: AlbumArtistListG
                 break;
             case AlbumArtistListSort.RECENTLY_ADDED:
                 break;
+            case AlbumArtistListSort.RELEASE_DATE:
+                break;
             case AlbumArtistListSort.SONG_COUNT:
                 rows.push(ALBUMARTIST_CARD_ROWS.songCount);
                 break;
-            case AlbumArtistListSort.RELEASE_DATE:
-                break;
         }
 
         return rows;
@@ -144,7 +146,6 @@ export const AlbumArtistListGridView = ({ itemCount, gridRef }: AlbumArtistListG
             <AutoSizer>
                 {({ height, width }: Size) => (
                     <VirtualInfiniteGrid
-                        ref={gridRef}
                         cardRows={cardRows}
                         display={display || ListDisplayType.CARD}
                         fetchFn={fetch}
@@ -159,12 +160,13 @@ export const AlbumArtistListGridView = ({ itemCount, gridRef }: AlbumArtistListG
                         itemType={LibraryItem.ALBUM_ARTIST}
                         loading={itemCount === undefined || itemCount === null}
                         minimumBatchSize={40}
+                        onScroll={handleGridScroll}
+                        ref={gridRef}
                         route={{
                             route: AppRoute.LIBRARY_ALBUM_ARTISTS_DETAIL,
                             slugs: [{ idProperty: 'id', slugProperty: 'albumArtistId' }],
                         }}
                         width={width}
-                        onScroll={handleGridScroll}
                     />
                 )}
             </AutoSizer>
diff --git a/src/renderer/features/artists/components/album-artist-list-header-filters.tsx b/src/renderer/features/artists/components/album-artist-list-header-filters.tsx
index 480649ac..7d3f63a2 100644
--- a/src/renderer/features/artists/components/album-artist-list-header-filters.tsx
+++ b/src/renderer/features/artists/components/album-artist-list-header-filters.tsx
@@ -1,12 +1,16 @@
-import { ChangeEvent, MouseEvent, MutableRefObject, useCallback } from 'react';
-import { IDatasource } from '@ag-grid-community/core';
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
+
+import { IDatasource } from '@ag-grid-community/core';
 import { Divider, Flex, Group, Stack } from '@mantine/core';
 import { useQueryClient } from '@tanstack/react-query';
 import debounce from 'lodash/debounce';
+import { ChangeEvent, MouseEvent, MutableRefObject, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import { RiFolder2Line, RiMoreFill, RiRefreshLine, RiSettings3Fill } from 'react-icons/ri';
+
 import { useListContext } from '../../../context/list-context';
+
+import i18n from '/@/i18n/i18n';
 import { api } from '/@/renderer/api';
 import { queryKeys } from '/@/renderer/api/query-keys';
 import {
@@ -28,7 +32,6 @@ import {
     useListStoreByKey,
 } from '/@/renderer/store';
 import { ListDisplayType, TableColumn } from '/@/renderer/types';
-import i18n from '/@/i18n/i18n';
 
 const FILTERS = {
     jellyfin: [
@@ -116,7 +119,7 @@ const FILTERS = {
 };
 
 interface AlbumArtistListHeaderFiltersProps {
-    gridRef: MutableRefObject<VirtualInfiniteGridRef | null>;
+    gridRef: MutableRefObject<null | VirtualInfiniteGridRef>;
     tableRef: MutableRefObject<AgGridReactType | null>;
 }
 
@@ -128,10 +131,10 @@ export const AlbumArtistListHeaderFilters = ({
     const queryClient = useQueryClient();
     const server = useCurrentServer();
     const { pageKey } = useListContext();
-    const { display, table, grid, filter } = useListStoreByKey<AlbumArtistListQuery>({
+    const { display, filter, grid, table } = useListStoreByKey<AlbumArtistListQuery>({
         key: pageKey,
     });
-    const { setFilter, setTable, setTablePagination, setDisplayType, setGrid } =
+    const { setDisplayType, setFilter, setGrid, setTable, setTablePagination } =
         useListStoreActions();
     const cq = useContainerQuery();
 
@@ -376,10 +379,10 @@ export const AlbumArtistListHeaderFilters = ({
                     <DropdownMenu.Dropdown>
                         {FILTERS[server?.type as keyof typeof FILTERS].map((f) => (
                             <DropdownMenu.Item
-                                key={`filter-${f.name}`}
                                 $isActive={f.value === filter.sortBy}
-                                value={f.value}
+                                key={`filter-${f.name}`}
                                 onClick={handleSetSortBy}
+                                value={f.value}
                             >
                                 {f.name}
                             </DropdownMenu.Item>
@@ -388,8 +391,8 @@ export const AlbumArtistListHeaderFilters = ({
                 </DropdownMenu>
                 <Divider orientation="vertical" />
                 <OrderToggleButton
-                    sortOrder={filter.sortOrder}
                     onToggle={handleToggleSortOrder}
+                    sortOrder={filter.sortOrder}
                 />
                 {server?.type === ServerType.JELLYFIN && (
                     <>
@@ -408,10 +411,10 @@ export const AlbumArtistListHeaderFilters = ({
                             <DropdownMenu.Dropdown>
                                 {musicFoldersQuery.data?.items.map((folder) => (
                                     <DropdownMenu.Item
-                                        key={`musicFolder-${folder.id}`}
                                         $isActive={filter.musicFolderId === folder.id}
-                                        value={folder.id}
+                                        key={`musicFolder-${folder.id}`}
                                         onClick={handleSetMusicFolder}
+                                        value={folder.id}
                                     >
                                         {folder.name}
                                     </DropdownMenu.Item>
@@ -423,10 +426,10 @@ export const AlbumArtistListHeaderFilters = ({
                 <Divider orientation="vertical" />
                 <Button
                     compact
+                    onClick={handleRefresh}
                     size="md"
                     tooltip={{ label: t('common.refresh', { postProcess: 'titleCase' }) }}
                     variant="subtle"
-                    onClick={handleRefresh}
                 >
                     <RiRefreshLine size="1.3rem" />
                 </Button>
@@ -473,8 +476,8 @@ export const AlbumArtistListHeaderFilters = ({
                         </DropdownMenu.Label>
                         <DropdownMenu.Item
                             $isActive={display === ListDisplayType.CARD}
-                            value={ListDisplayType.CARD}
                             onClick={handleSetViewType}
+                            value={ListDisplayType.CARD}
                         >
                             {t('table.config.view.card', {
                                 postProcess: 'sentenceCase',
@@ -482,8 +485,8 @@ export const AlbumArtistListHeaderFilters = ({
                         </DropdownMenu.Item>
                         <DropdownMenu.Item
                             $isActive={display === ListDisplayType.POSTER}
-                            value={ListDisplayType.POSTER}
                             onClick={handleSetViewType}
+                            value={ListDisplayType.POSTER}
                         >
                             {t('table.config.view.poster', {
                                 postProcess: 'sentenceCase',
@@ -491,8 +494,8 @@ export const AlbumArtistListHeaderFilters = ({
                         </DropdownMenu.Item>
                         <DropdownMenu.Item
                             $isActive={display === ListDisplayType.TABLE}
-                            value={ListDisplayType.TABLE}
                             onClick={handleSetViewType}
+                            value={ListDisplayType.TABLE}
                         >
                             {t('table.config.view.table', {
                                 postProcess: 'sentenceCase',
@@ -563,8 +566,8 @@ export const AlbumArtistListHeaderFilters = ({
                                             defaultValue={table?.columns.map(
                                                 (column) => column.column,
                                             )}
-                                            width={300}
                                             onChange={handleTableColumns}
+                                            width={300}
                                         />
                                         <Group position="apart">
                                             <Text>
diff --git a/src/renderer/features/artists/components/album-artist-list-header.tsx b/src/renderer/features/artists/components/album-artist-list-header.tsx
index 6ce0cfd4..5e5aa5f5 100644
--- a/src/renderer/features/artists/components/album-artist-list-header.tsx
+++ b/src/renderer/features/artists/components/album-artist-list-header.tsx
@@ -1,27 +1,30 @@
-import type { ChangeEvent, MutableRefObject } from 'react';
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
+import type { ChangeEvent, MutableRefObject } from 'react';
+
 import { Flex, Group, Stack } from '@mantine/core';
 import debounce from 'lodash/debounce';
 import { useTranslation } from 'react-i18next';
+
 import { FilterBar } from '../../shared/components/filter-bar';
+
 import { AlbumArtistListQuery, LibraryItem } from '/@/renderer/api/types';
 import { PageHeader, SearchInput } from '/@/renderer/components';
 import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid';
 import { AlbumArtistListHeaderFilters } from '/@/renderer/features/artists/components/album-artist-list-header-filters';
 import { LibraryHeaderBar } from '/@/renderer/features/shared';
 import { useContainerQuery } from '/@/renderer/hooks';
-import { AlbumArtistListFilter, useCurrentServer } from '/@/renderer/store';
 import { useDisplayRefresh } from '/@/renderer/hooks/use-display-refresh';
+import { AlbumArtistListFilter, useCurrentServer } from '/@/renderer/store';
 
 interface AlbumArtistListHeaderProps {
-    gridRef: MutableRefObject<VirtualInfiniteGridRef | null>;
+    gridRef: MutableRefObject<null | VirtualInfiniteGridRef>;
     itemCount?: number;
     tableRef: MutableRefObject<AgGridReactType | null>;
 }
 
 export const AlbumArtistListHeader = ({
-    itemCount,
     gridRef,
+    itemCount,
     tableRef,
 }: AlbumArtistListHeaderProps) => {
     const { t } = useTranslation();
@@ -64,8 +67,8 @@ export const AlbumArtistListHeader = ({
                     <Group>
                         <SearchInput
                             defaultValue={filter.searchTerm}
-                            openedWidth={cq.isMd ? 250 : cq.isSm ? 200 : 150}
                             onChange={handleSearch}
+                            openedWidth={cq.isMd ? 250 : cq.isSm ? 200 : 150}
                         />
                     </Group>
                 </Flex>
diff --git a/src/renderer/features/artists/components/album-artist-list-table-view.tsx b/src/renderer/features/artists/components/album-artist-list-table-view.tsx
index 6cf560df..1fd57275 100644
--- a/src/renderer/features/artists/components/album-artist-list-table-view.tsx
+++ b/src/renderer/features/artists/components/album-artist-list-table-view.tsx
@@ -1,7 +1,10 @@
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
+
 import { MutableRefObject } from 'react';
+
 import { useListContext } from '../../../context/list-context';
 import { ARTIST_CONTEXT_MENU_ITEMS } from '../../context-menu/context-menu-items';
+
 import { LibraryItem } from '/@/renderer/api/types';
 import { VirtualGridAutoSizerContainer } from '/@/renderer/components/virtual-grid';
 import { VirtualTable } from '/@/renderer/components/virtual-table';
diff --git a/src/renderer/features/artists/components/artist-list-content.tsx b/src/renderer/features/artists/components/artist-list-content.tsx
index 436184b4..f36af5f7 100644
--- a/src/renderer/features/artists/components/artist-list-content.tsx
+++ b/src/renderer/features/artists/components/artist-list-content.tsx
@@ -1,10 +1,13 @@
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
+
 import { lazy, MutableRefObject, Suspense } from 'react';
+
+import { useListStoreByKey } from '../../../store/list.store';
+
 import { Spinner } from '/@/renderer/components';
 import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid';
-import { ListDisplayType } from '/@/renderer/types';
-import { useListStoreByKey } from '../../../store/list.store';
 import { useListContext } from '/@/renderer/context/list-context';
+import { ListDisplayType } from '/@/renderer/types';
 
 const ArtistListGridView = lazy(() =>
     import('/@/renderer/features/artists/components/artist-list-grid-view').then((module) => ({
@@ -19,12 +22,12 @@ const ArtistListTableView = lazy(() =>
 );
 
 interface ArtistListContentProps {
-    gridRef: MutableRefObject<VirtualInfiniteGridRef | null>;
+    gridRef: MutableRefObject<null | VirtualInfiniteGridRef>;
     itemCount?: number;
     tableRef: MutableRefObject<AgGridReactType | null>;
 }
 
-export const ArtistListContent = ({ itemCount, gridRef, tableRef }: ArtistListContentProps) => {
+export const ArtistListContent = ({ gridRef, itemCount, tableRef }: ArtistListContentProps) => {
     const { pageKey } = useListContext();
     const { display } = useListStoreByKey({ key: pageKey });
     const isGrid = display === ListDisplayType.CARD || display === ListDisplayType.POSTER;
diff --git a/src/renderer/features/artists/components/artist-list-grid-view.tsx b/src/renderer/features/artists/components/artist-list-grid-view.tsx
index 9734da73..e72a63ca 100644
--- a/src/renderer/features/artists/components/artist-list-grid-view.tsx
+++ b/src/renderer/features/artists/components/artist-list-grid-view.tsx
@@ -2,8 +2,10 @@ import { QueryKey, useQueryClient } from '@tanstack/react-query';
 import { MutableRefObject, useCallback, useMemo } from 'react';
 import AutoSizer, { Size } from 'react-virtualized-auto-sizer';
 import { ListOnScrollProps } from 'react-window';
+
 import { VirtualGridAutoSizerContainer } from '../../../components/virtual-grid/virtual-grid-wrapper';
 import { useListStoreByKey } from '../../../store/list.store';
+
 import { api } from '/@/renderer/api';
 import { queryKeys } from '/@/renderer/api/query-keys';
 import {
@@ -17,28 +19,28 @@ import { ALBUMARTIST_CARD_ROWS } from '/@/renderer/components';
 import { VirtualInfiniteGrid, VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid';
 import { useListContext } from '/@/renderer/context/list-context';
 import { usePlayQueueAdd } from '/@/renderer/features/player';
+import { useHandleFavorite } from '/@/renderer/features/shared/hooks/use-handle-favorite';
 import { AppRoute } from '/@/renderer/router/routes';
 import { useCurrentServer, useListStoreActions } from '/@/renderer/store';
 import { CardRow, ListDisplayType } from '/@/renderer/types';
-import { useHandleFavorite } from '/@/renderer/features/shared/hooks/use-handle-favorite';
 
 interface ArtistListGridViewProps {
-    gridRef: MutableRefObject<VirtualInfiniteGridRef | null>;
+    gridRef: MutableRefObject<null | VirtualInfiniteGridRef>;
     itemCount?: number;
 }
 
-export const ArtistListGridView = ({ itemCount, gridRef }: ArtistListGridViewProps) => {
+export const ArtistListGridView = ({ gridRef, itemCount }: ArtistListGridViewProps) => {
     const queryClient = useQueryClient();
     const server = useCurrentServer();
     const handlePlayQueueAdd = usePlayQueueAdd();
 
     const { pageKey } = useListContext();
-    const { grid, display, filter } = useListStoreByKey<ArtistListQuery>({ key: pageKey });
+    const { display, filter, grid } = useListStoreByKey<ArtistListQuery>({ key: pageKey });
     const { setGrid } = useListStoreActions();
     const handleFavorite = useHandleFavorite({ gridRef, server });
 
     const fetchInitialData = useCallback(() => {
-        const query: Omit<ArtistListQuery, 'startIndex' | 'limit'> = {
+        const query: Omit<ArtistListQuery, 'limit' | 'startIndex'> = {
             ...filter,
         };
 
@@ -109,6 +111,9 @@ export const ArtistListGridView = ({ itemCount, gridRef }: ArtistListGridViewPro
         const rows: CardRow<AlbumArtist>[] = [ALBUMARTIST_CARD_ROWS.name];
 
         switch (filter.sortBy) {
+            case ArtistListSort.ALBUM_COUNT:
+                rows.push(ALBUMARTIST_CARD_ROWS.albumCount);
+                break;
             case ArtistListSort.DURATION:
                 rows.push(ALBUMARTIST_CARD_ROWS.duration);
                 break;
@@ -116,9 +121,6 @@ export const ArtistListGridView = ({ itemCount, gridRef }: ArtistListGridViewPro
                 break;
             case ArtistListSort.NAME:
                 break;
-            case ArtistListSort.ALBUM_COUNT:
-                rows.push(ALBUMARTIST_CARD_ROWS.albumCount);
-                break;
             case ArtistListSort.PLAY_COUNT:
                 rows.push(ALBUMARTIST_CARD_ROWS.playCount);
                 break;
@@ -129,11 +131,11 @@ export const ArtistListGridView = ({ itemCount, gridRef }: ArtistListGridViewPro
                 break;
             case ArtistListSort.RECENTLY_ADDED:
                 break;
+            case ArtistListSort.RELEASE_DATE:
+                break;
             case ArtistListSort.SONG_COUNT:
                 rows.push(ALBUMARTIST_CARD_ROWS.songCount);
                 break;
-            case ArtistListSort.RELEASE_DATE:
-                break;
         }
 
         return rows;
@@ -144,7 +146,6 @@ export const ArtistListGridView = ({ itemCount, gridRef }: ArtistListGridViewPro
             <AutoSizer>
                 {({ height, width }: Size) => (
                     <VirtualInfiniteGrid
-                        ref={gridRef}
                         cardRows={cardRows}
                         display={display || ListDisplayType.CARD}
                         fetchFn={fetch}
@@ -159,12 +160,13 @@ export const ArtistListGridView = ({ itemCount, gridRef }: ArtistListGridViewPro
                         itemType={LibraryItem.ARTIST}
                         loading={itemCount === undefined || itemCount === null}
                         minimumBatchSize={40}
+                        onScroll={handleGridScroll}
+                        ref={gridRef}
                         route={{
                             route: AppRoute.LIBRARY_ARTISTS_DETAIL,
                             slugs: [{ idProperty: 'id', slugProperty: 'artistId' }],
                         }}
                         width={width}
-                        onScroll={handleGridScroll}
                     />
                 )}
             </AutoSizer>
diff --git a/src/renderer/features/artists/components/artist-list-header-filters.tsx b/src/renderer/features/artists/components/artist-list-header-filters.tsx
index a6ac45cf..1551c0d1 100644
--- a/src/renderer/features/artists/components/artist-list-header-filters.tsx
+++ b/src/renderer/features/artists/components/artist-list-header-filters.tsx
@@ -1,12 +1,16 @@
-import { ChangeEvent, MouseEvent, MutableRefObject, useCallback } from 'react';
-import { IDatasource } from '@ag-grid-community/core';
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
+
+import { IDatasource } from '@ag-grid-community/core';
 import { Divider, Flex, Group, Stack } from '@mantine/core';
 import { useQueryClient } from '@tanstack/react-query';
 import debounce from 'lodash/debounce';
+import { ChangeEvent, MouseEvent, MutableRefObject, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import { RiFolder2Line, RiMoreFill, RiRefreshLine, RiSettings3Fill } from 'react-icons/ri';
+
 import { useListContext } from '../../../context/list-context';
+
+import i18n from '/@/i18n/i18n';
 import { api } from '/@/renderer/api';
 import { queryKeys } from '/@/renderer/api/query-keys';
 import {
@@ -27,6 +31,7 @@ import {
 } from '/@/renderer/components';
 import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid';
 import { ALBUMARTIST_TABLE_COLUMNS } from '/@/renderer/components/virtual-table';
+import { useRoles } from '/@/renderer/features/artists/queries/roles-query';
 import { OrderToggleButton, useMusicFolders } from '/@/renderer/features/shared';
 import { useContainerQuery } from '/@/renderer/hooks';
 import {
@@ -36,8 +41,6 @@ import {
     useListStoreByKey,
 } from '/@/renderer/store';
 import { ListDisplayType, TableColumn } from '/@/renderer/types';
-import i18n from '/@/i18n/i18n';
-import { useRoles } from '/@/renderer/features/artists/queries/roles-query';
 
 const FILTERS = {
     jellyfin: [
@@ -124,7 +127,7 @@ const FILTERS = {
 };
 
 interface ArtistListHeaderFiltersProps {
-    gridRef: MutableRefObject<VirtualInfiniteGridRef | null>;
+    gridRef: MutableRefObject<null | VirtualInfiniteGridRef>;
     tableRef: MutableRefObject<AgGridReactType | null>;
 }
 
@@ -133,10 +136,10 @@ export const ArtistListHeaderFilters = ({ gridRef, tableRef }: ArtistListHeaderF
     const queryClient = useQueryClient();
     const server = useCurrentServer();
     const { pageKey } = useListContext();
-    const { display, table, grid, filter } = useListStoreByKey<ArtistListQuery>({
+    const { display, filter, grid, table } = useListStoreByKey<ArtistListQuery>({
         key: pageKey,
     });
-    const { setFilter, setTable, setTablePagination, setDisplayType, setGrid } =
+    const { setDisplayType, setFilter, setGrid, setTable, setTablePagination } =
         useListStoreActions();
     const cq = useContainerQuery();
     const roles = useRoles({
@@ -369,7 +372,7 @@ export const ArtistListHeaderFilters = ({ gridRef, tableRef }: ArtistListHeaderF
     }, [filter, handleFilterChange, queryClient, server?.id]);
 
     const handleSetRole = useCallback(
-        (e: string | null) => {
+        (e: null | string) => {
             const updatedFilters = setFilter({
                 data: {
                     role: e || '',
@@ -403,10 +406,10 @@ export const ArtistListHeaderFilters = ({ gridRef, tableRef }: ArtistListHeaderF
                     <DropdownMenu.Dropdown>
                         {FILTERS[server?.type as keyof typeof FILTERS].map((f) => (
                             <DropdownMenu.Item
-                                key={`filter-${f.name}`}
                                 $isActive={f.value === filter.sortBy}
-                                value={f.value}
+                                key={`filter-${f.name}`}
                                 onClick={handleSetSortBy}
+                                value={f.value}
                             >
                                 {f.name}
                             </DropdownMenu.Item>
@@ -415,8 +418,8 @@ export const ArtistListHeaderFilters = ({ gridRef, tableRef }: ArtistListHeaderF
                 </DropdownMenu>
                 <Divider orientation="vertical" />
                 <OrderToggleButton
-                    sortOrder={filter.sortOrder}
                     onToggle={handleToggleSortOrder}
+                    sortOrder={filter.sortOrder}
                 />
                 {server?.type === ServerType.JELLYFIN && (
                     <>
@@ -435,10 +438,10 @@ export const ArtistListHeaderFilters = ({ gridRef, tableRef }: ArtistListHeaderF
                             <DropdownMenu.Dropdown>
                                 {musicFoldersQuery.data?.items.map((folder) => (
                                     <DropdownMenu.Item
-                                        key={`musicFolder-${folder.id}`}
                                         $isActive={filter.musicFolderId === folder.id}
-                                        value={folder.id}
+                                        key={`musicFolder-${folder.id}`}
                                         onClick={handleSetMusicFolder}
+                                        value={folder.id}
                                     >
                                         {folder.name}
                                     </DropdownMenu.Item>
@@ -452,18 +455,18 @@ export const ArtistListHeaderFilters = ({ gridRef, tableRef }: ArtistListHeaderF
                         <Divider orientation="vertical" />
                         <Select
                             data={roles.data}
-                            value={filter.role}
                             onChange={handleSetRole}
+                            value={filter.role}
                         />
                     </>
                 )}
                 <Divider orientation="vertical" />
                 <Button
                     compact
+                    onClick={handleRefresh}
                     size="md"
                     tooltip={{ label: t('common.refresh', { postProcess: 'titleCase' }) }}
                     variant="subtle"
-                    onClick={handleRefresh}
                 >
                     <RiRefreshLine size="1.3rem" />
                 </Button>
@@ -510,8 +513,8 @@ export const ArtistListHeaderFilters = ({ gridRef, tableRef }: ArtistListHeaderF
                         </DropdownMenu.Label>
                         <DropdownMenu.Item
                             $isActive={display === ListDisplayType.CARD}
-                            value={ListDisplayType.CARD}
                             onClick={handleSetViewType}
+                            value={ListDisplayType.CARD}
                         >
                             {t('table.config.view.card', {
                                 postProcess: 'sentenceCase',
@@ -519,8 +522,8 @@ export const ArtistListHeaderFilters = ({ gridRef, tableRef }: ArtistListHeaderF
                         </DropdownMenu.Item>
                         <DropdownMenu.Item
                             $isActive={display === ListDisplayType.POSTER}
-                            value={ListDisplayType.POSTER}
                             onClick={handleSetViewType}
+                            value={ListDisplayType.POSTER}
                         >
                             {t('table.config.view.poster', {
                                 postProcess: 'sentenceCase',
@@ -528,8 +531,8 @@ export const ArtistListHeaderFilters = ({ gridRef, tableRef }: ArtistListHeaderF
                         </DropdownMenu.Item>
                         <DropdownMenu.Item
                             $isActive={display === ListDisplayType.TABLE}
-                            value={ListDisplayType.TABLE}
                             onClick={handleSetViewType}
+                            value={ListDisplayType.TABLE}
                         >
                             {t('table.config.view.table', {
                                 postProcess: 'sentenceCase',
@@ -593,8 +596,8 @@ export const ArtistListHeaderFilters = ({ gridRef, tableRef }: ArtistListHeaderF
                                             defaultValue={table?.columns.map(
                                                 (column) => column.column,
                                             )}
-                                            width={300}
                                             onChange={handleTableColumns}
+                                            width={300}
                                         />
                                         <Group position="apart">
                                             <Text>
diff --git a/src/renderer/features/artists/components/artist-list-header.tsx b/src/renderer/features/artists/components/artist-list-header.tsx
index 7dbfcfa4..0389839f 100644
--- a/src/renderer/features/artists/components/artist-list-header.tsx
+++ b/src/renderer/features/artists/components/artist-list-header.tsx
@@ -1,25 +1,28 @@
-import type { ChangeEvent, MutableRefObject } from 'react';
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
+import type { ChangeEvent, MutableRefObject } from 'react';
+
 import { Flex, Group, Stack } from '@mantine/core';
 import debounce from 'lodash/debounce';
 import { useTranslation } from 'react-i18next';
+
 import { FilterBar } from '../../shared/components/filter-bar';
+
 import { ArtistListQuery, LibraryItem } from '/@/renderer/api/types';
 import { PageHeader, SearchInput } from '/@/renderer/components';
 import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid';
+import { ArtistListHeaderFilters } from '/@/renderer/features/artists/components/artist-list-header-filters';
 import { LibraryHeaderBar } from '/@/renderer/features/shared';
 import { useContainerQuery } from '/@/renderer/hooks';
-import { ArtistListFilter, useCurrentServer } from '/@/renderer/store';
 import { useDisplayRefresh } from '/@/renderer/hooks/use-display-refresh';
-import { ArtistListHeaderFilters } from '/@/renderer/features/artists/components/artist-list-header-filters';
+import { ArtistListFilter, useCurrentServer } from '/@/renderer/store';
 
 interface ArtistListHeaderProps {
-    gridRef: MutableRefObject<VirtualInfiniteGridRef | null>;
+    gridRef: MutableRefObject<null | VirtualInfiniteGridRef>;
     itemCount?: number;
     tableRef: MutableRefObject<AgGridReactType | null>;
 }
 
-export const ArtistListHeader = ({ itemCount, gridRef, tableRef }: ArtistListHeaderProps) => {
+export const ArtistListHeader = ({ gridRef, itemCount, tableRef }: ArtistListHeaderProps) => {
     const { t } = useTranslation();
     const server = useCurrentServer();
     const cq = useContainerQuery();
@@ -60,8 +63,8 @@ export const ArtistListHeader = ({ itemCount, gridRef, tableRef }: ArtistListHea
                     <Group>
                         <SearchInput
                             defaultValue={filter.searchTerm}
-                            openedWidth={cq.isMd ? 250 : cq.isSm ? 200 : 150}
                             onChange={handleSearch}
+                            openedWidth={cq.isMd ? 250 : cq.isSm ? 200 : 150}
                         />
                     </Group>
                 </Flex>
diff --git a/src/renderer/features/artists/components/artist-list-table-view.tsx b/src/renderer/features/artists/components/artist-list-table-view.tsx
index 1407b774..237f98d2 100644
--- a/src/renderer/features/artists/components/artist-list-table-view.tsx
+++ b/src/renderer/features/artists/components/artist-list-table-view.tsx
@@ -1,7 +1,10 @@
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
+
 import { MutableRefObject } from 'react';
+
 import { useListContext } from '../../../context/list-context';
 import { ARTIST_CONTEXT_MENU_ITEMS } from '../../context-menu/context-menu-items';
+
 import { LibraryItem } from '/@/renderer/api/types';
 import { VirtualGridAutoSizerContainer } from '/@/renderer/components/virtual-grid';
 import { VirtualTable } from '/@/renderer/components/virtual-table';
diff --git a/src/renderer/features/artists/queries/album-artist-detail-query.ts b/src/renderer/features/artists/queries/album-artist-detail-query.ts
index 9c4db894..93a68611 100644
--- a/src/renderer/features/artists/queries/album-artist-detail-query.ts
+++ b/src/renderer/features/artists/queries/album-artist-detail-query.ts
@@ -1,10 +1,13 @@
-import { useQuery } from '@tanstack/react-query';
-import { queryKeys } from '/@/renderer/api/query-keys';
 import type { AlbumArtistDetailQuery } from '/@/renderer/api/types';
-import { getServerById } from '/@/renderer/store';
-import { api } from '/@/renderer/api';
+
+import { useQuery } from '@tanstack/react-query';
+
 import { QueryHookArgs } from '../../../lib/react-query';
 
+import { api } from '/@/renderer/api';
+import { queryKeys } from '/@/renderer/api/query-keys';
+import { getServerById } from '/@/renderer/store';
+
 export const useAlbumArtistDetail = (args: QueryHookArgs<AlbumArtistDetailQuery>) => {
     const { options, query, serverId } = args || {};
     const server = getServerById(serverId);
diff --git a/src/renderer/features/artists/queries/album-artist-list-count-query.ts b/src/renderer/features/artists/queries/album-artist-list-count-query.ts
index f96dceaa..4199c6d4 100644
--- a/src/renderer/features/artists/queries/album-artist-list-count-query.ts
+++ b/src/renderer/features/artists/queries/album-artist-list-count-query.ts
@@ -1,4 +1,5 @@
 import { useQuery } from '@tanstack/react-query';
+
 import { api } from '/@/renderer/api';
 import { queryKeys } from '/@/renderer/api/query-keys';
 import { AlbumArtistListQuery } from '/@/renderer/api/types';
diff --git a/src/renderer/features/artists/queries/album-artist-list-query.ts b/src/renderer/features/artists/queries/album-artist-list-query.ts
index b03aca53..14612055 100644
--- a/src/renderer/features/artists/queries/album-artist-list-query.ts
+++ b/src/renderer/features/artists/queries/album-artist-list-query.ts
@@ -1,10 +1,13 @@
-import { useQuery } from '@tanstack/react-query';
-import { queryKeys } from '/@/renderer/api/query-keys';
 import type { AlbumArtistListQuery } from '/@/renderer/api/types';
-import { getServerById } from '/@/renderer/store';
-import { api } from '/@/renderer/api';
+
+import { useQuery } from '@tanstack/react-query';
+
 import { QueryHookArgs } from '../../../lib/react-query';
 
+import { api } from '/@/renderer/api';
+import { queryKeys } from '/@/renderer/api/query-keys';
+import { getServerById } from '/@/renderer/store';
+
 export const useAlbumArtistList = (args: QueryHookArgs<AlbumArtistListQuery>) => {
     const { options, query, serverId } = args || {};
     const server = getServerById(serverId);
diff --git a/src/renderer/features/artists/queries/artist-info-query.ts b/src/renderer/features/artists/queries/artist-info-query.ts
index a863cadc..4bd16bf2 100644
--- a/src/renderer/features/artists/queries/artist-info-query.ts
+++ b/src/renderer/features/artists/queries/artist-info-query.ts
@@ -1,10 +1,13 @@
-import { useQuery } from '@tanstack/react-query';
-import { queryKeys } from '/@/renderer/api/query-keys';
 import type { AlbumArtistDetailQuery } from '/@/renderer/api/types';
-import { getServerById } from '/@/renderer/store';
-import { api } from '/@/renderer/api';
+
+import { useQuery } from '@tanstack/react-query';
+
 import { QueryHookArgs } from '../../../lib/react-query';
 
+import { api } from '/@/renderer/api';
+import { queryKeys } from '/@/renderer/api/query-keys';
+import { getServerById } from '/@/renderer/store';
+
 export const useAlbumArtistInfo = (args: QueryHookArgs<AlbumArtistDetailQuery>) => {
     const { options, query, serverId } = args || {};
     const server = getServerById(serverId);
diff --git a/src/renderer/features/artists/queries/artist-list-count-query.ts b/src/renderer/features/artists/queries/artist-list-count-query.ts
index 595fd14f..2d541b9c 100644
--- a/src/renderer/features/artists/queries/artist-list-count-query.ts
+++ b/src/renderer/features/artists/queries/artist-list-count-query.ts
@@ -1,4 +1,5 @@
 import { useQuery } from '@tanstack/react-query';
+
 import { api } from '/@/renderer/api';
 import { queryKeys } from '/@/renderer/api/query-keys';
 import { ArtistListQuery } from '/@/renderer/api/types';
diff --git a/src/renderer/features/artists/queries/roles-query.ts b/src/renderer/features/artists/queries/roles-query.ts
index f80d112c..4747df7f 100644
--- a/src/renderer/features/artists/queries/roles-query.ts
+++ b/src/renderer/features/artists/queries/roles-query.ts
@@ -1,4 +1,5 @@
 import { useQuery } from '@tanstack/react-query';
+
 import { api } from '/@/renderer/api';
 import { queryKeys } from '/@/renderer/api/query-keys';
 import { QueryHookArgs } from '/@/renderer/lib/react-query';
diff --git a/src/renderer/features/artists/queries/top-songs-list-query.ts b/src/renderer/features/artists/queries/top-songs-list-query.ts
index 41430210..3ddbbcd1 100644
--- a/src/renderer/features/artists/queries/top-songs-list-query.ts
+++ b/src/renderer/features/artists/queries/top-songs-list-query.ts
@@ -1,9 +1,11 @@
-import { useQuery } from '@tanstack/react-query';
-import { queryKeys } from '/@/renderer/api/query-keys';
 import type { TopSongListQuery } from '/@/renderer/api/types';
 import type { QueryHookArgs } from '/@/renderer/lib/react-query';
-import { getServerById } from '/@/renderer/store';
+
+import { useQuery } from '@tanstack/react-query';
+
 import { api } from '/@/renderer/api';
+import { queryKeys } from '/@/renderer/api/query-keys';
+import { getServerById } from '/@/renderer/store';
 
 export const useTopSongsList = (args: QueryHookArgs<TopSongListQuery>) => {
     const { options, query, serverId } = args || {};
diff --git a/src/renderer/features/artists/routes/album-artist-detail-route.tsx b/src/renderer/features/artists/routes/album-artist-detail-route.tsx
index 3f385dde..0fa6838f 100644
--- a/src/renderer/features/artists/routes/album-artist-detail-route.tsx
+++ b/src/renderer/features/artists/routes/album-artist-detail-route.tsx
@@ -1,5 +1,6 @@
 import { useRef } from 'react';
 import { useParams } from 'react-router';
+
 import { LibraryItem } from '/@/renderer/api/types';
 import { NativeScrollArea, Spinner } from '/@/renderer/components';
 import { AlbumArtistDetailContent } from '/@/renderer/features/artists/components/album-artist-detail-content';
@@ -52,7 +53,6 @@ const AlbumArtistDetailRoute = () => {
     return (
         <AnimatedPage key={`album-artist-detail-${routeId}`}>
             <NativeScrollArea
-                ref={scrollAreaRef}
                 pageHeaderProps={{
                     backgroundColor: background,
                     children: (
@@ -66,10 +66,11 @@ const AlbumArtistDetailRoute = () => {
                     offset: 200,
                     target: headerRef,
                 }}
+                ref={scrollAreaRef}
             >
                 <AlbumArtistDetailHeader
-                    ref={headerRef}
                     background={background}
+                    ref={headerRef}
                 />
                 <AlbumArtistDetailContent background={background} />
             </NativeScrollArea>
diff --git a/src/renderer/features/artists/routes/album-artist-detail-top-songs-list-route.tsx b/src/renderer/features/artists/routes/album-artist-detail-top-songs-list-route.tsx
index cfe24984..bbd81cf0 100644
--- a/src/renderer/features/artists/routes/album-artist-detail-top-songs-list-route.tsx
+++ b/src/renderer/features/artists/routes/album-artist-detail-top-songs-list-route.tsx
@@ -1,14 +1,17 @@
-import { useMemo, useRef } from 'react';
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
+
+import { useMemo, useRef } from 'react';
 import { useParams } from 'react-router';
+
+import { LibraryItem } from '../../../api/types';
+import { useCurrentServer } from '../../../store/auth.store';
+
+import { ListContext } from '/@/renderer/context/list-context';
 import { AlbumArtistDetailTopSongsListContent } from '/@/renderer/features/artists/components/album-artist-detail-top-songs-list-content';
 import { AlbumArtistDetailTopSongsListHeader } from '/@/renderer/features/artists/components/album-artist-detail-top-songs-list-header';
 import { useAlbumArtistDetail } from '/@/renderer/features/artists/queries/album-artist-detail-query';
 import { useTopSongsList } from '/@/renderer/features/artists/queries/top-songs-list-query';
 import { AnimatedPage } from '/@/renderer/features/shared';
-import { LibraryItem } from '../../../api/types';
-import { useCurrentServer } from '../../../store/auth.store';
-import { ListContext } from '/@/renderer/context/list-context';
 
 const AlbumArtistDetailTopSongsListRoute = () => {
     const tableRef = useRef<AgGridReactType | null>(null);
diff --git a/src/renderer/features/artists/routes/album-artist-list-route.tsx b/src/renderer/features/artists/routes/album-artist-list-route.tsx
index ff4dba84..9641354c 100644
--- a/src/renderer/features/artists/routes/album-artist-list-route.tsx
+++ b/src/renderer/features/artists/routes/album-artist-list-route.tsx
@@ -1,17 +1,20 @@
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
+
 import { useMemo, useRef } from 'react';
+
 import { useCurrentServer } from '../../../store/auth.store';
 import { useListFilterByKey } from '../../../store/list.store';
+
 import { AlbumArtistListQuery, LibraryItem } from '/@/renderer/api/types';
 import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid';
 import { ListContext } from '/@/renderer/context/list-context';
 import { AlbumArtistListContent } from '/@/renderer/features/artists/components/album-artist-list-content';
 import { AlbumArtistListHeader } from '/@/renderer/features/artists/components/album-artist-list-header';
-import { AnimatedPage } from '/@/renderer/features/shared';
 import { useAlbumArtistListCount } from '/@/renderer/features/artists/queries/album-artist-list-count-query';
+import { AnimatedPage } from '/@/renderer/features/shared';
 
 const AlbumArtistListRoute = () => {
-    const gridRef = useRef<VirtualInfiniteGridRef | null>(null);
+    const gridRef = useRef<null | VirtualInfiniteGridRef>(null);
     const tableRef = useRef<AgGridReactType | null>(null);
     const pageKey = LibraryItem.ALBUM_ARTIST;
     const server = useCurrentServer();
diff --git a/src/renderer/features/artists/routes/artist-list-route.tsx b/src/renderer/features/artists/routes/artist-list-route.tsx
index 6150fa55..c059a8f4 100644
--- a/src/renderer/features/artists/routes/artist-list-route.tsx
+++ b/src/renderer/features/artists/routes/artist-list-route.tsx
@@ -1,17 +1,20 @@
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
+
 import { useMemo, useRef } from 'react';
+
 import { useCurrentServer } from '../../../store/auth.store';
 import { useListFilterByKey } from '../../../store/list.store';
+
 import { ArtistListQuery, LibraryItem } from '/@/renderer/api/types';
 import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid';
 import { ListContext } from '/@/renderer/context/list-context';
-import { AnimatedPage } from '/@/renderer/features/shared';
-import { useArtistListCount } from '/@/renderer/features/artists/queries/artist-list-count-query';
-import { ArtistListHeader } from '/@/renderer/features/artists/components/artist-list-header';
 import { ArtistListContent } from '/@/renderer/features/artists/components/artist-list-content';
+import { ArtistListHeader } from '/@/renderer/features/artists/components/artist-list-header';
+import { useArtistListCount } from '/@/renderer/features/artists/queries/artist-list-count-query';
+import { AnimatedPage } from '/@/renderer/features/shared';
 
 const ArtistListRoute = () => {
-    const gridRef = useRef<VirtualInfiniteGridRef | null>(null);
+    const gridRef = useRef<null | VirtualInfiniteGridRef>(null);
     const tableRef = useRef<AgGridReactType | null>(null);
     const pageKey = LibraryItem.ARTIST;
     const server = useCurrentServer();
diff --git a/src/renderer/features/context-menu/context-menu-provider.tsx b/src/renderer/features/context-menu/context-menu-provider.tsx
index b80bc9fc..52fbf71e 100644
--- a/src/renderer/features/context-menu/context-menu-provider.tsx
+++ b/src/renderer/features/context-menu/context-menu-provider.tsx
@@ -1,4 +1,3 @@
-import { createContext, Fragment, ReactNode, useState, useMemo, useCallback } from 'react';
 import { RowNode } from '@ag-grid-community/core';
 import { Divider, Group, Portal, Stack } from '@mantine/core';
 import {
@@ -11,8 +10,7 @@ import {
 import { closeAllModals, openContextModal, openModal } from '@mantine/modals';
 import { AnimatePresence } from 'framer-motion';
 import isElectron from 'is-electron';
-import { ServerFeature } from '/@/renderer/api/features-types';
-import { hasFeature } from '/@/renderer/api/utils';
+import { createContext, Fragment, ReactNode, useCallback, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import {
     RiAddBoxFill,
@@ -21,20 +19,25 @@ import {
     RiArrowGoForwardLine,
     RiArrowRightSFill,
     RiArrowUpLine,
+    RiCloseCircleLine,
     RiDeleteBinFill,
     RiDislikeFill,
+    RiDownload2Line,
     RiHeartFill,
+    RiInformationFill,
     RiPlayFill,
     RiPlayListAddFill,
-    RiStarFill,
-    RiCloseCircleLine,
-    RiShareForwardFill,
-    RiInformationFill,
     RiRadio2Fill,
-    RiDownload2Line,
+    RiShareForwardFill,
     RiShuffleFill,
+    RiStarFill,
 } from 'react-icons/ri';
-import { AnyLibraryItems, LibraryItem, ServerType, AnyLibraryItem } from '/@/renderer/api/types';
+
+import { api } from '/@/renderer/api';
+import { controller } from '/@/renderer/api/controller';
+import { ServerFeature } from '/@/renderer/api/features-types';
+import { AnyLibraryItem, AnyLibraryItems, LibraryItem, ServerType } from '/@/renderer/api/types';
+import { hasFeature } from '/@/renderer/api/utils';
 import {
     ConfirmModal,
     ContextMenu,
@@ -49,7 +52,9 @@ import {
     OpenContextMenuProps,
     useContextMenuEvents,
 } from '/@/renderer/features/context-menu/events';
+import { ItemDetailsModal } from '/@/renderer/features/item-details/components/item-details-modal';
 import { usePlayQueueAdd } from '/@/renderer/features/player';
+import { updateSong } from '/@/renderer/features/player/update-remote-song';
 import { useDeletePlaylist } from '/@/renderer/features/playlists';
 import { useRemoveFromPlaylist } from '/@/renderer/features/playlists/mutations/remove-from-playlist-mutation';
 import { useCreateFavorite, useDeleteFavorite, useSetRating } from '/@/renderer/features/shared';
@@ -63,10 +68,6 @@ import {
 } from '/@/renderer/store';
 import { usePlaybackType } from '/@/renderer/store/settings.store';
 import { Play, PlaybackType } from '/@/renderer/types';
-import { ItemDetailsModal } from '/@/renderer/features/item-details/components/item-details-modal';
-import { updateSong } from '/@/renderer/features/player/update-remote-song';
-import { controller } from '/@/renderer/api/controller';
-import { api } from '/@/renderer/api';
 import { setQueue, setQueueNext } from '/@/renderer/utils/set-transcoded-queue-data';
 
 type ContextMenuContextProps = {
@@ -78,7 +79,7 @@ type ContextMenuItem = {
     children?: ContextMenuItem[];
     disabled?: boolean;
     id: string;
-    label: string | ReactNode;
+    label: ReactNode | string;
     leftIcon?: ReactNode;
     onClick?: (...args: any) => any;
     rightIcon?: ReactNode;
@@ -95,7 +96,11 @@ const JELLYFIN_IGNORED_MENU_ITEMS: ContextMenuItemType[] = ['setRating', 'shareI
 // const NAVIDROME_IGNORED_MENU_ITEMS: ContextMenuItemType[] = [];
 // const SUBSONIC_IGNORED_MENU_ITEMS: ContextMenuItemType[] = [];
 
-const utils = isElectron() ? window.electron.utils : null;
+const utils = isElectron() ? window.api.utils : null;
+
+export interface ContextMenuProviderProps {
+    children: ReactNode;
+}
 
 function RatingIcon({ rating }: { rating: number }) {
     return (
@@ -109,10 +114,6 @@ function RatingIcon({ rating }: { rating: number }) {
     );
 }
 
-export interface ContextMenuProviderProps {
-    children: ReactNode;
-}
-
 export const ContextMenuProvider = ({ children }: ContextMenuProviderProps) => {
     const disabledItems = useSettingsStore((state) => state.general.disabledContextMenu);
     const { t } = useTranslation();
@@ -139,15 +140,15 @@ export const ContextMenuProvider = ({ children }: ContextMenuProviderProps) => {
     const openContextMenu = useCallback(
         (args: OpenContextMenuProps) => {
             const {
+                context,
+                data,
+                dataNodes,
+                menuItems,
+                resetGridCache,
+                tableApi,
+                type,
                 xPos,
                 yPos,
-                menuItems,
-                data,
-                type,
-                tableApi,
-                dataNodes,
-                context,
-                resetGridCache,
             } = args;
 
             const serverType = data[0]?.serverType || useAuthStore.getState().currentServer?.type;
@@ -213,13 +214,13 @@ export const ContextMenuProvider = ({ children }: ContextMenuProviderProps) => {
                         playType,
                     });
                     break;
-                case LibraryItem.ARTIST:
+                case LibraryItem.ALBUM_ARTIST:
                     handlePlayQueueAdd?.({
                         byItemType: { id: ctx.data.map((item) => item.id), type: ctx.type },
                         playType,
                     });
                     break;
-                case LibraryItem.ALBUM_ARTIST:
+                case LibraryItem.ARTIST:
                     handlePlayQueueAdd?.({
                         byItemType: { id: ctx.data.map((item) => item.id), type: ctx.type },
                         playType,
@@ -231,9 +232,6 @@ export const ContextMenuProvider = ({ children }: ContextMenuProviderProps) => {
                         playType,
                     });
                     break;
-                case LibraryItem.SONG:
-                    handlePlayQueueAdd?.({ byData: ctx.data, playType });
-                    break;
                 case LibraryItem.PLAYLIST:
                     for (const item of ctx.data) {
                         handlePlayQueueAdd?.({
@@ -242,6 +240,9 @@ export const ContextMenuProvider = ({ children }: ContextMenuProviderProps) => {
                         });
                     }
 
+                    break;
+                case LibraryItem.SONG:
+                    handlePlayQueueAdd?.({ byData: ctx.data, playType });
                     break;
             }
         },
@@ -510,8 +511,8 @@ export const ContextMenuProvider = ({ children }: ContextMenuProviderProps) => {
         let songId: string[] | undefined;
 
         switch (serverType) {
-            case ServerType.NAVIDROME:
             case ServerType.JELLYFIN:
+            case ServerType.NAVIDROME:
                 songId = ctx.dataNodes?.map((node) => node.data.playlistItemId);
                 break;
             case ServerType.SUBSONIC:
@@ -622,7 +623,7 @@ export const ContextMenuProvider = ({ children }: ContextMenuProviderProps) => {
     );
 
     const playbackType = usePlaybackType();
-    const { moveToNextOfQueue, moveToBottomOfQueue, moveToTopOfQueue, removeFromQueue } =
+    const { moveToBottomOfQueue, moveToNextOfQueue, moveToTopOfQueue, removeFromQueue } =
         useQueueControls();
 
     const handleMoveToNext = useCallback(() => {
@@ -935,15 +936,15 @@ export const ContextMenuProvider = ({ children }: ContextMenuProviderProps) => {
                 <AnimatePresence>
                     {opened && (
                         <ContextMenu
-                            ref={mergedRef}
                             minWidth={125}
+                            ref={mergedRef}
                             xPos={ctx.xPos}
                             yPos={ctx.yPos}
                         >
                             <Stack spacing={0}>
                                 <Stack
-                                    spacing={0}
                                     onClick={closeContextMenu}
+                                    spacing={0}
                                 >
                                     {ctx.menuItems?.map((item) => {
                                         return (
@@ -960,14 +961,14 @@ export const ContextMenuProvider = ({ children }: ContextMenuProviderProps) => {
                                                                         contextMenuItems[item.id]
                                                                             .leftIcon
                                                                     }
-                                                                    rightIcon={
-                                                                        contextMenuItems[item.id]
-                                                                            .rightIcon
-                                                                    }
                                                                     onClick={
                                                                         contextMenuItems[item.id]
                                                                             .onClick
                                                                     }
+                                                                    rightIcon={
+                                                                        contextMenuItems[item.id]
+                                                                            .rightIcon
+                                                                    }
                                                                 >
                                                                     {
                                                                         contextMenuItems[item.id]
@@ -985,10 +986,10 @@ export const ContextMenuProvider = ({ children }: ContextMenuProviderProps) => {
                                                                             leftIcon={
                                                                                 child.leftIcon
                                                                             }
+                                                                            onClick={child.onClick}
                                                                             rightIcon={
                                                                                 child.rightIcon
                                                                             }
-                                                                            onClick={child.onClick}
                                                                         >
                                                                             {child.label}
                                                                         </ContextMenuButton>
@@ -1001,12 +1002,12 @@ export const ContextMenuProvider = ({ children }: ContextMenuProviderProps) => {
                                                             leftIcon={
                                                                 contextMenuItems[item.id].leftIcon
                                                             }
-                                                            rightIcon={
-                                                                contextMenuItems[item.id].rightIcon
-                                                            }
                                                             onClick={
                                                                 contextMenuItems[item.id].onClick
                                                             }
+                                                            rightIcon={
+                                                                contextMenuItems[item.id].rightIcon
+                                                            }
                                                         >
                                                             {contextMenuItems[item.id].label}
                                                         </ContextMenuButton>
@@ -1014,8 +1015,8 @@ export const ContextMenuProvider = ({ children }: ContextMenuProviderProps) => {
 
                                                     {item.divider && (
                                                         <Divider
-                                                            key={`context-menu-divider-${item.id}`}
                                                             color="rgb(62, 62, 62)"
+                                                            key={`context-menu-divider-${item.id}`}
                                                             size="sm"
                                                         />
                                                     )}
diff --git a/src/renderer/features/context-menu/events.ts b/src/renderer/features/context-menu/events.ts
index a31949d8..f50ea2d2 100644
--- a/src/renderer/features/context-menu/events.ts
+++ b/src/renderer/features/context-menu/events.ts
@@ -1,7 +1,35 @@
 import { GridOptions, RowNode } from '@ag-grid-community/core';
 import { createUseExternalEvents } from '@mantine/utils';
+
 import { LibraryItem } from '/@/renderer/api/types';
 
+export type ContextMenuEvents = {
+    closeContextMenu: () => void;
+    openContextMenu: (args: OpenContextMenuProps) => void;
+};
+
+export type ContextMenuItemType =
+    | 'addToFavorites'
+    | 'addToPlaylist'
+    | 'createPlaylist'
+    | 'deletePlaylist'
+    | 'deselectAll'
+    | 'download'
+    | 'moveToBottomOfQueue'
+    | 'moveToNextOfQueue'
+    | 'moveToTopOfQueue'
+    | 'play'
+    | 'playLast'
+    | 'playNext'
+    | 'playShuffled'
+    | 'playSimilarSongs'
+    | 'removeFromFavorites'
+    | 'removeFromPlaylist'
+    | 'removeFromQueue'
+    | 'setRating'
+    | 'shareItem'
+    | 'showDetails';
+
 export type OpenContextMenuProps = {
     context?: any;
     data: any[];
@@ -14,33 +42,6 @@ export type OpenContextMenuProps = {
     yPos: number;
 };
 
-export type ContextMenuEvents = {
-    closeContextMenu: () => void;
-    openContextMenu: (args: OpenContextMenuProps) => void;
-};
-
-export type ContextMenuItemType =
-    | 'play'
-    | 'playLast'
-    | 'playNext'
-    | 'playShuffled'
-    | 'addToPlaylist'
-    | 'removeFromPlaylist'
-    | 'addToFavorites'
-    | 'removeFromFavorites'
-    | 'setRating'
-    | 'shareItem'
-    | 'deletePlaylist'
-    | 'createPlaylist'
-    | 'moveToNextOfQueue'
-    | 'moveToBottomOfQueue'
-    | 'moveToTopOfQueue'
-    | 'removeFromQueue'
-    | 'deselectAll'
-    | 'showDetails'
-    | 'playSimilarSongs'
-    | 'download';
-
 export const CONFIGURABLE_CONTEXT_MENU_ITEMS: ContextMenuItemType[] = [
     'moveToBottomOfQueue',
     'moveToTopOfQueue',
diff --git a/src/renderer/features/context-menu/hooks/use-handle-context-menu.ts b/src/renderer/features/context-menu/hooks/use-handle-context-menu.ts
index 5606d24e..b9b3e6cc 100644
--- a/src/renderer/features/context-menu/hooks/use-handle-context-menu.ts
+++ b/src/renderer/features/context-menu/hooks/use-handle-context-menu.ts
@@ -1,5 +1,6 @@
 import { CellContextMenuEvent, GridApi } from '@ag-grid-community/core';
 import sortBy from 'lodash/sortBy';
+
 import { Album, AlbumArtist, Artist, LibraryItem, QueueSong, Song } from '/@/renderer/api/types';
 import { openContextMenu, SetContextMenuItems } from '/@/renderer/features/context-menu/events';
 
@@ -64,7 +65,7 @@ export const useHandleGeneralContextMenu = (
 ) => {
     const handleContextMenu = (
         e: any,
-        data: Song[] | QueueSong[] | AlbumArtist[] | Artist[] | Album[],
+        data: Album[] | AlbumArtist[] | Artist[] | QueueSong[] | Song[],
     ) => {
         if (!e) return;
         const clickEvent = e as MouseEvent;
@@ -92,7 +93,7 @@ export const useHandleGridContextMenu = (
 ) => {
     const handleContextMenu = (
         e: any,
-        data: Song[] | QueueSong[] | AlbumArtist[] | Artist[] | Album[],
+        data: Album[] | AlbumArtist[] | Artist[] | QueueSong[] | Song[],
     ) => {
         if (!e) return;
         const clickEvent = e as MouseEvent;
diff --git a/src/renderer/features/context-menu/index.tsx b/src/renderer/features/context-menu/index.tsx
index adec7b07..e5229ef7 100644
--- a/src/renderer/features/context-menu/index.tsx
+++ b/src/renderer/features/context-menu/index.tsx
@@ -1,3 +1,3 @@
-export * from './events';
 export * from './context-menu-provider';
+export * from './events';
 export * from './hooks/use-handle-context-menu';
diff --git a/src/renderer/features/discord-rpc/use-discord-rpc.ts b/src/renderer/features/discord-rpc/use-discord-rpc.ts
index e9221448..efc12338 100644
--- a/src/renderer/features/discord-rpc/use-discord-rpc.ts
+++ b/src/renderer/features/discord-rpc/use-discord-rpc.ts
@@ -1,6 +1,9 @@
-/* eslint-disable consistent-return */
+import { SetActivity } from '@xhayper/discord-rpc';
 import isElectron from 'is-electron';
 import { useCallback, useEffect, useRef } from 'react';
+
+import { controller } from '/@/renderer/api/controller';
+import { ServerType } from '/@/renderer/api/types';
 import {
     getServerById,
     useCurrentSong,
@@ -9,12 +12,9 @@ import {
     useGeneralSettings,
     usePlayerStore,
 } from '/@/renderer/store';
-import { SetActivity } from '@xhayper/discord-rpc';
 import { PlayerStatus } from '/@/renderer/types';
-import { ServerType } from '/@/renderer/api/types';
-import { controller } from '/@/renderer/api/controller';
 
-const discordRpc = isElectron() ? window.electron.discordRpc : null;
+const discordRpc = isElectron() ? window.api.discordRpc : null;
 
 export const useDiscordRpc = () => {
     const intervalRef = useRef(0);
diff --git a/src/renderer/features/genres/components/genre-list-content.tsx b/src/renderer/features/genres/components/genre-list-content.tsx
index 0d0cc092..8c763226 100644
--- a/src/renderer/features/genres/components/genre-list-content.tsx
+++ b/src/renderer/features/genres/components/genre-list-content.tsx
@@ -1,5 +1,7 @@
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
+
 import { lazy, MutableRefObject, Suspense } from 'react';
+
 import { Spinner } from '/@/renderer/components';
 import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid';
 import { useListContext } from '/@/renderer/context/list-context';
@@ -19,12 +21,12 @@ const GenreListTableView = lazy(() =>
 );
 
 interface AlbumListContentProps {
-    gridRef: MutableRefObject<VirtualInfiniteGridRef | null>;
+    gridRef: MutableRefObject<null | VirtualInfiniteGridRef>;
     itemCount?: number;
     tableRef: MutableRefObject<AgGridReactType | null>;
 }
 
-export const GenreListContent = ({ itemCount, gridRef, tableRef }: AlbumListContentProps) => {
+export const GenreListContent = ({ gridRef, itemCount, tableRef }: AlbumListContentProps) => {
     const { pageKey } = useListContext();
     const { display } = useListStoreByKey({ key: pageKey });
 
diff --git a/src/renderer/features/genres/components/genre-list-grid-view.tsx b/src/renderer/features/genres/components/genre-list-grid-view.tsx
index a3bd5d31..e28cfb41 100644
--- a/src/renderer/features/genres/components/genre-list-grid-view.tsx
+++ b/src/renderer/features/genres/components/genre-list-grid-view.tsx
@@ -3,6 +3,7 @@ import { useCallback, useMemo } from 'react';
 import { useSearchParams } from 'react-router-dom';
 import AutoSizer, { Size } from 'react-virtualized-auto-sizer';
 import { ListOnScrollProps } from 'react-window';
+
 import { api } from '/@/renderer/api';
 import { queryKeys } from '/@/renderer/api/query-keys';
 import { Album, GenreListQuery, GenreListResponse, LibraryItem } from '/@/renderer/api/types';
@@ -13,16 +14,16 @@ import {
 } from '/@/renderer/components/virtual-grid';
 import { useListContext } from '/@/renderer/context/list-context';
 import { usePlayQueueAdd } from '/@/renderer/features/player';
+import { useGenreRoute } from '/@/renderer/hooks/use-genre-route';
 import { useCurrentServer, useListStoreActions, useListStoreByKey } from '/@/renderer/store';
 import { CardRow, ListDisplayType } from '/@/renderer/types';
-import { useGenreRoute } from '/@/renderer/hooks/use-genre-route';
 
 export const GenreListGridView = ({ gridRef, itemCount }: any) => {
     const queryClient = useQueryClient();
     const server = useCurrentServer();
     const handlePlayQueueAdd = usePlayQueueAdd();
-    const { pageKey, id } = useListContext();
-    const { grid, display, filter } = useListStoreByKey<GenreListQuery>({ key: pageKey });
+    const { id, pageKey } = useListContext();
+    const { display, filter, grid } = useListStoreByKey<GenreListQuery>({ key: pageKey });
     const { setGrid } = useListStoreActions();
     const genrePath = useGenreRoute();
 
@@ -53,7 +54,7 @@ export const GenreListGridView = ({ gridRef, itemCount }: any) => {
     );
 
     const fetchInitialData = useCallback(() => {
-        const query: Omit<GenreListQuery, 'startIndex' | 'limit'> = {
+        const query: Omit<GenreListQuery, 'limit' | 'startIndex'> = {
             ...filter,
         };
 
@@ -122,8 +123,6 @@ export const GenreListGridView = ({ gridRef, itemCount }: any) => {
             <AutoSizer>
                 {({ height, width }: Size) => (
                     <VirtualInfiniteGrid
-                        key={`album-list-${server?.id}-${display}`}
-                        ref={gridRef}
                         cardRows={cardRows}
                         display={display || ListDisplayType.CARD}
                         fetchFn={fetch}
@@ -135,14 +134,16 @@ export const GenreListGridView = ({ gridRef, itemCount }: any) => {
                         itemGap={grid?.itemGap ?? 10}
                         itemSize={grid?.itemSize || 200}
                         itemType={LibraryItem.GENRE}
+                        key={`album-list-${server?.id}-${display}`}
                         loading={itemCount === undefined || itemCount === null}
                         minimumBatchSize={40}
+                        onScroll={handleGridScroll}
+                        ref={gridRef}
                         route={{
                             route: genrePath,
                             slugs: [{ idProperty: 'id', slugProperty: 'genreId' }],
                         }}
                         width={width}
-                        onScroll={handleGridScroll}
                     />
                 )}
             </AutoSizer>
diff --git a/src/renderer/features/genres/components/genre-list-header-filters.tsx b/src/renderer/features/genres/components/genre-list-header-filters.tsx
index de1d3eeb..01c42ecd 100644
--- a/src/renderer/features/genres/components/genre-list-header-filters.tsx
+++ b/src/renderer/features/genres/components/genre-list-header-filters.tsx
@@ -1,7 +1,8 @@
-import { ChangeEvent, MouseEvent, MutableRefObject, useCallback, useMemo } from 'react';
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
+
 import { Divider, Flex, Group, Stack } from '@mantine/core';
 import { useQueryClient } from '@tanstack/react-query';
+import { ChangeEvent, MouseEvent, MutableRefObject, useCallback, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import {
     RiAlbumLine,
@@ -11,6 +12,8 @@ import {
     RiRefreshLine,
     RiSettings3Fill,
 } from 'react-icons/ri';
+
+import i18n from '/@/i18n/i18n';
 import { queryKeys } from '/@/renderer/api/query-keys';
 import {
     GenreListQuery,
@@ -36,7 +39,6 @@ import {
     useSettingsStoreActions,
 } from '/@/renderer/store';
 import { ListDisplayType, TableColumn } from '/@/renderer/types';
-import i18n from '/@/i18n/i18n';
 
 const FILTERS = {
     jellyfin: [
@@ -63,7 +65,7 @@ const FILTERS = {
 };
 
 interface GenreListHeaderFiltersProps {
-    gridRef: MutableRefObject<VirtualInfiniteGridRef | null>;
+    gridRef: MutableRefObject<null | VirtualInfiniteGridRef>;
     itemCount: number | undefined;
     tableRef: MutableRefObject<AgGridReactType | null>;
 }
@@ -75,15 +77,15 @@ export const GenreListHeaderFilters = ({
 }: GenreListHeaderFiltersProps) => {
     const { t } = useTranslation();
     const queryClient = useQueryClient();
-    const { pageKey, customFilters } = useListContext();
+    const { customFilters, pageKey } = useListContext();
     const server = useCurrentServer();
-    const { setFilter, setTable, setGrid, setDisplayType } = useListStoreActions();
-    const { display, filter, table, grid } = useListStoreByKey<GenreListQuery>({ key: pageKey });
+    const { setDisplayType, setFilter, setGrid, setTable } = useListStoreActions();
+    const { display, filter, grid, table } = useListStoreByKey<GenreListQuery>({ key: pageKey });
     const cq = useContainerQuery();
     const { genreTarget } = useGeneralSettings();
     const { setGenreBehavior } = useSettingsStoreActions();
 
-    const { handleRefreshTable, handleRefreshGrid } = useListFilterRefresh({
+    const { handleRefreshGrid, handleRefreshTable } = useListFilterRefresh({
         itemCount,
         itemType: LibraryItem.GENRE,
         server,
@@ -265,10 +267,10 @@ export const GenreListHeaderFilters = ({
                     <DropdownMenu.Dropdown>
                         {FILTERS[server?.type as keyof typeof FILTERS].map((f) => (
                             <DropdownMenu.Item
-                                key={`filter-${f.name}`}
                                 $isActive={f.value === filter.sortBy}
-                                value={f.value}
+                                key={`filter-${f.name}`}
                                 onClick={handleSetSortBy}
+                                value={f.value}
                             >
                                 {f.name}
                             </DropdownMenu.Item>
@@ -277,8 +279,8 @@ export const GenreListHeaderFilters = ({
                 </DropdownMenu>
                 <Divider orientation="vertical" />
                 <OrderToggleButton
-                    sortOrder={filter.sortOrder}
                     onToggle={handleToggleSortOrder}
+                    sortOrder={filter.sortOrder}
                 />
                 {server?.type === ServerType.JELLYFIN && (
                     <>
@@ -304,10 +306,10 @@ export const GenreListHeaderFilters = ({
                             <DropdownMenu.Dropdown>
                                 {musicFoldersQuery.data?.items.map((folder) => (
                                     <DropdownMenu.Item
-                                        key={`musicFolder-${folder.id}`}
                                         $isActive={filter.musicFolderId === folder.id}
-                                        value={folder.id}
+                                        key={`musicFolder-${folder.id}`}
                                         onClick={handleSetMusicFolder}
+                                        value={folder.id}
                                     >
                                         {folder.name}
                                     </DropdownMenu.Item>
@@ -319,10 +321,10 @@ export const GenreListHeaderFilters = ({
                 <Divider orientation="vertical" />
                 <Button
                     compact
+                    onClick={handleRefresh}
                     size="md"
                     tooltip={{ label: t('common.refresh', { postProcess: 'titleCase' }) }}
                     variant="subtle"
-                    onClick={handleRefresh}
                 >
                     <RiRefreshLine size="1.3rem" />
                 </Button>
@@ -348,6 +350,7 @@ export const GenreListHeaderFilters = ({
                     <Divider orientation="vertical" />
                     <Button
                         compact
+                        onClick={handleGenreToggle}
                         size="md"
                         tooltip={{
                             label: t(
@@ -358,7 +361,6 @@ export const GenreListHeaderFilters = ({
                             ),
                         }}
                         variant="subtle"
-                        onClick={handleGenreToggle}
                     >
                         {genreTarget === GenreTarget.ALBUM ? <RiAlbumLine /> : <RiMusic2Line />}
                     </Button>
@@ -390,22 +392,22 @@ export const GenreListHeaderFilters = ({
                         </DropdownMenu.Label>
                         <DropdownMenu.Item
                             $isActive={display === ListDisplayType.CARD}
-                            value={ListDisplayType.CARD}
                             onClick={handleSetViewType}
+                            value={ListDisplayType.CARD}
                         >
                             {t('table.config.view.card', { postProcess: 'titleCase' })}
                         </DropdownMenu.Item>
                         <DropdownMenu.Item
                             $isActive={display === ListDisplayType.POSTER}
-                            value={ListDisplayType.POSTER}
                             onClick={handleSetViewType}
+                            value={ListDisplayType.POSTER}
                         >
                             {t('table.config.view.poster', { postProcess: 'titleCase' })}
                         </DropdownMenu.Item>
                         <DropdownMenu.Item
                             $isActive={display === ListDisplayType.TABLE}
-                            value={ListDisplayType.TABLE}
                             onClick={handleSetViewType}
+                            value={ListDisplayType.TABLE}
                         >
                             {t('table.config.view.table', { postProcess: 'titleCase' })}
                         </DropdownMenu.Item>
@@ -458,8 +460,8 @@ export const GenreListHeaderFilters = ({
                                             defaultValue={table?.columns.map(
                                                 (column) => column.column,
                                             )}
-                                            width={300}
                                             onChange={handleTableColumns}
+                                            width={300}
                                         />
                                         <Group position="apart">
                                             <Text>
diff --git a/src/renderer/features/genres/components/genre-list-header.tsx b/src/renderer/features/genres/components/genre-list-header.tsx
index c24ad224..b6848401 100644
--- a/src/renderer/features/genres/components/genre-list-header.tsx
+++ b/src/renderer/features/genres/components/genre-list-header.tsx
@@ -1,24 +1,26 @@
-import { ChangeEvent, MutableRefObject } from 'react';
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
+
 import { Flex, Group, Stack } from '@mantine/core';
 import debounce from 'lodash/debounce';
+import { ChangeEvent, MutableRefObject } from 'react';
+import { useTranslation } from 'react-i18next';
+
 import { GenreListQuery, LibraryItem } from '/@/renderer/api/types';
 import { PageHeader, SearchInput } from '/@/renderer/components';
 import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid';
 import { GenreListHeaderFilters } from '/@/renderer/features/genres/components/genre-list-header-filters';
 import { FilterBar, LibraryHeaderBar } from '/@/renderer/features/shared';
 import { useContainerQuery } from '/@/renderer/hooks';
-import { GenreListFilter, useCurrentServer } from '/@/renderer/store';
-import { useTranslation } from 'react-i18next';
 import { useDisplayRefresh } from '/@/renderer/hooks/use-display-refresh';
+import { GenreListFilter, useCurrentServer } from '/@/renderer/store';
 
 interface GenreListHeaderProps {
-    gridRef: MutableRefObject<VirtualInfiniteGridRef | null>;
+    gridRef: MutableRefObject<null | VirtualInfiniteGridRef>;
     itemCount?: number;
     tableRef: MutableRefObject<AgGridReactType | null>;
 }
 
-export const GenreListHeader = ({ itemCount, gridRef, tableRef }: GenreListHeaderProps) => {
+export const GenreListHeader = ({ gridRef, itemCount, tableRef }: GenreListHeaderProps) => {
     const { t } = useTranslation();
     const cq = useContainerQuery();
     const server = useCurrentServer();
@@ -57,8 +59,8 @@ export const GenreListHeader = ({ itemCount, gridRef, tableRef }: GenreListHeade
                     <Group>
                         <SearchInput
                             defaultValue={filter.searchTerm}
-                            openedWidth={cq.isMd ? 250 : cq.isSm ? 200 : 150}
                             onChange={handleSearch}
+                            openedWidth={cq.isMd ? 250 : cq.isSm ? 200 : 150}
                         />
                     </Group>
                 </Flex>
diff --git a/src/renderer/features/genres/components/genre-list-table-view.tsx b/src/renderer/features/genres/components/genre-list-table-view.tsx
index 1e443c0b..12f8cba6 100644
--- a/src/renderer/features/genres/components/genre-list-table-view.tsx
+++ b/src/renderer/features/genres/components/genre-list-table-view.tsx
@@ -1,24 +1,26 @@
-import { LibraryItem } from '/@/renderer/api/types';
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
+
+import { RowDoubleClickedEvent } from '@ag-grid-community/core';
+import { MutableRefObject, useCallback } from 'react';
+import { generatePath, useNavigate } from 'react-router';
+
+import { LibraryItem } from '/@/renderer/api/types';
 import { VirtualGridAutoSizerContainer } from '/@/renderer/components/virtual-grid';
 import { VirtualTable } from '/@/renderer/components/virtual-table';
 import { useVirtualTable } from '/@/renderer/components/virtual-table/hooks/use-virtual-table';
 import { useListContext } from '/@/renderer/context/list-context';
 import { GENRE_CONTEXT_MENU_ITEMS } from '/@/renderer/features/context-menu/context-menu-items';
-import { useCurrentServer } from '/@/renderer/store';
-import { MutableRefObject, useCallback } from 'react';
-import { RowDoubleClickedEvent } from '@ag-grid-community/core';
-import { generatePath, useNavigate } from 'react-router';
 import { useGenreRoute } from '/@/renderer/hooks/use-genre-route';
+import { useCurrentServer } from '/@/renderer/store';
 
 interface GenreListTableViewProps {
     itemCount?: number;
     tableRef: MutableRefObject<AgGridReactType | null>;
 }
 
-export const GenreListTableView = ({ tableRef, itemCount }: GenreListTableViewProps) => {
+export const GenreListTableView = ({ itemCount, tableRef }: GenreListTableViewProps) => {
     const server = useCurrentServer();
-    const { pageKey, customFilters } = useListContext();
+    const { customFilters, pageKey } = useListContext();
     const navigate = useNavigate();
     const genrePath = useGenreRoute();
 
diff --git a/src/renderer/features/genres/queries/genre-list-query.ts b/src/renderer/features/genres/queries/genre-list-query.ts
index 9d209b33..36b44782 100644
--- a/src/renderer/features/genres/queries/genre-list-query.ts
+++ b/src/renderer/features/genres/queries/genre-list-query.ts
@@ -1,8 +1,10 @@
-import { useQuery } from '@tanstack/react-query';
-import { api } from '/@/renderer/api';
-import { queryKeys } from '/@/renderer/api/query-keys';
 import type { GenreListQuery } from '/@/renderer/api/types';
 import type { QueryHookArgs } from '/@/renderer/lib/react-query';
+
+import { useQuery } from '@tanstack/react-query';
+
+import { api } from '/@/renderer/api';
+import { queryKeys } from '/@/renderer/api/query-keys';
 import { getServerById } from '/@/renderer/store';
 
 export const useGenreList = (args: QueryHookArgs<GenreListQuery>) => {
diff --git a/src/renderer/features/genres/routes/genre-list-route.tsx b/src/renderer/features/genres/routes/genre-list-route.tsx
index 2bff14cf..0eeb49d0 100644
--- a/src/renderer/features/genres/routes/genre-list-route.tsx
+++ b/src/renderer/features/genres/routes/genre-list-route.tsx
@@ -1,5 +1,10 @@
-import { useMemo, useRef } from 'react';
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
+
+import { useMemo, useRef } from 'react';
+
+import { useListStoreByKey } from '../../../store/list.store';
+
+import { GenreListQuery } from '/@/renderer/api/types';
 import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid';
 import { ListContext } from '/@/renderer/context/list-context';
 import { GenreListContent } from '/@/renderer/features/genres/components/genre-list-content';
@@ -7,11 +12,9 @@ import { GenreListHeader } from '/@/renderer/features/genres/components/genre-li
 import { useGenreList } from '/@/renderer/features/genres/queries/genre-list-query';
 import { AnimatedPage } from '/@/renderer/features/shared';
 import { useCurrentServer } from '/@/renderer/store';
-import { useListStoreByKey } from '../../../store/list.store';
-import { GenreListQuery } from '/@/renderer/api/types';
 
 const GenreListRoute = () => {
-    const gridRef = useRef<VirtualInfiniteGridRef | null>(null);
+    const gridRef = useRef<null | VirtualInfiniteGridRef>(null);
     const tableRef = useRef<AgGridReactType | null>(null);
     const server = useCurrentServer();
     const pageKey = 'genre';
diff --git a/src/renderer/features/home/queries/recently-played-query.ts b/src/renderer/features/home/queries/recently-played-query.ts
index 6e4bd565..df36cdfa 100644
--- a/src/renderer/features/home/queries/recently-played-query.ts
+++ b/src/renderer/features/home/queries/recently-played-query.ts
@@ -1,9 +1,10 @@
 import { useQuery } from '@tanstack/react-query';
+
 import { api } from '/@/renderer/api';
 import { queryKeys } from '/@/renderer/api/query-keys';
 import { AlbumListQuery, AlbumListSort, SortOrder } from '/@/renderer/api/types';
-import { getServerById } from '/@/renderer/store';
 import { QueryHookArgs } from '/@/renderer/lib/react-query';
+import { getServerById } from '/@/renderer/store';
 
 export const useRecentlyPlayed = (args: QueryHookArgs<Partial<AlbumListQuery>>) => {
     const { options, query, serverId } = args;
diff --git a/src/renderer/features/home/routes/home-route.tsx b/src/renderer/features/home/routes/home-route.tsx
index 10a6f78f..fc1f3eb0 100644
--- a/src/renderer/features/home/routes/home-route.tsx
+++ b/src/renderer/features/home/routes/home-route.tsx
@@ -1,5 +1,10 @@
-import { useMemo, useRef } from 'react';
 import { ActionIcon, Group, Stack } from '@mantine/core';
+import { useQueryClient } from '@tanstack/react-query';
+import { useMemo, useRef } from 'react';
+import { useTranslation } from 'react-i18next';
+import { RiRefreshLine } from 'react-icons/ri';
+
+import { queryKeys } from '/@/renderer/api/query-keys';
 import {
     AlbumListSort,
     LibraryItem,
@@ -8,9 +13,11 @@ import {
     SortOrder,
 } from '/@/renderer/api/types';
 import { FeatureCarousel, NativeScrollArea, Spinner, TextTitle } from '/@/renderer/components';
+import { MemoizedSwiperGridCarousel } from '/@/renderer/components/grid-carousel';
 import { useAlbumList } from '/@/renderer/features/albums';
 import { useRecentlyPlayed } from '/@/renderer/features/home/queries/recently-played-query';
 import { AnimatedPage, LibraryHeaderBar } from '/@/renderer/features/shared';
+import { useSongList } from '/@/renderer/features/songs';
 import { AppRoute } from '/@/renderer/router/routes';
 import {
     HomeItem,
@@ -18,13 +25,7 @@ import {
     useGeneralSettings,
     useWindowSettings,
 } from '/@/renderer/store';
-import { MemoizedSwiperGridCarousel } from '/@/renderer/components/grid-carousel';
 import { Platform } from '/@/renderer/types';
-import { useQueryClient } from '@tanstack/react-query';
-import { queryKeys } from '/@/renderer/api/query-keys';
-import { useTranslation } from 'react-i18next';
-import { RiRefreshLine } from 'react-icons/ri';
-import { useSongList } from '/@/renderer/features/songs';
 
 const HomeRoute = () => {
     const { t } = useTranslation();
@@ -137,33 +138,6 @@ const HomeRoute = () => {
     }
 
     const carousels = {
-        [HomeItem.RANDOM]: {
-            data: random?.data?.items,
-            itemType: LibraryItem.ALBUM,
-            sortBy: AlbumListSort.RANDOM,
-            sortOrder: SortOrder.ASC,
-            title: t('page.home.explore', { postProcess: 'sentenceCase' }),
-        },
-        [HomeItem.RECENTLY_PLAYED]: {
-            data: recentlyPlayed?.data?.items,
-            itemType: LibraryItem.ALBUM,
-            pagination: {
-                itemsPerPage,
-            },
-            sortBy: AlbumListSort.RECENTLY_PLAYED,
-            sortOrder: SortOrder.DESC,
-            title: t('page.home.recentlyPlayed', { postProcess: 'sentenceCase' }),
-        },
-        [HomeItem.RECENTLY_ADDED]: {
-            data: recentlyAdded?.data?.items,
-            itemType: LibraryItem.ALBUM,
-            pagination: {
-                itemsPerPage,
-            },
-            sortBy: AlbumListSort.RECENTLY_ADDED,
-            sortOrder: SortOrder.DESC,
-            title: t('page.home.newlyAdded', { postProcess: 'sentenceCase' }),
-        },
         [HomeItem.MOST_PLAYED]: {
             data:
                 server?.type === ServerType.JELLYFIN
@@ -180,6 +154,33 @@ const HomeRoute = () => {
             sortOrder: SortOrder.DESC,
             title: t('page.home.mostPlayed', { postProcess: 'sentenceCase' }),
         },
+        [HomeItem.RANDOM]: {
+            data: random?.data?.items,
+            itemType: LibraryItem.ALBUM,
+            sortBy: AlbumListSort.RANDOM,
+            sortOrder: SortOrder.ASC,
+            title: t('page.home.explore', { postProcess: 'sentenceCase' }),
+        },
+        [HomeItem.RECENTLY_ADDED]: {
+            data: recentlyAdded?.data?.items,
+            itemType: LibraryItem.ALBUM,
+            pagination: {
+                itemsPerPage,
+            },
+            sortBy: AlbumListSort.RECENTLY_ADDED,
+            sortOrder: SortOrder.DESC,
+            title: t('page.home.newlyAdded', { postProcess: 'sentenceCase' }),
+        },
+        [HomeItem.RECENTLY_PLAYED]: {
+            data: recentlyPlayed?.data?.items,
+            itemType: LibraryItem.ALBUM,
+            pagination: {
+                itemsPerPage,
+            },
+            sortBy: AlbumListSort.RECENTLY_PLAYED,
+            sortOrder: SortOrder.DESC,
+            title: t('page.home.recentlyPlayed', { postProcess: 'sentenceCase' }),
+        },
     };
 
     const sortedCarousel = homeItems
@@ -200,7 +201,7 @@ const HomeRoute = () => {
 
     const invalidateCarouselQuery = (carousel: {
         itemType: LibraryItem;
-        sortBy: SongListSort | AlbumListSort;
+        sortBy: AlbumListSort | SongListSort;
         sortOrder: SortOrder;
     }) => {
         if (carousel.itemType === LibraryItem.ALBUM) {
@@ -231,7 +232,6 @@ const HomeRoute = () => {
     return (
         <AnimatedPage>
             <NativeScrollArea
-                ref={scrollAreaRef}
                 pageHeaderProps={{
                     backgroundColor: 'var(--titlebar-bg)',
                     children: (
@@ -243,6 +243,7 @@ const HomeRoute = () => {
                     ),
                     offset: 200,
                 }}
+                ref={scrollAreaRef}
             >
                 <Stack
                     mb="5rem"
@@ -253,7 +254,6 @@ const HomeRoute = () => {
                     {homeFeature && <FeatureCarousel data={featureItemsWithImage} />}
                     {sortedCarousel.map((carousel) => (
                         <MemoizedSwiperGridCarousel
-                            key={`carousel-${carousel.uniqueId}`}
                             cardRows={[
                                 {
                                     property: 'name',
@@ -287,6 +287,7 @@ const HomeRoute = () => {
                             ]}
                             data={carousel.data}
                             itemType={carousel.itemType}
+                            key={`carousel-${carousel.uniqueId}`}
                             route={{
                                 route: AppRoute.LIBRARY_ALBUMS_DETAIL,
                                 slugs: [
diff --git a/src/renderer/features/item-details/components/item-details-modal.tsx b/src/renderer/features/item-details/components/item-details-modal.tsx
index 1174b740..adfbbbab 100644
--- a/src/renderer/features/item-details/components/item-details-modal.tsx
+++ b/src/renderer/features/item-details/components/item-details-modal.tsx
@@ -1,7 +1,10 @@
 import { Group, Table } from '@mantine/core';
-import { RiCheckFill, RiCloseFill } from 'react-icons/ri';
-import { TFunction, useTranslation } from 'react-i18next';
 import { ReactNode } from 'react';
+import { TFunction, useTranslation } from 'react-i18next';
+import { RiCheckFill, RiCloseFill } from 'react-icons/ri';
+import { generatePath } from 'react-router';
+import { Link } from 'react-router-dom';
+
 import {
     Album,
     AlbumArtist,
@@ -10,18 +13,16 @@ import {
     RelatedArtist,
     Song,
 } from '/@/renderer/api/types';
-import { formatDurationString, formatSizeString } from '/@/renderer/utils';
-import { replaceURLWithHTMLLinks } from '/@/renderer/utils/linkify';
-import { Spoiler, Text } from '/@/renderer/components';
-import { sanitize } from '/@/renderer/utils/sanitize';
-import { SongPath } from '/@/renderer/features/item-details/components/song-path';
-import { generatePath } from 'react-router';
-import { Link } from 'react-router-dom';
-import { AppRoute } from '/@/renderer/router/routes';
-import { Separator } from '/@/renderer/components/separator';
-import { useGenreRoute } from '/@/renderer/hooks/use-genre-route';
-import { formatDateRelative, formatRating } from '/@/renderer/utils/format';
 import { SEPARATOR_STRING } from '/@/renderer/api/utils';
+import { Spoiler, Text } from '/@/renderer/components';
+import { Separator } from '/@/renderer/components/separator';
+import { SongPath } from '/@/renderer/features/item-details/components/song-path';
+import { useGenreRoute } from '/@/renderer/hooks/use-genre-route';
+import { AppRoute } from '/@/renderer/router/routes';
+import { formatDurationString, formatSizeString } from '/@/renderer/utils';
+import { formatDateRelative, formatRating } from '/@/renderer/utils/format';
+import { replaceURLWithHTMLLinks } from '/@/renderer/utils/linkify';
+import { sanitize } from '/@/renderer/utils/sanitize';
 
 export type ItemDetailsModalProps = {
     item: Album | AlbumArtist | Song;
@@ -54,7 +55,7 @@ const handleRow = <T extends AnyLibraryItem>(t: TFunction, item: T, rule: ItemDe
     );
 };
 
-const formatArtists = (artists: RelatedArtist[] | undefined | null) =>
+const formatArtists = (artists: null | RelatedArtist[] | undefined) =>
     artists?.map((artist, index) => (
         <span key={artist.id || artist.name}>
             {index > 0 && <Separator />}
diff --git a/src/renderer/features/item-details/components/song-path.tsx b/src/renderer/features/item-details/components/song-path.tsx
index 33f66307..9c435a9e 100644
--- a/src/renderer/features/item-details/components/song-path.tsx
+++ b/src/renderer/features/item-details/components/song-path.tsx
@@ -2,13 +2,14 @@ import { ActionIcon, CopyButton, Group } from '@mantine/core';
 import isElectron from 'is-electron';
 import { useTranslation } from 'react-i18next';
 import { RiCheckFill, RiClipboardFill, RiExternalLinkFill } from 'react-icons/ri';
-import { Tooltip, toast } from '/@/renderer/components';
 import styled from 'styled-components';
 
-const util = isElectron() ? window.electron.utils : null;
+import { toast, Tooltip } from '/@/renderer/components';
+
+const util = isElectron() ? window.api.utils : null;
 
 export type SongPathProps = {
-    path: string | null;
+    path: null | string;
 };
 
 const PathText = styled.div`
@@ -28,11 +29,13 @@ export const SongPath = ({ path }: SongPathProps) => {
             >
                 {({ copied, copy }) => (
                     <Tooltip
-                        withinPortal
                         label={t(
                             copied ? 'page.itemDetail.copiedPath' : 'page.itemDetail.copyPath',
-                            { postProcess: 'sentenceCase' },
+                            {
+                                postProcess: 'sentenceCase',
+                            },
                         )}
+                        withinPortal
                     >
                         <ActionIcon onClick={copy}>
                             {copied ? <RiCheckFill /> : <RiClipboardFill />}
@@ -42,8 +45,8 @@ export const SongPath = ({ path }: SongPathProps) => {
             </CopyButton>
             {util && (
                 <Tooltip
-                    withinPortal
                     label={t('page.itemDetail.openFile', { postProcess: 'sentenceCase' })}
+                    withinPortal
                 >
                     <ActionIcon>
                         <RiExternalLinkFill
diff --git a/src/renderer/features/lyrics/components/lyrics-search-form.tsx b/src/renderer/features/lyrics/components/lyrics-search-form.tsx
index 7555ded5..4491ae43 100644
--- a/src/renderer/features/lyrics/components/lyrics-search-form.tsx
+++ b/src/renderer/features/lyrics/components/lyrics-search-form.tsx
@@ -1,19 +1,21 @@
-import { useMemo } from 'react';
 import { Divider, Group, Stack } from '@mantine/core';
 import { useForm } from '@mantine/form';
 import { useDebouncedValue } from '@mantine/hooks';
 import { openModal } from '@mantine/modals';
 import orderBy from 'lodash/orderBy';
+import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import styled from 'styled-components';
+
 import {
     InternetProviderLyricSearchResponse,
     LyricSource,
     LyricsOverride,
 } from '../../../api/types';
 import { useLyricSearch } from '../queries/lyric-search-query';
-import { ScrollArea, Spinner, Text, TextInput } from '/@/renderer/components';
+
 import i18n from '/@/i18n/i18n';
+import { ScrollArea, Spinner, Text, TextInput } from '/@/renderer/components';
 
 const SearchItem = styled.button`
     all: unset;
@@ -34,7 +36,7 @@ interface SearchResultProps {
     onClick?: () => void;
 }
 const SearchResult = ({ data, onClick }: SearchResultProps) => {
-    const { artist, name, source, score, id } = data;
+    const { artist, id, name, score, source } = data;
 
     const percentageScore = useMemo(() => {
         if (!score) return 0;
@@ -140,8 +142,8 @@ export const LyricsSearchForm = ({ artist, name, onSearchOverride }: LyricSearch
                 <Spinner container />
             ) : (
                 <ScrollArea
-                    offsetScrollbars
                     h={400}
+                    offsetScrollbars
                     pr="1rem"
                     type="auto"
                     w="100%"
@@ -149,8 +151,8 @@ export const LyricsSearchForm = ({ artist, name, onSearchOverride }: LyricSearch
                     <Stack spacing="md">
                         {searchResults.map((result) => (
                             <SearchResult
-                                key={`${result.source}-${result.id}`}
                                 data={result}
+                                key={`${result.source}-${result.id}`}
                                 onClick={() => {
                                     onSearchOverride?.({
                                         artist: result.artist,
diff --git a/src/renderer/features/lyrics/lyric-line.tsx b/src/renderer/features/lyrics/lyric-line.tsx
index 7656744c..8fa76ac5 100644
--- a/src/renderer/features/lyrics/lyric-line.tsx
+++ b/src/renderer/features/lyrics/lyric-line.tsx
@@ -1,10 +1,11 @@
-import { ComponentPropsWithoutRef } from 'react';
-import { TextTitle } from '/@/renderer/components/text-title';
 import { TitleProps } from '@mantine/core';
+import { ComponentPropsWithoutRef } from 'react';
 import styled from 'styled-components';
 
+import { TextTitle } from '/@/renderer/components/text-title';
+
 interface LyricLineProps extends ComponentPropsWithoutRef<'div'> {
-    alignment: 'left' | 'center' | 'right';
+    alignment: 'center' | 'left' | 'right';
     fontSize: number;
     text: string;
 }
@@ -34,7 +35,7 @@ const StyledText = styled(TextTitle)<TitleProps & { $alignment: string; $fontSiz
     }
 `;
 
-export const LyricLine = ({ text, alignment, fontSize, ...props }: LyricLineProps) => {
+export const LyricLine = ({ alignment, fontSize, text, ...props }: LyricLineProps) => {
     return (
         <StyledText
             $alignment={alignment}
diff --git a/src/renderer/features/lyrics/lyrics-actions.tsx b/src/renderer/features/lyrics/lyrics-actions.tsx
index 75d6b3a8..cdca0887 100644
--- a/src/renderer/features/lyrics/lyrics-actions.tsx
+++ b/src/renderer/features/lyrics/lyrics-actions.tsx
@@ -2,6 +2,7 @@ import { Box, Center, Group, Select, SelectItem } from '@mantine/core';
 import isElectron from 'is-electron';
 import { useTranslation } from 'react-i18next';
 import { RiAddFill, RiSubtractFill } from 'react-icons/ri';
+
 import { LyricsOverride } from '/@/renderer/api/types';
 import { Button, NumberInput, Tooltip } from '/@/renderer/components';
 import { openLyricSearchModal } from '/@/renderer/features/lyrics/components/lyrics-search-form';
@@ -56,9 +57,9 @@ export const LyricsActions = ({
                     <Select
                         clearable={false}
                         data={languages}
+                        onChange={(value) => setIndex(parseInt(value!, 10))}
                         style={{ bottom: 30, position: 'absolute' }}
                         value={index.toString()}
-                        onChange={(value) => setIndex(parseInt(value!, 10))}
                     />
                 </Center>
             )}
@@ -66,9 +67,7 @@ export const LyricsActions = ({
             <Group position="center">
                 {isDesktop && sources.length ? (
                     <Button
-                        uppercase
                         disabled={isActionsDisabled}
-                        variant="subtle"
                         onClick={() =>
                             openLyricSearchModal({
                                 artist: currentSong?.artistName,
@@ -76,14 +75,16 @@ export const LyricsActions = ({
                                 onSearchOverride,
                             })
                         }
+                        uppercase
+                        variant="subtle"
                     >
                         {t('common.search', { postProcess: 'titleCase' })}
                     </Button>
                 ) : null}
                 <Button
                     aria-label="Decrease lyric offset"
-                    variant="subtle"
                     onClick={() => handleLyricOffset(delayMs - 50)}
+                    variant="subtle"
                 >
                     <RiSubtractFill />
                 </Button>
@@ -93,25 +94,25 @@ export const LyricsActions = ({
                 >
                     <NumberInput
                         aria-label="Lyric offset"
+                        onChange={handleLyricOffset}
                         styles={{ input: { textAlign: 'center' } }}
                         value={delayMs || 0}
                         width={55}
-                        onChange={handleLyricOffset}
                     />
                 </Tooltip>
                 <Button
                     aria-label="Increase lyric offset"
-                    variant="subtle"
                     onClick={() => handleLyricOffset(delayMs + 50)}
+                    variant="subtle"
                 >
                     <RiAddFill />
                 </Button>
                 {isDesktop && sources.length ? (
                     <Button
-                        uppercase
                         disabled={isActionsDisabled}
-                        variant="subtle"
                         onClick={onResetLyric}
+                        uppercase
+                        variant="subtle"
                     >
                         {t('common.reset', { postProcess: 'sentenceCase' })}
                     </Button>
@@ -121,10 +122,10 @@ export const LyricsActions = ({
             <Box style={{ position: 'absolute', right: 0, top: 0 }}>
                 {isDesktop && sources.length ? (
                     <Button
-                        uppercase
                         disabled={isActionsDisabled}
-                        variant="subtle"
                         onClick={onRemoveLyric}
+                        uppercase
+                        variant="subtle"
                     >
                         {t('common.clear', { postProcess: 'sentenceCase' })}
                     </Button>
@@ -134,10 +135,10 @@ export const LyricsActions = ({
             <Box style={{ position: 'absolute', right: 0, top: -50 }}>
                 {isDesktop && sources.length ? (
                     <Button
-                        uppercase
                         disabled={isActionsDisabled}
-                        variant="subtle"
                         onClick={onTranslateLyric}
+                        uppercase
+                        variant="subtle"
                     >
                         {t('common.translation', { postProcess: 'sentenceCase' })}
                     </Button>
diff --git a/src/renderer/features/lyrics/lyrics.tsx b/src/renderer/features/lyrics/lyrics.tsx
index 4b5ea97e..32a874e1 100644
--- a/src/renderer/features/lyrics/lyrics.tsx
+++ b/src/renderer/features/lyrics/lyrics.tsx
@@ -1,24 +1,26 @@
-import { useCallback, useEffect, useMemo, useState } from 'react';
 import { Center, Group } from '@mantine/core';
 import { AnimatePresence, motion } from 'framer-motion';
+import { useCallback, useEffect, useMemo, useState } from 'react';
 import { ErrorBoundary } from 'react-error-boundary';
 import { useTranslation } from 'react-i18next';
 import { RiInformationFill } from 'react-icons/ri';
 import styled from 'styled-components';
+
 import { useSongLyricsByRemoteId, useSongLyricsBySong } from './queries/lyric-query';
 import { translateLyrics } from './queries/lyric-translate';
 import { SynchronizedLyrics, SynchronizedLyricsProps } from './synchronized-lyrics';
+
+import { queryKeys } from '/@/renderer/api/query-keys';
+import { FullLyricsMetadata, LyricSource, LyricsOverride } from '/@/renderer/api/types';
 import { Spinner, TextTitle } from '/@/renderer/components';
 import { ErrorFallback } from '/@/renderer/features/action-required';
+import { LyricsActions } from '/@/renderer/features/lyrics/lyrics-actions';
 import {
     UnsynchronizedLyrics,
     UnsynchronizedLyricsProps,
 } from '/@/renderer/features/lyrics/unsynchronized-lyrics';
-import { useCurrentSong, usePlayerStore, useLyricsSettings } from '/@/renderer/store';
-import { FullLyricsMetadata, LyricSource, LyricsOverride } from '/@/renderer/api/types';
-import { LyricsActions } from '/@/renderer/features/lyrics/lyrics-actions';
-import { queryKeys } from '/@/renderer/api/query-keys';
 import { queryClient } from '/@/renderer/lib/react-query';
+import { useCurrentSong, useLyricsSettings, usePlayerStore } from '/@/renderer/store';
 
 const ActionsContainer = styled.div`
     position: absolute;
@@ -89,7 +91,7 @@ export const Lyrics = () => {
     const lyricsSettings = useLyricsSettings();
     const { t } = useTranslation();
     const [index, setIndex] = useState(0);
-    const [translatedLyrics, setTranslatedLyrics] = useState<string | null>(null);
+    const [translatedLyrics, setTranslatedLyrics] = useState<null | string>(null);
     const [showTranslation, setShowTranslation] = useState(false);
 
     const { data, isInitialLoading } = useSongLyricsBySong(
@@ -153,7 +155,7 @@ export const Lyrics = () => {
             : lyrics.lyrics;
         const { translationApiKey, translationApiProvider, translationTargetLanguage } =
             lyricsSettings;
-        const TranslatedText: string | null = await translateLyrics(
+        const TranslatedText: null | string = await translateLyrics(
             originalLyrics,
             translationApiKey,
             translationApiProvider,
@@ -250,11 +252,11 @@ export const Lyrics = () => {
                     <LyricsActions
                         index={index}
                         languages={languages}
-                        setIndex={setIndex}
                         onRemoveLyric={handleOnRemoveLyric}
                         onResetLyric={handleOnResetLyric}
                         onSearchOverride={handleOnSearchOverride}
                         onTranslateLyric={handleOnTranslateLyric}
+                        setIndex={setIndex}
                     />
                 </ActionsContainer>
             </LyricsContainer>
diff --git a/src/renderer/features/lyrics/queries/lyric-query.ts b/src/renderer/features/lyrics/queries/lyric-query.ts
index 7d50e821..0c700cb4 100644
--- a/src/renderer/features/lyrics/queries/lyric-query.ts
+++ b/src/renderer/features/lyrics/queries/lyric-query.ts
@@ -1,23 +1,24 @@
-import { UseQueryResult, useQuery, useQueryClient } from '@tanstack/react-query';
+import { useQuery, useQueryClient, UseQueryResult } from '@tanstack/react-query';
+import isElectron from 'is-electron';
+
+import { api } from '/@/renderer/api';
+import { ServerFeature } from '/@/renderer/api/features-types';
+import { queryKeys } from '/@/renderer/api/query-keys';
 import {
+    FullLyricsMetadata,
+    InternetProviderLyricResponse,
+    LyricGetQuery,
     LyricsQuery,
     QueueSong,
-    SynchronizedLyricsArray,
-    InternetProviderLyricResponse,
-    FullLyricsMetadata,
-    LyricGetQuery,
-    StructuredLyric,
     ServerType,
+    StructuredLyric,
+    SynchronizedLyricsArray,
 } from '/@/renderer/api/types';
+import { hasFeature } from '/@/renderer/api/utils';
 import { QueryHookArgs } from '/@/renderer/lib/react-query';
 import { getServerById, useLyricsSettings } from '/@/renderer/store';
-import { queryKeys } from '/@/renderer/api/query-keys';
-import { api } from '/@/renderer/api';
-import isElectron from 'is-electron';
-import { hasFeature } from '/@/renderer/api/utils';
-import { ServerFeature } from '/@/renderer/api/features-types';
 
-const lyricsIpc = isElectron() ? window.electron.lyrics : null;
+const lyricsIpc = isElectron() ? window.api.lyrics : null;
 
 // Match LRC lyrics format by https://github.com/ustbhuangyi/lyric-parser
 // [mm:ss.SSS] text
@@ -62,7 +63,7 @@ const formatLyrics = (lyrics: string) => {
 
 export const useServerLyrics = (
     args: QueryHookArgs<LyricsQuery>,
-): UseQueryResult<string | null> => {
+): UseQueryResult<null | string> => {
     const { query, serverId } = args;
     const server = getServerById(serverId);
 
@@ -92,7 +93,7 @@ export const useSongLyricsBySong = (
         cacheTime: Infinity,
         enabled: !!song && !!server,
         onError: () => {},
-        queryFn: async ({ signal }): Promise<FullLyricsMetadata | StructuredLyric[] | null> => {
+        queryFn: async ({ signal }): Promise<FullLyricsMetadata | null | StructuredLyric[]> => {
             if (!server) throw new Error('Server not found');
             if (!song) return null;
 
@@ -156,7 +157,7 @@ export const useSongLyricsBySong = (
 
 export const useSongLyricsByRemoteId = (
     args: QueryHookArgs<Partial<LyricGetQuery>>,
-): UseQueryResult<string | null> => {
+): UseQueryResult<null | string> => {
     const queryClient = useQueryClient();
     const { query, serverId } = args;
 
diff --git a/src/renderer/features/lyrics/queries/lyric-search-query.ts b/src/renderer/features/lyrics/queries/lyric-search-query.ts
index f82e2adb..047a2c09 100644
--- a/src/renderer/features/lyrics/queries/lyric-search-query.ts
+++ b/src/renderer/features/lyrics/queries/lyric-search-query.ts
@@ -1,5 +1,6 @@
 import { useQuery } from '@tanstack/react-query';
 import isElectron from 'is-electron';
+
 import { queryKeys } from '/@/renderer/api/query-keys';
 import {
     InternetProviderLyricSearchResponse,
@@ -8,7 +9,7 @@ import {
 } from '/@/renderer/api/types';
 import { QueryHookArgs } from '/@/renderer/lib/react-query';
 
-const lyricsIpc = isElectron() ? window.electron.lyrics : null;
+const lyricsIpc = isElectron() ? window.api.lyrics : null;
 
 export const useLyricSearch = (args: Omit<QueryHookArgs<LyricSearchQuery>, 'serverId'>) => {
     const { options, query } = args;
diff --git a/src/renderer/features/lyrics/queries/lyric-translate.ts b/src/renderer/features/lyrics/queries/lyric-translate.ts
index f6d6039b..39fc74f5 100644
--- a/src/renderer/features/lyrics/queries/lyric-translate.ts
+++ b/src/renderer/features/lyrics/queries/lyric-translate.ts
@@ -3,8 +3,8 @@ import axios from 'axios';
 export const translateLyrics = async (
     originalLyrics: string,
     translationApiKey: string,
-    translationApiProvider: string | null,
-    translationTargetLanguage: string | null,
+    translationApiProvider: null | string,
+    translationTargetLanguage: null | string,
 ) => {
     let TranslatedText = '';
     if (translationApiProvider === 'Microsoft Azure') {
diff --git a/src/renderer/features/lyrics/synchronized-lyrics.tsx b/src/renderer/features/lyrics/synchronized-lyrics.tsx
index 53ee960b..41bb3b70 100644
--- a/src/renderer/features/lyrics/synchronized-lyrics.tsx
+++ b/src/renderer/features/lyrics/synchronized-lyrics.tsx
@@ -1,4 +1,11 @@
+import isElectron from 'is-electron';
 import { useCallback, useEffect, useRef } from 'react';
+import styled from 'styled-components';
+
+import { FullLyricsMetadata, SynchronizedLyricsArray } from '/@/renderer/api/types';
+import { LyricLine } from '/@/renderer/features/lyrics/lyric-line';
+import { useScrobble } from '/@/renderer/features/player/hooks/use-scrobble';
+import { PlayersRef } from '/@/renderer/features/player/ref/players-ref';
 import {
     useCurrentPlayer,
     useCurrentStatus,
@@ -10,16 +17,10 @@ import {
     useSetCurrentTime,
 } from '/@/renderer/store';
 import { PlaybackType, PlayerStatus } from '/@/renderer/types';
-import { LyricLine } from '/@/renderer/features/lyrics/lyric-line';
-import isElectron from 'is-electron';
-import { PlayersRef } from '/@/renderer/features/player/ref/players-ref';
-import { FullLyricsMetadata, SynchronizedLyricsArray } from '/@/renderer/api/types';
-import styled from 'styled-components';
-import { useScrobble } from '/@/renderer/features/player/hooks/use-scrobble';
 
-const mpvPlayer = isElectron() ? window.electron.mpvPlayer : null;
-const utils = isElectron() ? window.electron.utils : null;
-const mpris = isElectron() && utils?.isLinux() ? window.electron.mpris : null;
+const mpvPlayer = isElectron() ? window.api.mpvPlayer : null;
+const utils = isElectron() ? window.api.utils : null;
+const mpris = isElectron() && utils?.isLinux() ? window.api.mpris : null;
 
 const SynchronizedLyricsContainer = styled.div<{ $gap: number }>`
     display: flex;
@@ -55,7 +56,7 @@ const SynchronizedLyricsContainer = styled.div<{ $gap: number }>`
 
 export interface SynchronizedLyricsProps extends Omit<FullLyricsMetadata, 'lyrics'> {
     lyrics: SynchronizedLyricsArray;
-    translatedLyrics?: string | null;
+    translatedLyrics?: null | string;
 }
 
 export const SynchronizedLyrics = ({
@@ -185,7 +186,7 @@ export const SynchronizedLyrics = ({
                 'sychronized-lyrics-scroll-container',
             ) as HTMLElement;
             const currentLyric = document.querySelector(`#lyric-${index}`) as HTMLElement;
-            // eslint-disable-next-line no-unsafe-optional-chaining
+
             const offsetTop = currentLyric?.offsetTop - doc?.clientHeight / 2 ?? 0;
 
             if (currentLyric === null) {
@@ -372,16 +373,16 @@ export const SynchronizedLyrics = ({
                         className="lyric-line synchronized"
                         fontSize={settings.fontSize}
                         id={`lyric-${idx}`}
-                        text={text}
                         onClick={() => handleSeek(time / 1000)}
+                        text={text}
                     />
                     {translatedLyrics && (
                         <LyricLine
                             alignment={settings.alignment}
                             className="lyric-line synchronized translation"
                             fontSize={settings.fontSize * 0.8}
-                            text={translatedLyrics.split('\n')[idx]}
                             onClick={() => handleSeek(time / 1000)}
+                            text={translatedLyrics.split('\n')[idx]}
                         />
                     )}
                 </div>
diff --git a/src/renderer/features/lyrics/unsynchronized-lyrics.tsx b/src/renderer/features/lyrics/unsynchronized-lyrics.tsx
index 1d94baf2..2c313ee5 100644
--- a/src/renderer/features/lyrics/unsynchronized-lyrics.tsx
+++ b/src/renderer/features/lyrics/unsynchronized-lyrics.tsx
@@ -1,12 +1,13 @@
 import { useMemo } from 'react';
 import styled from 'styled-components';
-import { LyricLine } from '/@/renderer/features/lyrics/lyric-line';
+
 import { FullLyricsMetadata } from '/@/renderer/api/types';
+import { LyricLine } from '/@/renderer/features/lyrics/lyric-line';
 import { useLyricsSettings } from '/@/renderer/store';
 
 export interface UnsynchronizedLyricsProps extends Omit<FullLyricsMetadata, 'lyrics'> {
     lyrics: string;
-    translatedLyrics?: string | null;
+    translatedLyrics?: null | string;
 }
 
 const UnsynchronizedLyricsContainer = styled.div<{ $gap: number }>`
diff --git a/src/renderer/features/now-playing/components/drawer-play-queue.tsx b/src/renderer/features/now-playing/components/drawer-play-queue.tsx
index 057bcc7d..eb2205f7 100644
--- a/src/renderer/features/now-playing/components/drawer-play-queue.tsx
+++ b/src/renderer/features/now-playing/components/drawer-play-queue.tsx
@@ -1,12 +1,15 @@
-import { useRef } from 'react';
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
+
 import { Box, Flex } from '@mantine/core';
+import { useRef } from 'react';
+
 import { PlayQueueListControls } from './play-queue-list-controls';
+
 import { Song } from '/@/renderer/api/types';
 import { PlayQueue } from '/@/renderer/features/now-playing/components/play-queue';
 
 export const DrawerPlayQueue = () => {
-    const queueRef = useRef<{ grid: AgGridReactType<Song> } | null>(null);
+    const queueRef = useRef<null | { grid: AgGridReactType<Song> }>(null);
 
     return (
         <Flex
diff --git a/src/renderer/features/now-playing/components/play-queue-list-controls.tsx b/src/renderer/features/now-playing/components/play-queue-list-controls.tsx
index eb42bde0..f22448ab 100644
--- a/src/renderer/features/now-playing/components/play-queue-list-controls.tsx
+++ b/src/renderer/features/now-playing/components/play-queue-list-controls.tsx
@@ -1,43 +1,46 @@
-import type { MutableRefObject } from 'react';
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
+import type { MutableRefObject } from 'react';
+
 import { Group } from '@mantine/core';
-import { Button, Popover } from '/@/renderer/components';
 import isElectron from 'is-electron';
 import { useTranslation } from 'react-i18next';
 import {
     RiArrowDownLine,
     RiArrowGoForwardLine,
     RiArrowUpLine,
-    RiShuffleLine,
     RiDeleteBinLine,
-    RiListSettingsLine,
     RiEraserLine,
+    RiListSettingsLine,
+    RiShuffleLine,
 } from 'react-icons/ri';
-import { Song } from '/@/renderer/api/types';
-import { usePlayerControls, useQueueControls } from '/@/renderer/store';
-import { PlaybackType, TableType } from '/@/renderer/types';
-import { usePlaybackType } from '/@/renderer/store/settings.store';
+
 import { usePlayerStore, useSetCurrentTime } from '../../../store/player.store';
+
+import { Song } from '/@/renderer/api/types';
+import { Button, Popover } from '/@/renderer/components';
 import { TableConfigDropdown } from '/@/renderer/components/virtual-table';
 import { updateSong } from '/@/renderer/features/player/update-remote-song';
+import { usePlayerControls, useQueueControls } from '/@/renderer/store';
+import { usePlaybackType } from '/@/renderer/store/settings.store';
+import { PlaybackType, TableType } from '/@/renderer/types';
 import { setQueue, setQueueNext } from '/@/renderer/utils/set-transcoded-queue-data';
 
-const mpvPlayer = isElectron() ? window.electron.mpvPlayer : null;
+const mpvPlayer = isElectron() ? window.api.mpvPlayer : null;
 
 interface PlayQueueListOptionsProps {
-    tableRef: MutableRefObject<{ grid: AgGridReactType<Song> } | null>;
+    tableRef: MutableRefObject<null | { grid: AgGridReactType<Song> }>;
     type: TableType;
 }
 
-export const PlayQueueListControls = ({ type, tableRef }: PlayQueueListOptionsProps) => {
+export const PlayQueueListControls = ({ tableRef, type }: PlayQueueListOptionsProps) => {
     const { t } = useTranslation();
     const {
         clearQueue,
         moveToBottomOfQueue,
         moveToNextOfQueue,
         moveToTopOfQueue,
-        shuffleQueue,
         removeFromQueue,
+        shuffleQueue,
     } = useQueueControls();
 
     const { pause } = usePlayerControls();
@@ -136,57 +139,57 @@ export const PlayQueueListControls = ({ type, tableRef }: PlayQueueListOptionsPr
             <Group spacing="sm">
                 <Button
                     compact
+                    onClick={handleShuffleQueue}
                     size="md"
                     tooltip={{ label: t('player.shuffle', { postProcess: 'sentenceCase' }) }}
                     variant="default"
-                    onClick={handleShuffleQueue}
                 >
                     <RiShuffleLine size="1.1rem" />
                 </Button>
                 <Button
                     compact
+                    onClick={handleMoveToNext}
                     size="md"
                     tooltip={{ label: t('action.moveToNext', { postProcess: 'sentenceCase' }) }}
                     variant="default"
-                    onClick={handleMoveToNext}
                 >
                     <RiArrowGoForwardLine size="1.1rem" />
                 </Button>
                 <Button
                     compact
+                    onClick={handleMoveToBottom}
                     size="md"
                     tooltip={{ label: t('action.moveToBottom', { postProcess: 'sentenceCase' }) }}
                     variant="default"
-                    onClick={handleMoveToBottom}
                 >
                     <RiArrowDownLine size="1.1rem" />
                 </Button>
                 <Button
                     compact
+                    onClick={handleMoveToTop}
                     size="md"
                     tooltip={{ label: t('action.moveToTop', { postProcess: 'sentenceCase' }) }}
                     variant="default"
-                    onClick={handleMoveToTop}
                 >
                     <RiArrowUpLine size="1.1rem" />
                 </Button>
                 <Button
                     compact
+                    onClick={handleRemoveSelected}
                     size="md"
                     tooltip={{
                         label: t('action.removeFromQueue', { postProcess: 'sentenceCase' }),
                     }}
                     variant="default"
-                    onClick={handleRemoveSelected}
                 >
                     <RiEraserLine size="1.1rem" />
                 </Button>
                 <Button
                     compact
+                    onClick={handleClearQueue}
                     size="md"
                     tooltip={{ label: t('action.clearQueue', { postProcess: 'sentenceCase' }) }}
                     variant="default"
-                    onClick={handleClearQueue}
                 >
                     <RiDeleteBinLine size="1.1rem" />
                 </Button>
diff --git a/src/renderer/features/now-playing/components/play-queue.tsx b/src/renderer/features/now-playing/components/play-queue.tsx
index 8e69614c..15d5d1af 100644
--- a/src/renderer/features/now-playing/components/play-queue.tsx
+++ b/src/renderer/features/now-playing/components/play-queue.tsx
@@ -1,5 +1,3 @@
-import type { Ref } from 'react';
-import { useState, forwardRef, useEffect, useImperativeHandle, useMemo, useRef } from 'react';
 import type {
     CellDoubleClickedEvent,
     RowClassRules,
@@ -7,7 +5,24 @@ import type {
     RowNode,
 } from '@ag-grid-community/core';
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
+import type { Ref } from 'react';
+
+import { useMergedRef } from '@mantine/hooks';
 import '@ag-grid-community/styles/ag-theme-alpine.css';
+import isElectron from 'is-electron';
+import debounce from 'lodash/debounce';
+import { forwardRef, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
+import { ErrorBoundary } from 'react-error-boundary';
+
+import { LibraryItem, QueueSong } from '/@/renderer/api/types';
+import { VirtualGridAutoSizerContainer } from '/@/renderer/components/virtual-grid';
+import { getColumnDefs, VirtualTable } from '/@/renderer/components/virtual-table';
+import { ErrorFallback } from '/@/renderer/features/action-required';
+import { useHandleTableContextMenu } from '/@/renderer/features/context-menu';
+import { QUEUE_CONTEXT_MENU_ITEMS } from '/@/renderer/features/context-menu/context-menu-items';
+import { PlayersRef } from '/@/renderer/features/player/ref/players-ref';
+import { updateSong } from '/@/renderer/features/player/update-remote-song';
+import { useAppFocus } from '/@/renderer/hooks';
 import {
     useAppStoreActions,
     useCurrentSong,
@@ -24,23 +39,10 @@ import {
     useSettingsStoreActions,
     useTableSettings,
 } from '/@/renderer/store/settings.store';
-import { useMergedRef } from '@mantine/hooks';
-import isElectron from 'is-electron';
-import debounce from 'lodash/debounce';
-import { ErrorBoundary } from 'react-error-boundary';
-import { getColumnDefs, VirtualTable } from '/@/renderer/components/virtual-table';
-import { ErrorFallback } from '/@/renderer/features/action-required';
 import { PlaybackType, TableType } from '/@/renderer/types';
-import { LibraryItem, QueueSong } from '/@/renderer/api/types';
-import { useHandleTableContextMenu } from '/@/renderer/features/context-menu';
-import { QUEUE_CONTEXT_MENU_ITEMS } from '/@/renderer/features/context-menu/context-menu-items';
-import { VirtualGridAutoSizerContainer } from '/@/renderer/components/virtual-grid';
-import { useAppFocus } from '/@/renderer/hooks';
-import { PlayersRef } from '/@/renderer/features/player/ref/players-ref';
-import { updateSong } from '/@/renderer/features/player/update-remote-song';
 import { setQueue, setQueueNext } from '/@/renderer/utils/set-transcoded-queue-data';
 
-const mpvPlayer = isElectron() ? window.electron.mpvPlayer : null;
+const mpvPlayer = isElectron() ? window.api.mpvPlayer : null;
 
 type QueueProps = {
     type: TableType;
@@ -248,10 +250,7 @@ export const PlayQueue = forwardRef(({ type }: QueueProps, ref: Ref<any>) => {
         <ErrorBoundary FallbackComponent={ErrorFallback}>
             <VirtualGridAutoSizerContainer>
                 <VirtualTable
-                    ref={mergedRef}
                     alwaysShowHorizontalScroll
-                    rowDragEntireRow
-                    rowDragMultiRow
                     autoFitColumns={tableConfig.autoFit}
                     columnDefs={columnDefs}
                     context={{
@@ -265,11 +264,6 @@ export const PlayQueue = forwardRef(({ type }: QueueProps, ref: Ref<any>) => {
                     }}
                     deselectOnClickOutside={type === 'fullScreen'}
                     getRowId={(data) => data.data.uniqueId}
-                    rowBuffer={50}
-                    rowClassRules={rowClassRules}
-                    rowData={queue}
-                    rowHeight={tableConfig.rowHeight || 40}
-                    suppressCellFocus={type === 'fullScreen'}
                     onCellContextMenu={onCellContextMenu}
                     onCellDoubleClicked={handleDoubleClick}
                     onColumnMoved={handleColumnChange}
@@ -278,6 +272,14 @@ export const PlayQueue = forwardRef(({ type }: QueueProps, ref: Ref<any>) => {
                     onGridReady={handleGridReady}
                     onGridSizeChanged={handleGridSizeChange}
                     onRowDragEnd={handleDragEnd}
+                    ref={mergedRef}
+                    rowBuffer={50}
+                    rowClassRules={rowClassRules}
+                    rowData={queue}
+                    rowDragEntireRow
+                    rowDragMultiRow
+                    rowHeight={tableConfig.rowHeight || 40}
+                    suppressCellFocus={type === 'fullScreen'}
                 />
             </VirtualGridAutoSizerContainer>
         </ErrorBoundary>
diff --git a/src/renderer/features/now-playing/components/sidebar-play-queue.tsx b/src/renderer/features/now-playing/components/sidebar-play-queue.tsx
index 7e1d6fbf..fd278c42 100644
--- a/src/renderer/features/now-playing/components/sidebar-play-queue.tsx
+++ b/src/renderer/features/now-playing/components/sidebar-play-queue.tsx
@@ -1,16 +1,19 @@
-import { useRef } from 'react';
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
+
 import { Stack } from '@mantine/core';
-import { PlayQueue } from '/@/renderer/features/now-playing/components/play-queue';
+import { useRef } from 'react';
+
 import { PlayQueueListControls } from './play-queue-list-controls';
+
 import { Song } from '/@/renderer/api/types';
 import { PageHeader, Paper } from '/@/renderer/components';
+import { VirtualGridContainer } from '/@/renderer/components/virtual-grid';
+import { PlayQueue } from '/@/renderer/features/now-playing/components/play-queue';
 import { useWindowSettings } from '/@/renderer/store/settings.store';
 import { Platform } from '/@/renderer/types';
-import { VirtualGridContainer } from '/@/renderer/components/virtual-grid';
 
 export const SidebarPlayQueue = () => {
-    const queueRef = useRef<{ grid: AgGridReactType<Song> } | null>(null);
+    const queueRef = useRef<null | { grid: AgGridReactType<Song> }>(null);
     const { windowBarStyle } = useWindowSettings();
 
     const isWeb = windowBarStyle === Platform.WEB;
diff --git a/src/renderer/features/now-playing/index.ts b/src/renderer/features/now-playing/index.ts
index 4c2467af..a53963f1 100644
--- a/src/renderer/features/now-playing/index.ts
+++ b/src/renderer/features/now-playing/index.ts
@@ -1,4 +1,4 @@
-export * from './components/play-queue';
-export * from './components/sidebar-play-queue';
 export * from './components/drawer-play-queue';
+export * from './components/play-queue';
 export * from './components/play-queue-list-controls';
+export * from './components/sidebar-play-queue';
diff --git a/src/renderer/features/now-playing/routes/now-playing-route.tsx b/src/renderer/features/now-playing/routes/now-playing-route.tsx
index 8f2b0321..2c962e68 100644
--- a/src/renderer/features/now-playing/routes/now-playing-route.tsx
+++ b/src/renderer/features/now-playing/routes/now-playing-route.tsx
@@ -1,15 +1,17 @@
-import { useRef } from 'react';
+import type { Song } from '/@/renderer/api/types';
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
+
+import { useRef } from 'react';
+
+import { Paper } from '/@/renderer/components';
+import { VirtualGridContainer } from '/@/renderer/components/virtual-grid';
 import { NowPlayingHeader } from '/@/renderer/features/now-playing/components/now-playing-header';
 import { PlayQueue } from '/@/renderer/features/now-playing/components/play-queue';
-import type { Song } from '/@/renderer/api/types';
-import { AnimatedPage } from '/@/renderer/features/shared';
-import { Paper } from '/@/renderer/components';
 import { PlayQueueListControls } from '/@/renderer/features/now-playing/components/play-queue-list-controls';
-import { VirtualGridContainer } from '/@/renderer/components/virtual-grid';
+import { AnimatedPage } from '/@/renderer/features/shared';
 
 const NowPlayingRoute = () => {
-    const queueRef = useRef<{ grid: AgGridReactType<Song> } | null>(null);
+    const queueRef = useRef<null | { grid: AgGridReactType<Song> }>(null);
 
     return (
         <AnimatedPage>
diff --git a/src/renderer/features/player/components/center-controls.tsx b/src/renderer/features/player/components/center-controls.tsx
index f93e2b21..d1ff0ab2 100644
--- a/src/renderer/features/player/components/center-controls.tsx
+++ b/src/renderer/features/player/components/center-controls.tsx
@@ -1,9 +1,10 @@
-import { useEffect, useState } from 'react';
 import { useHotkeys } from '@mantine/hooks';
 import { useQueryClient } from '@tanstack/react-query';
 import formatDuration from 'format-duration';
 import isElectron from 'is-electron';
+import { useEffect, useState } from 'react';
 import { useTranslation } from 'react-i18next';
+import { BsDice3 } from 'react-icons/bs';
 import { IoIosPause } from 'react-icons/io';
 import {
     RiPlayFill,
@@ -16,29 +17,30 @@ import {
     RiSpeedFill,
     RiStopFill,
 } from 'react-icons/ri';
-import { BsDice3 } from 'react-icons/bs';
 import styled from 'styled-components';
-import { Text } from '/@/renderer/components';
+
 import { useCenterControls } from '../hooks/use-center-controls';
 import { PlayerButton } from './player-button';
+import { openShuffleAllModal } from './shuffle-all-modal';
+
+import { Text } from '/@/renderer/components';
+import { PlayerbarSlider } from '/@/renderer/features/player/components/playerbar-slider';
+import { usePlayQueueAdd } from '/@/renderer/features/player/hooks/use-playqueue-add';
 import {
+    useCurrentPlayer,
     useCurrentSong,
     useCurrentStatus,
-    useCurrentPlayer,
-    useSetCurrentTime,
-    useRepeatStatus,
-    useShuffleStatus,
     useCurrentTime,
+    useRepeatStatus,
+    useSetCurrentTime,
+    useShuffleStatus,
 } from '/@/renderer/store';
 import {
     useHotkeySettings,
     usePlaybackType,
     useSettingsStore,
 } from '/@/renderer/store/settings.store';
-import { PlayerStatus, PlaybackType, PlayerShuffle, PlayerRepeat } from '/@/renderer/types';
-import { PlayerbarSlider } from '/@/renderer/features/player/components/playerbar-slider';
-import { openShuffleAllModal } from './shuffle-all-modal';
-import { usePlayQueueAdd } from '/@/renderer/features/player/hooks/use-playqueue-add';
+import { PlaybackType, PlayerRepeat, PlayerShuffle, PlayerStatus } from '/@/renderer/types';
 
 interface CenterControlsProps {
     playersRef: any;
@@ -111,16 +113,16 @@ export const CenterControls = ({ playersRef }: CenterControlsProps) => {
 
     const {
         handleNextTrack,
+        handlePause,
+        handlePlay,
         handlePlayPause,
         handlePrevTrack,
         handleSeekSlider,
         handleSkipBackward,
         handleSkipForward,
+        handleStop,
         handleToggleRepeat,
         handleToggleShuffle,
-        handleStop,
-        handlePause,
-        handlePlay,
     } = useCenterControls({ playersRef });
     const handlePlayQueueAdd = usePlayQueueAdd();
 
@@ -174,15 +176,16 @@ export const CenterControls = ({ playersRef }: CenterControlsProps) => {
                 <ButtonsContainer>
                     <PlayerButton
                         icon={<RiStopFill size={buttonSize} />}
+                        onClick={handleStop}
                         tooltip={{
                             label: t('player.stop', { postProcess: 'sentenceCase' }),
                         }}
                         variant="tertiary"
-                        onClick={handleStop}
                     />
                     <PlayerButton
                         $isActive={shuffle !== PlayerShuffle.NONE}
                         icon={<RiShuffleFill size={buttonSize} />}
+                        onClick={handleToggleShuffle}
                         tooltip={{
                             label:
                                 shuffle === PlayerShuffle.NONE
@@ -193,19 +196,19 @@ export const CenterControls = ({ playersRef }: CenterControlsProps) => {
                                     : t('player.shuffle', { postProcess: 'sentenceCase' }),
                         }}
                         variant="tertiary"
-                        onClick={handleToggleShuffle}
                     />
                     <PlayerButton
                         icon={<RiSkipBackFill size={buttonSize} />}
+                        onClick={handlePrevTrack}
                         tooltip={{
                             label: t('player.previous', { postProcess: 'sentenceCase' }),
                         }}
                         variant="secondary"
-                        onClick={handlePrevTrack}
                     />
                     {skip?.enabled && (
                         <PlayerButton
                             icon={<RiRewindFill size={buttonSize} />}
+                            onClick={() => handleSkipBackward(skip?.skipBackwardSeconds)}
                             tooltip={{
                                 label: t('player.skip', {
                                     context: 'back',
@@ -213,7 +216,6 @@ export const CenterControls = ({ playersRef }: CenterControlsProps) => {
                                 }),
                             }}
                             variant="secondary"
-                            onClick={() => handleSkipBackward(skip?.skipBackwardSeconds)}
                         />
                     )}
                     <PlayerButton
@@ -225,6 +227,7 @@ export const CenterControls = ({ playersRef }: CenterControlsProps) => {
                                 <IoIosPause size={buttonSize} />
                             )
                         }
+                        onClick={handlePlayPause}
                         tooltip={{
                             label:
                                 status === PlayerStatus.PAUSED
@@ -232,11 +235,11 @@ export const CenterControls = ({ playersRef }: CenterControlsProps) => {
                                     : t('player.pause', { postProcess: 'sentenceCase' }),
                         }}
                         variant="main"
-                        onClick={handlePlayPause}
                     />
                     {skip?.enabled && (
                         <PlayerButton
                             icon={<RiSpeedFill size={buttonSize} />}
+                            onClick={() => handleSkipForward(skip?.skipForwardSeconds)}
                             tooltip={{
                                 label: t('player.skip', {
                                     context: 'forward',
@@ -244,16 +247,15 @@ export const CenterControls = ({ playersRef }: CenterControlsProps) => {
                                 }),
                             }}
                             variant="secondary"
-                            onClick={() => handleSkipForward(skip?.skipForwardSeconds)}
                         />
                     )}
                     <PlayerButton
                         icon={<RiSkipForwardFill size={buttonSize} />}
+                        onClick={handleNextTrack}
                         tooltip={{
                             label: t('player.next', { postProcess: 'sentenceCase' }),
                         }}
                         variant="secondary"
-                        onClick={handleNextTrack}
                     />
                     <PlayerButton
                         $isActive={repeat !== PlayerRepeat.NONE}
@@ -264,6 +266,7 @@ export const CenterControls = ({ playersRef }: CenterControlsProps) => {
                                 <RiRepeat2Line size={buttonSize} />
                             )
                         }
+                        onClick={handleToggleRepeat}
                         tooltip={{
                             label: `${
                                 repeat === PlayerRepeat.NONE
@@ -283,21 +286,20 @@ export const CenterControls = ({ playersRef }: CenterControlsProps) => {
                             }`,
                         }}
                         variant="tertiary"
-                        onClick={handleToggleRepeat}
                     />
 
                     <PlayerButton
                         icon={<BsDice3 size={buttonSize} />}
-                        tooltip={{
-                            label: t('player.playRandom', { postProcess: 'sentenceCase' }),
-                        }}
-                        variant="tertiary"
                         onClick={() =>
                             openShuffleAllModal({
                                 handlePlayQueueAdd,
                                 queryClient,
                             })
                         }
+                        tooltip={{
+                            label: t('player.playRandom', { postProcess: 'sentenceCase' }),
+                        }}
+                        variant="tertiary"
                     />
                 </ButtonsContainer>
             </ControlsContainer>
@@ -317,9 +319,6 @@ export const CenterControls = ({ playersRef }: CenterControlsProps) => {
                         label={(value) => formatDuration(value * 1000)}
                         max={songDuration}
                         min={0}
-                        size={6}
-                        value={!isSeeking ? currentTime : seekValue}
-                        w="100%"
                         onChange={(e) => {
                             setIsSeeking(true);
                             setSeekValue(e);
@@ -333,6 +332,9 @@ export const CenterControls = ({ playersRef }: CenterControlsProps) => {
                                 setIsSeeking(false);
                             }, 50);
                         }}
+                        size={6}
+                        value={!isSeeking ? currentTime : seekValue}
+                        w="100%"
                     />
                 </SliderWrapper>
                 <SliderValueWrapper $position="right">
diff --git a/src/renderer/features/player/components/full-screen-player-image.tsx b/src/renderer/features/player/components/full-screen-player-image.tsx
index 269517de..3fbaac52 100644
--- a/src/renderer/features/player/components/full-screen-player-image.tsx
+++ b/src/renderer/features/player/components/full-screen-player-image.tsx
@@ -1,11 +1,12 @@
-import { Flex, Stack, Group, Center } from '@mantine/core';
+import { Center, Flex, Group, Stack } from '@mantine/core';
 import { useSetState } from '@mantine/hooks';
 import { AnimatePresence, HTMLMotionProps, motion, Variants } from 'framer-motion';
-import { useEffect, useRef, useLayoutEffect, useState, useCallback, Fragment } from 'react';
+import { Fragment, useCallback, useEffect, useLayoutEffect, useRef, useState } from 'react';
 import { RiAlbumFill } from 'react-icons/ri';
 import { generatePath } from 'react-router';
 import { Link } from 'react-router-dom';
 import styled from 'styled-components';
+
 import { QueueSong } from '/@/renderer/api/types';
 import { Badge, Text, TextTitle } from '/@/renderer/components';
 import { useFastAverageColor } from '/@/renderer/hooks';
@@ -90,7 +91,7 @@ const imageVariants: Variants = {
     },
 };
 
-const scaleImageUrl = (imageSize: number, url?: string | null) => {
+const scaleImageUrl = (imageSize: number, url?: null | string) => {
     return url
         ?.replace(/&size=\d+/, `&size=${imageSize}`)
         .replace(/\?width=\d+/, `?width=${imageSize}`)
@@ -213,13 +214,13 @@ export const FullScreenPlayerImage = () => {
                 >
                     {imageState.current === 0 && (
                         <ImageWithPlaceholder
-                            key={imageKey}
                             animate="open"
                             className="full-screen-player-image"
                             custom={{ isOpen: imageState.current === 0 }}
                             draggable={false}
                             exit="closed"
                             initial="closed"
+                            key={imageKey}
                             placeholder="var(--placeholder-bg)"
                             src={imageState.topImage || ''}
                             useAspectRatio={useImageAspectRatio}
@@ -229,13 +230,13 @@ export const FullScreenPlayerImage = () => {
 
                     {imageState.current === 1 && (
                         <ImageWithPlaceholder
-                            key={imageKey}
                             animate="open"
                             className="full-screen-player-image"
                             custom={{ isOpen: imageState.current === 1 }}
                             draggable={false}
                             exit="closed"
                             initial="closed"
+                            key={imageKey}
                             placeholder="var(--placeholder-bg)"
                             src={imageState.bottomImage || ''}
                             useAspectRatio={useImageAspectRatio}
@@ -279,8 +280,8 @@ export const FullScreenPlayerImage = () => {
                     {currentSong?.album}{' '}
                 </TextTitle>
                 <TextTitle
-                    key="fs-artists"
                     align="center"
+                    key="fs-artists"
                     order={3}
                     style={{
                         textShadow: 'var(--fullscreen-player-text-shadow)',
diff --git a/src/renderer/features/player/components/full-screen-player-queue.tsx b/src/renderer/features/player/components/full-screen-player-queue.tsx
index e053c8ba..ceb8a8fc 100644
--- a/src/renderer/features/player/components/full-screen-player-queue.tsx
+++ b/src/renderer/features/player/components/full-screen-player-queue.tsx
@@ -1,20 +1,21 @@
 import { Group } from '@mantine/core';
 import { motion } from 'framer-motion';
+import { lazy, Suspense, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { HiOutlineQueueList } from 'react-icons/hi2';
 import { RiFileMusicLine, RiFileTextLine } from 'react-icons/ri';
 import styled from 'styled-components';
+
 import { Button } from '/@/renderer/components';
+import { Lyrics } from '/@/renderer/features/lyrics/lyrics';
 import { PlayQueue } from '/@/renderer/features/now-playing';
+import { FullScreenSimilarSongs } from '/@/renderer/features/player/components/full-screen-similar-songs';
+import { usePlaybackSettings } from '/@/renderer/store';
 import {
     useFullScreenPlayerStore,
     useFullScreenPlayerStoreActions,
 } from '/@/renderer/store/full-screen-player.store';
-import { Lyrics } from '/@/renderer/features/lyrics/lyrics';
-import { lazy, Suspense, useMemo } from 'react';
-import { usePlaybackSettings } from '/@/renderer/store';
 import { PlaybackType } from '/@/renderer/types';
-import { FullScreenSimilarSongs } from '/@/renderer/features/player/components/full-screen-similar-songs';
 
 const Visualizer = lazy(() =>
     import('/@/renderer/features/player/components/visualizer').then((module) => ({
@@ -112,17 +113,17 @@ export const FullScreenPlayerQueue = () => {
             opacity={opacity}
         >
             <Group
-                grow
                 align="center"
                 className="full-screen-player-queue-header"
+                grow
                 position="center"
             >
                 {headerItems.map((item) => (
                     <HeaderItemWrapper key={`tab-${item.label}`}>
                         <Button
                             fullWidth
-                            uppercase
                             fw="600"
+                            onClick={item.onClick}
                             pos="relative"
                             size="lg"
                             sx={{
@@ -132,8 +133,8 @@ export const FullScreenPlayerQueue = () => {
                                     : 'var(--main-fg-secondary) !important',
                                 letterSpacing: '1px',
                             }}
+                            uppercase
                             variant="subtle"
-                            onClick={item.onClick}
                         >
                             {item.label}
                         </Button>
diff --git a/src/renderer/features/player/components/full-screen-player.tsx b/src/renderer/features/player/components/full-screen-player.tsx
index 9078e383..1ec7c3f6 100644
--- a/src/renderer/features/player/components/full-screen-player.tsx
+++ b/src/renderer/features/player/components/full-screen-player.tsx
@@ -1,11 +1,14 @@
-import { useLayoutEffect, useRef } from 'react';
 import { Divider, Group } from '@mantine/core';
 import { useHotkeys } from '@mantine/hooks';
-import { Variants, motion } from 'framer-motion';
+import { motion, Variants } from 'framer-motion';
+import { useLayoutEffect, useRef } from 'react';
 import { useTranslation } from 'react-i18next';
 import { RiArrowDownSLine, RiSettings3Line } from 'react-icons/ri';
 import { useLocation } from 'react-router';
 import styled from 'styled-components';
+
+import { useFastAverageColor } from '../../../hooks/use-fast-average-color';
+
 import {
     Button,
     NumberInput,
@@ -15,6 +18,9 @@ import {
     Slider,
     Switch,
 } from '/@/renderer/components';
+import { TableConfigDropdown } from '/@/renderer/components/virtual-table';
+import { FullScreenPlayerImage } from '/@/renderer/features/player/components/full-screen-player-image';
+import { FullScreenPlayerQueue } from '/@/renderer/features/player/components/full-screen-player-queue';
 import {
     useCurrentSong,
     useFullScreenPlayerStore,
@@ -24,10 +30,6 @@ import {
     useSettingsStoreActions,
     useWindowSettings,
 } from '/@/renderer/store';
-import { useFastAverageColor } from '../../../hooks/use-fast-average-color';
-import { FullScreenPlayerImage } from '/@/renderer/features/player/components/full-screen-player-image';
-import { FullScreenPlayerQueue } from '/@/renderer/features/player/components/full-screen-player-queue';
-import { TableConfigDropdown } from '/@/renderer/components/virtual-table';
 import { Platform } from '/@/renderer/types';
 
 const Container = styled(motion.div)`
@@ -119,10 +121,10 @@ const Controls = () => {
         >
             <Button
                 compact
+                onClick={handleToggleFullScreenPlayer}
                 size="sm"
                 tooltip={{ label: t('common.minimize', { postProcess: 'titleCase' }) }}
                 variant="subtle"
-                onClick={handleToggleFullScreenPlayer}
             >
                 <RiArrowDownSLine size="2rem" />
             </Button>
@@ -187,9 +189,9 @@ const Controls = () => {
                                     label={(e) => `${e} rem`}
                                     max={6}
                                     min={0}
+                                    onChangeEnd={(e) => setStore({ dynamicImageBlur: Number(e) })}
                                     step={0.5}
                                     w="100%"
-                                    onChangeEnd={(e) => setStore({ dynamicImageBlur: Number(e) })}
                                 />
                             </Option.Control>
                         </Option>
@@ -207,8 +209,8 @@ const Controls = () => {
                                     label={(e) => `${e} %`}
                                     max={100}
                                     min={0}
-                                    w="100%"
                                     onChangeEnd={(e) => setStore({ opacity: Number(e) })}
+                                    w="100%"
                                 />
                             </Option.Control>
                         </Option>
@@ -296,8 +298,8 @@ const Controls = () => {
                                     }
                                     max={72}
                                     min={8}
-                                    w="100%"
                                     onChangeEnd={(e) => handleLyricsSettings('fontSize', Number(e))}
+                                    w="100%"
                                 />
                                 <Slider
                                     defaultValue={lyricConfig.fontSize}
@@ -308,10 +310,10 @@ const Controls = () => {
                                     }
                                     max={72}
                                     min={8}
-                                    w="100%"
                                     onChangeEnd={(e) =>
                                         handleLyricsSettings('fontSizeUnsync', Number(e))
                                     }
+                                    w="100%"
                                 />
                             </Group>
                         </Option.Control>
@@ -332,18 +334,18 @@ const Controls = () => {
                                     label={(e) => `Synchronized: ${e}px`}
                                     max={50}
                                     min={0}
-                                    w="100%"
                                     onChangeEnd={(e) => handleLyricsSettings('gap', Number(e))}
+                                    w="100%"
                                 />
                                 <Slider
                                     defaultValue={lyricConfig.gap}
                                     label={(e) => `Unsynchronized: ${e}px`}
                                     max={50}
                                     min={0}
-                                    w="100%"
                                     onChangeEnd={(e) =>
                                         handleLyricsSettings('gapUnsync', Number(e))
                                     }
+                                    w="100%"
                                 />
                             </Group>
                         </Option.Control>
@@ -376,8 +378,8 @@ const Controls = () => {
                                         value: 'right',
                                     },
                                 ]}
-                                value={lyricConfig.alignment}
                                 onChange={(e) => handleLyricsSettings('alignment', e)}
+                                value={lyricConfig.alignment}
                             />
                         </Option.Control>
                     </Option>
@@ -391,10 +393,10 @@ const Controls = () => {
                             <NumberInput
                                 defaultValue={lyricConfig.delayMs}
                                 hideControls={false}
-                                step={10}
                                 onBlur={(e) =>
                                     handleLyricsSettings('delayMs', Number(e.currentTarget.value))
                                 }
+                                step={10}
                             />
                         </Option.Control>
                     </Option>
diff --git a/src/renderer/features/player/components/left-controls.tsx b/src/renderer/features/player/components/left-controls.tsx
index 41fa6d5b..66b06f9e 100644
--- a/src/renderer/features/player/components/left-controls.tsx
+++ b/src/renderer/features/player/components/left-controls.tsx
@@ -1,26 +1,27 @@
-import React, { MouseEvent } from 'react';
 import { Center, Group } from '@mantine/core';
 import { useHotkeys } from '@mantine/hooks';
-import { motion, AnimatePresence, LayoutGroup } from 'framer-motion';
+import { AnimatePresence, LayoutGroup, motion } from 'framer-motion';
+import React, { MouseEvent } from 'react';
 import { useTranslation } from 'react-i18next';
 import { RiArrowUpSLine, RiDiscLine, RiMore2Fill } from 'react-icons/ri';
 import { generatePath, Link } from 'react-router-dom';
 import styled from 'styled-components';
+
+import { LibraryItem } from '/@/renderer/api/types';
 import { Button, Text, Tooltip } from '/@/renderer/components';
+import { Separator } from '/@/renderer/components/separator';
+import { SONG_CONTEXT_MENU_ITEMS } from '/@/renderer/features/context-menu/context-menu-items';
+import { useHandleGeneralContextMenu } from '/@/renderer/features/context-menu/hooks/use-handle-context-menu';
 import { AppRoute } from '/@/renderer/router/routes';
 import {
     useAppStoreActions,
     useCurrentSong,
-    useSetFullScreenPlayerStore,
     useFullScreenPlayerStore,
-    useSidebarStore,
     useHotkeySettings,
+    useSetFullScreenPlayerStore,
+    useSidebarStore,
 } from '/@/renderer/store';
 import { fadeIn } from '/@/renderer/styles';
-import { LibraryItem } from '/@/renderer/api/types';
-import { SONG_CONTEXT_MENU_ITEMS } from '/@/renderer/features/context-menu/context-menu-items';
-import { useHandleGeneralContextMenu } from '/@/renderer/features/context-menu/hooks/use-handle-context-menu';
-import { Separator } from '/@/renderer/components/separator';
 
 const ImageWrapper = styled.div`
     position: relative;
@@ -98,7 +99,7 @@ export const LeftControls = () => {
     const { setSideBar } = useAppStoreActions();
     const { expanded: isFullScreenPlayerExpanded } = useFullScreenPlayerStore();
     const setFullScreenPlayerStore = useSetFullScreenPlayerStore();
-    const { image, collapsed } = useSidebarStore();
+    const { collapsed, image } = useSidebarStore();
     const hideImage = image && !collapsed;
     const currentSong = useCurrentSong();
     const title = currentSong?.name;
@@ -112,7 +113,7 @@ export const LeftControls = () => {
         SONG_CONTEXT_MENU_ITEMS,
     );
 
-    const handleToggleFullScreenPlayer = (e?: MouseEvent<HTMLDivElement> | KeyboardEvent) => {
+    const handleToggleFullScreenPlayer = (e?: KeyboardEvent | MouseEvent<HTMLDivElement>) => {
         e?.stopPropagation();
         setFullScreenPlayerStore({ expanded: !isFullScreenPlayerExpanded });
     };
@@ -143,13 +144,13 @@ export const LeftControls = () => {
                     {!hideImage && (
                         <ImageWrapper>
                             <Image
-                                key="playerbar-image"
                                 animate={{ opacity: 1, scale: 1, x: 0 }}
                                 exit={{ opacity: 0, x: -50 }}
                                 initial={{ opacity: 0, x: -50 }}
+                                key="playerbar-image"
+                                onClick={handleToggleFullScreenPlayer}
                                 role="button"
                                 transition={{ duration: 0.3, ease: 'easeInOut' }}
-                                onClick={handleToggleFullScreenPlayer}
                             >
                                 <Tooltip
                                     label={t('player.toggleFullscreenPlayer', {
@@ -180,6 +181,7 @@ export const LeftControls = () => {
                                 {!collapsed && (
                                     <Button
                                         compact
+                                        onClick={handleToggleSidebarImage}
                                         opacity={0.8}
                                         radius={50}
                                         size="md"
@@ -196,7 +198,6 @@ export const LeftControls = () => {
                                             openDelay: 500,
                                         }}
                                         variant="default"
-                                        onClick={handleToggleSidebarImage}
                                     >
                                         <RiArrowUpSLine
                                             color="white"
@@ -211,8 +212,8 @@ export const LeftControls = () => {
                 <MetadataStack layout="position">
                     <LineItem onClick={stopPropagation}>
                         <Group
-                            noWrap
                             align="flex-start"
+                            noWrap
                             spacing="xs"
                         >
                             <Text
@@ -228,8 +229,8 @@ export const LeftControls = () => {
                             {isSongDefined && (
                                 <Button
                                     compact
-                                    variant="subtle"
                                     onClick={(e) => handleGeneralContextMenu(e, [currentSong!])}
+                                    variant="subtle"
                                 >
                                     <RiMore2Fill size="1.2rem" />
                                 </Button>
diff --git a/src/renderer/features/player/components/player-button.tsx b/src/renderer/features/player/components/player-button.tsx
index b8cc10d8..c4c2eb97 100644
--- a/src/renderer/features/player/components/player-button.tsx
+++ b/src/renderer/features/player/components/player-button.tsx
@@ -1,12 +1,14 @@
-/* stylelint-disable no-descending-specificity */
-import { ComponentPropsWithoutRef, forwardRef, ReactNode } from 'react';
 import type { TooltipProps, UnstyledButtonProps } from '@mantine/core';
+
 import { UnstyledButton } from '@mantine/core';
 import { motion } from 'framer-motion';
+/* stylelint-disable no-descending-specificity */
+import { ComponentPropsWithoutRef, forwardRef, ReactNode } from 'react';
 import styled, { css } from 'styled-components';
+
 import { Tooltip } from '/@/renderer/components';
 
-type MantineButtonProps = UnstyledButtonProps & ComponentPropsWithoutRef<'button'>;
+type MantineButtonProps = ComponentPropsWithoutRef<'button'> & UnstyledButtonProps;
 interface PlayerButtonProps extends MantineButtonProps {
     $isActive?: boolean;
     icon: ReactNode;
@@ -121,7 +123,7 @@ const StyledPlayerButton = styled(UnstyledButton)<StyledPlayerButtonProps>`
 `;
 
 export const PlayerButton = forwardRef<HTMLDivElement, PlayerButtonProps>(
-    ({ tooltip, variant, icon, ...rest }: PlayerButtonProps, ref) => {
+    ({ icon, tooltip, variant, ...rest }: PlayerButtonProps, ref) => {
         if (tooltip) {
             return (
                 <Tooltip {...tooltip}>
diff --git a/src/renderer/features/player/components/playerbar.tsx b/src/renderer/features/player/components/playerbar.tsx
index 3b3be97c..a83e90f3 100644
--- a/src/renderer/features/player/components/playerbar.tsx
+++ b/src/renderer/features/player/components/playerbar.tsx
@@ -1,28 +1,30 @@
-import { useCallback, MouseEvent } from 'react';
+import { MouseEvent, useCallback } from 'react';
 import styled from 'styled-components';
-import {
-    usePlaybackType,
-    useSettingsStore,
-    useGeneralSettings,
-} from '/@/renderer/store/settings.store';
-import { PlaybackType } from '/@/renderer/types';
+
+import { CenterControls } from './center-controls';
+import { LeftControls } from './left-controls';
+import { RightControls } from './right-controls';
+
 import { AudioPlayer } from '/@/renderer/components';
+import { PlayersRef } from '/@/renderer/features/player/ref/players-ref';
+import { updateSong } from '/@/renderer/features/player/update-remote-song';
 import {
     useCurrentPlayer,
     useCurrentStatus,
+    useFullScreenPlayerStore,
     useMuted,
     usePlayer1Data,
     usePlayer2Data,
     usePlayerControls,
-    useVolume,
     useSetFullScreenPlayerStore,
-    useFullScreenPlayerStore,
+    useVolume,
 } from '/@/renderer/store';
-import { CenterControls } from './center-controls';
-import { LeftControls } from './left-controls';
-import { RightControls } from './right-controls';
-import { PlayersRef } from '/@/renderer/features/player/ref/players-ref';
-import { updateSong } from '/@/renderer/features/player/update-remote-song';
+import {
+    useGeneralSettings,
+    usePlaybackType,
+    useSettingsStore,
+} from '/@/renderer/store/settings.store';
+import { PlaybackType } from '/@/renderer/types';
 
 const PlayerbarContainer = styled.div`
     width: 100vw;
@@ -80,7 +82,7 @@ export const Playerbar = () => {
     const { expanded: isFullScreenPlayerExpanded } = useFullScreenPlayerStore();
     const setFullScreenPlayerStore = useSetFullScreenPlayerStore();
 
-    const handleToggleFullScreenPlayer = (e?: MouseEvent<HTMLDivElement> | KeyboardEvent) => {
+    const handleToggleFullScreenPlayer = (e?: KeyboardEvent | MouseEvent<HTMLDivElement>) => {
         e?.stopPropagation();
         setFullScreenPlayerStore({ expanded: !isFullScreenPlayerExpanded });
     };
@@ -107,7 +109,6 @@ export const Playerbar = () => {
             </PlayerbarControlsGrid>
             {playbackType === PlaybackType.WEB && (
                 <AudioPlayer
-                    ref={playersRef}
                     autoNext={autoNextFn}
                     crossfadeDuration={settings.crossfadeDuration}
                     crossfadeStyle={settings.crossfadeStyle}
@@ -116,6 +117,7 @@ export const Playerbar = () => {
                     playbackStyle={settings.style}
                     player1={player1}
                     player2={player2}
+                    ref={playersRef}
                     status={status}
                     style={settings.style}
                     volume={(volume / 100) ** 2}
diff --git a/src/renderer/features/player/components/right-controls.tsx b/src/renderer/features/player/components/right-controls.tsx
index e3efddf2..f6a0b7cd 100644
--- a/src/renderer/features/player/components/right-controls.tsx
+++ b/src/renderer/features/player/components/right-controls.tsx
@@ -1,16 +1,25 @@
-import { useEffect } from 'react';
 import { Flex, Group } from '@mantine/core';
 import { useHotkeys, useMediaQuery } from '@mantine/hooks';
 import isElectron from 'is-electron';
+import { useEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 import { HiOutlineQueueList } from 'react-icons/hi2';
 import {
-    RiVolumeUpFill,
+    RiHeartFill,
+    RiHeartLine,
     RiVolumeDownFill,
     RiVolumeMuteFill,
-    RiHeartLine,
-    RiHeartFill,
+    RiVolumeUpFill,
 } from 'react-icons/ri';
+
+import { useRightControls } from '../hooks/use-right-controls';
+import { PlayerButton } from './player-button';
+
+import { LibraryItem, QueueSong, ServerType, Song } from '/@/renderer/api/types';
+import { DropdownMenu, Rating } from '/@/renderer/components';
+import { Slider } from '/@/renderer/components/slider';
+import { PlayerbarSlider } from '/@/renderer/features/player/components/playerbar-slider';
+import { useCreateFavorite, useDeleteFavorite, useSetRating } from '/@/renderer/features/shared';
 import {
     useAppStoreActions,
     useCurrentServer,
@@ -23,16 +32,9 @@ import {
     useSpeed,
     useVolume,
 } from '/@/renderer/store';
-import { useRightControls } from '../hooks/use-right-controls';
-import { PlayerButton } from './player-button';
-import { LibraryItem, QueueSong, ServerType, Song } from '/@/renderer/api/types';
-import { useCreateFavorite, useDeleteFavorite, useSetRating } from '/@/renderer/features/shared';
-import { DropdownMenu, Rating } from '/@/renderer/components';
-import { PlayerbarSlider } from '/@/renderer/features/player/components/playerbar-slider';
-import { Slider } from '/@/renderer/components/slider';
 
-const ipc = isElectron() ? window.electron.ipc : null;
-const remote = isElectron() ? window.electron.remote : null;
+const ipc = isElectron() ? window.api.ipc : null;
+const remote = isElectron() ? window.api.remote : null;
 
 export const RightControls = () => {
     const { t } = useTranslation();
@@ -46,12 +48,12 @@ export const RightControls = () => {
     const { rightExpanded: isQueueExpanded } = useSidebarStore();
     const { bindings } = useHotkeySettings();
     const {
-        handleVolumeSlider,
-        handleVolumeWheel,
         handleMute,
-        handleVolumeDown,
-        handleVolumeUp,
         handleSpeed,
+        handleVolumeDown,
+        handleVolumeSlider,
+        handleVolumeUp,
+        handleVolumeWheel,
     } = useRightControls();
 
     const speed = useSpeed();
@@ -208,23 +210,23 @@ export const RightControls = () => {
             <Group h="calc(100% / 3)">
                 {showRating && (
                     <Rating
+                        onChange={handleUpdateRating}
                         size="sm"
                         value={currentSong?.userRating || 0}
-                        onChange={handleUpdateRating}
                     />
                 )}
             </Group>
             <Group
-                noWrap
                 align="center"
+                noWrap
                 spacing="xs"
             >
                 <DropdownMenu
-                    withArrow
                     arrowOffset={12}
                     offset={0}
                     position="top-end"
                     width={425}
+                    withArrow
                 >
                     <DropdownMenu.Target>
                         <PlayerButton
@@ -248,6 +250,8 @@ export const RightControls = () => {
                             ]}
                             max={1.5}
                             min={0.5}
+                            onChange={handleSpeed}
+                            onDoubleClick={() => handleSpeed(1)}
                             step={0.01}
                             styles={{
                                 markLabel: {
@@ -258,8 +262,6 @@ export const RightControls = () => {
                                 },
                             }}
                             value={speed}
-                            onChange={handleSpeed}
-                            onDoubleClick={() => handleSpeed(1)}
                         />
                     </DropdownMenu.Dropdown>
                 </DropdownMenu>
@@ -274,6 +276,7 @@ export const RightControls = () => {
                             <RiHeartLine size="1.1rem" />
                         )
                     }
+                    onClick={() => handleToggleFavorite(currentSong)}
                     sx={{
                         svg: {
                             fill: !currentSong?.userFavorite
@@ -288,17 +291,16 @@ export const RightControls = () => {
                         openDelay: 500,
                     }}
                     variant="secondary"
-                    onClick={() => handleToggleFavorite(currentSong)}
                 />
                 {!isMinWidth ? (
                     <PlayerButton
                         icon={<HiOutlineQueueList size="1.1rem" />}
+                        onClick={handleToggleQueue}
                         tooltip={{
                             label: t('player.viewQueue', { postProcess: 'titleCase' }),
                             openDelay: 500,
                         }}
                         variant="secondary"
-                        onClick={handleToggleQueue}
                     />
                 ) : null}
                 <Group
@@ -315,23 +317,23 @@ export const RightControls = () => {
                                 <RiVolumeDownFill size="1.2rem" />
                             )
                         }
+                        onClick={handleMute}
+                        onWheel={handleVolumeWheel}
                         tooltip={{
                             label: muted ? t('player.muted', { postProcess: 'titleCase' }) : volume,
                             openDelay: 500,
                         }}
                         variant="secondary"
-                        onClick={handleMute}
-                        onWheel={handleVolumeWheel}
                     />
                     {!isMinWidth ? (
                         <PlayerbarSlider
                             max={100}
                             min={0}
+                            onChange={handleVolumeSlider}
+                            onWheel={handleVolumeWheel}
                             size={6}
                             value={volume}
                             w={volumeWidth}
-                            onChange={handleVolumeSlider}
-                            onWheel={handleVolumeWheel}
                         />
                     ) : null}
                 </Group>
diff --git a/src/renderer/features/player/components/shuffle-all-modal.tsx b/src/renderer/features/player/components/shuffle-all-modal.tsx
index 33e1e6d6..ee0e6fb3 100644
--- a/src/renderer/features/player/components/shuffle-all-modal.tsx
+++ b/src/renderer/features/player/components/shuffle-all-modal.tsx
@@ -1,28 +1,29 @@
-import { useMemo } from 'react';
 import { Divider, Group, SelectItem, Stack } from '@mantine/core';
 import { closeAllModals, openModal } from '@mantine/modals';
 import { QueryClient } from '@tanstack/react-query';
 import merge from 'lodash/merge';
-import { RiAddBoxFill, RiPlayFill, RiAddCircleFill } from 'react-icons/ri';
-import { Button, Checkbox, NumberInput, Select } from '/@/renderer/components';
+import { useMemo } from 'react';
+import { RiAddBoxFill, RiAddCircleFill, RiPlayFill } from 'react-icons/ri';
 import { create } from 'zustand';
 import { persist } from 'zustand/middleware';
 import { immer } from 'zustand/middleware/immer';
+
+import i18n from '/@/i18n/i18n';
+import { api } from '/@/renderer/api';
+import { queryKeys } from '/@/renderer/api/query-keys';
 import {
     GenreListResponse,
-    RandomSongListQuery,
-    MusicFolderListResponse,
-    ServerType,
     GenreListSort,
-    SortOrder,
-    ServerListItem,
+    MusicFolderListResponse,
     Played,
+    RandomSongListQuery,
+    ServerListItem,
+    ServerType,
+    SortOrder,
 } from '/@/renderer/api/types';
-import { api } from '/@/renderer/api';
+import { Button, Checkbox, NumberInput, Select } from '/@/renderer/components';
 import { useAuthStore } from '/@/renderer/store';
-import { queryKeys } from '/@/renderer/api/query-keys';
 import { Play, PlayQueueAddOptions } from '/@/renderer/types';
-import i18n from '/@/i18n/i18n';
 
 interface ShuffleAllSlice extends RandomSongListQuery {
     actions: {
@@ -70,17 +71,17 @@ interface ShuffleAllModalProps {
     handlePlayQueueAdd: ((options: PlayQueueAddOptions) => void) | undefined;
     musicFolders: MusicFolderListResponse | undefined;
     queryClient: QueryClient;
-    server: ServerListItem | null;
+    server: null | ServerListItem;
 }
 
 export const ShuffleAllModal = ({
+    genres,
     handlePlayQueueAdd,
+    musicFolders,
     queryClient,
     server,
-    genres,
-    musicFolders,
 }: ShuffleAllModalProps) => {
-    const { genre, limit, maxYear, minYear, enableMaxYear, enableMinYear, musicFolderId, played } =
+    const { enableMaxYear, enableMinYear, genre, limit, maxYear, minYear, musicFolderId, played } =
         useShuffleAllStore();
     const { setStore } = useShuffleAllStoreActions();
 
@@ -140,18 +141,19 @@ export const ShuffleAllModal = ({
     return (
         <Stack spacing="md">
             <NumberInput
-                required
                 label="How many tracks?"
                 max={500}
                 min={1}
-                value={limit}
                 onChange={(e) => setStore({ limit: e ? Number(e) : 500 })}
+                required
+                value={limit}
             />
             <Group grow>
                 <NumberInput
                     label="From year"
                     max={2050}
                     min={1850}
+                    onChange={(e) => setStore({ minYear: e ? Number(e) : 0 })}
                     rightSection={
                         <Checkbox
                             checked={enableMinYear}
@@ -160,13 +162,13 @@ export const ShuffleAllModal = ({
                         />
                     }
                     value={minYear}
-                    onChange={(e) => setStore({ minYear: e ? Number(e) : 0 })}
                 />
 
                 <NumberInput
                     label="To year"
                     max={2050}
                     min={1850}
+                    onChange={(e) => setStore({ maxYear: e ? Number(e) : 0 })}
                     rightSection={
                         <Checkbox
                             checked={enableMaxYear}
@@ -175,34 +177,33 @@ export const ShuffleAllModal = ({
                         />
                     }
                     value={maxYear}
-                    onChange={(e) => setStore({ maxYear: e ? Number(e) : 0 })}
                 />
             </Group>
             <Select
                 clearable
                 data={genreData}
                 label="Genre"
-                value={genre}
                 onChange={(e) => setStore({ genre: e || '' })}
+                value={genre}
             />
             <Select
                 clearable
                 data={musicFolderData}
                 label="Music folder"
-                value={musicFolderId}
                 onChange={(e) => {
                     setStore({ musicFolderId: e ? String(e) : '' });
                 }}
+                value={musicFolderId}
             />
             {server?.type === ServerType.JELLYFIN && (
                 <Select
                     clearable
                     data={PLAYED_DATA}
                     label="Play filter"
-                    value={played}
                     onChange={(e) => {
                         setStore({ played: e as Played });
                     }}
+                    value={played}
                 />
             )}
             <Divider />
@@ -210,18 +211,18 @@ export const ShuffleAllModal = ({
                 <Button
                     disabled={!limit}
                     leftIcon={<RiAddBoxFill size="1rem" />}
+                    onClick={() => handlePlay(Play.LAST)}
                     type="submit"
                     variant="default"
-                    onClick={() => handlePlay(Play.LAST)}
                 >
                     Add
                 </Button>
                 <Button
                     disabled={!limit}
                     leftIcon={<RiAddCircleFill size="1rem" />}
+                    onClick={() => handlePlay(Play.NEXT)}
                     type="submit"
                     variant="default"
-                    onClick={() => handlePlay(Play.NEXT)}
                 >
                     Add next
                 </Button>
@@ -229,9 +230,9 @@ export const ShuffleAllModal = ({
             <Button
                 disabled={!limit}
                 leftIcon={<RiPlayFill size="1rem" />}
+                onClick={() => handlePlay(Play.NOW)}
                 type="submit"
                 variant="filled"
-                onClick={() => handlePlay(Play.NOW)}
             >
                 Play
             </Button>
diff --git a/src/renderer/features/player/components/visualizer.tsx b/src/renderer/features/player/components/visualizer.tsx
index 3e633eec..e1405a51 100644
--- a/src/renderer/features/player/components/visualizer.tsx
+++ b/src/renderer/features/player/components/visualizer.tsx
@@ -1,7 +1,8 @@
-import { createRef, useCallback, useEffect, useState } from 'react';
-import { useWebAudio } from '/@/renderer/features/player/hooks/use-webaudio';
 import AudioMotionAnalyzer from 'audiomotion-analyzer';
+import { createRef, useCallback, useEffect, useState } from 'react';
 import styled from 'styled-components';
+
+import { useWebAudio } from '/@/renderer/features/player/hooks/use-webaudio';
 import { useSettingsStore } from '/@/renderer/store';
 
 const StyledContainer = styled.div`
diff --git a/src/renderer/features/player/context/play-queue-handler-context.ts b/src/renderer/features/player/context/play-queue-handler-context.ts
index ae1d0265..dc45db08 100644
--- a/src/renderer/features/player/context/play-queue-handler-context.ts
+++ b/src/renderer/features/player/context/play-queue-handler-context.ts
@@ -1,4 +1,5 @@
 import { createContext } from 'react';
+
 import { PlayQueueAddOptions } from '/@/renderer/types';
 
 export const PlayQueueHandlerContext = createContext<{
diff --git a/src/renderer/features/player/context/webaudio-context.ts b/src/renderer/features/player/context/webaudio-context.ts
index caabca8d..710cf933 100644
--- a/src/renderer/features/player/context/webaudio-context.ts
+++ b/src/renderer/features/player/context/webaudio-context.ts
@@ -1,4 +1,5 @@
 import { createContext } from 'react';
+
 import { WebAudio } from '/@/renderer/types';
 
 export const WebAudioContext = createContext<{
diff --git a/src/renderer/features/player/hooks/use-center-controls.ts b/src/renderer/features/player/hooks/use-center-controls.ts
index ac34f0e8..b6f5f53f 100644
--- a/src/renderer/features/player/hooks/use-center-controls.ts
+++ b/src/renderer/features/player/hooks/use-center-controls.ts
@@ -1,6 +1,11 @@
-import { useCallback, useEffect } from 'react';
 import isElectron from 'is-electron';
-import { PlaybackType, PlayerRepeat, PlayerShuffle, PlayerStatus } from '/@/renderer/types';
+import debounce from 'lodash/debounce';
+import { useCallback, useEffect } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { toast } from '/@/renderer/components';
+import { useScrobble } from '/@/renderer/features/player/hooks/use-scrobble';
+import { updateSong } from '/@/renderer/features/player/update-remote-song';
 import {
     useCurrentPlayer,
     useCurrentStatus,
@@ -12,19 +17,15 @@ import {
     useShuffleStatus,
 } from '/@/renderer/store';
 import { usePlaybackType } from '/@/renderer/store/settings.store';
-import { useScrobble } from '/@/renderer/features/player/hooks/use-scrobble';
-import debounce from 'lodash/debounce';
-import { toast } from '/@/renderer/components';
-import { useTranslation } from 'react-i18next';
-import { updateSong } from '/@/renderer/features/player/update-remote-song';
+import { PlaybackType, PlayerRepeat, PlayerShuffle, PlayerStatus } from '/@/renderer/types';
 import { setAutoNext, setQueue, setQueueNext } from '/@/renderer/utils/set-transcoded-queue-data';
 
-const mpvPlayer = isElectron() ? window.electron.mpvPlayer : null;
-const mpvPlayerListener = isElectron() ? window.electron.mpvPlayerListener : null;
-const ipc = isElectron() ? window.electron.ipc : null;
-const utils = isElectron() ? window.electron.utils : null;
-const mpris = isElectron() && utils?.isLinux() ? window.electron.mpris : null;
-const remote = isElectron() ? window.electron.remote : null;
+const mpvPlayer = isElectron() ? window.api.mpvPlayer : null;
+const mpvPlayerListener = isElectron() ? window.api.mpvPlayerListener : null;
+const ipc = isElectron() ? window.api.ipc : null;
+const utils = isElectron() ? window.api.utils : null;
+const mpris = isElectron() && utils?.isLinux() ? window.api.mpris : null;
+const remote = isElectron() ? window.api.remote : null;
 const mediaSession = navigator.mediaSession;
 
 export const useCenterControls = (args: { playersRef: any }) => {
@@ -32,7 +33,7 @@ export const useCenterControls = (args: { playersRef: any }) => {
     const { playersRef } = args;
 
     const currentPlayer = useCurrentPlayer();
-    const { setShuffle, setRepeat, play, pause, previous, next, setCurrentIndex, autoNext } =
+    const { autoNext, next, pause, play, previous, setCurrentIndex, setRepeat, setShuffle } =
         usePlayerControls();
     const setCurrentTime = useSetCurrentTime();
     const queue = useDefaultQueue();
@@ -45,7 +46,7 @@ export const useCenterControls = (args: { playersRef: any }) => {
     const currentPlayerRef = currentPlayer === 1 ? player1Ref : player2Ref;
     const nextPlayerRef = currentPlayer === 1 ? player2Ref : player1Ref;
 
-    const { handleScrobbleFromSongRestart, handleScrobbleFromSeek } = useScrobble();
+    const { handleScrobbleFromSeek, handleScrobbleFromSongRestart } = useScrobble();
 
     useEffect(() => {
         if (mediaSession) {
@@ -226,12 +227,12 @@ export const useCenterControls = (args: { playersRef: any }) => {
         };
 
         switch (repeatStatus) {
-            case PlayerRepeat.NONE:
-                handleRepeatNone[playbackType]();
-                break;
             case PlayerRepeat.ALL:
                 handleRepeatAll[playbackType]();
                 break;
+            case PlayerRepeat.NONE:
+                handleRepeatNone[playbackType]();
+                break;
             case PlayerRepeat.ONE:
                 handleRepeatOne[playbackType]();
                 break;
@@ -310,12 +311,12 @@ export const useCenterControls = (args: { playersRef: any }) => {
         };
 
         switch (repeatStatus) {
-            case PlayerRepeat.NONE:
-                handleRepeatNone[playbackType]();
-                break;
             case PlayerRepeat.ALL:
                 handleRepeatAll[playbackType]();
                 break;
+            case PlayerRepeat.NONE:
+                handleRepeatNone[playbackType]();
+                break;
             case PlayerRepeat.ONE:
                 handleRepeatOne[playbackType]();
                 break;
@@ -418,12 +419,12 @@ export const useCenterControls = (args: { playersRef: any }) => {
         };
 
         switch (repeatStatus) {
-            case PlayerRepeat.NONE:
-                handleRepeatNone[playbackType]();
-                break;
             case PlayerRepeat.ALL:
                 handleRepeatAll[playbackType]();
                 break;
+            case PlayerRepeat.NONE:
+                handleRepeatNone[playbackType]();
+                break;
             case PlayerRepeat.ONE:
                 handleRepeatOne[playbackType]();
                 break;
@@ -510,7 +511,7 @@ export const useCenterControls = (args: { playersRef: any }) => {
     }, 100);
 
     const handleSeekSlider = useCallback(
-        (e: number | any) => {
+        (e: any | number) => {
             setCurrentTime(e, true);
             handleScrobbleFromSeek(e);
             debouncedSeek(e);
@@ -564,6 +565,7 @@ export const useCenterControls = (args: { playersRef: any }) => {
             });
 
             mpvPlayerListener.rendererCurrentTime((_event: any, time: number) => {
+                console.log('time :>> ', time);
                 setCurrentTime(time);
             });
 
diff --git a/src/renderer/features/player/hooks/use-handle-playqueue-add.ts b/src/renderer/features/player/hooks/use-handle-playqueue-add.ts
index b25f9e8c..f19cd4d4 100644
--- a/src/renderer/features/player/hooks/use-handle-playqueue-add.ts
+++ b/src/renderer/features/player/hooks/use-handle-playqueue-add.ts
@@ -1,31 +1,32 @@
-import { useCallback, useRef } from 'react';
 import { useQueryClient } from '@tanstack/react-query';
-import { useCurrentServer, usePlayerControls, usePlayerStore } from '/@/renderer/store';
-import { useGeneralSettings, usePlaybackType } from '/@/renderer/store/settings.store';
-import { PlayQueueAddOptions, Play, PlaybackType } from '/@/renderer/types';
-import { toast } from '/@/renderer/components/toast/index';
 import isElectron from 'is-electron';
 import { nanoid } from 'nanoid/non-secure';
+import { useCallback, useRef } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { queryKeys } from '/@/renderer/api/query-keys';
 import {
+    instanceOfCancellationError,
     LibraryItem,
     QueueSong,
     Song,
     SongListResponse,
-    instanceOfCancellationError,
 } from '/@/renderer/api/types';
-import {
-    getPlaylistSongsById,
-    getSongById,
-    getAlbumSongsById,
-    getAlbumArtistSongsById,
-    getSongsByQuery,
-    getGenreSongsById,
-    getArtistSongsById,
-} from '/@/renderer/features/player/utils';
-import { queryKeys } from '/@/renderer/api/query-keys';
-import { useTranslation } from 'react-i18next';
+import { toast } from '/@/renderer/components/toast/index';
 import { PlayersRef } from '/@/renderer/features/player/ref/players-ref';
 import { updateSong } from '/@/renderer/features/player/update-remote-song';
+import {
+    getAlbumArtistSongsById,
+    getAlbumSongsById,
+    getArtistSongsById,
+    getGenreSongsById,
+    getPlaylistSongsById,
+    getSongById,
+    getSongsByQuery,
+} from '/@/renderer/features/player/utils';
+import { useCurrentServer, usePlayerControls, usePlayerStore } from '/@/renderer/store';
+import { useGeneralSettings, usePlaybackType } from '/@/renderer/store/settings.store';
+import { Play, PlaybackType, PlayQueueAddOptions } from '/@/renderer/types';
 import { setQueue, setQueueNext } from '/@/renderer/utils/set-transcoded-queue-data';
 
 const getRootQueryKey = (itemType: LibraryItem, serverId: string) => {
@@ -55,7 +56,7 @@ const getRootQueryKey = (itemType: LibraryItem, serverId: string) => {
     return queryKey;
 };
 
-const mpvPlayer = isElectron() ? window.electron.mpvPlayer : null;
+const mpvPlayer = isElectron() ? window.api.mpvPlayer : null;
 
 const addToQueue = usePlayerStore.getState().actions.addToQueue;
 
@@ -65,20 +66,20 @@ export const useHandlePlayQueueAdd = () => {
     const playbackType = usePlaybackType();
     const server = useCurrentServer();
     const { play } = usePlayerControls();
-    const timeoutIds = useRef<Record<string, ReturnType<typeof setTimeout>> | null>({});
+    const timeoutIds = useRef<null | Record<string, ReturnType<typeof setTimeout>>>({});
 
     const { doubleClickQueueAll } = useGeneralSettings();
 
     const handlePlayQueueAdd = useCallback(
         async (options: PlayQueueAddOptions) => {
             if (!server) return toast.error({ message: 'No server selected', type: 'error' });
-            const { initialIndex, initialSongId, playType, byData, byItemType, query } = options;
-            let songs: QueueSong[] | null = null;
+            const { byData, byItemType, initialIndex, initialSongId, playType, query } = options;
+            let songs: null | QueueSong[] = null;
             let initialSongIndex = 0;
 
             if (byItemType) {
                 let songList: SongListResponse | undefined;
-                const { type: itemType, id } = byItemType;
+                const { id, type: itemType } = byItemType;
 
                 const fetchId = nanoid();
                 timeoutIds.current = {
diff --git a/src/renderer/features/player/hooks/use-playqueue-add.ts b/src/renderer/features/player/hooks/use-playqueue-add.ts
index 4703cb61..bfda2a7b 100644
--- a/src/renderer/features/player/hooks/use-playqueue-add.ts
+++ b/src/renderer/features/player/hooks/use-playqueue-add.ts
@@ -1,4 +1,5 @@
 import { useContext } from 'react';
+
 import { PlayQueueHandlerContext } from '/@/renderer/features/player/context/play-queue-handler-context';
 
 export const usePlayQueueAdd = () => {
diff --git a/src/renderer/features/player/hooks/use-right-controls.ts b/src/renderer/features/player/hooks/use-right-controls.ts
index eac4e805..526291ca 100644
--- a/src/renderer/features/player/hooks/use-right-controls.ts
+++ b/src/renderer/features/player/hooks/use-right-controls.ts
@@ -1,5 +1,6 @@
-import { useCallback, useEffect, WheelEvent } from 'react';
 import isElectron from 'is-electron';
+import { useCallback, useEffect, WheelEvent } from 'react';
+
 import {
     useMuted,
     usePlayerControls,
@@ -9,10 +10,10 @@ import {
 } from '/@/renderer/store';
 import { useGeneralSettings } from '/@/renderer/store/settings.store';
 
-const mpvPlayer = isElectron() ? window.electron.mpvPlayer : null;
-const mpvPlayerListener = isElectron() ? window.electron.mpvPlayerListener : null;
-const ipc = isElectron() ? window.electron.ipc : null;
-const remote = isElectron() ? window.electron.remote : null;
+const mpvPlayer = isElectron() ? window.api.mpvPlayer : null;
+const mpvPlayerListener = isElectron() ? window.api.mpvPlayerListener : null;
+const ipc = isElectron() ? window.api.ipc : null;
+const remote = isElectron() ? window.api.remote : null;
 
 const calculateVolumeUp = (volume: number, volumeWheelStep: number) => {
     let volumeToSet;
@@ -39,7 +40,7 @@ const calculateVolumeDown = (volume: number, volumeWheelStep: number) => {
 };
 
 export const useRightControls = () => {
-    const { setVolume, setMuted } = usePlayerControls();
+    const { setMuted, setVolume } = usePlayerControls();
     const volume = useVolume();
     const muted = useMuted();
     const { volumeWheelStep } = useGeneralSettings();
@@ -98,7 +99,7 @@ export const useRightControls = () => {
     }, [setVolume, volume, volumeWheelStep]);
 
     const handleVolumeWheel = useCallback(
-        (e: WheelEvent<HTMLDivElement | HTMLButtonElement>) => {
+        (e: WheelEvent<HTMLButtonElement | HTMLDivElement>) => {
             let volumeToSet;
             if (e.deltaY > 0 || e.deltaX > 0) {
                 volumeToSet = calculateVolumeDown(volume, volumeWheelStep);
diff --git a/src/renderer/features/player/hooks/use-scrobble.ts b/src/renderer/features/player/hooks/use-scrobble.ts
index fc9a833b..281c78d1 100644
--- a/src/renderer/features/player/hooks/use-scrobble.ts
+++ b/src/renderer/features/player/hooks/use-scrobble.ts
@@ -1,4 +1,5 @@
-import { useEffect, useCallback, useState, useRef } from 'react';
+import { useCallback, useEffect, useRef, useState } from 'react';
+
 import { QueueSong, ServerType } from '/@/renderer/api/types';
 import { useSendScrobble } from '/@/renderer/features/player/mutations/scrobble-mutation';
 import { usePlayerStore } from '/@/renderer/store';
@@ -82,12 +83,12 @@ export const useScrobble = () => {
         [isScrobbleEnabled, sendScrobble],
     );
 
-    const progressIntervalId = useRef<ReturnType<typeof setInterval> | null>(null);
-    const songChangeTimeoutId = useRef<ReturnType<typeof setTimeout> | null>(null);
+    const progressIntervalId = useRef<null | ReturnType<typeof setInterval>>(null);
+    const songChangeTimeoutId = useRef<null | ReturnType<typeof setTimeout>>(null);
     const handleScrobbleFromSongChange = useCallback(
         (
-            current: (QueueSong | number | undefined)[],
-            previous: (QueueSong | number | undefined)[],
+            current: (number | QueueSong | undefined)[],
+            previous: (number | QueueSong | undefined)[],
         ) => {
             if (!isScrobbleEnabled) return;
 
@@ -179,8 +180,8 @@ export const useScrobble = () => {
 
     const handleScrobbleFromStatusChange = useCallback(
         (
-            current: (PlayerStatus | number | undefined)[],
-            previous: (PlayerStatus | number | undefined)[],
+            current: (number | PlayerStatus | undefined)[],
+            previous: (number | PlayerStatus | undefined)[],
         ) => {
             if (!isScrobbleEnabled) return;
 
diff --git a/src/renderer/features/player/hooks/use-webaudio.ts b/src/renderer/features/player/hooks/use-webaudio.ts
index 5b8bc334..209e732f 100644
--- a/src/renderer/features/player/hooks/use-webaudio.ts
+++ b/src/renderer/features/player/hooks/use-webaudio.ts
@@ -1,7 +1,8 @@
 import { useContext } from 'react';
+
 import { WebAudioContext } from '/@/renderer/features/player/context/webaudio-context';
 
 export const useWebAudio = () => {
-    const { webAudio, setWebAudio } = useContext(WebAudioContext);
+    const { setWebAudio, webAudio } = useContext(WebAudioContext);
     return { setWebAudio, webAudio };
 };
diff --git a/src/renderer/features/player/mutations/scrobble-mutation.ts b/src/renderer/features/player/mutations/scrobble-mutation.ts
index 8b1688d1..7445fb07 100644
--- a/src/renderer/features/player/mutations/scrobble-mutation.ts
+++ b/src/renderer/features/player/mutations/scrobble-mutation.ts
@@ -1,7 +1,8 @@
 import { useMutation } from '@tanstack/react-query';
 import { AxiosError } from 'axios';
+
 import { api } from '/@/renderer/api';
-import { ScrobbleResponse, ScrobbleArgs } from '/@/renderer/api/types';
+import { ScrobbleArgs, ScrobbleResponse } from '/@/renderer/api/types';
 import { MutationOptions } from '/@/renderer/lib/react-query';
 import { getServerById, useIncrementQueuePlayCount } from '/@/renderer/store';
 import { usePlayEvent } from '/@/renderer/store/event.store';
@@ -13,7 +14,7 @@ export const useSendScrobble = (options?: MutationOptions) => {
     return useMutation<
         ScrobbleResponse,
         AxiosError,
-        Omit<ScrobbleArgs, 'server' | 'apiClientProps'>,
+        Omit<ScrobbleArgs, 'apiClientProps' | 'server'>,
         null
     >({
         mutationFn: (args) => {
diff --git a/src/renderer/features/player/update-remote-song.tsx b/src/renderer/features/player/update-remote-song.tsx
index 1941e60e..a091068d 100644
--- a/src/renderer/features/player/update-remote-song.tsx
+++ b/src/renderer/features/player/update-remote-song.tsx
@@ -1,7 +1,8 @@
 import isElectron from 'is-electron';
+
 import { QueueSong } from '/@/renderer/api/types';
 
-const remote = isElectron() ? window.electron.remote : null;
+const remote = isElectron() ? window.api.remote : null;
 const mediaSession = navigator.mediaSession;
 
 export const updateSong = (song: QueueSong | undefined) => {
diff --git a/src/renderer/features/player/utils.ts b/src/renderer/features/player/utils.ts
index 6fa6a312..c0f2b284 100644
--- a/src/renderer/features/player/utils.ts
+++ b/src/renderer/features/player/utils.ts
@@ -1,14 +1,15 @@
 import { QueryClient } from '@tanstack/react-query';
+
 import { api } from '/@/renderer/api';
 import { queryKeys } from '/@/renderer/api/query-keys';
 import {
     PlaylistSongListQuery,
+    ServerListItem,
     SongDetailQuery,
     SongListQuery,
     SongListResponse,
     SongListSort,
     SortOrder,
-    ServerListItem,
 } from '/@/renderer/api/types';
 
 export const getPlaylistSongsById = async (args: {
@@ -17,7 +18,7 @@ export const getPlaylistSongsById = async (args: {
     queryClient: QueryClient;
     server: ServerListItem;
 }) => {
-    const { id, queryClient, server, query } = args;
+    const { id, query, queryClient, server } = args;
 
     const queryFilter: PlaylistSongListQuery = {
         id,
@@ -55,7 +56,7 @@ export const getAlbumSongsById = async (args: {
     queryClient: QueryClient;
     server: ServerListItem;
 }) => {
-    const { id, queryClient, server, query } = args;
+    const { id, query, queryClient, server } = args;
 
     const queryFilter: SongListQuery = {
         albumIds: id,
@@ -91,9 +92,9 @@ export const getGenreSongsById = async (args: {
     orderByIds?: boolean;
     query?: Partial<SongListQuery>;
     queryClient: QueryClient;
-    server: ServerListItem | null;
+    server: null | ServerListItem;
 }) => {
-    const { id, queryClient, server, query } = args;
+    const { id, query, queryClient, server } = args;
 
     const data: SongListResponse = {
         items: [],
@@ -143,7 +144,7 @@ export const getAlbumArtistSongsById = async (args: {
     queryClient: QueryClient;
     server: ServerListItem;
 }) => {
-    const { id, queryClient, server, query } = args;
+    const { id, query, queryClient, server } = args;
 
     const queryFilter: SongListQuery = {
         albumArtistIds: id || [],
@@ -180,7 +181,7 @@ export const getArtistSongsById = async (args: {
     queryClient: QueryClient;
     server: ServerListItem;
 }) => {
-    const { id, queryClient, server, query } = args;
+    const { id, query, queryClient, server } = args;
 
     const queryFilter: SongListQuery = {
         artistIds: id,
@@ -216,7 +217,7 @@ export const getSongsByQuery = async (args: {
     queryClient: QueryClient;
     server: ServerListItem;
 }) => {
-    const { queryClient, server, query } = args;
+    const { query, queryClient, server } = args;
 
     const queryFilter: SongListQuery = {
         sortBy: SongListSort.ALBUM,
diff --git a/src/renderer/features/playlists/components/add-to-playlist-context-modal.tsx b/src/renderer/features/playlists/components/add-to-playlist-context-modal.tsx
index c20c76ac..9fddb545 100644
--- a/src/renderer/features/playlists/components/add-to-playlist-context-modal.tsx
+++ b/src/renderer/features/playlists/components/add-to-playlist-context-modal.tsx
@@ -1,7 +1,9 @@
-import { useMemo, useState } from 'react';
 import { Box, Group, Stack } from '@mantine/core';
 import { useForm } from '@mantine/form';
 import { closeModal, ContextModalProps } from '@mantine/modals';
+import { useMemo, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+
 import { api } from '/@/renderer/api';
 import { queryKeys } from '/@/renderer/api/query-keys';
 import { PlaylistListSort, SongListQuery, SongListSort, SortOrder } from '/@/renderer/api/types';
@@ -11,7 +13,6 @@ import { useAddToPlaylist } from '/@/renderer/features/playlists/mutations/add-t
 import { usePlaylistList } from '/@/renderer/features/playlists/queries/playlist-list-query';
 import { queryClient } from '/@/renderer/lib/react-query';
 import { useCurrentServer } from '/@/renderer/store';
-import { useTranslation } from 'react-i18next';
 
 export const AddToPlaylistContextModal = ({
     id,
@@ -217,13 +218,13 @@ export const AddToPlaylistContextModal = ({
                 <Stack>
                     <MultiSelect
                         clearable
-                        searchable
                         data={playlistSelect}
                         disabled={playlistList.isLoading}
                         label={t('form.addToPlaylist.input', {
                             context: 'playlists',
                             postProcess: 'titleCase',
                         })}
+                        searchable
                         size="md"
                         {...form.getInputProps('playlistId')}
                     />
@@ -238,9 +239,9 @@ export const AddToPlaylistContextModal = ({
                         <Group>
                             <Button
                                 disabled={addToPlaylistMutation.isLoading}
+                                onClick={() => closeModal(id)}
                                 size="md"
                                 variant="subtle"
-                                onClick={() => closeModal(id)}
                             >
                                 {t('common.cancel', { postProcess: 'titleCase' })}
                             </Button>
diff --git a/src/renderer/features/playlists/components/create-playlist-form.tsx b/src/renderer/features/playlists/components/create-playlist-form.tsx
index 13f8609b..fbd3a3ae 100644
--- a/src/renderer/features/playlists/components/create-playlist-form.tsx
+++ b/src/renderer/features/playlists/components/create-playlist-form.tsx
@@ -1,7 +1,11 @@
-import { useRef, useState } from 'react';
 import { Group, Stack } from '@mantine/core';
 import { useForm } from '@mantine/form';
+import { useRef, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { ServerFeature } from '/@/renderer/api/features-types';
 import { CreatePlaylistBody, ServerType, SongListSort } from '/@/renderer/api/types';
+import { hasFeature } from '/@/renderer/api/utils';
 import { Button, Switch, Text, TextInput, toast } from '/@/renderer/components';
 import {
     PlaylistQueryBuilder,
@@ -10,9 +14,6 @@ import {
 import { useCreatePlaylist } from '/@/renderer/features/playlists/mutations/create-playlist-mutation';
 import { convertQueryGroupToNDQuery } from '/@/renderer/features/playlists/utils';
 import { useCurrentServer } from '/@/renderer/store';
-import { useTranslation } from 'react-i18next';
-import { hasFeature } from '/@/renderer/api/utils';
-import { ServerFeature } from '/@/renderer/api/features-types';
 
 interface CreatePlaylistFormProps {
     onCancel: () => void;
@@ -95,11 +96,11 @@ export const CreatePlaylistForm = ({ onCancel }: CreatePlaylistFormProps) => {
             <Stack>
                 <TextInput
                     data-autofocus
-                    required
                     label={t('form.createPlaylist.input', {
                         context: 'name',
                         postProcess: 'titleCase',
                     })}
+                    required
                     {...form.getInputProps('name')}
                 />
                 {server?.type === ServerType.NAVIDROME && (
@@ -135,10 +136,10 @@ export const CreatePlaylistForm = ({ onCancel }: CreatePlaylistFormProps) => {
                     <Stack pt="1rem">
                         <Text>Query Editor</Text>
                         <PlaylistQueryBuilder
-                            ref={queryBuilderRef}
                             isSaving={false}
                             limit={undefined}
                             query={undefined}
+                            ref={queryBuilderRef}
                             sortBy={SongListSort.ALBUM}
                             sortOrder="asc"
                         />
@@ -147,8 +148,8 @@ export const CreatePlaylistForm = ({ onCancel }: CreatePlaylistFormProps) => {
 
                 <Group position="right">
                     <Button
-                        variant="subtle"
                         onClick={onCancel}
+                        variant="subtle"
                     >
                         {t('common.cancel', { postProcess: 'titleCase' })}
                     </Button>
diff --git a/src/renderer/features/playlists/components/playlist-detail-song-list-content.tsx b/src/renderer/features/playlists/components/playlist-detail-song-list-content.tsx
index 445cde53..9d39dbd8 100644
--- a/src/renderer/features/playlists/components/playlist-detail-song-list-content.tsx
+++ b/src/renderer/features/playlists/components/playlist-detail-song-list-content.tsx
@@ -8,11 +8,13 @@ import type {
     RowDragEvent,
 } from '@ag-grid-community/core';
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
+
 import { useQueryClient } from '@tanstack/react-query';
 import { AnimatePresence } from 'framer-motion';
 import debounce from 'lodash/debounce';
 import { MutableRefObject, useCallback, useMemo } from 'react';
 import { useParams } from 'react-router';
+
 import { api } from '/@/renderer/api';
 import { queryKeys } from '/@/renderer/api/query-keys';
 import {
@@ -23,8 +25,9 @@ import {
     SongListSort,
     SortOrder,
 } from '/@/renderer/api/types';
+import { toast } from '/@/renderer/components';
 import { VirtualGridAutoSizerContainer } from '/@/renderer/components/virtual-grid';
-import { TablePagination, VirtualTable, getColumnDefs } from '/@/renderer/components/virtual-table';
+import { getColumnDefs, TablePagination, VirtualTable } from '/@/renderer/components/virtual-table';
 import { useCurrentSongRowStyles } from '/@/renderer/components/virtual-table/hooks/use-current-song-row-styles';
 import { useHandleTableContextMenu } from '/@/renderer/features/context-menu';
 import {
@@ -34,6 +37,7 @@ import {
 import { usePlayQueueAdd } from '/@/renderer/features/player';
 import { usePlaylistDetail } from '/@/renderer/features/playlists/queries/playlist-detail-query';
 import { usePlaylistSongList } from '/@/renderer/features/playlists/queries/playlist-song-list-query';
+import { useAppFocus } from '/@/renderer/hooks';
 import {
     useCurrentServer,
     useCurrentSong,
@@ -45,8 +49,6 @@ import {
 } from '/@/renderer/store';
 import { usePlayButtonBehavior } from '/@/renderer/store/settings.store';
 import { ListDisplayType, ServerType } from '/@/renderer/types';
-import { useAppFocus } from '/@/renderer/hooks';
-import { toast } from '/@/renderer/components';
 
 interface PlaylistDetailContentProps {
     songs?: Song[];
@@ -290,12 +292,7 @@ export const PlaylistDetailSongListContent = ({ songs, tableRef }: PlaylistDetai
         <>
             <VirtualGridAutoSizerContainer>
                 <VirtualTable
-                    // https://github.com/ag-grid/ag-grid/issues/5284
-                    // Key is used to force remount of table when display, rowHeight, or server changes
-                    key={`table-${page.display}-${page.table.rowHeight}-${server?.id}`}
-                    ref={tableRef}
                     alwaysShowHorizontalScroll
-                    shouldUpdateSong
                     autoFitColumns={page.table.autoFit}
                     columnDefs={columnDefs}
                     context={{
@@ -309,14 +306,9 @@ export const PlaylistDetailSongListContent = ({ songs, tableRef }: PlaylistDetai
                     infiniteInitialRowCount={
                         iSClientSide ? undefined : checkPlaylistList.data?.totalRecordCount || 100
                     }
-                    pagination={isPaginationEnabled}
-                    paginationAutoPageSize={isPaginationEnabled}
-                    paginationPageSize={pagination.itemsPerPage || 100}
-                    rowClassRules={rowClassRules}
-                    rowData={songs}
-                    rowDragEntireRow={canDrag}
-                    rowHeight={page.table.rowHeight || 40}
-                    rowModelType={iSClientSide ? 'clientSide' : 'infinite'}
+                    // https://github.com/ag-grid/ag-grid/issues/5284
+                    // Key is used to force remount of table when display, rowHeight, or server changes
+                    key={`table-${page.display}-${page.table.rowHeight}-${server?.id}`}
                     onBodyScrollEnd={handleScroll}
                     onCellContextMenu={handleContextMenu}
                     onColumnMoved={handleColumnChange}
@@ -326,13 +318,23 @@ export const PlaylistDetailSongListContent = ({ songs, tableRef }: PlaylistDetai
                     onPaginationChanged={onPaginationChanged}
                     onRowDoubleClicked={handleRowDoubleClick}
                     onRowDragEnd={handleDragEnd}
+                    pagination={isPaginationEnabled}
+                    paginationAutoPageSize={isPaginationEnabled}
+                    paginationPageSize={pagination.itemsPerPage || 100}
+                    ref={tableRef}
+                    rowClassRules={rowClassRules}
+                    rowData={songs}
+                    rowDragEntireRow={canDrag}
+                    rowHeight={page.table.rowHeight || 40}
+                    rowModelType={iSClientSide ? 'clientSide' : 'infinite'}
+                    shouldUpdateSong
                 />
             </VirtualGridAutoSizerContainer>
             {isPaginationEnabled && (
                 <AnimatePresence
-                    presenceAffectsLayout
                     initial={false}
                     mode="wait"
+                    presenceAffectsLayout
                 >
                     {page.display === ListDisplayType.TABLE_PAGINATED && (
                         <TablePagination
diff --git a/src/renderer/features/playlists/components/playlist-detail-song-list-header-filters.tsx b/src/renderer/features/playlists/components/playlist-detail-song-list-header-filters.tsx
index 2293f9bd..254ff19f 100644
--- a/src/renderer/features/playlists/components/playlist-detail-song-list-header-filters.tsx
+++ b/src/renderer/features/playlists/components/playlist-detail-song-list-header-filters.tsx
@@ -1,20 +1,24 @@
-import { useCallback, ChangeEvent, MutableRefObject, MouseEvent } from 'react';
-import { IDatasource } from '@ag-grid-community/core';
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
+
+import { IDatasource } from '@ag-grid-community/core';
 import { Divider, Flex, Group, Stack } from '@mantine/core';
 import { closeAllModals, openModal } from '@mantine/modals';
 import { useQueryClient } from '@tanstack/react-query';
+import { ChangeEvent, MouseEvent, MutableRefObject, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import {
-    RiMoreFill,
-    RiSettings3Fill,
-    RiPlayFill,
-    RiAddCircleFill,
     RiAddBoxFill,
-    RiEditFill,
+    RiAddCircleFill,
     RiDeleteBinFill,
+    RiEditFill,
+    RiMoreFill,
+    RiPlayFill,
     RiRefreshLine,
+    RiSettings3Fill,
 } from 'react-icons/ri';
+import { useNavigate, useParams } from 'react-router';
+
+import i18n from '/@/i18n/i18n';
 import { api } from '/@/renderer/api';
 import { queryKeys } from '/@/renderer/api/query-keys';
 import {
@@ -25,20 +29,26 @@ import {
     SortOrder,
 } from '/@/renderer/api/types';
 import {
-    DropdownMenu,
     Button,
-    Slider,
+    ConfirmModal,
+    DropdownMenu,
     MultiSelect,
+    Slider,
     Switch,
     Text,
-    ConfirmModal,
     toast,
 } from '/@/renderer/components';
+import { SONG_TABLE_COLUMNS } from '/@/renderer/components/virtual-table';
 import { usePlayQueueAdd } from '/@/renderer/features/player';
+import { openUpdatePlaylistModal } from '/@/renderer/features/playlists/components/update-playlist-form';
+import { useDeletePlaylist } from '/@/renderer/features/playlists/mutations/delete-playlist-mutation';
+import { usePlaylistDetail } from '/@/renderer/features/playlists/queries/playlist-detail-query';
+import { OrderToggleButton } from '/@/renderer/features/shared';
 import { useContainerQuery } from '/@/renderer/hooks';
+import { AppRoute } from '/@/renderer/router/routes';
 import {
-    useCurrentServer,
     SongListFilter,
+    useCurrentServer,
     usePlaylistDetailStore,
     useSetPlaylistDetailFilters,
     useSetPlaylistDetailTable,
@@ -46,14 +56,6 @@ import {
     useSetPlaylistTablePagination,
 } from '/@/renderer/store';
 import { ListDisplayType, Play, TableColumn } from '/@/renderer/types';
-import { usePlaylistDetail } from '/@/renderer/features/playlists/queries/playlist-detail-query';
-import { useParams, useNavigate } from 'react-router';
-import { SONG_TABLE_COLUMNS } from '/@/renderer/components/virtual-table';
-import { openUpdatePlaylistModal } from '/@/renderer/features/playlists/components/update-playlist-form';
-import { useDeletePlaylist } from '/@/renderer/features/playlists/mutations/delete-playlist-mutation';
-import { AppRoute } from '/@/renderer/router/routes';
-import { OrderToggleButton } from '/@/renderer/features/shared';
-import i18n from '/@/i18n/i18n';
 
 const FILTERS = {
     jellyfin: [
@@ -265,8 +267,8 @@ interface PlaylistDetailSongListHeaderFiltersProps {
 }
 
 export const PlaylistDetailSongListHeaderFilters = ({
-    tableRef,
     handleToggleShowQueryBuilder,
+    tableRef,
 }: PlaylistDetailSongListHeaderFiltersProps) => {
     const { t } = useTranslation();
     const { playlistId } = useParams() as { playlistId: string };
@@ -493,10 +495,10 @@ export const PlaylistDetailSongListHeaderFilters = ({
                     <DropdownMenu.Dropdown>
                         {FILTERS[server?.type as keyof typeof FILTERS].map((filter) => (
                             <DropdownMenu.Item
-                                key={`filter-${filter.name}`}
                                 $isActive={filter.value === filters.sortBy}
-                                value={filter.value}
+                                key={`filter-${filter.name}`}
                                 onClick={handleSetSortBy}
+                                value={filter.value}
                             >
                                 {filter.name}
                             </DropdownMenu.Item>
@@ -506,8 +508,8 @@ export const PlaylistDetailSongListHeaderFilters = ({
 
                 <Divider orientation="vertical" />
                 <OrderToggleButton
-                    sortOrder={filters.sortOrder || SortOrder.ASC}
                     onToggle={handleToggleSortOrder}
+                    sortOrder={filters.sortOrder || SortOrder.ASC}
                 />
                 <Divider orientation="vertical" />
                 <DropdownMenu position="bottom-start">
@@ -601,8 +603,8 @@ export const PlaylistDetailSongListHeaderFilters = ({
                         </DropdownMenu.Label>
                         <DropdownMenu.Item
                             $isActive={page.display === ListDisplayType.TABLE}
-                            value={ListDisplayType.TABLE}
                             onClick={handleSetViewType}
+                            value={ListDisplayType.TABLE}
                         >
                             Table
                         </DropdownMenu.Item>
@@ -642,8 +644,8 @@ export const PlaylistDetailSongListHeaderFilters = ({
                                             defaultValue={page.table?.columns.map(
                                                 (column) => column.column,
                                             )}
-                                            width={300}
                                             onChange={handleTableColumns}
+                                            width={300}
                                         />
                                         <Group position="apart">
                                             <Text>Auto Fit Columns</Text>
diff --git a/src/renderer/features/playlists/components/playlist-detail-song-list-header.tsx b/src/renderer/features/playlists/components/playlist-detail-song-list-header.tsx
index 29e7a51e..ae28ef50 100644
--- a/src/renderer/features/playlists/components/playlist-detail-song-list-header.tsx
+++ b/src/renderer/features/playlists/components/playlist-detail-song-list-header.tsx
@@ -1,8 +1,10 @@
-import { MutableRefObject } from 'react';
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
+
 import { Stack } from '@mantine/core';
+import { MutableRefObject } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useParams } from 'react-router';
+
 import { LibraryItem } from '/@/renderer/api/types';
 import { Badge, PageHeader, Paper, SpinnerIcon } from '/@/renderer/components';
 import { usePlayQueueAdd } from '/@/renderer/features/player';
@@ -20,9 +22,9 @@ interface PlaylistDetailHeaderProps {
 }
 
 export const PlaylistDetailSongListHeader = ({
-    tableRef,
-    itemCount,
     handleToggleShowQueryBuilder,
+    itemCount,
+    tableRef,
 }: PlaylistDetailHeaderProps) => {
     const { t } = useTranslation();
     const { playlistId } = useParams() as { playlistId: string };
diff --git a/src/renderer/features/playlists/components/playlist-list-content.tsx b/src/renderer/features/playlists/components/playlist-list-content.tsx
index ed40b04d..61427068 100644
--- a/src/renderer/features/playlists/components/playlist-list-content.tsx
+++ b/src/renderer/features/playlists/components/playlist-list-content.tsx
@@ -1,10 +1,13 @@
-import { lazy, MutableRefObject, Suspense } from 'react';
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
+
+import { lazy, MutableRefObject, Suspense } from 'react';
+
+import { useListContext } from '../../../context/list-context';
+import { useListStoreByKey } from '../../../store/list.store';
+
 import { Spinner } from '/@/renderer/components';
 import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid';
 import { ListDisplayType } from '/@/renderer/types';
-import { useListContext } from '../../../context/list-context';
-import { useListStoreByKey } from '../../../store/list.store';
 
 const PlaylistListTableView = lazy(() =>
     import('/@/renderer/features/playlists/components/playlist-list-table-view').then((module) => ({
@@ -19,12 +22,12 @@ const PlaylistListGridView = lazy(() =>
 );
 
 interface PlaylistListContentProps {
-    gridRef: MutableRefObject<VirtualInfiniteGridRef | null>;
+    gridRef: MutableRefObject<null | VirtualInfiniteGridRef>;
     itemCount?: number;
     tableRef: MutableRefObject<AgGridReactType | null>;
 }
 
-export const PlaylistListContent = ({ gridRef, tableRef, itemCount }: PlaylistListContentProps) => {
+export const PlaylistListContent = ({ gridRef, itemCount, tableRef }: PlaylistListContentProps) => {
     const { pageKey } = useListContext();
     const { display } = useListStoreByKey({ key: pageKey });
 
diff --git a/src/renderer/features/playlists/components/playlist-list-grid-view.tsx b/src/renderer/features/playlists/components/playlist-list-grid-view.tsx
index 9dad4a9e..3038f1d8 100644
--- a/src/renderer/features/playlists/components/playlist-list-grid-view.tsx
+++ b/src/renderer/features/playlists/components/playlist-list-grid-view.tsx
@@ -2,8 +2,10 @@ import { QueryKey, useQueryClient } from '@tanstack/react-query';
 import { MutableRefObject, useCallback, useMemo } from 'react';
 import AutoSizer, { Size } from 'react-virtualized-auto-sizer';
 import { ListOnScrollProps } from 'react-window';
+
 import { useListContext } from '../../../context/list-context';
 import { useListStoreActions } from '../../../store/list.store';
+
 import { controller } from '/@/renderer/api/controller';
 import { queryKeys } from '/@/renderer/api/query-keys';
 import {
@@ -20,13 +22,13 @@ import {
     VirtualInfiniteGridRef,
 } from '/@/renderer/components/virtual-grid';
 import { usePlayQueueAdd } from '/@/renderer/features/player';
+import { useHandleFavorite } from '/@/renderer/features/shared/hooks/use-handle-favorite';
 import { AppRoute } from '/@/renderer/router/routes';
 import { useCurrentServer, useListStoreByKey } from '/@/renderer/store';
 import { CardRow, ListDisplayType } from '/@/renderer/types';
-import { useHandleFavorite } from '/@/renderer/features/shared/hooks/use-handle-favorite';
 
 interface PlaylistListGridViewProps {
-    gridRef: MutableRefObject<VirtualInfiniteGridRef | null>;
+    gridRef: MutableRefObject<null | VirtualInfiniteGridRef>;
     itemCount?: number;
 }
 
@@ -35,7 +37,7 @@ export const PlaylistListGridView = ({ gridRef, itemCount }: PlaylistListGridVie
     const queryClient = useQueryClient();
     const server = useCurrentServer();
     const handlePlayQueueAdd = usePlayQueueAdd();
-    const { display, grid, filter } = useListStoreByKey<PlaylistListQuery>({ key: pageKey });
+    const { display, filter, grid } = useListStoreByKey<PlaylistListQuery>({ key: pageKey });
     const { setGrid } = useListStoreActions();
     const handleFavorite = useHandleFavorite({ gridRef, server });
 
@@ -49,15 +51,15 @@ export const PlaylistListGridView = ({ gridRef, itemCount }: PlaylistListGridVie
             case PlaylistListSort.NAME:
                 rows.push(PLAYLIST_CARD_ROWS.songCount);
                 break;
-            case PlaylistListSort.SONG_COUNT:
-                rows.push(PLAYLIST_CARD_ROWS.songCount);
-                break;
             case PlaylistListSort.OWNER:
                 rows.push(PLAYLIST_CARD_ROWS.owner);
                 break;
             case PlaylistListSort.PUBLIC:
                 rows.push(PLAYLIST_CARD_ROWS.public);
                 break;
+            case PlaylistListSort.SONG_COUNT:
+                rows.push(PLAYLIST_CARD_ROWS.songCount);
+                break;
             case PlaylistListSort.UPDATED_AT:
                 break;
         }
@@ -73,7 +75,7 @@ export const PlaylistListGridView = ({ gridRef, itemCount }: PlaylistListGridVie
     );
 
     const fetchInitialData = useCallback(() => {
-        const query: Omit<PlaylistListQuery, 'startIndex' | 'limit'> = {
+        const query: Omit<PlaylistListQuery, 'limit' | 'startIndex'> = {
             ...filter,
         };
 
@@ -140,8 +142,6 @@ export const PlaylistListGridView = ({ gridRef, itemCount }: PlaylistListGridVie
             <AutoSizer>
                 {({ height, width }: Size) => (
                     <VirtualInfiniteGrid
-                        key={`playlist-list-${server?.id}`}
-                        ref={gridRef}
                         cardRows={cardRows}
                         display={display || ListDisplayType.CARD}
                         fetchFn={fetch}
@@ -154,14 +154,16 @@ export const PlaylistListGridView = ({ gridRef, itemCount }: PlaylistListGridVie
                         itemGap={grid?.itemGap ?? 10}
                         itemSize={grid?.itemSize || 200}
                         itemType={LibraryItem.PLAYLIST}
+                        key={`playlist-list-${server?.id}`}
                         loading={itemCount === undefined || itemCount === null}
                         minimumBatchSize={40}
+                        onScroll={handleGridScroll}
+                        ref={gridRef}
                         route={{
                             route: AppRoute.PLAYLISTS_DETAIL_SONGS,
                             slugs: [{ idProperty: 'id', slugProperty: 'playlistId' }],
                         }}
                         width={width}
-                        onScroll={handleGridScroll}
                     />
                 )}
             </AutoSizer>
diff --git a/src/renderer/features/playlists/components/playlist-list-header-filters.tsx b/src/renderer/features/playlists/components/playlist-list-header-filters.tsx
index 771dd592..5a44e87b 100644
--- a/src/renderer/features/playlists/components/playlist-list-header-filters.tsx
+++ b/src/renderer/features/playlists/components/playlist-list-header-filters.tsx
@@ -1,12 +1,16 @@
-import { ChangeEvent, MouseEvent, MutableRefObject, useCallback } from 'react';
-import { IDatasource } from '@ag-grid-community/core';
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
+
+import { IDatasource } from '@ag-grid-community/core';
 import { Divider, Flex, Group, Stack } from '@mantine/core';
 import { useQueryClient } from '@tanstack/react-query';
+import { ChangeEvent, MouseEvent, MutableRefObject, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import { RiMoreFill, RiRefreshLine, RiSettings3Fill } from 'react-icons/ri';
+
 import { useListContext } from '../../../context/list-context';
 import { useListStoreByKey } from '../../../store/list.store';
+
+import i18n from '/@/i18n/i18n';
 import { api } from '/@/renderer/api';
 import { queryKeys } from '/@/renderer/api/query-keys';
 import { LibraryItem, PlaylistListQuery, PlaylistListSort, SortOrder } from '/@/renderer/api/types';
@@ -17,7 +21,6 @@ import { OrderToggleButton } from '/@/renderer/features/shared';
 import { useContainerQuery } from '/@/renderer/hooks';
 import { PlaylistListFilter, useCurrentServer, useListStoreActions } from '/@/renderer/store';
 import { ListDisplayType, TableColumn } from '/@/renderer/types';
-import i18n from '/@/i18n/i18n';
 
 const FILTERS = {
     jellyfin: [
@@ -104,7 +107,7 @@ const FILTERS = {
 };
 
 interface PlaylistListHeaderFiltersProps {
-    gridRef: MutableRefObject<VirtualInfiniteGridRef | null>;
+    gridRef: MutableRefObject<null | VirtualInfiniteGridRef>;
     tableRef: MutableRefObject<AgGridReactType | null>;
 }
 
@@ -116,9 +119,9 @@ export const PlaylistListHeaderFilters = ({
     const { pageKey } = useListContext();
     const queryClient = useQueryClient();
     const server = useCurrentServer();
-    const { setFilter, setTable, setTablePagination, setGrid, setDisplayType } =
+    const { setDisplayType, setFilter, setGrid, setTable, setTablePagination } =
         useListStoreActions();
-    const { display, filter, table, grid } = useListStoreByKey<PlaylistListQuery>({ key: pageKey });
+    const { display, filter, grid, table } = useListStoreByKey<PlaylistListQuery>({ key: pageKey });
     const cq = useContainerQuery();
 
     const isGrid = display === ListDisplayType.CARD || display === ListDisplayType.POSTER;
@@ -337,10 +340,10 @@ export const PlaylistListHeaderFilters = ({
                     <DropdownMenu.Dropdown>
                         {FILTERS[server?.type as keyof typeof FILTERS].map((f) => (
                             <DropdownMenu.Item
-                                key={`filter-${f.name}`}
                                 $isActive={f.value === filter.sortBy}
-                                value={f.value}
+                                key={`filter-${f.name}`}
                                 onClick={handleSetSortBy}
+                                value={f.value}
                             >
                                 {f.name}
                             </DropdownMenu.Item>
@@ -349,16 +352,16 @@ export const PlaylistListHeaderFilters = ({
                 </DropdownMenu>
                 <Divider orientation="vertical" />
                 <OrderToggleButton
-                    sortOrder={filter.sortOrder}
                     onToggle={handleToggleSortOrder}
+                    sortOrder={filter.sortOrder}
                 />
                 <Divider orientation="vertical" />
                 <Button
                     compact
+                    onClick={handleRefresh}
                     size="md"
                     tooltip={{ label: t('common.refresh', { postProcess: 'titleCase' }) }}
                     variant="subtle"
-                    onClick={handleRefresh}
                 >
                     <RiRefreshLine size="1.3rem" />
                 </Button>
@@ -404,22 +407,22 @@ export const PlaylistListHeaderFilters = ({
                         </DropdownMenu.Label>
                         <DropdownMenu.Item
                             $isActive={display === ListDisplayType.CARD}
-                            value={ListDisplayType.CARD}
                             onClick={handleSetViewType}
+                            value={ListDisplayType.CARD}
                         >
                             {t('table.config.view.card', { postProcess: 'titleCase' })}
                         </DropdownMenu.Item>
                         <DropdownMenu.Item
                             $isActive={display === ListDisplayType.POSTER}
-                            value={ListDisplayType.POSTER}
                             onClick={handleSetViewType}
+                            value={ListDisplayType.POSTER}
                         >
                             {t('table.config.view.poster', { postProcess: 'titleCase' })}
                         </DropdownMenu.Item>
                         <DropdownMenu.Item
                             $isActive={display === ListDisplayType.TABLE}
-                            value={ListDisplayType.TABLE}
                             onClick={handleSetViewType}
+                            value={ListDisplayType.TABLE}
                         >
                             {t('table.config.view.table', { postProcess: 'titleCase' })}
                         </DropdownMenu.Item>
@@ -478,8 +481,8 @@ export const PlaylistListHeaderFilters = ({
                                             defaultValue={table?.columns.map(
                                                 (column) => column.column,
                                             )}
-                                            width={300}
                                             onChange={handleTableColumns}
+                                            width={300}
                                         />
                                         <Group position="apart">
                                             <Text>
diff --git a/src/renderer/features/playlists/components/playlist-list-header.tsx b/src/renderer/features/playlists/components/playlist-list-header.tsx
index ccb57dd6..b9cccbed 100644
--- a/src/renderer/features/playlists/components/playlist-list-header.tsx
+++ b/src/renderer/features/playlists/components/playlist-list-header.tsx
@@ -1,27 +1,29 @@
-import { ChangeEvent, MutableRefObject } from 'react';
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
+
 import { Flex, Group, Stack } from '@mantine/core';
-import { openModal, closeAllModals } from '@mantine/modals';
-import { PageHeader, SpinnerIcon, Paper, Button, SearchInput } from '/@/renderer/components';
+import { closeAllModals, openModal } from '@mantine/modals';
+import debounce from 'lodash/debounce';
+import { ChangeEvent, MutableRefObject } from 'react';
+import { useTranslation } from 'react-i18next';
+import { RiFileAddFill } from 'react-icons/ri';
+
+import { LibraryItem, PlaylistListQuery, ServerType } from '/@/renderer/api/types';
+import { Button, PageHeader, Paper, SearchInput, SpinnerIcon } from '/@/renderer/components';
 import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid';
 import { CreatePlaylistForm } from '/@/renderer/features/playlists/components/create-playlist-form';
 import { PlaylistListHeaderFilters } from '/@/renderer/features/playlists/components/playlist-list-header-filters';
 import { LibraryHeaderBar } from '/@/renderer/features/shared';
 import { useContainerQuery } from '/@/renderer/hooks';
-import { PlaylistListFilter, useCurrentServer } from '/@/renderer/store';
-import debounce from 'lodash/debounce';
-import { useTranslation } from 'react-i18next';
-import { RiFileAddFill } from 'react-icons/ri';
-import { LibraryItem, PlaylistListQuery, ServerType } from '/@/renderer/api/types';
 import { useDisplayRefresh } from '/@/renderer/hooks/use-display-refresh';
+import { PlaylistListFilter, useCurrentServer } from '/@/renderer/store';
 
 interface PlaylistListHeaderProps {
-    gridRef: MutableRefObject<VirtualInfiniteGridRef | null>;
+    gridRef: MutableRefObject<null | VirtualInfiniteGridRef>;
     itemCount?: number;
     tableRef: MutableRefObject<AgGridReactType | null>;
 }
 
-export const PlaylistListHeader = ({ itemCount, tableRef, gridRef }: PlaylistListHeaderProps) => {
+export const PlaylistListHeader = ({ gridRef, itemCount, tableRef }: PlaylistListHeaderProps) => {
     const { t } = useTranslation();
     const cq = useContainerQuery();
     const server = useCurrentServer();
@@ -78,12 +80,12 @@ export const PlaylistListHeader = ({ itemCount, tableRef, gridRef }: PlaylistLis
                             )}
                         </Paper>
                         <Button
+                            onClick={handleCreatePlaylistModal}
                             tooltip={{
                                 label: t('action.createPlaylist', { postProcess: 'sentenceCase' }),
                                 openDelay: 500,
                             }}
                             variant="filled"
-                            onClick={handleCreatePlaylistModal}
                         >
                             <RiFileAddFill />
                         </Button>
@@ -91,8 +93,8 @@ export const PlaylistListHeader = ({ itemCount, tableRef, gridRef }: PlaylistLis
                     <Group>
                         <SearchInput
                             defaultValue={filter.searchTerm}
-                            openedWidth={cq.isMd ? 250 : cq.isSm ? 200 : 150}
                             onChange={handleSearch}
+                            openedWidth={cq.isMd ? 250 : cq.isSm ? 200 : 150}
                         />
                     </Group>
                 </Flex>
diff --git a/src/renderer/features/playlists/components/playlist-list-table-view.tsx b/src/renderer/features/playlists/components/playlist-list-table-view.tsx
index af5fe0e3..744b58ca 100644
--- a/src/renderer/features/playlists/components/playlist-list-table-view.tsx
+++ b/src/renderer/features/playlists/components/playlist-list-table-view.tsx
@@ -1,7 +1,9 @@
-import { MutableRefObject } from 'react';
-import { RowDoubleClickedEvent } from '@ag-grid-community/core';
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
+
+import { RowDoubleClickedEvent } from '@ag-grid-community/core';
+import { MutableRefObject } from 'react';
 import { generatePath, useNavigate } from 'react-router';
+
 import { LibraryItem } from '/@/renderer/api/types';
 import { VirtualGridAutoSizerContainer } from '/@/renderer/components/virtual-grid';
 import { VirtualTable } from '/@/renderer/components/virtual-table';
@@ -15,7 +17,7 @@ interface PlaylistListTableViewProps {
     tableRef: MutableRefObject<AgGridReactType | null>;
 }
 
-export const PlaylistListTableView = ({ tableRef, itemCount }: PlaylistListTableViewProps) => {
+export const PlaylistListTableView = ({ itemCount, tableRef }: PlaylistListTableViewProps) => {
     const navigate = useNavigate();
     const server = useCurrentServer();
     const pageKey = 'playlist';
diff --git a/src/renderer/features/playlists/components/playlist-query-builder.tsx b/src/renderer/features/playlists/components/playlist-query-builder.tsx
index dde8c42d..82bda953 100644
--- a/src/renderer/features/playlists/components/playlist-query-builder.tsx
+++ b/src/renderer/features/playlists/components/playlist-query-builder.tsx
@@ -1,4 +1,3 @@
-import { forwardRef, Ref, useImperativeHandle, useMemo, useState } from 'react';
 import { Group } from '@mantine/core';
 import { useForm } from '@mantine/form';
 import { openModal } from '@mantine/modals';
@@ -6,6 +5,19 @@ import clone from 'lodash/clone';
 import get from 'lodash/get';
 import setWith from 'lodash/setWith';
 import { nanoid } from 'nanoid';
+import { forwardRef, Ref, useImperativeHandle, useMemo, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { RiMore2Fill, RiSaveLine } from 'react-icons/ri';
+
+import {
+    NDSongQueryBooleanOperators,
+    NDSongQueryDateOperators,
+    NDSongQueryFields,
+    NDSongQueryNumberOperators,
+    NDSongQueryPlaylistOperators,
+    NDSongQueryStringOperators,
+} from '/@/renderer/api/navidrome.types';
+import { PlaylistListSort, SongListSort, SortOrder } from '/@/renderer/api/types';
 import {
     Button,
     DropdownMenu,
@@ -15,25 +27,14 @@ import {
     ScrollArea,
     Select,
 } from '/@/renderer/components';
+import { usePlaylistList } from '/@/renderer/features/playlists/queries/playlist-list-query';
 import {
     convertNDQueryToQueryGroup,
     convertQueryGroupToNDQuery,
 } from '/@/renderer/features/playlists/utils';
-import { QueryBuilderGroup, QueryBuilderRule } from '/@/renderer/types';
-import { useTranslation } from 'react-i18next';
-import { RiMore2Fill, RiSaveLine } from 'react-icons/ri';
-import { PlaylistListSort, SongListSort, SortOrder } from '/@/renderer/api/types';
-import {
-    NDSongQueryBooleanOperators,
-    NDSongQueryDateOperators,
-    NDSongQueryFields,
-    NDSongQueryNumberOperators,
-    NDSongQueryPlaylistOperators,
-    NDSongQueryStringOperators,
-} from '/@/renderer/api/navidrome.types';
-import { usePlaylistList } from '/@/renderer/features/playlists/queries/playlist-list-query';
-import { useCurrentServer } from '/@/renderer/store';
 import { JsonPreview } from '/@/renderer/features/shared/components/json-preview';
+import { useCurrentServer } from '/@/renderer/store';
+import { QueryBuilderGroup, QueryBuilderRule } from '/@/renderer/types';
 
 type AddArgs = {
     groupIndex: number[];
@@ -91,14 +92,14 @@ export type PlaylistQueryBuilderRef = {
 export const PlaylistQueryBuilder = forwardRef(
     (
         {
-            sortOrder,
-            sortBy,
-            limit,
             isSaving,
-            query,
+            limit,
             onSave,
             onSaveAs,
             playlistId,
+            query,
+            sortBy,
+            sortOrder,
         }: PlaylistQueryBuilderProps,
         ref: Ref<PlaylistQueryBuilderRef>,
     ) => {
@@ -177,7 +178,7 @@ export const PlaylistQueryBuilder = forwardRef(
         };
 
         const handleAddRuleGroup = (args: AddArgs) => {
-            const { level, groupIndex } = args;
+            const { groupIndex, level } = args;
             const filtersCopy = clone(filters);
 
             const getPath = (level: number) => {
@@ -218,7 +219,7 @@ export const PlaylistQueryBuilder = forwardRef(
         };
 
         const handleDeleteRuleGroup = (args: DeleteArgs) => {
-            const { uniqueId, level, groupIndex } = args;
+            const { groupIndex, level, uniqueId } = args;
             const filtersCopy = clone(filters);
 
             const getPath = (level: number) => {
@@ -264,7 +265,7 @@ export const PlaylistQueryBuilder = forwardRef(
         };
 
         const handleAddRule = (args: AddArgs) => {
-            const { level, groupIndex } = args;
+            const { groupIndex, level } = args;
             const filtersCopy = clone(filters);
 
             const path = getRulePath(level, groupIndex);
@@ -287,7 +288,7 @@ export const PlaylistQueryBuilder = forwardRef(
         };
 
         const handleDeleteRule = (args: DeleteArgs) => {
-            const { uniqueId, level, groupIndex } = args;
+            const { groupIndex, level, uniqueId } = args;
             const filtersCopy = clone(filters);
 
             const path = getRulePath(level, groupIndex);
@@ -304,7 +305,7 @@ export const PlaylistQueryBuilder = forwardRef(
         };
 
         const handleChangeField = (args: any) => {
-            const { uniqueId, level, groupIndex, value } = args;
+            const { groupIndex, level, uniqueId, value } = args;
             const filtersCopy = clone(filters);
 
             const path = getRulePath(level, groupIndex);
@@ -327,7 +328,7 @@ export const PlaylistQueryBuilder = forwardRef(
         };
 
         const handleChangeType = (args: any) => {
-            const { level, groupIndex, value } = args;
+            const { groupIndex, level, value } = args;
 
             const filtersCopy = clone(filters);
 
@@ -359,7 +360,7 @@ export const PlaylistQueryBuilder = forwardRef(
         };
 
         const handleChangeOperator = (args: any) => {
-            const { uniqueId, level, groupIndex, value } = args;
+            const { groupIndex, level, uniqueId, value } = args;
             const filtersCopy = clone(filters);
 
             const path = getRulePath(level, groupIndex);
@@ -380,7 +381,7 @@ export const PlaylistQueryBuilder = forwardRef(
         };
 
         const handleChangeValue = (args: any) => {
-            const { uniqueId, level, groupIndex, value } = args;
+            const { groupIndex, level, uniqueId, value } = args;
             const filtersCopy = clone(filters);
 
             const path = getRulePath(level, groupIndex);
@@ -424,15 +425,6 @@ export const PlaylistQueryBuilder = forwardRef(
                         filters={NDSongQueryFields}
                         groupIndex={[]}
                         level={0}
-                        operators={{
-                            boolean: NDSongQueryBooleanOperators,
-                            date: NDSongQueryDateOperators,
-                            number: NDSongQueryNumberOperators,
-                            playlist: NDSongQueryPlaylistOperators,
-                            string: NDSongQueryStringOperators,
-                        }}
-                        playlists={playlistData}
-                        uniqueId={filters.uniqueId}
                         onAddRule={handleAddRule}
                         onAddRuleGroup={handleAddRuleGroup}
                         onChangeField={handleChangeField}
@@ -443,12 +435,21 @@ export const PlaylistQueryBuilder = forwardRef(
                         onDeleteRule={handleDeleteRule}
                         onDeleteRuleGroup={handleDeleteRuleGroup}
                         onResetFilters={handleResetFilters}
+                        operators={{
+                            boolean: NDSongQueryBooleanOperators,
+                            date: NDSongQueryDateOperators,
+                            number: NDSongQueryNumberOperators,
+                            playlist: NDSongQueryPlaylistOperators,
+                            string: NDSongQueryStringOperators,
+                        }}
+                        playlists={playlistData}
+                        uniqueId={filters.uniqueId}
                     />
                 </ScrollArea>
                 <Group
-                    noWrap
                     align="flex-end"
                     m="1rem"
+                    noWrap
                     position="apart"
                 >
                     <Group
@@ -457,10 +458,10 @@ export const PlaylistQueryBuilder = forwardRef(
                         w="100%"
                     >
                         <Select
-                            searchable
                             data={sortOptions}
                             label="Sort"
                             maxWidth="20%"
+                            searchable
                             width={150}
                             {...extraFiltersForm.getInputProps('sortBy')}
                         />
@@ -494,15 +495,15 @@ export const PlaylistQueryBuilder = forwardRef(
                         >
                             <Button
                                 loading={isSaving}
-                                variant="filled"
                                 onClick={handleSaveAs}
+                                variant="filled"
                             >
                                 {t('common.saveAs', { postProcess: 'titleCase' })}
                             </Button>
                             <Button
+                                onClick={openPreviewModal}
                                 p="0.5em"
                                 variant="default"
-                                onClick={openPreviewModal}
                             >
                                 {t('common.preview', { postProcess: 'titleCase' })}
                             </Button>
diff --git a/src/renderer/features/playlists/components/save-as-playlist-form.tsx b/src/renderer/features/playlists/components/save-as-playlist-form.tsx
index 8b1e3d96..35c7b12c 100644
--- a/src/renderer/features/playlists/components/save-as-playlist-form.tsx
+++ b/src/renderer/features/playlists/components/save-as-playlist-form.tsx
@@ -1,12 +1,13 @@
 import { Group, Stack } from '@mantine/core';
 import { useForm } from '@mantine/form';
+import { useTranslation } from 'react-i18next';
+
+import { ServerFeature } from '/@/renderer/api/features-types';
 import { CreatePlaylistBody, CreatePlaylistResponse, ServerType } from '/@/renderer/api/types';
+import { hasFeature } from '/@/renderer/api/utils';
 import { Button, Switch, TextInput, toast } from '/@/renderer/components';
 import { useCreatePlaylist } from '/@/renderer/features/playlists/mutations/create-playlist-mutation';
 import { useCurrentServer } from '/@/renderer/store';
-import { useTranslation } from 'react-i18next';
-import { ServerFeature } from '/@/renderer/api/features-types';
-import { hasFeature } from '/@/renderer/api/utils';
 
 interface SaveAsPlaylistFormProps {
     body: Partial<CreatePlaylistBody>;
@@ -17,9 +18,9 @@ interface SaveAsPlaylistFormProps {
 
 export const SaveAsPlaylistForm = ({
     body,
-    serverId,
-    onSuccess,
     onCancel,
+    onSuccess,
+    serverId,
 }: SaveAsPlaylistFormProps) => {
     const { t } = useTranslation();
     const mutation = useCreatePlaylist({});
@@ -68,11 +69,11 @@ export const SaveAsPlaylistForm = ({
             <Stack>
                 <TextInput
                     data-autofocus
-                    required
                     label={t('form.createPlaylist.input', {
                         context: 'name',
                         postProcess: 'titleCase',
                     })}
+                    required
                     {...form.getInputProps('name')}
                 />
                 {server?.type === ServerType.NAVIDROME && (
@@ -95,8 +96,8 @@ export const SaveAsPlaylistForm = ({
                 )}
                 <Group position="right">
                     <Button
-                        variant="subtle"
                         onClick={onCancel}
+                        variant="subtle"
                     >
                         {t('common.cancel', { postProcess: 'titleCase' })}
                     </Button>
diff --git a/src/renderer/features/playlists/components/update-playlist-form.tsx b/src/renderer/features/playlists/components/update-playlist-form.tsx
index 38b6f690..3d4f0a12 100644
--- a/src/renderer/features/playlists/components/update-playlist-form.tsx
+++ b/src/renderer/features/playlists/components/update-playlist-form.tsx
@@ -1,7 +1,11 @@
 import { Group, Stack } from '@mantine/core';
 import { useForm } from '@mantine/form';
-import { openModal, closeAllModals } from '@mantine/modals';
+import { closeAllModals, openModal } from '@mantine/modals';
+import { useTranslation } from 'react-i18next';
+
+import i18n from '/@/i18n/i18n';
 import { api } from '/@/renderer/api';
+import { ServerFeature } from '/@/renderer/api/features-types';
 import { queryKeys } from '/@/renderer/api/query-keys';
 import {
     PlaylistDetailResponse,
@@ -14,14 +18,11 @@ import {
     UserListQuery,
     UserListSort,
 } from '/@/renderer/api/types';
+import { hasFeature } from '/@/renderer/api/utils';
 import { Button, Select, Switch, TextInput, toast } from '/@/renderer/components';
 import { useUpdatePlaylist } from '/@/renderer/features/playlists/mutations/update-playlist-mutation';
 import { queryClient } from '/@/renderer/lib/react-query';
 import { useCurrentServer } from '/@/renderer/store';
-import { useTranslation } from 'react-i18next';
-import i18n from '/@/i18n/i18n';
-import { hasFeature } from '/@/renderer/api/utils';
-import { ServerFeature } from '/@/renderer/api/features-types';
 
 interface UpdatePlaylistFormProps {
     body: Partial<UpdatePlaylistBody>;
@@ -30,7 +31,7 @@ interface UpdatePlaylistFormProps {
     users?: User[];
 }
 
-export const UpdatePlaylistForm = ({ users, query, body, onCancel }: UpdatePlaylistFormProps) => {
+export const UpdatePlaylistForm = ({ body, onCancel, query, users }: UpdatePlaylistFormProps) => {
     const { t } = useTranslation();
     const mutation = useUpdatePlaylist({});
     const server = useCurrentServer();
@@ -89,11 +90,11 @@ export const UpdatePlaylistForm = ({ users, query, body, onCancel }: UpdatePlayl
             <Stack>
                 <TextInput
                     data-autofocus
-                    required
                     label={t('form.createPlaylist.input', {
                         context: 'name',
                         postProcess: 'titleCase',
                     })}
+                    required
                     {...form.getInputProps('name')}
                 />
                 {server?.type === ServerType.NAVIDROME && (
@@ -135,8 +136,8 @@ export const UpdatePlaylistForm = ({ users, query, body, onCancel }: UpdatePlayl
                 )}
                 <Group position="right">
                     <Button
-                        variant="subtle"
                         onClick={onCancel}
+                        variant="subtle"
                     >
                         {t('common.cancel', { postProcess: 'titleCase' })}
                     </Button>
@@ -200,9 +201,9 @@ export const openUpdatePlaylistModal = async (args: {
                     name: playlist?.name,
                     public: playlist?.public || false,
                 }}
+                onCancel={closeAllModals}
                 query={{ id: playlist?.id }}
                 users={users?.items}
-                onCancel={closeAllModals}
             />
         ),
         title: i18n.t('form.editPlaylist.title', { postProcess: 'titleCase' }) as string,
diff --git a/src/renderer/features/playlists/index.ts b/src/renderer/features/playlists/index.ts
index 1fa563c8..543657b2 100644
--- a/src/renderer/features/playlists/index.ts
+++ b/src/renderer/features/playlists/index.ts
@@ -1,8 +1,8 @@
-export * from './queries/playlist-list-query';
 export * from './components/add-to-playlist-context-modal';
 export * from './components/create-playlist-form';
-export * from './mutations/delete-playlist-mutation';
-export * from './mutations/create-playlist-mutation';
-export * from './mutations/update-playlist-mutation';
 export * from './mutations/add-to-playlist-mutation';
+export * from './mutations/create-playlist-mutation';
+export * from './mutations/delete-playlist-mutation';
 export * from './mutations/remove-from-playlist-mutation';
+export * from './mutations/update-playlist-mutation';
+export * from './queries/playlist-list-query';
diff --git a/src/renderer/features/playlists/mutations/add-to-playlist-mutation.ts b/src/renderer/features/playlists/mutations/add-to-playlist-mutation.ts
index 01086dee..9143599f 100644
--- a/src/renderer/features/playlists/mutations/add-to-playlist-mutation.ts
+++ b/src/renderer/features/playlists/mutations/add-to-playlist-mutation.ts
@@ -1,5 +1,6 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { AxiosError } from 'axios';
+
 import { api } from '/@/renderer/api';
 import { queryKeys } from '/@/renderer/api/query-keys';
 import { AddToPlaylistArgs, AddToPlaylistResponse } from '/@/renderer/api/types';
@@ -13,7 +14,7 @@ export const useAddToPlaylist = (args: MutationHookArgs) => {
     return useMutation<
         AddToPlaylistResponse,
         AxiosError,
-        Omit<AddToPlaylistArgs, 'server' | 'apiClientProps'>,
+        Omit<AddToPlaylistArgs, 'apiClientProps' | 'server'>,
         null
     >({
         mutationFn: (args) => {
diff --git a/src/renderer/features/playlists/mutations/create-playlist-mutation.ts b/src/renderer/features/playlists/mutations/create-playlist-mutation.ts
index 799b2b50..86e4e5d5 100644
--- a/src/renderer/features/playlists/mutations/create-playlist-mutation.ts
+++ b/src/renderer/features/playlists/mutations/create-playlist-mutation.ts
@@ -1,10 +1,12 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
+import { AxiosError } from 'axios';
+
+import { queryKeys } from '../../../api/query-keys';
+
 import { api } from '/@/renderer/api';
 import { CreatePlaylistArgs, CreatePlaylistResponse } from '/@/renderer/api/types';
 import { MutationHookArgs } from '/@/renderer/lib/react-query';
 import { getServerById } from '/@/renderer/store';
-import { AxiosError } from 'axios';
-import { queryKeys } from '../../../api/query-keys';
 
 export const useCreatePlaylist = (args: MutationHookArgs) => {
     const { options } = args || {};
@@ -13,7 +15,7 @@ export const useCreatePlaylist = (args: MutationHookArgs) => {
     return useMutation<
         CreatePlaylistResponse,
         AxiosError,
-        Omit<CreatePlaylistArgs, 'server' | 'apiClientProps'>,
+        Omit<CreatePlaylistArgs, 'apiClientProps' | 'server'>,
         null
     >({
         mutationFn: (args) => {
diff --git a/src/renderer/features/playlists/mutations/delete-playlist-mutation.ts b/src/renderer/features/playlists/mutations/delete-playlist-mutation.ts
index 4f6a3cf0..3dced629 100644
--- a/src/renderer/features/playlists/mutations/delete-playlist-mutation.ts
+++ b/src/renderer/features/playlists/mutations/delete-playlist-mutation.ts
@@ -1,5 +1,6 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { AxiosError } from 'axios';
+
 import { api } from '/@/renderer/api';
 import { queryKeys } from '/@/renderer/api/query-keys';
 import { DeletePlaylistArgs, DeletePlaylistResponse } from '/@/renderer/api/types';
@@ -14,7 +15,7 @@ export const useDeletePlaylist = (args: MutationHookArgs) => {
     return useMutation<
         DeletePlaylistResponse,
         AxiosError,
-        Omit<DeletePlaylistArgs, 'server' | 'apiClientProps'>,
+        Omit<DeletePlaylistArgs, 'apiClientProps' | 'server'>,
         null
     >({
         mutationFn: (args) => {
diff --git a/src/renderer/features/playlists/mutations/remove-from-playlist-mutation.ts b/src/renderer/features/playlists/mutations/remove-from-playlist-mutation.ts
index 22d5da94..ea62d46e 100644
--- a/src/renderer/features/playlists/mutations/remove-from-playlist-mutation.ts
+++ b/src/renderer/features/playlists/mutations/remove-from-playlist-mutation.ts
@@ -1,5 +1,6 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { AxiosError } from 'axios';
+
 import { api } from '/@/renderer/api';
 import { queryKeys } from '/@/renderer/api/query-keys';
 import { RemoveFromPlaylistArgs, RemoveFromPlaylistResponse } from '/@/renderer/api/types';
@@ -12,7 +13,7 @@ export const useRemoveFromPlaylist = (options?: MutationOptions) => {
     return useMutation<
         RemoveFromPlaylistResponse,
         AxiosError,
-        Omit<RemoveFromPlaylistArgs, 'server' | 'apiClientProps'>,
+        Omit<RemoveFromPlaylistArgs, 'apiClientProps' | 'server'>,
         null
     >({
         mutationFn: (args) => {
diff --git a/src/renderer/features/playlists/mutations/update-playlist-mutation.ts b/src/renderer/features/playlists/mutations/update-playlist-mutation.ts
index ef657013..0111eb8d 100644
--- a/src/renderer/features/playlists/mutations/update-playlist-mutation.ts
+++ b/src/renderer/features/playlists/mutations/update-playlist-mutation.ts
@@ -1,5 +1,6 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { AxiosError } from 'axios';
+
 import { api } from '/@/renderer/api';
 import { queryKeys } from '/@/renderer/api/query-keys';
 import { UpdatePlaylistArgs, UpdatePlaylistResponse } from '/@/renderer/api/types';
@@ -13,7 +14,7 @@ export const useUpdatePlaylist = (args: MutationHookArgs) => {
     return useMutation<
         UpdatePlaylistResponse,
         AxiosError,
-        Omit<UpdatePlaylistArgs, 'server' | 'apiClientProps'>,
+        Omit<UpdatePlaylistArgs, 'apiClientProps' | 'server'>,
         null
     >({
         mutationFn: (args) => {
diff --git a/src/renderer/features/playlists/queries/playlist-detail-query.ts b/src/renderer/features/playlists/queries/playlist-detail-query.ts
index fc614dbc..4740e1d3 100644
--- a/src/renderer/features/playlists/queries/playlist-detail-query.ts
+++ b/src/renderer/features/playlists/queries/playlist-detail-query.ts
@@ -1,9 +1,11 @@
-import { useQuery } from '@tanstack/react-query';
-import { queryKeys } from '/@/renderer/api/query-keys';
 import type { PlaylistDetailQuery } from '/@/renderer/api/types';
 import type { QueryHookArgs } from '/@/renderer/lib/react-query';
-import { getServerById } from '/@/renderer/store';
+
+import { useQuery } from '@tanstack/react-query';
+
 import { api } from '/@/renderer/api';
+import { queryKeys } from '/@/renderer/api/query-keys';
+import { getServerById } from '/@/renderer/store';
 
 export const usePlaylistDetail = (args: QueryHookArgs<PlaylistDetailQuery>) => {
     const { options, query, serverId } = args || {};
diff --git a/src/renderer/features/playlists/queries/playlist-list-query.ts b/src/renderer/features/playlists/queries/playlist-list-query.ts
index 797866c0..e449bed1 100644
--- a/src/renderer/features/playlists/queries/playlist-list-query.ts
+++ b/src/renderer/features/playlists/queries/playlist-list-query.ts
@@ -1,9 +1,11 @@
-import { useQuery } from '@tanstack/react-query';
-import { queryKeys } from '/@/renderer/api/query-keys';
 import type { PlaylistListQuery } from '/@/renderer/api/types';
 import type { QueryOptions } from '/@/renderer/lib/react-query';
-import { getServerById } from '/@/renderer/store';
+
+import { useQuery } from '@tanstack/react-query';
+
 import { api } from '/@/renderer/api';
+import { queryKeys } from '/@/renderer/api/query-keys';
+import { getServerById } from '/@/renderer/store';
 
 export const usePlaylistList = (args: {
     options?: QueryOptions;
diff --git a/src/renderer/features/playlists/queries/playlist-song-list-query.ts b/src/renderer/features/playlists/queries/playlist-song-list-query.ts
index 423a6136..a85a6307 100644
--- a/src/renderer/features/playlists/queries/playlist-song-list-query.ts
+++ b/src/renderer/features/playlists/queries/playlist-song-list-query.ts
@@ -1,9 +1,11 @@
-import { useQuery } from '@tanstack/react-query';
-import { queryKeys } from '/@/renderer/api/query-keys';
 import type { PlaylistSongListQuery } from '/@/renderer/api/types';
 import type { QueryHookArgs } from '/@/renderer/lib/react-query';
-import { getServerById } from '/@/renderer/store';
+
+import { useQuery } from '@tanstack/react-query';
+
 import { api } from '/@/renderer/api';
+import { queryKeys } from '/@/renderer/api/query-keys';
+import { getServerById } from '/@/renderer/store';
 
 export const usePlaylistSongList = (args: QueryHookArgs<PlaylistSongListQuery>) => {
     const { options, query, serverId } = args || {};
diff --git a/src/renderer/features/playlists/routes/playlist-detail-song-list-route.tsx b/src/renderer/features/playlists/routes/playlist-detail-song-list-route.tsx
index b4a4ff17..7cf6a39d 100644
--- a/src/renderer/features/playlists/routes/playlist-detail-song-list-route.tsx
+++ b/src/renderer/features/playlists/routes/playlist-detail-song-list-route.tsx
@@ -1,23 +1,26 @@
-import { useRef, useState } from 'react';
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
+
 import { Box, Group } from '@mantine/core';
 import { closeAllModals, openModal } from '@mantine/modals';
+import { useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { RiArrowDownSLine, RiArrowUpSLine } from 'react-icons/ri';
 import { generatePath, useNavigate, useParams } from 'react-router';
+
 import { PlaylistDetailSongListContent } from '../components/playlist-detail-song-list-content';
 import { PlaylistDetailSongListHeader } from '../components/playlist-detail-song-list-header';
-import { AnimatedPage } from '/@/renderer/features/shared';
-import { PlaylistQueryBuilder } from '/@/renderer/features/playlists/components/playlist-query-builder';
-import { usePlaylistDetail } from '/@/renderer/features/playlists/queries/playlist-detail-query';
-import { useCreatePlaylist } from '/@/renderer/features/playlists/mutations/create-playlist-mutation';
-import { AppRoute } from '/@/renderer/router/routes';
-import { useDeletePlaylist } from '/@/renderer/features/playlists/mutations/delete-playlist-mutation';
-import { Button, Paper, Text, toast } from '/@/renderer/components';
-import { SaveAsPlaylistForm } from '/@/renderer/features/playlists/components/save-as-playlist-form';
-import { useCurrentServer, usePlaylistDetailStore } from '/@/renderer/store';
+
 import { PlaylistSongListQuery, ServerType, SongListSort, SortOrder } from '/@/renderer/api/types';
+import { Button, Paper, Text, toast } from '/@/renderer/components';
+import { PlaylistQueryBuilder } from '/@/renderer/features/playlists/components/playlist-query-builder';
+import { SaveAsPlaylistForm } from '/@/renderer/features/playlists/components/save-as-playlist-form';
+import { useCreatePlaylist } from '/@/renderer/features/playlists/mutations/create-playlist-mutation';
+import { useDeletePlaylist } from '/@/renderer/features/playlists/mutations/delete-playlist-mutation';
+import { usePlaylistDetail } from '/@/renderer/features/playlists/queries/playlist-detail-query';
 import { usePlaylistSongList } from '/@/renderer/features/playlists/queries/playlist-song-list-query';
+import { AnimatedPage } from '/@/renderer/features/shared';
+import { AppRoute } from '/@/renderer/router/routes';
+import { useCurrentServer, usePlaylistDetailStore } from '/@/renderer/store';
 
 const PlaylistDetailSongListRoute = () => {
     const { t } = useTranslation();
@@ -105,7 +108,6 @@ const PlaylistDetailSongListRoute = () => {
                         name: detailQuery?.data?.name,
                         public: detailQuery?.data?.public || false,
                     }}
-                    serverId={detailQuery?.data?.serverId}
                     onCancel={closeAllModals}
                     onSuccess={(data) =>
                         navigate(
@@ -114,6 +116,7 @@ const PlaylistDetailSongListRoute = () => {
                             }),
                         )
                     }
+                    serverId={detailQuery?.data?.serverId}
                 />
             ),
             title: t('common.saveAs', { postProcess: 'sentenceCase' }),
@@ -173,8 +176,8 @@ const PlaylistDetailSongListRoute = () => {
                         <Group p="1rem">
                             <Button
                                 compact
-                                variant="default"
                                 onClick={handleToggleExpand}
+                                variant="default"
                             >
                                 {isQueryBuilderExpanded ? (
                                     <RiArrowUpSLine size={20} />
@@ -186,15 +189,15 @@ const PlaylistDetailSongListRoute = () => {
                         </Group>
                         {isQueryBuilderExpanded && (
                             <PlaylistQueryBuilder
-                                key={JSON.stringify(detailQuery?.data?.rules)}
                                 isSaving={createPlaylistMutation?.isLoading}
+                                key={JSON.stringify(detailQuery?.data?.rules)}
                                 limit={detailQuery?.data?.rules?.limit}
+                                onSave={handleSave}
+                                onSaveAs={handleSaveAs}
                                 playlistId={playlistId}
                                 query={detailQuery?.data?.rules}
                                 sortBy={detailQuery?.data?.rules?.sort || SongListSort.ALBUM}
                                 sortOrder={detailQuery?.data?.rules?.order || 'asc'}
-                                onSave={handleSave}
-                                onSaveAs={handleSaveAs}
                             />
                         )}
                     </Paper>
diff --git a/src/renderer/features/playlists/routes/playlist-list-route.tsx b/src/renderer/features/playlists/routes/playlist-list-route.tsx
index ef2abc79..6a4284da 100644
--- a/src/renderer/features/playlists/routes/playlist-list-route.tsx
+++ b/src/renderer/features/playlists/routes/playlist-list-route.tsx
@@ -1,6 +1,8 @@
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
+
 import { useMemo, useRef } from 'react';
 import { useParams } from 'react-router';
+
 import { PlaylistListSort, PlaylistSongListQuery, SortOrder } from '/@/renderer/api/types';
 import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid';
 import { ListContext } from '/@/renderer/context/list-context';
@@ -11,7 +13,7 @@ import { AnimatedPage } from '/@/renderer/features/shared';
 import { useCurrentServer, useListStoreByKey } from '/@/renderer/store';
 
 const PlaylistListRoute = () => {
-    const gridRef = useRef<VirtualInfiniteGridRef | null>(null);
+    const gridRef = useRef<null | VirtualInfiniteGridRef>(null);
     const tableRef = useRef<AgGridReactType | null>(null);
     const server = useCurrentServer();
     const { playlistId } = useParams();
diff --git a/src/renderer/features/playlists/utils.ts b/src/renderer/features/playlists/utils.ts
index 753c3d67..e87adafa 100644
--- a/src/renderer/features/playlists/utils.ts
+++ b/src/renderer/features/playlists/utils.ts
@@ -1,4 +1,5 @@
 import { nanoid } from 'nanoid/non-secure';
+
 import { NDSongQueryFields } from '/@/renderer/api/navidrome.types';
 import { QueryBuilderGroup } from '/@/renderer/types';
 
@@ -93,7 +94,7 @@ export const convertNDQueryToQueryGroup = (query: Record<string, any>) => {
     const rootGroup: QueryBuilderGroup = {
         group: [],
         rules: [],
-        type: rootType as 'any' | 'all',
+        type: rootType as 'all' | 'any',
         uniqueId: nanoid(),
     };
 
diff --git a/src/renderer/features/search/components/command-palette.tsx b/src/renderer/features/search/components/command-palette.tsx
index d239f1bf..f4ec043e 100644
--- a/src/renderer/features/search/components/command-palette.tsx
+++ b/src/renderer/features/search/components/command-palette.tsx
@@ -1,22 +1,23 @@
-/* eslint-disable react/no-unknown-property */
-import { useCallback, useState, Fragment, useRef } from 'react';
 import { ActionIcon, Group, Kbd, ScrollArea } from '@mantine/core';
-import { useDisclosure, useDebouncedValue } from '@mantine/hooks';
+import { useDebouncedValue, useDisclosure } from '@mantine/hooks';
+import { Fragment, useCallback, useRef, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { RiSearchLine, RiCloseFill } from 'react-icons/ri';
+import { RiCloseFill, RiSearchLine } from 'react-icons/ri';
 import { generatePath, useNavigate } from 'react-router';
 import styled from 'styled-components';
+
 import { GoToCommands } from './go-to-commands';
-import { Command, CommandPalettePages } from '/@/renderer/features/search/components/command';
-import { Button, Modal, Paper, Spinner, TextInput } from '/@/renderer/components';
 import { HomeCommands } from './home-commands';
+
+import { LibraryItem } from '/@/renderer/api/types';
+import { Button, Modal, Paper, Spinner, TextInput } from '/@/renderer/components';
+import { usePlayQueueAdd } from '/@/renderer/features/player';
+import { Command, CommandPalettePages } from '/@/renderer/features/search/components/command';
+import { LibraryCommandItem } from '/@/renderer/features/search/components/library-command-item';
 import { ServerCommands } from '/@/renderer/features/search/components/server-commands';
 import { useSearch } from '/@/renderer/features/search/queries/search-query';
-import { useCurrentServer } from '/@/renderer/store';
 import { AppRoute } from '/@/renderer/router/routes';
-import { LibraryCommandItem } from '/@/renderer/features/search/components/library-command-item';
-import { LibraryItem } from '/@/renderer/api/types';
-import { usePlayQueueAdd } from '/@/renderer/features/player';
+import { useCurrentServer } from '/@/renderer/store';
 
 interface CommandPaletteProps {
     modalProps: (typeof useDisclosure)['arguments'];
@@ -118,13 +119,14 @@ export const CommandPalette = ({ modalProps }: CommandPaletteProps) => {
                     return 0;
                 }}
                 label="Global Command Menu"
-                value={value}
                 onValueChange={setValue}
+                value={value}
             >
                 <TextInput
-                    ref={searchInputRef}
                     data-autofocus
                     icon={<RiSearchLine />}
+                    onChange={(e) => setQuery(e.currentTarget.value)}
+                    ref={searchInputRef}
                     rightSection={
                         <ActionIcon
                             onClick={() => {
@@ -137,7 +139,6 @@ export const CommandPalette = ({ modalProps }: CommandPaletteProps) => {
                     }
                     size="lg"
                     value={query}
-                    onChange={(e) => setQuery(e.currentTarget.value)}
                 />
                 <Command.Separator />
                 <Command.List>
@@ -147,7 +148,6 @@ export const CommandPalette = ({ modalProps }: CommandPaletteProps) => {
                             {data?.albums?.map((album) => (
                                 <Command.Item
                                     key={`search-album-${album.id}`}
-                                    value={`search-${album.id}`}
                                     onSelect={() => {
                                         navigate(
                                             generatePath(AppRoute.LIBRARY_ALBUMS_DETAIL, {
@@ -157,6 +157,7 @@ export const CommandPalette = ({ modalProps }: CommandPaletteProps) => {
                                         modalProps.handlers.close();
                                         setQuery('');
                                     }}
+                                    value={`search-${album.id}`}
                                 >
                                     <LibraryCommandItem
                                         handlePlayQueueAdd={handlePlayQueueAdd}
@@ -177,7 +178,6 @@ export const CommandPalette = ({ modalProps }: CommandPaletteProps) => {
                             {data?.albumArtists.map((artist) => (
                                 <Command.Item
                                     key={`artist-${artist.id}`}
-                                    value={`search-${artist.id}`}
                                     onSelect={() => {
                                         navigate(
                                             generatePath(AppRoute.LIBRARY_ALBUM_ARTISTS_DETAIL, {
@@ -187,6 +187,7 @@ export const CommandPalette = ({ modalProps }: CommandPaletteProps) => {
                                         modalProps.handlers.close();
                                         setQuery('');
                                     }}
+                                    value={`search-${artist.id}`}
                                 >
                                     <LibraryCommandItem
                                         disabled={artist?.albumCount === 0}
@@ -213,7 +214,6 @@ export const CommandPalette = ({ modalProps }: CommandPaletteProps) => {
                             {data?.songs.map((song) => (
                                 <Command.Item
                                     key={`artist-${song.id}`}
-                                    value={`search-${song.id}`}
                                     onSelect={() => {
                                         navigate(
                                             generatePath(AppRoute.LIBRARY_ALBUMS_DETAIL, {
@@ -223,6 +223,7 @@ export const CommandPalette = ({ modalProps }: CommandPaletteProps) => {
                                         modalProps.handlers.close();
                                         setQuery('');
                                     }}
+                                    value={`search-${song.id}`}
                                 >
                                     <LibraryCommandItem
                                         handlePlayQueueAdd={handlePlayQueueAdd}
diff --git a/src/renderer/features/search/components/go-to-commands.tsx b/src/renderer/features/search/components/go-to-commands.tsx
index 4947ba5a..78e3d7f6 100644
--- a/src/renderer/features/search/components/go-to-commands.tsx
+++ b/src/renderer/features/search/components/go-to-commands.tsx
@@ -1,6 +1,7 @@
-import { useCallback, Dispatch } from 'react';
+import { Dispatch, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router';
+
 import { Command, CommandPalettePages } from '/@/renderer/features/search/components/command';
 import { AppRoute } from '/@/renderer/router/routes';
 
@@ -10,7 +11,7 @@ interface GoToCommandsProps {
     setQuery: Dispatch<string>;
 }
 
-export const GoToCommands = ({ setQuery, setPages, handleClose }: GoToCommandsProps) => {
+export const GoToCommands = ({ handleClose, setPages, setQuery }: GoToCommandsProps) => {
     const { t } = useTranslation();
     const navigate = useNavigate();
 
diff --git a/src/renderer/features/search/components/home-commands.tsx b/src/renderer/features/search/components/home-commands.tsx
index e32595cd..96f452d2 100644
--- a/src/renderer/features/search/components/home-commands.tsx
+++ b/src/renderer/features/search/components/home-commands.tsx
@@ -1,9 +1,10 @@
-import { Dispatch, useCallback } from 'react';
-import { openModal, closeAllModals } from '@mantine/modals';
+import { closeAllModals, openModal } from '@mantine/modals';
 import { nanoid } from 'nanoid/non-secure';
+import { Dispatch, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import { generatePath, useNavigate } from 'react-router';
 import { createSearchParams } from 'react-router-dom';
+
 import { LibraryItem, ServerType } from '/@/renderer/api/types';
 import { CreatePlaylistForm } from '/@/renderer/features/playlists';
 import { Command, CommandPalettePages } from '/@/renderer/features/search/components/command';
@@ -19,11 +20,11 @@ interface HomeCommandsProps {
 }
 
 export const HomeCommands = ({
-    query,
-    setQuery,
-    pages,
-    setPages,
     handleClose,
+    pages,
+    query,
+    setPages,
+    setQuery,
 }: HomeCommandsProps) => {
     const { t } = useTranslation();
     const navigate = useNavigate();
@@ -61,8 +62,8 @@ export const HomeCommands = ({
         <>
             <Command.Group heading={t('page.globalSearch.title', { postProcess: 'titleCase' })}>
                 <Command.Item
-                    value={t('common.search', { postProcess: 'sentenceCase' })}
                     onSelect={handleSearch}
+                    value={t('common.search', { postProcess: 'sentenceCase' })}
                 >
                     {query
                         ? t('page.globalSearch.commands.searchFor', {
diff --git a/src/renderer/features/search/components/library-command-item.tsx b/src/renderer/features/search/components/library-command-item.tsx
index 0cac83ec..29a4d8a4 100644
--- a/src/renderer/features/search/components/library-command-item.tsx
+++ b/src/renderer/features/search/components/library-command-item.tsx
@@ -1,5 +1,5 @@
-import { useCallback, MouseEvent } from 'react';
 import { Center, Flex } from '@mantine/core';
+import { MouseEvent, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import {
     RiAddBoxFill,
@@ -10,6 +10,7 @@ import {
     RiUserVoiceFill,
 } from 'react-icons/ri';
 import styled from 'styled-components';
+
 import { LibraryItem } from '/@/renderer/api/types';
 import { Button, Text } from '/@/renderer/components';
 import { Play, PlayQueueAddOptions } from '/@/renderer/types';
@@ -56,7 +57,7 @@ interface LibraryCommandItemProps {
     disabled?: boolean;
     handlePlayQueueAdd?: (options: PlayQueueAddOptions) => void;
     id: string;
-    imageUrl: string | null;
+    imageUrl: null | string;
     itemType: LibraryItem;
     subtitle?: string;
     title?: string;
@@ -64,12 +65,12 @@ interface LibraryCommandItemProps {
 
 export const LibraryCommandItem = ({
     disabled,
+    handlePlayQueueAdd,
     id,
     imageUrl,
+    itemType,
     subtitle,
     title,
-    itemType,
-    handlePlayQueueAdd,
 }: LibraryCommandItemProps) => {
     const { t } = useTranslation();
     let Placeholder = RiAlbumFill;
@@ -78,10 +79,10 @@ export const LibraryCommandItem = ({
         case LibraryItem.ALBUM:
             Placeholder = RiAlbumFill;
             break;
-        case LibraryItem.ARTIST:
+        case LibraryItem.ALBUM_ARTIST:
             Placeholder = RiUserVoiceFill;
             break;
-        case LibraryItem.ALBUM_ARTIST:
+        case LibraryItem.ARTIST:
             Placeholder = RiUserVoiceFill;
             break;
         case LibraryItem.PLAYLIST:
@@ -157,19 +158,20 @@ export const LibraryCommandItem = ({
                 <Button
                     compact
                     disabled={disabled}
+                    onClick={(e) => handlePlay(e, id, Play.NOW)}
                     size="md"
                     tooltip={{
                         label: t('player.play', { postProcess: 'sentenceCase' }),
                         openDelay: 500,
                     }}
                     variant="default"
-                    onClick={(e) => handlePlay(e, id, Play.NOW)}
                 >
                     <RiPlayFill />
                 </Button>
                 <Button
                     compact
                     disabled={disabled}
+                    onClick={(e) => handlePlay(e, id, Play.LAST)}
                     size="md"
                     tooltip={{
                         label: t('player.addLast', { postProcess: 'sentenceCase' }),
@@ -177,20 +179,19 @@ export const LibraryCommandItem = ({
                         openDelay: 500,
                     }}
                     variant="default"
-                    onClick={(e) => handlePlay(e, id, Play.LAST)}
                 >
                     <RiAddBoxFill />
                 </Button>
                 <Button
                     compact
                     disabled={disabled}
+                    onClick={(e) => handlePlay(e, id, Play.NEXT)}
                     size="md"
                     tooltip={{
                         label: t('player.addNext', { postProcess: 'sentenceCase' }),
                         openDelay: 500,
                     }}
                     variant="default"
-                    onClick={(e) => handlePlay(e, id, Play.NEXT)}
                 >
                     <RiAddCircleFill />
                 </Button>
diff --git a/src/renderer/features/search/components/search-content.tsx b/src/renderer/features/search/components/search-content.tsx
index 6092c706..0894e67c 100644
--- a/src/renderer/features/search/components/search-content.tsx
+++ b/src/renderer/features/search/components/search-content.tsx
@@ -1,9 +1,12 @@
-import { RowDoubleClickedEvent } from '@ag-grid-community/core';
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
+
+import { RowDoubleClickedEvent } from '@ag-grid-community/core';
 import { MutableRefObject } from 'react';
 import { generatePath, useNavigate } from 'react-router';
 import { useParams, useSearchParams } from 'react-router-dom';
+
 import { AppRoute } from '../../../router/routes';
+
 import { LibraryItem, QueueSong, SongListQuery } from '/@/renderer/api/types';
 import { VirtualGridAutoSizerContainer } from '/@/renderer/components/virtual-grid';
 import { VirtualTable } from '/@/renderer/components/virtual-table';
@@ -93,17 +96,17 @@ export const SearchContent = ({ tableRef }: SearchContentProps) => {
         <VirtualGridAutoSizerContainer>
             <VirtualTable
                 {...tableProps}
-                key={`table-${itemType}-${tableProps.rowHeight}-${server?.id}`}
-                ref={tableRef}
                 context={{
                     itemType,
                     query: searchParams.get('query'),
                 }}
                 getRowId={(data) => data.data.id}
                 infiniteInitialRowCount={25}
+                key={`table-${itemType}-${tableProps.rowHeight}-${server?.id}`}
+                onRowDoubleClicked={handleRowDoubleClick}
+                ref={tableRef}
                 rowClassRules={rowClassRules}
                 shouldUpdateSong={itemType === LibraryItem.SONG}
-                onRowDoubleClicked={handleRowDoubleClick}
             />
         </VirtualGridAutoSizerContainer>
     );
diff --git a/src/renderer/features/search/components/search-header.tsx b/src/renderer/features/search/components/search-header.tsx
index 214f31cf..3ee10f95 100644
--- a/src/renderer/features/search/components/search-header.tsx
+++ b/src/renderer/features/search/components/search-header.tsx
@@ -1,10 +1,13 @@
-import { ChangeEvent, MutableRefObject } from 'react';
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
+
 import { Flex, Group, Stack } from '@mantine/core';
 import debounce from 'lodash/debounce';
+import { ChangeEvent, MutableRefObject } from 'react';
 import { useTranslation } from 'react-i18next';
 import { generatePath, Link, useParams, useSearchParams } from 'react-router-dom';
+
 import { useCurrentServer } from '../../../store/auth.store';
+
 import {
     AlbumArtistListQuery,
     AlbumListQuery,
@@ -23,13 +26,13 @@ interface SearchHeaderProps {
     tableRef: MutableRefObject<AgGridReactType | null>;
 }
 
-export const SearchHeader = ({ tableRef, navigationId }: SearchHeaderProps) => {
+export const SearchHeader = ({ navigationId, tableRef }: SearchHeaderProps) => {
     const { t } = useTranslation();
     const { itemType } = useParams() as { itemType: LibraryItem };
     const [searchParams, setSearchParams] = useSearchParams();
     const cq = useContainerQuery();
     const server = useCurrentServer();
-    const { filter } = useListStoreByKey<AlbumListQuery | AlbumArtistListQuery | SongListQuery>({
+    const { filter } = useListStoreByKey<AlbumArtistListQuery | AlbumListQuery | SongListQuery>({
         key: itemType,
     });
 
@@ -59,8 +62,8 @@ export const SearchHeader = ({ tableRef, navigationId }: SearchHeaderProps) => {
                     <Group>
                         <SearchInput
                             defaultValue={searchParams.get('query') || ''}
-                            openedWidth={cq.isMd ? 250 : cq.isSm ? 200 : 150}
                             onChange={handleSearch}
+                            openedWidth={cq.isMd ? 250 : cq.isSm ? 200 : 150}
                         />
                     </Group>
                 </Flex>
@@ -69,9 +72,9 @@ export const SearchHeader = ({ tableRef, navigationId }: SearchHeaderProps) => {
                 <Group>
                     <Button
                         compact
-                        replace
                         component={Link}
                         fw={600}
+                        replace
                         size="md"
                         state={{ navigationId }}
                         to={{
@@ -84,9 +87,9 @@ export const SearchHeader = ({ tableRef, navigationId }: SearchHeaderProps) => {
                     </Button>
                     <Button
                         compact
-                        replace
                         component={Link}
                         fw={600}
+                        replace
                         size="md"
                         state={{ navigationId }}
                         to={{
@@ -101,9 +104,9 @@ export const SearchHeader = ({ tableRef, navigationId }: SearchHeaderProps) => {
                     </Button>
                     <Button
                         compact
-                        replace
                         component={Link}
                         fw={600}
+                        replace
                         size="md"
                         state={{ navigationId }}
                         to={{
diff --git a/src/renderer/features/search/components/server-commands.tsx b/src/renderer/features/search/components/server-commands.tsx
index e7c265c7..0a7310ad 100644
--- a/src/renderer/features/search/components/server-commands.tsx
+++ b/src/renderer/features/search/components/server-commands.tsx
@@ -1,12 +1,13 @@
-import { useCallback, Dispatch } from 'react';
 import { openModal } from '@mantine/modals';
-import { Command, CommandPalettePages } from '/@/renderer/features/search/components/command';
-import { ServerList } from '/@/renderer/features/servers';
-import { useAuthStoreActions, useServerList } from '/@/renderer/store';
-import { ServerListItem } from '/@/renderer/api/types';
+import { Dispatch, useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useNavigate } from 'react-router';
+
+import { ServerListItem } from '/@/renderer/api/types';
+import { Command, CommandPalettePages } from '/@/renderer/features/search/components/command';
+import { ServerList } from '/@/renderer/features/servers';
 import { AppRoute } from '/@/renderer/router/routes';
+import { useAuthStoreActions, useServerList } from '/@/renderer/store';
 
 interface ServerCommandsProps {
     handleClose: () => void;
@@ -14,7 +15,7 @@ interface ServerCommandsProps {
     setQuery: Dispatch<string>;
 }
 
-export const ServerCommands = ({ setQuery, setPages, handleClose }: ServerCommandsProps) => {
+export const ServerCommands = ({ handleClose, setPages, setQuery }: ServerCommandsProps) => {
     const { t } = useTranslation();
     const serverList = useServerList();
     const navigate = useNavigate();
diff --git a/src/renderer/features/search/queries/search-query.ts b/src/renderer/features/search/queries/search-query.ts
index 4f863a8f..3852d3f6 100644
--- a/src/renderer/features/search/queries/search-query.ts
+++ b/src/renderer/features/search/queries/search-query.ts
@@ -1,9 +1,10 @@
+import { useQuery } from '@tanstack/react-query';
+
+import { api } from '/@/renderer/api';
+import { queryKeys } from '/@/renderer/api/query-keys';
 import { SearchQuery } from '/@/renderer/api/types';
 import { QueryHookArgs } from '/@/renderer/lib/react-query';
-import { useQuery } from '@tanstack/react-query';
-import { queryKeys } from '/@/renderer/api/query-keys';
 import { getServerById } from '/@/renderer/store';
-import { api } from '/@/renderer/api';
 
 export const useSearch = (args: QueryHookArgs<SearchQuery>) => {
     const { options, query, serverId } = args;
diff --git a/src/renderer/features/search/routes/search-route.tsx b/src/renderer/features/search/routes/search-route.tsx
index cfb9151f..8d620282 100644
--- a/src/renderer/features/search/routes/search-route.tsx
+++ b/src/renderer/features/search/routes/search-route.tsx
@@ -1,6 +1,8 @@
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
+
 import { useId, useRef } from 'react';
 import { useLocation, useParams } from 'react-router';
+
 import { SearchContent } from '/@/renderer/features/search/components/search-content';
 import { SearchHeader } from '/@/renderer/features/search/components/search-header';
 import { AnimatedPage } from '/@/renderer/features/shared';
diff --git a/src/renderer/features/servers/components/add-server-form.tsx b/src/renderer/features/servers/components/add-server-form.tsx
index f17fdbd2..6859b7d2 100644
--- a/src/renderer/features/servers/components/add-server-form.tsx
+++ b/src/renderer/features/servers/components/add-server-form.tsx
@@ -1,18 +1,19 @@
-import { useState } from 'react';
-import { Stack, Group, Checkbox } from '@mantine/core';
-import { Button, PasswordInput, SegmentedControl, TextInput, toast } from '/@/renderer/components';
+import { Checkbox, Group, Stack } from '@mantine/core';
 import { useForm } from '@mantine/form';
 import { useFocusTrap } from '@mantine/hooks';
 import { closeAllModals } from '@mantine/modals';
 import isElectron from 'is-electron';
 import { nanoid } from 'nanoid/non-secure';
-import { AuthenticationResponse } from '/@/renderer/api/types';
-import { useAuthStoreActions } from '/@/renderer/store';
-import { ServerType, toServerType } from '/@/renderer/types';
-import { api } from '/@/renderer/api';
+import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 
-const localSettings = isElectron() ? window.electron.localSettings : null;
+import { api } from '/@/renderer/api';
+import { AuthenticationResponse } from '/@/renderer/api/types';
+import { Button, PasswordInput, SegmentedControl, TextInput, toast } from '/@/renderer/components';
+import { useAuthStoreActions } from '/@/renderer/store';
+import { ServerType, toServerType } from '/@/renderer/types';
+
+const localSettings = isElectron() ? window.api.localSettings : null;
 
 const SERVER_TYPES = [
     { label: 'Jellyfin', value: ServerType.JELLYFIN },
@@ -124,8 +125,8 @@ export const AddServerForm = ({ onCancel }: AddServerFormProps) => {
     return (
         <form onSubmit={handleSubmit}>
             <Stack
-                ref={focusTrapRef}
                 m={5}
+                ref={focusTrapRef}
             >
                 <SegmentedControl
                     data={SERVER_TYPES}
@@ -187,8 +188,8 @@ export const AddServerForm = ({ onCancel }: AddServerFormProps) => {
                 )}
                 <Group position="right">
                     <Button
-                        variant="subtle"
                         onClick={onCancel}
+                        variant="subtle"
                     >
                         {t('common.cancel', { postProcess: 'titleCase' })}
                     </Button>
diff --git a/src/renderer/features/servers/components/edit-server-form.tsx b/src/renderer/features/servers/components/edit-server-form.tsx
index 1735248e..7433bac1 100644
--- a/src/renderer/features/servers/components/edit-server-form.tsx
+++ b/src/renderer/features/servers/components/edit-server-form.tsx
@@ -1,25 +1,26 @@
-import { useState } from 'react';
-import { Stack, Group } from '@mantine/core';
-import { Button, Checkbox, PasswordInput, TextInput, toast, Tooltip } from '/@/renderer/components';
+import { Group, Stack } from '@mantine/core';
 import { useForm } from '@mantine/form';
 import { useFocusTrap } from '@mantine/hooks';
 import { closeAllModals } from '@mantine/modals';
 import isElectron from 'is-electron';
+import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { RiInformationLine } from 'react-icons/ri';
-import { AuthenticationResponse, ServerListItem, ServerType } from '/@/renderer/api/types';
-import { useAuthStoreActions } from '/@/renderer/store';
-import { api } from '/@/renderer/api';
-import i18n from '/@/i18n/i18n';
-import { queryClient } from '/@/renderer/lib/react-query';
-import { queryKeys } from '/@/renderer/api/query-keys';
 
-const localSettings = isElectron() ? window.electron.localSettings : null;
+import i18n from '/@/i18n/i18n';
+import { api } from '/@/renderer/api';
+import { queryKeys } from '/@/renderer/api/query-keys';
+import { AuthenticationResponse, ServerListItem, ServerType } from '/@/renderer/api/types';
+import { Button, Checkbox, PasswordInput, TextInput, toast, Tooltip } from '/@/renderer/components';
+import { queryClient } from '/@/renderer/lib/react-query';
+import { useAuthStoreActions } from '/@/renderer/store';
+
+const localSettings = isElectron() ? window.api.localSettings : null;
 
 interface EditServerFormProps {
     isUpdate?: boolean;
     onCancel: () => void;
-    password: string | null;
+    password: null | string;
     server: ServerListItem;
 }
 
@@ -33,7 +34,7 @@ const ModifiedFieldIndicator = () => {
     );
 };
 
-export const EditServerForm = ({ isUpdate, password, server, onCancel }: EditServerFormProps) => {
+export const EditServerForm = ({ isUpdate, onCancel, password, server }: EditServerFormProps) => {
     const { t } = useTranslation();
     const { updateServer } = useAuthStoreActions();
     const focusTrapRef = useFocusTrap();
@@ -127,29 +128,29 @@ export const EditServerForm = ({ isUpdate, password, server, onCancel }: EditSer
         <form onSubmit={handleSubmit}>
             <Stack ref={focusTrapRef}>
                 <TextInput
-                    required
                     label={t('form.addServer.input', {
                         context: 'name',
                         postProcess: 'titleCase',
                     })}
+                    required
                     rightSection={form.isDirty('name') && <ModifiedFieldIndicator />}
                     {...form.getInputProps('name')}
                 />
                 <TextInput
-                    required
                     label={t('form.addServer.input', {
                         context: 'url',
                         postProcess: 'titleCase',
                     })}
+                    required
                     rightSection={form.isDirty('url') && <ModifiedFieldIndicator />}
                     {...form.getInputProps('url')}
                 />
                 <TextInput
-                    required
                     label={t('form.addServer.input', {
                         context: 'username',
                         postProcess: 'titleCase',
                     })}
+                    required
                     rightSection={form.isDirty('username') && <ModifiedFieldIndicator />}
                     {...form.getInputProps('username')}
                 />
@@ -186,8 +187,8 @@ export const EditServerForm = ({ isUpdate, password, server, onCancel }: EditSer
                 )}
                 <Group position="right">
                     <Button
-                        variant="subtle"
                         onClick={onCancel}
+                        variant="subtle"
                     >
                         {t('common.cancel', { postProcess: 'titleCase' })}
                     </Button>
diff --git a/src/renderer/features/servers/components/server-list-item.tsx b/src/renderer/features/servers/components/server-list-item.tsx
index f8f7ecf0..f313c402 100644
--- a/src/renderer/features/servers/components/server-list-item.tsx
+++ b/src/renderer/features/servers/components/server-list-item.tsx
@@ -1,16 +1,17 @@
-import { useCallback, useState } from 'react';
-import { Stack, Group, Divider } from '@mantine/core';
-import { Button, Text, TimeoutButton } from '/@/renderer/components';
+import { Divider, Group, Stack } from '@mantine/core';
 import { useDisclosure } from '@mantine/hooks';
 import isElectron from 'is-electron';
+import { useCallback, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { RiDeleteBin2Line, RiEdit2Fill } from 'react-icons/ri';
+
+import { ServerListItem as ServerItem } from '/@/renderer/api/types';
+import { Button, Text, TimeoutButton } from '/@/renderer/components';
 import { EditServerForm } from '/@/renderer/features/servers/components/edit-server-form';
 import { ServerSection } from '/@/renderer/features/servers/components/server-section';
 import { useAuthStoreActions } from '/@/renderer/store';
-import { ServerListItem as ServerItem } from '/@/renderer/api/types';
 
-const localSettings = isElectron() ? window.electron.localSettings : null;
+const localSettings = isElectron() ? window.api.localSettings : null;
 
 interface ServerListItemProps {
     server: ServerItem;
@@ -31,7 +32,7 @@ export const ServerListItem = ({ server }: ServerListItemProps) => {
         if (!edit && localSettings && server.savePassword) {
             localSettings
                 .passwordGet(server.id)
-                .then((password: string | null) => {
+                .then((password: null | string) => {
                     if (password) {
                         setSavedPassword(password);
                     } else {
@@ -66,9 +67,9 @@ export const ServerListItem = ({ server }: ServerListItemProps) => {
             >
                 {edit ? (
                     <EditServerForm
+                        onCancel={() => editHandlers.toggle()}
                         password={savedPassword}
                         server={server}
-                        onCancel={() => editHandlers.toggle()}
                     />
                 ) : (
                     <Stack>
@@ -93,13 +94,13 @@ export const ServerListItem = ({ server }: ServerListItemProps) => {
                         <Group grow>
                             <Button
                                 leftIcon={<RiEdit2Fill />}
+                                onClick={() => handleEdit()}
                                 tooltip={{
                                     label: t('page.manageServers.editServerDetailsTooltip', {
                                         postProcess: 'sentenceCase',
                                     }),
                                 }}
                                 variant="subtle"
-                                onClick={() => handleEdit()}
                             >
                                 {t('common.edit')}
                             </Button>
diff --git a/src/renderer/features/servers/components/server-list.tsx b/src/renderer/features/servers/components/server-list.tsx
index 256b4e41..da394155 100644
--- a/src/renderer/features/servers/components/server-list.tsx
+++ b/src/renderer/features/servers/components/server-list.tsx
@@ -1,17 +1,18 @@
-import { ChangeEvent } from 'react';
 import { Divider, Group, Stack } from '@mantine/core';
-import { Accordion, Button, ContextModalVars, Switch, Text } from '/@/renderer/components';
 import { useLocalStorage } from '@mantine/hooks';
 import { openContextModal } from '@mantine/modals';
 import isElectron from 'is-electron';
+import { ChangeEvent } from 'react';
 import { useTranslation } from 'react-i18next';
 import { RiAddFill, RiServerFill } from 'react-icons/ri';
+
+import { Accordion, Button, ContextModalVars, Switch, Text } from '/@/renderer/components';
 import { AddServerForm } from '/@/renderer/features/servers/components/add-server-form';
 import { ServerListItem } from '/@/renderer/features/servers/components/server-list-item';
 import { useCurrentServer, useServerList } from '/@/renderer/store';
 import { titleCase } from '/@/renderer/utils';
 
-const localSettings = isElectron() ? window.electron.localSettings : null;
+const localSettings = isElectron() ? window.api.localSettings : null;
 
 export const ServerList = () => {
     const { t } = useTranslation();
@@ -21,7 +22,6 @@ export const ServerList = () => {
     const handleAddServerModal = () => {
         openContextModal({
             innerProps: {
-                // eslint-disable-next-line react/no-unstable-nested-components
                 modalBody: (vars: ContextModalVars) => (
                     <AddServerForm onCancel={() => vars.context.closeModal(vars.id)} />
                 ),
@@ -73,9 +73,9 @@ export const ServerList = () => {
                     autoFocus
                     compact
                     leftIcon={<RiAddFill size={15} />}
+                    onClick={handleAddServerModal}
                     size="sm"
                     variant="filled"
-                    onClick={handleAddServerModal}
                 >
                     {t('form.addServer.title', { postProcess: 'titleCase' })}
                 </Button>
diff --git a/src/renderer/features/servers/components/server-section.tsx b/src/renderer/features/servers/components/server-section.tsx
index 928f1019..520c42ce 100644
--- a/src/renderer/features/servers/components/server-section.tsx
+++ b/src/renderer/features/servers/components/server-section.tsx
@@ -1,10 +1,11 @@
 import React from 'react';
 import styled from 'styled-components';
+
 import { Text } from '/@/renderer/components';
 
 interface ServerSectionProps {
     children: React.ReactNode;
-    title: string | React.ReactNode;
+    title: React.ReactNode | string;
 }
 
 const Container = styled.div``;
@@ -14,7 +15,7 @@ const Section = styled.div`
     border: 1px dashed var(--generic-border-color);
 `;
 
-export const ServerSection = ({ title, children }: ServerSectionProps) => {
+export const ServerSection = ({ children, title }: ServerSectionProps) => {
     return (
         <Container>
             {React.isValidElement(title) ? title : <Text>{title}</Text>}
diff --git a/src/renderer/features/settings/components/advanced/advanced-tab.tsx b/src/renderer/features/settings/components/advanced/advanced-tab.tsx
index 2d76aba8..19824f56 100644
--- a/src/renderer/features/settings/components/advanced/advanced-tab.tsx
+++ b/src/renderer/features/settings/components/advanced/advanced-tab.tsx
@@ -1,4 +1,5 @@
 import { Stack } from '@mantine/core';
+
 import { StylesSettings } from '/@/renderer/features/settings/components/advanced/styles-settings';
 
 export const AdvancedTab = () => {
diff --git a/src/renderer/features/settings/components/advanced/styles-settings.tsx b/src/renderer/features/settings/components/advanced/styles-settings.tsx
index 046ba9bd..7defbcda 100644
--- a/src/renderer/features/settings/components/advanced/styles-settings.tsx
+++ b/src/renderer/features/settings/components/advanced/styles-settings.tsx
@@ -1,17 +1,18 @@
-import { useState } from 'react';
-import { Button, ConfirmModal, Switch, Text, Textarea } from '/@/renderer/components';
-import { sanitizeCss } from '/@/renderer/utils/sanitize';
 import { Code } from '@mantine/core';
-import { SettingsOptions } from '/@/renderer/features/settings/components/settings-option';
 import { closeAllModals, openModal } from '@mantine/modals';
+import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
+
+import { Button, ConfirmModal, Switch, Text, Textarea } from '/@/renderer/components';
+import { SettingsOptions } from '/@/renderer/features/settings/components/settings-option';
 import { useCssSettings, useSettingsStoreActions } from '/@/renderer/store';
+import { sanitizeCss } from '/@/renderer/utils/sanitize';
 
 export const StylesSettings = () => {
     const [open, setOpen] = useState(false);
     const { t } = useTranslation();
 
-    const { enabled, content } = useCssSettings();
+    const { content, enabled } = useCssSettings();
     const [css, setCss] = useState(content);
 
     const { setSettings } = useSettingsStoreActions();
@@ -82,17 +83,17 @@ export const StylesSettings = () => {
                                 {open && (
                                     <Button
                                         compact
+                                        onClick={handleSave}
                                         // disabled={isSaveButtonDisabled}
                                         variant="filled"
-                                        onClick={handleSave}
                                     >
                                         {t('common.save', { postProcess: 'titleCase' })}
                                     </Button>
                                 )}
                                 <Button
                                     compact
-                                    variant="filled"
                                     onClick={() => setOpen(!open)}
+                                    variant="filled"
                                 >
                                     {t(open ? 'common.close' : 'common.edit', {
                                         postProcess: 'titleCase',
diff --git a/src/renderer/features/settings/components/general/application-settings.tsx b/src/renderer/features/settings/components/general/application-settings.tsx
index 1052a2c9..0e4e1eeb 100644
--- a/src/renderer/features/settings/components/general/application-settings.tsx
+++ b/src/renderer/features/settings/components/general/application-settings.tsx
@@ -1,22 +1,24 @@
 import type { IpcRendererEvent } from 'electron';
+
 import isElectron from 'is-electron';
+import { useCallback, useEffect, useMemo, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import i18n, { languages } from '/@/i18n/i18n';
 import { FileInput, NumberInput, Select, toast } from '/@/renderer/components';
 import {
-    SettingsSection,
     SettingOption,
+    SettingsSection,
 } from '/@/renderer/features/settings/components/settings-section';
 import {
     useFontSettings,
     useGeneralSettings,
     useSettingsStoreActions,
 } from '/@/renderer/store/settings.store';
-import { useTranslation } from 'react-i18next';
-import { useCallback, useEffect, useMemo, useState } from 'react';
 import { FontType } from '/@/renderer/types';
-import i18n, { languages } from '/@/i18n/i18n';
 
-const localSettings = isElectron() ? window.electron.localSettings : null;
-const ipc = isElectron() ? window.electron.ipc : null;
+const localSettings = isElectron() ? window.api.localSettings : null;
+const ipc = isElectron() ? window.api.ipc : null;
 
 type Font = {
     label: string;
@@ -158,8 +160,8 @@ export const ApplicationSettings = () => {
             control: (
                 <Select
                     data={languages}
-                    value={settings.language}
                     onChange={handleChangeLanguage}
+                    value={settings.language}
                 />
             ),
             description: t('setting.language', {
@@ -173,7 +175,6 @@ export const ApplicationSettings = () => {
             control: (
                 <Select
                     data={FONT_TYPES}
-                    value={fontSettings.type}
                     onChange={(e) => {
                         if (!e) return;
                         setSettings({
@@ -183,6 +184,7 @@ export const ApplicationSettings = () => {
                             },
                         });
                     }}
+                    value={fontSettings.type}
                 />
             ),
             description: t('setting.fontType', {
@@ -195,9 +197,7 @@ export const ApplicationSettings = () => {
         {
             control: (
                 <Select
-                    searchable
                     data={FONT_OPTIONS}
-                    value={fontSettings.builtIn}
                     onChange={(e) => {
                         if (!e) return;
                         setSettings({
@@ -207,6 +207,8 @@ export const ApplicationSettings = () => {
                             },
                         });
                     }}
+                    searchable
+                    value={fontSettings.builtIn}
                 />
             ),
             description: t('setting.font', { context: 'description', postProcess: 'sentenceCase' }),
@@ -216,10 +218,7 @@ export const ApplicationSettings = () => {
         {
             control: (
                 <Select
-                    searchable
                     data={localFonts}
-                    value={fontSettings.system}
-                    w={300}
                     onChange={(e) => {
                         if (!e) return;
                         setSettings({
@@ -229,6 +228,9 @@ export const ApplicationSettings = () => {
                             },
                         });
                     }}
+                    searchable
+                    value={fontSettings.system}
+                    w={300}
                 />
             ),
             description: t('setting.font', { context: 'description', postProcess: 'sentenceCase' }),
@@ -239,8 +241,6 @@ export const ApplicationSettings = () => {
             control: (
                 <FileInput
                     accept=".ttc,.ttf,.otf,.woff,.woff2"
-                    placeholder={fontList}
-                    w={300}
                     onChange={(e) =>
                         setSettings({
                             font: {
@@ -249,6 +249,8 @@ export const ApplicationSettings = () => {
                             },
                         })
                     }
+                    placeholder={fontList}
+                    w={300}
                 />
             ),
             description: t('setting.customFontPath', {
@@ -263,7 +265,6 @@ export const ApplicationSettings = () => {
                 <NumberInput
                     max={300}
                     min={50}
-                    value={settings.zoomFactor}
                     onBlur={(e) => {
                         if (!e) return;
                         const newVal = e.currentTarget.value
@@ -277,6 +278,7 @@ export const ApplicationSettings = () => {
                         });
                         localSettings!.setZoomFactor(newVal);
                     }}
+                    value={settings.zoomFactor}
                 />
             ),
             description: t('setting.zoom', {
diff --git a/src/renderer/features/settings/components/general/context-menu-settings.tsx b/src/renderer/features/settings/components/general/context-menu-settings.tsx
index 102e3a53..9388eb38 100644
--- a/src/renderer/features/settings/components/general/context-menu-settings.tsx
+++ b/src/renderer/features/settings/components/general/context-menu-settings.tsx
@@ -1,12 +1,13 @@
-import { useTranslation } from 'react-i18next';
-import { SettingsOptions } from '/@/renderer/features/settings/components/settings-option';
-import { useState } from 'react';
-import { Button, Checkbox } from '/@/renderer/components';
 import { Divider, Stack } from '@mantine/core';
+import { useState } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { Button, Checkbox } from '/@/renderer/components';
 import {
     CONFIGURABLE_CONTEXT_MENU_ITEMS,
     CONTEXT_MENU_ITEM_MAPPING,
 } from '/@/renderer/features/context-menu';
+import { SettingsOptions } from '/@/renderer/features/settings/components/settings-option';
 import { useSettingsStore, useSettingsStoreActions } from '/@/renderer/store';
 
 export const ContextMenuSettings = () => {
@@ -21,8 +22,8 @@ export const ContextMenuSettings = () => {
                 control={
                     <Button
                         compact
-                        variant="filled"
                         onClick={() => setOpen(!open)}
+                        variant="filled"
                     >
                         {t(open ? 'common.close' : 'common.edit', { postProcess: 'titleCase' })}
                     </Button>
@@ -39,8 +40,8 @@ export const ContextMenuSettings = () => {
                 <Stack>
                     {CONFIGURABLE_CONTEXT_MENU_ITEMS.map((item) => (
                         <Checkbox
-                            key={item}
                             checked={!disabledItems[item]}
+                            key={item}
                             label={t(
                                 `page.contextMenu.${CONTEXT_MENU_ITEM_MAPPING[item] || item}`,
                                 {
diff --git a/src/renderer/features/settings/components/general/control-settings.tsx b/src/renderer/features/settings/components/general/control-settings.tsx
index ad17f9d9..e9b3733f 100644
--- a/src/renderer/features/settings/components/general/control-settings.tsx
+++ b/src/renderer/features/settings/components/general/control-settings.tsx
@@ -1,7 +1,9 @@
 import { Group } from '@mantine/core';
 import { t } from 'i18next';
 import isElectron from 'is-electron';
-import { Select, Tooltip, NumberInput, Switch, Slider } from '/@/renderer/components';
+import { useTranslation } from 'react-i18next';
+
+import { NumberInput, Select, Slider, Switch, Tooltip } from '/@/renderer/components';
 import { SettingsSection } from '/@/renderer/features/settings/components/settings-section';
 import {
     GenreTarget,
@@ -10,9 +12,8 @@ import {
     useSettingsStoreActions,
 } from '/@/renderer/store/settings.store';
 import { Play } from '/@/renderer/types';
-import { useTranslation } from 'react-i18next';
 
-const localSettings = isElectron() ? window.electron.localSettings : null;
+const localSettings = isElectron() ? window.api.localSettings : null;
 
 const SIDE_QUEUE_OPTIONS = [
     {
@@ -43,8 +44,6 @@ export const ControlSettings = () => {
                     defaultValue={settings.buttonSize}
                     max={30}
                     min={15}
-                    rightSection="px"
-                    width={75}
                     onBlur={(e) => {
                         if (!e) return;
                         const newVal = e.currentTarget.value
@@ -57,6 +56,8 @@ export const ControlSettings = () => {
                             },
                         });
                     }}
+                    rightSection="px"
+                    width={75}
                 />
             ),
             description: t('setting.buttonSize', {
@@ -71,10 +72,6 @@ export const ControlSettings = () => {
                 <NumberInput
                     defaultValue={settings.albumArtRes || undefined}
                     max={2500}
-                    placeholder="0"
-                    rightSection="px"
-                    value={settings.albumArtRes ?? 0}
-                    width={75}
                     onBlur={(e) => {
                         const newVal =
                             e.currentTarget.value !== '0'
@@ -82,6 +79,10 @@ export const ControlSettings = () => {
                                 : null;
                         setSettings({ general: { ...settings, albumArtRes: newVal } });
                     }}
+                    placeholder="0"
+                    rightSection="px"
+                    value={settings.albumArtRes ?? 0}
+                    width={75}
                 />
             ),
             description: t('setting.playerAlbumArtResolution', {
@@ -145,7 +146,6 @@ export const ControlSettings = () => {
                         <NumberInput
                             defaultValue={settings.skipButtons.skipBackwardSeconds}
                             min={0}
-                            width={75}
                             onBlur={(e) =>
                                 setSettings({
                                     general: {
@@ -159,13 +159,13 @@ export const ControlSettings = () => {
                                     },
                                 })
                             }
+                            width={75}
                         />
                     </Tooltip>
                     <Tooltip label={t('common.forward', { postProcess: 'titleCase' })}>
                         <NumberInput
                             defaultValue={settings.skipButtons.skipForwardSeconds}
                             min={0}
-                            width={75}
                             onBlur={(e) =>
                                 setSettings({
                                     general: {
@@ -179,6 +179,7 @@ export const ControlSettings = () => {
                                     },
                                 })
                             }
+                            width={75}
                         />
                     </Tooltip>
                 </Group>
@@ -312,7 +313,6 @@ export const ControlSettings = () => {
                     defaultValue={settings.volumeWheelStep}
                     max={20}
                     min={1}
-                    w={100}
                     onChangeEnd={(e) => {
                         setSettings({
                             general: {
@@ -321,6 +321,7 @@ export const ControlSettings = () => {
                             },
                         });
                     }}
+                    w={100}
                 />
             ),
             description: t('setting.volumeWheelStep', {
@@ -336,14 +337,14 @@ export const ControlSettings = () => {
                     defaultValue={settings.volumeWidth}
                     max={180}
                     min={30}
-                    placeholder="0"
-                    rightSection="px"
-                    width={75}
                     onBlur={(e) => {
                         setSettings({
                             general: { ...settings, volumeWidth: Number(e.currentTarget.value) },
                         });
                     }}
+                    placeholder="0"
+                    rightSection="px"
+                    width={75}
                 />
             ),
             description: t('setting.volumeWidth', {
@@ -481,8 +482,6 @@ export const ControlSettings = () => {
                     label={(e) => `${e} rem`}
                     max={6}
                     min={0}
-                    step={0.5}
-                    w={100}
                     onChangeEnd={(e) => {
                         setSettings({
                             general: {
@@ -491,6 +490,8 @@ export const ControlSettings = () => {
                             },
                         });
                     }}
+                    step={0.5}
+                    w={100}
                 />
             ),
             description: t('setting.albumBackgroundBlur', {
diff --git a/src/renderer/features/settings/components/general/draggable-item.tsx b/src/renderer/features/settings/components/general/draggable-item.tsx
index 61baa5bc..c4c67078 100644
--- a/src/renderer/features/settings/components/general/draggable-item.tsx
+++ b/src/renderer/features/settings/components/general/draggable-item.tsx
@@ -1,30 +1,31 @@
 import { Group } from '@mantine/core';
-import { useDragControls, Reorder, DragControls } from 'framer-motion';
+import { DragControls, Reorder, useDragControls } from 'framer-motion';
 import { MdDragIndicator } from 'react-icons/md';
+
 import { Checkbox } from '/@/renderer/components';
 
 const DragHandle = ({ dragControls }: { dragControls: DragControls }) => {
     return (
         <MdDragIndicator
             color="white"
-            style={{ cursor: 'grab' }}
             onPointerDown={(event) => dragControls.start(event)}
+            style={{ cursor: 'grab' }}
         />
     );
 };
 
-interface SidebarItem {
-    disabled: boolean;
-    id: string;
-}
-
 export interface DraggableItemProps {
     handleChangeDisabled: (id: string, e: boolean) => void;
     item: SidebarItem;
     value: string;
 }
 
-export const DraggableItem = ({ item, value, handleChangeDisabled }: DraggableItemProps) => {
+interface SidebarItem {
+    disabled: boolean;
+    id: string;
+}
+
+export const DraggableItem = ({ handleChangeDisabled, item, value }: DraggableItemProps) => {
     const dragControls = useDragControls();
 
     return (
@@ -35,8 +36,8 @@ export const DraggableItem = ({ item, value, handleChangeDisabled }: DraggableIt
             value={item}
         >
             <Group
-                noWrap
                 h="3rem"
+                noWrap
                 style={{ boxShadow: '0 1px 3px rgba(0,0,0,.1)' }}
             >
                 <Checkbox
diff --git a/src/renderer/features/settings/components/general/draggable-items.tsx b/src/renderer/features/settings/components/general/draggable-items.tsx
index 2842580b..0db2cf85 100644
--- a/src/renderer/features/settings/components/general/draggable-items.tsx
+++ b/src/renderer/features/settings/components/general/draggable-items.tsx
@@ -1,13 +1,14 @@
+import { Divider } from '@mantine/core';
+import { Reorder } from 'framer-motion';
 import isEqual from 'lodash/isEqual';
 import { useCallback, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
-import { SortableItem } from '/@/renderer/store';
-import { useSettingSearchContext } from '/@/renderer/features/settings/context/search-context';
-import { SettingsOptions } from '/@/renderer/features/settings/components/settings-option';
+
 import { Button } from '/@/renderer/components';
-import { Reorder } from 'framer-motion';
-import { Divider } from '@mantine/core';
 import { DraggableItem } from '/@/renderer/features/settings/components/general/draggable-item';
+import { SettingsOptions } from '/@/renderer/features/settings/components/settings-option';
+import { useSettingSearchContext } from '/@/renderer/features/settings/context/search-context';
+import { SortableItem } from '/@/renderer/store';
 
 export type DraggableItemsProps<K, T> = {
     description: string;
@@ -20,8 +21,8 @@ export type DraggableItemsProps<K, T> = {
 export const DraggableItems = <K extends string, T extends SortableItem<K>>({
     description,
     itemLabels,
-    settings,
     setItems,
+    settings,
     title,
 }: DraggableItemsProps<K, T>) => {
     const { t } = useTranslation();
@@ -86,16 +87,16 @@ export const DraggableItems = <K extends string, T extends SortableItem<K>>({
                             <Button
                                 compact
                                 disabled={isSaveButtonDisabled}
-                                variant="filled"
                                 onClick={handleSave}
+                                variant="filled"
                             >
                                 {t('common.save', { postProcess: 'titleCase' })}
                             </Button>
                         )}
                         <Button
                             compact
-                            variant="filled"
                             onClick={() => setOpen(!open)}
+                            variant="filled"
                         >
                             {t(open ? 'common.close' : 'common.edit', { postProcess: 'titleCase' })}
                         </Button>
@@ -107,15 +108,15 @@ export const DraggableItems = <K extends string, T extends SortableItem<K>>({
             {open && (
                 <Reorder.Group
                     axis="y"
+                    onReorder={setLocalItems}
                     style={{ userSelect: 'none' }}
                     values={localItems}
-                    onReorder={setLocalItems}
                 >
                     {localItems.map((item) => (
                         <DraggableItem
-                            key={item.id}
                             handleChangeDisabled={handleChangeDisabled}
                             item={item}
+                            key={item.id}
                             value={translatedItemMap[item.id]}
                         />
                     ))}
diff --git a/src/renderer/features/settings/components/general/general-tab.tsx b/src/renderer/features/settings/components/general/general-tab.tsx
index f8f4c983..e46134ec 100644
--- a/src/renderer/features/settings/components/general/general-tab.tsx
+++ b/src/renderer/features/settings/components/general/general-tab.tsx
@@ -1,15 +1,16 @@
 import { Stack } from '@mantine/core';
+import isElectron from 'is-electron';
+
 import { ApplicationSettings } from '/@/renderer/features/settings/components/general/application-settings';
+import { ArtistSettings } from '/@/renderer/features/settings/components/general/artist-settings';
+import { ContextMenuSettings } from '/@/renderer/features/settings/components/general/context-menu-settings';
 import { ControlSettings } from '/@/renderer/features/settings/components/general/control-settings';
+import { HomeSettings } from '/@/renderer/features/settings/components/general/home-settings';
+import { RemoteSettings } from '/@/renderer/features/settings/components/general/remote-settings';
+import { SidebarReorder } from '/@/renderer/features/settings/components/general/sidebar-reorder';
 import { SidebarSettings } from '/@/renderer/features/settings/components/general/sidebar-settings';
 import { ThemeSettings } from '/@/renderer/features/settings/components/general/theme-settings';
-import { RemoteSettings } from '/@/renderer/features/settings/components/general/remote-settings';
 import { CacheSettings } from '/@/renderer/features/settings/components/window/cache-settngs';
-import isElectron from 'is-electron';
-import { HomeSettings } from '/@/renderer/features/settings/components/general/home-settings';
-import { SidebarReorder } from '/@/renderer/features/settings/components/general/sidebar-reorder';
-import { ContextMenuSettings } from '/@/renderer/features/settings/components/general/context-menu-settings';
-import { ArtistSettings } from '/@/renderer/features/settings/components/general/artist-settings';
 
 export const GeneralTab = () => {
     return (
diff --git a/src/renderer/features/settings/components/general/home-settings.tsx b/src/renderer/features/settings/components/general/home-settings.tsx
index 70da0956..732866e9 100644
--- a/src/renderer/features/settings/components/general/home-settings.tsx
+++ b/src/renderer/features/settings/components/general/home-settings.tsx
@@ -1,8 +1,9 @@
 import {
-    useSettingsStoreActions,
-    useGeneralSettings,
     HomeItem,
+    useGeneralSettings,
+    useSettingsStoreActions,
 } from '../../../../store/settings.store';
+
 import { DraggableItems } from '/@/renderer/features/settings/components/general/draggable-items';
 
 const HOME_ITEMS: Array<[string, string]> = [
diff --git a/src/renderer/features/settings/components/general/remote-settings.tsx b/src/renderer/features/settings/components/general/remote-settings.tsx
index 0178b676..34371336 100644
--- a/src/renderer/features/settings/components/general/remote-settings.tsx
+++ b/src/renderer/features/settings/components/general/remote-settings.tsx
@@ -1,11 +1,12 @@
 import isElectron from 'is-electron';
-import { SettingsSection } from '/@/renderer/features/settings/components/settings-section';
-import { useRemoteSettings, useSettingsStoreActions } from '/@/renderer/store';
-import { NumberInput, Switch, Text, TextInput, toast } from '/@/renderer/components';
 import debounce from 'lodash/debounce';
 import { useTranslation } from 'react-i18next';
 
-const remote = isElectron() ? window.electron.remote : null;
+import { NumberInput, Switch, Text, TextInput, toast } from '/@/renderer/components';
+import { SettingsSection } from '/@/renderer/features/settings/components/settings-section';
+import { useRemoteSettings, useSettingsStoreActions } from '/@/renderer/store';
+
+const remote = isElectron() ? window.api.remote : null;
 
 export const RemoteSettings = () => {
     const { t } = useTranslation();
@@ -93,12 +94,12 @@ export const RemoteSettings = () => {
             control: (
                 <NumberInput
                     max={65535}
-                    value={settings.port}
                     onBlur={async (e) => {
                         if (!e) return;
                         const port = Number(e.currentTarget.value);
                         await debouncedChangeRemotePort(port);
                     }}
+                    value={settings.port}
                 />
             ),
             description: t('setting.remotePort', {
diff --git a/src/renderer/features/settings/components/general/sidebar-settings.tsx b/src/renderer/features/settings/components/general/sidebar-settings.tsx
index 1f6ee676..8b9aabd7 100644
--- a/src/renderer/features/settings/components/general/sidebar-settings.tsx
+++ b/src/renderer/features/settings/components/general/sidebar-settings.tsx
@@ -1,7 +1,9 @@
 import { ChangeEvent } from 'react';
 import { useTranslation } from 'react-i18next';
+
+import { useGeneralSettings, useSettingsStoreActions } from '../../../../store/settings.store';
+
 import { Switch } from '/@/renderer/components';
-import { useSettingsStoreActions, useGeneralSettings } from '../../../../store/settings.store';
 import {
     SettingOption,
     SettingsSection,
diff --git a/src/renderer/features/settings/components/general/theme-settings.tsx b/src/renderer/features/settings/components/general/theme-settings.tsx
index b89a6f9e..e3173a05 100644
--- a/src/renderer/features/settings/components/general/theme-settings.tsx
+++ b/src/renderer/features/settings/components/general/theme-settings.tsx
@@ -1,16 +1,17 @@
 import { ColorInput, Stack } from '@mantine/core';
-import { Switch, Select } from '/@/renderer/components';
+import isElectron from 'is-electron';
+import { useTranslation } from 'react-i18next';
+
+import { Select, Switch } from '/@/renderer/components';
 import {
-    SettingsSection,
     SettingOption,
+    SettingsSection,
 } from '/@/renderer/features/settings/components/settings-section';
 import { THEME_DATA } from '/@/renderer/hooks';
 import { useGeneralSettings, useSettingsStoreActions } from '/@/renderer/store/settings.store';
 import { AppTheme } from '/@/renderer/themes/types';
-import isElectron from 'is-electron';
-import { useTranslation } from 'react-i18next';
 
-const localSettings = isElectron() ? window.electron.localSettings : null;
+const localSettings = isElectron() ? window.api.localSettings : null;
 
 export const ThemeSettings = () => {
     const { t } = useTranslation();
@@ -126,6 +127,14 @@ export const ThemeSettings = () => {
                     <ColorInput
                         defaultValue={settings.accent}
                         format="rgb"
+                        onChangeEnd={(e) => {
+                            setSettings({
+                                general: {
+                                    ...settings,
+                                    accent: e,
+                                },
+                            });
+                        }}
                         swatches={[
                             'rgb(53, 116, 252)',
                             'rgb(240, 170, 22)',
@@ -135,14 +144,6 @@ export const ThemeSettings = () => {
                         ]}
                         swatchesPerRow={5}
                         withEyeDropper={false}
-                        onChangeEnd={(e) => {
-                            setSettings({
-                                general: {
-                                    ...settings,
-                                    accent: e,
-                                },
-                            });
-                        }}
                     />
                 </Stack>
             ),
diff --git a/src/renderer/features/settings/components/hotkeys/hotkey-manager-settings.tsx b/src/renderer/features/settings/components/hotkeys/hotkey-manager-settings.tsx
index e861456f..f9c65a6e 100644
--- a/src/renderer/features/settings/components/hotkeys/hotkey-manager-settings.tsx
+++ b/src/renderer/features/settings/components/hotkeys/hotkey-manager-settings.tsx
@@ -1,17 +1,18 @@
-import { useCallback, useMemo, useState, KeyboardEvent, ChangeEvent } from 'react';
 import { Group } from '@mantine/core';
 import isElectron from 'is-electron';
 import debounce from 'lodash/debounce';
+import { ChangeEvent, KeyboardEvent, useCallback, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { RiDeleteBinLine, RiEditLine, RiKeyboardBoxLine } from 'react-icons/ri';
 import styled from 'styled-components';
-import { Button, TextInput, Checkbox } from '/@/renderer/components';
-import { BindingActions, useHotkeySettings, useSettingsStoreActions } from '/@/renderer/store';
-import { SettingsOptions } from '/@/renderer/features/settings/components/settings-option';
-import i18n from '/@/i18n/i18n';
-import { useSettingSearchContext } from '/@/renderer/features/settings/context/search-context';
 
-const ipc = isElectron() ? window.electron.ipc : null;
+import i18n from '/@/i18n/i18n';
+import { Button, Checkbox, TextInput } from '/@/renderer/components';
+import { SettingsOptions } from '/@/renderer/features/settings/components/settings-option';
+import { useSettingSearchContext } from '/@/renderer/features/settings/context/search-context';
+import { BindingActions, useHotkeySettings, useSettingsStoreActions } from '/@/renderer/store';
+
+const ipc = isElectron() ? window.api.ipc : null;
 
 const BINDINGS_MAP: Record<BindingActions, string> = {
     browserBack: i18n.t('setting.hotkey', { context: 'browserBack', postProcess: 'sentenceCase' }),
@@ -258,9 +259,15 @@ export const HotkeyManagerSettings = () => {
                             value={BINDINGS_MAP[binding as keyof typeof BINDINGS_MAP]}
                         />
                         <TextInput
-                            readOnly
                             icon={<RiKeyboardBoxLine />}
                             id={`hotkey-${binding}`}
+                            onBlur={() => setSelected(null)}
+                            onChange={() => {}}
+                            onKeyDownCapture={(e) => {
+                                if (selected !== (binding as BindingActions)) return;
+                                handleSetHotkey(binding as BindingActions, e);
+                            }}
+                            readOnly
                             style={{
                                 opacity: selected === (binding as BindingActions) ? 0.8 : 1,
                                 outline: duplicateHotkeyMap.includes(
@@ -270,12 +277,6 @@ export const HotkeyManagerSettings = () => {
                                     : undefined,
                             }}
                             value={bindings[binding as keyof typeof BINDINGS_MAP].hotkey}
-                            onBlur={() => setSelected(null)}
-                            onChange={() => {}}
-                            onKeyDownCapture={(e) => {
-                                if (selected !== (binding as BindingActions)) return;
-                                handleSetHotkey(binding as BindingActions, e);
-                            }}
                         />
                         {isElectron() && (
                             <Checkbox
@@ -283,6 +284,9 @@ export const HotkeyManagerSettings = () => {
                                 disabled={
                                     bindings[binding as keyof typeof BINDINGS_MAP].hotkey === ''
                                 }
+                                onChange={(e) =>
+                                    handleSetGlobalHotkey(binding as BindingActions, e)
+                                }
                                 size="xl"
                                 style={{
                                     opacity: bindings[binding as keyof typeof BINDINGS_MAP]
@@ -290,24 +294,21 @@ export const HotkeyManagerSettings = () => {
                                         ? 1
                                         : 0,
                                 }}
-                                onChange={(e) =>
-                                    handleSetGlobalHotkey(binding as BindingActions, e)
-                                }
                             />
                         )}
                         <Button
-                            variant="default"
-                            w={100}
                             onClick={() => {
                                 setSelected(binding as BindingActions);
                                 document.getElementById(`hotkey-${binding}`)?.focus();
                             }}
+                            variant="default"
+                            w={100}
                         >
                             <RiEditLine />
                         </Button>
                         <Button
-                            variant="default"
                             onClick={() => handleClearHotkey(binding as BindingActions)}
+                            variant="default"
                         >
                             <RiDeleteBinLine />
                         </Button>
diff --git a/src/renderer/features/settings/components/hotkeys/hotkeys-tab.tsx b/src/renderer/features/settings/components/hotkeys/hotkeys-tab.tsx
index 3580e9e3..823fbfb0 100644
--- a/src/renderer/features/settings/components/hotkeys/hotkeys-tab.tsx
+++ b/src/renderer/features/settings/components/hotkeys/hotkeys-tab.tsx
@@ -1,6 +1,8 @@
 import { Stack } from '@mantine/core';
 import isElectron from 'is-electron';
+
 import { WindowHotkeySettings } from './window-hotkey-settings';
+
 import { HotkeyManagerSettings } from '/@/renderer/features/settings/components/hotkeys/hotkey-manager-settings';
 
 export const HotkeysTab = () => {
diff --git a/src/renderer/features/settings/components/hotkeys/window-hotkey-settings.tsx b/src/renderer/features/settings/components/hotkeys/window-hotkey-settings.tsx
index f6b98dab..71a3348a 100644
--- a/src/renderer/features/settings/components/hotkeys/window-hotkey-settings.tsx
+++ b/src/renderer/features/settings/components/hotkeys/window-hotkey-settings.tsx
@@ -1,10 +1,12 @@
 import isElectron from 'is-electron';
 import { useTranslation } from 'react-i18next';
+
 import { SettingOption, SettingsSection } from '../settings-section';
+
 import { Switch } from '/@/renderer/components';
 import { useHotkeySettings, useSettingsStoreActions } from '/@/renderer/store';
 
-const localSettings = isElectron() ? window.electron.localSettings : null;
+const localSettings = isElectron() ? window.api.localSettings : null;
 
 export const WindowHotkeySettings = () => {
     const { t } = useTranslation();
diff --git a/src/renderer/features/settings/components/playback/audio-settings.tsx b/src/renderer/features/settings/components/playback/audio-settings.tsx
index 852c411e..cd5b4c7f 100644
--- a/src/renderer/features/settings/components/playback/audio-settings.tsx
+++ b/src/renderer/features/settings/components/playback/audio-settings.tsx
@@ -1,15 +1,16 @@
-import { useEffect, useState } from 'react';
 import { SelectItem } from '@mantine/core';
 import isElectron from 'is-electron';
+import { useEffect, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+
 import { Select, Slider, Switch, toast } from '/@/renderer/components';
 import {
-    SettingsSection,
     SettingOption,
+    SettingsSection,
 } from '/@/renderer/features/settings/components/settings-section';
 import { useCurrentStatus, usePlayerStore } from '/@/renderer/store';
 import { usePlaybackSettings, useSettingsStoreActions } from '/@/renderer/store/settings.store';
-import { PlaybackType, PlayerStatus, PlaybackStyle, CrossfadeStyle } from '/@/renderer/types';
-import { useTranslation } from 'react-i18next';
+import { CrossfadeStyle, PlaybackStyle, PlaybackType, PlayerStatus } from '/@/renderer/types';
 import { setQueue } from '/@/renderer/utils/set-transcoded-queue-data';
 
 const getAudioDevice = async () => {
@@ -163,10 +164,10 @@ export const AudioSettings = ({ hasFancyAudio }: { hasFancyAudio: boolean }) =>
                     }
                     max={15}
                     min={0}
-                    w={100}
                     onChangeEnd={(e) =>
                         setSettings({ playback: { ...settings, crossfadeDuration: e } })
                     }
+                    w={100}
                 />
             ),
             description: t('setting.crossfadeDuration', {
@@ -202,13 +203,13 @@ export const AudioSettings = ({ hasFancyAudio }: { hasFancyAudio: boolean }) =>
                         settings.style !== PlaybackStyle.CROSSFADE ||
                         status === PlayerStatus.PLAYING
                     }
-                    width={200}
                     onChange={(e) => {
                         if (!e) return;
                         setSettings({
                             playback: { ...settings, crossfadeStyle: e as CrossfadeStyle },
                         });
                     }}
+                    width={200}
                 />
             ),
             description: t('setting.crossfadeStyle', {
diff --git a/src/renderer/features/settings/components/playback/lyric-settings.tsx b/src/renderer/features/settings/components/playback/lyric-settings.tsx
index 7d396f2e..dc0cb7d4 100644
--- a/src/renderer/features/settings/components/playback/lyric-settings.tsx
+++ b/src/renderer/features/settings/components/playback/lyric-settings.tsx
@@ -1,23 +1,24 @@
+import isElectron from 'is-electron';
+import { useTranslation } from 'react-i18next';
+import styled from 'styled-components';
+
+import { languages } from '/@/i18n/i18n';
+import { LyricSource } from '/@/renderer/api/types';
+import {
+    MultiSelect,
+    MultiSelectProps,
+    NumberInput,
+    Select,
+    Switch,
+    TextInput,
+} from '/@/renderer/components';
 import {
     SettingOption,
     SettingsSection,
 } from '/@/renderer/features/settings/components/settings-section';
 import { useLyricsSettings, useSettingsStoreActions } from '/@/renderer/store';
-import {
-    Select,
-    MultiSelect,
-    MultiSelectProps,
-    TextInput,
-    NumberInput,
-    Switch,
-} from '/@/renderer/components';
-import isElectron from 'is-electron';
-import styled from 'styled-components';
-import { LyricSource } from '/@/renderer/api/types';
-import { useTranslation } from 'react-i18next';
-import { languages } from '/@/i18n/i18n';
 
-const localSettings = isElectron() ? window.electron.localSettings : null;
+const localSettings = isElectron() ? window.api.localSettings : null;
 
 const WorkingButtonSelect = styled(MultiSelect)<MultiSelectProps>`
     & button {
@@ -77,11 +78,10 @@ export const LyricSettings = () => {
         {
             control: (
                 <WorkingButtonSelect
-                    clearable
                     aria-label="Lyric providers"
+                    clearable
                     data={Object.values(LyricSource)}
                     defaultValue={settings.sources}
-                    width={300}
                     onChange={(e: LyricSource[]) => {
                         localSettings?.set('lyrics', e);
                         setSettings({
@@ -91,6 +91,7 @@ export const LyricSettings = () => {
                             },
                         });
                     }}
+                    width={300}
                 />
             ),
             description: t('setting.lyricFetchProvider', {
@@ -104,8 +105,6 @@ export const LyricSettings = () => {
             control: (
                 <NumberInput
                     defaultValue={settings.delayMs}
-                    step={10}
-                    width={100}
                     onBlur={(e) => {
                         const value = Number(e.currentTarget.value);
                         setSettings({
@@ -115,6 +114,8 @@ export const LyricSettings = () => {
                             },
                         });
                     }}
+                    step={10}
+                    width={100}
                 />
             ),
             description: t('setting.lyricOffset', {
@@ -128,10 +129,10 @@ export const LyricSettings = () => {
             control: (
                 <Select
                     data={languages}
-                    value={settings.translationTargetLanguage}
                     onChange={(value) => {
                         setSettings({ lyrics: { ...settings, translationTargetLanguage: value } });
                     }}
+                    value={settings.translationTargetLanguage}
                 />
             ),
             description: t('setting.translationTargetLanguage', {
@@ -145,10 +146,10 @@ export const LyricSettings = () => {
             control: (
                 <Select
                     data={['Microsoft Azure', 'Google Cloud']}
-                    value={settings.translationApiProvider}
                     onChange={(value) => {
                         setSettings({ lyrics: { ...settings, translationApiProvider: value } });
                     }}
+                    value={settings.translationApiProvider}
                 />
             ),
             description: t('setting.translationApiProvider', {
@@ -161,12 +162,12 @@ export const LyricSettings = () => {
         {
             control: (
                 <TextInput
-                    value={settings.translationApiKey}
                     onChange={(e) => {
                         setSettings({
                             lyrics: { ...settings, translationApiKey: e.currentTarget.value },
                         });
                     }}
+                    value={settings.translationApiKey}
                 />
             ),
             description: t('setting.translationApiKey', {
diff --git a/src/renderer/features/settings/components/playback/mpv-settings.tsx b/src/renderer/features/settings/components/playback/mpv-settings.tsx
index 716984cd..9462f019 100644
--- a/src/renderer/features/settings/components/playback/mpv-settings.tsx
+++ b/src/renderer/features/settings/components/playback/mpv-settings.tsx
@@ -1,19 +1,23 @@
-import { useEffect, useState } from 'react';
 import { Group, Stack } from '@mantine/core';
 import isElectron from 'is-electron';
+import { useEffect, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+import { RiCloseLine, RiRestartLine } from 'react-icons/ri';
+
 import {
-    FileInput,
-    Textarea,
-    Text,
-    Select,
-    NumberInput,
-    Switch,
     Button,
+    FileInput,
+    NumberInput,
+    Select,
+    Switch,
+    Text,
+    Textarea,
 } from '/@/renderer/components';
 import {
-    SettingsSection,
     SettingOption,
+    SettingsSection,
 } from '/@/renderer/features/settings/components/settings-section';
+import { usePlayerControls, usePlayerStore, useQueueControls } from '/@/renderer/store';
 import {
     SettingsState,
     usePlaybackSettings,
@@ -21,12 +25,9 @@ import {
     useSettingsStoreActions,
 } from '/@/renderer/store/settings.store';
 import { PlaybackType } from '/@/renderer/types';
-import { useTranslation } from 'react-i18next';
-import { RiCloseLine, RiRestartLine } from 'react-icons/ri';
-import { usePlayerControls, usePlayerStore, useQueueControls } from '/@/renderer/store';
 
-const localSettings = isElectron() ? window.electron.localSettings : null;
-const mpvPlayer = isElectron() ? window.electron.mpvPlayer : null;
+const localSettings = isElectron() ? window.api.localSettings : null;
+const mpvPlayer = isElectron() ? window.api.mpvPlayer : null;
 
 export const getMpvSetting = (
     key: keyof SettingsState['playback']['mpvProperties'],
@@ -39,12 +40,12 @@ export const getMpvSetting = (
             return { 'audio-samplerate': value };
         case 'gaplessAudio':
             return { 'gapless-audio': value || 'weak' };
-        case 'replayGainMode':
-            return { replaygain: value || 'no' };
         case 'replayGainClip':
             return { 'replaygain-clip': value || 'no' };
         case 'replayGainFallbackDB':
             return { 'replaygain-fallback': value };
+        case 'replayGainMode':
+            return { replaygain: value || 'no' };
         case 'replayGainPreampDB':
             return { 'replaygain-preamp': value || 0 };
         default:
@@ -150,34 +151,34 @@ export const MpvSettings = () => {
             control: (
                 <Group spacing="sm">
                     <Button
+                        onClick={handleReloadMpv}
                         tooltip={{
                             label: t('common.reload', { postProcess: 'titleCase' }),
                             openDelay: 0,
                         }}
                         variant="subtle"
-                        onClick={handleReloadMpv}
                     >
                         <RiRestartLine />
                     </Button>
                     <FileInput
+                        onChange={handleSetMpvPath}
                         placeholder={mpvPath}
                         rightSection={
                             mpvPath && (
                                 <Button
                                     compact
+                                    onClick={() => handleSetMpvPath(null)}
                                     tooltip={{
                                         label: t('common.clear', { postProcess: 'titleCase' }),
                                         openDelay: 0,
                                     }}
                                     variant="subtle"
-                                    onClick={() => handleSetMpvPath(null)}
                                 >
                                     <RiCloseLine />
                                 </Button>
                             )
                         }
                         width={200}
-                        onChange={handleSetMpvPath}
                     />
                 </Group>
             ),
@@ -196,14 +197,14 @@ export const MpvSettings = () => {
                         autosize
                         defaultValue={settings.mpvExtraParameters.join('\n')}
                         minRows={4}
+                        onBlur={(e) => {
+                            handleSetExtraParameters(e.currentTarget.value.split('\n'));
+                        }}
                         placeholder={`(${t('setting.mpvExtraParameters', {
                             context: 'help',
                             postProcess: 'sentenceCase',
                         })}):\n--gapless-audio=weak\n--prefetch-playlist=yes`}
                         width={225}
-                        onBlur={(e) => {
-                            handleSetExtraParameters(e.currentTarget.value.split('\n'));
-                        }}
                     />
                 </Stack>
             ),
@@ -272,14 +273,14 @@ export const MpvSettings = () => {
                     defaultValue={settings.mpvProperties.audioSampleRateHz || undefined}
                     max={192000}
                     min={0}
-                    placeholder="48000"
-                    rightSection="Hz"
-                    width={100}
                     onBlur={(e) => {
                         const value = Number(e.currentTarget.value);
                         // Setting a value of `undefined` causes an error for MPV. Use 0 instead
                         handleSetMpvProperty('audioSampleRateHz', value >= 8000 ? value : value);
                     }}
+                    placeholder="48000"
+                    rightSection="Hz"
+                    width={100}
                 />
             ),
             description: t('setting.sampleRate', {
@@ -343,32 +344,32 @@ export const MpvSettings = () => {
                 />
             ),
             description: t('setting.replayGainMode', {
-                ReplayGain: 'ReplayGain',
                 context: 'description',
                 postProcess: 'sentenceCase',
+                ReplayGain: 'ReplayGain',
             }),
             note: t('common.restartRequired', { postProcess: 'sentenceCase' }),
             title: t('setting.replayGainMode', {
-                ReplayGain: 'ReplayGain',
                 postProcess: 'sentenceCase',
+                ReplayGain: 'ReplayGain',
             }),
         },
         {
             control: (
                 <NumberInput
                     defaultValue={settings.mpvProperties.replayGainPreampDB}
-                    width={75}
                     onChange={(e) => handleSetMpvProperty('replayGainPreampDB', e)}
+                    width={75}
                 />
             ),
             description: t('setting.replayGainMode', {
-                ReplayGain: 'ReplayGain',
                 context: 'description',
                 postProcess: 'sentenceCase',
+                ReplayGain: 'ReplayGain',
             }),
             title: t('setting.replayGainPreamp', {
-                ReplayGain: 'ReplayGain',
                 postProcess: 'sentenceCase',
+                ReplayGain: 'ReplayGain',
             }),
         },
         {
@@ -381,32 +382,32 @@ export const MpvSettings = () => {
                 />
             ),
             description: t('setting.replayGainClipping', {
-                ReplayGain: 'ReplayGain',
                 context: 'description',
                 postProcess: 'sentenceCase',
+                ReplayGain: 'ReplayGain',
             }),
             title: t('setting.replayGainClipping', {
-                ReplayGain: 'ReplayGain',
                 postProcess: 'sentenceCase',
+                ReplayGain: 'ReplayGain',
             }),
         },
         {
             control: (
                 <NumberInput
                     defaultValue={settings.mpvProperties.replayGainFallbackDB}
-                    width={75}
                     onBlur={(e) =>
                         handleSetMpvProperty('replayGainFallbackDB', Number(e.currentTarget.value))
                     }
+                    width={75}
                 />
             ),
             description: t('setting.replayGainFallback', {
-                ReplayGain: 'ReplayGain',
                 postProcess: 'sentenceCase',
+                ReplayGain: 'ReplayGain',
             }),
             title: t('setting.replayGainFallback', {
-                ReplayGain: 'ReplayGain',
                 postProcess: 'sentenceCase',
+                ReplayGain: 'ReplayGain',
             }),
         },
     ];
diff --git a/src/renderer/features/settings/components/playback/playback-tab.tsx b/src/renderer/features/settings/components/playback/playback-tab.tsx
index c3d0cba9..db54798d 100644
--- a/src/renderer/features/settings/components/playback/playback-tab.tsx
+++ b/src/renderer/features/settings/components/playback/playback-tab.tsx
@@ -1,12 +1,13 @@
-import { lazy, Suspense, useMemo } from 'react';
 import { Stack } from '@mantine/core';
-import { AudioSettings } from '/@/renderer/features/settings/components/playback/audio-settings';
-import { ScrobbleSettings } from '/@/renderer/features/settings/components/playback/scrobble-settings';
 import isElectron from 'is-electron';
+import { lazy, Suspense, useMemo } from 'react';
+
+import { AudioSettings } from '/@/renderer/features/settings/components/playback/audio-settings';
 import { LyricSettings } from '/@/renderer/features/settings/components/playback/lyric-settings';
+import { ScrobbleSettings } from '/@/renderer/features/settings/components/playback/scrobble-settings';
+import { TranscodeSettings } from '/@/renderer/features/settings/components/playback/transcode-settings';
 import { useSettingsStore } from '/@/renderer/store';
 import { PlaybackType } from '/@/renderer/types';
-import { TranscodeSettings } from '/@/renderer/features/settings/components/playback/transcode-settings';
 
 const MpvSettings = lazy(() =>
     import('/@/renderer/features/settings/components/playback/mpv-settings').then((module) => {
diff --git a/src/renderer/features/settings/components/playback/scrobble-settings.tsx b/src/renderer/features/settings/components/playback/scrobble-settings.tsx
index f8fbcb52..ab1fbbd1 100644
--- a/src/renderer/features/settings/components/playback/scrobble-settings.tsx
+++ b/src/renderer/features/settings/components/playback/scrobble-settings.tsx
@@ -1,7 +1,9 @@
+import { useTranslation } from 'react-i18next';
+
+import { SettingOption, SettingsSection } from '../settings-section';
+
 import { NumberInput, Slider, Switch } from '/@/renderer/components';
 import { usePlaybackSettings, useSettingsStoreActions } from '/@/renderer/store/settings.store';
-import { SettingOption, SettingsSection } from '../settings-section';
-import { useTranslation } from 'react-i18next';
 
 export const ScrobbleSettings = () => {
     const { t } = useTranslation();
@@ -41,7 +43,6 @@ export const ScrobbleSettings = () => {
                     label={`${settings.scrobble.scrobbleAtPercentage}%`}
                     max={90}
                     min={25}
-                    w={100}
                     onChange={(e) => {
                         setSettings({
                             playback: {
@@ -53,6 +54,7 @@ export const ScrobbleSettings = () => {
                             },
                         });
                     }}
+                    w={100}
                 />
             ),
             description: t('setting.minimumScrobblePercentage', {
@@ -68,7 +70,6 @@ export const ScrobbleSettings = () => {
                     defaultValue={settings.scrobble.scrobbleAtDuration}
                     max={1200}
                     min={0}
-                    width={75}
                     onChange={(e) => {
                         if (e === '') return;
                         setSettings({
@@ -81,6 +82,7 @@ export const ScrobbleSettings = () => {
                             },
                         });
                     }}
+                    width={75}
                 />
             ),
             description: t('setting.minimumScrobbleSeconds', {
diff --git a/src/renderer/features/settings/components/playback/transcode-settings.tsx b/src/renderer/features/settings/components/playback/transcode-settings.tsx
index b744eeca..83d0722a 100644
--- a/src/renderer/features/settings/components/playback/transcode-settings.tsx
+++ b/src/renderer/features/settings/components/playback/transcode-settings.tsx
@@ -1,7 +1,9 @@
+import { useTranslation } from 'react-i18next';
+
+import { SettingOption, SettingsSection } from '../settings-section';
+
 import { NumberInput, Switch, TextInput } from '/@/renderer/components';
 import { usePlaybackSettings, useSettingsStoreActions } from '/@/renderer/store/settings.store';
-import { SettingOption, SettingsSection } from '../settings-section';
-import { useTranslation } from 'react-i18next';
 
 export const TranscodeSettings = () => {
     const { t } = useTranslation();
@@ -36,7 +38,6 @@ export const TranscodeSettings = () => {
                     aria-label="Transcode bitrate"
                     defaultValue={transcode.bitrate}
                     min={0}
-                    w={100}
                     onBlur={(e) => {
                         setTranscodingConfig({
                             ...transcode,
@@ -45,6 +46,7 @@ export const TranscodeSettings = () => {
                                 : undefined,
                         });
                     }}
+                    w={100}
                 />
             ),
             description: t('setting.transcodeBitrate', {
@@ -60,14 +62,14 @@ export const TranscodeSettings = () => {
                 <TextInput
                     aria-label="transcoding format"
                     defaultValue={transcode.format}
-                    placeholder="mp3, opus"
-                    width={100}
                     onBlur={(e) => {
                         setTranscodingConfig({
                             ...transcode,
                             format: e.currentTarget.value || undefined,
                         });
                     }}
+                    placeholder="mp3, opus"
+                    width={100}
                 />
             ),
             description: t('setting.transcodeFormat', {
diff --git a/src/renderer/features/settings/components/settings-content.tsx b/src/renderer/features/settings/components/settings-content.tsx
index 60824a92..3e6372fb 100644
--- a/src/renderer/features/settings/components/settings-content.tsx
+++ b/src/renderer/features/settings/components/settings-content.tsx
@@ -1,10 +1,11 @@
-import { lazy } from 'react';
-import { Tabs } from '/@/renderer/components';
-import { useSettingsStore, useSettingsStoreActions } from '/@/renderer/store/settings.store';
 import isElectron from 'is-electron';
+import { lazy } from 'react';
 import { useTranslation } from 'react-i18next';
 import styled from 'styled-components';
 
+import { Tabs } from '/@/renderer/components';
+import { useSettingsStore, useSettingsStoreActions } from '/@/renderer/store/settings.store';
+
 const GeneralTab = lazy(() =>
     import('/@/renderer/features/settings/components/general/general-tab').then((module) => ({
         default: module.GeneralTab,
@@ -51,10 +52,10 @@ export const SettingsContent = () => {
         <TabContainer>
             <Tabs
                 keepMounted={false}
+                onTabChange={(e) => e && setSettings({ tab: e })}
                 orientation="horizontal"
                 value={currentTab}
                 variant="default"
-                onTabChange={(e) => e && setSettings({ tab: e })}
             >
                 <Tabs.List>
                     <Tabs.Tab value="general">
diff --git a/src/renderer/features/settings/components/settings-header.tsx b/src/renderer/features/settings/components/settings-header.tsx
index a2f844f2..6cb56d0e 100644
--- a/src/renderer/features/settings/components/settings-header.tsx
+++ b/src/renderer/features/settings/components/settings-header.tsx
@@ -2,10 +2,12 @@ import { Flex, Group } from '@mantine/core';
 import { closeAllModals, openModal } from '@mantine/modals';
 import { useTranslation } from 'react-i18next';
 import { RiSettings2Fill } from 'react-icons/ri';
-import { Button, ConfirmModal, PageHeader, SearchInput } from '/@/renderer/components';
-import { LibraryHeaderBar } from '/@/renderer/features/shared';
+
 import { useSettingsStoreActions } from '../../../store/settings.store';
+
+import { Button, ConfirmModal, PageHeader, SearchInput } from '/@/renderer/components';
 import { useSettingSearchContext } from '/@/renderer/features/settings/context/search-context';
+import { LibraryHeaderBar } from '/@/renderer/features/shared';
 import { useContainerQuery } from '/@/renderer/hooks';
 
 export type SettingsHeaderProps = {
@@ -52,15 +54,15 @@ export const SettingsHeader = ({ setSearch }: SettingsHeaderProps) => {
                         <Group>
                             <SearchInput
                                 defaultValue={search}
-                                openedWidth={cq.isMd ? 250 : cq.isSm ? 200 : 150}
                                 onChange={(event) =>
                                     setSearch(event.target.value.toLocaleLowerCase())
                                 }
+                                openedWidth={cq.isMd ? 250 : cq.isSm ? 200 : 150}
                             />
                             <Button
                                 compact
-                                variant="default"
                                 onClick={openResetConfirmModal}
+                                variant="default"
                             >
                                 {t('common.resetToDefault', { postProcess: 'sentenceCase' })}
                             </Button>
diff --git a/src/renderer/features/settings/components/settings-option.tsx b/src/renderer/features/settings/components/settings-option.tsx
index 10bc3ac9..05082748 100644
--- a/src/renderer/features/settings/components/settings-option.tsx
+++ b/src/renderer/features/settings/components/settings-option.tsx
@@ -1,6 +1,7 @@
-import React from 'react';
 import { Group, Stack } from '@mantine/core';
+import React from 'react';
 import { RiInformationLine } from 'react-icons/ri';
+
 import { Text, Tooltip } from '/@/renderer/components';
 
 interface SettingsOptionProps {
@@ -10,7 +11,7 @@ interface SettingsOptionProps {
     title: React.ReactNode | string;
 }
 
-export const SettingsOptions = ({ title, description, control, note }: SettingsOptionProps) => {
+export const SettingsOptions = ({ control, description, note, title }: SettingsOptionProps) => {
     return (
         <>
             <Group
diff --git a/src/renderer/features/settings/components/settings-section.tsx b/src/renderer/features/settings/components/settings-section.tsx
index aab8fd67..05eba72c 100644
--- a/src/renderer/features/settings/components/settings-section.tsx
+++ b/src/renderer/features/settings/components/settings-section.tsx
@@ -1,11 +1,12 @@
+import { Divider } from '@mantine/core';
 import { ReactNode } from 'react';
+
 import { SettingsOptions } from '/@/renderer/features/settings/components/settings-option';
 import { useSettingSearchContext } from '/@/renderer/features/settings/context/search-context';
-import { Divider } from '@mantine/core';
 
 export type SettingOption = {
     control: ReactNode;
-    description: string | ReactNode;
+    description: ReactNode | string;
     isHidden?: boolean;
     note?: string;
     title: string;
diff --git a/src/renderer/features/settings/components/window/cache-settngs.tsx b/src/renderer/features/settings/components/window/cache-settngs.tsx
index 081c9f2b..e216a349 100644
--- a/src/renderer/features/settings/components/window/cache-settngs.tsx
+++ b/src/renderer/features/settings/components/window/cache-settngs.tsx
@@ -1,15 +1,16 @@
 import { closeAllModals, openModal } from '@mantine/modals';
 import { useQueryClient } from '@tanstack/react-query';
 import isElectron from 'is-electron';
-import { useTranslation } from 'react-i18next';
-import { Button, ConfirmModal, toast } from '/@/renderer/components';
 import { useCallback, useState } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { Button, ConfirmModal, toast } from '/@/renderer/components';
 import {
     SettingOption,
     SettingsSection,
 } from '/@/renderer/features/settings/components/settings-section';
 
-const browser = isElectron() ? window.electron.browser : null;
+const browser = isElectron() ? window.api.browser : null;
 
 export const CacheSettings = () => {
     const [isClearing, setIsClearing] = useState(false);
@@ -59,8 +60,8 @@ export const CacheSettings = () => {
                 <Button
                     compact
                     disabled={isClearing}
-                    variant="filled"
                     onClick={() => openResetConfirmModal(false)}
+                    variant="filled"
                 >
                     {t('common.clear', { postProcess: 'sentenceCase' })}
                 </Button>
@@ -76,8 +77,8 @@ export const CacheSettings = () => {
                 <Button
                     compact
                     disabled={isClearing}
-                    variant="filled"
                     onClick={() => openResetConfirmModal(true)}
+                    variant="filled"
                 >
                     {t('common.clear', { postProcess: 'sentenceCase' })}
                 </Button>
diff --git a/src/renderer/features/settings/components/window/discord-settings.tsx b/src/renderer/features/settings/components/window/discord-settings.tsx
index d124ed13..e8957a75 100644
--- a/src/renderer/features/settings/components/window/discord-settings.tsx
+++ b/src/renderer/features/settings/components/window/discord-settings.tsx
@@ -1,4 +1,6 @@
 import isElectron from 'is-electron';
+import { useTranslation } from 'react-i18next';
+
 import { NumberInput, Switch, TextInput } from '/@/renderer/components';
 import {
     SettingOption,
@@ -6,10 +8,9 @@ import {
 } from '/@/renderer/features/settings/components/settings-section';
 import {
     useDiscordSetttings,
-    useSettingsStoreActions,
     useGeneralSettings,
+    useSettingsStoreActions,
 } from '/@/renderer/store';
-import { useTranslation } from 'react-i18next';
 
 export const DiscordSettings = () => {
     const { t } = useTranslation();
@@ -75,7 +76,6 @@ export const DiscordSettings = () => {
         {
             control: (
                 <NumberInput
-                    value={settings.updateInterval}
                     onChange={(e) => {
                         let value = e ? Number(e) : 0;
                         if (value < 15) {
@@ -89,6 +89,7 @@ export const DiscordSettings = () => {
                             },
                         });
                     }}
+                    value={settings.updateInterval}
                 />
             ),
             description: t('setting.discordUpdateInterval', {
diff --git a/src/renderer/features/settings/components/window/password-settings.tsx b/src/renderer/features/settings/components/window/password-settings.tsx
index 2d6d7467..9c56736c 100644
--- a/src/renderer/features/settings/components/window/password-settings.tsx
+++ b/src/renderer/features/settings/components/window/password-settings.tsx
@@ -1,14 +1,16 @@
 import { SelectItem } from '@mantine/core';
 import isElectron from 'is-electron';
 import { useTranslation } from 'react-i18next';
-import { useSettingsStoreActions, useGeneralSettings } from '../../../../store/settings.store';
-import {
-    SettingsSection,
-    SettingOption,
-} from '/@/renderer/features/settings/components/settings-section';
-import { Select } from '/@/renderer/components';
 
-const localSettings = isElectron() ? window.electron.localSettings : null;
+import { useGeneralSettings, useSettingsStoreActions } from '../../../../store/settings.store';
+
+import { Select } from '/@/renderer/components';
+import {
+    SettingOption,
+    SettingsSection,
+} from '/@/renderer/features/settings/components/settings-section';
+
+const localSettings = isElectron() ? window.api.localSettings : null;
 
 const PASSWORD_SETTINGS: SelectItem[] = [
     { label: 'libsecret', value: 'gnome_libsecret' },
diff --git a/src/renderer/features/settings/components/window/update-settings.tsx b/src/renderer/features/settings/components/window/update-settings.tsx
index 41389bcc..8b08be87 100644
--- a/src/renderer/features/settings/components/window/update-settings.tsx
+++ b/src/renderer/features/settings/components/window/update-settings.tsx
@@ -1,14 +1,16 @@
 import isElectron from 'is-electron';
 import { useTranslation } from 'react-i18next';
-import { useWindowSettings, useSettingsStoreActions } from '../../../../store/settings.store';
-import {
-    SettingsSection,
-    SettingOption,
-} from '/@/renderer/features/settings/components/settings-section';
-import { Switch } from '/@/renderer/components';
 
-const localSettings = isElectron() ? window.electron.localSettings : null;
-const utils = isElectron() ? window.electron.utils : null;
+import { useSettingsStoreActions, useWindowSettings } from '../../../../store/settings.store';
+
+import { Switch } from '/@/renderer/components';
+import {
+    SettingOption,
+    SettingsSection,
+} from '/@/renderer/features/settings/components/settings-section';
+
+const localSettings = isElectron() ? window.api.localSettings : null;
+const utils = isElectron() ? window.api.utils : null;
 
 export const UpdateSettings = () => {
     const { t } = useTranslation();
diff --git a/src/renderer/features/settings/components/window/window-settings.tsx b/src/renderer/features/settings/components/window/window-settings.tsx
index c4dc060f..9c802f69 100644
--- a/src/renderer/features/settings/components/window/window-settings.tsx
+++ b/src/renderer/features/settings/components/window/window-settings.tsx
@@ -1,12 +1,14 @@
 import isElectron from 'is-electron';
-import { Platform } from '/@/renderer/types';
 import { useTranslation } from 'react-i18next';
-import { useWindowSettings, useSettingsStoreActions } from '../../../../store/settings.store';
-import {
-    SettingsSection,
-    SettingOption,
-} from '/@/renderer/features/settings/components/settings-section';
+
+import { useSettingsStoreActions, useWindowSettings } from '../../../../store/settings.store';
+
 import { Select, Switch, toast } from '/@/renderer/components';
+import {
+    SettingOption,
+    SettingsSection,
+} from '/@/renderer/features/settings/components/settings-section';
+import { Platform } from '/@/renderer/types';
 
 const WINDOW_BAR_OPTIONS = [
     { label: 'Web (hidden)', value: Platform.WEB },
@@ -15,7 +17,7 @@ const WINDOW_BAR_OPTIONS = [
     { label: 'Native', value: Platform.LINUX },
 ];
 
-const localSettings = isElectron() ? window.electron.localSettings : null;
+const localSettings = isElectron() ? window.api.localSettings : null;
 
 export const WindowSettings = () => {
     const { t } = useTranslation();
@@ -28,7 +30,6 @@ export const WindowSettings = () => {
                 <Select
                     data={WINDOW_BAR_OPTIONS}
                     disabled={!isElectron()}
-                    value={settings.windowBarStyle}
                     onChange={(e) => {
                         if (!e) return;
 
@@ -49,7 +50,7 @@ export const WindowSettings = () => {
                                     postProcess: 'sentenceCase',
                                 }),
                                 onClose: () => {
-                                    window.electron.ipc!.send('app-restart');
+                                    window.api.ipc!.send('app-restart');
                                 },
                                 title: t('common.restartRequired', {
                                     postProcess: 'sentenceCase',
@@ -72,6 +73,7 @@ export const WindowSettings = () => {
                             },
                         });
                     }}
+                    value={settings.windowBarStyle}
                 />
             ),
             description: t('setting.windowBarStyle', {
diff --git a/src/renderer/features/settings/components/window/window-tab.tsx b/src/renderer/features/settings/components/window/window-tab.tsx
index 14b5c6a4..3e280385 100644
--- a/src/renderer/features/settings/components/window/window-tab.tsx
+++ b/src/renderer/features/settings/components/window/window-tab.tsx
@@ -1,11 +1,12 @@
 import { Stack } from '@mantine/core';
+import isElectron from 'is-electron';
+
+import { DiscordSettings } from '/@/renderer/features/settings/components/window/discord-settings';
+import { PasswordSettings } from '/@/renderer/features/settings/components/window/password-settings';
 import { UpdateSettings } from '/@/renderer/features/settings/components/window/update-settings';
 import { WindowSettings } from '/@/renderer/features/settings/components/window/window-settings';
-import { DiscordSettings } from '/@/renderer/features/settings/components/window/discord-settings';
-import isElectron from 'is-electron';
-import { PasswordSettings } from '/@/renderer/features/settings/components/window/password-settings';
 
-const utils = isElectron() ? window.electron.utils : null;
+const utils = isElectron() ? window.api.utils : null;
 
 export const WindowTab = () => {
     return (
diff --git a/src/renderer/features/settings/routes/settings-route.tsx b/src/renderer/features/settings/routes/settings-route.tsx
index 54f402ce..a3c41a61 100644
--- a/src/renderer/features/settings/routes/settings-route.tsx
+++ b/src/renderer/features/settings/routes/settings-route.tsx
@@ -1,9 +1,10 @@
 import { Flex } from '@mantine/core';
+import { useState } from 'react';
+
 import { SettingsContent } from '/@/renderer/features/settings/components/settings-content';
 import { SettingsHeader } from '/@/renderer/features/settings/components/settings-header';
-import { AnimatedPage } from '/@/renderer/features/shared';
 import { SettingSearchContext } from '/@/renderer/features/settings/context/search-context';
-import { useState } from 'react';
+import { AnimatedPage } from '/@/renderer/features/shared';
 
 const SettingsRoute = () => {
     const [search, setSearch] = useState('');
diff --git a/src/renderer/features/shared/components/animated-page.tsx b/src/renderer/features/shared/components/animated-page.tsx
index aa0e5dc6..f5ab231a 100644
--- a/src/renderer/features/shared/components/animated-page.tsx
+++ b/src/renderer/features/shared/components/animated-page.tsx
@@ -1,6 +1,8 @@
 import type { ReactNode, Ref } from 'react';
-import { forwardRef } from 'react';
+
 import { motion } from 'framer-motion';
+import { forwardRef } from 'react';
+
 import styles from './animated-page.module.scss';
 
 interface AnimatedPageProps {
@@ -17,9 +19,9 @@ export const AnimatedPage = forwardRef(
     ({ children }: AnimatedPageProps, ref: Ref<HTMLDivElement>) => {
         return (
             <motion.main
-                ref={ref}
                 // animate="animate"
                 className={styles.animatedPage}
+                ref={ref}
                 // exit="exit"
                 // initial="initial"
                 // transition={{ duration: 0.3, ease: 'easeIn' }}
diff --git a/src/renderer/features/shared/components/filter-bar.tsx b/src/renderer/features/shared/components/filter-bar.tsx
index 4a322723..cd8e266d 100644
--- a/src/renderer/features/shared/components/filter-bar.tsx
+++ b/src/renderer/features/shared/components/filter-bar.tsx
@@ -1,5 +1,6 @@
 import { PaperProps } from '@mantine/core';
 import styled from 'styled-components';
+
 import { Paper } from '/@/renderer/components';
 
 const StyledFilterBar = styled(Paper)`
diff --git a/src/renderer/features/shared/components/item-image-placeholder.module.scss b/src/renderer/features/shared/components/item-image-placeholder.module.css
similarity index 100%
rename from src/renderer/features/shared/components/item-image-placeholder.module.scss
rename to src/renderer/features/shared/components/item-image-placeholder.module.css
diff --git a/src/renderer/features/shared/components/item-image-placeholder.tsx b/src/renderer/features/shared/components/item-image-placeholder.tsx
index 6ba276ab..d387e072 100644
--- a/src/renderer/features/shared/components/item-image-placeholder.tsx
+++ b/src/renderer/features/shared/components/item-image-placeholder.tsx
@@ -2,7 +2,9 @@ import { Center } from '@mantine/core';
 import clsx from 'clsx';
 import { memo } from 'react';
 import { RiAlbumFill, RiPlayListFill, RiUserVoiceFill } from 'react-icons/ri';
-import styles from './item-image-placeholder.module.scss';
+
+import styles from './item-image-placeholder.module.css';
+
 import { LibraryItem } from '/@/renderer/api/types';
 
 interface ItemImagePlaceholderProps {
@@ -13,10 +15,10 @@ const Image = memo(function Image(props: ItemImagePlaceholderProps) {
     switch (props.itemType) {
         case LibraryItem.ALBUM:
             return <RiAlbumFill />;
-        case LibraryItem.ARTIST:
-            return <RiUserVoiceFill />;
         case LibraryItem.ALBUM_ARTIST:
             return <RiUserVoiceFill />;
+        case LibraryItem.ARTIST:
+            return <RiUserVoiceFill />;
         case LibraryItem.PLAYLIST:
             return <RiPlayListFill />;
         default:
diff --git a/src/renderer/features/shared/components/json-preview.tsx b/src/renderer/features/shared/components/json-preview.tsx
index 51fbf13d..32a35ff8 100644
--- a/src/renderer/features/shared/components/json-preview.tsx
+++ b/src/renderer/features/shared/components/json-preview.tsx
@@ -1,5 +1,5 @@
 interface JsonPreviewProps {
-    value: string | Record<string, any>;
+    value: Record<string, any> | string;
 }
 
 export const JsonPreview = ({ value }: JsonPreviewProps) => {
diff --git a/src/renderer/features/shared/components/library-header-bar.tsx b/src/renderer/features/shared/components/library-header-bar.tsx
index 3acfce5c..b746b8b9 100644
--- a/src/renderer/features/shared/components/library-header-bar.tsx
+++ b/src/renderer/features/shared/components/library-header-bar.tsx
@@ -1,8 +1,9 @@
-import { ReactNode } from 'react';
 import { Box } from '@mantine/core';
+import { ReactNode } from 'react';
+import styled from 'styled-components';
+
 import { Paper, PaperProps, SpinnerIcon, TextTitle } from '/@/renderer/components';
 import { PlayButton as PlayBtn } from '/@/renderer/features/shared/components/play-button';
-import styled from 'styled-components';
 
 interface LibraryHeaderBarProps {
     children: ReactNode;
@@ -47,8 +48,8 @@ const PlayButton = ({ onClick }: PlayButtonProps) => {
         <Box>
             <PlayBtn
                 h="45px"
-                w="45px"
                 onClick={onClick}
+                w="45px"
             />
         </Box>
     );
diff --git a/src/renderer/features/shared/components/library-header.module.scss b/src/renderer/features/shared/components/library-header.module.css
similarity index 100%
rename from src/renderer/features/shared/components/library-header.module.scss
rename to src/renderer/features/shared/components/library-header.module.css
diff --git a/src/renderer/features/shared/components/library-header.tsx b/src/renderer/features/shared/components/library-header.tsx
index 9bb9b833..f321f29d 100644
--- a/src/renderer/features/shared/components/library-header.tsx
+++ b/src/renderer/features/shared/components/library-header.tsx
@@ -1,11 +1,13 @@
-import { forwardRef, ReactNode, Ref, useCallback, useState } from 'react';
 import { Center, Group } from '@mantine/core';
 import { closeAllModals, openModal } from '@mantine/modals';
 import { AutoTextSize } from 'auto-text-size';
 import clsx from 'clsx';
+import { forwardRef, ReactNode, Ref, useCallback, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Link } from 'react-router-dom';
-import styles from './library-header.module.scss';
+
+import styles from './library-header.module.css';
+
 import { LibraryItem } from '/@/renderer/api/types';
 import { Text } from '/@/renderer/components';
 import { ItemImagePlaceholder } from '/@/renderer/features/shared/components/item-image-placeholder';
@@ -15,8 +17,8 @@ interface LibraryHeaderProps {
     background: string;
     blur?: number;
     children?: ReactNode;
-    imagePlaceholderUrl?: string | null;
-    imageUrl?: string | null;
+    imagePlaceholderUrl?: null | string;
+    imageUrl?: null | string;
     item: { route: string; type: LibraryItem };
     title: string;
 }
@@ -24,13 +26,13 @@ interface LibraryHeaderProps {
 export const LibraryHeader = forwardRef(
     (
         {
-            imageUrl,
-            imagePlaceholderUrl,
             background,
             blur,
-            title,
-            item,
             children,
+            imagePlaceholderUrl,
+            imageUrl,
+            item,
+            title,
         }: LibraryHeaderProps,
         ref: Ref<HTMLDivElement>,
     ) => {
@@ -46,10 +48,10 @@ export const LibraryHeader = forwardRef(
             switch (item.type) {
                 case LibraryItem.ALBUM:
                     return t('entity.album', { count: 1 });
-                case LibraryItem.ARTIST:
-                    return t('entity.artist', { count: 1 });
                 case LibraryItem.ALBUM_ARTIST:
                     return t('entity.albumArtist', { count: 1 });
+                case LibraryItem.ARTIST:
+                    return t('entity.artist', { count: 1 });
                 case LibraryItem.PLAYLIST:
                     return t('entity.playlist', { count: 1 });
                 case LibraryItem.SONG:
@@ -66,12 +68,12 @@ export const LibraryHeader = forwardRef(
                 openModal({
                     children: (
                         <Center
+                            onClick={() => closeAllModals()}
                             style={{
                                 cursor: 'pointer',
                                 height: 'calc(100vh - 80px)',
                                 width: '100%',
                             }}
-                            onClick={() => closeAllModals()}
                         >
                             <img
                                 alt="cover"
@@ -90,8 +92,8 @@ export const LibraryHeader = forwardRef(
 
         return (
             <div
-                ref={ref}
                 className={styles.libraryHeader}
+                ref={ref}
             >
                 <div
                     className={styles.background}
@@ -104,22 +106,22 @@ export const LibraryHeader = forwardRef(
                 />
                 <div
                     className={styles.imageSection}
+                    onClick={() => openImage()}
+                    onKeyDown={(event) =>
+                        [' ', 'Enter', 'Spacebar'].includes(event.key) && openImage()
+                    }
                     role="button"
                     style={{ cursor: 'pointer' }}
                     tabIndex={0}
-                    onClick={() => openImage()}
-                    onKeyDown={(event) =>
-                        ['Spacebar', ' ', 'Enter'].includes(event.key) && openImage()
-                    }
                 >
                     {imageUrl && !isImageError ? (
                         <img
                             alt="cover"
                             className={styles.image}
+                            onError={onImageError}
                             placeholder={imagePlaceholderUrl || 'var(--placeholder-bg)'}
                             src={imageUrl}
                             style={{ height: '' }}
-                            onError={onImageError}
                         />
                     ) : (
                         <ItemImagePlaceholder itemType={item.type} />
diff --git a/src/renderer/features/shared/components/order-toggle-button.tsx b/src/renderer/features/shared/components/order-toggle-button.tsx
index d223374b..16435d55 100644
--- a/src/renderer/features/shared/components/order-toggle-button.tsx
+++ b/src/renderer/features/shared/components/order-toggle-button.tsx
@@ -1,6 +1,7 @@
 import { ButtonProps } from '@mantine/core';
 import { useTranslation } from 'react-i18next';
 import { RiSortAsc, RiSortDesc } from 'react-icons/ri';
+
 import { SortOrder } from '/@/renderer/api/types';
 import { Button, Tooltip } from '/@/renderer/components';
 
@@ -10,7 +11,7 @@ interface OrderToggleButtonProps {
     sortOrder: SortOrder;
 }
 
-export const OrderToggleButton = ({ sortOrder, onToggle, buttonProps }: OrderToggleButtonProps) => {
+export const OrderToggleButton = ({ buttonProps, onToggle, sortOrder }: OrderToggleButtonProps) => {
     const { t } = useTranslation();
     return (
         <Tooltip
@@ -23,9 +24,9 @@ export const OrderToggleButton = ({ sortOrder, onToggle, buttonProps }: OrderTog
             <Button
                 compact
                 fw="600"
+                onClick={onToggle}
                 size="md"
                 variant="subtle"
-                onClick={onToggle}
                 {...buttonProps}
             >
                 <>
diff --git a/src/renderer/features/shared/components/resize-handle.tsx b/src/renderer/features/shared/components/resize-handle.tsx
index 81e6d11e..9446af64 100644
--- a/src/renderer/features/shared/components/resize-handle.tsx
+++ b/src/renderer/features/shared/components/resize-handle.tsx
@@ -2,7 +2,7 @@ import styled from 'styled-components';
 
 export const ResizeHandle = styled.div<{
     $isResizing: boolean;
-    $placement: 'top' | 'left' | 'bottom' | 'right';
+    $placement: 'bottom' | 'left' | 'right' | 'top';
 }>`
     position: absolute;
     top: ${(props) => props.$placement === 'top' && 0};
diff --git a/src/renderer/features/shared/hooks/use-handle-favorite.ts b/src/renderer/features/shared/hooks/use-handle-favorite.ts
index ecdc1a36..b8ab1f40 100644
--- a/src/renderer/features/shared/hooks/use-handle-favorite.ts
+++ b/src/renderer/features/shared/hooks/use-handle-favorite.ts
@@ -1,4 +1,5 @@
 import { MutableRefObject, useCallback } from 'react';
+
 import { LibraryItem } from '/@/renderer/api/types';
 import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid';
 import { useCreateFavorite } from '/@/renderer/features/shared/mutations/create-favorite-mutation';
@@ -6,8 +7,8 @@ import { useDeleteFavorite } from '/@/renderer/features/shared/mutations/delete-
 import { ServerListItem } from '/@/renderer/types';
 
 interface HandleFavoriteProps {
-    gridRef: MutableRefObject<VirtualInfiniteGridRef | null>;
-    server: ServerListItem | null;
+    gridRef: MutableRefObject<null | VirtualInfiniteGridRef>;
+    server: null | ServerListItem;
 }
 
 export const useHandleFavorite = ({ gridRef, server }: HandleFavoriteProps) => {
@@ -16,7 +17,7 @@ export const useHandleFavorite = ({ gridRef, server }: HandleFavoriteProps) => {
 
     const handleFavorite = useCallback(
         async (options: { id: string[]; isFavorite: boolean; itemType: LibraryItem }) => {
-            const { id, itemType, isFavorite } = options;
+            const { id, isFavorite, itemType } = options;
             try {
                 if (isFavorite) {
                     await deleteFavoriteMutation.mutateAsync({
diff --git a/src/renderer/features/shared/mutations/create-favorite-mutation.ts b/src/renderer/features/shared/mutations/create-favorite-mutation.ts
index 8a811ff1..035ea324 100644
--- a/src/renderer/features/shared/mutations/create-favorite-mutation.ts
+++ b/src/renderer/features/shared/mutations/create-favorite-mutation.ts
@@ -1,5 +1,7 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { AxiosError } from 'axios';
+import isElectron from 'is-electron';
+
 import { api } from '/@/renderer/api';
 import { queryKeys } from '/@/renderer/api/query-keys';
 import {
@@ -11,10 +13,9 @@ import {
 } from '/@/renderer/api/types';
 import { MutationHookArgs } from '/@/renderer/lib/react-query';
 import { getServerById, useSetAlbumListItemDataById, useSetQueueFavorite } from '/@/renderer/store';
-import isElectron from 'is-electron';
 import { useFavoriteEvent } from '/@/renderer/store/event.store';
 
-const remote = isElectron() ? window.electron.remote : null;
+const remote = isElectron() ? window.api.remote : null;
 
 export const useCreateFavorite = (args: MutationHookArgs) => {
     const { options } = args || {};
@@ -26,7 +27,7 @@ export const useCreateFavorite = (args: MutationHookArgs) => {
     return useMutation<
         FavoriteResponse,
         AxiosError,
-        Omit<FavoriteArgs, 'server' | 'apiClientProps'>,
+        Omit<FavoriteArgs, 'apiClientProps' | 'server'>,
         null
     >({
         mutationFn: (args) => {
diff --git a/src/renderer/features/shared/mutations/delete-favorite-mutation.ts b/src/renderer/features/shared/mutations/delete-favorite-mutation.ts
index a0275704..59b16a9a 100644
--- a/src/renderer/features/shared/mutations/delete-favorite-mutation.ts
+++ b/src/renderer/features/shared/mutations/delete-favorite-mutation.ts
@@ -1,5 +1,7 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { AxiosError } from 'axios';
+import isElectron from 'is-electron';
+
 import { api } from '/@/renderer/api';
 import { queryKeys } from '/@/renderer/api/query-keys';
 import {
@@ -11,10 +13,9 @@ import {
 } from '/@/renderer/api/types';
 import { MutationHookArgs } from '/@/renderer/lib/react-query';
 import { getServerById, useSetAlbumListItemDataById, useSetQueueFavorite } from '/@/renderer/store';
-import isElectron from 'is-electron';
 import { useFavoriteEvent } from '/@/renderer/store/event.store';
 
-const remote = isElectron() ? window.electron.remote : null;
+const remote = isElectron() ? window.api.remote : null;
 
 export const useDeleteFavorite = (args: MutationHookArgs) => {
     const { options } = args || {};
@@ -26,7 +27,7 @@ export const useDeleteFavorite = (args: MutationHookArgs) => {
     return useMutation<
         FavoriteResponse,
         AxiosError,
-        Omit<FavoriteArgs, 'server' | 'apiClientProps'>,
+        Omit<FavoriteArgs, 'apiClientProps' | 'server'>,
         null
     >({
         mutationFn: (args) => {
diff --git a/src/renderer/features/shared/mutations/set-rating-mutation.ts b/src/renderer/features/shared/mutations/set-rating-mutation.ts
index eb3f1e5c..841fbc8b 100644
--- a/src/renderer/features/shared/mutations/set-rating-mutation.ts
+++ b/src/renderer/features/shared/mutations/set-rating-mutation.ts
@@ -1,23 +1,24 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query';
 import { AxiosError } from 'axios';
+import isElectron from 'is-electron';
+
 import { api } from '/@/renderer/api';
 import { queryKeys } from '/@/renderer/api/query-keys';
 import {
     Album,
     AlbumArtist,
+    AlbumArtistDetailResponse,
+    AlbumDetailResponse,
     AnyLibraryItems,
     LibraryItem,
-    SetRatingArgs,
     RatingResponse,
-    AlbumDetailResponse,
-    AlbumArtistDetailResponse,
+    SetRatingArgs,
 } from '/@/renderer/api/types';
 import { MutationHookArgs } from '/@/renderer/lib/react-query';
 import { getServerById, useSetAlbumListItemDataById, useSetQueueRating } from '/@/renderer/store';
-import isElectron from 'is-electron';
 import { useRatingEvent } from '/@/renderer/store/event.store';
 
-const remote = isElectron() ? window.electron.remote : null;
+const remote = isElectron() ? window.api.remote : null;
 
 export const useSetRating = (args: MutationHookArgs) => {
     const { options } = args || {};
@@ -29,8 +30,8 @@ export const useSetRating = (args: MutationHookArgs) => {
     return useMutation<
         RatingResponse,
         AxiosError,
-        Omit<SetRatingArgs, 'server' | 'apiClientProps'>,
-        { previous: { items: AnyLibraryItems } | undefined }
+        Omit<SetRatingArgs, 'apiClientProps' | 'server'>,
+        { previous: undefined | { items: AnyLibraryItems } }
     >({
         mutationFn: (args) => {
             const server = getServerById(args.serverId);
diff --git a/src/renderer/features/shared/queries/music-folders-query.ts b/src/renderer/features/shared/queries/music-folders-query.ts
index 97042a42..40363f12 100644
--- a/src/renderer/features/shared/queries/music-folders-query.ts
+++ b/src/renderer/features/shared/queries/music-folders-query.ts
@@ -1,9 +1,11 @@
 import { useQuery } from '@tanstack/react-query';
+
+import { MusicFolderListQuery } from '../../../api/types';
+import { QueryHookArgs } from '../../../lib/react-query';
+
 import { api } from '/@/renderer/api';
 import { queryKeys } from '/@/renderer/api/query-keys';
 import { getServerById } from '/@/renderer/store';
-import { MusicFolderListQuery } from '../../../api/types';
-import { QueryHookArgs } from '../../../lib/react-query';
 
 export const useMusicFolders = (args: QueryHookArgs<MusicFolderListQuery>) => {
     const { options, serverId } = args || {};
diff --git a/src/renderer/features/sharing/components/share-item-context-modal.tsx b/src/renderer/features/sharing/components/share-item-context-modal.tsx
index ca915093..61d45f48 100644
--- a/src/renderer/features/sharing/components/share-item-context-modal.tsx
+++ b/src/renderer/features/sharing/components/share-item-context-modal.tsx
@@ -2,10 +2,12 @@ import { Box, Group, Stack, TextInput } from '@mantine/core';
 import { DateTimePicker } from '@mantine/dates';
 import { useForm } from '@mantine/form';
 import { closeModal, ContextModalProps } from '@mantine/modals';
+import { useTranslation } from 'react-i18next';
+
+import { useShareItem } from '../mutations/share-item-mutation';
+
 import { Button, Switch, toast } from '/@/renderer/components';
 import { useCurrentServer } from '/@/renderer/store';
-import { useTranslation } from 'react-i18next';
-import { useShareItem } from '../mutations/share-item-mutation';
 
 export const ShareItemContextModal = ({
     id,
@@ -122,9 +124,9 @@ export const ShareItemContextModal = ({
                     <Group position="right">
                         <Group>
                             <Button
+                                onClick={() => closeModal(id)}
                                 size="md"
                                 variant="subtle"
-                                onClick={() => closeModal(id)}
                             >
                                 {t('common.cancel', { postProcess: 'titleCase' })}
                             </Button>
diff --git a/src/renderer/features/sharing/mutations/share-item-mutation.ts b/src/renderer/features/sharing/mutations/share-item-mutation.ts
index ae774df0..30aae5ba 100644
--- a/src/renderer/features/sharing/mutations/share-item-mutation.ts
+++ b/src/renderer/features/sharing/mutations/share-item-mutation.ts
@@ -1,7 +1,8 @@
 import { useMutation } from '@tanstack/react-query';
-import { AnyLibraryItems, ShareItemResponse, ShareItemArgs } from '/@/renderer/api/types';
 import { AxiosError } from 'axios';
+
 import { api } from '/@/renderer/api';
+import { AnyLibraryItems, ShareItemArgs, ShareItemResponse } from '/@/renderer/api/types';
 import { MutationHookArgs } from '/@/renderer/lib/react-query';
 import { getServerById } from '/@/renderer/store';
 
@@ -11,8 +12,8 @@ export const useShareItem = (args: MutationHookArgs) => {
     return useMutation<
         ShareItemResponse,
         AxiosError,
-        Omit<ShareItemArgs, 'server' | 'apiClientProps'>,
-        { previous: { items: AnyLibraryItems } | undefined }
+        Omit<ShareItemArgs, 'apiClientProps' | 'server'>,
+        { previous: undefined | { items: AnyLibraryItems } }
     >({
         mutationFn: (args) => {
             const server = getServerById(args.serverId);
diff --git a/src/renderer/features/sidebar/components/action-bar.tsx b/src/renderer/features/sidebar/components/action-bar.tsx
index b92d3dca..35376a42 100644
--- a/src/renderer/features/sidebar/components/action-bar.tsx
+++ b/src/renderer/features/sidebar/components/action-bar.tsx
@@ -1,8 +1,9 @@
 import { Grid, Group } from '@mantine/core';
 import { useTranslation } from 'react-i18next';
-import { RiSearchLine, RiMenuFill, RiArrowLeftSLine, RiArrowRightSLine } from 'react-icons/ri';
+import { RiArrowLeftSLine, RiArrowRightSLine, RiMenuFill, RiSearchLine } from 'react-icons/ri';
 import { useNavigate } from 'react-router';
 import styled from 'styled-components';
+
 import { Button, DropdownMenu, TextInput } from '/@/renderer/components';
 import { AppMenu } from '/@/renderer/features/titlebar/components/app-menu';
 import { useContainerQuery } from '/@/renderer/hooks';
@@ -36,16 +37,16 @@ export const ActionBar = () => {
                 >
                     <Grid.Col span={6}>
                         <TextInput
-                            readOnly
                             icon={<RiSearchLine />}
-                            placeholder={t('common.search', { postProcess: 'titleCase' })}
-                            size="md"
                             onClick={open}
                             onKeyDown={(e) => {
                                 if (e.key === 'Enter' || e.key === ' ') {
                                     open();
                                 }
                             }}
+                            placeholder={t('common.search', { postProcess: 'titleCase' })}
+                            readOnly
+                            size="md"
                         />
                     </Grid.Col>
                     <Grid.Col span={6}>
@@ -69,18 +70,18 @@ export const ActionBar = () => {
                                 </DropdownMenu.Dropdown>
                             </DropdownMenu>
                             <Button
+                                onClick={() => navigate(-1)}
                                 p="0.5rem"
                                 size="md"
                                 variant="default"
-                                onClick={() => navigate(-1)}
                             >
                                 <RiArrowLeftSLine size="1.5rem" />
                             </Button>
                             <Button
+                                onClick={() => navigate(1)}
                                 p="0.5rem"
                                 size="md"
                                 variant="default"
-                                onClick={() => navigate(1)}
                             >
                                 <RiArrowRightSLine size="1.5rem" />
                             </Button>
@@ -95,10 +96,10 @@ export const ActionBar = () => {
                     w="100%"
                 >
                     <Button
+                        onClick={open}
                         p="0.5rem"
                         size="md"
                         variant="default"
-                        onClick={open}
                     >
                         <RiSearchLine size="1rem" />
                     </Button>
@@ -117,18 +118,18 @@ export const ActionBar = () => {
                         </DropdownMenu.Dropdown>
                     </DropdownMenu>
                     <Button
+                        onClick={() => navigate(-1)}
                         p="0.5rem"
                         size="md"
                         variant="default"
-                        onClick={() => navigate(-1)}
                     >
                         <RiArrowLeftSLine size="1.5rem" />
                     </Button>
                     <Button
+                        onClick={() => navigate(1)}
                         p="0.5rem"
                         size="md"
                         variant="default"
-                        onClick={() => navigate(1)}
                     >
                         <RiArrowRightSLine size="1.5rem" />
                     </Button>
diff --git a/src/renderer/features/sidebar/components/collapsed-sidebar-button.tsx b/src/renderer/features/sidebar/components/collapsed-sidebar-button.tsx
index 73f35ef8..c927e827 100644
--- a/src/renderer/features/sidebar/components/collapsed-sidebar-button.tsx
+++ b/src/renderer/features/sidebar/components/collapsed-sidebar-button.tsx
@@ -1,5 +1,5 @@
-import { forwardRef, ReactNode } from 'react';
 import { createPolymorphicComponent, Flex } from '@mantine/core';
+import { forwardRef, ReactNode } from 'react';
 import styled from 'styled-components';
 
 const Container = styled(Flex)<{ $active?: boolean; $disabled?: boolean }>`
@@ -48,9 +48,9 @@ const _CollapsedSidebarButton = forwardRef<HTMLDivElement, CollapsedSidebarButto
     ({ children, ...props }: CollapsedSidebarButtonProps, ref) => {
         return (
             <Container
-                ref={ref}
                 align="center"
                 direction="column"
+                ref={ref}
                 {...props}
             >
                 {children}
diff --git a/src/renderer/features/sidebar/components/collapsed-sidebar-item.tsx b/src/renderer/features/sidebar/components/collapsed-sidebar-item.tsx
index e30122d3..3562e43a 100644
--- a/src/renderer/features/sidebar/components/collapsed-sidebar-item.tsx
+++ b/src/renderer/features/sidebar/components/collapsed-sidebar-item.tsx
@@ -3,6 +3,7 @@ import { motion } from 'framer-motion';
 import { forwardRef, ReactNode } from 'react';
 import { useMatch } from 'react-router';
 import styled from 'styled-components';
+
 import { Text } from '/@/renderer/components';
 
 const Container = styled(Flex)<{ $active?: boolean; $disabled?: boolean }>`
@@ -71,17 +72,17 @@ interface CollapsedSidebarItemProps {
 }
 
 const _CollapsedSidebarItem = forwardRef<HTMLDivElement, CollapsedSidebarItemProps>(
-    ({ route, activeIcon, icon, label, disabled, ...props }: CollapsedSidebarItemProps, ref) => {
+    ({ activeIcon, disabled, icon, label, route, ...props }: CollapsedSidebarItemProps, ref) => {
         const match = useMatch(route || '/null');
         const isMatch = Boolean(match);
 
         return (
             <Container
-                ref={ref}
                 $active={Boolean(match)}
                 $disabled={disabled}
                 align="center"
                 direction="column"
+                ref={ref}
                 {...props}
             >
                 {isMatch ? <ActiveTabIndicator /> : null}
diff --git a/src/renderer/features/sidebar/components/collapsed-sidebar.tsx b/src/renderer/features/sidebar/components/collapsed-sidebar.tsx
index 4abadf10..606ba65e 100644
--- a/src/renderer/features/sidebar/components/collapsed-sidebar.tsx
+++ b/src/renderer/features/sidebar/components/collapsed-sidebar.tsx
@@ -1,10 +1,11 @@
-import { useMemo } from 'react';
 import { Group, UnstyledButton } from '@mantine/core';
 import { motion } from 'framer-motion';
+import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { RiArrowLeftSLine, RiArrowRightSLine, RiMenuFill } from 'react-icons/ri';
 import { NavLink, useNavigate } from 'react-router-dom';
 import styled from 'styled-components';
+
 import { DropdownMenu, ScrollArea } from '/@/renderer/components';
 import { CollapsedSidebarButton } from '/@/renderer/features/sidebar/components/collapsed-sidebar-button';
 import { CollapsedSidebarItem } from '/@/renderer/features/sidebar/components/collapsed-sidebar-item';
@@ -28,7 +29,7 @@ export const CollapsedSidebar = () => {
     const { t } = useTranslation();
     const navigate = useNavigate();
     const { windowBarStyle } = useWindowSettings();
-    const { sidebarItems, sidebarCollapsedNavigation } = useGeneralSettings();
+    const { sidebarCollapsedNavigation, sidebarItems } = useGeneralSettings();
 
     const translatedSidebarItemMap = useMemo(
         () => ({
@@ -68,8 +69,8 @@ export const CollapsedSidebar = () => {
     return (
         <SidebarContainer $windowBarStyle={windowBarStyle}>
             <ScrollArea
-                scrollHideDelay={0}
                 scrollbarSize={8}
+                scrollHideDelay={0}
             >
                 {sidebarCollapsedNavigation && (
                     <Group
@@ -108,7 +109,6 @@ export const CollapsedSidebar = () => {
                 </DropdownMenu>
                 {sidebarItemsWithRoute.map((item) => (
                     <CollapsedSidebarItem
-                        key={item.id}
                         activeIcon={
                             <SidebarIcon
                                 active
@@ -123,6 +123,7 @@ export const CollapsedSidebar = () => {
                                 size="25"
                             />
                         }
+                        key={item.id}
                         label={item.label}
                         route={item.route}
                         to={item.route}
diff --git a/src/renderer/features/sidebar/components/sidebar-icon.tsx b/src/renderer/features/sidebar/components/sidebar-icon.tsx
index ef87e702..6ed341ac 100644
--- a/src/renderer/features/sidebar/components/sidebar-icon.tsx
+++ b/src/renderer/features/sidebar/components/sidebar-icon.tsx
@@ -20,9 +20,10 @@ import {
     RiUserVoiceFill,
     RiUserVoiceLine,
 } from 'react-icons/ri';
-import { AppRoute } from '/@/renderer/router/routes';
 import { generatePath } from 'react-router';
+
 import { LibraryItem } from '/@/renderer/api/types';
+import { AppRoute } from '/@/renderer/router/routes';
 
 interface SidebarIconProps {
     active?: boolean;
@@ -35,36 +36,36 @@ export const SidebarIcon = ({ active, route, size }: SidebarIconProps) => {
         case AppRoute.HOME:
             if (active) return <RiHome6Fill size={size} />;
             return <RiHome6Line size={size} />;
-        case AppRoute.LIBRARY_ALBUMS:
-            if (active) return <RiAlbumFill size={size} />;
-            return <RiAlbumLine size={size} />;
         case AppRoute.LIBRARY_ALBUM_ARTISTS:
             if (active) return <RiUserVoiceFill size={size} />;
             return <RiUserVoiceLine size={size} />;
+        case AppRoute.LIBRARY_ALBUMS:
+            if (active) return <RiAlbumFill size={size} />;
+            return <RiAlbumLine size={size} />;
         case AppRoute.LIBRARY_ARTISTS:
             if (active) return <RiUserVoiceFill size={size} />;
             return <RiUserVoiceLine size={size} />;
-        case AppRoute.PLAYLISTS:
-            if (active) return <RiPlayListFill size={size} />;
-            return <RiPlayListLine size={size} />;
-        case AppRoute.LIBRARY_SONGS:
-            if (active) return <RiMusic2Fill size={size} />;
-            return <RiMusic2Line size={size} />;
         case AppRoute.LIBRARY_FOLDERS:
             if (active) return <RiFolder3Fill size={size} />;
             return <RiFolder3Line size={size} />;
         case AppRoute.LIBRARY_GENRES:
             if (active) return <RiFlag2Fill size={size} />;
             return <RiFlag2Line size={size} />;
-        case generatePath(AppRoute.SEARCH, { itemType: LibraryItem.SONG }):
-            if (active) return <RiSearchFill size={size} />;
-            return <RiSearchLine size={size} />;
-        case AppRoute.SETTINGS:
-            if (active) return <RiSettings2Fill size={size} />;
-            return <RiSettings2Line size={size} />;
+        case AppRoute.LIBRARY_SONGS:
+            if (active) return <RiMusic2Fill size={size} />;
+            return <RiMusic2Line size={size} />;
         case AppRoute.NOW_PLAYING:
             if (active) return <RiPlayFill size={size} />;
             return <RiPlayLine size={size} />;
+        case AppRoute.PLAYLISTS:
+            if (active) return <RiPlayListFill size={size} />;
+            return <RiPlayListLine size={size} />;
+        case AppRoute.SETTINGS:
+            if (active) return <RiSettings2Fill size={size} />;
+            return <RiSettings2Line size={size} />;
+        case generatePath(AppRoute.SEARCH, { itemType: LibraryItem.SONG }):
+            if (active) return <RiSearchFill size={size} />;
+            return <RiSearchLine size={size} />;
         default:
             return <RiHome6Line size={size} />;
     }
diff --git a/src/renderer/features/sidebar/components/sidebar-item.tsx b/src/renderer/features/sidebar/components/sidebar-item.tsx
index f23ffdc5..5a8f00b4 100644
--- a/src/renderer/features/sidebar/components/sidebar-item.tsx
+++ b/src/renderer/features/sidebar/components/sidebar-item.tsx
@@ -1,6 +1,7 @@
 import type { ReactNode } from 'react';
-import { createPolymorphicComponent, Flex, FlexProps } from '@mantine/core';
 import type { LinkProps } from 'react-router-dom';
+
+import { createPolymorphicComponent, Flex, FlexProps } from '@mantine/core';
 import { Link } from 'react-router-dom';
 import styled, { css } from 'styled-components';
 
@@ -46,7 +47,7 @@ const _ItemLink = styled(StyledItem)<LinkProps & { disabled?: boolean }>`
 
 const ItemLink = createPolymorphicComponent<'a', ListItemProps>(_ItemLink);
 
-export const SidebarItem = ({ to, children, ...props }: ListItemProps) => {
+export const SidebarItem = ({ children, to, ...props }: ListItemProps) => {
     if (to) {
         return (
             <ItemLink
diff --git a/src/renderer/features/sidebar/components/sidebar-playlist-list.tsx b/src/renderer/features/sidebar/components/sidebar-playlist-list.tsx
index 6c1bd85a..b4f33169 100644
--- a/src/renderer/features/sidebar/components/sidebar-playlist-list.tsx
+++ b/src/renderer/features/sidebar/components/sidebar-playlist-list.tsx
@@ -1,6 +1,6 @@
-import { useCallback, useMemo, useState } from 'react';
 import { Box, Flex, Group } from '@mantine/core';
 import { useDebouncedValue } from '@mantine/hooks';
+import { useCallback, useMemo, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import {
     RiAddBoxFill,
@@ -11,20 +11,21 @@ import {
 } from 'react-icons/ri';
 import { generatePath } from 'react-router';
 import { Link } from 'react-router-dom';
-import { LibraryItem, Playlist, PlaylistListSort, SortOrder } from '/@/renderer/api/types';
-import { Button, Text } from '/@/renderer/components';
-import { usePlayQueueAdd } from '/@/renderer/features/player';
-import { usePlaylistList } from '/@/renderer/features/playlists';
-import { AppRoute } from '/@/renderer/router/routes';
-import { Play } from '/@/renderer/types';
 import AutoSizer from 'react-virtualized-auto-sizer';
 import { FixedSizeList, ListChildComponentProps } from 'react-window';
-import { useHideScrollbar } from '/@/renderer/hooks';
-import { useCurrentServer, useGeneralSettings, useSettingsStoreActions } from '/@/renderer/store';
+
+import { LibraryItem, Playlist, PlaylistListSort, SortOrder } from '/@/renderer/api/types';
+import { Button, Text } from '/@/renderer/components';
 import { openContextMenu } from '/@/renderer/features/context-menu';
 import { PLAYLIST_CONTEXT_MENU_ITEMS } from '/@/renderer/features/context-menu/context-menu-items';
+import { usePlayQueueAdd } from '/@/renderer/features/player';
+import { usePlaylistList } from '/@/renderer/features/playlists';
+import { useHideScrollbar } from '/@/renderer/hooks';
+import { AppRoute } from '/@/renderer/router/routes';
+import { useCurrentServer, useGeneralSettings, useSettingsStoreActions } from '/@/renderer/store';
+import { Play } from '/@/renderer/types';
 
-const PlaylistRow = ({ index, data, style }: ListChildComponentProps) => {
+const PlaylistRow = ({ data, index, style }: ListChildComponentProps) => {
     const { t } = useTranslation();
 
     if (Array.isArray(data?.items[index])) {
@@ -40,6 +41,7 @@ const PlaylistRow = ({ index, data, style }: ListChildComponentProps) => {
                         <Text>{t('page.sidebar.shared', { postProcess: 'titleCase' })}</Text>
                         <Button
                             compact
+                            onClick={() => setCollapse()}
                             tooltip={{
                                 label: t(collapse ? 'common.expand' : 'common.collapse', {
                                     postProcess: 'titleCase',
@@ -47,7 +49,6 @@ const PlaylistRow = ({ index, data, style }: ListChildComponentProps) => {
                                 openDelay: 500,
                             }}
                             variant="default"
-                            onClick={() => setCollapse()}
                         >
                             {collapse ? (
                                 <RiArrowUpSLine size={20} />
@@ -67,7 +68,6 @@ const PlaylistRow = ({ index, data, style }: ListChildComponentProps) => {
 
     return (
         <div
-            style={{ margin: '0.5rem 0', padding: '0 1.5rem', ...style }}
             onContextMenu={(e) => {
                 e.preventDefault();
                 e.stopPropagation();
@@ -83,10 +83,11 @@ const PlaylistRow = ({ index, data, style }: ListChildComponentProps) => {
                     yPos: e.clientY + 5,
                 });
             }}
+            style={{ margin: '0.5rem 0', padding: '0 1.5rem', ...style }}
         >
             <Group
-                noWrap
                 className="sidebar-playlist-item"
+                noWrap
                 pos="relative"
                 position="apart"
                 sx={{
@@ -115,55 +116,55 @@ const PlaylistRow = ({ index, data, style }: ListChildComponentProps) => {
                     {data?.items[index].name}
                 </Text>
                 <Group
-                    noWrap
                     className="sidebar-playlist-controls"
                     display="none"
+                    noWrap
                     pos="absolute"
                     right="0"
                     spacing="sm"
                 >
                     <Button
                         compact
+                        onClick={() => {
+                            if (!data?.items?.[index].id) return;
+                            data.handlePlay(data?.items[index].id, Play.NOW);
+                        }}
                         size="md"
                         tooltip={{
                             label: t('player.play', { postProcess: 'sentenceCase' }),
                             openDelay: 500,
                         }}
                         variant="default"
-                        onClick={() => {
-                            if (!data?.items?.[index].id) return;
-                            data.handlePlay(data?.items[index].id, Play.NOW);
-                        }}
                     >
                         <RiPlayFill />
                     </Button>
                     <Button
                         compact
+                        onClick={() => {
+                            if (!data?.items?.[index].id) return;
+                            data.handlePlay(data?.items[index].id, Play.LAST);
+                        }}
                         size="md"
                         tooltip={{
                             label: t('player.addLast', { postProcess: 'sentenceCase' }),
                             openDelay: 500,
                         }}
                         variant="default"
-                        onClick={() => {
-                            if (!data?.items?.[index].id) return;
-                            data.handlePlay(data?.items[index].id, Play.LAST);
-                        }}
                     >
                         <RiAddBoxFill />
                     </Button>
                     <Button
                         compact
+                        onClick={() => {
+                            if (!data?.items?.[index].id) return;
+                            data.handlePlay(data?.items[index].id, Play.NEXT);
+                        }}
                         size="md"
                         tooltip={{
                             label: t('player.addNext', { postProcess: 'sentenceCase' }),
                             openDelay: 500,
                         }}
                         variant="default"
-                        onClick={() => {
-                            if (!data?.items?.[index].id) return;
-                            data.handlePlay(data?.items[index].id, Play.NEXT);
-                        }}
                     >
                         <RiAddCircleFill />
                     </Button>
@@ -174,7 +175,7 @@ const PlaylistRow = ({ index, data, style }: ListChildComponentProps) => {
 };
 
 export const SidebarPlaylistList = () => {
-    const { isScrollbarHidden, hideScrollbarElementProps } = useHideScrollbar(0);
+    const { hideScrollbarElementProps, isScrollbarHidden } = useHideScrollbar(0);
     const handlePlayQueueAdd = usePlayQueueAdd();
     const { sidebarCollapseShared } = useGeneralSettings();
     const { toggleSidebarCollapseShare } = useSettingsStoreActions();
@@ -218,7 +219,7 @@ export const SidebarPlaylistList = () => {
             return { ...base, items: data?.items };
         }
 
-        const owned: Array<Playlist | [boolean, () => void]> = [];
+        const owned: Array<[boolean, () => void] | Playlist> = [];
         const shared: Playlist[] = [];
 
         for (const playlist of data.items) {
diff --git a/src/renderer/features/sidebar/components/sidebar.tsx b/src/renderer/features/sidebar/components/sidebar.tsx
index 3ba5602b..8cd901aa 100644
--- a/src/renderer/features/sidebar/components/sidebar.tsx
+++ b/src/renderer/features/sidebar/components/sidebar.tsx
@@ -1,16 +1,18 @@
-import { MouseEvent, useMemo } from 'react';
 import { Box, Center, Divider, Group, Stack } from '@mantine/core';
 import { closeAllModals, openModal } from '@mantine/modals';
 import { AnimatePresence, motion } from 'framer-motion';
+import { MouseEvent, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { RiAddFill, RiArrowDownSLine, RiDiscLine, RiListUnordered } from 'react-icons/ri';
 import { Link, useLocation } from 'react-router-dom';
 import styled from 'styled-components';
+
 import {
     SidebarItemType,
     useGeneralSettings,
     useWindowSettings,
 } from '../../../store/settings.store';
+
 import { ServerType } from '/@/renderer/api/types';
 import { Button, MotionStack, Tooltip } from '/@/renderer/components';
 import { CreatePlaylistForm } from '/@/renderer/features/playlists';
@@ -137,8 +139,8 @@ export const Sidebar = () => {
 
     return (
         <SidebarContainer
-            ref={cq.ref}
             $windowBarStyle={windowBarStyle}
+            ref={cq.ref}
         >
             <ActionBar />
             <Stack
@@ -193,6 +195,7 @@ export const Sidebar = () => {
                                 <Group spacing="sm">
                                     <Button
                                         compact
+                                        onClick={handleCreatePlaylistModal}
                                         size="md"
                                         tooltip={{
                                             label: t('action.createPlaylist', {
@@ -201,13 +204,13 @@ export const Sidebar = () => {
                                             openDelay: 500,
                                         }}
                                         variant="default"
-                                        onClick={handleCreatePlaylistModal}
                                     >
                                         <RiAddFill size="1em" />
                                     </Button>
                                     <Button
                                         compact
                                         component={Link}
+                                        onClick={(e) => e.stopPropagation()}
                                         size="md"
                                         to={AppRoute.PLAYLISTS}
                                         tooltip={{
@@ -217,7 +220,6 @@ export const Sidebar = () => {
                                             openDelay: 500,
                                         }}
                                         variant="default"
-                                        onClick={(e) => e.stopPropagation()}
                                     >
                                         <RiListUnordered size="1em" />
                                     </Button>
@@ -233,14 +235,14 @@ export const Sidebar = () => {
                 >
                     {showImage && (
                         <ImageContainer
-                            key="sidebar-image"
                             animate={{ opacity: 1, y: 0 }}
                             exit={{ opacity: 0, y: 200 }}
                             height={sidebar.leftWidth}
                             initial={{ opacity: 0, y: 200 }}
+                            key="sidebar-image"
+                            onClick={expandFullScreenPlayer}
                             role="button"
                             transition={{ duration: 0.3, ease: 'easeInOut' }}
-                            onClick={expandFullScreenPlayer}
                         >
                             <Tooltip
                                 label={t('player.toggleFullscreenPlayer', {
@@ -266,6 +268,10 @@ export const Sidebar = () => {
                             </Tooltip>
                             <Button
                                 compact
+                                onClick={(e) => {
+                                    e.stopPropagation();
+                                    setSideBar({ image: false });
+                                }}
                                 opacity={0.8}
                                 radius={100}
                                 size="md"
@@ -275,10 +281,6 @@ export const Sidebar = () => {
                                     openDelay: 500,
                                 }}
                                 variant="default"
-                                onClick={(e) => {
-                                    e.stopPropagation();
-                                    setSideBar({ image: false });
-                                }}
                             >
                                 <RiArrowDownSLine
                                     color="white"
diff --git a/src/renderer/features/similar-songs/components/similar-songs-list.tsx b/src/renderer/features/similar-songs/components/similar-songs-list.tsx
index db0e7a76..3a5c5438 100644
--- a/src/renderer/features/similar-songs/components/similar-songs-list.tsx
+++ b/src/renderer/features/similar-songs/components/similar-songs-list.tsx
@@ -1,17 +1,18 @@
-import { ErrorBoundary } from 'react-error-boundary';
-import { VirtualGridAutoSizerContainer } from '/@/renderer/components/virtual-grid';
-import { VirtualTable, getColumnDefs } from '/@/renderer/components/virtual-table';
-import { ErrorFallback } from '/@/renderer/features/action-required';
-import { useSimilarSongs } from '/@/renderer/features/similar-songs/queries/similar-song-queries';
-import { usePlayButtonBehavior, useTableSettings } from '/@/renderer/store';
-import { useMemo, useRef } from 'react';
+import { RowDoubleClickedEvent } from '@ag-grid-community/core';
 import { AgGridReact } from '@ag-grid-community/react';
+import { useMemo, useRef } from 'react';
+import { ErrorBoundary } from 'react-error-boundary';
+
 import { LibraryItem, Song } from '/@/renderer/api/types';
+import { Spinner } from '/@/renderer/components';
+import { VirtualGridAutoSizerContainer } from '/@/renderer/components/virtual-grid';
+import { getColumnDefs, VirtualTable } from '/@/renderer/components/virtual-table';
+import { ErrorFallback } from '/@/renderer/features/action-required';
 import { useHandleTableContextMenu } from '/@/renderer/features/context-menu';
 import { SONG_CONTEXT_MENU_ITEMS } from '/@/renderer/features/context-menu/context-menu-items';
-import { Spinner } from '/@/renderer/components';
-import { RowDoubleClickedEvent } from '@ag-grid-community/core';
 import { useHandlePlayQueueAdd } from '/@/renderer/features/player/hooks/use-handle-playqueue-add';
+import { useSimilarSongs } from '/@/renderer/features/similar-songs/queries/similar-song-queries';
+import { usePlayButtonBehavior, useTableSettings } from '/@/renderer/store';
 
 export type SimilarSongsListProps = {
     count?: number;
@@ -60,8 +61,6 @@ export const SimilarSongsList = ({ count, fullScreen, song }: SimilarSongsListPr
         <ErrorBoundary FallbackComponent={ErrorFallback}>
             <VirtualGridAutoSizerContainer>
                 <VirtualTable
-                    ref={tableRef}
-                    shouldUpdateSong
                     autoFitColumns={tableConfig.autoFit}
                     columnDefs={columnDefs}
                     context={{
@@ -72,11 +71,13 @@ export const SimilarSongsList = ({ count, fullScreen, song }: SimilarSongsListPr
                     }}
                     deselectOnClickOutside={fullScreen}
                     getRowId={(data) => data.data.uniqueId}
+                    onCellContextMenu={onCellContextMenu}
+                    onCellDoubleClicked={handleRowDoubleClick}
+                    ref={tableRef}
                     rowBuffer={50}
                     rowData={songQuery.data ?? []}
                     rowHeight={tableConfig.rowHeight || 40}
-                    onCellContextMenu={onCellContextMenu}
-                    onCellDoubleClicked={handleRowDoubleClick}
+                    shouldUpdateSong
                 />
             </VirtualGridAutoSizerContainer>
         </ErrorBoundary>
diff --git a/src/renderer/features/similar-songs/queries/similar-song-queries.tsx b/src/renderer/features/similar-songs/queries/similar-song-queries.tsx
index c09993f7..bd672d74 100644
--- a/src/renderer/features/similar-songs/queries/similar-song-queries.tsx
+++ b/src/renderer/features/similar-songs/queries/similar-song-queries.tsx
@@ -1,9 +1,10 @@
 import { useQuery } from '@tanstack/react-query';
+
+import { api } from '/@/renderer/api';
+import { queryKeys } from '/@/renderer/api/query-keys';
 import { SimilarSongsQuery } from '/@/renderer/api/types';
 import { QueryHookArgs } from '/@/renderer/lib/react-query';
 import { getServerById } from '/@/renderer/store';
-import { queryKeys } from '/@/renderer/api/query-keys';
-import { api } from '/@/renderer/api';
 
 export const useSimilarSongs = (args: QueryHookArgs<SimilarSongsQuery>) => {
     const { options, query, serverId } = args || {};
diff --git a/src/renderer/features/songs/components/jellyfin-song-filters.tsx b/src/renderer/features/songs/components/jellyfin-song-filters.tsx
index 010362a6..a80a0c8e 100644
--- a/src/renderer/features/songs/components/jellyfin-song-filters.tsx
+++ b/src/renderer/features/songs/components/jellyfin-song-filters.tsx
@@ -1,13 +1,14 @@
-import { ChangeEvent, useMemo } from 'react';
 import { Divider, Group, Stack } from '@mantine/core';
 import debounce from 'lodash/debounce';
+import { ChangeEvent, useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
+
 import { GenreListSort, LibraryItem, SongListQuery, SortOrder } from '/@/renderer/api/types';
 import { NumberInput, Switch, Text } from '/@/renderer/components';
-import { SongListFilter, useListFilterByKey, useListStoreActions } from '/@/renderer/store';
-import { useTranslation } from 'react-i18next';
-import { useTagList } from '/@/renderer/features/tag/queries/use-tag-list';
-import { useGenreList } from '/@/renderer/features/genres';
 import { MultiSelectWithInvalidData } from '/@/renderer/components/select-with-invalid-data';
+import { useGenreList } from '/@/renderer/features/genres';
+import { useTagList } from '/@/renderer/features/tag/queries/use-tag-list';
+import { SongListFilter, useListFilterByKey, useListStoreActions } from '/@/renderer/store';
 
 interface JellyfinSongFiltersProps {
     customFilters?: Partial<SongListFilter>;
@@ -18,8 +19,8 @@ interface JellyfinSongFiltersProps {
 
 export const JellyfinSongFilters = ({
     customFilters,
-    pageKey,
     onFilterChange,
+    pageKey,
     serverId,
 }: JellyfinSongFiltersProps) => {
     const { t } = useTranslation();
@@ -188,28 +189,28 @@ export const JellyfinSongFilters = ({
                     label={t('filter.fromYear', { postProcess: 'sentenceCase' })}
                     max={2300}
                     min={1700}
-                    required={!!filter?.minYear}
                     onChange={handleMinYearFilter}
+                    required={!!filter?.minYear}
                 />
                 <NumberInput
                     defaultValue={filter?.maxYear}
                     label={t('filter.toYear', { postProcess: 'sentenceCase' })}
                     max={2300}
                     min={1700}
-                    required={!!filter?.minYear}
                     onChange={handleMaxYearFilter}
+                    required={!!filter?.minYear}
                 />
             </Group>
             {!isGenrePage && (
                 <Group grow>
                     <MultiSelectWithInvalidData
                         clearable
-                        searchable
                         data={genreList}
                         defaultValue={selectedGenres}
                         label={t('entity.genre', { count: 1, postProcess: 'sentenceCase' })}
-                        width={250}
                         onChange={handleGenresFilter}
+                        searchable
+                        width={250}
                     />
                 </Group>
             )}
@@ -217,12 +218,12 @@ export const JellyfinSongFilters = ({
                 <Group grow>
                     <MultiSelectWithInvalidData
                         clearable
-                        searchable
                         data={tagsQuery.data.boolTags}
                         defaultValue={selectedTags}
                         label={t('common.tags', { postProcess: 'sentenceCase' })}
-                        width={250}
                         onChange={handleTagFilter}
+                        searchable
+                        width={250}
                     />
                 </Group>
             )}
diff --git a/src/renderer/features/songs/components/navidrome-song-filters.tsx b/src/renderer/features/songs/components/navidrome-song-filters.tsx
index ee542c3a..7c86888e 100644
--- a/src/renderer/features/songs/components/navidrome-song-filters.tsx
+++ b/src/renderer/features/songs/components/navidrome-song-filters.tsx
@@ -1,13 +1,14 @@
-import { ChangeEvent, useMemo } from 'react';
 import { Divider, Group, Stack } from '@mantine/core';
 import debounce from 'lodash/debounce';
+import { ChangeEvent, useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
+
 import { GenreListSort, LibraryItem, SongListQuery, SortOrder } from '/@/renderer/api/types';
 import { NumberInput, Switch, Text } from '/@/renderer/components';
-import { useGenreList } from '/@/renderer/features/genres';
-import { SongListFilter, useListFilterByKey, useListStoreActions } from '/@/renderer/store';
-import { useTranslation } from 'react-i18next';
-import { useTagList } from '/@/renderer/features/tag/queries/use-tag-list';
 import { SelectWithInvalidData } from '/@/renderer/components/select-with-invalid-data';
+import { useGenreList } from '/@/renderer/features/genres';
+import { useTagList } from '/@/renderer/features/tag/queries/use-tag-list';
+import { SongListFilter, useListFilterByKey, useListStoreActions } from '/@/renderer/store';
 
 interface NavidromeSongFiltersProps {
     customFilters?: Partial<SongListFilter>;
@@ -52,7 +53,7 @@ export const NavidromeSongFilters = ({
         }));
     }, [genreListQuery.data]);
 
-    const handleGenresFilter = debounce((e: string | null) => {
+    const handleGenresFilter = debounce((e: null | string) => {
         const updatedFilters = setFilter({
             customFilters,
             data: {
@@ -66,7 +67,7 @@ export const NavidromeSongFilters = ({
         onFilterChange(updatedFilters);
     }, 250);
 
-    const handleTagFilter = debounce((tag: string, e: string | null) => {
+    const handleTagFilter = debounce((tag: string, e: null | string) => {
         const updatedFilters = setFilter({
             customFilters,
             data: {
@@ -134,8 +135,8 @@ export const NavidromeSongFilters = ({
                     <Text>{filter.label}</Text>
                     <Switch
                         checked={filter?.value || false}
-                        size="xs"
                         onChange={filter.onChange}
+                        size="xs"
                     />
                 </Group>
             ))}
@@ -145,38 +146,38 @@ export const NavidromeSongFilters = ({
                     label={t('common.year', { postProcess: 'titleCase' })}
                     max={5000}
                     min={0}
+                    onChange={(e) => handleYearFilter(e)}
                     value={filter._custom?.navidrome?.year}
                     width={50}
-                    onChange={(e) => handleYearFilter(e)}
                 />
                 {!isGenrePage && (
                     <SelectWithInvalidData
                         clearable
-                        searchable
                         data={genreList}
                         defaultValue={filter.genreIds ? filter.genreIds[0] : undefined}
                         label={t('entity.genre', { count: 1, postProcess: 'titleCase' })}
-                        width={150}
                         onChange={handleGenresFilter}
+                        searchable
+                        width={150}
                     />
                 )}
             </Group>
             {tagsQuery.data?.enumTags?.length &&
                 tagsQuery.data.enumTags.map((tag) => (
                     <Group
-                        key={tag.name}
                         grow
+                        key={tag.name}
                     >
                         <SelectWithInvalidData
                             clearable
-                            searchable
                             data={tag.options}
                             defaultValue={
                                 filter._custom?.navidrome?.[tag.name] as string | undefined
                             }
                             label={tag.name}
-                            width={150}
                             onChange={(value) => handleTagFilter(tag.name, value)}
+                            searchable
+                            width={150}
                         />
                     </Group>
                 ))}
diff --git a/src/renderer/features/songs/components/song-list-content.tsx b/src/renderer/features/songs/components/song-list-content.tsx
index af04a9f5..6cb2e3b4 100644
--- a/src/renderer/features/songs/components/song-list-content.tsx
+++ b/src/renderer/features/songs/components/song-list-content.tsx
@@ -1,10 +1,12 @@
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
+
 import { lazy, MutableRefObject, Suspense } from 'react';
+
 import { Spinner } from '/@/renderer/components';
+import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid';
 import { useListContext } from '/@/renderer/context/list-context';
 import { useListStoreByKey } from '/@/renderer/store';
 import { ListDisplayType } from '/@/renderer/types';
-import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid';
 
 const SongListTableView = lazy(() =>
     import('/@/renderer/features/songs/components/song-list-table-view').then((module) => ({
@@ -19,12 +21,12 @@ const SongListGridView = lazy(() =>
 );
 
 interface SongListContentProps {
-    gridRef: MutableRefObject<VirtualInfiniteGridRef | null>;
+    gridRef: MutableRefObject<null | VirtualInfiniteGridRef>;
     itemCount?: number;
     tableRef: MutableRefObject<AgGridReactType | null>;
 }
 
-export const SongListContent = ({ itemCount, gridRef, tableRef }: SongListContentProps) => {
+export const SongListContent = ({ gridRef, itemCount, tableRef }: SongListContentProps) => {
     const { pageKey } = useListContext();
     const { display } = useListStoreByKey({ key: pageKey });
 
diff --git a/src/renderer/features/songs/components/song-list-grid-view.tsx b/src/renderer/features/songs/components/song-list-grid-view.tsx
index 679182af..98f21acc 100644
--- a/src/renderer/features/songs/components/song-list-grid-view.tsx
+++ b/src/renderer/features/songs/components/song-list-grid-view.tsx
@@ -3,6 +3,7 @@ import { MutableRefObject, useCallback, useEffect, useMemo } from 'react';
 import { useSearchParams } from 'react-router-dom';
 import AutoSizer, { Size } from 'react-virtualized-auto-sizer';
 import { ListOnScrollProps } from 'react-window';
+
 import { controller } from '/@/renderer/api/controller';
 import { queryKeys } from '/@/renderer/api/query-keys';
 import {
@@ -20,14 +21,14 @@ import {
 } from '/@/renderer/components/virtual-grid';
 import { useListContext } from '/@/renderer/context/list-context';
 import { usePlayQueueAdd } from '/@/renderer/features/player';
+import { useHandleFavorite } from '/@/renderer/features/shared/hooks/use-handle-favorite';
 import { AppRoute } from '/@/renderer/router/routes';
 import { useCurrentServer, useListStoreActions, useListStoreByKey } from '/@/renderer/store';
-import { CardRow, ListDisplayType } from '/@/renderer/types';
-import { useHandleFavorite } from '/@/renderer/features/shared/hooks/use-handle-favorite';
 import { useEventStore } from '/@/renderer/store/event.store';
+import { CardRow, ListDisplayType } from '/@/renderer/types';
 
 interface SongListGridViewProps {
-    gridRef: MutableRefObject<VirtualInfiniteGridRef | null>;
+    gridRef: MutableRefObject<null | VirtualInfiniteGridRef>;
     itemCount?: number;
 }
 
@@ -35,8 +36,8 @@ export const SongListGridView = ({ gridRef, itemCount }: SongListGridViewProps)
     const queryClient = useQueryClient();
     const server = useCurrentServer();
     const handlePlayQueueAdd = usePlayQueueAdd();
-    const { pageKey, customFilters, id } = useListContext();
-    const { grid, display, filter } = useListStoreByKey<SongListQuery>({ key: pageKey });
+    const { customFilters, id, pageKey } = useListContext();
+    const { display, filter, grid } = useListStoreByKey<SongListQuery>({ key: pageKey });
     const { setGrid } = useListStoreActions();
 
     const [searchParams, setSearchParams] = useSearchParams();
@@ -201,8 +202,6 @@ export const SongListGridView = ({ gridRef, itemCount }: SongListGridViewProps)
             <AutoSizer>
                 {({ height, width }: Size) => (
                     <VirtualInfiniteGrid
-                        key={`song-list-${server?.id}-${display}`}
-                        ref={gridRef}
                         cardRows={cardRows}
                         display={display || ListDisplayType.CARD}
                         fetchFn={fetch}
@@ -215,14 +214,16 @@ export const SongListGridView = ({ gridRef, itemCount }: SongListGridViewProps)
                         itemGap={grid?.itemGap ?? 10}
                         itemSize={grid?.itemSize || 200}
                         itemType={LibraryItem.SONG}
+                        key={`song-list-${server?.id}-${display}`}
                         loading={itemCount === undefined || itemCount === null}
                         minimumBatchSize={40}
+                        onScroll={handleGridScroll}
+                        ref={gridRef}
                         route={{
                             route: AppRoute.LIBRARY_ALBUMS_DETAIL,
                             slugs: [{ idProperty: 'albumId', slugProperty: 'albumId' }],
                         }}
                         width={width}
-                        onScroll={handleGridScroll}
                     />
                 )}
             </AutoSizer>
diff --git a/src/renderer/features/songs/components/song-list-header-filters.tsx b/src/renderer/features/songs/components/song-list-header-filters.tsx
index c2d46d23..5f52db12 100644
--- a/src/renderer/features/songs/components/song-list-header-filters.tsx
+++ b/src/renderer/features/songs/components/song-list-header-filters.tsx
@@ -1,7 +1,8 @@
-import { ChangeEvent, MouseEvent, MutableRefObject, useCallback, useMemo } from 'react';
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
+
 import { Divider, Flex, Group, Stack } from '@mantine/core';
 import { openModal } from '@mantine/modals';
+import { ChangeEvent, MouseEvent, MutableRefObject, useCallback, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import {
     RiAddBoxFill,
@@ -13,7 +14,10 @@ import {
     RiRefreshLine,
     RiSettings3Fill,
 } from 'react-icons/ri';
+
 import { useListStoreByKey } from '../../../store/list.store';
+
+import i18n from '/@/i18n/i18n';
 import { queryKeys } from '/@/renderer/api/query-keys';
 import {
     LibraryItem,
@@ -29,13 +33,12 @@ import { useListContext } from '/@/renderer/context/list-context';
 import { OrderToggleButton, useMusicFolders } from '/@/renderer/features/shared';
 import { JellyfinSongFilters } from '/@/renderer/features/songs/components/jellyfin-song-filters';
 import { NavidromeSongFilters } from '/@/renderer/features/songs/components/navidrome-song-filters';
+import { SubsonicSongFilters } from '/@/renderer/features/songs/components/subsonic-song-filter';
 import { useContainerQuery } from '/@/renderer/hooks';
 import { useListFilterRefresh } from '/@/renderer/hooks/use-list-filter-refresh';
 import { queryClient } from '/@/renderer/lib/react-query';
 import { SongListFilter, useCurrentServer, useListStoreActions } from '/@/renderer/store';
 import { ListDisplayType, Play, TableColumn } from '/@/renderer/types';
-import i18n from '/@/i18n/i18n';
-import { SubsonicSongFilters } from '/@/renderer/features/songs/components/subsonic-song-filter';
 
 const FILTERS = {
     jellyfin: [
@@ -182,7 +185,7 @@ const FILTERS = {
 };
 
 interface SongListHeaderFiltersProps {
-    gridRef: MutableRefObject<VirtualInfiniteGridRef | null>;
+    gridRef: MutableRefObject<null | VirtualInfiniteGridRef>;
     itemCount?: number;
     tableRef: MutableRefObject<AgGridReactType | null>;
 }
@@ -194,16 +197,16 @@ export const SongListHeaderFilters = ({
 }: SongListHeaderFiltersProps) => {
     const { t } = useTranslation();
     const server = useCurrentServer();
-    const { pageKey, handlePlay, customFilters } = useListContext();
-    const { display, table, filter, grid } = useListStoreByKey<SongListQuery>({
+    const { customFilters, handlePlay, pageKey } = useListContext();
+    const { display, filter, grid, table } = useListStoreByKey<SongListQuery>({
         filter: customFilters,
         key: pageKey,
     });
 
-    const { setFilter, setGrid, setTable, setTablePagination, setDisplayType } =
+    const { setDisplayType, setFilter, setGrid, setTable, setTablePagination } =
         useListStoreActions();
 
-    const { handleRefreshTable, handleRefreshGrid } = useListFilterRefresh({
+    const { handleRefreshGrid, handleRefreshTable } = useListFilterRefresh({
         itemCount,
         itemType: LibraryItem.SONG,
         server,
@@ -416,12 +419,12 @@ export const SongListHeaderFilters = ({
         let FilterComponent;
 
         switch (server?.type) {
-            case ServerType.NAVIDROME:
-                FilterComponent = NavidromeSongFilters;
-                break;
             case ServerType.JELLYFIN:
                 FilterComponent = JellyfinSongFilters;
                 break;
+            case ServerType.NAVIDROME:
+                FilterComponent = NavidromeSongFilters;
+                break;
             case ServerType.SUBSONIC:
                 FilterComponent = SubsonicSongFilters;
                 break;
@@ -435,9 +438,9 @@ export const SongListHeaderFilters = ({
             children: (
                 <FilterComponent
                     customFilters={customFilters}
+                    onFilterChange={onFilterChange}
                     pageKey={pageKey}
                     serverId={server?.id}
-                    onFilterChange={onFilterChange}
                 />
             ),
             title: 'Song Filters',
@@ -493,10 +496,10 @@ export const SongListHeaderFilters = ({
                     <DropdownMenu.Dropdown>
                         {FILTERS[server?.type as keyof typeof FILTERS].map((f) => (
                             <DropdownMenu.Item
-                                key={`filter-${f.name}`}
                                 $isActive={f.value === filter.sortBy}
-                                value={f.value}
+                                key={`filter-${f.name}`}
                                 onClick={handleSetSortBy}
+                                value={f.value}
                             >
                                 {f.name}
                             </DropdownMenu.Item>
@@ -507,8 +510,8 @@ export const SongListHeaderFilters = ({
                     <>
                         <Divider orientation="vertical" />
                         <OrderToggleButton
-                            sortOrder={filter.sortOrder}
                             onToggle={handleToggleSortOrder}
+                            sortOrder={filter.sortOrder}
                         />
                     </>
                 )}
@@ -536,10 +539,10 @@ export const SongListHeaderFilters = ({
                             <DropdownMenu.Dropdown>
                                 {musicFoldersQuery.data?.items.map((folder) => (
                                     <DropdownMenu.Item
-                                        key={`musicFolder-${folder.id}`}
                                         $isActive={filter.musicFolderId === folder.id}
-                                        value={folder.id}
+                                        key={`musicFolder-${folder.id}`}
                                         onClick={handleSetMusicFolder}
+                                        value={folder.id}
                                     >
                                         {folder.name}
                                     </DropdownMenu.Item>
@@ -551,6 +554,7 @@ export const SongListHeaderFilters = ({
                 <Divider orientation="vertical" />
                 <Button
                     compact
+                    onClick={handleOpenFiltersModal}
                     size="md"
                     sx={{
                         svg: {
@@ -559,17 +563,16 @@ export const SongListHeaderFilters = ({
                     }}
                     tooltip={{ label: t('common.filters', { postProcess: 'titleCase' }) }}
                     variant="subtle"
-                    onClick={handleOpenFiltersModal}
                 >
                     <RiFilterFill size="1.3rem" />
                 </Button>
                 <Divider orientation="vertical" />
                 <Button
                     compact
+                    onClick={handleRefresh}
                     size="md"
                     tooltip={{ label: t('common.refresh', { postProcess: 'titleCase' }) }}
                     variant="subtle"
-                    onClick={handleRefresh}
                 >
                     <RiRefreshLine size="1.3rem" />
                 </Button>
@@ -637,22 +640,22 @@ export const SongListHeaderFilters = ({
                         </DropdownMenu.Label>
                         <DropdownMenu.Item
                             $isActive={display === ListDisplayType.CARD}
-                            value={ListDisplayType.CARD}
                             onClick={handleSetViewType}
+                            value={ListDisplayType.CARD}
                         >
                             {t('table.config.view.card', { postProcess: 'sentenceCase' })}
                         </DropdownMenu.Item>
                         <DropdownMenu.Item
                             $isActive={display === ListDisplayType.POSTER}
-                            value={ListDisplayType.POSTER}
                             onClick={handleSetViewType}
+                            value={ListDisplayType.POSTER}
                         >
                             {t('table.config.view.poster', { postProcess: 'sentenceCase' })}
                         </DropdownMenu.Item>
                         <DropdownMenu.Item
                             $isActive={display === ListDisplayType.TABLE}
-                            value={ListDisplayType.TABLE}
                             onClick={handleSetViewType}
+                            value={ListDisplayType.TABLE}
                         >
                             {t('table.config.view.table', { postProcess: 'sentenceCase' })}
                         </DropdownMenu.Item>
@@ -707,8 +710,8 @@ export const SongListHeaderFilters = ({
                                     clearable
                                     data={SONG_TABLE_COLUMNS}
                                     defaultValue={table?.columns.map((column) => column.column)}
-                                    width={300}
                                     onChange={handleTableColumns}
+                                    width={300}
                                 />
                                 <Group position="apart">
                                     <Text>
diff --git a/src/renderer/features/songs/components/song-list-header.tsx b/src/renderer/features/songs/components/song-list-header.tsx
index 055d3ce8..ac48198a 100644
--- a/src/renderer/features/songs/components/song-list-header.tsx
+++ b/src/renderer/features/songs/components/song-list-header.tsx
@@ -1,21 +1,23 @@
-import { ChangeEvent, MutableRefObject, useEffect, useRef } from 'react';
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
+
 import { Flex, Group, Stack } from '@mantine/core';
 import debounce from 'lodash/debounce';
+import { ChangeEvent, MutableRefObject, useEffect, useRef } from 'react';
 import { useTranslation } from 'react-i18next';
+
 import { LibraryItem, SongListQuery } from '/@/renderer/api/types';
 import { PageHeader, SearchInput } from '/@/renderer/components';
+import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid';
 import { FilterBar, LibraryHeaderBar } from '/@/renderer/features/shared';
 import { SongListHeaderFilters } from '/@/renderer/features/songs/components/song-list-header-filters';
 import { useContainerQuery } from '/@/renderer/hooks';
+import { useDisplayRefresh } from '/@/renderer/hooks/use-display-refresh';
 import { SongListFilter, useCurrentServer } from '/@/renderer/store';
 import { usePlayButtonBehavior } from '/@/renderer/store/settings.store';
-import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid';
-import { useDisplayRefresh } from '/@/renderer/hooks/use-display-refresh';
 
 interface SongListHeaderProps {
     genreId?: string;
-    gridRef: MutableRefObject<VirtualInfiniteGridRef | null>;
+    gridRef: MutableRefObject<null | VirtualInfiniteGridRef>;
     itemCount?: number;
     tableRef: MutableRefObject<AgGridReactType | null>;
     title?: string;
@@ -24,9 +26,9 @@ interface SongListHeaderProps {
 export const SongListHeader = ({
     genreId,
     gridRef,
-    title,
     itemCount,
     tableRef,
+    title,
 }: SongListHeaderProps) => {
     const { t } = useTranslation();
     const server = useCurrentServer();
@@ -90,8 +92,8 @@ export const SongListHeader = ({
                     <Group>
                         <SearchInput
                             defaultValue={filter.searchTerm}
-                            openedWidth={cq.isMd ? 250 : cq.isSm ? 200 : 150}
                             onChange={handleSearch}
+                            openedWidth={cq.isMd ? 250 : cq.isSm ? 200 : 150}
                         />
                     </Group>
                 </Flex>
diff --git a/src/renderer/features/songs/components/song-list-table-view.tsx b/src/renderer/features/songs/components/song-list-table-view.tsx
index ff498dd3..4574529c 100644
--- a/src/renderer/features/songs/components/song-list-table-view.tsx
+++ b/src/renderer/features/songs/components/song-list-table-view.tsx
@@ -1,6 +1,8 @@
-import { RowDoubleClickedEvent } from '@ag-grid-community/core';
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
+
+import { RowDoubleClickedEvent } from '@ag-grid-community/core';
 import { MutableRefObject } from 'react';
+
 import { LibraryItem, QueueSong, SongListQuery } from '/@/renderer/api/types';
 import { VirtualGridAutoSizerContainer } from '/@/renderer/components/virtual-grid';
 import { VirtualTable } from '/@/renderer/components/virtual-table';
@@ -21,9 +23,9 @@ interface SongListTableViewProps {
     tableRef: MutableRefObject<AgGridReactType | null>;
 }
 
-export const SongListTableView = ({ tableRef, itemCount }: SongListTableViewProps) => {
+export const SongListTableView = ({ itemCount, tableRef }: SongListTableViewProps) => {
     const server = useCurrentServer();
-    const { pageKey, id, handlePlay, customFilters } = useListContext();
+    const { customFilters, handlePlay, id, pageKey } = useListContext();
     const isFocused = useAppFocus();
     const currentSong = useCurrentSong();
     const status = useCurrentStatus();
@@ -56,15 +58,15 @@ export const SongListTableView = ({ tableRef, itemCount }: SongListTableViewProp
                 key={`table-${tableProps.rowHeight}-${server?.id}`}
                 ref={tableRef}
                 {...tableProps}
-                shouldUpdateSong
                 context={{
                     ...tableProps.context,
                     currentSong,
                     isFocused,
                     status,
                 }}
-                rowClassRules={rowClassRules}
                 onRowDoubleClicked={handleRowDoubleClick}
+                rowClassRules={rowClassRules}
+                shouldUpdateSong
             />
         </VirtualGridAutoSizerContainer>
     );
diff --git a/src/renderer/features/songs/components/subsonic-song-filter.tsx b/src/renderer/features/songs/components/subsonic-song-filter.tsx
index fae5546b..a29f67d8 100644
--- a/src/renderer/features/songs/components/subsonic-song-filter.tsx
+++ b/src/renderer/features/songs/components/subsonic-song-filter.tsx
@@ -1,11 +1,12 @@
-import { ChangeEvent, useMemo } from 'react';
 import { Divider, Group, Stack } from '@mantine/core';
 import debounce from 'lodash/debounce';
+import { ChangeEvent, useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
+
 import { GenreListSort, LibraryItem, SongListQuery, SortOrder } from '/@/renderer/api/types';
 import { Select, Switch, Text } from '/@/renderer/components';
 import { useGenreList } from '/@/renderer/features/genres';
 import { SongListFilter, useListFilterByKey, useListStoreActions } from '/@/renderer/store';
-import { useTranslation } from 'react-i18next';
 
 interface SubsonicSongFiltersProps {
     customFilters?: Partial<SongListFilter>;
@@ -43,7 +44,7 @@ export const SubsonicSongFilters = ({
         }));
     }, [genreListQuery.data]);
 
-    const handleGenresFilter = debounce((e: string | null) => {
+    const handleGenresFilter = debounce((e: null | string) => {
         const updatedFilters = setFilter({
             customFilters,
             data: {
@@ -87,8 +88,8 @@ export const SubsonicSongFilters = ({
                     <Switch
                         checked={filter?.value || false}
                         disabled={filter.disabled}
-                        size="xs"
                         onChange={filter.onChange}
+                        size="xs"
                     />
                 </Group>
             ))}
@@ -97,13 +98,13 @@ export const SubsonicSongFilters = ({
                 {!isGenrePage && (
                     <Select
                         clearable
-                        searchable
                         data={genreList}
                         defaultValue={filter.genreIds ? filter.genreIds[0] : undefined}
                         disabled={!!filter.searchTerm}
                         label={t('entity.genre', { count: 1, postProcess: 'titleCase' })}
-                        width={150}
                         onChange={handleGenresFilter}
+                        searchable
+                        width={150}
                     />
                 )}
             </Group>
diff --git a/src/renderer/features/songs/queries/song-list-count-query.ts b/src/renderer/features/songs/queries/song-list-count-query.ts
index 849708a6..0631925f 100644
--- a/src/renderer/features/songs/queries/song-list-count-query.ts
+++ b/src/renderer/features/songs/queries/song-list-count-query.ts
@@ -1,8 +1,10 @@
-import { useQuery } from '@tanstack/react-query';
-import { api } from '/@/renderer/api';
-import { queryKeys } from '/@/renderer/api/query-keys';
 import type { SongListQuery } from '/@/renderer/api/types';
 import type { QueryHookArgs } from '/@/renderer/lib/react-query';
+
+import { useQuery } from '@tanstack/react-query';
+
+import { api } from '/@/renderer/api';
+import { queryKeys } from '/@/renderer/api/query-keys';
 import { getServerById } from '/@/renderer/store';
 
 export const useSongListCount = (args: QueryHookArgs<SongListQuery>) => {
diff --git a/src/renderer/features/songs/queries/song-list-query.ts b/src/renderer/features/songs/queries/song-list-query.ts
index c63d06c5..5ed9f414 100644
--- a/src/renderer/features/songs/queries/song-list-query.ts
+++ b/src/renderer/features/songs/queries/song-list-query.ts
@@ -1,12 +1,14 @@
-import { useQuery } from '@tanstack/react-query';
-import { controller } from '/@/renderer/api/controller';
-import { queryKeys } from '/@/renderer/api/query-keys';
 import type { SongListQuery } from '/@/renderer/api/types';
-import { getServerById } from '/@/renderer/store';
 import type { QueryHookArgs } from '/@/renderer/lib/react-query';
 
+import { useQuery } from '@tanstack/react-query';
+
+import { controller } from '/@/renderer/api/controller';
+import { queryKeys } from '/@/renderer/api/query-keys';
+import { getServerById } from '/@/renderer/store';
+
 export const useSongList = (args: QueryHookArgs<SongListQuery>, imageSize?: number) => {
-    const { query, options, serverId } = args || {};
+    const { options, query, serverId } = args || {};
     const server = getServerById(serverId);
 
     return useQuery({
diff --git a/src/renderer/features/songs/routes/song-list-route.tsx b/src/renderer/features/songs/routes/song-list-route.tsx
index 3fb4e2f4..8508adc3 100644
--- a/src/renderer/features/songs/routes/song-list-route.tsx
+++ b/src/renderer/features/songs/routes/song-list-route.tsx
@@ -1,8 +1,10 @@
-import { useCallback, useMemo, useRef } from 'react';
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
+
 import isEmpty from 'lodash/isEmpty';
+import { useCallback, useMemo, useRef } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useParams, useSearchParams } from 'react-router-dom';
+
 import { GenreListSort, LibraryItem, SongListQuery, SortOrder } from '/@/renderer/api/types';
 import { ListContext } from '/@/renderer/context/list-context';
 import { useGenreList } from '/@/renderer/features/genres';
@@ -10,15 +12,15 @@ import { usePlayQueueAdd } from '/@/renderer/features/player';
 import { AnimatedPage } from '/@/renderer/features/shared';
 import { SongListContent } from '/@/renderer/features/songs/components/song-list-content';
 import { SongListHeader } from '/@/renderer/features/songs/components/song-list-header';
+import { useSongListCount } from '/@/renderer/features/songs/queries/song-list-count-query';
 import { useCurrentServer, useListFilterByKey } from '/@/renderer/store';
 import { Play } from '/@/renderer/types';
 import { sentenceCase, titleCase } from '/@/renderer/utils';
 import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid';
-import { useSongListCount } from '/@/renderer/features/songs/queries/song-list-count-query';
 
 const TrackListRoute = () => {
     const { t } = useTranslation();
-    const gridRef = useRef<VirtualInfiniteGridRef | null>(null);
+    const gridRef = useRef<null | VirtualInfiniteGridRef>(null);
     const tableRef = useRef<AgGridReactType | null>(null);
     const server = useCurrentServer();
     const [searchParams] = useSearchParams();
diff --git a/src/renderer/features/tag/queries/use-tag-list.ts b/src/renderer/features/tag/queries/use-tag-list.ts
index 488af5f1..fe4229ad 100644
--- a/src/renderer/features/tag/queries/use-tag-list.ts
+++ b/src/renderer/features/tag/queries/use-tag-list.ts
@@ -1,14 +1,15 @@
 import { useQuery } from '@tanstack/react-query';
+
+import { api } from '/@/renderer/api';
+import { ServerFeature } from '/@/renderer/api/features-types';
+import { queryKeys } from '/@/renderer/api/query-keys';
+import { TagQuery } from '/@/renderer/api/types';
+import { hasFeature } from '/@/renderer/api/utils';
 import { QueryHookArgs } from '/@/renderer/lib/react-query';
 import { getServerById } from '/@/renderer/store';
-import { api } from '/@/renderer/api';
-import { queryKeys } from '/@/renderer/api/query-keys';
-import { hasFeature } from '/@/renderer/api/utils';
-import { ServerFeature } from '/@/renderer/api/features-types';
-import { TagQuery } from '/@/renderer/api/types';
 
 export const useTagList = (args: QueryHookArgs<TagQuery>) => {
-    const { query, options, serverId } = args || {};
+    const { options, query, serverId } = args || {};
     const server = getServerById(serverId);
 
     return useQuery({
diff --git a/src/renderer/features/titlebar/components/app-menu.tsx b/src/renderer/features/titlebar/components/app-menu.tsx
index d145c1ea..8c0649ff 100644
--- a/src/renderer/features/titlebar/components/app-menu.tsx
+++ b/src/renderer/features/titlebar/components/app-menu.tsx
@@ -1,39 +1,41 @@
 import { Group } from '@mantine/core';
-import { openModal, closeAllModals } from '@mantine/modals';
+import { closeAllModals, openModal } from '@mantine/modals';
 import isElectron from 'is-electron';
 import { useTranslation } from 'react-i18next';
 import {
-    RiLockLine,
-    RiWindowFill,
     RiArrowLeftSLine,
     RiArrowRightSLine,
-    RiLayoutRightLine,
-    RiLayoutLeftLine,
-    RiEdit2Line,
-    RiSettings3Line,
-    RiServerLine,
-    RiGithubLine,
-    RiExternalLinkLine,
     RiCloseCircleLine,
+    RiEdit2Line,
+    RiExternalLinkLine,
+    RiGithubLine,
+    RiLayoutLeftLine,
+    RiLayoutRightLine,
+    RiLockLine,
+    RiServerLine,
+    RiSettings3Line,
+    RiWindowFill,
 } from 'react-icons/ri';
 import { useNavigate } from 'react-router';
 import { Link } from 'react-router-dom';
+
+import packageJson from '../../../../../package.json';
+
+import { ServerListItem, ServerType } from '/@/renderer/api/types';
 import { DropdownMenu } from '/@/renderer/components';
 import { ServerList } from '/@/renderer/features/servers';
 import { EditServerForm } from '/@/renderer/features/servers/components/edit-server-form';
 import { AppRoute } from '/@/renderer/router/routes';
 import {
+    useAppStoreActions,
+    useAuthStoreActions,
     useCurrentServer,
     useServerList,
-    useAuthStoreActions,
     useSidebarStore,
-    useAppStoreActions,
 } from '/@/renderer/store';
-import { ServerListItem, ServerType } from '/@/renderer/api/types';
-import packageJson from '../../../../../package.json';
 
-const browser = isElectron() ? window.electron.browser : null;
-const localSettings = isElectron() ? window.electron.localSettings : null;
+const browser = isElectron() ? window.api.browser : null;
+const localSettings = isElectron() ? window.api.localSettings : null;
 
 export const AppMenu = () => {
     const { t } = useTranslation();
@@ -50,7 +52,7 @@ export const AppMenu = () => {
     };
 
     const handleCredentialsModal = async (server: ServerListItem) => {
-        let password: string | null = null;
+        let password: null | string = null;
 
         try {
             if (localSettings && server.savePassword) {
@@ -63,9 +65,9 @@ export const AppMenu = () => {
             children: server && (
                 <EditServerForm
                     isUpdate
+                    onCancel={closeAllModals}
                     password={password}
                     server={server}
-                    onCancel={closeAllModals}
                 />
             ),
             size: 'sm',
@@ -153,7 +155,6 @@ export const AppMenu = () => {
 
                 return (
                     <DropdownMenu.Item
-                        key={`server-${server.id}`}
                         $isActive={server.id === currentServer?.id}
                         icon={
                             isSessionExpired ? (
@@ -162,6 +163,7 @@ export const AppMenu = () => {
                                 <RiServerLine />
                             )
                         }
+                        key={`server-${server.id}`}
                         onClick={() => {
                             if (!isSessionExpired) return handleSetCurrentServer(server);
                             return handleCredentialsModal(server);
diff --git a/src/renderer/features/titlebar/components/titlebar.tsx b/src/renderer/features/titlebar/components/titlebar.tsx
index 4e512e31..8ced5289 100644
--- a/src/renderer/features/titlebar/components/titlebar.tsx
+++ b/src/renderer/features/titlebar/components/titlebar.tsx
@@ -1,6 +1,8 @@
 import type { ReactNode } from 'react';
+
 import { Group } from '@mantine/core';
 import styled from 'styled-components';
+
 import { WindowControls } from '../../window-controls';
 
 interface TitlebarProps {
diff --git a/src/renderer/features/users/queries/user-list-query.ts b/src/renderer/features/users/queries/user-list-query.ts
index 7caef8cc..e4908270 100644
--- a/src/renderer/features/users/queries/user-list-query.ts
+++ b/src/renderer/features/users/queries/user-list-query.ts
@@ -1,12 +1,14 @@
-import { useQuery } from '@tanstack/react-query';
-import { queryKeys } from '/@/renderer/api/query-keys';
 import type { UserListQuery } from '/@/renderer/api/types';
-import { getServerById } from '/@/renderer/store';
-import { api } from '/@/renderer/api';
 import type { QueryHookArgs } from '/@/renderer/lib/react-query';
 
+import { useQuery } from '@tanstack/react-query';
+
+import { api } from '/@/renderer/api';
+import { queryKeys } from '/@/renderer/api/query-keys';
+import { getServerById } from '/@/renderer/store';
+
 export const useUserList = (args: QueryHookArgs<UserListQuery>) => {
-    const { query, serverId, options } = args || {};
+    const { options, query, serverId } = args || {};
     const server = getServerById(serverId);
 
     return useQuery({
diff --git a/src/renderer/features/window-controls/components/window-controls.tsx b/src/renderer/features/window-controls/components/window-controls.tsx
index 6bfd020d..e6a98cf4 100644
--- a/src/renderer/features/window-controls/components/window-controls.tsx
+++ b/src/renderer/features/window-controls/components/window-controls.tsx
@@ -1,12 +1,12 @@
-import { useState } from 'react';
 import isElectron from 'is-electron';
+import { useState } from 'react';
 import { RiCheckboxBlankLine, RiCloseLine, RiSubtractLine } from 'react-icons/ri';
 import styled from 'styled-components';
 
-const browser = isElectron() ? window.electron.browser : null;
+const browser = isElectron() ? window.api.browser : null;
 
 interface WindowControlsProps {
-    style?: 'macos' | 'windows' | 'linux';
+    style?: 'linux' | 'macos' | 'windows';
 }
 
 const WindowsButtonGroup = styled.div`
@@ -66,21 +66,21 @@ export const WindowControls = ({ style }: WindowControlsProps) => {
                     {style === 'windows' && (
                         <WindowsButtonGroup>
                             <WindowsButton
-                                role="button"
                                 onClick={handleMinimize}
+                                role="button"
                             >
                                 <RiSubtractLine size={19} />
                             </WindowsButton>
                             <WindowsButton
-                                role="button"
                                 onClick={handleMaximize}
+                                role="button"
                             >
                                 <RiCheckboxBlankLine size={13} />
                             </WindowsButton>
                             <WindowsButton
                                 $exit
-                                role="button"
                                 onClick={handleClose}
+                                role="button"
                             >
                                 <RiCloseLine size={19} />
                             </WindowsButton>
diff --git a/src/renderer/hooks/index.ts b/src/renderer/hooks/index.ts
index 0bc18aeb..ded5edf5 100644
--- a/src/renderer/hooks/index.ts
+++ b/src/renderer/hooks/index.ts
@@ -1,8 +1,8 @@
-export * from './use-theme';
-export * from './use-is-mounted';
-export * from './use-should-pad-titlebar';
+export * from './use-app-focus';
 export * from './use-container-query';
 export * from './use-fast-average-color';
 export * from './use-hide-scrollbar';
-export * from './use-app-focus';
+export * from './use-is-mounted';
 export * from './use-is-overflow';
+export * from './use-should-pad-titlebar';
+export * from './use-theme';
diff --git a/src/renderer/hooks/use-app-focus.ts b/src/renderer/hooks/use-app-focus.ts
index 72e163f8..2d83728f 100644
--- a/src/renderer/hooks/use-app-focus.ts
+++ b/src/renderer/hooks/use-app-focus.ts
@@ -1,6 +1,6 @@
 // From https://learnersbucket.com/examples/interview/usehasfocus-hook-in-react/
 
-import { useState, useEffect } from 'react';
+import { useEffect, useState } from 'react';
 
 export const useAppFocus = () => {
     const [focus, setFocus] = useState(document.hasFocus());
diff --git a/src/renderer/hooks/use-container-query.ts b/src/renderer/hooks/use-container-query.ts
index 3cf02732..dc0b80a4 100644
--- a/src/renderer/hooks/use-container-query.ts
+++ b/src/renderer/hooks/use-container-query.ts
@@ -9,7 +9,7 @@ interface UseContainerQueryProps {
 
 export const useContainerQuery = (props?: UseContainerQueryProps) => {
     const { lg, md, sm, xl } = props || {};
-    const { ref, width, height } = useElementSize();
+    const { height, ref, width } = useElementSize();
 
     const isXs = width >= 0;
     const isSm = width >= (sm || 600);
diff --git a/src/renderer/hooks/use-display-refresh.ts b/src/renderer/hooks/use-display-refresh.ts
index f48b486b..66079dd9 100644
--- a/src/renderer/hooks/use-display-refresh.ts
+++ b/src/renderer/hooks/use-display-refresh.ts
@@ -1,29 +1,31 @@
-import { ChangeEvent, MutableRefObject, useCallback } from 'react';
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
+
+import { ChangeEvent, MutableRefObject, useCallback } from 'react';
+
+import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid';
+import { useListContext } from '/@/renderer/context/list-context';
 import {
     UseHandleListFilterChangeProps,
     useListFilterRefresh,
 } from '/@/renderer/hooks/use-list-filter-refresh';
-import { useListContext } from '/@/renderer/context/list-context';
-import { ListDisplayType } from '/@/renderer/types';
-import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid';
 import { useListStoreActions, useListStoreByKey } from '/@/renderer/store';
+import { ListDisplayType } from '/@/renderer/types';
 
-export type UseDisplayRefreshProps = {
-    gridRef: MutableRefObject<VirtualInfiniteGridRef | null>;
+export type UseDisplayRefreshProps = UseHandleListFilterChangeProps & {
+    gridRef: MutableRefObject<null | VirtualInfiniteGridRef>;
     itemCount?: number;
     tableRef: MutableRefObject<AgGridReactType | null>;
-} & UseHandleListFilterChangeProps;
+};
 
 export const useDisplayRefresh = <TFilter>({
+    gridRef,
     isClientSideSort,
     itemCount,
-    gridRef,
     itemType,
     server,
     tableRef,
 }: UseDisplayRefreshProps) => {
-    const { customFilters, pageKey, handlePlay } = useListContext();
+    const { customFilters, handlePlay, pageKey } = useListContext();
     const { display, filter } = useListStoreByKey<TFilter>({ key: pageKey });
 
     const { handleRefreshGrid, handleRefreshTable } = useListFilterRefresh({
diff --git a/src/renderer/hooks/use-fast-average-color.tsx b/src/renderer/hooks/use-fast-average-color.tsx
index bf4aa04e..8f360189 100644
--- a/src/renderer/hooks/use-fast-average-color.tsx
+++ b/src/renderer/hooks/use-fast-average-color.tsx
@@ -1,13 +1,13 @@
-import { useEffect, useRef, useState } from 'react';
 import { FastAverageColor } from 'fast-average-color';
+import { useEffect, useRef, useState } from 'react';
 
 export const useFastAverageColor = (args: {
     algorithm?: 'dominant' | 'simple' | 'sqrt';
     id?: string;
-    src?: string | null;
+    src?: null | string;
     srcLoaded?: boolean;
 }) => {
-    const { algorithm, src, srcLoaded, id } = args;
+    const { algorithm, id, src, srcLoaded } = args;
     const idRef = useRef<string | undefined>(id);
 
     const [color, setColor] = useState<string | undefined>(undefined);
diff --git a/src/renderer/hooks/use-genre-route.ts b/src/renderer/hooks/use-genre-route.ts
index b321d2c2..ba9496cb 100644
--- a/src/renderer/hooks/use-genre-route.ts
+++ b/src/renderer/hooks/use-genre-route.ts
@@ -1,7 +1,8 @@
-import { useLocation } from 'react-router';
-import { GenreTarget, useSettingsStore } from '/@/renderer/store';
-import { AppRoute } from '/@/renderer/router/routes';
 import { useMemo } from 'react';
+import { useLocation } from 'react-router';
+
+import { AppRoute } from '/@/renderer/router/routes';
+import { GenreTarget, useSettingsStore } from '/@/renderer/store';
 
 const ALBUM_REGEX = /albums$/;
 const SONG_REGEX = /songs$/;
diff --git a/src/renderer/hooks/use-hide-scrollbar.ts b/src/renderer/hooks/use-hide-scrollbar.ts
index 7f3f5712..69bf303c 100644
--- a/src/renderer/hooks/use-hide-scrollbar.ts
+++ b/src/renderer/hooks/use-hide-scrollbar.ts
@@ -1,9 +1,9 @@
-import { useEffect, useState } from 'react';
 import { useTimeout } from '@mantine/hooks';
+import { useEffect, useState } from 'react';
 
 export const useHideScrollbar = (timeout: number) => {
     const [hideScrollbar, setHideScrollbar] = useState(false);
-    const { start, clear } = useTimeout(() => setHideScrollbar(true), timeout);
+    const { clear, start } = useTimeout(() => setHideScrollbar(true), timeout);
 
     // Automatically hide the scrollbar after the timeout duration
     useEffect(() => {
diff --git a/src/renderer/hooks/use-is-overflow.ts b/src/renderer/hooks/use-is-overflow.ts
index a3c0b7d0..f08e8082 100644
--- a/src/renderer/hooks/use-is-overflow.ts
+++ b/src/renderer/hooks/use-is-overflow.ts
@@ -1,7 +1,7 @@
-import { MutableRefObject, useState, useLayoutEffect } from 'react';
+import { MutableRefObject, useLayoutEffect, useState } from 'react';
 
 export const useIsOverflow = (ref: MutableRefObject<HTMLDivElement | null>) => {
-    const [isOverflow, setIsOverflow] = useState<Boolean | undefined>(undefined);
+    const [isOverflow, setIsOverflow] = useState<boolean | undefined>(undefined);
 
     useLayoutEffect(() => {
         const { current } = ref;
diff --git a/src/renderer/hooks/use-list-filter-refresh.ts b/src/renderer/hooks/use-list-filter-refresh.ts
index 0e568a0a..6b9fffe8 100644
--- a/src/renderer/hooks/use-list-filter-refresh.ts
+++ b/src/renderer/hooks/use-list-filter-refresh.ts
@@ -1,27 +1,29 @@
-import { MutableRefObject, useCallback, useMemo } from 'react';
-import { IDatasource } from '@ag-grid-community/core';
 import type { AgGridReact as AgGridReactType } from '@ag-grid-community/react/lib/agGridReact';
+
+import { IDatasource } from '@ag-grid-community/core';
 import { QueryKey, useQueryClient } from '@tanstack/react-query';
+import orderBy from 'lodash/orderBy';
+import { MutableRefObject, useCallback, useMemo } from 'react';
+
 import { api } from '/@/renderer/api';
 import { queryKeys } from '/@/renderer/api/query-keys';
 import { BasePaginatedResponse, LibraryItem, ServerListItem } from '/@/renderer/api/types';
 import { VirtualInfiniteGridRef } from '/@/renderer/components/virtual-grid';
-import orderBy from 'lodash/orderBy';
 
 export interface UseHandleListFilterChangeProps {
     isClientSideSort?: boolean;
     itemCount?: number;
     itemType: LibraryItem;
-    server: ServerListItem | null;
+    server: null | ServerListItem;
 }
 
 const BLOCK_SIZE = 500;
 
 export const useListFilterRefresh = ({
-    server,
+    isClientSideSort,
     itemCount,
     itemType,
-    isClientSideSort,
+    server,
 }: UseHandleListFilterChangeProps) => {
     const queryClient = useQueryClient();
 
@@ -134,7 +136,7 @@ export const useListFilterRefresh = ({
     );
 
     const handleRefreshGrid = useCallback(
-        async (gridRef: MutableRefObject<VirtualInfiniteGridRef | null>, filter: any) => {
+        async (gridRef: MutableRefObject<null | VirtualInfiniteGridRef>, filter: any) => {
             if (!gridRef || !queryKeyFn || !queryFn) {
                 return;
             }
diff --git a/src/renderer/hooks/use-server-authenticated.ts b/src/renderer/hooks/use-server-authenticated.ts
index e8479f93..f4b31300 100644
--- a/src/renderer/hooks/use-server-authenticated.ts
+++ b/src/renderer/hooks/use-server-authenticated.ts
@@ -1,10 +1,11 @@
+import { debounce } from 'lodash';
 import { useCallback, useEffect, useRef, useState } from 'react';
-import { useCurrentServer } from '/@/renderer/store';
-import { AuthState, ServerListItem, ServerType } from '/@/renderer/types';
+
 import { api } from '/@/renderer/api';
 import { SongListSort, SortOrder } from '/@/renderer/api/types';
-import { debounce } from 'lodash';
 import { toast } from '/@/renderer/components';
+import { useCurrentServer } from '/@/renderer/store';
+import { AuthState, ServerListItem, ServerType } from '/@/renderer/types';
 
 export const useServerAuthenticated = () => {
     const priorServerId = useRef<string>();
diff --git a/src/renderer/hooks/use-server-version.ts b/src/renderer/hooks/use-server-version.ts
index 96245e76..fed47401 100644
--- a/src/renderer/hooks/use-server-version.ts
+++ b/src/renderer/hooks/use-server-version.ts
@@ -1,9 +1,10 @@
-import { useEffect } from 'react';
-import { useAuthStoreActions, useCurrentServer } from '/@/renderer/store';
 import { useQuery } from '@tanstack/react-query';
-import { queryKeys } from '/@/renderer/api/query-keys';
-import { controller } from '/@/renderer/api/controller';
 import isEqual from 'lodash/isEqual';
+import { useEffect } from 'react';
+
+import { controller } from '/@/renderer/api/controller';
+import { queryKeys } from '/@/renderer/api/query-keys';
+import { useAuthStoreActions, useCurrentServer } from '/@/renderer/store';
 
 export const useServerVersion = () => {
     const { updateServer } = useAuthStoreActions();
@@ -28,7 +29,7 @@ export const useServerVersion = () => {
         }
 
         if (server?.id === serverInfo.data?.id) {
-            const { version, features } = serverInfo.data || {};
+            const { features, version } = serverInfo.data || {};
             if (version !== server?.version || !isEqual(features, server?.features)) {
                 updateServer(server.id, {
                     features,
diff --git a/src/renderer/hooks/use-should-pad-titlebar.tsx b/src/renderer/hooks/use-should-pad-titlebar.tsx
index b880ce76..9a16c0d5 100644
--- a/src/renderer/hooks/use-should-pad-titlebar.tsx
+++ b/src/renderer/hooks/use-should-pad-titlebar.tsx
@@ -1,7 +1,8 @@
 import isElectron from 'is-electron';
 import { useLocation } from 'react-router';
+
 import { AppRoute } from '/@/renderer/router/routes';
-import { useSidebarRightExpanded, useGeneralSettings, useWindowSettings } from '/@/renderer/store';
+import { useGeneralSettings, useSidebarRightExpanded, useWindowSettings } from '/@/renderer/store';
 import { Platform } from '/@/renderer/types';
 
 export const useShouldPadTitlebar = () => {
diff --git a/src/renderer/hooks/use-song-change.ts b/src/renderer/hooks/use-song-change.ts
index a6c008bb..9d18487b 100644
--- a/src/renderer/hooks/use-song-change.ts
+++ b/src/renderer/hooks/use-song-change.ts
@@ -1,8 +1,9 @@
-import { MutableRefObject, useCallback, useEffect } from 'react';
-import { useEventStore, UserEvent } from '/@/renderer/store/event.store';
 import { RowNode } from '@ag-grid-community/core';
 import { AgGridReact } from '@ag-grid-community/react';
+import { MutableRefObject, useCallback, useEffect } from 'react';
+
 import { Song } from '/@/renderer/api/types';
+import { useEventStore, UserEvent } from '/@/renderer/store/event.store';
 
 export const useSongChange = (
     handler: (ids: string[], event: UserEvent) => void,
diff --git a/src/renderer/hooks/use-theme.ts b/src/renderer/hooks/use-theme.ts
index 3516d13e..48bbea66 100644
--- a/src/renderer/hooks/use-theme.ts
+++ b/src/renderer/hooks/use-theme.ts
@@ -1,4 +1,5 @@
 import { useEffect, useState } from 'react';
+
 import { useSettingsStore } from '/@/renderer/store/settings.store';
 import { AppTheme } from '/@/renderer/themes/types';
 
diff --git a/src/renderer/index.ejs b/src/renderer/index.ejs
deleted file mode 100644
index 4d5ecd15..00000000
--- a/src/renderer/index.ejs
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<html>
-
-<head>
-  <meta charset="utf-8" />
-  <meta http-equiv="Content-Security-Policy" />
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <title>Feishin</title>
-  <% if (web) { %>
-  <script src="settings.js"></script>
-  <% } %>
-</head>
-
-<body>
-  <div id="root"></div>
-</body>
-
-</html>
diff --git a/src/renderer/index.html b/src/renderer/index.html
new file mode 100644
index 00000000..1a446c50
--- /dev/null
+++ b/src/renderer/index.html
@@ -0,0 +1,19 @@
+<!doctype html>
+<html>
+
+<head>
+    <meta charset="utf-8" />
+    <meta http-equiv="Content-Security-Policy" />
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <title>Feishin</title>
+    <script src="settings.js"></script>
+</head>
+
+<body>
+    <div id="root">
+        <script type="module" src="main.tsx"></script>
+    </div>
+
+</body>
+
+</html>
diff --git a/src/renderer/is-updated-dialog.tsx b/src/renderer/is-updated-dialog.tsx
index f0cdaf55..934173f2 100644
--- a/src/renderer/is-updated-dialog.tsx
+++ b/src/renderer/is-updated-dialog.tsx
@@ -1,11 +1,12 @@
-import { useCallback } from 'react';
 import { Group, Stack } from '@mantine/core';
 import { useLocalStorage } from '@mantine/hooks';
+import { useCallback } from 'react';
 import { RiExternalLinkLine } from 'react-icons/ri';
-import { Button, Dialog, Text } from './components';
-import packageJson from '../../package.json';
 
-export const IsUpdatedDialog = () => {
+import packageJson from '../../package.json';
+import { Button, Dialog, Text } from './components';
+
+export function IsUpdatedDialog() {
     const { version } = packageJson;
 
     const [value, setValue] = useLocalStorage({ key: 'version' });
@@ -31,16 +32,16 @@ export const IsUpdatedDialog = () => {
                     <Button
                         component="a"
                         href={`https://github.com/jeffvli/feishin/releases/tag/v${version}`}
+                        onClick={handleDismiss}
                         rightIcon={<RiExternalLinkLine />}
                         target="_blank"
                         variant="filled"
-                        onClick={handleDismiss}
                     >
                         View release notes
                     </Button>
                     <Button
-                        variant="default"
                         onClick={handleDismiss}
+                        variant="default"
                     >
                         Dismiss
                     </Button>
@@ -48,4 +49,4 @@ export const IsUpdatedDialog = () => {
             </Stack>
         </Dialog>
     );
-};
+}
diff --git a/src/renderer/layouts/auth-layout.tsx b/src/renderer/layouts/auth-layout.tsx
index 29362476..20a0d454 100644
--- a/src/renderer/layouts/auth-layout.tsx
+++ b/src/renderer/layouts/auth-layout.tsx
@@ -1,5 +1,6 @@
 import { Outlet } from 'react-router-dom';
 import styled from 'styled-components';
+
 import { Titlebar } from '/@/renderer/features/titlebar/components/titlebar';
 
 const WindowsTitlebarContainer = styled.div`
diff --git a/src/renderer/layouts/default-layout.tsx b/src/renderer/layouts/default-layout.tsx
index 85eb6129..b896684d 100644
--- a/src/renderer/layouts/default-layout.tsx
+++ b/src/renderer/layouts/default-layout.tsx
@@ -1,20 +1,21 @@
-import { lazy } from 'react';
+import { HotkeyItem, useHotkeys } from '@mantine/hooks';
 import isElectron from 'is-electron';
+import { lazy } from 'react';
 import { useNavigate } from 'react-router';
 import styled from 'styled-components';
-import {
-    useWindowSettings,
-    useSettingsStore,
-    useHotkeySettings,
-    useGeneralSettings,
-    useSettingsStoreActions,
-} from '/@/renderer/store/settings.store';
-import { Platform, PlaybackType } from '/@/renderer/types';
+
+import { CommandPalette } from '/@/renderer/features/search/components/command-palette';
 import { MainContent } from '/@/renderer/layouts/default-layout/main-content';
 import { PlayerBar } from '/@/renderer/layouts/default-layout/player-bar';
-import { HotkeyItem, useHotkeys } from '@mantine/hooks';
-import { CommandPalette } from '/@/renderer/features/search/components/command-palette';
 import { useCommandPalette } from '/@/renderer/store';
+import {
+    useGeneralSettings,
+    useHotkeySettings,
+    useSettingsStore,
+    useSettingsStoreActions,
+    useWindowSettings,
+} from '/@/renderer/store/settings.store';
+import { Platform, PlaybackType } from '/@/renderer/types';
 
 if (!isElectron()) {
     useSettingsStore.getState().actions.setSettings({
@@ -56,7 +57,7 @@ export const DefaultLayout = ({ shell }: DefaultLayoutProps) => {
     const { opened, ...handlers } = useCommandPalette();
     const { bindings } = useHotkeySettings();
     const navigate = useNavigate();
-    const localSettings = isElectron() ? window.electron.localSettings : null;
+    const localSettings = isElectron() ? window.api.localSettings : null;
     const settings = useGeneralSettings();
     const { setSettings } = useSettingsStoreActions();
 
diff --git a/src/renderer/layouts/default-layout/full-screen-overlay.tsx b/src/renderer/layouts/default-layout/full-screen-overlay.tsx
index ca09edbf..ab281933 100644
--- a/src/renderer/layouts/default-layout/full-screen-overlay.tsx
+++ b/src/renderer/layouts/default-layout/full-screen-overlay.tsx
@@ -1,4 +1,5 @@
 import { AnimatePresence } from 'framer-motion';
+
 import { FullScreenPlayer } from '/@/renderer/features/player/components/full-screen-player';
 import { useFullScreenPlayerStore } from '/@/renderer/store';
 
diff --git a/src/renderer/layouts/default-layout/left-sidebar.tsx b/src/renderer/layouts/default-layout/left-sidebar.tsx
index 2eb176b2..a1fd6047 100644
--- a/src/renderer/layouts/default-layout/left-sidebar.tsx
+++ b/src/renderer/layouts/default-layout/left-sidebar.tsx
@@ -1,5 +1,6 @@
 import { useRef } from 'react';
 import styled from 'styled-components';
+
 import { ResizeHandle } from '/@/renderer/features/shared';
 import { CollapsedSidebar } from '/@/renderer/features/sidebar/components/collapsed-sidebar';
 import { Sidebar } from '/@/renderer/features/sidebar/components/sidebar';
@@ -24,13 +25,13 @@ export const LeftSidebar = ({ isResizing, startResizing }: LeftSidebarProps) =>
     return (
         <SidebarContainer id="sidebar">
             <ResizeHandle
-                ref={sidebarRef}
                 $isResizing={isResizing}
                 $placement="right"
                 onMouseDown={(e) => {
                     e.preventDefault();
                     startResizing('left');
                 }}
+                ref={sidebarRef}
             />
             {collapsed ? <CollapsedSidebar /> : <Sidebar />}
         </SidebarContainer>
diff --git a/src/renderer/layouts/default-layout/main-content.tsx b/src/renderer/layouts/default-layout/main-content.tsx
index 6517217d..0857d3ac 100644
--- a/src/renderer/layouts/default-layout/main-content.tsx
+++ b/src/renderer/layouts/default-layout/main-content.tsx
@@ -1,15 +1,16 @@
-import { lazy, Suspense, useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { throttle } from 'lodash';
+import { lazy, Suspense, useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { Outlet, useLocation } from 'react-router';
 import styled from 'styled-components';
+
+import { Spinner } from '/@/renderer/components';
+import { FullScreenOverlay } from '/@/renderer/layouts/default-layout/full-screen-overlay';
+import { LeftSidebar } from '/@/renderer/layouts/default-layout/left-sidebar';
+import { RightSidebar } from '/@/renderer/layouts/default-layout/right-sidebar';
 import { AppRoute } from '/@/renderer/router/routes';
 import { useAppStoreActions, useSidebarStore } from '/@/renderer/store';
 import { useGeneralSettings } from '/@/renderer/store/settings.store';
-import { constrainSidebarWidth, constrainRightSidebarWidth } from '/@/renderer/utils';
-import { LeftSidebar } from '/@/renderer/layouts/default-layout/left-sidebar';
-import { FullScreenOverlay } from '/@/renderer/layouts/default-layout/full-screen-overlay';
-import { RightSidebar } from '/@/renderer/layouts/default-layout/right-sidebar';
-import { Spinner } from '/@/renderer/components';
+import { constrainRightSidebarWidth, constrainSidebarWidth } from '/@/renderer/utils';
 
 const SideDrawerQueue = lazy(() =>
     import('/@/renderer/layouts/default-layout/side-drawer-queue').then((module) => ({
@@ -41,9 +42,9 @@ const MainContentContainer = styled.div<{
 
 export const MainContent = ({ shell }: { shell?: boolean }) => {
     const location = useLocation();
-    const { collapsed, leftWidth, rightWidth, rightExpanded } = useSidebarStore();
+    const { collapsed, leftWidth, rightExpanded, rightWidth } = useSidebarStore();
     const { setSideBar } = useAppStoreActions();
-    const { sideQueueType, showQueueDrawerButton } = useGeneralSettings();
+    const { showQueueDrawerButton, sideQueueType } = useGeneralSettings();
     const [isResizing, setIsResizing] = useState(false);
     const [isResizingRight, setIsResizingRight] = useState(false);
 
@@ -114,8 +115,8 @@ export const MainContent = ({ shell }: { shell?: boolean }) => {
                         startResizing={startResizing}
                     />
                     <RightSidebar
-                        ref={rightSidebarRef}
                         isResizing={isResizingRight}
+                        ref={rightSidebarRef}
                         startResizing={startResizing}
                     />
                 </>
diff --git a/src/renderer/layouts/default-layout/player-bar.tsx b/src/renderer/layouts/default-layout/player-bar.tsx
index 740dd972..daed625e 100644
--- a/src/renderer/layouts/default-layout/player-bar.tsx
+++ b/src/renderer/layouts/default-layout/player-bar.tsx
@@ -1,4 +1,5 @@
 import styled from 'styled-components';
+
 import { Playerbar } from '/@/renderer/features/player';
 import { useGeneralSettings } from '/@/renderer/store/settings.store';
 
diff --git a/src/renderer/layouts/default-layout/right-sidebar.tsx b/src/renderer/layouts/default-layout/right-sidebar.tsx
index f4efb36a..bbda6cd7 100644
--- a/src/renderer/layouts/default-layout/right-sidebar.tsx
+++ b/src/renderer/layouts/default-layout/right-sidebar.tsx
@@ -2,7 +2,8 @@ import { AnimatePresence, motion, Variants } from 'framer-motion';
 import { forwardRef, Ref } from 'react';
 import { useLocation } from 'react-router';
 import styled from 'styled-components';
-import { SidebarPlayQueue, DrawerPlayQueue } from '/@/renderer/features/now-playing';
+
+import { DrawerPlayQueue, SidebarPlayQueue } from '/@/renderer/features/now-playing';
 import { ResizeHandle } from '/@/renderer/features/shared';
 import { AppRoute } from '/@/renderer/router/routes';
 import { useGeneralSettings, useSidebarStore, useWindowSettings } from '/@/renderer/store';
@@ -93,49 +94,49 @@ export const RightSidebar = forwardRef(
         ref: Ref<HTMLDivElement>,
     ) => {
         const { windowBarStyle } = useWindowSettings();
-        const { rightWidth, rightExpanded } = useSidebarStore();
+        const { rightExpanded, rightWidth } = useSidebarStore();
         const { sideQueueType } = useGeneralSettings();
         const location = useLocation();
         const showSideQueue = rightExpanded && location.pathname !== AppRoute.NOW_PLAYING;
 
         return (
             <AnimatePresence
-                key="queue-sidebar"
-                presenceAffectsLayout
                 initial={false}
+                key="queue-sidebar"
                 mode="sync"
+                presenceAffectsLayout
             >
                 {showSideQueue && (
                     <>
                         {sideQueueType === 'sideQueue' ? (
                             <RightSidebarContainer
-                                key="queue-sidebar"
                                 animate="open"
                                 custom={rightWidth}
                                 exit="closed"
                                 id="sidebar-queue"
                                 initial="closed"
+                                key="queue-sidebar"
                                 variants={queueSidebarVariants}
                             >
                                 <ResizeHandle
-                                    ref={ref}
                                     $isResizing={isResizingRight}
                                     $placement="left"
                                     onMouseDown={(e) => {
                                         e.preventDefault();
                                         startResizing('right');
                                     }}
+                                    ref={ref}
                                 />
                                 <SidebarPlayQueue />
                             </RightSidebarContainer>
                         ) : (
                             <QueueDrawer
-                                key="queue-drawer"
                                 animate="open"
                                 custom={windowBarStyle}
                                 exit="closed"
                                 id="drawer-queue"
                                 initial="closed"
+                                key="queue-drawer"
                                 variants={queueDrawerVariants}
                             >
                                 <DrawerPlayQueue />
diff --git a/src/renderer/layouts/default-layout/side-drawer-queue.tsx b/src/renderer/layouts/default-layout/side-drawer-queue.tsx
index c23c7b59..b3bcfcc7 100644
--- a/src/renderer/layouts/default-layout/side-drawer-queue.tsx
+++ b/src/renderer/layouts/default-layout/side-drawer-queue.tsx
@@ -4,6 +4,7 @@ import { useCallback } from 'react';
 import { TbArrowBarLeft } from 'react-icons/tb';
 import { useLocation } from 'react-router';
 import styled from 'styled-components';
+
 import { DrawerPlayQueue } from '/@/renderer/features/now-playing';
 import { AppRoute } from '/@/renderer/router/routes';
 import { useAppStore, useSidebarStore } from '/@/renderer/store';
@@ -104,14 +105,14 @@ export const SideDrawerQueue = () => {
             >
                 {isQueueDrawerButtonVisible && (
                     <QueueDrawerArea
-                        key="queue-drawer-button"
                         animate="visible"
                         exit="hidden"
                         initial="hidden"
-                        variants={queueDrawerButtonVariants}
-                        whileHover={{ opacity: 1, scale: 2, transition: { duration: 0.5 } }}
+                        key="queue-drawer-button"
                         onMouseEnter={handleEnterDrawerButton}
                         onMouseLeave={handleLeaveDrawerButton}
+                        variants={queueDrawerButtonVariants}
+                        whileHover={{ opacity: 1, scale: 2, transition: { duration: 0.5 } }}
                     >
                         <TbArrowBarLeft size={12} />
                     </QueueDrawerArea>
@@ -119,11 +120,10 @@ export const SideDrawerQueue = () => {
 
                 {drawer && (
                     <QueueDrawer
-                        key="queue-drawer"
                         animate="open"
                         exit="closed"
                         initial="closed"
-                        variants={queueDrawerVariants}
+                        key="queue-drawer"
                         onMouseLeave={() => {
                             // The drawer will close due to the delay when setting isReorderingQueue
                             setTimeout(() => {
@@ -131,6 +131,7 @@ export const SideDrawerQueue = () => {
                                 drawerHandler.close();
                             }, 50);
                         }}
+                        variants={queueDrawerVariants}
                     >
                         <DrawerPlayQueue />
                     </QueueDrawer>
diff --git a/src/renderer/layouts/window-bar.tsx b/src/renderer/layouts/window-bar.tsx
index 12720744..19bdd2c0 100644
--- a/src/renderer/layouts/window-bar.tsx
+++ b/src/renderer/layouts/window-bar.tsx
@@ -1,19 +1,21 @@
-import { useCallback, useState } from 'react';
 import isElectron from 'is-electron';
+import { useCallback, useState } from 'react';
 import { RiCheckboxBlankLine, RiCloseLine, RiSubtractLine } from 'react-icons/ri';
 import styled from 'styled-components';
-import { useCurrentStatus, useQueueStatus } from '/@/renderer/store';
-import { useWindowSettings } from '/@/renderer/store/settings.store';
-import { Platform, PlayerStatus } from '/@/renderer/types';
+
+import appIcon from '../../../assets/icons/32x32.png';
 import macCloseHover from './assets/close-mac-hover.png';
 import macClose from './assets/close-mac.png';
 import macMaxHover from './assets/max-mac-hover.png';
 import macMax from './assets/max-mac.png';
 import macMinHover from './assets/min-mac-hover.png';
 import macMin from './assets/min-mac.png';
-import appIcon from '../../../assets/icons/32x32.png';
 
-const localSettings = isElectron() ? window.electron.localSettings : null;
+import { useCurrentStatus, useQueueStatus } from '/@/renderer/store';
+import { useWindowSettings } from '/@/renderer/store/settings.store';
+import { Platform, PlayerStatus } from '/@/renderer/types';
+
+const localSettings = isElectron() ? window.api.localSettings : null;
 
 const WindowsContainer = styled.div`
     display: flex;
@@ -61,7 +63,7 @@ const PlayerStatusContainer = styled.div`
     white-space: nowrap;
 `;
 
-const browser = isElectron() ? window.electron.browser : null;
+const browser = isElectron() ? window.api.browser : null;
 const close = () => browser?.exit();
 const minimize = () => browser?.minimize();
 const maximize = () => browser?.maximize();
@@ -92,21 +94,21 @@ const WindowsControls = ({ controls, title }: WindowBarControlsProps) => {
             </PlayerStatusContainer>
             <WindowsButtonGroup>
                 <WindowsButton
-                    role="button"
                     onClick={handleMinimize}
+                    role="button"
                 >
                     <RiSubtractLine size={19} />
                 </WindowsButton>
                 <WindowsButton
-                    role="button"
                     onClick={handleMaximize}
+                    role="button"
                 >
                     <RiCheckboxBlankLine size={13} />
                 </WindowsButton>
                 <WindowsButton
                     $exit
-                    role="button"
                     onClick={handleClose}
+                    role="button"
                 >
                     <RiCloseLine size={19} />
                 </WindowsButton>
diff --git a/src/renderer/lib/react-query.ts b/src/renderer/lib/react-query.ts
index dff03c26..08205543 100644
--- a/src/renderer/lib/react-query.ts
+++ b/src/renderer/lib/react-query.ts
@@ -1,10 +1,12 @@
 import type {
-    UseQueryOptions,
     DefaultOptions,
-    UseMutationOptions,
     UseInfiniteQueryOptions,
+    UseMutationOptions,
+    UseQueryOptions,
 } from '@tanstack/react-query';
-import { QueryClient, QueryCache } from '@tanstack/react-query';
+
+import { QueryCache, QueryClient } from '@tanstack/react-query';
+
 import { toast } from '/@/renderer/components/toast/index';
 
 const queryCache = new QueryCache({
@@ -38,16 +40,45 @@ export const queryClient = new QueryClient({
     queryCache,
 });
 
-export type QueryHookArgs<T> = {
-    options?: QueryOptions;
-    query: T;
-    serverId: string | undefined;
+export type InfiniteQueryOptions = {
+    cacheTime?: UseInfiniteQueryOptions['cacheTime'];
+    enabled?: UseInfiniteQueryOptions['enabled'];
+    keepPreviousData?: UseInfiniteQueryOptions['keepPreviousData'];
+    meta?: UseInfiniteQueryOptions['meta'];
+    onError?: (err: any) => void;
+    onSettled?: any;
+    onSuccess?: any;
+    queryKey?: UseInfiniteQueryOptions['queryKey'];
+    refetchInterval?: number;
+    refetchIntervalInBackground?: UseInfiniteQueryOptions['refetchIntervalInBackground'];
+    refetchOnWindowFocus?: boolean;
+    retry?: UseInfiniteQueryOptions['retry'];
+    retryDelay?: UseInfiniteQueryOptions['retryDelay'];
+    staleTime?: UseInfiniteQueryOptions['staleTime'];
+    suspense?: UseInfiniteQueryOptions['suspense'];
+    useErrorBoundary?: boolean;
 };
 
 export type MutationHookArgs = {
     options?: MutationOptions;
 };
 
+export type MutationOptions = {
+    mutationKey: UseMutationOptions['mutationKey'];
+    onError?: (err: any) => void;
+    onSettled?: any;
+    onSuccess?: any;
+    retry?: UseQueryOptions['retry'];
+    retryDelay?: UseQueryOptions['retryDelay'];
+    useErrorBoundary?: boolean;
+};
+
+export type QueryHookArgs<T> = {
+    options?: QueryOptions;
+    query: T;
+    serverId: string | undefined;
+};
+
 export type QueryOptions = {
     cacheTime?: UseQueryOptions['cacheTime'];
     enabled?: UseQueryOptions['enabled'];
@@ -66,32 +97,3 @@ export type QueryOptions = {
     suspense?: UseQueryOptions['suspense'];
     useErrorBoundary?: boolean;
 };
-
-export type MutationOptions = {
-    mutationKey: UseMutationOptions['mutationKey'];
-    onError?: (err: any) => void;
-    onSettled?: any;
-    onSuccess?: any;
-    retry?: UseQueryOptions['retry'];
-    retryDelay?: UseQueryOptions['retryDelay'];
-    useErrorBoundary?: boolean;
-};
-
-export type InfiniteQueryOptions = {
-    cacheTime?: UseInfiniteQueryOptions['cacheTime'];
-    enabled?: UseInfiniteQueryOptions['enabled'];
-    keepPreviousData?: UseInfiniteQueryOptions['keepPreviousData'];
-    meta?: UseInfiniteQueryOptions['meta'];
-    onError?: (err: any) => void;
-    onSettled?: any;
-    onSuccess?: any;
-    queryKey?: UseInfiniteQueryOptions['queryKey'];
-    refetchInterval?: number;
-    refetchIntervalInBackground?: UseInfiniteQueryOptions['refetchIntervalInBackground'];
-    refetchOnWindowFocus?: boolean;
-    retry?: UseInfiniteQueryOptions['retry'];
-    retryDelay?: UseInfiniteQueryOptions['retryDelay'];
-    staleTime?: UseInfiniteQueryOptions['staleTime'];
-    suspense?: UseInfiniteQueryOptions['suspense'];
-    useErrorBoundary?: boolean;
-};
diff --git a/src/renderer/index.tsx b/src/renderer/main.tsx
similarity index 84%
rename from src/renderer/index.tsx
rename to src/renderer/main.tsx
index f7ddc1c8..1a9fc300 100644
--- a/src/renderer/index.tsx
+++ b/src/renderer/main.tsx
@@ -4,14 +4,16 @@ import {
     Persister,
     PersistQueryClientProvider,
 } from '@tanstack/react-query-persist-client';
-import { get, set, del } from 'idb-keyval';
+import { del, get, set } from 'idb-keyval';
 import { createRoot } from 'react-dom/client';
-import { App } from './app';
-import { queryClient } from './lib/react-query';
-
 import 'overlayscrollbars/overlayscrollbars.css';
 
-export function createIDBPersister(idbValidKey: IDBValidKey = 'reactQuery') {
+import './styles/overlayscrollbars.css';
+import { queryClient } from './lib/react-query';
+
+import { App } from '/@/renderer/app';
+
+function createIDBPersister(idbValidKey: IDBValidKey = 'reactQuery') {
     return {
         persistClient: async (client: PersistedClient) => {
             set(idbValidKey, client);
@@ -20,7 +22,6 @@ export function createIDBPersister(idbValidKey: IDBValidKey = 'reactQuery') {
             await del(idbValidKey);
         },
         restoreClient: async () => {
-            // eslint-disable-next-line no-return-await
             return await get<PersistedClient>(idbValidKey);
         },
     } as Persister;
@@ -28,10 +29,7 @@ export function createIDBPersister(idbValidKey: IDBValidKey = 'reactQuery') {
 
 const indexedDbPersister = createIDBPersister('feishin');
 
-const container = document.getElementById('root')! as HTMLElement;
-const root = createRoot(container);
-
-root.render(
+createRoot(document.getElementById('root')!).render(
     <PersistQueryClientProvider
         client={queryClient}
         persistOptions={{
diff --git a/src/renderer/preload.d.ts b/src/renderer/preload.d.ts
deleted file mode 100644
index 7d8c9258..00000000
--- a/src/renderer/preload.d.ts
+++ /dev/null
@@ -1,90 +0,0 @@
-import { IpcRendererEvent } from 'electron';
-import { PlayerData, PlayerState } from './store';
-import { FontData, InternetProviderLyricResponse, QueueSong } from '/@/renderer/api/types';
-import { Remote } from '/@/main/preload/remote';
-import { Mpris } from '/@/main/preload/mpris';
-import { MpvPLayer, MpvPlayerListener } from '/@/main/preload/mpv-player';
-import { Lyrics } from '/@/main/preload/lyrics';
-import { Utils } from '/@/main/preload/utils';
-import { LocalSettings } from '/@/main/preload/local-settings';
-import { Ipc } from '/@/main/preload/ipc';
-import { DiscordRpc } from '/@/main/preload/discord-rpc';
-import { Browser } from '/@/main/preload/browser';
-
-declare global {
-    interface Window {
-        SERVER_LOCK?: boolean;
-        SERVER_NAME?: string;
-        SERVER_TYPE?: string;
-        SERVER_URL?: string;
-        electron: {
-            browser: Browser;
-            discordRpc: DiscordRpc;
-            ipc?: Ipc;
-            ipcRenderer: {
-                APP_RESTART(): void;
-                LYRIC_FETCH(data: QueueSong): void;
-                LYRIC_GET(
-                    event: IpcRendererEvent,
-                    songName: string,
-                    source: string,
-                    lyric: InternetProviderLyricResponse,
-                ): void;
-                PASSWORD_GET(server: string): Promise<string | null>;
-                PASSWORD_REMOVE(server: string): void;
-                PASSWORD_SET(password: string, server: string): Promise<boolean>;
-                PLAYER_AUTO_NEXT(data: PlayerData): void;
-                PLAYER_CURRENT_TIME(): void;
-                PLAYER_GET_TIME(): number | undefined;
-                PLAYER_MEDIA_KEYS_DISABLE(): void;
-                PLAYER_MEDIA_KEYS_ENABLE(): void;
-                PLAYER_MUTE(): void;
-                PLAYER_NEXT(): void;
-                PLAYER_PAUSE(): void;
-                PLAYER_PLAY(): void;
-                PLAYER_PREVIOUS(): void;
-                PLAYER_RESTORE_DATA(): void;
-                PLAYER_SAVE_QUEUE(data: PlayerState): void;
-                PLAYER_SEEK(seconds: number): void;
-                PLAYER_SEEK_TO(seconds: number): void;
-                PLAYER_SET_QUEUE(data: PlayerData): void;
-                PLAYER_SET_QUEUE_NEXT(data: PlayerData): void;
-                PLAYER_STOP(): void;
-                PLAYER_VOLUME(value: number): void;
-                REMOTE_ENABLE(enabled: boolean): Promise<string | null>;
-                REMOTE_PORT(port: number): Promise<string | null>;
-                RENDERER_PLAYER_AUTO_NEXT(cb: (event: IpcRendererEvent, data: any) => void): void;
-                RENDERER_PLAYER_CURRENT_TIME(
-                    cb: (event: IpcRendererEvent, data: any) => void,
-                ): void;
-                RENDERER_PLAYER_NEXT(cb: (event: IpcRendererEvent, data: any) => void): void;
-                RENDERER_PLAYER_PAUSE(cb: (event: IpcRendererEvent, data: any) => void): void;
-                RENDERER_PLAYER_PLAY(cb: (event: IpcRendererEvent, data: any) => void): void;
-                RENDERER_PLAYER_PLAY_PAUSE(cb: (event: IpcRendererEvent, data: any) => void): void;
-                RENDERER_PLAYER_PREVIOUS(cb: (event: IpcRendererEvent, data: any) => void): void;
-                RENDERER_PLAYER_RESTORE_QUEUE(
-                    cb: (event: IpcRendererEvent, data: any) => void,
-                ): void;
-                RENDERER_PLAYER_SAVE_QUEUE(cb: (event: IpcRendererEvent, data: any) => void): void;
-                RENDERER_PLAYER_STOP(cb: (event: IpcRendererEvent, data: any) => void): void;
-                SETTINGS_GET(data: { property: string }): any;
-                SETTINGS_SET(data: { property: string; value: any }): void;
-                removeAllListeners(value: string): void;
-                windowClose(): void;
-                windowMaximize(): void;
-                windowMinimize(): void;
-                windowUnmaximize(): void;
-            };
-            localSettings: LocalSettings;
-            lyrics?: Lyrics;
-            mpris?: Mpris;
-            mpvPlayer?: MpvPLayer;
-            mpvPlayerListener?: MpvPlayerListener;
-            remote?: Remote;
-            utils?: Utils;
-        };
-        queryLocalFonts?: () => Promise<FontData[]>;
-    }
-}
-
-export {};
diff --git a/src/renderer/router/app-outlet.tsx b/src/renderer/router/app-outlet.tsx
index cc8834fb..00cca508 100644
--- a/src/renderer/router/app-outlet.tsx
+++ b/src/renderer/router/app-outlet.tsx
@@ -1,16 +1,17 @@
-import { useMemo, useEffect } from 'react';
 import { Center } from '@mantine/core';
 import isElectron from 'is-electron';
+import { useEffect, useMemo } from 'react';
 import { Navigate, Outlet } from 'react-router-dom';
-import { AppRoute } from '/@/renderer/router/routes';
-import { useCurrentServer, useSetPlayerFallback } from '/@/renderer/store';
+
 import { Spinner, toast } from '/@/renderer/components';
 import { useServerAuthenticated } from '/@/renderer/hooks/use-server-authenticated';
+import { AppRoute } from '/@/renderer/router/routes';
+import { useCurrentServer, useSetPlayerFallback } from '/@/renderer/store';
 import { AuthState } from '/@/renderer/types';
 
-const ipc = isElectron() ? window.electron.ipc : null;
-const utils = isElectron() ? window.electron.utils : null;
-const mpvPlayerListener = isElectron() ? window.electron.mpvPlayerListener : null;
+const ipc = isElectron() ? window.api.ipc : null;
+const utils = isElectron() ? window.api.utils : null;
+const mpvPlayerListener = isElectron() ? window.api.mpvPlayerListener : null;
 
 export const AppOutlet = () => {
     const currentServer = useCurrentServer();
diff --git a/src/renderer/router/app-router.tsx b/src/renderer/router/app-router.tsx
index cc03d915..bf9e0afa 100644
--- a/src/renderer/router/app-router.tsx
+++ b/src/renderer/router/app-router.tsx
@@ -1,14 +1,16 @@
+import { ModalsProvider } from '@mantine/modals';
 import { lazy, Suspense } from 'react';
-import { Route, HashRouter, Routes } from 'react-router-dom';
+import { HashRouter, Route, Routes } from 'react-router-dom';
+
 import { AppRoute } from './routes';
+
+import { BaseContextModal } from '/@/renderer/components';
+import ArtistListRoute from '/@/renderer/features/artists/routes/artist-list-route';
+import { AddToPlaylistContextModal } from '/@/renderer/features/playlists';
+import { ShareItemContextModal } from '/@/renderer/features/sharing';
 import { DefaultLayout } from '/@/renderer/layouts';
 import { AppOutlet } from '/@/renderer/router/app-outlet';
 import { TitlebarOutlet } from '/@/renderer/router/titlebar-outlet';
-import { ModalsProvider } from '@mantine/modals';
-import { BaseContextModal } from '/@/renderer/components';
-import { AddToPlaylistContextModal } from '/@/renderer/features/playlists';
-import { ShareItemContextModal } from '/@/renderer/features/sharing';
-import ArtistListRoute from '/@/renderer/features/artists/routes/artist-list-route';
 
 const NowPlayingRoute = lazy(
     () => import('/@/renderer/features/now-playing/routes/now-playing-route'),
@@ -96,9 +98,9 @@ export const AppRouter = () => {
                         >
                             <Route element={<DefaultLayout />}>
                                 <Route
-                                    index
                                     element={<HomeRoute />}
                                     errorElement={<RouteErrorBoundary />}
+                                    index
                                 />
                                 <Route
                                     element={<HomeRoute />}
@@ -122,9 +124,9 @@ export const AppRouter = () => {
                                 />
                                 <Route path={AppRoute.LIBRARY_GENRES}>
                                     <Route
-                                        index
                                         element={<GenreListRoute />}
                                         errorElement={<RouteErrorBoundary />}
+                                        index
                                     />
                                     <Route
                                         element={<AlbumListRoute />}
@@ -152,8 +154,8 @@ export const AppRouter = () => {
                                 />
                                 <Route path={AppRoute.LIBRARY_ARTISTS_DETAIL}>
                                     <Route
-                                        index
                                         element={<AlbumArtistDetailRoute />}
+                                        index
                                     />
                                     <Route
                                         element={<AlbumListRoute />}
@@ -193,13 +195,13 @@ export const AppRouter = () => {
                                     path={AppRoute.LIBRARY_ALBUM_ARTISTS}
                                 >
                                     <Route
-                                        index
                                         element={<AlbumArtistListRoute />}
+                                        index
                                     />
                                     <Route path={AppRoute.LIBRARY_ALBUM_ARTISTS_DETAIL}>
                                         <Route
-                                            index
                                             element={<AlbumArtistDetailRoute />}
+                                            index
                                         />
                                         <Route
                                             element={<AlbumListRoute />}
diff --git a/src/renderer/router/routes.ts b/src/renderer/router/routes.ts
index 76b3fc5f..7a49f624 100644
--- a/src/renderer/router/routes.ts
+++ b/src/renderer/router/routes.ts
@@ -3,13 +3,13 @@ export enum AppRoute {
     EXPLORE = '/explore',
     FAKE_LIBRARY_ALBUM_DETAILS = '/library/albums/dummy/:albumId',
     HOME = '/',
-    LIBRARY_ALBUMS = '/library/albums',
-    LIBRARY_ALBUMS_DETAIL = '/library/albums/:albumId',
     LIBRARY_ALBUM_ARTISTS = '/library/album-artists',
     LIBRARY_ALBUM_ARTISTS_DETAIL = '/library/album-artists/:albumArtistId',
     LIBRARY_ALBUM_ARTISTS_DETAIL_DISCOGRAPHY = '/library/album-artists/:albumArtistId/discography',
     LIBRARY_ALBUM_ARTISTS_DETAIL_SONGS = '/library/album-artists/:albumArtistId/songs',
     LIBRARY_ALBUM_ARTISTS_DETAIL_TOP_SONGS = '/library/album-artists/:albumArtistId/top-songs',
+    LIBRARY_ALBUMS = '/library/albums',
+    LIBRARY_ALBUMS_DETAIL = '/library/albums/:albumId',
     LIBRARY_ARTISTS = '/library/artists',
     LIBRARY_ARTISTS_DETAIL = '/library/artists/:artistId',
     LIBRARY_ARTISTS_DETAIL_DISCOGRAPHY = '/library/artists/:artistId/discography',
diff --git a/src/renderer/router/titlebar-outlet.tsx b/src/renderer/router/titlebar-outlet.tsx
index a4be6661..36c6cb6b 100644
--- a/src/renderer/router/titlebar-outlet.tsx
+++ b/src/renderer/router/titlebar-outlet.tsx
@@ -1,5 +1,6 @@
 import { Outlet } from 'react-router';
 import styled from 'styled-components';
+
 import { Titlebar } from '/@/renderer/features/titlebar/components/titlebar';
 import { useWindowSettings } from '/@/renderer/store/settings.store';
 import { Platform } from '/@/renderer/types';
diff --git a/src/renderer/store/album-artist-list-data.store.ts b/src/renderer/store/album-artist-list-data.store.ts
index 050c84e1..098ad9a7 100644
--- a/src/renderer/store/album-artist-list-data.store.ts
+++ b/src/renderer/store/album-artist-list-data.store.ts
@@ -2,16 +2,16 @@ import { create } from 'zustand';
 import { devtools } from 'zustand/middleware';
 import { immer } from 'zustand/middleware/immer';
 
-export interface AlbumArtistListDataState {
-    itemData: any[];
-}
-
 export interface AlbumArtistListDataSlice extends AlbumArtistListDataState {
     actions: {
         setItemData: (data: any[]) => void;
     };
 }
 
+export interface AlbumArtistListDataState {
+    itemData: any[];
+}
+
 export const useAlbumArtistListDataStore = create<AlbumArtistListDataSlice>()(
     devtools(
         immer((set) => ({
diff --git a/src/renderer/store/album-artist.store.ts b/src/renderer/store/album-artist.store.ts
index 54ce3d5c..03682266 100644
--- a/src/renderer/store/album-artist.store.ts
+++ b/src/renderer/store/album-artist.store.ts
@@ -1,15 +1,26 @@
 import { create } from 'zustand';
 import { devtools, persist } from 'zustand/middleware';
 import { immer } from 'zustand/middleware/immer';
+
 import { AlbumArtistListArgs, AlbumArtistListSort, SortOrder } from '/@/renderer/api/types';
 import { DataTableProps } from '/@/renderer/store/settings.store';
-import { ListDisplayType, TableColumn, TablePagination } from '/@/renderer/types';
 import { mergeOverridingColumns } from '/@/renderer/store/utils';
+import { ListDisplayType, TableColumn, TablePagination } from '/@/renderer/types';
 
-type TableProps = {
-    pagination: TablePagination;
-    scrollOffset: number;
-} & DataTableProps;
+export type AlbumArtistListFilter = Omit<AlbumArtistListArgs['query'], 'limit' | 'startIndex'>;
+
+export interface AlbumArtistSlice extends AlbumArtistState {
+    actions: {
+        setFilters: (data: Partial<AlbumArtistListFilter>) => AlbumArtistListFilter;
+        setStore: (data: Partial<AlbumArtistSlice>) => void;
+        setTable: (data: Partial<TableProps>) => void;
+        setTablePagination: (data: Partial<TableProps['pagination']>) => void;
+    };
+}
+
+export interface AlbumArtistState {
+    list: ListProps<AlbumArtistListFilter>;
+}
 
 type ListProps<T> = {
     display: ListDisplayType;
@@ -21,20 +32,10 @@ type ListProps<T> = {
     table: TableProps;
 };
 
-export type AlbumArtistListFilter = Omit<AlbumArtistListArgs['query'], 'startIndex' | 'limit'>;
-
-export interface AlbumArtistState {
-    list: ListProps<AlbumArtistListFilter>;
-}
-
-export interface AlbumArtistSlice extends AlbumArtistState {
-    actions: {
-        setFilters: (data: Partial<AlbumArtistListFilter>) => AlbumArtistListFilter;
-        setStore: (data: Partial<AlbumArtistSlice>) => void;
-        setTable: (data: Partial<TableProps>) => void;
-        setTablePagination: (data: Partial<TableProps['pagination']>) => void;
-    };
-}
+type TableProps = DataTableProps & {
+    pagination: TablePagination;
+    scrollOffset: number;
+};
 
 export const useAlbumArtistStore = create<AlbumArtistSlice>()(
     persist(
diff --git a/src/renderer/store/album-list-data.store.ts b/src/renderer/store/album-list-data.store.ts
index c79fef77..b791684f 100644
--- a/src/renderer/store/album-list-data.store.ts
+++ b/src/renderer/store/album-list-data.store.ts
@@ -2,10 +2,6 @@ import { create } from 'zustand';
 import { devtools } from 'zustand/middleware';
 import { immer } from 'zustand/middleware/immer';
 
-export interface AlbumListDataState {
-    itemData: any[];
-}
-
 export interface AlbumListDataSlice extends AlbumListDataState {
     actions: {
         setItemData: (data: any[]) => void;
@@ -13,6 +9,10 @@ export interface AlbumListDataSlice extends AlbumListDataState {
     };
 }
 
+export interface AlbumListDataState {
+    itemData: any[];
+}
+
 export const useAlbumListDataStore = create<AlbumListDataSlice>()(
     devtools(
         immer((set) => ({
diff --git a/src/renderer/store/app.store.ts b/src/renderer/store/app.store.ts
index b4bda7bb..47dadbec 100644
--- a/src/renderer/store/app.store.ts
+++ b/src/renderer/store/app.store.ts
@@ -2,8 +2,32 @@ import merge from 'lodash/merge';
 import { create } from 'zustand';
 import { devtools, persist } from 'zustand/middleware';
 import { immer } from 'zustand/middleware/immer';
+
 import { Platform } from '/@/renderer/types';
 
+export interface AppSlice extends AppState {
+    actions: {
+        setAppStore: (data: Partial<AppSlice>) => void;
+        setSideBar: (options: Partial<SidebarProps>) => void;
+        setTitleBar: (options: Partial<TitlebarProps>) => void;
+    };
+}
+
+export interface AppState {
+    commandPalette: CommandPaletteProps;
+    isReorderingQueue: boolean;
+    platform: Platform;
+    sidebar: SidebarProps;
+    titlebar: TitlebarProps;
+}
+
+type CommandPaletteProps = {
+    close: () => void;
+    open: () => void;
+    opened: boolean;
+    toggle: () => void;
+};
+
 type SidebarProps = {
     collapsed: boolean;
     expanded: string[];
@@ -18,29 +42,6 @@ type TitlebarProps = {
     outOfView: boolean;
 };
 
-type CommandPaletteProps = {
-    close: () => void;
-    open: () => void;
-    opened: boolean;
-    toggle: () => void;
-};
-
-export interface AppState {
-    commandPalette: CommandPaletteProps;
-    isReorderingQueue: boolean;
-    platform: Platform;
-    sidebar: SidebarProps;
-    titlebar: TitlebarProps;
-}
-
-export interface AppSlice extends AppState {
-    actions: {
-        setAppStore: (data: Partial<AppSlice>) => void;
-        setSideBar: (options: Partial<SidebarProps>) => void;
-        setTitleBar: (options: Partial<TitlebarProps>) => void;
-    };
-}
-
 export const useAppStore = create<AppSlice>()(
     persist(
         devtools(
diff --git a/src/renderer/store/auth.store.ts b/src/renderer/store/auth.store.ts
index 8711a59e..2bfa8cc0 100644
--- a/src/renderer/store/auth.store.ts
+++ b/src/renderer/store/auth.store.ts
@@ -3,27 +3,28 @@ import { nanoid } from 'nanoid/non-secure';
 import { create } from 'zustand';
 import { devtools, persist } from 'zustand/middleware';
 import { immer } from 'zustand/middleware/immer';
+
+import { ServerListItem } from '/@/renderer/api/types';
 import { useAlbumArtistListDataStore } from '/@/renderer/store/album-artist-list-data.store';
 import { useAlbumListDataStore } from '/@/renderer/store/album-list-data.store';
 import { useListStore } from '/@/renderer/store/list.store';
-import { ServerListItem } from '/@/renderer/api/types';
-
-export interface AuthState {
-    currentServer: ServerListItem | null;
-    deviceId: string;
-    serverList: Record<string, ServerListItem>;
-}
 
 export interface AuthSlice extends AuthState {
     actions: {
         addServer: (args: ServerListItem) => void;
         deleteServer: (id: string) => void;
-        getServer: (id: string) => ServerListItem | null;
-        setCurrentServer: (server: ServerListItem | null) => void;
+        getServer: (id: string) => null | ServerListItem;
+        setCurrentServer: (server: null | ServerListItem) => void;
         updateServer: (id: string, args: Partial<ServerListItem>) => void;
     };
 }
 
+export interface AuthState {
+    currentServer: null | ServerListItem;
+    deviceId: string;
+    serverList: Record<string, ServerListItem>;
+}
+
 export const useAuthStore = create<AuthSlice>()(
     persist(
         devtools(
diff --git a/src/renderer/store/event.store.ts b/src/renderer/store/event.store.ts
index 668b8e07..42f030b8 100644
--- a/src/renderer/store/event.store.ts
+++ b/src/renderer/store/event.store.ts
@@ -2,6 +2,19 @@ import { create } from 'zustand';
 import { devtools, subscribeWithSelector } from 'zustand/middleware';
 import { immer } from 'zustand/middleware/immer';
 
+export interface EventSlice extends EventState {
+    actions: {
+        favorite: (ids: string[], favorite: boolean) => void;
+        play: (id: string) => void;
+        rate: (ids: string[], rating: null | number) => void;
+    };
+}
+
+export interface EventState {
+    event: null | UserEvent;
+    ids: string[];
+}
+
 export type FavoriteEvent = {
     event: 'favorite';
     favorite: boolean;
@@ -14,24 +27,11 @@ export type PlayEvent = {
 
 export type RatingEvent = {
     event: 'rating';
-    rating: number | null;
+    rating: null | number;
 };
 
 export type UserEvent = FavoriteEvent | PlayEvent | RatingEvent;
 
-export interface EventState {
-    event: UserEvent | null;
-    ids: string[];
-}
-
-export interface EventSlice extends EventState {
-    actions: {
-        favorite: (ids: string[], favorite: boolean) => void;
-        play: (id: string) => void;
-        rate: (ids: string[], rating: number | null) => void;
-    };
-}
-
 export const useEventStore = create<EventSlice>()(
     subscribeWithSelector(
         devtools(
diff --git a/src/renderer/store/full-screen-player.store.ts b/src/renderer/store/full-screen-player.store.ts
index 4ac852f6..3aa4eb4a 100644
--- a/src/renderer/store/full-screen-player.store.ts
+++ b/src/renderer/store/full-screen-player.store.ts
@@ -3,8 +3,14 @@ import { create } from 'zustand';
 import { devtools, persist } from 'zustand/middleware';
 import { immer } from 'zustand/middleware/immer';
 
+export interface FullScreenPlayerSlice extends FullScreenPlayerState {
+    actions: {
+        setStore: (data: Partial<FullScreenPlayerSlice>) => void;
+    };
+}
+
 interface FullScreenPlayerState {
-    activeTab: string | 'queue' | 'related' | 'lyrics';
+    activeTab: 'lyrics' | 'queue' | 'related' | string;
     dynamicBackground?: boolean;
     dynamicImageBlur: number;
     dynamicIsImage?: boolean;
@@ -13,12 +19,6 @@ interface FullScreenPlayerState {
     useImageAspectRatio: boolean;
 }
 
-export interface FullScreenPlayerSlice extends FullScreenPlayerState {
-    actions: {
-        setStore: (data: Partial<FullScreenPlayerSlice>) => void;
-    };
-}
-
 export const useFullScreenPlayerStore = create<FullScreenPlayerSlice>()(
     persist(
         devtools(
diff --git a/src/renderer/store/index.ts b/src/renderer/store/index.ts
index 61a484fd..44ba7331 100644
--- a/src/renderer/store/index.ts
+++ b/src/renderer/store/index.ts
@@ -1,9 +1,9 @@
-export * from './auth.store';
-export * from './player.store';
-export * from './app.store';
-export * from './list.store';
-export * from './playlist.store';
-export * from './album-list-data.store';
 export * from './album-artist-list-data.store';
+export * from './album-list-data.store';
+export * from './app.store';
+export * from './auth.store';
 export * from './full-screen-player.store';
+export * from './list.store';
+export * from './player.store';
+export * from './playlist.store';
 export * from './settings.store';
diff --git a/src/renderer/store/list.store.ts b/src/renderer/store/list.store.ts
index 506bd967..c1fdfca5 100644
--- a/src/renderer/store/list.store.ts
+++ b/src/renderer/store/list.store.ts
@@ -2,6 +2,7 @@ import { create } from 'zustand';
 import { devtools, persist } from 'zustand/middleware';
 import { immer } from 'zustand/middleware/immer';
 import { shallow } from 'zustand/shallow';
+
 import {
     AlbumArtistListArgs,
     AlbumArtistListSort,
@@ -18,33 +19,18 @@ import {
     SortOrder,
 } from '/@/renderer/api/types';
 import { DataTableProps, PersistedTableColumn } from '/@/renderer/store/settings.store';
-import { ListDisplayType, TableColumn, TablePagination } from '/@/renderer/types';
 import { mergeOverridingColumns } from '/@/renderer/store/utils';
+import { ListDisplayType, TableColumn, TablePagination } from '/@/renderer/types';
 
 export const generatePageKey = (page: string, id?: string) => {
     return id ? `${page}_${id}` : page;
 };
 
-export type AlbumListFilter = Omit<AlbumListArgs['query'], 'startIndex' | 'limit'>;
-export type SongListFilter = Omit<SongListArgs['query'], 'startIndex' | 'limit'>;
-export type AlbumArtistListFilter = Omit<AlbumArtistListArgs['query'], 'startIndex' | 'limit'>;
-export type ArtistListFilter = Omit<ArtistListArgs['query'], 'startIndex' | 'limit'>;
-export type PlaylistListFilter = Omit<PlaylistListArgs['query'], 'startIndex' | 'limit'>;
-export type GenreListFilter = Omit<GenreListArgs['query'], 'startIndex' | 'limit'>;
-
-type FilterType =
-    | AlbumListFilter
-    | SongListFilter
-    | AlbumArtistListFilter
-    | ArtistListFilter
-    | PlaylistListFilter
-    | GenreListFilter;
-
-export type ListTableProps = {
-    pagination: TablePagination;
-    scrollOffset: number;
-} & DataTableProps;
-
+export type AlbumArtistListFilter = Omit<AlbumArtistListArgs['query'], 'limit' | 'startIndex'>;
+export type AlbumListFilter = Omit<AlbumListArgs['query'], 'limit' | 'startIndex'>;
+export type ArtistListFilter = Omit<ArtistListArgs['query'], 'limit' | 'startIndex'>;
+export type GenreListFilter = Omit<GenreListArgs['query'], 'limit' | 'startIndex'>;
+export type ListDeterministicArgs = { key: ListKey };
 export type ListGridProps = {
     itemGap?: number;
     itemSize?: number;
@@ -59,6 +45,35 @@ export type ListItemProps<TFilter = any> = {
     table: ListTableProps;
 };
 
+export type ListKey = keyof ListState['item'] | string;
+
+export interface ListSlice extends ListState {
+    _actions: {
+        getFilter: (args: {
+            customFilters?: Record<any, any>;
+            id?: string;
+            itemType: LibraryItem;
+            key?: string;
+        }) => FilterType;
+        resetFilter: () => void;
+        setDisplayType: (args: ListDeterministicArgs & { data: ListDisplayType }) => void;
+        setFilter: (
+            args: ListDeterministicArgs & {
+                customFilters?: Record<any, any>;
+                data: Partial<FilterType>;
+                itemType: LibraryItem;
+            },
+        ) => FilterType;
+        setGrid: (args: ListDeterministicArgs & { data: Partial<ListGridProps> }) => void;
+        setStore: (data: Partial<ListSlice>) => void;
+        setTable: (args: ListDeterministicArgs & { data: Partial<ListTableProps> }) => void;
+        setTableColumns: (args: ListDeterministicArgs & { data: PersistedTableColumn[] }) => void;
+        setTablePagination: (
+            args: ListDeterministicArgs & { data: Partial<TablePagination> },
+        ) => void;
+    };
+}
+
 export interface ListState {
     detail: {
         [key: string]: Omit<ListItemProps<any>, 'display'>;
@@ -75,36 +90,22 @@ export interface ListState {
     };
 }
 
-export type ListKey = keyof ListState['item'] | string;
+export type ListTableProps = DataTableProps & {
+    pagination: TablePagination;
+    scrollOffset: number;
+};
 
-export type ListDeterministicArgs = { key: ListKey };
+export type PlaylistListFilter = Omit<PlaylistListArgs['query'], 'limit' | 'startIndex'>;
 
-export interface ListSlice extends ListState {
-    _actions: {
-        getFilter: (args: {
-            customFilters?: Record<any, any>;
-            id?: string;
-            itemType: LibraryItem;
-            key?: string;
-        }) => FilterType;
-        resetFilter: () => void;
-        setDisplayType: (args: { data: ListDisplayType } & ListDeterministicArgs) => void;
-        setFilter: (
-            args: {
-                customFilters?: Record<any, any>;
-                data: Partial<FilterType>;
-                itemType: LibraryItem;
-            } & ListDeterministicArgs,
-        ) => FilterType;
-        setGrid: (args: { data: Partial<ListGridProps> } & ListDeterministicArgs) => void;
-        setStore: (data: Partial<ListSlice>) => void;
-        setTable: (args: { data: Partial<ListTableProps> } & ListDeterministicArgs) => void;
-        setTableColumns: (args: { data: PersistedTableColumn[] } & ListDeterministicArgs) => void;
-        setTablePagination: (
-            args: { data: Partial<TablePagination> } & ListDeterministicArgs,
-        ) => void;
-    };
-}
+export type SongListFilter = Omit<SongListArgs['query'], 'limit' | 'startIndex'>;
+
+type FilterType =
+    | AlbumArtistListFilter
+    | AlbumListFilter
+    | ArtistListFilter
+    | GenreListFilter
+    | PlaylistListFilter
+    | SongListFilter;
 
 export const useListStore = create<ListSlice>()(
     persist(
@@ -678,7 +679,7 @@ export const useListStoreByKey = <TFilter>(args: {
 };
 
 export const useListFilterByKey = <TFilter>(args: {
-    filter?: Partial<TFilter> | any;
+    filter?: any | Partial<TFilter>;
     key: string;
 }): TFilter => {
     const key = args.key as keyof ListState['item'];
diff --git a/src/renderer/store/player.store.ts b/src/renderer/store/player.store.ts
index 410340cd..cc61adc4 100644
--- a/src/renderer/store/player.store.ts
+++ b/src/renderer/store/player.store.ts
@@ -6,34 +6,9 @@ import { create } from 'zustand';
 import { devtools, persist, subscribeWithSelector } from 'zustand/middleware';
 import { immer } from 'zustand/middleware/immer';
 import { shallow } from 'zustand/shallow';
-import { QueueSong } from '/@/renderer/api/types';
-import { PlayerStatus, PlayerRepeat, PlayerShuffle, Play } from '/@/renderer/types';
 
-export interface PlayerState {
-    current: {
-        index: number;
-        nextIndex: number;
-        player: 1 | 2;
-        previousIndex: number;
-        seek: boolean;
-        shuffledIndex: number;
-        song?: QueueSong;
-        status: PlayerStatus;
-        time: number;
-    };
-    fallback: boolean | null;
-    muted: boolean;
-    queue: {
-        default: QueueSong[];
-        previousNode?: QueueSong;
-        shuffled: string[];
-        sorted: QueueSong[];
-    };
-    repeat: PlayerRepeat;
-    shuffle: PlayerShuffle;
-    speed: number;
-    volume: number;
-}
+import { QueueSong } from '/@/renderer/api/types';
+import { Play, PlayerRepeat, PlayerShuffle, PlayerStatus } from '/@/renderer/types';
 
 export interface PlayerData {
     current: {
@@ -50,13 +25,6 @@ export interface PlayerData {
     queue: QueueData;
 }
 
-export interface QueueData {
-    current?: QueueSong;
-    length: number;
-    next?: QueueSong;
-    previous?: QueueSong;
-}
-
 export interface PlayerSlice extends PlayerState {
     actions: {
         addToQueue: (args: {
@@ -90,7 +58,7 @@ export interface PlayerSlice extends PlayerState {
         setFallback: (fallback: boolean | null) => boolean;
         setFavorite: (ids: string[], favorite: boolean) => string[];
         setMuted: (muted: boolean) => void;
-        setRating: (ids: string[], rating: number | null) => string[];
+        setRating: (ids: string[], rating: null | number) => string[];
         setRepeat: (type: PlayerRepeat) => PlayerData;
         setShuffle: (type: PlayerShuffle) => PlayerData;
         setShuffledIndex: (index: number) => PlayerData;
@@ -100,6 +68,39 @@ export interface PlayerSlice extends PlayerState {
     };
 }
 
+export interface PlayerState {
+    current: {
+        index: number;
+        nextIndex: number;
+        player: 1 | 2;
+        previousIndex: number;
+        seek: boolean;
+        shuffledIndex: number;
+        song?: QueueSong;
+        status: PlayerStatus;
+        time: number;
+    };
+    fallback: boolean | null;
+    muted: boolean;
+    queue: {
+        default: QueueSong[];
+        previousNode?: QueueSong;
+        shuffled: string[];
+        sorted: QueueSong[];
+    };
+    repeat: PlayerRepeat;
+    shuffle: PlayerShuffle;
+    speed: number;
+    volume: number;
+}
+
+export interface QueueData {
+    current?: QueueSong;
+    length: number;
+    next?: QueueSong;
+    previous?: QueueSong;
+}
+
 export const usePlayerStore = create<PlayerSlice>()(
     subscribeWithSelector(
         persist(
diff --git a/src/renderer/store/playlist.store.ts b/src/renderer/store/playlist.store.ts
index e4d36d4e..d7447851 100644
--- a/src/renderer/store/playlist.store.ts
+++ b/src/renderer/store/playlist.store.ts
@@ -1,48 +1,12 @@
 import { create } from 'zustand';
 import { devtools, persist } from 'zustand/middleware';
 import { immer } from 'zustand/middleware/immer';
+
 import { PlaylistListSort, SortOrder } from '/@/renderer/api/types';
 import { PlaylistListFilter, SongListFilter } from '/@/renderer/store/list.store';
 import { DataTableProps } from '/@/renderer/store/settings.store';
-import { ListDisplayType, TableColumn, TablePagination } from '/@/renderer/types';
 import { mergeOverridingColumns } from '/@/renderer/store/utils';
-
-type TableProps = {
-    pagination: TablePagination;
-    scrollOffset: number;
-} & DataTableProps;
-
-type ListProps<T> = {
-    display: ListDisplayType;
-    filter: T;
-    table: TableProps;
-};
-
-type DetailPaginationProps = TablePagination & {
-    scrollOffset: number;
-};
-
-type DetailTableProps = DataTableProps & {
-    id: {
-        [key: string]: DetailPaginationProps & { filter: SongListFilter };
-    };
-};
-
-type DetailProps = {
-    display: ListDisplayType;
-    table: DetailTableProps;
-};
-
-type ListGridProps = {
-    itemsPerRow?: number;
-    scrollOffset?: number;
-};
-
-interface PlaylistState {
-    detail: DetailProps;
-    grid: ListGridProps;
-    list: ListProps<PlaylistListFilter>;
-}
+import { ListDisplayType, TableColumn, TablePagination } from '/@/renderer/types';
 
 export interface PlaylistSlice extends PlaylistState {
     actions: {
@@ -57,6 +21,43 @@ export interface PlaylistSlice extends PlaylistState {
     };
 }
 
+type DetailPaginationProps = TablePagination & {
+    scrollOffset: number;
+};
+
+type DetailProps = {
+    display: ListDisplayType;
+    table: DetailTableProps;
+};
+
+type DetailTableProps = DataTableProps & {
+    id: {
+        [key: string]: DetailPaginationProps & { filter: SongListFilter };
+    };
+};
+
+type ListGridProps = {
+    itemsPerRow?: number;
+    scrollOffset?: number;
+};
+
+type ListProps<T> = {
+    display: ListDisplayType;
+    filter: T;
+    table: TableProps;
+};
+
+interface PlaylistState {
+    detail: DetailProps;
+    grid: ListGridProps;
+    list: ListProps<PlaylistListFilter>;
+}
+
+type TableProps = DataTableProps & {
+    pagination: TablePagination;
+    scrollOffset: number;
+};
+
 export const usePlaylistStore = create<PlaylistSlice>()(
     persist(
         devtools(
diff --git a/src/renderer/store/settings.store.ts b/src/renderer/store/settings.store.ts
index b5fe9c32..7914d916 100644
--- a/src/renderer/store/settings.store.ts
+++ b/src/renderer/store/settings.store.ts
@@ -1,5 +1,5 @@
-/* eslint-disable prefer-destructuring */
-/* eslint-disable @typescript-eslint/no-unused-vars */
+import type { ContextMenuItemType } from '/@/renderer/features/context-menu';
+
 import { ColDef } from '@ag-grid-community/core';
 import isElectron from 'is-electron';
 import { generatePath } from 'react-router';
@@ -7,26 +7,26 @@ import { create } from 'zustand';
 import { devtools, persist } from 'zustand/middleware';
 import { immer } from 'zustand/middleware/immer';
 import { shallow } from 'zustand/shallow';
+
+import i18n from '/@/i18n/i18n';
 import { LibraryItem, LyricSource } from '/@/renderer/api/types';
 import { AppRoute } from '/@/renderer/router/routes';
+import { usePlayerStore } from '/@/renderer/store/player.store';
+import { mergeOverridingColumns } from '/@/renderer/store/utils';
 import { AppTheme } from '/@/renderer/themes/types';
 import {
-    TableColumn,
     CrossfadeStyle,
+    FontType,
+    Platform,
     Play,
     PlaybackStyle,
     PlaybackType,
+    TableColumn,
     TableType,
-    Platform,
-    FontType,
 } from '/@/renderer/types';
 import { randomString } from '/@/renderer/utils';
-import i18n from '/@/i18n/i18n';
-import { usePlayerStore } from '/@/renderer/store/player.store';
-import { mergeOverridingColumns } from '/@/renderer/store/utils';
-import type { ContextMenuItemType } from '/@/renderer/features/context-menu';
 
-const utils = isElectron() ? window.electron.utils : null;
+const utils = isElectron() ? window.api.utils : null;
 
 export type SidebarItemType = {
     disabled: boolean;
@@ -93,11 +93,6 @@ export const sidebarItems: SidebarItemType[] = [
     },
 ];
 
-export type SortableItem<T> = {
-    disabled: boolean;
-    id: T;
-};
-
 export enum HomeItem {
     MOST_PLAYED = 'mostPlayed',
     RANDOM = 'random',
@@ -105,6 +100,11 @@ export enum HomeItem {
     RECENTLY_PLAYED = 'recentlyPlayed',
 }
 
+export type SortableItem<T> = {
+    disabled: boolean;
+    id: T;
+};
+
 const homeItems = Object.values(HomeItem).map((item) => ({
     disabled: false,
     id: item,
@@ -113,10 +113,10 @@ const homeItems = Object.values(HomeItem).map((item) => ({
 /* eslint-disable typescript-sort-keys/string-enum */
 export enum ArtistItem {
     BIOGRAPHY = 'biography',
-    TOP_SONGS = 'topSongs',
-    RECENT_ALBUMS = 'recentAlbums',
     COMPILATIONS = 'compilations',
+    RECENT_ALBUMS = 'recentAlbums',
     SIMILAR_ARTISTS = 'similarArtists',
+    TOP_SONGS = 'topSongs',
 }
 /* eslint-enable typescript-sort-keys/string-enum */
 
@@ -125,32 +125,6 @@ const artistItems = Object.values(ArtistItem).map((item) => ({
     id: item,
 }));
 
-export type PersistedTableColumn = {
-    column: TableColumn;
-    extraProps?: Partial<ColDef>;
-    width: number;
-};
-
-export type DataTableProps = {
-    autoFit: boolean;
-    columns: PersistedTableColumn[];
-    followCurrentSong?: boolean;
-    rowHeight: number;
-};
-
-export type SideQueueType = 'sideQueue' | 'sideDrawerQueue';
-
-type MpvSettings = {
-    audioExclusiveMode: 'yes' | 'no';
-    audioFormat?: 's16' | 's32' | 'float';
-    audioSampleRateHz?: number;
-    gaplessAudio: 'yes' | 'no' | 'weak';
-    replayGainClip: boolean;
-    replayGainFallbackDB?: number;
-    replayGainMode: 'no' | 'track' | 'album';
-    replayGainPreampDB?: number;
-};
-
 export enum BindingActions {
     BROWSER_BACK = 'browserBack',
     BROWSER_FORWARD = 'browserForward',
@@ -192,12 +166,35 @@ export enum GenreTarget {
     TRACK = 'track',
 }
 
-export type TranscodingConfig = {
-    bitrate?: number;
-    enabled: boolean;
-    format?: string;
+export type DataTableProps = {
+    autoFit: boolean;
+    columns: PersistedTableColumn[];
+    followCurrentSong?: boolean;
+    rowHeight: number;
 };
 
+export type PersistedTableColumn = {
+    column: TableColumn;
+    extraProps?: Partial<ColDef>;
+    width: number;
+};
+
+export interface SettingsSlice extends SettingsState {
+    actions: {
+        reset: () => void;
+        resetSampleRate: () => void;
+        setArtistItems: (item: SortableItem<ArtistItem>[]) => void;
+        setGenreBehavior: (target: GenreTarget) => void;
+        setHomeItems: (item: SortableItem<HomeItem>[]) => void;
+        setSettings: (data: Partial<SettingsState>) => void;
+        setSidebarItems: (items: SidebarItemType[]) => void;
+        setTable: (type: TableType, data: DataTableProps) => void;
+        setTranscodingConfig: (config: TranscodingConfig) => void;
+        toggleContextMenuItem: (item: ContextMenuItemType) => void;
+        toggleSidebarCollapseShare: () => void;
+    };
+}
+
 export interface SettingsState {
     css: {
         content: string;
@@ -205,21 +202,21 @@ export interface SettingsState {
     };
     discord: {
         clientId: string;
-        enableIdle: boolean;
         enabled: boolean;
+        enableIdle: boolean;
         showAsListening: boolean;
         showServerImage: boolean;
         updateInterval: number;
     };
     font: {
         builtIn: string;
-        custom: string | null;
-        system: string | null;
+        custom: null | string;
+        system: null | string;
         type: FontType;
     };
     general: {
         accent: string;
-        albumArtRes?: number | null;
+        albumArtRes?: null | number;
         albumBackground: boolean;
         albumBackgroundBlur: number;
         artistItems: SortableItem<ArtistItem>[];
@@ -239,11 +236,11 @@ export interface SettingsState {
         playerbarOpenDrawer: boolean;
         resume: boolean;
         showQueueDrawerButton: boolean;
-        sideQueueType: SideQueueType;
-        sidebarCollapseShared: boolean;
         sidebarCollapsedNavigation: boolean;
+        sidebarCollapseShared: boolean;
         sidebarItems: SidebarItemType[];
         sidebarPlaylistList: boolean;
+        sideQueueType: SideQueueType;
         skipButtons: {
             enabled: boolean;
             skipBackwardSeconds: number;
@@ -264,7 +261,7 @@ export interface SettingsState {
         globalMediaHotkeys: boolean;
     };
     lyrics: {
-        alignment: 'left' | 'center' | 'right';
+        alignment: 'center' | 'left' | 'right';
         delayMs: number;
         fetch: boolean;
         follow: boolean;
@@ -276,11 +273,11 @@ export interface SettingsState {
         showProvider: boolean;
         sources: LyricSource[];
         translationApiKey: string;
-        translationApiProvider: string | null;
-        translationTargetLanguage: string | null;
+        translationApiProvider: null | string;
+        translationTargetLanguage: null | string;
     };
     playback: {
-        audioDeviceId?: string | null;
+        audioDeviceId?: null | string;
         crossfadeDuration: number;
         crossfadeStyle: CrossfadeStyle;
         mpvExtraParameters: string[];
@@ -302,7 +299,7 @@ export interface SettingsState {
         port: number;
         username: string;
     };
-    tab: 'general' | 'playback' | 'window' | 'hotkeys' | string;
+    tab: 'general' | 'hotkeys' | 'playback' | 'window' | string;
     tables: {
         albumDetail: DataTableProps;
         fullScreen: DataTableProps;
@@ -321,21 +318,24 @@ export interface SettingsState {
     };
 }
 
-export interface SettingsSlice extends SettingsState {
-    actions: {
-        reset: () => void;
-        resetSampleRate: () => void;
-        setArtistItems: (item: SortableItem<ArtistItem>[]) => void;
-        setGenreBehavior: (target: GenreTarget) => void;
-        setHomeItems: (item: SortableItem<HomeItem>[]) => void;
-        setSettings: (data: Partial<SettingsState>) => void;
-        setSidebarItems: (items: SidebarItemType[]) => void;
-        setTable: (type: TableType, data: DataTableProps) => void;
-        setTranscodingConfig: (config: TranscodingConfig) => void;
-        toggleContextMenuItem: (item: ContextMenuItemType) => void;
-        toggleSidebarCollapseShare: () => void;
-    };
-}
+export type SideQueueType = 'sideDrawerQueue' | 'sideQueue';
+
+export type TranscodingConfig = {
+    bitrate?: number;
+    enabled: boolean;
+    format?: string;
+};
+
+type MpvSettings = {
+    audioExclusiveMode: 'no' | 'yes';
+    audioFormat?: 'float' | 's16' | 's32';
+    audioSampleRateHz?: number;
+    gaplessAudio: 'no' | 'weak' | 'yes';
+    replayGainClip: boolean;
+    replayGainFallbackDB?: number;
+    replayGainMode: 'album' | 'no' | 'track';
+    replayGainPreampDB?: number;
+};
 
 // Determines the default/initial windowBarStyle value based on the current platform.
 const getPlatformDefaultWindowBarStyle = (): Platform => {
@@ -351,8 +351,8 @@ const initialState: SettingsState = {
     },
     discord: {
         clientId: '1165957668758900787',
-        enableIdle: false,
         enabled: false,
+        enableIdle: false,
         showAsListening: false,
         showServerImage: false,
         updateInterval: 15,
@@ -385,11 +385,11 @@ const initialState: SettingsState = {
         playerbarOpenDrawer: false,
         resume: false,
         showQueueDrawerButton: false,
-        sideQueueType: 'sideQueue',
-        sidebarCollapseShared: false,
         sidebarCollapsedNavigation: true,
+        sidebarCollapseShared: false,
         sidebarItems,
         sidebarPlaylistList: true,
+        sideQueueType: 'sideQueue',
         skipButtons: {
             enabled: false,
             skipBackwardSeconds: 5,
diff --git a/src/renderer/styles/global.scss b/src/renderer/styles/global.scss
index bc44ddd3..d754dd50 100644
--- a/src/renderer/styles/global.scss
+++ b/src/renderer/styles/global.scss
@@ -2,218 +2,216 @@
 @use '../themes/dark.scss';
 @use '../themes/light.scss';
 @use './ag-grid.scss';
-@use './overlayscrollbars.scss';
 
 * {
-    box-sizing: border-box;
-    margin: 0;
-    padding: 0;
+  box-sizing: border-box;
+  margin: 0;
+  padding: 0;
 }
 
 body,
 html {
-    position: absolute;
-    display: block;
-    width: 100%;
-    height: 100%;
-    overflow-x: hidden;
-    overflow-y: hidden;
-    color: var(--content-text-color);
-    background: var(--content-bg);
-    font-family: var(--content-font-family);
-    font-size: var(--root-font-size);
+  position: absolute;
+  display: block;
+  width: 100%;
+  height: 100%;
+  overflow-x: hidden;
+  overflow-y: hidden;
+  color: var(--content-text-color);
+  background: var(--content-bg);
+  font-family: var(--content-font-family);
+  font-size: var(--root-font-size);
 }
 
 @media only screen and (max-width: 639px) {
-    body,
-    html {
-        overflow-x: auto;
-    }
+  body,
+  html {
+    overflow-x: auto;
+  }
 }
 
 #app {
-    height: inherit;
+  height: inherit;
 }
 
 *,
 *:before,
 *:after {
-    box-sizing: border-box;
-    text-rendering: optimizeLegibility;
-    -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-    -webkit-text-size-adjust: none;
-    outline: none;
+  box-sizing: border-box;
+  text-rendering: optimizeLegibility;
+  -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
+  -webkit-text-size-adjust: none;
+  outline: none;
 }
 
 ::-webkit-scrollbar {
-    width: 12px;
-    height: 12px;
+  width: 12px;
+  height: 12px;
 }
 
 ::-webkit-scrollbar-corner {
-    background: var(--scrollbar-track-bg);
+  background: var(--scrollbar-track-bg);
 }
 
 ::-webkit-scrollbar-track {
-    background: var(--scrollbar-track-bg);
+  background: var(--scrollbar-track-bg);
 }
 
 ::-webkit-scrollbar-thumb {
-    background: var(--scrollbar-thumb-bg);
+  background: var(--scrollbar-thumb-bg);
 }
 
 ::-webkit-scrollbar-thumb:hover {
-    background: var(--scrollbar-thumb-bg-hover);
+  background: var(--scrollbar-thumb-bg-hover);
 }
 
 a {
-    text-decoration: none;
+  text-decoration: none;
 }
 
 button {
-    -webkit-app-region: no-drag;
+  -webkit-app-region: no-drag;
 }
 
 .hide-scrollbar {
-    &::-webkit-scrollbar-track {
-        background: transparent;
-    }
+  &::-webkit-scrollbar-track {
+    background: transparent;
+  }
 
-    &::-webkit-scrollbar-thumb {
-        background-color: transparent;
-    }
+  &::-webkit-scrollbar-thumb {
+    background-color: transparent;
+  }
 }
 
 @keyframes fadeIn {
-    from {
-        opacity: 0;
-    }
-    to {
-        opacity: 1;
-    }
+  from {
+    opacity: 0;
+  }
+  to {
+    opacity: 1;
+  }
 }
 
 @keyframes fadeOut {
-    from {
-        opacity: 1;
-    }
-    to {
-        opacity: 0;
-    }
+  from {
+    opacity: 1;
+  }
+  to {
+    opacity: 0;
+  }
 }
 
 .mantine-ScrollArea-thumb[data-state='visible'] {
-    animation: fadeIn 0.3s forwards;
+  animation: fadeIn 0.3s forwards;
 }
 
 .mantine-ScrollArea-scrollbar[data-state='hidden'] {
-    animation: fadeOut 0.2s forwards;
+  animation: fadeOut 0.2s forwards;
 }
 
 @font-face {
-    font-family: 'Archivo';
-    src: url('../fonts/Archivo-VariableFont_wdth,wght.ttf') format('truetype-variations');
-    font-weight: 100 1000;
+  font-family: 'Archivo';
+  src: url('../fonts/Archivo-VariableFont_wdth,wght.ttf') format('truetype-variations');
+  font-weight: 100 1000;
 }
 
 @font-face {
-    font-family: 'Raleway';
-    src: url('../fonts/Raleway-VariableFont_wght.ttf') format('truetype-variations');
-    font-weight: 100 1000;
+  font-family: 'Raleway';
+  src: url('../fonts/Raleway-VariableFont_wght.ttf') format('truetype-variations');
+  font-weight: 100 1000;
 }
 
 @font-face {
-    font-family: 'Fredoka';
-    src: url('../fonts/Fredoka-VariableFont_wdth,wght.ttf') format('truetype-variations');
-    font-weight: 100 1000;
+  font-family: 'Fredoka';
+  src: url('../fonts/Fredoka-VariableFont_wdth,wght.ttf') format('truetype-variations');
+  font-weight: 100 1000;
 }
 
 @font-face {
-    font-family: 'League Spartan';
-    src: url('../fonts/LeagueSpartan-VariableFont_wght.ttf') format('truetype-variations');
-    font-weight: 100 1000;
+  font-family: 'League Spartan';
+  src: url('../fonts/LeagueSpartan-VariableFont_wght.ttf') format('truetype-variations');
+  font-weight: 100 1000;
 }
 
 @font-face {
-    font-family: 'Lexend';
-    src: url('../fonts/Lexend-VariableFont_wght.ttf') format('truetype-variations');
-    font-weight: 100 1000;
+  font-family: 'Lexend';
+  src: url('../fonts/Lexend-VariableFont_wght.ttf') format('truetype-variations');
+  font-weight: 100 1000;
 }
 
 @font-face {
-    font-family: 'Inter';
-    src: url('../fonts/Inter-VariableFont_slnt,wght.ttf') format('truetype-variations');
-    font-weight: 100 1000;
+  font-family: 'Inter';
+  src: url('../fonts/Inter-VariableFont_slnt,wght.ttf') format('truetype-variations');
+  font-weight: 100 1000;
 }
 
 @font-face {
-    font-family: 'Sora';
-    src: url('../fonts/Sora-VariableFont_wght.ttf') format('truetype-variations');
-    font-weight: 100 1000;
+  font-family: 'Sora';
+  src: url('../fonts/Sora-VariableFont_wght.ttf') format('truetype-variations');
+  font-weight: 100 1000;
 }
 
 @font-face {
-    font-family: 'Work Sans';
-    src: url('../fonts/WorkSans-VariableFont_wght.ttf') format('truetype-variations');
-    font-weight: 100 1000;
+  font-family: 'Work Sans';
+  src: url('../fonts/WorkSans-VariableFont_wght.ttf') format('truetype-variations');
+  font-weight: 100 1000;
 }
 
 @font-face {
-    font-family: 'Poppins';
-    font-style: normal;
-    font-weight: 400;
-    font-display: swap;
-    src: url('../fonts/Poppins-Regular.ttf') format('truetype');
+  font-family: 'Poppins';
+  font-style: normal;
+  font-weight: 400;
+  font-display: swap;
+  src: url('../fonts/Poppins-Regular.ttf') format('truetype');
 }
 
 @font-face {
-    font-family: 'Poppins';
-    font-style: normal;
-    font-weight: 600;
-    font-display: swap;
-    src: url('../fonts/Poppins-SemiBold.ttf') format('truetype');
+  font-family: 'Poppins';
+  font-style: normal;
+  font-weight: 600;
+  font-display: swap;
+  src: url('../fonts/Poppins-SemiBold.ttf') format('truetype');
 }
 
 @font-face {
-    font-family: 'Poppins';
-    font-style: normal;
-    font-weight: 700;
-    font-display: swap;
-    src: url('../fonts/Poppins-Bold.ttf') format('truetype');
+  font-family: 'Poppins';
+  font-style: normal;
+  font-weight: 700;
+  font-display: swap;
+  src: url('../fonts/Poppins-Bold.ttf') format('truetype');
 }
 
 @font-face {
-    font-family: 'Poppins';
-    font-style: normal;
-    font-weight: 800;
-    font-display: swap;
-    src: url('../fonts/Poppins-ExtraBold.ttf') format('truetype');
+  font-family: 'Poppins';
+  font-style: normal;
+  font-weight: 800;
+  font-display: swap;
+  src: url('../fonts/Poppins-ExtraBold.ttf') format('truetype');
 }
 
 @font-face {
-    font-family: 'Poppins';
-    font-style: normal;
-    font-weight: 900;
-    font-display: swap;
-    src: url('../fonts/Poppins-Black.ttf') format('truetype');
+  font-family: 'Poppins';
+  font-style: normal;
+  font-weight: 900;
+  font-display: swap;
+  src: url('../fonts/Poppins-Black.ttf') format('truetype');
 }
 
 @font-face {
-    font-family: 'Raleway';
-    src: url('../fonts/Raleway-VariableFont_wght.ttf') format('truetype-variations');
-    font-weight: 100 1000;
+  font-family: 'Raleway';
+  src: url('../fonts/Raleway-VariableFont_wght.ttf') format('truetype-variations');
+  font-weight: 100 1000;
 }
 
 @font-face {
-    font-family: 'DroidSerif';
-    src: url('https://rawgit.com/google/fonts/master/ufl/ubuntumono/UbuntuMono-Italic.ttf')
-        format('truetype');
-    unicode-range: U+000-5FF; /* Latin glyphs */
+  font-family: 'DroidSerif';
+  src: url('https://rawgit.com/google/fonts/master/ufl/ubuntumono/UbuntuMono-Italic.ttf')
+    format('truetype');
+  unicode-range: U+000-5FF; /* Latin glyphs */
 }
 
 @font-face {
-    font-family: 'DroidSerif';
-    src: url('https://fonts.gstatic.com/ea/notosansjp/v5/NotoSansJP-Regular.woff2')
-        format('truetype');
-    unicode-range: U+3000-9FFF, U+ff??; /* Japanese glyphs */
+  font-family: 'DroidSerif';
+  src: url('https://fonts.gstatic.com/ea/notosansjp/v5/NotoSansJP-Regular.woff2') format('truetype');
+  unicode-range: U+3000-9FFF, U+ff??; /* Japanese glyphs */
 }
diff --git a/src/renderer/styles/overlayscrollbars.scss b/src/renderer/styles/overlayscrollbars.css
similarity index 100%
rename from src/renderer/styles/overlayscrollbars.scss
rename to src/renderer/styles/overlayscrollbars.css
diff --git a/src/renderer/types.ts b/src/renderer/types.ts
index b6da94fe..dd0cd400 100644
--- a/src/renderer/types.ts
+++ b/src/renderer/types.ts
@@ -1,4 +1,5 @@
 import { ReactNode } from 'react';
+
 import { ServerFeatures } from '/@/renderer/api/features-types';
 import {
     Album,
@@ -11,38 +12,6 @@ import {
 } from '/@/renderer/api/types';
 import { AppRoute } from '/@/renderer/router/routes';
 
-export type TablePagination = {
-    currentPage: number;
-    itemsPerPage: number;
-    totalItems: number;
-    totalPages: number;
-};
-
-export type RouteSlug = {
-    idProperty: string;
-    slugProperty: string;
-};
-
-export type CardRoute = {
-    route: AppRoute | string;
-    slugs?: RouteSlug[];
-};
-
-export type TableType =
-    | 'nowPlaying'
-    | 'sideQueue'
-    | 'sideDrawerQueue'
-    | 'songs'
-    | 'fullScreen'
-    | 'albumDetail';
-
-export type CardRow<T> = {
-    arrayProperty?: string;
-    format?: (value: T) => ReactNode;
-    property: keyof T;
-    route?: CardRoute;
-};
-
 export enum ListDisplayType {
     CARD = 'card',
     POSTER = 'poster',
@@ -63,7 +32,39 @@ export enum ServerType {
     SUBSONIC = 'subsonic',
 }
 
-export const toServerType = (value?: string): ServerType | null => {
+export type CardRoute = {
+    route: AppRoute | string;
+    slugs?: RouteSlug[];
+};
+
+export type CardRow<T> = {
+    arrayProperty?: string;
+    format?: (value: T) => ReactNode;
+    property: keyof T;
+    route?: CardRoute;
+};
+
+export type RouteSlug = {
+    idProperty: string;
+    slugProperty: string;
+};
+
+export type TablePagination = {
+    currentPage: number;
+    itemsPerPage: number;
+    totalItems: number;
+    totalPages: number;
+};
+
+export type TableType =
+    | 'albumDetail'
+    | 'fullScreen'
+    | 'nowPlaying'
+    | 'sideDrawerQueue'
+    | 'sideQueue'
+    | 'songs';
+
+export const toServerType = (value?: string): null | ServerType => {
     switch (value?.toLowerCase()) {
         case ServerType.JELLYFIN:
             return ServerType.JELLYFIN;
@@ -76,23 +77,42 @@ export const toServerType = (value?: string): ServerType | null => {
     }
 };
 
-export type ServerListItem = {
-    credential: string;
-    features?: ServerFeatures;
-    id: string;
-    name: string;
-    ndCredential?: string;
-    savePassword?: boolean;
-    type: ServerType;
-    url: string;
-    userId: string | null;
-    username: string;
-    version?: string;
-};
+export enum AuthState {
+    INVALID = 'invalid',
+    LOADING = 'loading',
+    VALID = 'valid',
+}
 
-export enum PlayerStatus {
-    PAUSED = 'paused',
-    PLAYING = 'playing',
+export enum CrossfadeStyle {
+    CONSTANT_POWER = 'constantPower',
+    CONSTANT_POWER_SLOW_CUT = 'constantPowerSlowCut',
+    CONSTANT_POWER_SLOW_FADE = 'constantPowerSlowFade',
+    DIPPED = 'dipped',
+    EQUALPOWER = 'equalPower',
+    LINEAR = 'linear',
+}
+
+export enum FontType {
+    BUILT_IN = 'builtIn',
+    CUSTOM = 'custom',
+    SYSTEM = 'system',
+}
+
+export enum Play {
+    LAST = 'last',
+    NEXT = 'next',
+    NOW = 'now',
+    SHUFFLE = 'shuffle',
+}
+
+export enum PlaybackStyle {
+    CROSSFADE = 'crossfade',
+    GAPLESS = 'gapless',
+}
+
+export enum PlaybackType {
+    LOCAL = 'local',
+    WEB = 'web',
 }
 
 export enum PlayerRepeat {
@@ -107,50 +127,11 @@ export enum PlayerShuffle {
     TRACK = 'track',
 }
 
-export enum Play {
-    LAST = 'last',
-    NEXT = 'next',
-    NOW = 'now',
-    SHUFFLE = 'shuffle',
+export enum PlayerStatus {
+    PAUSED = 'paused',
+    PLAYING = 'playing',
 }
 
-export enum CrossfadeStyle {
-    CONSTANT_POWER = 'constantPower',
-    CONSTANT_POWER_SLOW_CUT = 'constantPowerSlowCut',
-    CONSTANT_POWER_SLOW_FADE = 'constantPowerSlowFade',
-    DIPPED = 'dipped',
-    EQUALPOWER = 'equalPower',
-    LINEAR = 'linear',
-}
-
-export enum PlaybackStyle {
-    CROSSFADE = 'crossfade',
-    GAPLESS = 'gapless',
-}
-
-export enum PlaybackType {
-    LOCAL = 'local',
-    WEB = 'web',
-}
-
-export interface UniqueId {
-    uniqueId: string;
-}
-
-export type QueryBuilderRule = {
-    field?: string | null;
-    operator?: string | null;
-    uniqueId: string;
-    value?: string | number | Date | undefined | null | any;
-};
-
-export type QueryBuilderGroup = {
-    group: QueryBuilderGroup[];
-    rules: QueryBuilderRule[];
-    type: 'any' | 'all';
-    uniqueId: string;
-};
-
 export enum TableColumn {
     ACTIONS = 'actions',
     ALBUM = 'album',
@@ -184,18 +165,6 @@ export enum TableColumn {
     YEAR = 'releaseYear',
 }
 
-export type PlayQueueAddOptions = {
-    byData?: QueueSong[];
-    byItemType?: {
-        id: string[];
-        type: LibraryItem;
-    };
-    initialIndex?: number;
-    initialSongId?: string;
-    playType: Play;
-    query?: Record<string, any>;
-};
-
 export type GridCardData = {
     cardControls: any;
     cardRows: CardRow<Album | AlbumArtist | Artist | Playlist | Song>[];
@@ -214,6 +183,46 @@ export type GridCardData = {
     route: CardRoute;
 };
 
+export type PlayQueueAddOptions = {
+    byData?: QueueSong[];
+    byItemType?: {
+        id: string[];
+        type: LibraryItem;
+    };
+    initialIndex?: number;
+    initialSongId?: string;
+    playType: Play;
+    query?: Record<string, any>;
+};
+
+export type QueryBuilderGroup = {
+    group: QueryBuilderGroup[];
+    rules: QueryBuilderRule[];
+    type: 'all' | 'any';
+    uniqueId: string;
+};
+
+export type QueryBuilderRule = {
+    field?: null | string;
+    operator?: null | string;
+    uniqueId: string;
+    value?: any | Date | null | number | string | undefined;
+};
+
+export type ServerListItem = {
+    credential: string;
+    features?: ServerFeatures;
+    id: string;
+    name: string;
+    ndCredential?: string;
+    savePassword?: boolean;
+    type: ServerType;
+    url: string;
+    userId: null | string;
+    username: string;
+    version?: string;
+};
+
 export type SongState = {
     position?: number;
     repeat?: PlayerRepeat;
@@ -224,18 +233,10 @@ export type SongState = {
     volume?: number;
 };
 
-export enum FontType {
-    BUILT_IN = 'builtIn',
-    CUSTOM = 'custom',
-    SYSTEM = 'system',
-}
-
 export type TitleTheme = 'dark' | 'light' | 'system';
 
-export enum AuthState {
-    INVALID = 'invalid',
-    LOADING = 'loading',
-    VALID = 'valid',
+export interface UniqueId {
+    uniqueId: string;
 }
 
 export type WebAudio = {
diff --git a/src/renderer/types/emotion.d.ts b/src/renderer/types/emotion.d.ts
index c8dc6c2c..ee47a66e 100644
--- a/src/renderer/types/emotion.d.ts
+++ b/src/renderer/types/emotion.d.ts
@@ -2,6 +2,5 @@ import '@emotion/react';
 import type { MantineTheme } from '@mantine/core';
 
 declare module '@emotion/react' {
-    // eslint-disable-next-line @typescript-eslint/no-empty-interface
     export interface GREY extends MantineTheme {}
 }
diff --git a/src/renderer/utils/format.tsx b/src/renderer/utils/format.tsx
index 3e983b47..20386b99 100644
--- a/src/renderer/utils/format.tsx
+++ b/src/renderer/utils/format.tsx
@@ -1,8 +1,10 @@
+import type { Album, AlbumArtist, Song } from '/@/renderer/api/types';
+
 import dayjs from 'dayjs';
 import relativeTime from 'dayjs/plugin/relativeTime';
 import utc from 'dayjs/plugin/utc';
 import formatDuration from 'format-duration';
-import type { Album, AlbumArtist, Song } from '/@/renderer/api/types';
+
 import { Rating } from '/@/renderer/components/rating';
 
 dayjs.extend(relativeTime);
@@ -19,13 +21,13 @@ const getDateFormat = (key: string): string => {
     return FORMATS[dashes];
 };
 
-export const formatDateAbsolute = (key: string | null) =>
+export const formatDateAbsolute = (key: null | string) =>
     key ? dayjs(key).format(getDateFormat(key)) : '';
 
-export const formatDateAbsoluteUTC = (key: string | null) =>
+export const formatDateAbsoluteUTC = (key: null | string) =>
     key ? dayjs.utc(key).format(getDateFormat(key)) : '';
 
-export const formatDateRelative = (key: string | null) => (key ? dayjs(key).fromNow() : '');
+export const formatDateRelative = (key: null | string) => (key ? dayjs(key).fromNow() : '');
 
 export const formatDurationString = (duration: number) => {
     const rawDuration = formatDuration(duration).split(':');
diff --git a/src/renderer/utils/index.ts b/src/renderer/utils/index.ts
index 46e06c13..d9eebe6f 100644
--- a/src/renderer/utils/index.ts
+++ b/src/renderer/utils/index.ts
@@ -1,10 +1,10 @@
-export * from './random-string';
-export * from './normalize-server-url';
-export * from './set-local-storage-setttings';
 export * from './constrain-sidebar-width';
-export * from './title-case';
+export * from './format';
 export * from './get-header-color';
+export * from './normalize-server-url';
 export * from './parse-search-params';
+export * from './random-string';
 export * from './rgb-to-rgba';
 export * from './sentence-case';
-export * from './format';
+export * from './set-local-storage-setttings';
+export * from './title-case';
diff --git a/src/renderer/utils/linkify.tsx b/src/renderer/utils/linkify.tsx
index 601ebff1..558432d4 100644
--- a/src/renderer/utils/linkify.tsx
+++ b/src/renderer/utils/linkify.tsx
@@ -19,8 +19,8 @@ export const replaceURLWithHTMLLinks = (text: string) => {
         const prefix = link.startsWith('http') ? '' : 'https://';
         elements.push(
             <a
-                key={lastIndex}
                 href={prefix + link}
+                key={lastIndex}
                 rel="noopener noreferrer"
                 target="_blank"
             >
diff --git a/src/renderer/utils/set-transcoded-queue-data.ts b/src/renderer/utils/set-transcoded-queue-data.ts
index 0fb6b30e..420f4742 100644
--- a/src/renderer/utils/set-transcoded-queue-data.ts
+++ b/src/renderer/utils/set-transcoded-queue-data.ts
@@ -1,9 +1,11 @@
-import isElectron from 'is-electron';
-import { getServerById, PlayerData, useSettingsStore } from '/@/renderer/store';
 import type { QueueSong } from '/@/renderer/api/types';
-import { api } from '/@/renderer/api';
 
-const mpvPlayer = isElectron() ? window.electron.mpvPlayer : null;
+import isElectron from 'is-electron';
+
+import { api } from '/@/renderer/api';
+import { getServerById, PlayerData, useSettingsStore } from '/@/renderer/store';
+
+const mpvPlayer = isElectron() ? window.api.mpvPlayer : null;
 
 const modifyUrl = (song: QueueSong): string => {
     const transcode = useSettingsStore.getState().playback.transcode;
diff --git a/tsconfig.json b/tsconfig.json
index 8c5dbfe2..31bac6e9 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,28 +1,4 @@
 {
-    "compilerOptions": {
-        "target": "es2021",
-        "module": "commonjs",
-        "lib": ["dom", "es2021", "WebWorker"],
-        "baseUrl": "./src",
-        "paths": {
-            "/@/*": ["*"]
-        },
-        "declaration": true,
-        "declarationMap": true,
-        "jsx": "react-jsx",
-        "strict": true,
-        "pretty": true,
-        "sourceMap": true,
-        "noUnusedLocals": true,
-        "noUnusedParameters": true,
-        "noImplicitReturns": true,
-        "noFallthroughCasesInSwitch": true,
-        "moduleResolution": "node",
-        "esModuleInterop": true,
-        "allowSyntheticDefaultImports": true,
-        "resolveJsonModule": true,
-        "allowJs": true,
-        "outDir": "release/app/dist"
-    },
-    "exclude": ["test", "release/build", "release/app/dist", ".erb/dll", "server"]
+  "files": [],
+  "references": [{ "path": "./tsconfig.node.json" }, { "path": "./tsconfig.web.json" }]
 }
diff --git a/tsconfig.node.json b/tsconfig.node.json
new file mode 100644
index 00000000..e2771862
--- /dev/null
+++ b/tsconfig.node.json
@@ -0,0 +1,8 @@
+{
+  "extends": "@electron-toolkit/tsconfig/tsconfig.node.json",
+  "include": ["electron.vite.config.*", "src/main/**/*", "src/preload/**/*", "src/i18n/**/*"],
+  "compilerOptions": {
+    "composite": true,
+    "types": ["electron-vite/node"]
+  }
+}
diff --git a/tsconfig.web.json b/tsconfig.web.json
new file mode 100644
index 00000000..9ba8703c
--- /dev/null
+++ b/tsconfig.web.json
@@ -0,0 +1,31 @@
+{
+  "extends": "@electron-toolkit/tsconfig/tsconfig.web.json",
+  "include": [
+    "src/renderer/env.d.ts",
+    "src/renderer/**/*",
+    "src/renderer/**/*.tsx",
+    "src/preload/*.d.ts",
+    "src/i18n/**/*",
+    "package.json"
+  ],
+  "compilerOptions": {
+    "outDir": "./out",
+    "composite": true,
+    "jsx": "react-jsx",
+    "baseUrl": ".",
+    "paths": {
+      "/@/renderer/*": [
+        "src/renderer/*"
+      ],
+      "/@/main/*": [
+        "src/main/src/*"
+      ],
+      "/@/shared/*": [
+        "src/shared/src/*"
+      ],
+      "/@/i18n/*": [
+        "src/i18n/*"
+      ]
+    }
+  },
+}