diff --git a/openapitools.json b/openapitools.json
index 624d047..bd2e7d1 100644
--- a/openapitools.json
+++ b/openapitools.json
@@ -13,8 +13,8 @@
           "apiPackage": "service",
           "modelPackage": "model",
           "withSeparateModelsAndApi": true,
-          "supportsES6": true,
-          "withInterfaces": false
+          "supportsES6": false,
+          "useSingleRequestParameter": true
         }
       }
     }
diff --git a/package-lock.json b/package-lock.json
index dbf747c..439a94f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -8,29 +8,42 @@
       "name": "dex-ui-vue",
       "version": "0.0.0",
       "dependencies": {
-        "@primeuix/themes": "^1.0.3",
-        "@tailwindcss/vite": "^4.1.5",
+        "@primeuix/themes": "^1.2.1",
+        "@tailwindcss/vite": "^4.1.11",
         "@vueuse/core": "^13.5.0",
         "axios": "^1.10.0",
         "oidc-client-ts": "^3.3.0",
         "pinia": "^3.0.3",
         "primeicons": "^7.0.0",
-        "primevue": "^4.2.5",
-        "tailwindcss": "^4.1.5",
+        "primevue": "^4.3.6",
+        "tailwindcss": "^4.1.11",
         "tailwindcss-primeui": "^0.6.1",
-        "vue": "^3.5.13",
+        "vue": "^3.5.17",
         "vue-router": "^4.5.1"
       },
       "devDependencies": {
         "@openapitools/openapi-generator-cli": "^2.20.2",
-        "@vitejs/plugin-vue": "^5.2.2",
+        "@vitejs/plugin-vue": "^6.0.0",
         "@vue/tsconfig": "^0.7.0",
         "typescript": "~5.7.2",
         "unplugin-vue-components": "^28.5.0",
-        "vite": "^6.3.1",
+        "vite": "^7.0.2",
         "vue-tsc": "^2.2.8"
       }
     },
+    "node_modules/@ampproject/remapping": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
+      "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
     "node_modules/@babel/helper-string-parser": {
       "version": "7.27.1",
       "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
@@ -50,12 +63,12 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.1.tgz",
-      "integrity": "sha512-I0dZ3ZpCrJ1c04OqlNsQcKiZlsrXf/kkE4FXzID9rIOYICsAbA8mMDzhW/luRNAHdCNt7os/u8wenklZDlUVUQ==",
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.0.tgz",
+      "integrity": "sha512-jVZGvOxOuNSsuQuLRTh13nU0AogFlw32w/MT+LV6D3sP5WdbW61E77RnkbaO2dUvmPAYrBDJXGn5gGS6tH4j8g==",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.27.1"
+        "@babel/types": "^7.28.0"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -75,9 +88,9 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.27.1.tgz",
-      "integrity": "sha512-+EzkxvLNfiUeKMgy/3luqfsCWFRXLb7U6wNQTk60tovuckwB15B191tJWvpp4HjiQWdJkCxO3Wbvc6jlk3Xb2Q==",
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.0.tgz",
+      "integrity": "sha512-jYnje+JyZG5YThjHiF28oT4SIZLnYOcSBb6+SDaFIyzDVSkXQmQQYclJ2R+YxcdmK0AX6x1E5OQNtuh3jHDrUg==",
       "license": "MIT",
       "dependencies": {
         "@babel/helper-string-parser": "^7.27.1",
@@ -487,12 +500,62 @@
         "node": ">=18"
       }
     },
+    "node_modules/@isaacs/fs-minipass": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz",
+      "integrity": "sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==",
+      "license": "ISC",
+      "dependencies": {
+        "minipass": "^7.0.4"
+      },
+      "engines": {
+        "node": ">=18.0.0"
+      }
+    },
+    "node_modules/@isaacs/fs-minipass/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/@jridgewell/gen-mapping": {
+      "version": "0.3.12",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.12.tgz",
+      "integrity": "sha512-OuLGC46TjB5BbN1dH8JULVVZY4WTdkF7tV9Ys6wLL1rubZnCMstOhNHueU5bLCrnRuDhKPDM4g6sw4Bel5Gzqg==",
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/sourcemap-codec": "^1.5.0",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      }
+    },
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
     "node_modules/@jridgewell/sourcemap-codec": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
       "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
       "license": "MIT"
     },
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.29",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.29.tgz",
+      "integrity": "sha512-uw6guiW/gcAGPDhLmd77/6lW8QLeiV5RUTsAX46Db6oLhGaVj4lhnPwb184s1bkc8kdVg/+h988dro8GRDpmYQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
+      }
+    },
     "node_modules/@lukeed/csprng": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@lukeed/csprng/-/csprng-1.1.0.tgz",
@@ -683,93 +746,79 @@
       }
     },
     "node_modules/@primeuix/styled": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/@primeuix/styled/-/styled-0.5.1.tgz",
-      "integrity": "sha512-5Ftw/KSauDPClQ8F2qCyCUF7cIUEY4yLNikf0rKV7Vsb8zGYNK0dahQe7CChaR6M2Kn+NA2DSBSk76ZXqj6Uog==",
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/@primeuix/styled/-/styled-0.7.0.tgz",
+      "integrity": "sha512-xUqMdQb75izeDkNWFK1QlU15aUl5LIU97Fq68IXOhrqqLsKEBnj5ftntFZrENQW70jAHwALdWP4EOGi/poc9Tg==",
       "license": "MIT",
       "dependencies": {
-        "@primeuix/utils": "^0.5.3"
+        "@primeuix/utils": "^0.6.0"
       },
       "engines": {
         "node": ">=12.11.0"
       }
     },
-    "node_modules/@primeuix/themes": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@primeuix/themes/-/themes-1.0.3.tgz",
-      "integrity": "sha512-f/1qadrv5TFMHfvtVv4Y9zjrkeDP2BO/cuzbHBO9DYxKL6YBIPT9BjKec2K4Kg8PcfGm6CAvxAvICadJSWejRw==",
+    "node_modules/@primeuix/styles": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@primeuix/styles/-/styles-1.2.1.tgz",
+      "integrity": "sha512-Tri7pPgZgxrVmhJG8ijZZFolQ6vu27xnkGoAB9EFY8YlaKTM5iqkWzEcqdxy2KmgFWMXi+BrPHwO0RdQ6JCT+g==",
       "license": "MIT",
       "dependencies": {
-        "@primeuix/styled": "^0.5.1"
+        "@primeuix/styled": "^0.7.0"
+      }
+    },
+    "node_modules/@primeuix/themes": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@primeuix/themes/-/themes-1.2.1.tgz",
+      "integrity": "sha512-DVCFDncvag47tpag3TdufDTuvUbfKnkgzmlxAQkwuMS0IlPA3wChrf9VlL2wETg/ZpJm/tHobkJBnB9FmkiqnA==",
+      "license": "MIT",
+      "dependencies": {
+        "@primeuix/styled": "^0.7.0"
       }
     },
     "node_modules/@primeuix/utils": {
-      "version": "0.5.3",
-      "resolved": "https://registry.npmjs.org/@primeuix/utils/-/utils-0.5.3.tgz",
-      "integrity": "sha512-7SGh7734wcF1/uK6RzO6Z6CBjGQ97GDHfpyl2F1G/c7R0z9hkT/V72ypDo82AWcCS7Ta07oIjDpOCTkSVZuEGQ==",
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/@primeuix/utils/-/utils-0.6.0.tgz",
+      "integrity": "sha512-ULpB87ImNAiX36OMtyDeRceWB7N/mVlh6gGLqp/lx8UMKZlLIQH/UAFND86hYXHwNpXeNKcWfMGreb0Oc0hcZA==",
       "license": "MIT",
       "engines": {
         "node": ">=12.11.0"
       }
     },
     "node_modules/@primevue/core": {
-      "version": "4.2.5",
-      "resolved": "https://registry.npmjs.org/@primevue/core/-/core-4.2.5.tgz",
-      "integrity": "sha512-+oWBIQs5dLd2Ini4KEVOlvPILk989EHAskiFS3R/dz3jeOllJDMZFcSp8V9ddV0R3yDaPdLVkfHm2Q5t42kU2Q==",
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/@primevue/core/-/core-4.3.6.tgz",
+      "integrity": "sha512-ZuP0gqpEbIkpz9Em/O4Du+fRj0qyOl2YYuxhlELAtRg8+YkMsSJDd2ai2GM623sYRWOIwMr5rWevZGB1WqukzQ==",
       "license": "MIT",
       "dependencies": {
-        "@primeuix/styled": "^0.3.2",
-        "@primeuix/utils": "^0.3.2"
+        "@primeuix/styled": "^0.7.0",
+        "@primeuix/utils": "^0.6.0"
       },
       "engines": {
         "node": ">=12.11.0"
       },
       "peerDependencies": {
-        "vue": "^3.3.0"
-      }
-    },
-    "node_modules/@primevue/core/node_modules/@primeuix/styled": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/@primeuix/styled/-/styled-0.3.2.tgz",
-      "integrity": "sha512-ColZes0+/WKqH4ob2x8DyNYf1NENpe5ZguOvx5yCLxaP8EIMVhLjWLO/3umJiDnQU4XXMLkn2mMHHw+fhTX/mw==",
-      "license": "MIT",
-      "dependencies": {
-        "@primeuix/utils": "^0.3.2"
-      },
-      "engines": {
-        "node": ">=12.11.0"
-      }
-    },
-    "node_modules/@primevue/core/node_modules/@primeuix/utils": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/@primeuix/utils/-/utils-0.3.2.tgz",
-      "integrity": "sha512-B+nphqTQeq+i6JuICLdVWnDMjONome2sNz0xI65qIOyeB4EF12CoKRiCsxuZ5uKAkHi/0d1LqlQ9mIWRSdkavw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=12.11.0"
+        "vue": "^3.5.0"
       }
     },
     "node_modules/@primevue/icons": {
-      "version": "4.2.5",
-      "resolved": "https://registry.npmjs.org/@primevue/icons/-/icons-4.2.5.tgz",
-      "integrity": "sha512-WFbUMZhQkXf/KmwcytkjGVeJ9aGEDXjP3uweOjQZMmRdEIxFnqYYpd90wE90JE1teZn3+TVnT4ZT7ejGyEXnFQ==",
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/@primevue/icons/-/icons-4.3.6.tgz",
+      "integrity": "sha512-QVFmfikMpo4/DObMSbB5kS8MH1OoQrx8N9prEZaMvfFzD3hixxK24l2VrcS5x5/0NnP3szwZwTCmEAutCygX6A==",
       "license": "MIT",
       "dependencies": {
-        "@primeuix/utils": "^0.3.2",
-        "@primevue/core": "4.2.5"
+        "@primeuix/utils": "^0.6.0",
+        "@primevue/core": "4.3.6"
       },
       "engines": {
         "node": ">=12.11.0"
       }
     },
-    "node_modules/@primevue/icons/node_modules/@primeuix/utils": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/@primeuix/utils/-/utils-0.3.2.tgz",
-      "integrity": "sha512-B+nphqTQeq+i6JuICLdVWnDMjONome2sNz0xI65qIOyeB4EF12CoKRiCsxuZ5uKAkHi/0d1LqlQ9mIWRSdkavw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=12.11.0"
-      }
+    "node_modules/@rolldown/pluginutils": {
+      "version": "1.0.0-beta.19",
+      "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-beta.19.tgz",
+      "integrity": "sha512-3FL3mnMbPu0muGOCaKAhhFEYmqv9eTfPSJRJmANrCwtgK8VuxpsZDGK+m0LYAGoyO8+0j5uRe4PeyPDK1yA/hA==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@rollup/rollup-android-arm-eabi": {
       "version": "4.40.1",
@@ -1032,44 +1081,52 @@
       ]
     },
     "node_modules/@tailwindcss/node": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/node/-/node-4.1.5.tgz",
-      "integrity": "sha512-CBhSWo0vLnWhXIvpD0qsPephiaUYfHUX3U9anwDaHZAeuGpTiB3XmsxPAN6qX7bFhipyGBqOa1QYQVVhkOUGxg==",
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/node/-/node-4.1.11.tgz",
+      "integrity": "sha512-yzhzuGRmv5QyU9qLNg4GTlYI6STedBWRE7NjxP45CsFYYq9taI0zJXZBMqIC/c8fViNLhmrbpSFS57EoxUmD6Q==",
       "license": "MIT",
       "dependencies": {
+        "@ampproject/remapping": "^2.3.0",
         "enhanced-resolve": "^5.18.1",
         "jiti": "^2.4.2",
-        "lightningcss": "1.29.2",
-        "tailwindcss": "4.1.5"
+        "lightningcss": "1.30.1",
+        "magic-string": "^0.30.17",
+        "source-map-js": "^1.2.1",
+        "tailwindcss": "4.1.11"
       }
     },
     "node_modules/@tailwindcss/oxide": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide/-/oxide-4.1.5.tgz",
-      "integrity": "sha512-1n4br1znquEvyW/QuqMKQZlBen+jxAbvyduU87RS8R3tUSvByAkcaMTkJepNIrTlYhD+U25K4iiCIxE6BGdRYA==",
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide/-/oxide-4.1.11.tgz",
+      "integrity": "sha512-Q69XzrtAhuyfHo+5/HMgr1lAiPP/G40OMFAnws7xcFEYqcypZmdW8eGXaOUIeOl1dzPJBPENXgbjsOyhg2nkrg==",
+      "hasInstallScript": true,
       "license": "MIT",
+      "dependencies": {
+        "detect-libc": "^2.0.4",
+        "tar": "^7.4.3"
+      },
       "engines": {
         "node": ">= 10"
       },
       "optionalDependencies": {
-        "@tailwindcss/oxide-android-arm64": "4.1.5",
-        "@tailwindcss/oxide-darwin-arm64": "4.1.5",
-        "@tailwindcss/oxide-darwin-x64": "4.1.5",
-        "@tailwindcss/oxide-freebsd-x64": "4.1.5",
-        "@tailwindcss/oxide-linux-arm-gnueabihf": "4.1.5",
-        "@tailwindcss/oxide-linux-arm64-gnu": "4.1.5",
-        "@tailwindcss/oxide-linux-arm64-musl": "4.1.5",
-        "@tailwindcss/oxide-linux-x64-gnu": "4.1.5",
-        "@tailwindcss/oxide-linux-x64-musl": "4.1.5",
-        "@tailwindcss/oxide-wasm32-wasi": "4.1.5",
-        "@tailwindcss/oxide-win32-arm64-msvc": "4.1.5",
-        "@tailwindcss/oxide-win32-x64-msvc": "4.1.5"
+        "@tailwindcss/oxide-android-arm64": "4.1.11",
+        "@tailwindcss/oxide-darwin-arm64": "4.1.11",
+        "@tailwindcss/oxide-darwin-x64": "4.1.11",
+        "@tailwindcss/oxide-freebsd-x64": "4.1.11",
+        "@tailwindcss/oxide-linux-arm-gnueabihf": "4.1.11",
+        "@tailwindcss/oxide-linux-arm64-gnu": "4.1.11",
+        "@tailwindcss/oxide-linux-arm64-musl": "4.1.11",
+        "@tailwindcss/oxide-linux-x64-gnu": "4.1.11",
+        "@tailwindcss/oxide-linux-x64-musl": "4.1.11",
+        "@tailwindcss/oxide-wasm32-wasi": "4.1.11",
+        "@tailwindcss/oxide-win32-arm64-msvc": "4.1.11",
+        "@tailwindcss/oxide-win32-x64-msvc": "4.1.11"
       }
     },
     "node_modules/@tailwindcss/oxide-android-arm64": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-android-arm64/-/oxide-android-arm64-4.1.5.tgz",
-      "integrity": "sha512-LVvM0GirXHED02j7hSECm8l9GGJ1RfgpWCW+DRn5TvSaxVsv28gRtoL4aWKGnXqwvI3zu1GABeDNDVZeDPOQrw==",
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-android-arm64/-/oxide-android-arm64-4.1.11.tgz",
+      "integrity": "sha512-3IfFuATVRUMZZprEIx9OGDjG3Ou3jG4xQzNTvjDoKmU9JdmoCohQJ83MYd0GPnQIu89YoJqvMM0G3uqLRFtetg==",
       "cpu": [
         "arm64"
       ],
@@ -1083,9 +1140,9 @@
       }
     },
     "node_modules/@tailwindcss/oxide-darwin-arm64": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-arm64/-/oxide-darwin-arm64-4.1.5.tgz",
-      "integrity": "sha512-//TfCA3pNrgnw4rRJOqavW7XUk8gsg9ddi8cwcsWXp99tzdBAZW0WXrD8wDyNbqjW316Pk2hiN/NJx/KWHl8oA==",
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-arm64/-/oxide-darwin-arm64-4.1.11.tgz",
+      "integrity": "sha512-ESgStEOEsyg8J5YcMb1xl8WFOXfeBmrhAwGsFxxB2CxY9evy63+AtpbDLAyRkJnxLy2WsD1qF13E97uQyP1lfQ==",
       "cpu": [
         "arm64"
       ],
@@ -1099,9 +1156,9 @@
       }
     },
     "node_modules/@tailwindcss/oxide-darwin-x64": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-x64/-/oxide-darwin-x64-4.1.5.tgz",
-      "integrity": "sha512-XQorp3Q6/WzRd9OalgHgaqgEbjP3qjHrlSUb5k1EuS1Z9NE9+BbzSORraO+ecW432cbCN7RVGGL/lSnHxcd+7Q==",
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-x64/-/oxide-darwin-x64-4.1.11.tgz",
+      "integrity": "sha512-EgnK8kRchgmgzG6jE10UQNaH9Mwi2n+yw1jWmof9Vyg2lpKNX2ioe7CJdf9M5f8V9uaQxInenZkOxnTVL3fhAw==",
       "cpu": [
         "x64"
       ],
@@ -1115,9 +1172,9 @@
       }
     },
     "node_modules/@tailwindcss/oxide-freebsd-x64": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-freebsd-x64/-/oxide-freebsd-x64-4.1.5.tgz",
-      "integrity": "sha512-bPrLWbxo8gAo97ZmrCbOdtlz/Dkuy8NK97aFbVpkJ2nJ2Jo/rsCbu0TlGx8joCuA3q6vMWTSn01JY46iwG+clg==",
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-freebsd-x64/-/oxide-freebsd-x64-4.1.11.tgz",
+      "integrity": "sha512-xdqKtbpHs7pQhIKmqVpxStnY1skuNh4CtbcyOHeX1YBE0hArj2romsFGb6yUmzkq/6M24nkxDqU8GYrKrz+UcA==",
       "cpu": [
         "x64"
       ],
@@ -1131,9 +1188,9 @@
       }
     },
     "node_modules/@tailwindcss/oxide-linux-arm-gnueabihf": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm-gnueabihf/-/oxide-linux-arm-gnueabihf-4.1.5.tgz",
-      "integrity": "sha512-1gtQJY9JzMAhgAfvd/ZaVOjh/Ju/nCoAsvOVJenWZfs05wb8zq+GOTnZALWGqKIYEtyNpCzvMk+ocGpxwdvaVg==",
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm-gnueabihf/-/oxide-linux-arm-gnueabihf-4.1.11.tgz",
+      "integrity": "sha512-ryHQK2eyDYYMwB5wZL46uoxz2zzDZsFBwfjssgB7pzytAeCCa6glsiJGjhTEddq/4OsIjsLNMAiMlHNYnkEEeg==",
       "cpu": [
         "arm"
       ],
@@ -1147,9 +1204,9 @@
       }
     },
     "node_modules/@tailwindcss/oxide-linux-arm64-gnu": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-gnu/-/oxide-linux-arm64-gnu-4.1.5.tgz",
-      "integrity": "sha512-dtlaHU2v7MtdxBXoqhxwsWjav7oim7Whc6S9wq/i/uUMTWAzq/gijq1InSgn2yTnh43kR+SFvcSyEF0GCNu1PQ==",
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-gnu/-/oxide-linux-arm64-gnu-4.1.11.tgz",
+      "integrity": "sha512-mYwqheq4BXF83j/w75ewkPJmPZIqqP1nhoghS9D57CLjsh3Nfq0m4ftTotRYtGnZd3eCztgbSPJ9QhfC91gDZQ==",
       "cpu": [
         "arm64"
       ],
@@ -1163,9 +1220,9 @@
       }
     },
     "node_modules/@tailwindcss/oxide-linux-arm64-musl": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-musl/-/oxide-linux-arm64-musl-4.1.5.tgz",
-      "integrity": "sha512-fg0F6nAeYcJ3CriqDT1iVrqALMwD37+sLzXs8Rjy8Z1ZHshJoYceodfyUwGJEsQoTyWbliFNRs2wMQNXtT7MVA==",
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-musl/-/oxide-linux-arm64-musl-4.1.11.tgz",
+      "integrity": "sha512-m/NVRFNGlEHJrNVk3O6I9ggVuNjXHIPoD6bqay/pubtYC9QIdAMpS+cswZQPBLvVvEF6GtSNONbDkZrjWZXYNQ==",
       "cpu": [
         "arm64"
       ],
@@ -1179,9 +1236,9 @@
       }
     },
     "node_modules/@tailwindcss/oxide-linux-x64-gnu": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-gnu/-/oxide-linux-x64-gnu-4.1.5.tgz",
-      "integrity": "sha512-SO+F2YEIAHa1AITwc8oPwMOWhgorPzzcbhWEb+4oLi953h45FklDmM8dPSZ7hNHpIk9p/SCZKUYn35t5fjGtHA==",
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-gnu/-/oxide-linux-x64-gnu-4.1.11.tgz",
+      "integrity": "sha512-YW6sblI7xukSD2TdbbaeQVDysIm/UPJtObHJHKxDEcW2exAtY47j52f8jZXkqE1krdnkhCMGqP3dbniu1Te2Fg==",
       "cpu": [
         "x64"
       ],
@@ -1195,9 +1252,9 @@
       }
     },
     "node_modules/@tailwindcss/oxide-linux-x64-musl": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-musl/-/oxide-linux-x64-musl-4.1.5.tgz",
-      "integrity": "sha512-6UbBBplywkk/R+PqqioskUeXfKcBht3KU7juTi1UszJLx0KPXUo10v2Ok04iBJIaDPkIFkUOVboXms5Yxvaz+g==",
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-musl/-/oxide-linux-x64-musl-4.1.11.tgz",
+      "integrity": "sha512-e3C/RRhGunWYNC3aSF7exsQkdXzQ/M+aYuZHKnw4U7KQwTJotnWsGOIVih0s2qQzmEzOFIJ3+xt7iq67K/p56Q==",
       "cpu": [
         "x64"
       ],
@@ -1211,9 +1268,9 @@
       }
     },
     "node_modules/@tailwindcss/oxide-wasm32-wasi": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-wasm32-wasi/-/oxide-wasm32-wasi-4.1.5.tgz",
-      "integrity": "sha512-hwALf2K9FHuiXTPqmo1KeOb83fTRNbe9r/Ixv9ZNQ/R24yw8Ge1HOWDDgTdtzntIaIUJG5dfXCf4g9AD4RiyhQ==",
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-wasm32-wasi/-/oxide-wasm32-wasi-4.1.11.tgz",
+      "integrity": "sha512-Xo1+/GU0JEN/C/dvcammKHzeM6NqKovG+6921MR6oadee5XPBaKOumrJCXvopJ/Qb5TH7LX/UAywbqrP4lax0g==",
       "bundleDependencies": [
         "@napi-rs/wasm-runtime",
         "@emnapi/core",
@@ -1231,7 +1288,7 @@
         "@emnapi/core": "^1.4.3",
         "@emnapi/runtime": "^1.4.3",
         "@emnapi/wasi-threads": "^1.0.2",
-        "@napi-rs/wasm-runtime": "^0.2.9",
+        "@napi-rs/wasm-runtime": "^0.2.11",
         "@tybys/wasm-util": "^0.9.0",
         "tslib": "^2.8.0"
       },
@@ -1240,9 +1297,9 @@
       }
     },
     "node_modules/@tailwindcss/oxide-win32-arm64-msvc": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-arm64-msvc/-/oxide-win32-arm64-msvc-4.1.5.tgz",
-      "integrity": "sha512-oDKncffWzaovJbkuR7/OTNFRJQVdiw/n8HnzaCItrNQUeQgjy7oUiYpsm9HUBgpmvmDpSSbGaCa2Evzvk3eFmA==",
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-arm64-msvc/-/oxide-win32-arm64-msvc-4.1.11.tgz",
+      "integrity": "sha512-UgKYx5PwEKrac3GPNPf6HVMNhUIGuUh4wlDFR2jYYdkX6pL/rn73zTq/4pzUm8fOjAn5L8zDeHp9iXmUGOXZ+w==",
       "cpu": [
         "arm64"
       ],
@@ -1256,9 +1313,9 @@
       }
     },
     "node_modules/@tailwindcss/oxide-win32-x64-msvc": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-x64-msvc/-/oxide-win32-x64-msvc-4.1.5.tgz",
-      "integrity": "sha512-WiR4dtyrFdbb+ov0LK+7XsFOsG+0xs0PKZKkt41KDn9jYpO7baE3bXiudPVkTqUEwNfiglCygQHl2jklvSBi7Q==",
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-x64-msvc/-/oxide-win32-x64-msvc-4.1.11.tgz",
+      "integrity": "sha512-YfHoggn1j0LK7wR82TOucWc5LDCguHnoS879idHekmmiR7g9HUtMw9MI0NHatS28u/Xlkfi9w5RJWgz2Dl+5Qg==",
       "cpu": [
         "x64"
       ],
@@ -1272,17 +1329,17 @@
       }
     },
     "node_modules/@tailwindcss/vite": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/@tailwindcss/vite/-/vite-4.1.5.tgz",
-      "integrity": "sha512-FE1stRoqdHSb7RxesMfCXE8icwI1W6zGE/512ae3ZDrpkQYTTYeSyUJPRCjZd8CwVAhpDUbi1YR8pcZioFJQ/w==",
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/@tailwindcss/vite/-/vite-4.1.11.tgz",
+      "integrity": "sha512-RHYhrR3hku0MJFRV+fN2gNbDNEh3dwKvY8XJvTxCSXeMOsCRSr+uKvDWQcbizrHgjML6ZmTE5OwMrl5wKcujCw==",
       "license": "MIT",
       "dependencies": {
-        "@tailwindcss/node": "4.1.5",
-        "@tailwindcss/oxide": "4.1.5",
-        "tailwindcss": "4.1.5"
+        "@tailwindcss/node": "4.1.11",
+        "@tailwindcss/oxide": "4.1.11",
+        "tailwindcss": "4.1.11"
       },
       "peerDependencies": {
-        "vite": "^5.2.0 || ^6"
+        "vite": "^5.2.0 || ^6 || ^7"
       }
     },
     "node_modules/@tokenizer/inflate": {
@@ -1331,16 +1388,19 @@
       "license": "MIT"
     },
     "node_modules/@vitejs/plugin-vue": {
-      "version": "5.2.3",
-      "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-5.2.3.tgz",
-      "integrity": "sha512-IYSLEQj4LgZZuoVpdSUCw3dIynTWQgPlaRP6iAvMle4My0HdYwr5g5wQAfwOeHQBmYwEkqF70nRpSilr6PoUDg==",
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-6.0.0.tgz",
+      "integrity": "sha512-iAliE72WsdhjzTOp2DtvKThq1VBC4REhwRcaA+zPAAph6I+OQhUXv+Xu2KS7ElxYtb7Zc/3R30Hwv1DxEo7NXQ==",
       "dev": true,
       "license": "MIT",
+      "dependencies": {
+        "@rolldown/pluginutils": "1.0.0-beta.19"
+      },
       "engines": {
-        "node": "^18.0.0 || >=20.0.0"
+        "node": "^20.19.0 || >=22.12.0"
       },
       "peerDependencies": {
-        "vite": "^5.0.0 || ^6.0.0",
+        "vite": "^5.0.0 || ^6.0.0 || ^7.0.0",
         "vue": "^3.2.25"
       }
     },
@@ -1374,53 +1434,53 @@
       }
     },
     "node_modules/@vue/compiler-core": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.13.tgz",
-      "integrity": "sha512-oOdAkwqUfW1WqpwSYJce06wvt6HljgY3fGeM9NcVA1HaYOij3mZG9Rkysn0OHuyUAGMbEbARIpsG+LPVlBJ5/Q==",
+      "version": "3.5.17",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.17.tgz",
+      "integrity": "sha512-Xe+AittLbAyV0pabcN7cP7/BenRBNcteM4aSDCtRvGw0d9OL+HG1u/XHLY/kt1q4fyMeZYXyIYrsHuPSiDPosA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.25.3",
-        "@vue/shared": "3.5.13",
+        "@babel/parser": "^7.27.5",
+        "@vue/shared": "3.5.17",
         "entities": "^4.5.0",
         "estree-walker": "^2.0.2",
-        "source-map-js": "^1.2.0"
+        "source-map-js": "^1.2.1"
       }
     },
     "node_modules/@vue/compiler-dom": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.13.tgz",
-      "integrity": "sha512-ZOJ46sMOKUjO3e94wPdCzQ6P1Lx/vhp2RSvfaab88Ajexs0AHeV0uasYhi99WPaogmBlRHNRuly8xV75cNTMDA==",
+      "version": "3.5.17",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.17.tgz",
+      "integrity": "sha512-+2UgfLKoaNLhgfhV5Ihnk6wB4ljyW1/7wUIog2puUqajiC29Lp5R/IKDdkebh9jTbTogTbsgB+OY9cEWzG95JQ==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-core": "3.5.13",
-        "@vue/shared": "3.5.13"
+        "@vue/compiler-core": "3.5.17",
+        "@vue/shared": "3.5.17"
       }
     },
     "node_modules/@vue/compiler-sfc": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.13.tgz",
-      "integrity": "sha512-6VdaljMpD82w6c2749Zhf5T9u5uLBWKnVue6XWxprDobftnletJ8+oel7sexFfM3qIxNmVE7LSFGTpv6obNyaQ==",
+      "version": "3.5.17",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.17.tgz",
+      "integrity": "sha512-rQQxbRJMgTqwRugtjw0cnyQv9cP4/4BxWfTdRBkqsTfLOHWykLzbOc3C4GGzAmdMDxhzU/1Ija5bTjMVrddqww==",
       "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.25.3",
-        "@vue/compiler-core": "3.5.13",
-        "@vue/compiler-dom": "3.5.13",
-        "@vue/compiler-ssr": "3.5.13",
-        "@vue/shared": "3.5.13",
+        "@babel/parser": "^7.27.5",
+        "@vue/compiler-core": "3.5.17",
+        "@vue/compiler-dom": "3.5.17",
+        "@vue/compiler-ssr": "3.5.17",
+        "@vue/shared": "3.5.17",
         "estree-walker": "^2.0.2",
-        "magic-string": "^0.30.11",
-        "postcss": "^8.4.48",
-        "source-map-js": "^1.2.0"
+        "magic-string": "^0.30.17",
+        "postcss": "^8.5.6",
+        "source-map-js": "^1.2.1"
       }
     },
     "node_modules/@vue/compiler-ssr": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.13.tgz",
-      "integrity": "sha512-wMH6vrYHxQl/IybKJagqbquvxpWCuVYpoUJfCqFZwa/JY1GdATAQ+TgVtgrwwMZ0D07QhA99rs/EAAWfvG6KpA==",
+      "version": "3.5.17",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.17.tgz",
+      "integrity": "sha512-hkDbA0Q20ZzGgpj5uZjb9rBzQtIHLS78mMilwrlpWk2Ep37DYntUz0PonQ6kr113vfOEdM+zTBuJDaceNIW0tQ==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-dom": "3.5.13",
-        "@vue/shared": "3.5.13"
+        "@vue/compiler-dom": "3.5.17",
+        "@vue/shared": "3.5.17"
       }
     },
     "node_modules/@vue/compiler-vue2": {
@@ -1490,53 +1550,53 @@
       }
     },
     "node_modules/@vue/reactivity": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.13.tgz",
-      "integrity": "sha512-NaCwtw8o48B9I6L1zl2p41OHo/2Z4wqYGGIK1Khu5T7yxrn+ATOixn/Udn2m+6kZKB/J7cuT9DbWWhRxqixACg==",
+      "version": "3.5.17",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.17.tgz",
+      "integrity": "sha512-l/rmw2STIscWi7SNJp708FK4Kofs97zc/5aEPQh4bOsReD/8ICuBcEmS7KGwDj5ODQLYWVN2lNibKJL1z5b+Lw==",
       "license": "MIT",
       "dependencies": {
-        "@vue/shared": "3.5.13"
+        "@vue/shared": "3.5.17"
       }
     },
     "node_modules/@vue/runtime-core": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.13.tgz",
-      "integrity": "sha512-Fj4YRQ3Az0WTZw1sFe+QDb0aXCerigEpw418pw1HBUKFtnQHWzwojaukAs2X/c9DQz4MQ4bsXTGlcpGxU/RCIw==",
+      "version": "3.5.17",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.17.tgz",
+      "integrity": "sha512-QQLXa20dHg1R0ri4bjKeGFKEkJA7MMBxrKo2G+gJikmumRS7PTD4BOU9FKrDQWMKowz7frJJGqBffYMgQYS96Q==",
       "license": "MIT",
       "dependencies": {
-        "@vue/reactivity": "3.5.13",
-        "@vue/shared": "3.5.13"
+        "@vue/reactivity": "3.5.17",
+        "@vue/shared": "3.5.17"
       }
     },
     "node_modules/@vue/runtime-dom": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.13.tgz",
-      "integrity": "sha512-dLaj94s93NYLqjLiyFzVs9X6dWhTdAlEAciC3Moq7gzAc13VJUdCnjjRurNM6uTLFATRHexHCTu/Xp3eW6yoog==",
+      "version": "3.5.17",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.17.tgz",
+      "integrity": "sha512-8El0M60TcwZ1QMz4/os2MdlQECgGoVHPuLnQBU3m9h3gdNRW9xRmI8iLS4t/22OQlOE6aJvNNlBiCzPHur4H9g==",
       "license": "MIT",
       "dependencies": {
-        "@vue/reactivity": "3.5.13",
-        "@vue/runtime-core": "3.5.13",
-        "@vue/shared": "3.5.13",
+        "@vue/reactivity": "3.5.17",
+        "@vue/runtime-core": "3.5.17",
+        "@vue/shared": "3.5.17",
         "csstype": "^3.1.3"
       }
     },
     "node_modules/@vue/server-renderer": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.13.tgz",
-      "integrity": "sha512-wAi4IRJV/2SAW3htkTlB+dHeRmpTiVIK1OGLWV1yeStVSebSQQOwGwIq0D3ZIoBj2C2qpgz5+vX9iEBkTdk5YA==",
+      "version": "3.5.17",
+      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.17.tgz",
+      "integrity": "sha512-BOHhm8HalujY6lmC3DbqF6uXN/K00uWiEeF22LfEsm9Q93XeJ/plHTepGwf6tqFcF7GA5oGSSAAUock3VvzaCA==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-ssr": "3.5.13",
-        "@vue/shared": "3.5.13"
+        "@vue/compiler-ssr": "3.5.17",
+        "@vue/shared": "3.5.17"
       },
       "peerDependencies": {
-        "vue": "3.5.13"
+        "vue": "3.5.17"
       }
     },
     "node_modules/@vue/shared": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.13.tgz",
-      "integrity": "sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ==",
+      "version": "3.5.17",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.17.tgz",
+      "integrity": "sha512-CabR+UN630VnsJO/jHWYBC1YVXyMq94KKp6iF5MQgZJs5I8cmjw6oVMO1oDbtBkENSHSSn/UadWlW/OAgdmKrg==",
       "license": "MIT"
     },
     "node_modules/@vue/tsconfig": {
@@ -1907,6 +1967,15 @@
         "fsevents": "~2.3.2"
       }
     },
+    "node_modules/chownr": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz",
+      "integrity": "sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==",
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/cli-cursor": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
@@ -2272,9 +2341,9 @@
       "license": "MIT"
     },
     "node_modules/enhanced-resolve": {
-      "version": "5.18.1",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz",
-      "integrity": "sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==",
+      "version": "5.18.2",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.2.tgz",
+      "integrity": "sha512-6Jw4sE1maoRJo3q8MsSIn2onJFbLTOjY9hlx4DZXmOKvLRd1Ok2kXmAGXaafL2+ijsJZ1ClYbl/pmqr9+k4iUQ==",
       "license": "MIT",
       "dependencies": {
         "graceful-fs": "^4.2.4",
@@ -2493,9 +2562,9 @@
       "license": "MIT"
     },
     "node_modules/fdir": {
-      "version": "6.4.4",
-      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.4.tgz",
-      "integrity": "sha512-1NZP+GK4GfuAv3PqKvxQRDMjdSRZjnkq7KfhlNrCNNlZ0ygQFpebfrnfnq/W7fpUnAv9aGWmY1zKx7FYL3gwhg==",
+      "version": "6.4.6",
+      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.6.tgz",
+      "integrity": "sha512-hiFoqpyZcfNm1yc4u8oWCf9A2c4D3QjCrks3zmoVKVxpQRzmPNar1hUJcBG2RQHvEVGDN+Jm81ZheVLAQMK6+w==",
       "license": "MIT",
       "peerDependencies": {
         "picomatch": "^3 || ^4"
@@ -3085,9 +3154,9 @@
       }
     },
     "node_modules/lightningcss": {
-      "version": "1.29.2",
-      "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.29.2.tgz",
-      "integrity": "sha512-6b6gd/RUXKaw5keVdSEtqFVdzWnU5jMxTUjA2bVcMNPLwSQ08Sv/UodBVtETLCn7k4S1Ibxwh7k68IwLZPgKaA==",
+      "version": "1.30.1",
+      "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.30.1.tgz",
+      "integrity": "sha512-xi6IyHML+c9+Q3W0S4fCQJOym42pyurFiJUHEcEyHS0CeKzia4yZDEsLlqOFykxOdHpNy0NmvVO31vcSqAxJCg==",
       "license": "MPL-2.0",
       "dependencies": {
         "detect-libc": "^2.0.3"
@@ -3100,22 +3169,22 @@
         "url": "https://opencollective.com/parcel"
       },
       "optionalDependencies": {
-        "lightningcss-darwin-arm64": "1.29.2",
-        "lightningcss-darwin-x64": "1.29.2",
-        "lightningcss-freebsd-x64": "1.29.2",
-        "lightningcss-linux-arm-gnueabihf": "1.29.2",
-        "lightningcss-linux-arm64-gnu": "1.29.2",
-        "lightningcss-linux-arm64-musl": "1.29.2",
-        "lightningcss-linux-x64-gnu": "1.29.2",
-        "lightningcss-linux-x64-musl": "1.29.2",
-        "lightningcss-win32-arm64-msvc": "1.29.2",
-        "lightningcss-win32-x64-msvc": "1.29.2"
+        "lightningcss-darwin-arm64": "1.30.1",
+        "lightningcss-darwin-x64": "1.30.1",
+        "lightningcss-freebsd-x64": "1.30.1",
+        "lightningcss-linux-arm-gnueabihf": "1.30.1",
+        "lightningcss-linux-arm64-gnu": "1.30.1",
+        "lightningcss-linux-arm64-musl": "1.30.1",
+        "lightningcss-linux-x64-gnu": "1.30.1",
+        "lightningcss-linux-x64-musl": "1.30.1",
+        "lightningcss-win32-arm64-msvc": "1.30.1",
+        "lightningcss-win32-x64-msvc": "1.30.1"
       }
     },
     "node_modules/lightningcss-darwin-arm64": {
-      "version": "1.29.2",
-      "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.29.2.tgz",
-      "integrity": "sha512-cK/eMabSViKn/PG8U/a7aCorpeKLMlK0bQeNHmdb7qUnBkNPnL+oV5DjJUo0kqWsJUapZsM4jCfYItbqBDvlcA==",
+      "version": "1.30.1",
+      "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.30.1.tgz",
+      "integrity": "sha512-c8JK7hyE65X1MHMN+Viq9n11RRC7hgin3HhYKhrMyaXflk5GVplZ60IxyoVtzILeKr+xAJwg6zK6sjTBJ0FKYQ==",
       "cpu": [
         "arm64"
       ],
@@ -3133,9 +3202,9 @@
       }
     },
     "node_modules/lightningcss-darwin-x64": {
-      "version": "1.29.2",
-      "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.29.2.tgz",
-      "integrity": "sha512-j5qYxamyQw4kDXX5hnnCKMf3mLlHvG44f24Qyi2965/Ycz829MYqjrVg2H8BidybHBp9kom4D7DR5VqCKDXS0w==",
+      "version": "1.30.1",
+      "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.30.1.tgz",
+      "integrity": "sha512-k1EvjakfumAQoTfcXUcHQZhSpLlkAuEkdMBsI/ivWw9hL+7FtilQc0Cy3hrx0AAQrVtQAbMI7YjCgYgvn37PzA==",
       "cpu": [
         "x64"
       ],
@@ -3153,9 +3222,9 @@
       }
     },
     "node_modules/lightningcss-freebsd-x64": {
-      "version": "1.29.2",
-      "resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.29.2.tgz",
-      "integrity": "sha512-wDk7M2tM78Ii8ek9YjnY8MjV5f5JN2qNVO+/0BAGZRvXKtQrBC4/cn4ssQIpKIPP44YXw6gFdpUF+Ps+RGsCwg==",
+      "version": "1.30.1",
+      "resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.30.1.tgz",
+      "integrity": "sha512-kmW6UGCGg2PcyUE59K5r0kWfKPAVy4SltVeut+umLCFoJ53RdCUWxcRDzO1eTaxf/7Q2H7LTquFHPL5R+Gjyig==",
       "cpu": [
         "x64"
       ],
@@ -3173,9 +3242,9 @@
       }
     },
     "node_modules/lightningcss-linux-arm-gnueabihf": {
-      "version": "1.29.2",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.29.2.tgz",
-      "integrity": "sha512-IRUrOrAF2Z+KExdExe3Rz7NSTuuJ2HvCGlMKoquK5pjvo2JY4Rybr+NrKnq0U0hZnx5AnGsuFHjGnNT14w26sg==",
+      "version": "1.30.1",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.30.1.tgz",
+      "integrity": "sha512-MjxUShl1v8pit+6D/zSPq9S9dQ2NPFSQwGvxBCYaBYLPlCWuPh9/t1MRS8iUaR8i+a6w7aps+B4N0S1TYP/R+Q==",
       "cpu": [
         "arm"
       ],
@@ -3193,9 +3262,9 @@
       }
     },
     "node_modules/lightningcss-linux-arm64-gnu": {
-      "version": "1.29.2",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.29.2.tgz",
-      "integrity": "sha512-KKCpOlmhdjvUTX/mBuaKemp0oeDIBBLFiU5Fnqxh1/DZ4JPZi4evEH7TKoSBFOSOV3J7iEmmBaw/8dpiUvRKlQ==",
+      "version": "1.30.1",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.30.1.tgz",
+      "integrity": "sha512-gB72maP8rmrKsnKYy8XUuXi/4OctJiuQjcuqWNlJQ6jZiWqtPvqFziskH3hnajfvKB27ynbVCucKSm2rkQp4Bw==",
       "cpu": [
         "arm64"
       ],
@@ -3213,9 +3282,9 @@
       }
     },
     "node_modules/lightningcss-linux-arm64-musl": {
-      "version": "1.29.2",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.29.2.tgz",
-      "integrity": "sha512-Q64eM1bPlOOUgxFmoPUefqzY1yV3ctFPE6d/Vt7WzLW4rKTv7MyYNky+FWxRpLkNASTnKQUaiMJ87zNODIrrKQ==",
+      "version": "1.30.1",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.30.1.tgz",
+      "integrity": "sha512-jmUQVx4331m6LIX+0wUhBbmMX7TCfjF5FoOH6SD1CttzuYlGNVpA7QnrmLxrsub43ClTINfGSYyHe2HWeLl5CQ==",
       "cpu": [
         "arm64"
       ],
@@ -3233,9 +3302,9 @@
       }
     },
     "node_modules/lightningcss-linux-x64-gnu": {
-      "version": "1.29.2",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.29.2.tgz",
-      "integrity": "sha512-0v6idDCPG6epLXtBH/RPkHvYx74CVziHo6TMYga8O2EiQApnUPZsbR9nFNrg2cgBzk1AYqEd95TlrsL7nYABQg==",
+      "version": "1.30.1",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.30.1.tgz",
+      "integrity": "sha512-piWx3z4wN8J8z3+O5kO74+yr6ze/dKmPnI7vLqfSqI8bccaTGY5xiSGVIJBDd5K5BHlvVLpUB3S2YCfelyJ1bw==",
       "cpu": [
         "x64"
       ],
@@ -3253,9 +3322,9 @@
       }
     },
     "node_modules/lightningcss-linux-x64-musl": {
-      "version": "1.29.2",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.29.2.tgz",
-      "integrity": "sha512-rMpz2yawkgGT8RULc5S4WiZopVMOFWjiItBT7aSfDX4NQav6M44rhn5hjtkKzB+wMTRlLLqxkeYEtQ3dd9696w==",
+      "version": "1.30.1",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.30.1.tgz",
+      "integrity": "sha512-rRomAK7eIkL+tHY0YPxbc5Dra2gXlI63HL+v1Pdi1a3sC+tJTcFrHX+E86sulgAXeI7rSzDYhPSeHHjqFhqfeQ==",
       "cpu": [
         "x64"
       ],
@@ -3273,9 +3342,9 @@
       }
     },
     "node_modules/lightningcss-win32-arm64-msvc": {
-      "version": "1.29.2",
-      "resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.29.2.tgz",
-      "integrity": "sha512-nL7zRW6evGQqYVu/bKGK+zShyz8OVzsCotFgc7judbt6wnB2KbiKKJwBE4SGoDBQ1O94RjW4asrCjQL4i8Fhbw==",
+      "version": "1.30.1",
+      "resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.30.1.tgz",
+      "integrity": "sha512-mSL4rqPi4iXq5YVqzSsJgMVFENoa4nGTT/GjO2c0Yl9OuQfPsIfncvLrEW6RbbB24WtZ3xP/2CCmI3tNkNV4oA==",
       "cpu": [
         "arm64"
       ],
@@ -3293,9 +3362,9 @@
       }
     },
     "node_modules/lightningcss-win32-x64-msvc": {
-      "version": "1.29.2",
-      "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.29.2.tgz",
-      "integrity": "sha512-EdIUW3B2vLuHmv7urfzMI/h2fmlnOQBk1xlsDxkN1tCWKjNFjfLhGxYk8C8mzpSfr+A6jFFIi8fU6LbQGsRWjA==",
+      "version": "1.30.1",
+      "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.30.1.tgz",
+      "integrity": "sha512-PVqXh48wh4T53F/1CCu8PIPCxLzWyCnn/9T5W1Jpmdy5h9Cwd+0YQS6/LwhHXSafuc61/xg9Lv5OrCby6a++jg==",
       "cpu": [
         "x64"
       ],
@@ -3456,12 +3525,48 @@
         "node": ">=8"
       }
     },
+    "node_modules/minizlib": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.0.2.tgz",
+      "integrity": "sha512-oG62iEk+CYt5Xj2YqI5Xi9xWUeZhDI8jjQmC5oThVH5JGCTgIjr7ciJDzC7MBzYd//WvR1OTmP5Q38Q8ShQtVA==",
+      "license": "MIT",
+      "dependencies": {
+        "minipass": "^7.1.2"
+      },
+      "engines": {
+        "node": ">= 18"
+      }
+    },
+    "node_modules/minizlib/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/mitt": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz",
       "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==",
       "license": "MIT"
     },
+    "node_modules/mkdirp": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-3.0.1.tgz",
+      "integrity": "sha512-+NsyUUAZDmo6YVHzL/stxSu3t9YS1iljliy3BSDrXJ/dkn1KYdmtZODGGjLcc9XLgVVpH4KshHB8XmZgMhaBXg==",
+      "license": "MIT",
+      "bin": {
+        "mkdirp": "dist/cjs/src/bin.js"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "node_modules/mlly": {
       "version": "1.7.4",
       "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.7.4.tgz",
@@ -3788,9 +3893,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.5.3",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz",
-      "integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==",
+      "version": "8.5.6",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz",
+      "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==",
       "funding": [
         {
           "type": "opencollective",
@@ -3807,7 +3912,7 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "nanoid": "^3.3.8",
+        "nanoid": "^3.3.11",
         "picocolors": "^1.1.1",
         "source-map-js": "^1.2.1"
       },
@@ -3822,41 +3927,21 @@
       "license": "MIT"
     },
     "node_modules/primevue": {
-      "version": "4.2.5",
-      "resolved": "https://registry.npmjs.org/primevue/-/primevue-4.2.5.tgz",
-      "integrity": "sha512-7UMOIJvdFz4jQyhC76yhNdSlHtXvVpmE2JSo2ndUTBWjWJOkYyT562rQ4ayO+bMdJLtzBGqgY64I9ZfEvNd7vQ==",
+      "version": "4.3.6",
+      "resolved": "https://registry.npmjs.org/primevue/-/primevue-4.3.6.tgz",
+      "integrity": "sha512-Wwg2dH6pBmOdkj9L/OnrCQf9AKPHfY5CcfnDyWeh0tNlR+XjYKGl8qvMdJOvGO9jjg6UdsX5MSaU8vDDsSG+sg==",
       "license": "MIT",
       "dependencies": {
-        "@primeuix/styled": "^0.3.2",
-        "@primeuix/utils": "^0.3.2",
-        "@primevue/core": "4.2.5",
-        "@primevue/icons": "4.2.5"
+        "@primeuix/styled": "^0.7.0",
+        "@primeuix/styles": "^1.2.0",
+        "@primeuix/utils": "^0.6.0",
+        "@primevue/core": "4.3.6",
+        "@primevue/icons": "4.3.6"
       },
       "engines": {
         "node": ">=12.11.0"
       }
     },
-    "node_modules/primevue/node_modules/@primeuix/styled": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/@primeuix/styled/-/styled-0.3.2.tgz",
-      "integrity": "sha512-ColZes0+/WKqH4ob2x8DyNYf1NENpe5ZguOvx5yCLxaP8EIMVhLjWLO/3umJiDnQU4XXMLkn2mMHHw+fhTX/mw==",
-      "license": "MIT",
-      "dependencies": {
-        "@primeuix/utils": "^0.3.2"
-      },
-      "engines": {
-        "node": ">=12.11.0"
-      }
-    },
-    "node_modules/primevue/node_modules/@primeuix/utils": {
-      "version": "0.3.2",
-      "resolved": "https://registry.npmjs.org/@primeuix/utils/-/utils-0.3.2.tgz",
-      "integrity": "sha512-B+nphqTQeq+i6JuICLdVWnDMjONome2sNz0xI65qIOyeB4EF12CoKRiCsxuZ5uKAkHi/0d1LqlQ9mIWRSdkavw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=12.11.0"
-      }
-    },
     "node_modules/proxy-agent": {
       "version": "6.5.0",
       "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.5.0.tgz",
@@ -4246,9 +4331,9 @@
       }
     },
     "node_modules/tailwindcss": {
-      "version": "4.1.5",
-      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.1.5.tgz",
-      "integrity": "sha512-nYtSPfWGDiWgCkwQG/m+aX83XCwf62sBgg3bIlNiiOcggnS1x3uVRDAuyelBFL+vJdOPPCGElxv9DjHJjRHiVA==",
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.1.11.tgz",
+      "integrity": "sha512-2E9TBm6MDD/xKYe+dvJZAmg3yxIEDNRc0jwlNyDg/4Fil2QcSLjFKGVff0lAf1jjeaArlG/M75Ey/EYr/OJtBA==",
       "license": "MIT"
     },
     "node_modules/tailwindcss-primeui": {
@@ -4261,14 +4346,40 @@
       }
     },
     "node_modules/tapable": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
-      "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==",
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.2.tgz",
+      "integrity": "sha512-Re10+NauLTMCudc7T5WLFLAwDhQ0JWdrMK+9B2M8zR5hRExKmsRDCBA7/aV/pNJFltmBFO5BAMlQFi/vq3nKOg==",
       "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
+    "node_modules/tar": {
+      "version": "7.4.3",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-7.4.3.tgz",
+      "integrity": "sha512-5S7Va8hKfV7W5U6g3aYxXmlPoZVAwUMy9AOKyF2fVuZa2UD3qZjg578OrLRt8PcNN1PleVaL/5/yYATNL0ICUw==",
+      "license": "ISC",
+      "dependencies": {
+        "@isaacs/fs-minipass": "^4.0.0",
+        "chownr": "^3.0.0",
+        "minipass": "^7.1.2",
+        "minizlib": "^3.0.1",
+        "mkdirp": "^3.0.1",
+        "yallist": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/tar/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/through": {
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
@@ -4277,9 +4388,9 @@
       "license": "MIT"
     },
     "node_modules/tinyglobby": {
-      "version": "0.2.13",
-      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.13.tgz",
-      "integrity": "sha512-mEwzpUgrLySlveBwEVDMKk5B57bhLPYovRfPAXD5gA/98Opn0rCDj3GtLwFvCvH5RK9uPCExUROW5NjDwvqkxw==",
+      "version": "0.2.14",
+      "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.14.tgz",
+      "integrity": "sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ==",
       "license": "MIT",
       "dependencies": {
         "fdir": "^6.4.4",
@@ -4506,23 +4617,23 @@
       "license": "MIT"
     },
     "node_modules/vite": {
-      "version": "6.3.4",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-6.3.4.tgz",
-      "integrity": "sha512-BiReIiMS2fyFqbqNT/Qqt4CVITDU9M9vE+DKcVAsB+ZV0wvTKd+3hMbkpxz1b+NmEDMegpVbisKiAZOnvO92Sw==",
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-7.0.2.tgz",
+      "integrity": "sha512-hxdyZDY1CM6SNpKI4w4lcUc3Mtkd9ej4ECWVHSMrOdSinVc2zYOAppHeGc/hzmRo3pxM5blMzkuWHOJA/3NiFw==",
       "license": "MIT",
       "dependencies": {
         "esbuild": "^0.25.0",
-        "fdir": "^6.4.4",
+        "fdir": "^6.4.6",
         "picomatch": "^4.0.2",
-        "postcss": "^8.5.3",
-        "rollup": "^4.34.9",
-        "tinyglobby": "^0.2.13"
+        "postcss": "^8.5.6",
+        "rollup": "^4.40.0",
+        "tinyglobby": "^0.2.14"
       },
       "bin": {
         "vite": "bin/vite.js"
       },
       "engines": {
-        "node": "^18.0.0 || ^20.0.0 || >=22.0.0"
+        "node": "^20.19.0 || >=22.12.0"
       },
       "funding": {
         "url": "https://github.com/vitejs/vite?sponsor=1"
@@ -4531,14 +4642,14 @@
         "fsevents": "~2.3.3"
       },
       "peerDependencies": {
-        "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0",
+        "@types/node": "^20.19.0 || >=22.12.0",
         "jiti": ">=1.21.0",
-        "less": "*",
+        "less": "^4.0.0",
         "lightningcss": "^1.21.0",
-        "sass": "*",
-        "sass-embedded": "*",
-        "stylus": "*",
-        "sugarss": "*",
+        "sass": "^1.70.0",
+        "sass-embedded": "^1.70.0",
+        "stylus": ">=0.54.8",
+        "sugarss": "^5.0.0",
         "terser": "^5.16.0",
         "tsx": "^4.8.1",
         "yaml": "^2.4.2"
@@ -4587,16 +4698,16 @@
       "license": "MIT"
     },
     "node_modules/vue": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.13.tgz",
-      "integrity": "sha512-wmeiSMxkZCSc+PM2w2VRsOYAZC8GdipNFRTsLSfodVqI9mbejKeXEGr8SckuLnrQPGe3oJN5c3K0vpoU9q/wCQ==",
+      "version": "3.5.17",
+      "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.17.tgz",
+      "integrity": "sha512-LbHV3xPN9BeljML+Xctq4lbz2lVHCR6DtbpTf5XIO6gugpXUN49j2QQPcMj086r9+AkJ0FfUT8xjulKKBkkr9g==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-dom": "3.5.13",
-        "@vue/compiler-sfc": "3.5.13",
-        "@vue/runtime-dom": "3.5.13",
-        "@vue/server-renderer": "3.5.13",
-        "@vue/shared": "3.5.13"
+        "@vue/compiler-dom": "3.5.17",
+        "@vue/compiler-sfc": "3.5.17",
+        "@vue/runtime-dom": "3.5.17",
+        "@vue/server-renderer": "3.5.17",
+        "@vue/shared": "3.5.17"
       },
       "peerDependencies": {
         "typescript": "*"
@@ -4699,6 +4810,15 @@
         "node": ">=10"
       }
     },
+    "node_modules/yallist": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz",
+      "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==",
+      "license": "BlueOak-1.0.0",
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/yargs": {
       "version": "16.2.0",
       "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz",
diff --git a/package.json b/package.json
index 021b020..9d957e5 100644
--- a/package.json
+++ b/package.json
@@ -10,26 +10,26 @@
     "openapi-generator": "openapi-generator-cli generate"
   },
   "dependencies": {
-    "@primeuix/themes": "^1.0.3",
-    "@tailwindcss/vite": "^4.1.5",
+    "@primeuix/themes": "^1.2.1",
+    "@tailwindcss/vite": "^4.1.11",
     "@vueuse/core": "^13.5.0",
     "axios": "^1.10.0",
     "oidc-client-ts": "^3.3.0",
     "pinia": "^3.0.3",
     "primeicons": "^7.0.0",
-    "primevue": "^4.2.5",
-    "tailwindcss": "^4.1.5",
+    "primevue": "^4.3.6",
+    "tailwindcss": "^4.1.11",
     "tailwindcss-primeui": "^0.6.1",
-    "vue": "^3.5.13",
+    "vue": "^3.5.17",
     "vue-router": "^4.5.1"
   },
   "devDependencies": {
     "@openapitools/openapi-generator-cli": "^2.20.2",
-    "@vitejs/plugin-vue": "^5.2.2",
+    "@vitejs/plugin-vue": "^6.0.0",
     "@vue/tsconfig": "^0.7.0",
     "typescript": "~5.7.2",
     "unplugin-vue-components": "^28.5.0",
-    "vite": "^6.3.1",
+    "vite": "^7.0.2",
     "vue-tsc": "^2.2.8"
   }
 }
diff --git a/src/App.vue b/src/App.vue
index c661a41..078c7f8 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="flex flex-col size-dvw overflow-hidden">
+  <div class="flex flex-col size-dvh">
     <!-- Navigator here -->
     <Menubar
         :model="items"
@@ -76,6 +76,13 @@ const items = ref([
     command: () => {
       router.push('/cards');
     }
+  },
+  {
+    label: 'Jobs',
+    icon: 'pi pi-mobile',
+    command: () => {
+      router.push('/jobs');
+    }
   }
 ]);
 </script>
\ No newline at end of file
diff --git a/src/api/mutableTypes.ts b/src/api/mutableTypes.ts
new file mode 100644
index 0000000..330c4e2
--- /dev/null
+++ b/src/api/mutableTypes.ts
@@ -0,0 +1,7 @@
+import type {CardServiceGetCardPageRequest} from "./openapi";
+
+export type Mutable<T> = {
+  -readonly [K in keyof T]: T[K];
+};
+
+export type MutableCardRequest = Mutable<CardServiceGetCardPageRequest>;
\ No newline at end of file
diff --git a/src/api/openapi/.openapi-generator/FILES b/src/api/openapi/.openapi-generator/FILES
index 2d43e14..41989e6 100644
--- a/src/api/openapi/.openapi-generator/FILES
+++ b/src/api/openapi/.openapi-generator/FILES
@@ -6,6 +6,7 @@ common.ts
 configuration.ts
 docs/Attribute.md
 docs/Card.md
+docs/CardPageSearchRequest.md
 docs/CardPrint.md
 docs/CardPrintService.md
 docs/CardService.md
@@ -19,6 +20,7 @@ docs/JobService.md
 docs/JobStatus.md
 docs/LinkArrow.md
 docs/MonsterCard.md
+docs/MonsterCardSubType.md
 docs/MonsterCardType.md
 docs/MonsterType.md
 docs/Page.md
@@ -38,6 +40,7 @@ docs/TrapCardType.md
 git_push.sh
 index.ts
 model/attribute.ts
+model/card-page-search-request.ts
 model/card-print.ts
 model/card-type.ts
 model/card-upstream-fetch-request.ts
@@ -48,6 +51,7 @@ model/index.ts
 model/job-dto.ts
 model/job-status.ts
 model/link-arrow.ts
+model/monster-card-sub-type.ts
 model/monster-card-type.ts
 model/monster-card.ts
 model/monster-type.ts
diff --git a/src/api/openapi/docs/Card.md b/src/api/openapi/docs/Card.md
index 3331515..5ef3e0c 100644
--- a/src/api/openapi/docs/Card.md
+++ b/src/api/openapi/docs/Card.md
@@ -18,10 +18,11 @@ Name | Type | Description | Notes
 **pendulumScale** | **number** |  | [optional] [default to undefined]
 **pendulumEffect** | **string** |  | [optional] [default to undefined]
 **linkValue** | **number** |  | [optional] [default to undefined]
-**subType** | [**SpellCardType**](SpellCardType.md) |  | [default to undefined]
+**type** | [**SpellCardType**](SpellCardType.md) |  | [default to undefined]
 **monsterType** | [**MonsterType**](MonsterType.md) |  | [default to undefined]
 **attribute** | [**Attribute**](Attribute.md) |  | [default to undefined]
 **linkArrows** | [**Set&lt;LinkArrow&gt;**](LinkArrow.md) |  | [default to undefined]
+**subTypes** | [**Set&lt;MonsterCardSubType&gt;**](MonsterCardSubType.md) |  | [default to undefined]
 
 ## Example
 
@@ -42,10 +43,11 @@ const instance: Card = {
     pendulumScale,
     pendulumEffect,
     linkValue,
-    subType,
+    type,
     monsterType,
     attribute,
     linkArrows,
+    subTypes,
 };
 ```
 
diff --git a/src/api/openapi/docs/CardPageSearchRequest.md b/src/api/openapi/docs/CardPageSearchRequest.md
new file mode 100644
index 0000000..70c03af
--- /dev/null
+++ b/src/api/openapi/docs/CardPageSearchRequest.md
@@ -0,0 +1,72 @@
+# CardPageSearchRequest
+
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**page** | **number** |  | [optional] [default to undefined]
+**pageSize** | **number** |  | [optional] [default to undefined]
+**name** | **string** |  | [optional] [default to undefined]
+**cardTypes** | [**Array&lt;CardType&gt;**](CardType.md) |  | [optional] [default to undefined]
+**monsterCardTypes** | [**Array&lt;MonsterCardType&gt;**](MonsterCardType.md) |  | [optional] [default to undefined]
+**spellCardType** | [**SpellCardType**](SpellCardType.md) |  | [optional] [default to undefined]
+**trapCardType** | [**TrapCardType**](TrapCardType.md) |  | [optional] [default to undefined]
+**attack** | **number** |  | [optional] [default to undefined]
+**attackMin** | **number** |  | [optional] [default to undefined]
+**attackMax** | **number** |  | [optional] [default to undefined]
+**defense** | **number** |  | [optional] [default to undefined]
+**defenseMin** | **number** |  | [optional] [default to undefined]
+**defenseMax** | **number** |  | [optional] [default to undefined]
+**level** | **number** |  | [optional] [default to undefined]
+**levelMin** | **number** |  | [optional] [default to undefined]
+**levelMax** | **number** |  | [optional] [default to undefined]
+**isPendulum** | **boolean** |  | [optional] [default to undefined]
+**pendulumScale** | **number** |  | [optional] [default to undefined]
+**pendulumScaleMin** | **number** |  | [optional] [default to undefined]
+**pendulumScaleMax** | **number** |  | [optional] [default to undefined]
+**linkValue** | **number** |  | [optional] [default to undefined]
+**linkValueMin** | **number** |  | [optional] [default to undefined]
+**linkValueMax** | **number** |  | [optional] [default to undefined]
+**linkArrows** | [**Array&lt;LinkArrow&gt;**](LinkArrow.md) |  | [optional] [default to undefined]
+**monsterCardSubTypes** | [**Array&lt;MonsterCardSubType&gt;**](MonsterCardSubType.md) |  | [optional] [default to undefined]
+**attributes** | [**Array&lt;Attribute&gt;**](Attribute.md) |  | [optional] [default to undefined]
+**pendulum** | **boolean** |  | [optional] [default to undefined]
+
+## Example
+
+```typescript
+import { CardPageSearchRequest } from './api';
+
+const instance: CardPageSearchRequest = {
+    page,
+    pageSize,
+    name,
+    cardTypes,
+    monsterCardTypes,
+    spellCardType,
+    trapCardType,
+    attack,
+    attackMin,
+    attackMax,
+    defense,
+    defenseMin,
+    defenseMax,
+    level,
+    levelMin,
+    levelMax,
+    isPendulum,
+    pendulumScale,
+    pendulumScaleMin,
+    pendulumScaleMax,
+    linkValue,
+    linkValueMin,
+    linkValueMax,
+    linkArrows,
+    monsterCardSubTypes,
+    attributes,
+    pendulum,
+};
+```
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/src/api/openapi/docs/CardService.md b/src/api/openapi/docs/CardService.md
index 77091ba..e7a770b 100644
--- a/src/api/openapi/docs/CardService.md
+++ b/src/api/openapi/docs/CardService.md
@@ -178,14 +178,60 @@ import {
 const configuration = new Configuration();
 const apiInstance = new CardService(configuration);
 
+let attack: number; // (optional) (default to undefined)
+let attackMax: number; // (optional) (default to undefined)
+let attackMin: number; // (optional) (default to undefined)
+let attributes: Array<Attribute>; // (optional) (default to undefined)
+let cardTypes: Array<CardType>; // (optional) (default to undefined)
+let defense: number; // (optional) (default to undefined)
+let defenseMax: number; // (optional) (default to undefined)
+let defenseMin: number; // (optional) (default to undefined)
+let isPendulum: boolean; // (optional) (default to undefined)
+let level: number; // (optional) (default to undefined)
+let levelMax: number; // (optional) (default to undefined)
+let levelMin: number; // (optional) (default to undefined)
+let linkArrows: Array<LinkArrow>; // (optional) (default to undefined)
+let linkValue: number; // (optional) (default to undefined)
+let linkValueMax: number; // (optional) (default to undefined)
+let linkValueMin: number; // (optional) (default to undefined)
+let monsterCardSubTypes: Array<MonsterCardSubType>; // (optional) (default to undefined)
+let monsterCardTypes: Array<MonsterCardType>; // (optional) (default to undefined)
 let name: string; // (optional) (default to undefined)
 let page: number; // (optional) (default to undefined)
 let pageSize: number; // (optional) (default to undefined)
+let pendulumScale: number; // (optional) (default to undefined)
+let pendulumScaleMax: number; // (optional) (default to undefined)
+let pendulumScaleMin: number; // (optional) (default to undefined)
+let spellCardType: SpellCardType; // (optional) (default to undefined)
+let trapCardType: TrapCardType; // (optional) (default to undefined)
 
 const { status, data } = await apiInstance.getCardPage(
+    attack,
+    attackMax,
+    attackMin,
+    attributes,
+    cardTypes,
+    defense,
+    defenseMax,
+    defenseMin,
+    isPendulum,
+    level,
+    levelMax,
+    levelMin,
+    linkArrows,
+    linkValue,
+    linkValueMax,
+    linkValueMin,
+    monsterCardSubTypes,
+    monsterCardTypes,
     name,
     page,
-    pageSize
+    pageSize,
+    pendulumScale,
+    pendulumScaleMax,
+    pendulumScaleMin,
+    spellCardType,
+    trapCardType
 );
 ```
 
@@ -193,9 +239,32 @@ const { status, data } = await apiInstance.getCardPage(
 
 |Name | Type | Description  | Notes|
 |------------- | ------------- | ------------- | -------------|
+| **attack** | [**number**] |  | (optional) defaults to undefined|
+| **attackMax** | [**number**] |  | (optional) defaults to undefined|
+| **attackMin** | [**number**] |  | (optional) defaults to undefined|
+| **attributes** | **Array&lt;Attribute&gt;** |  | (optional) defaults to undefined|
+| **cardTypes** | **Array&lt;CardType&gt;** |  | (optional) defaults to undefined|
+| **defense** | [**number**] |  | (optional) defaults to undefined|
+| **defenseMax** | [**number**] |  | (optional) defaults to undefined|
+| **defenseMin** | [**number**] |  | (optional) defaults to undefined|
+| **isPendulum** | [**boolean**] |  | (optional) defaults to undefined|
+| **level** | [**number**] |  | (optional) defaults to undefined|
+| **levelMax** | [**number**] |  | (optional) defaults to undefined|
+| **levelMin** | [**number**] |  | (optional) defaults to undefined|
+| **linkArrows** | **Array&lt;LinkArrow&gt;** |  | (optional) defaults to undefined|
+| **linkValue** | [**number**] |  | (optional) defaults to undefined|
+| **linkValueMax** | [**number**] |  | (optional) defaults to undefined|
+| **linkValueMin** | [**number**] |  | (optional) defaults to undefined|
+| **monsterCardSubTypes** | **Array&lt;MonsterCardSubType&gt;** |  | (optional) defaults to undefined|
+| **monsterCardTypes** | **Array&lt;MonsterCardType&gt;** |  | (optional) defaults to undefined|
 | **name** | [**string**] |  | (optional) defaults to undefined|
 | **page** | [**number**] |  | (optional) defaults to undefined|
 | **pageSize** | [**number**] |  | (optional) defaults to undefined|
+| **pendulumScale** | [**number**] |  | (optional) defaults to undefined|
+| **pendulumScaleMax** | [**number**] |  | (optional) defaults to undefined|
+| **pendulumScaleMin** | [**number**] |  | (optional) defaults to undefined|
+| **spellCardType** | **SpellCardType** |  | (optional) defaults to undefined|
+| **trapCardType** | **TrapCardType** |  | (optional) defaults to undefined|
 
 
 ### Return type
diff --git a/src/api/openapi/docs/JobDto.md b/src/api/openapi/docs/JobDto.md
index 2a16484..674cb1c 100644
--- a/src/api/openapi/docs/JobDto.md
+++ b/src/api/openapi/docs/JobDto.md
@@ -6,10 +6,12 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **id** | **number** |  | [optional] [default to undefined]
+**totalJobs** | **number** |  | [optional] [default to undefined]
 **pendingJobs** | **number** |  | [optional] [default to undefined]
 **processingJobs** | **number** |  | [optional] [default to undefined]
 **completedJobs** | **number** |  | [optional] [default to undefined]
 **failedJobs** | **number** |  | [optional] [default to undefined]
+**attempts** | **number** |  | [optional] [default to undefined]
 **status** | [**JobStatus**](JobStatus.md) |  | [default to undefined]
 
 ## Example
@@ -19,10 +21,12 @@ import { JobDto } from './api';
 
 const instance: JobDto = {
     id,
+    totalJobs,
     pendingJobs,
     processingJobs,
     completedJobs,
     failedJobs,
+    attempts,
     status,
 };
 ```
diff --git a/src/api/openapi/docs/JobService.md b/src/api/openapi/docs/JobService.md
index 524b0fc..fca1a4f 100644
--- a/src/api/openapi/docs/JobService.md
+++ b/src/api/openapi/docs/JobService.md
@@ -4,10 +4,54 @@ All URIs are relative to *http://localhost*
 
 |Method | HTTP request | Description|
 |------------- | ------------- | -------------|
+|[**getAllJobs**](#getalljobs) | **GET** /api/jobs | Get status of all Jobs|
 |[**getCardPrintImportJobStatusById**](#getcardprintimportjobstatusbyid) | **GET** /api/jobs/cardPrintImport/{id} | Get status of CardPrintImportJob|
 |[**getCardSetImportJobStatusById**](#getcardsetimportjobstatusbyid) | **GET** /api/jobs/cardSetImport/{id} | Get status of CardSetImportJob|
 |[**getRegionalSetImportJobStatusById**](#getregionalsetimportjobstatusbyid) | **GET** /api/jobs/regionalSetImport/{id} | Get status of RegionalSetImportJob|
 
+# **getAllJobs**
+> Array<JobDto> getAllJobs()
+
+
+### Example
+
+```typescript
+import {
+    JobService,
+    Configuration
+} from './api';
+
+const configuration = new Configuration();
+const apiInstance = new JobService(configuration);
+
+const { status, data } = await apiInstance.getAllJobs();
+```
+
+### Parameters
+This endpoint does not have any parameters.
+
+
+### Return type
+
+**Array<JobDto>**
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+|**200** | OK |  -  |
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
 # **getCardPrintImportJobStatusById**
 > JobDto getCardPrintImportJobStatusById()
 
diff --git a/src/api/openapi/docs/MonsterCard.md b/src/api/openapi/docs/MonsterCard.md
index 2ddcc59..72ab6f5 100644
--- a/src/api/openapi/docs/MonsterCard.md
+++ b/src/api/openapi/docs/MonsterCard.md
@@ -18,10 +18,11 @@ Name | Type | Description | Notes
 **pendulumScale** | **number** |  | [optional] [default to undefined]
 **pendulumEffect** | **string** |  | [optional] [default to undefined]
 **linkValue** | **number** |  | [optional] [default to undefined]
-**subType** | [**MonsterCardType**](MonsterCardType.md) |  | [default to undefined]
+**type** | [**MonsterCardType**](MonsterCardType.md) |  | [default to undefined]
 **monsterType** | [**MonsterType**](MonsterType.md) |  | [default to undefined]
 **attribute** | [**Attribute**](Attribute.md) |  | [default to undefined]
 **linkArrows** | [**Set&lt;LinkArrow&gt;**](LinkArrow.md) |  | [default to undefined]
+**subTypes** | [**Set&lt;MonsterCardSubType&gt;**](MonsterCardSubType.md) |  | [default to undefined]
 
 ## Example
 
@@ -42,10 +43,11 @@ const instance: MonsterCard = {
     pendulumScale,
     pendulumEffect,
     linkValue,
-    subType,
+    type,
     monsterType,
     attribute,
     linkArrows,
+    subTypes,
 };
 ```
 
diff --git a/src/api/openapi/docs/MonsterCardSubType.md b/src/api/openapi/docs/MonsterCardSubType.md
new file mode 100644
index 0000000..291f273
--- /dev/null
+++ b/src/api/openapi/docs/MonsterCardSubType.md
@@ -0,0 +1,20 @@
+# MonsterCardSubType
+
+
+## Enum
+
+* `Tuner` (value: `'TUNER'`)
+
+* `Flip` (value: `'FLIP'`)
+
+* `Toon` (value: `'TOON'`)
+
+* `Spirit` (value: `'SPIRIT'`)
+
+* `Union` (value: `'UNION'`)
+
+* `Gemini` (value: `'GEMINI'`)
+
+* `Token` (value: `'TOKEN'`)
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/src/api/openapi/docs/MonsterCardSubTypeEnum.md b/src/api/openapi/docs/MonsterCardSubTypeEnum.md
new file mode 100644
index 0000000..5b90199
--- /dev/null
+++ b/src/api/openapi/docs/MonsterCardSubTypeEnum.md
@@ -0,0 +1,20 @@
+# MonsterCardSubTypeEnum
+
+
+## Enum
+
+* `Tuner` (value: `'TUNER'`)
+
+* `Flip` (value: `'FLIP'`)
+
+* `Toon` (value: `'TOON'`)
+
+* `Spirit` (value: `'SPIRIT'`)
+
+* `Union` (value: `'UNION'`)
+
+* `Gemini` (value: `'GEMINI'`)
+
+* `Token` (value: `'TOKEN'`)
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/src/api/openapi/docs/SpellCard.md b/src/api/openapi/docs/SpellCard.md
index 68a8c8a..0157a10 100644
--- a/src/api/openapi/docs/SpellCard.md
+++ b/src/api/openapi/docs/SpellCard.md
@@ -10,7 +10,7 @@ Name | Type | Description | Notes
 **description** | **string** |  | [default to undefined]
 **name** | **string** |  | [default to undefined]
 **cardPrints** | [**Set&lt;CardPrint&gt;**](CardPrint.md) |  | [default to undefined]
-**subType** | [**SpellCardType**](SpellCardType.md) |  | [default to undefined]
+**type** | [**SpellCardType**](SpellCardType.md) |  | [default to undefined]
 
 ## Example
 
@@ -23,7 +23,7 @@ const instance: SpellCard = {
     description,
     name,
     cardPrints,
-    subType,
+    type,
 };
 ```
 
diff --git a/src/api/openapi/docs/TrapCard.md b/src/api/openapi/docs/TrapCard.md
index 8387b54..f32c501 100644
--- a/src/api/openapi/docs/TrapCard.md
+++ b/src/api/openapi/docs/TrapCard.md
@@ -10,7 +10,7 @@ Name | Type | Description | Notes
 **description** | **string** |  | [default to undefined]
 **name** | **string** |  | [default to undefined]
 **cardPrints** | [**Set&lt;CardPrint&gt;**](CardPrint.md) |  | [default to undefined]
-**subType** | [**TrapCardType**](TrapCardType.md) |  | [default to undefined]
+**type** | [**TrapCardType**](TrapCardType.md) |  | [default to undefined]
 
 ## Example
 
@@ -23,7 +23,7 @@ const instance: TrapCard = {
     description,
     name,
     cardPrints,
-    subType,
+    type,
 };
 ```
 
diff --git a/src/api/openapi/model/card-page-search-request.ts b/src/api/openapi/model/card-page-search-request.ts
new file mode 100644
index 0000000..b15abb8
--- /dev/null
+++ b/src/api/openapi/model/card-page-search-request.ts
@@ -0,0 +1,209 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * dex API
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 0.0.1
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+// May contain unused imports in some cases
+// @ts-ignore
+import type { Attribute } from './attribute';
+// May contain unused imports in some cases
+// @ts-ignore
+import type { CardType } from './card-type';
+// May contain unused imports in some cases
+// @ts-ignore
+import type { LinkArrow } from './link-arrow';
+// May contain unused imports in some cases
+// @ts-ignore
+import type { MonsterCardSubType } from './monster-card-sub-type';
+// May contain unused imports in some cases
+// @ts-ignore
+import type { MonsterCardType } from './monster-card-type';
+// May contain unused imports in some cases
+// @ts-ignore
+import type { SpellCardType } from './spell-card-type';
+// May contain unused imports in some cases
+// @ts-ignore
+import type { TrapCardType } from './trap-card-type';
+
+/**
+ * 
+ * @export
+ * @interface CardPageSearchRequest
+ */
+export interface CardPageSearchRequest {
+    /**
+     * 
+     * @type {number}
+     * @memberof CardPageSearchRequest
+     */
+    'page'?: number;
+    /**
+     * 
+     * @type {number}
+     * @memberof CardPageSearchRequest
+     */
+    'pageSize'?: number;
+    /**
+     * 
+     * @type {string}
+     * @memberof CardPageSearchRequest
+     */
+    'name'?: string | null;
+    /**
+     * 
+     * @type {Array<CardType>}
+     * @memberof CardPageSearchRequest
+     */
+    'cardTypes'?: Array<CardType> | null;
+    /**
+     * 
+     * @type {Array<MonsterCardType>}
+     * @memberof CardPageSearchRequest
+     */
+    'monsterCardTypes'?: Array<MonsterCardType> | null;
+    /**
+     * 
+     * @type {SpellCardType}
+     * @memberof CardPageSearchRequest
+     */
+    'spellCardType'?: SpellCardType | null;
+    /**
+     * 
+     * @type {TrapCardType}
+     * @memberof CardPageSearchRequest
+     */
+    'trapCardType'?: TrapCardType | null;
+    /**
+     * 
+     * @type {number}
+     * @memberof CardPageSearchRequest
+     */
+    'attack'?: number | null;
+    /**
+     * 
+     * @type {number}
+     * @memberof CardPageSearchRequest
+     */
+    'attackMin'?: number | null;
+    /**
+     * 
+     * @type {number}
+     * @memberof CardPageSearchRequest
+     */
+    'attackMax'?: number | null;
+    /**
+     * 
+     * @type {number}
+     * @memberof CardPageSearchRequest
+     */
+    'defense'?: number | null;
+    /**
+     * 
+     * @type {number}
+     * @memberof CardPageSearchRequest
+     */
+    'defenseMin'?: number | null;
+    /**
+     * 
+     * @type {number}
+     * @memberof CardPageSearchRequest
+     */
+    'defenseMax'?: number | null;
+    /**
+     * 
+     * @type {number}
+     * @memberof CardPageSearchRequest
+     */
+    'level'?: number | null;
+    /**
+     * 
+     * @type {number}
+     * @memberof CardPageSearchRequest
+     */
+    'levelMin'?: number | null;
+    /**
+     * 
+     * @type {number}
+     * @memberof CardPageSearchRequest
+     */
+    'levelMax'?: number | null;
+    /**
+     * 
+     * @type {boolean}
+     * @memberof CardPageSearchRequest
+     */
+    'isPendulum'?: boolean | null;
+    /**
+     * 
+     * @type {number}
+     * @memberof CardPageSearchRequest
+     */
+    'pendulumScale'?: number | null;
+    /**
+     * 
+     * @type {number}
+     * @memberof CardPageSearchRequest
+     */
+    'pendulumScaleMin'?: number | null;
+    /**
+     * 
+     * @type {number}
+     * @memberof CardPageSearchRequest
+     */
+    'pendulumScaleMax'?: number | null;
+    /**
+     * 
+     * @type {number}
+     * @memberof CardPageSearchRequest
+     */
+    'linkValue'?: number | null;
+    /**
+     * 
+     * @type {number}
+     * @memberof CardPageSearchRequest
+     */
+    'linkValueMin'?: number | null;
+    /**
+     * 
+     * @type {number}
+     * @memberof CardPageSearchRequest
+     */
+    'linkValueMax'?: number | null;
+    /**
+     * 
+     * @type {Array<LinkArrow>}
+     * @memberof CardPageSearchRequest
+     */
+    'linkArrows'?: Array<LinkArrow> | null;
+    /**
+     * 
+     * @type {Array<MonsterCardSubType>}
+     * @memberof CardPageSearchRequest
+     */
+    'monsterCardSubTypes'?: Array<MonsterCardSubType> | null;
+    /**
+     * 
+     * @type {Array<Attribute>}
+     * @memberof CardPageSearchRequest
+     */
+    'attributes'?: Array<Attribute> | null;
+    /**
+     * 
+     * @type {boolean}
+     * @memberof CardPageSearchRequest
+     */
+    'pendulum'?: boolean;
+}
+
+
+
diff --git a/src/api/openapi/model/card.ts b/src/api/openapi/model/card.ts
index 0cd9b6f..c45b484 100644
--- a/src/api/openapi/model/card.ts
+++ b/src/api/openapi/model/card.ts
@@ -30,6 +30,9 @@ import type { LinkArrow } from './link-arrow';
 import type { MonsterCard } from './monster-card';
 // May contain unused imports in some cases
 // @ts-ignore
+import type { MonsterCardSubType } from './monster-card-sub-type';
+// May contain unused imports in some cases
+// @ts-ignore
 import type { MonsterType } from './monster-type';
 // May contain unused imports in some cases
 // @ts-ignore
diff --git a/src/api/openapi/model/index.ts b/src/api/openapi/model/index.ts
index 0e62bda..1de9c1c 100644
--- a/src/api/openapi/model/index.ts
+++ b/src/api/openapi/model/index.ts
@@ -1,5 +1,6 @@
 export * from './attribute';
 export * from './card';
+export * from './card-page-search-request';
 export * from './card-print';
 export * from './card-type';
 export * from './card-upstream-fetch-request';
@@ -9,6 +10,7 @@ export * from './job-dto';
 export * from './job-status';
 export * from './link-arrow';
 export * from './monster-card';
+export * from './monster-card-sub-type';
 export * from './monster-card-type';
 export * from './monster-type';
 export * from './page';
diff --git a/src/api/openapi/model/job-dto.ts b/src/api/openapi/model/job-dto.ts
index e5c6a0c..998738f 100644
--- a/src/api/openapi/model/job-dto.ts
+++ b/src/api/openapi/model/job-dto.ts
@@ -29,6 +29,12 @@ export interface JobDto {
      * @memberof JobDto
      */
     'id'?: number;
+    /**
+     * 
+     * @type {number}
+     * @memberof JobDto
+     */
+    'totalJobs'?: number | null;
     /**
      * 
      * @type {number}
@@ -53,6 +59,12 @@ export interface JobDto {
      * @memberof JobDto
      */
     'failedJobs'?: number | null;
+    /**
+     * 
+     * @type {number}
+     * @memberof JobDto
+     */
+    'attempts'?: number;
     /**
      * 
      * @type {JobStatus}
diff --git a/src/api/openapi/model/monster-card-sub-type-enum.ts b/src/api/openapi/model/monster-card-sub-type-enum.ts
new file mode 100644
index 0000000..ae44b3d
--- /dev/null
+++ b/src/api/openapi/model/monster-card-sub-type-enum.ts
@@ -0,0 +1,36 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * dex API
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 0.0.1
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+
+/**
+ * 
+ * @export
+ * @enum {string}
+ */
+
+export const MonsterCardSubTypeEnum = {
+    Tuner: 'TUNER',
+    Flip: 'FLIP',
+    Toon: 'TOON',
+    Spirit: 'SPIRIT',
+    Union: 'UNION',
+    Gemini: 'GEMINI',
+    Token: 'TOKEN'
+} as const;
+
+export type MonsterCardSubTypeEnum = typeof MonsterCardSubTypeEnum[keyof typeof MonsterCardSubTypeEnum];
+
+
+
diff --git a/src/api/openapi/model/monster-card-sub-type.ts b/src/api/openapi/model/monster-card-sub-type.ts
new file mode 100644
index 0000000..17b527b
--- /dev/null
+++ b/src/api/openapi/model/monster-card-sub-type.ts
@@ -0,0 +1,36 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * dex API
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 0.0.1
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+
+/**
+ * 
+ * @export
+ * @enum {string}
+ */
+
+export const MonsterCardSubType = {
+    Tuner: 'TUNER',
+    Flip: 'FLIP',
+    Toon: 'TOON',
+    Spirit: 'SPIRIT',
+    Union: 'UNION',
+    Gemini: 'GEMINI',
+    Token: 'TOKEN'
+} as const;
+
+export type MonsterCardSubType = typeof MonsterCardSubType[keyof typeof MonsterCardSubType];
+
+
+
diff --git a/src/api/openapi/model/monster-card.ts b/src/api/openapi/model/monster-card.ts
index 0dcafe4..9cebaf2 100644
--- a/src/api/openapi/model/monster-card.ts
+++ b/src/api/openapi/model/monster-card.ts
@@ -27,6 +27,9 @@ import type { CardType } from './card-type';
 import type { LinkArrow } from './link-arrow';
 // May contain unused imports in some cases
 // @ts-ignore
+import type { MonsterCardSubType } from './monster-card-sub-type';
+// May contain unused imports in some cases
+// @ts-ignore
 import type { MonsterCardType } from './monster-card-type';
 // May contain unused imports in some cases
 // @ts-ignore
@@ -121,7 +124,7 @@ export interface MonsterCard {
      * @type {MonsterCardType}
      * @memberof MonsterCard
      */
-    'subType': MonsterCardType;
+    'type': MonsterCardType;
     /**
      * 
      * @type {MonsterType}
@@ -140,6 +143,12 @@ export interface MonsterCard {
      * @memberof MonsterCard
      */
     'linkArrows': Set<LinkArrow>;
+    /**
+     * 
+     * @type {Set<MonsterCardSubType>}
+     * @memberof MonsterCard
+     */
+    'subTypes': Set<MonsterCardSubType>;
 }
 
 
diff --git a/src/api/openapi/model/spell-card.ts b/src/api/openapi/model/spell-card.ts
index 92a3134..89e5909 100644
--- a/src/api/openapi/model/spell-card.ts
+++ b/src/api/openapi/model/spell-card.ts
@@ -64,7 +64,7 @@ export interface SpellCard {
      * @type {SpellCardType}
      * @memberof SpellCard
      */
-    'subType': SpellCardType;
+    'type': SpellCardType;
 }
 
 
diff --git a/src/api/openapi/model/trap-card.ts b/src/api/openapi/model/trap-card.ts
index b08d8d5..1f67327 100644
--- a/src/api/openapi/model/trap-card.ts
+++ b/src/api/openapi/model/trap-card.ts
@@ -64,7 +64,7 @@ export interface TrapCard {
      * @type {TrapCardType}
      * @memberof TrapCard
      */
-    'subType': TrapCardType;
+    'type': TrapCardType;
 }
 
 
diff --git a/src/api/openapi/service/card-print-service.ts b/src/api/openapi/service/card-print-service.ts
index c7fe87c..a899487 100644
--- a/src/api/openapi/service/card-print-service.ts
+++ b/src/api/openapi/service/card-print-service.ts
@@ -112,36 +112,42 @@ export const CardPrintServiceFactory = function (configuration?: Configuration,
         /**
          * 
          * @summary Get a page of Card Prints with optional name query parameter
-         * @param {string | null} [name] 
-         * @param {number} [page] 
-         * @param {number} [pageSize] 
+         * @param {CardPrintServiceGetCardPrintPageRequest} requestParameters Request parameters.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        getCardPrintPage(name?: string | null, page?: number, pageSize?: number, options?: RawAxiosRequestConfig): AxiosPromise<PageCardPrintDto> {
-            return localVarFp.getCardPrintPage(name, page, pageSize, options).then((request) => request(axios, basePath));
+        getCardPrintPage(requestParameters: CardPrintServiceGetCardPrintPageRequest = {}, options?: RawAxiosRequestConfig): AxiosPromise<PageCardPrintDto> {
+            return localVarFp.getCardPrintPage(requestParameters.name, requestParameters.page, requestParameters.pageSize, options).then((request) => request(axios, basePath));
         },
     };
 };
 
 /**
- * CardPrintService - interface
+ * Request parameters for getCardPrintPage operation in CardPrintService.
  * @export
- * @interface CardPrintService
+ * @interface CardPrintServiceGetCardPrintPageRequest
  */
-export interface CardPrintServiceInterface {
+export interface CardPrintServiceGetCardPrintPageRequest {
     /**
      * 
-     * @summary Get a page of Card Prints with optional name query parameter
-     * @param {string | null} [name] 
-     * @param {number} [page] 
-     * @param {number} [pageSize] 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof CardPrintServiceInterface
+     * @type {string}
+     * @memberof CardPrintServiceGetCardPrintPage
      */
-    getCardPrintPage(name?: string | null, page?: number, pageSize?: number, options?: RawAxiosRequestConfig): AxiosPromise<PageCardPrintDto>;
+    readonly name?: string | null
 
+    /**
+     * 
+     * @type {number}
+     * @memberof CardPrintServiceGetCardPrintPage
+     */
+    readonly page?: number
+
+    /**
+     * 
+     * @type {number}
+     * @memberof CardPrintServiceGetCardPrintPage
+     */
+    readonly pageSize?: number
 }
 
 /**
@@ -150,19 +156,17 @@ export interface CardPrintServiceInterface {
  * @class CardPrintService
  * @extends {BaseAPI}
  */
-export class CardPrintService extends BaseAPI implements CardPrintServiceInterface {
+export class CardPrintService extends BaseAPI {
     /**
      * 
      * @summary Get a page of Card Prints with optional name query parameter
-     * @param {string | null} [name] 
-     * @param {number} [page] 
-     * @param {number} [pageSize] 
+     * @param {CardPrintServiceGetCardPrintPageRequest} requestParameters Request parameters.
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof CardPrintService
      */
-    public getCardPrintPage(name?: string | null, page?: number, pageSize?: number, options?: RawAxiosRequestConfig) {
-        return CardPrintServiceFp(this.configuration).getCardPrintPage(name, page, pageSize, options).then((request) => request(this.axios, this.basePath));
+    public getCardPrintPage(requestParameters: CardPrintServiceGetCardPrintPageRequest = {}, options?: RawAxiosRequestConfig) {
+        return CardPrintServiceFp(this.configuration).getCardPrintPage(requestParameters.name, requestParameters.page, requestParameters.pageSize, options).then((request) => request(this.axios, this.basePath));
     }
 }
 
diff --git a/src/api/openapi/service/card-service.ts b/src/api/openapi/service/card-service.ts
index 487e830..93bc573 100644
--- a/src/api/openapi/service/card-service.ts
+++ b/src/api/openapi/service/card-service.ts
@@ -22,11 +22,25 @@ import { DUMMY_BASE_URL, assertParamExists, setApiKeyToObject, setBasicAuthToObj
 // @ts-ignore
 import { BASE_PATH, COLLECTION_FORMATS, type RequestArgs, BaseAPI, RequiredError, operationServerMap } from '../base';
 // @ts-ignore
+import type { Attribute } from '../model';
+// @ts-ignore
 import type { Card } from '../model';
 // @ts-ignore
+import type { CardType } from '../model';
+// @ts-ignore
 import type { CardUpstreamFetchRequest } from '../model';
 // @ts-ignore
+import type { LinkArrow } from '../model';
+// @ts-ignore
+import type { MonsterCardSubType } from '../model';
+// @ts-ignore
+import type { MonsterCardType } from '../model';
+// @ts-ignore
 import type { PageCardDto } from '../model';
+// @ts-ignore
+import type { SpellCardType } from '../model';
+// @ts-ignore
+import type { TrapCardType } from '../model';
 /**
  * CardService - axios parameter creator
  * @export
@@ -140,13 +154,36 @@ export const CardServiceAxiosParamCreator = function (configuration?: Configurat
         /**
          * 
          * @summary Get a page of Cards with optional name query parameter
+         * @param {number | null} [attack] 
+         * @param {number | null} [attackMax] 
+         * @param {number | null} [attackMin] 
+         * @param {Array<Attribute> | null} [attributes] 
+         * @param {Array<CardType> | null} [cardTypes] 
+         * @param {number | null} [defense] 
+         * @param {number | null} [defenseMax] 
+         * @param {number | null} [defenseMin] 
+         * @param {boolean | null} [isPendulum] 
+         * @param {number | null} [level] 
+         * @param {number | null} [levelMax] 
+         * @param {number | null} [levelMin] 
+         * @param {Array<LinkArrow> | null} [linkArrows] 
+         * @param {number | null} [linkValue] 
+         * @param {number | null} [linkValueMax] 
+         * @param {number | null} [linkValueMin] 
+         * @param {Array<MonsterCardSubType> | null} [monsterCardSubTypes] 
+         * @param {Array<MonsterCardType> | null} [monsterCardTypes] 
          * @param {string | null} [name] 
          * @param {number} [page] 
          * @param {number} [pageSize] 
+         * @param {number | null} [pendulumScale] 
+         * @param {number | null} [pendulumScaleMax] 
+         * @param {number | null} [pendulumScaleMin] 
+         * @param {SpellCardType | null} [spellCardType] 
+         * @param {TrapCardType | null} [trapCardType] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        getCardPage: async (name?: string | null, page?: number, pageSize?: number, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
+        getCardPage: async (attack?: number | null, attackMax?: number | null, attackMin?: number | null, attributes?: Array<Attribute> | null, cardTypes?: Array<CardType> | null, defense?: number | null, defenseMax?: number | null, defenseMin?: number | null, isPendulum?: boolean | null, level?: number | null, levelMax?: number | null, levelMin?: number | null, linkArrows?: Array<LinkArrow> | null, linkValue?: number | null, linkValueMax?: number | null, linkValueMin?: number | null, monsterCardSubTypes?: Array<MonsterCardSubType> | null, monsterCardTypes?: Array<MonsterCardType> | null, name?: string | null, page?: number, pageSize?: number, pendulumScale?: number | null, pendulumScaleMax?: number | null, pendulumScaleMin?: number | null, spellCardType?: SpellCardType | null, trapCardType?: TrapCardType | null, options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/api/cards`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -159,6 +196,78 @@ export const CardServiceAxiosParamCreator = function (configuration?: Configurat
             const localVarHeaderParameter = {} as any;
             const localVarQueryParameter = {} as any;
 
+            if (attack !== undefined) {
+                localVarQueryParameter['attack'] = attack;
+            }
+
+            if (attackMax !== undefined) {
+                localVarQueryParameter['attackMax'] = attackMax;
+            }
+
+            if (attackMin !== undefined) {
+                localVarQueryParameter['attackMin'] = attackMin;
+            }
+
+            if (attributes) {
+                localVarQueryParameter['attributes'] = attributes;
+            }
+
+            if (cardTypes) {
+                localVarQueryParameter['cardTypes'] = cardTypes;
+            }
+
+            if (defense !== undefined) {
+                localVarQueryParameter['defense'] = defense;
+            }
+
+            if (defenseMax !== undefined) {
+                localVarQueryParameter['defenseMax'] = defenseMax;
+            }
+
+            if (defenseMin !== undefined) {
+                localVarQueryParameter['defenseMin'] = defenseMin;
+            }
+
+            if (isPendulum !== undefined) {
+                localVarQueryParameter['isPendulum'] = isPendulum;
+            }
+
+            if (level !== undefined) {
+                localVarQueryParameter['level'] = level;
+            }
+
+            if (levelMax !== undefined) {
+                localVarQueryParameter['levelMax'] = levelMax;
+            }
+
+            if (levelMin !== undefined) {
+                localVarQueryParameter['levelMin'] = levelMin;
+            }
+
+            if (linkArrows) {
+                localVarQueryParameter['linkArrows'] = linkArrows;
+            }
+
+            if (linkValue !== undefined) {
+                localVarQueryParameter['linkValue'] = linkValue;
+            }
+
+            if (linkValueMax !== undefined) {
+                localVarQueryParameter['linkValueMax'] = linkValueMax;
+            }
+
+            if (linkValueMin !== undefined) {
+                localVarQueryParameter['linkValueMin'] = linkValueMin;
+            }
+
+            if (monsterCardSubTypes) {
+                localVarQueryParameter['monsterCardSubTypes'] = monsterCardSubTypes;
+            }
+
+            if (monsterCardTypes) {
+                localVarQueryParameter['monsterCardTypes'] = monsterCardTypes;
+            }
+
             if (name !== undefined) {
                 localVarQueryParameter['name'] = name;
             }
@@ -171,6 +280,26 @@ export const CardServiceAxiosParamCreator = function (configuration?: Configurat
                 localVarQueryParameter['pageSize'] = pageSize;
             }
 
+            if (pendulumScale !== undefined) {
+                localVarQueryParameter['pendulumScale'] = pendulumScale;
+            }
+
+            if (pendulumScaleMax !== undefined) {
+                localVarQueryParameter['pendulumScaleMax'] = pendulumScaleMax;
+            }
+
+            if (pendulumScaleMin !== undefined) {
+                localVarQueryParameter['pendulumScaleMin'] = pendulumScaleMin;
+            }
+
+            if (spellCardType !== undefined) {
+                localVarQueryParameter['spellCardType'] = spellCardType;
+            }
+
+            if (trapCardType !== undefined) {
+                localVarQueryParameter['trapCardType'] = trapCardType;
+            }
+
 
     
             setSearchParams(localVarUrlObj, localVarQueryParameter);
@@ -234,14 +363,37 @@ export const CardServiceFp = function(configuration?: Configuration) {
         /**
          * 
          * @summary Get a page of Cards with optional name query parameter
+         * @param {number | null} [attack] 
+         * @param {number | null} [attackMax] 
+         * @param {number | null} [attackMin] 
+         * @param {Array<Attribute> | null} [attributes] 
+         * @param {Array<CardType> | null} [cardTypes] 
+         * @param {number | null} [defense] 
+         * @param {number | null} [defenseMax] 
+         * @param {number | null} [defenseMin] 
+         * @param {boolean | null} [isPendulum] 
+         * @param {number | null} [level] 
+         * @param {number | null} [levelMax] 
+         * @param {number | null} [levelMin] 
+         * @param {Array<LinkArrow> | null} [linkArrows] 
+         * @param {number | null} [linkValue] 
+         * @param {number | null} [linkValueMax] 
+         * @param {number | null} [linkValueMin] 
+         * @param {Array<MonsterCardSubType> | null} [monsterCardSubTypes] 
+         * @param {Array<MonsterCardType> | null} [monsterCardTypes] 
          * @param {string | null} [name] 
          * @param {number} [page] 
          * @param {number} [pageSize] 
+         * @param {number | null} [pendulumScale] 
+         * @param {number | null} [pendulumScaleMax] 
+         * @param {number | null} [pendulumScaleMin] 
+         * @param {SpellCardType | null} [spellCardType] 
+         * @param {TrapCardType | null} [trapCardType] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async getCardPage(name?: string | null, page?: number, pageSize?: number, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<PageCardDto>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.getCardPage(name, page, pageSize, options);
+        async getCardPage(attack?: number | null, attackMax?: number | null, attackMin?: number | null, attributes?: Array<Attribute> | null, cardTypes?: Array<CardType> | null, defense?: number | null, defenseMax?: number | null, defenseMin?: number | null, isPendulum?: boolean | null, level?: number | null, levelMax?: number | null, levelMin?: number | null, linkArrows?: Array<LinkArrow> | null, linkValue?: number | null, linkValueMax?: number | null, linkValueMin?: number | null, monsterCardSubTypes?: Array<MonsterCardSubType> | null, monsterCardTypes?: Array<MonsterCardType> | null, name?: string | null, page?: number, pageSize?: number, pendulumScale?: number | null, pendulumScaleMax?: number | null, pendulumScaleMin?: number | null, spellCardType?: SpellCardType | null, trapCardType?: TrapCardType | null, options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<PageCardDto>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.getCardPage(attack, attackMax, attackMin, attributes, cardTypes, defense, defenseMax, defenseMin, isPendulum, level, levelMax, levelMin, linkArrows, linkValue, linkValueMax, linkValueMin, monsterCardSubTypes, monsterCardTypes, name, page, pageSize, pendulumScale, pendulumScaleMax, pendulumScaleMin, spellCardType, trapCardType, options);
             const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
             const localVarOperationServerBasePath = operationServerMap['CardService.getCardPage']?.[localVarOperationServerIndex]?.url;
             return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
@@ -259,96 +411,275 @@ export const CardServiceFactory = function (configuration?: Configuration, baseP
         /**
          * 
          * @summary Fetch Cards by ID or Name from any upstream service
-         * @param {CardUpstreamFetchRequest} cardUpstreamFetchRequest 
+         * @param {CardServiceFetchUpstreamRequest} requestParameters Request parameters.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        fetchUpstream(cardUpstreamFetchRequest: CardUpstreamFetchRequest, options?: RawAxiosRequestConfig): AxiosPromise<Array<Card>> {
-            return localVarFp.fetchUpstream(cardUpstreamFetchRequest, options).then((request) => request(axios, basePath));
+        fetchUpstream(requestParameters: CardServiceFetchUpstreamRequest, options?: RawAxiosRequestConfig): AxiosPromise<Array<Card>> {
+            return localVarFp.fetchUpstream(requestParameters.cardUpstreamFetchRequest, options).then((request) => request(axios, basePath));
         },
         /**
          * 
          * @summary Get a singular Card by its ID
-         * @param {number} id 
+         * @param {CardServiceGetCardByIdRequest} requestParameters Request parameters.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        getCardById(id: number, options?: RawAxiosRequestConfig): AxiosPromise<Card> {
-            return localVarFp.getCardById(id, options).then((request) => request(axios, basePath));
+        getCardById(requestParameters: CardServiceGetCardByIdRequest, options?: RawAxiosRequestConfig): AxiosPromise<Card> {
+            return localVarFp.getCardById(requestParameters.id, options).then((request) => request(axios, basePath));
         },
         /**
          * 
          * @summary Get the image of a Card by its ID
-         * @param {number} id 
+         * @param {CardServiceGetCardImageByIdRequest} requestParameters Request parameters.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        getCardImageById(id: number, options?: RawAxiosRequestConfig): AxiosPromise<File> {
-            return localVarFp.getCardImageById(id, options).then((request) => request(axios, basePath));
+        getCardImageById(requestParameters: CardServiceGetCardImageByIdRequest, options?: RawAxiosRequestConfig): AxiosPromise<File> {
+            return localVarFp.getCardImageById(requestParameters.id, options).then((request) => request(axios, basePath));
         },
         /**
          * 
          * @summary Get a page of Cards with optional name query parameter
-         * @param {string | null} [name] 
-         * @param {number} [page] 
-         * @param {number} [pageSize] 
+         * @param {CardServiceGetCardPageRequest} requestParameters Request parameters.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        getCardPage(name?: string | null, page?: number, pageSize?: number, options?: RawAxiosRequestConfig): AxiosPromise<PageCardDto> {
-            return localVarFp.getCardPage(name, page, pageSize, options).then((request) => request(axios, basePath));
+        getCardPage(requestParameters: CardServiceGetCardPageRequest = {}, options?: RawAxiosRequestConfig): AxiosPromise<PageCardDto> {
+            return localVarFp.getCardPage(requestParameters.attack, requestParameters.attackMax, requestParameters.attackMin, requestParameters.attributes, requestParameters.cardTypes, requestParameters.defense, requestParameters.defenseMax, requestParameters.defenseMin, requestParameters.isPendulum, requestParameters.level, requestParameters.levelMax, requestParameters.levelMin, requestParameters.linkArrows, requestParameters.linkValue, requestParameters.linkValueMax, requestParameters.linkValueMin, requestParameters.monsterCardSubTypes, requestParameters.monsterCardTypes, requestParameters.name, requestParameters.page, requestParameters.pageSize, requestParameters.pendulumScale, requestParameters.pendulumScaleMax, requestParameters.pendulumScaleMin, requestParameters.spellCardType, requestParameters.trapCardType, options).then((request) => request(axios, basePath));
         },
     };
 };
 
 /**
- * CardService - interface
+ * Request parameters for fetchUpstream operation in CardService.
  * @export
- * @interface CardService
+ * @interface CardServiceFetchUpstreamRequest
  */
-export interface CardServiceInterface {
+export interface CardServiceFetchUpstreamRequest {
     /**
      * 
-     * @summary Fetch Cards by ID or Name from any upstream service
-     * @param {CardUpstreamFetchRequest} cardUpstreamFetchRequest 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof CardServiceInterface
+     * @type {CardUpstreamFetchRequest}
+     * @memberof CardServiceFetchUpstream
      */
-    fetchUpstream(cardUpstreamFetchRequest: CardUpstreamFetchRequest, options?: RawAxiosRequestConfig): AxiosPromise<Array<Card>>;
+    readonly cardUpstreamFetchRequest: CardUpstreamFetchRequest
+}
+
+/**
+ * Request parameters for getCardById operation in CardService.
+ * @export
+ * @interface CardServiceGetCardByIdRequest
+ */
+export interface CardServiceGetCardByIdRequest {
+    /**
+     * 
+     * @type {number}
+     * @memberof CardServiceGetCardById
+     */
+    readonly id: number
+}
+
+/**
+ * Request parameters for getCardImageById operation in CardService.
+ * @export
+ * @interface CardServiceGetCardImageByIdRequest
+ */
+export interface CardServiceGetCardImageByIdRequest {
+    /**
+     * 
+     * @type {number}
+     * @memberof CardServiceGetCardImageById
+     */
+    readonly id: number
+}
+
+/**
+ * Request parameters for getCardPage operation in CardService.
+ * @export
+ * @interface CardServiceGetCardPageRequest
+ */
+export interface CardServiceGetCardPageRequest {
+    /**
+     * 
+     * @type {number}
+     * @memberof CardServiceGetCardPage
+     */
+    readonly attack?: number | null
 
     /**
      * 
-     * @summary Get a singular Card by its ID
-     * @param {number} id 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof CardServiceInterface
+     * @type {number}
+     * @memberof CardServiceGetCardPage
      */
-    getCardById(id: number, options?: RawAxiosRequestConfig): AxiosPromise<Card>;
+    readonly attackMax?: number | null
 
     /**
      * 
-     * @summary Get the image of a Card by its ID
-     * @param {number} id 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof CardServiceInterface
+     * @type {number}
+     * @memberof CardServiceGetCardPage
      */
-    getCardImageById(id: number, options?: RawAxiosRequestConfig): AxiosPromise<File>;
+    readonly attackMin?: number | null
 
     /**
      * 
-     * @summary Get a page of Cards with optional name query parameter
-     * @param {string | null} [name] 
-     * @param {number} [page] 
-     * @param {number} [pageSize] 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof CardServiceInterface
+     * @type {Array<Attribute>}
+     * @memberof CardServiceGetCardPage
      */
-    getCardPage(name?: string | null, page?: number, pageSize?: number, options?: RawAxiosRequestConfig): AxiosPromise<PageCardDto>;
+    readonly attributes?: Array<Attribute> | null
 
+    /**
+     * 
+     * @type {Array<CardType>}
+     * @memberof CardServiceGetCardPage
+     */
+    readonly cardTypes?: Array<CardType> | null
+
+    /**
+     * 
+     * @type {number}
+     * @memberof CardServiceGetCardPage
+     */
+    readonly defense?: number | null
+
+    /**
+     * 
+     * @type {number}
+     * @memberof CardServiceGetCardPage
+     */
+    readonly defenseMax?: number | null
+
+    /**
+     * 
+     * @type {number}
+     * @memberof CardServiceGetCardPage
+     */
+    readonly defenseMin?: number | null
+
+    /**
+     * 
+     * @type {boolean}
+     * @memberof CardServiceGetCardPage
+     */
+    readonly isPendulum?: boolean | null
+
+    /**
+     * 
+     * @type {number}
+     * @memberof CardServiceGetCardPage
+     */
+    readonly level?: number | null
+
+    /**
+     * 
+     * @type {number}
+     * @memberof CardServiceGetCardPage
+     */
+    readonly levelMax?: number | null
+
+    /**
+     * 
+     * @type {number}
+     * @memberof CardServiceGetCardPage
+     */
+    readonly levelMin?: number | null
+
+    /**
+     * 
+     * @type {Array<LinkArrow>}
+     * @memberof CardServiceGetCardPage
+     */
+    readonly linkArrows?: Array<LinkArrow> | null
+
+    /**
+     * 
+     * @type {number}
+     * @memberof CardServiceGetCardPage
+     */
+    readonly linkValue?: number | null
+
+    /**
+     * 
+     * @type {number}
+     * @memberof CardServiceGetCardPage
+     */
+    readonly linkValueMax?: number | null
+
+    /**
+     * 
+     * @type {number}
+     * @memberof CardServiceGetCardPage
+     */
+    readonly linkValueMin?: number | null
+
+    /**
+     * 
+     * @type {Array<MonsterCardSubType>}
+     * @memberof CardServiceGetCardPage
+     */
+    readonly monsterCardSubTypes?: Array<MonsterCardSubType> | null
+
+    /**
+     * 
+     * @type {Array<MonsterCardType>}
+     * @memberof CardServiceGetCardPage
+     */
+    readonly monsterCardTypes?: Array<MonsterCardType> | null
+
+    /**
+     * 
+     * @type {string}
+     * @memberof CardServiceGetCardPage
+     */
+    readonly name?: string | null
+
+    /**
+     * 
+     * @type {number}
+     * @memberof CardServiceGetCardPage
+     */
+    readonly page?: number
+
+    /**
+     * 
+     * @type {number}
+     * @memberof CardServiceGetCardPage
+     */
+    readonly pageSize?: number
+
+    /**
+     * 
+     * @type {number}
+     * @memberof CardServiceGetCardPage
+     */
+    readonly pendulumScale?: number | null
+
+    /**
+     * 
+     * @type {number}
+     * @memberof CardServiceGetCardPage
+     */
+    readonly pendulumScaleMax?: number | null
+
+    /**
+     * 
+     * @type {number}
+     * @memberof CardServiceGetCardPage
+     */
+    readonly pendulumScaleMin?: number | null
+
+    /**
+     * 
+     * @type {SpellCardType}
+     * @memberof CardServiceGetCardPage
+     */
+    readonly spellCardType?: SpellCardType | null
+
+    /**
+     * 
+     * @type {TrapCardType}
+     * @memberof CardServiceGetCardPage
+     */
+    readonly trapCardType?: TrapCardType | null
 }
 
 /**
@@ -357,55 +688,53 @@ export interface CardServiceInterface {
  * @class CardService
  * @extends {BaseAPI}
  */
-export class CardService extends BaseAPI implements CardServiceInterface {
+export class CardService extends BaseAPI {
     /**
      * 
      * @summary Fetch Cards by ID or Name from any upstream service
-     * @param {CardUpstreamFetchRequest} cardUpstreamFetchRequest 
+     * @param {CardServiceFetchUpstreamRequest} requestParameters Request parameters.
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof CardService
      */
-    public fetchUpstream(cardUpstreamFetchRequest: CardUpstreamFetchRequest, options?: RawAxiosRequestConfig) {
-        return CardServiceFp(this.configuration).fetchUpstream(cardUpstreamFetchRequest, options).then((request) => request(this.axios, this.basePath));
+    public fetchUpstream(requestParameters: CardServiceFetchUpstreamRequest, options?: RawAxiosRequestConfig) {
+        return CardServiceFp(this.configuration).fetchUpstream(requestParameters.cardUpstreamFetchRequest, options).then((request) => request(this.axios, this.basePath));
     }
 
     /**
      * 
      * @summary Get a singular Card by its ID
-     * @param {number} id 
+     * @param {CardServiceGetCardByIdRequest} requestParameters Request parameters.
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof CardService
      */
-    public getCardById(id: number, options?: RawAxiosRequestConfig) {
-        return CardServiceFp(this.configuration).getCardById(id, options).then((request) => request(this.axios, this.basePath));
+    public getCardById(requestParameters: CardServiceGetCardByIdRequest, options?: RawAxiosRequestConfig) {
+        return CardServiceFp(this.configuration).getCardById(requestParameters.id, options).then((request) => request(this.axios, this.basePath));
     }
 
     /**
      * 
      * @summary Get the image of a Card by its ID
-     * @param {number} id 
+     * @param {CardServiceGetCardImageByIdRequest} requestParameters Request parameters.
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof CardService
      */
-    public getCardImageById(id: number, options?: RawAxiosRequestConfig) {
-        return CardServiceFp(this.configuration).getCardImageById(id, options).then((request) => request(this.axios, this.basePath));
+    public getCardImageById(requestParameters: CardServiceGetCardImageByIdRequest, options?: RawAxiosRequestConfig) {
+        return CardServiceFp(this.configuration).getCardImageById(requestParameters.id, options).then((request) => request(this.axios, this.basePath));
     }
 
     /**
      * 
      * @summary Get a page of Cards with optional name query parameter
-     * @param {string | null} [name] 
-     * @param {number} [page] 
-     * @param {number} [pageSize] 
+     * @param {CardServiceGetCardPageRequest} requestParameters Request parameters.
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof CardService
      */
-    public getCardPage(name?: string | null, page?: number, pageSize?: number, options?: RawAxiosRequestConfig) {
-        return CardServiceFp(this.configuration).getCardPage(name, page, pageSize, options).then((request) => request(this.axios, this.basePath));
+    public getCardPage(requestParameters: CardServiceGetCardPageRequest = {}, options?: RawAxiosRequestConfig) {
+        return CardServiceFp(this.configuration).getCardPage(requestParameters.attack, requestParameters.attackMax, requestParameters.attackMin, requestParameters.attributes, requestParameters.cardTypes, requestParameters.defense, requestParameters.defenseMax, requestParameters.defenseMin, requestParameters.isPendulum, requestParameters.level, requestParameters.levelMax, requestParameters.levelMin, requestParameters.linkArrows, requestParameters.linkValue, requestParameters.linkValueMax, requestParameters.linkValueMin, requestParameters.monsterCardSubTypes, requestParameters.monsterCardTypes, requestParameters.name, requestParameters.page, requestParameters.pageSize, requestParameters.pendulumScale, requestParameters.pendulumScaleMax, requestParameters.pendulumScaleMin, requestParameters.spellCardType, requestParameters.trapCardType, options).then((request) => request(this.axios, this.basePath));
     }
 }
 
diff --git a/src/api/openapi/service/deck-service.ts b/src/api/openapi/service/deck-service.ts
index ad05d85..203dde7 100644
--- a/src/api/openapi/service/deck-service.ts
+++ b/src/api/openapi/service/deck-service.ts
@@ -264,98 +264,121 @@ export const DeckServiceFactory = function (configuration?: Configuration, baseP
         /**
          * 
          * @summary Add a Card by its ID to a Deck by its name
-         * @param {number} cardId 
-         * @param {string} deckName 
+         * @param {DeckServiceAddCardToDeckRequest} requestParameters Request parameters.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        addCardToDeck(cardId: number, deckName: string, options?: RawAxiosRequestConfig): AxiosPromise<void> {
-            return localVarFp.addCardToDeck(cardId, deckName, options).then((request) => request(axios, basePath));
+        addCardToDeck(requestParameters: DeckServiceAddCardToDeckRequest, options?: RawAxiosRequestConfig): AxiosPromise<void> {
+            return localVarFp.addCardToDeck(requestParameters.cardId, requestParameters.deckName, options).then((request) => request(axios, basePath));
         },
         /**
          * 
          * @summary Create a Deck with a given name
-         * @param {DeckCreateRequest} deckCreateRequest 
+         * @param {DeckServiceCreateDeckRequest} requestParameters Request parameters.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        createDeck(deckCreateRequest: DeckCreateRequest, options?: RawAxiosRequestConfig): AxiosPromise<void> {
-            return localVarFp.createDeck(deckCreateRequest, options).then((request) => request(axios, basePath));
+        createDeck(requestParameters: DeckServiceCreateDeckRequest, options?: RawAxiosRequestConfig): AxiosPromise<void> {
+            return localVarFp.createDeck(requestParameters.deckCreateRequest, options).then((request) => request(axios, basePath));
         },
         /**
          * 
          * @summary Get a singular Deck by its name
-         * @param {string} name 
+         * @param {DeckServiceGetDeckByNameRequest} requestParameters Request parameters.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        getDeckByName(name: string, options?: RawAxiosRequestConfig): AxiosPromise<Deck> {
-            return localVarFp.getDeckByName(name, options).then((request) => request(axios, basePath));
+        getDeckByName(requestParameters: DeckServiceGetDeckByNameRequest, options?: RawAxiosRequestConfig): AxiosPromise<Deck> {
+            return localVarFp.getDeckByName(requestParameters.name, options).then((request) => request(axios, basePath));
         },
         /**
          * 
          * @summary Get a page of Decks with optional name query parameter
-         * @param {string | null} [name] 
-         * @param {number} [page] 
-         * @param {number} [pageSize] 
+         * @param {DeckServiceGetDecksRequest} requestParameters Request parameters.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        getDecks(name?: string | null, page?: number, pageSize?: number, options?: RawAxiosRequestConfig): AxiosPromise<PageDeckDto> {
-            return localVarFp.getDecks(name, page, pageSize, options).then((request) => request(axios, basePath));
+        getDecks(requestParameters: DeckServiceGetDecksRequest = {}, options?: RawAxiosRequestConfig): AxiosPromise<PageDeckDto> {
+            return localVarFp.getDecks(requestParameters.name, requestParameters.page, requestParameters.pageSize, options).then((request) => request(axios, basePath));
         },
     };
 };
 
 /**
- * DeckService - interface
+ * Request parameters for addCardToDeck operation in DeckService.
  * @export
- * @interface DeckService
+ * @interface DeckServiceAddCardToDeckRequest
  */
-export interface DeckServiceInterface {
+export interface DeckServiceAddCardToDeckRequest {
     /**
      * 
-     * @summary Add a Card by its ID to a Deck by its name
-     * @param {number} cardId 
-     * @param {string} deckName 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof DeckServiceInterface
+     * @type {number}
+     * @memberof DeckServiceAddCardToDeck
      */
-    addCardToDeck(cardId: number, deckName: string, options?: RawAxiosRequestConfig): AxiosPromise<void>;
+    readonly cardId: number
 
     /**
      * 
-     * @summary Create a Deck with a given name
-     * @param {DeckCreateRequest} deckCreateRequest 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof DeckServiceInterface
+     * @type {string}
+     * @memberof DeckServiceAddCardToDeck
      */
-    createDeck(deckCreateRequest: DeckCreateRequest, options?: RawAxiosRequestConfig): AxiosPromise<void>;
+    readonly deckName: string
+}
+
+/**
+ * Request parameters for createDeck operation in DeckService.
+ * @export
+ * @interface DeckServiceCreateDeckRequest
+ */
+export interface DeckServiceCreateDeckRequest {
+    /**
+     * 
+     * @type {DeckCreateRequest}
+     * @memberof DeckServiceCreateDeck
+     */
+    readonly deckCreateRequest: DeckCreateRequest
+}
+
+/**
+ * Request parameters for getDeckByName operation in DeckService.
+ * @export
+ * @interface DeckServiceGetDeckByNameRequest
+ */
+export interface DeckServiceGetDeckByNameRequest {
+    /**
+     * 
+     * @type {string}
+     * @memberof DeckServiceGetDeckByName
+     */
+    readonly name: string
+}
+
+/**
+ * Request parameters for getDecks operation in DeckService.
+ * @export
+ * @interface DeckServiceGetDecksRequest
+ */
+export interface DeckServiceGetDecksRequest {
+    /**
+     * 
+     * @type {string}
+     * @memberof DeckServiceGetDecks
+     */
+    readonly name?: string | null
 
     /**
      * 
-     * @summary Get a singular Deck by its name
-     * @param {string} name 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof DeckServiceInterface
+     * @type {number}
+     * @memberof DeckServiceGetDecks
      */
-    getDeckByName(name: string, options?: RawAxiosRequestConfig): AxiosPromise<Deck>;
+    readonly page?: number
 
     /**
      * 
-     * @summary Get a page of Decks with optional name query parameter
-     * @param {string | null} [name] 
-     * @param {number} [page] 
-     * @param {number} [pageSize] 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof DeckServiceInterface
+     * @type {number}
+     * @memberof DeckServiceGetDecks
      */
-    getDecks(name?: string | null, page?: number, pageSize?: number, options?: RawAxiosRequestConfig): AxiosPromise<PageDeckDto>;
-
+    readonly pageSize?: number
 }
 
 /**
@@ -364,56 +387,53 @@ export interface DeckServiceInterface {
  * @class DeckService
  * @extends {BaseAPI}
  */
-export class DeckService extends BaseAPI implements DeckServiceInterface {
+export class DeckService extends BaseAPI {
     /**
      * 
      * @summary Add a Card by its ID to a Deck by its name
-     * @param {number} cardId 
-     * @param {string} deckName 
+     * @param {DeckServiceAddCardToDeckRequest} requestParameters Request parameters.
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof DeckService
      */
-    public addCardToDeck(cardId: number, deckName: string, options?: RawAxiosRequestConfig) {
-        return DeckServiceFp(this.configuration).addCardToDeck(cardId, deckName, options).then((request) => request(this.axios, this.basePath));
+    public addCardToDeck(requestParameters: DeckServiceAddCardToDeckRequest, options?: RawAxiosRequestConfig) {
+        return DeckServiceFp(this.configuration).addCardToDeck(requestParameters.cardId, requestParameters.deckName, options).then((request) => request(this.axios, this.basePath));
     }
 
     /**
      * 
      * @summary Create a Deck with a given name
-     * @param {DeckCreateRequest} deckCreateRequest 
+     * @param {DeckServiceCreateDeckRequest} requestParameters Request parameters.
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof DeckService
      */
-    public createDeck(deckCreateRequest: DeckCreateRequest, options?: RawAxiosRequestConfig) {
-        return DeckServiceFp(this.configuration).createDeck(deckCreateRequest, options).then((request) => request(this.axios, this.basePath));
+    public createDeck(requestParameters: DeckServiceCreateDeckRequest, options?: RawAxiosRequestConfig) {
+        return DeckServiceFp(this.configuration).createDeck(requestParameters.deckCreateRequest, options).then((request) => request(this.axios, this.basePath));
     }
 
     /**
      * 
      * @summary Get a singular Deck by its name
-     * @param {string} name 
+     * @param {DeckServiceGetDeckByNameRequest} requestParameters Request parameters.
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof DeckService
      */
-    public getDeckByName(name: string, options?: RawAxiosRequestConfig) {
-        return DeckServiceFp(this.configuration).getDeckByName(name, options).then((request) => request(this.axios, this.basePath));
+    public getDeckByName(requestParameters: DeckServiceGetDeckByNameRequest, options?: RawAxiosRequestConfig) {
+        return DeckServiceFp(this.configuration).getDeckByName(requestParameters.name, options).then((request) => request(this.axios, this.basePath));
     }
 
     /**
      * 
      * @summary Get a page of Decks with optional name query parameter
-     * @param {string | null} [name] 
-     * @param {number} [page] 
-     * @param {number} [pageSize] 
+     * @param {DeckServiceGetDecksRequest} requestParameters Request parameters.
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof DeckService
      */
-    public getDecks(name?: string | null, page?: number, pageSize?: number, options?: RawAxiosRequestConfig) {
-        return DeckServiceFp(this.configuration).getDecks(name, page, pageSize, options).then((request) => request(this.axios, this.basePath));
+    public getDecks(requestParameters: DeckServiceGetDecksRequest = {}, options?: RawAxiosRequestConfig) {
+        return DeckServiceFp(this.configuration).getDecks(requestParameters.name, requestParameters.page, requestParameters.pageSize, options).then((request) => request(this.axios, this.basePath));
     }
 }
 
diff --git a/src/api/openapi/service/job-service.ts b/src/api/openapi/service/job-service.ts
index caf745f..1ddcd13 100644
--- a/src/api/openapi/service/job-service.ts
+++ b/src/api/openapi/service/job-service.ts
@@ -29,6 +29,36 @@ import type { JobDto } from '../model';
  */
 export const JobServiceAxiosParamCreator = function (configuration?: Configuration) {
     return {
+        /**
+         * 
+         * @summary Get status of all Jobs
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        getAllJobs: async (options: RawAxiosRequestConfig = {}): Promise<RequestArgs> => {
+            const localVarPath = `/api/jobs`;
+            // use dummy base URL string because the URL constructor only accepts absolute URLs.
+            const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
+            let baseOptions;
+            if (configuration) {
+                baseOptions = configuration.baseOptions;
+            }
+
+            const localVarRequestOptions = { method: 'GET', ...baseOptions, ...options};
+            const localVarHeaderParameter = {} as any;
+            const localVarQueryParameter = {} as any;
+
+
+    
+            setSearchParams(localVarUrlObj, localVarQueryParameter);
+            let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
+            localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
+
+            return {
+                url: toPathString(localVarUrlObj),
+                options: localVarRequestOptions,
+            };
+        },
         /**
          * 
          * @summary Get status of CardPrintImportJob
@@ -141,6 +171,18 @@ export const JobServiceAxiosParamCreator = function (configuration?: Configurati
 export const JobServiceFp = function(configuration?: Configuration) {
     const localVarAxiosParamCreator = JobServiceAxiosParamCreator(configuration)
     return {
+        /**
+         * 
+         * @summary Get status of all Jobs
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        async getAllJobs(options?: RawAxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<Array<JobDto>>> {
+            const localVarAxiosArgs = await localVarAxiosParamCreator.getAllJobs(options);
+            const localVarOperationServerIndex = configuration?.serverIndex ?? 0;
+            const localVarOperationServerBasePath = operationServerMap['JobService.getAllJobs']?.[localVarOperationServerIndex]?.url;
+            return (axios, basePath) => createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration)(axios, localVarOperationServerBasePath || basePath);
+        },
         /**
          * 
          * @summary Get status of CardPrintImportJob
@@ -192,73 +234,86 @@ export const JobServiceFactory = function (configuration?: Configuration, basePa
     return {
         /**
          * 
-         * @summary Get status of CardPrintImportJob
-         * @param {number} id 
+         * @summary Get status of all Jobs
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        getCardPrintImportJobStatusById(id: number, options?: RawAxiosRequestConfig): AxiosPromise<JobDto> {
-            return localVarFp.getCardPrintImportJobStatusById(id, options).then((request) => request(axios, basePath));
+        getAllJobs(options?: RawAxiosRequestConfig): AxiosPromise<Array<JobDto>> {
+            return localVarFp.getAllJobs(options).then((request) => request(axios, basePath));
+        },
+        /**
+         * 
+         * @summary Get status of CardPrintImportJob
+         * @param {JobServiceGetCardPrintImportJobStatusByIdRequest} requestParameters Request parameters.
+         * @param {*} [options] Override http request option.
+         * @throws {RequiredError}
+         */
+        getCardPrintImportJobStatusById(requestParameters: JobServiceGetCardPrintImportJobStatusByIdRequest, options?: RawAxiosRequestConfig): AxiosPromise<JobDto> {
+            return localVarFp.getCardPrintImportJobStatusById(requestParameters.id, options).then((request) => request(axios, basePath));
         },
         /**
          * 
          * @summary Get status of CardSetImportJob
-         * @param {number} id 
+         * @param {JobServiceGetCardSetImportJobStatusByIdRequest} requestParameters Request parameters.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        getCardSetImportJobStatusById(id: number, options?: RawAxiosRequestConfig): AxiosPromise<JobDto> {
-            return localVarFp.getCardSetImportJobStatusById(id, options).then((request) => request(axios, basePath));
+        getCardSetImportJobStatusById(requestParameters: JobServiceGetCardSetImportJobStatusByIdRequest, options?: RawAxiosRequestConfig): AxiosPromise<JobDto> {
+            return localVarFp.getCardSetImportJobStatusById(requestParameters.id, options).then((request) => request(axios, basePath));
         },
         /**
          * 
          * @summary Get status of RegionalSetImportJob
-         * @param {number} id 
+         * @param {JobServiceGetRegionalSetImportJobStatusByIdRequest} requestParameters Request parameters.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        getRegionalSetImportJobStatusById(id: number, options?: RawAxiosRequestConfig): AxiosPromise<JobDto> {
-            return localVarFp.getRegionalSetImportJobStatusById(id, options).then((request) => request(axios, basePath));
+        getRegionalSetImportJobStatusById(requestParameters: JobServiceGetRegionalSetImportJobStatusByIdRequest, options?: RawAxiosRequestConfig): AxiosPromise<JobDto> {
+            return localVarFp.getRegionalSetImportJobStatusById(requestParameters.id, options).then((request) => request(axios, basePath));
         },
     };
 };
 
 /**
- * JobService - interface
+ * Request parameters for getCardPrintImportJobStatusById operation in JobService.
  * @export
- * @interface JobService
+ * @interface JobServiceGetCardPrintImportJobStatusByIdRequest
  */
-export interface JobServiceInterface {
+export interface JobServiceGetCardPrintImportJobStatusByIdRequest {
     /**
      * 
-     * @summary Get status of CardPrintImportJob
-     * @param {number} id 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof JobServiceInterface
+     * @type {number}
+     * @memberof JobServiceGetCardPrintImportJobStatusById
      */
-    getCardPrintImportJobStatusById(id: number, options?: RawAxiosRequestConfig): AxiosPromise<JobDto>;
+    readonly id: number
+}
 
+/**
+ * Request parameters for getCardSetImportJobStatusById operation in JobService.
+ * @export
+ * @interface JobServiceGetCardSetImportJobStatusByIdRequest
+ */
+export interface JobServiceGetCardSetImportJobStatusByIdRequest {
     /**
      * 
-     * @summary Get status of CardSetImportJob
-     * @param {number} id 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof JobServiceInterface
+     * @type {number}
+     * @memberof JobServiceGetCardSetImportJobStatusById
      */
-    getCardSetImportJobStatusById(id: number, options?: RawAxiosRequestConfig): AxiosPromise<JobDto>;
+    readonly id: number
+}
 
+/**
+ * Request parameters for getRegionalSetImportJobStatusById operation in JobService.
+ * @export
+ * @interface JobServiceGetRegionalSetImportJobStatusByIdRequest
+ */
+export interface JobServiceGetRegionalSetImportJobStatusByIdRequest {
     /**
      * 
-     * @summary Get status of RegionalSetImportJob
-     * @param {number} id 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof JobServiceInterface
+     * @type {number}
+     * @memberof JobServiceGetRegionalSetImportJobStatusById
      */
-    getRegionalSetImportJobStatusById(id: number, options?: RawAxiosRequestConfig): AxiosPromise<JobDto>;
-
+    readonly id: number
 }
 
 /**
@@ -267,41 +322,52 @@ export interface JobServiceInterface {
  * @class JobService
  * @extends {BaseAPI}
  */
-export class JobService extends BaseAPI implements JobServiceInterface {
+export class JobService extends BaseAPI {
     /**
      * 
-     * @summary Get status of CardPrintImportJob
-     * @param {number} id 
+     * @summary Get status of all Jobs
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof JobService
      */
-    public getCardPrintImportJobStatusById(id: number, options?: RawAxiosRequestConfig) {
-        return JobServiceFp(this.configuration).getCardPrintImportJobStatusById(id, options).then((request) => request(this.axios, this.basePath));
+    public getAllJobs(options?: RawAxiosRequestConfig) {
+        return JobServiceFp(this.configuration).getAllJobs(options).then((request) => request(this.axios, this.basePath));
+    }
+
+    /**
+     * 
+     * @summary Get status of CardPrintImportJob
+     * @param {JobServiceGetCardPrintImportJobStatusByIdRequest} requestParameters Request parameters.
+     * @param {*} [options] Override http request option.
+     * @throws {RequiredError}
+     * @memberof JobService
+     */
+    public getCardPrintImportJobStatusById(requestParameters: JobServiceGetCardPrintImportJobStatusByIdRequest, options?: RawAxiosRequestConfig) {
+        return JobServiceFp(this.configuration).getCardPrintImportJobStatusById(requestParameters.id, options).then((request) => request(this.axios, this.basePath));
     }
 
     /**
      * 
      * @summary Get status of CardSetImportJob
-     * @param {number} id 
+     * @param {JobServiceGetCardSetImportJobStatusByIdRequest} requestParameters Request parameters.
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof JobService
      */
-    public getCardSetImportJobStatusById(id: number, options?: RawAxiosRequestConfig) {
-        return JobServiceFp(this.configuration).getCardSetImportJobStatusById(id, options).then((request) => request(this.axios, this.basePath));
+    public getCardSetImportJobStatusById(requestParameters: JobServiceGetCardSetImportJobStatusByIdRequest, options?: RawAxiosRequestConfig) {
+        return JobServiceFp(this.configuration).getCardSetImportJobStatusById(requestParameters.id, options).then((request) => request(this.axios, this.basePath));
     }
 
     /**
      * 
      * @summary Get status of RegionalSetImportJob
-     * @param {number} id 
+     * @param {JobServiceGetRegionalSetImportJobStatusByIdRequest} requestParameters Request parameters.
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof JobService
      */
-    public getRegionalSetImportJobStatusById(id: number, options?: RawAxiosRequestConfig) {
-        return JobServiceFp(this.configuration).getRegionalSetImportJobStatusById(id, options).then((request) => request(this.axios, this.basePath));
+    public getRegionalSetImportJobStatusById(requestParameters: JobServiceGetRegionalSetImportJobStatusByIdRequest, options?: RawAxiosRequestConfig) {
+        return JobServiceFp(this.configuration).getRegionalSetImportJobStatusById(requestParameters.id, options).then((request) => request(this.axios, this.basePath));
     }
 }
 
diff --git a/src/api/openapi/service/set-service.ts b/src/api/openapi/service/set-service.ts
index 0de0c6a..2cae1d1 100644
--- a/src/api/openapi/service/set-service.ts
+++ b/src/api/openapi/service/set-service.ts
@@ -255,96 +255,114 @@ export const SetServiceFactory = function (configuration?: Configuration, basePa
         /**
          * 
          * @summary Find Set By Name
-         * @param {string} name 
+         * @param {SetServiceApiSetsNameGetRequest} requestParameters Request parameters.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        apiSetsNameGet(name: string, options?: RawAxiosRequestConfig): AxiosPromise<SetDto> {
-            return localVarFp.apiSetsNameGet(name, options).then((request) => request(axios, basePath));
+        apiSetsNameGet(requestParameters: SetServiceApiSetsNameGetRequest, options?: RawAxiosRequestConfig): AxiosPromise<SetDto> {
+            return localVarFp.apiSetsNameGet(requestParameters.name, options).then((request) => request(axios, basePath));
         },
         /**
          * 
          * @summary Fetch And Persist From Upstream
-         * @param {string} name 
+         * @param {SetServiceApiSetsNameNewGetRequest} requestParameters Request parameters.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        apiSetsNameNewGet(name: string, options?: RawAxiosRequestConfig): AxiosPromise<Array<SetDto>> {
-            return localVarFp.apiSetsNameNewGet(name, options).then((request) => request(axios, basePath));
+        apiSetsNameNewGet(requestParameters: SetServiceApiSetsNameNewGetRequest, options?: RawAxiosRequestConfig): AxiosPromise<Array<SetDto>> {
+            return localVarFp.apiSetsNameNewGet(requestParameters.name, options).then((request) => request(axios, basePath));
         },
         /**
          * 
          * @summary Scrape And Persist From Upstream
-         * @param {string} name 
+         * @param {SetServiceApiSetsNameScrapeGetRequest} requestParameters Request parameters.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        apiSetsNameScrapeGet(name: string, options?: RawAxiosRequestConfig): AxiosPromise<void> {
-            return localVarFp.apiSetsNameScrapeGet(name, options).then((request) => request(axios, basePath));
+        apiSetsNameScrapeGet(requestParameters: SetServiceApiSetsNameScrapeGetRequest, options?: RawAxiosRequestConfig): AxiosPromise<void> {
+            return localVarFp.apiSetsNameScrapeGet(requestParameters.name, options).then((request) => request(axios, basePath));
         },
         /**
          * 
          * @summary Get a page of Card Sets with optional name query parameter
-         * @param {string | null} [name] 
-         * @param {number} [page] 
-         * @param {number} [pageSize] 
+         * @param {SetServiceGetCardSetPageRequest} requestParameters Request parameters.
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        getCardSetPage(name?: string | null, page?: number, pageSize?: number, options?: RawAxiosRequestConfig): AxiosPromise<PageSetDto> {
-            return localVarFp.getCardSetPage(name, page, pageSize, options).then((request) => request(axios, basePath));
+        getCardSetPage(requestParameters: SetServiceGetCardSetPageRequest = {}, options?: RawAxiosRequestConfig): AxiosPromise<PageSetDto> {
+            return localVarFp.getCardSetPage(requestParameters.name, requestParameters.page, requestParameters.pageSize, options).then((request) => request(axios, basePath));
         },
     };
 };
 
 /**
- * SetService - interface
+ * Request parameters for apiSetsNameGet operation in SetService.
  * @export
- * @interface SetService
+ * @interface SetServiceApiSetsNameGetRequest
  */
-export interface SetServiceInterface {
+export interface SetServiceApiSetsNameGetRequest {
     /**
      * 
-     * @summary Find Set By Name
-     * @param {string} name 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof SetServiceInterface
+     * @type {string}
+     * @memberof SetServiceApiSetsNameGet
      */
-    apiSetsNameGet(name: string, options?: RawAxiosRequestConfig): AxiosPromise<SetDto>;
+    readonly name: string
+}
+
+/**
+ * Request parameters for apiSetsNameNewGet operation in SetService.
+ * @export
+ * @interface SetServiceApiSetsNameNewGetRequest
+ */
+export interface SetServiceApiSetsNameNewGetRequest {
+    /**
+     * 
+     * @type {string}
+     * @memberof SetServiceApiSetsNameNewGet
+     */
+    readonly name: string
+}
+
+/**
+ * Request parameters for apiSetsNameScrapeGet operation in SetService.
+ * @export
+ * @interface SetServiceApiSetsNameScrapeGetRequest
+ */
+export interface SetServiceApiSetsNameScrapeGetRequest {
+    /**
+     * 
+     * @type {string}
+     * @memberof SetServiceApiSetsNameScrapeGet
+     */
+    readonly name: string
+}
+
+/**
+ * Request parameters for getCardSetPage operation in SetService.
+ * @export
+ * @interface SetServiceGetCardSetPageRequest
+ */
+export interface SetServiceGetCardSetPageRequest {
+    /**
+     * 
+     * @type {string}
+     * @memberof SetServiceGetCardSetPage
+     */
+    readonly name?: string | null
 
     /**
      * 
-     * @summary Fetch And Persist From Upstream
-     * @param {string} name 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof SetServiceInterface
+     * @type {number}
+     * @memberof SetServiceGetCardSetPage
      */
-    apiSetsNameNewGet(name: string, options?: RawAxiosRequestConfig): AxiosPromise<Array<SetDto>>;
+    readonly page?: number
 
     /**
      * 
-     * @summary Scrape And Persist From Upstream
-     * @param {string} name 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof SetServiceInterface
+     * @type {number}
+     * @memberof SetServiceGetCardSetPage
      */
-    apiSetsNameScrapeGet(name: string, options?: RawAxiosRequestConfig): AxiosPromise<void>;
-
-    /**
-     * 
-     * @summary Get a page of Card Sets with optional name query parameter
-     * @param {string | null} [name] 
-     * @param {number} [page] 
-     * @param {number} [pageSize] 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof SetServiceInterface
-     */
-    getCardSetPage(name?: string | null, page?: number, pageSize?: number, options?: RawAxiosRequestConfig): AxiosPromise<PageSetDto>;
-
+    readonly pageSize?: number
 }
 
 /**
@@ -353,55 +371,53 @@ export interface SetServiceInterface {
  * @class SetService
  * @extends {BaseAPI}
  */
-export class SetService extends BaseAPI implements SetServiceInterface {
+export class SetService extends BaseAPI {
     /**
      * 
      * @summary Find Set By Name
-     * @param {string} name 
+     * @param {SetServiceApiSetsNameGetRequest} requestParameters Request parameters.
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof SetService
      */
-    public apiSetsNameGet(name: string, options?: RawAxiosRequestConfig) {
-        return SetServiceFp(this.configuration).apiSetsNameGet(name, options).then((request) => request(this.axios, this.basePath));
+    public apiSetsNameGet(requestParameters: SetServiceApiSetsNameGetRequest, options?: RawAxiosRequestConfig) {
+        return SetServiceFp(this.configuration).apiSetsNameGet(requestParameters.name, options).then((request) => request(this.axios, this.basePath));
     }
 
     /**
      * 
      * @summary Fetch And Persist From Upstream
-     * @param {string} name 
+     * @param {SetServiceApiSetsNameNewGetRequest} requestParameters Request parameters.
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof SetService
      */
-    public apiSetsNameNewGet(name: string, options?: RawAxiosRequestConfig) {
-        return SetServiceFp(this.configuration).apiSetsNameNewGet(name, options).then((request) => request(this.axios, this.basePath));
+    public apiSetsNameNewGet(requestParameters: SetServiceApiSetsNameNewGetRequest, options?: RawAxiosRequestConfig) {
+        return SetServiceFp(this.configuration).apiSetsNameNewGet(requestParameters.name, options).then((request) => request(this.axios, this.basePath));
     }
 
     /**
      * 
      * @summary Scrape And Persist From Upstream
-     * @param {string} name 
+     * @param {SetServiceApiSetsNameScrapeGetRequest} requestParameters Request parameters.
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof SetService
      */
-    public apiSetsNameScrapeGet(name: string, options?: RawAxiosRequestConfig) {
-        return SetServiceFp(this.configuration).apiSetsNameScrapeGet(name, options).then((request) => request(this.axios, this.basePath));
+    public apiSetsNameScrapeGet(requestParameters: SetServiceApiSetsNameScrapeGetRequest, options?: RawAxiosRequestConfig) {
+        return SetServiceFp(this.configuration).apiSetsNameScrapeGet(requestParameters.name, options).then((request) => request(this.axios, this.basePath));
     }
 
     /**
      * 
      * @summary Get a page of Card Sets with optional name query parameter
-     * @param {string | null} [name] 
-     * @param {number} [page] 
-     * @param {number} [pageSize] 
+     * @param {SetServiceGetCardSetPageRequest} requestParameters Request parameters.
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof SetService
      */
-    public getCardSetPage(name?: string | null, page?: number, pageSize?: number, options?: RawAxiosRequestConfig) {
-        return SetServiceFp(this.configuration).getCardSetPage(name, page, pageSize, options).then((request) => request(this.axios, this.basePath));
+    public getCardSetPage(requestParameters: SetServiceGetCardSetPageRequest = {}, options?: RawAxiosRequestConfig) {
+        return SetServiceFp(this.configuration).getCardSetPage(requestParameters.name, requestParameters.page, requestParameters.pageSize, options).then((request) => request(this.axios, this.basePath));
     }
 }
 
diff --git a/src/assets/DARK.svg b/src/assets/DARK.svg
new file mode 100644
index 0000000..f56a107
--- /dev/null
+++ b/src/assets/DARK.svg
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="76.85199" height="77.151932" id="svg3760" version="1.1" inkscape:version="0.48.1 " sodipodi:docname="DARK.svg">
+  <defs id="defs3762">
+    <linearGradient id="linearGradient3795">
+      <stop id="stop3797" offset="0" style="stop-color:#1c2224;stop-opacity:1"/>
+      <stop style="stop-color:#2a2723;stop-opacity:1" offset="0.63092703" id="stop3799"/>
+      <stop id="stop3801" offset="1" style="stop-color:#e6282e;stop-opacity:1"/>
+    </linearGradient>
+    <linearGradient id="linearGradient3432">
+      <stop style="stop-color:#7260a4;stop-opacity:1;" offset="0" id="stop3434"/>
+      <stop id="stop3793" offset="0.5" style="stop-color:#8d4b99;stop-opacity:1;"/>
+      <stop style="stop-color:#a8378f;stop-opacity:1" offset="1" id="stop3436"/>
+    </linearGradient>
+    <linearGradient id="linearGradient3418">
+      <stop id="stop3420" offset="0" style="stop-color:#d23388;stop-opacity:1"/>
+      <stop style="stop-color:#ef2e43;stop-opacity:1" offset="0.29348826" id="stop3422"/>
+      <stop id="stop3430" offset="0.68986225" style="stop-color:#e5282c;stop-opacity:1"/>
+      <stop id="stop3424" offset="1" style="stop-color:#602b33;stop-opacity:1"/>
+    </linearGradient>
+    <linearGradient id="linearGradient3410">
+      <stop style="stop-color:#808080;stop-opacity:1;" offset="0" id="stop3412"/>
+      <stop id="stop3426" offset="0.5" style="stop-color:#808080;stop-opacity:0.49803922;"/>
+      <stop style="stop-color:#808080;stop-opacity:0.24705882;" offset="0.75" id="stop3428"/>
+      <stop style="stop-color:#808080;stop-opacity:0;" offset="1" id="stop3414"/>
+    </linearGradient>
+    <linearGradient id="linearGradient3177">
+      <stop id="stop3179" offset="0" style="stop-color:#800000;stop-opacity:1"/>
+      <stop style="stop-color:#d69c45;stop-opacity:1" offset="0.21338069" id="stop3181"/>
+      <stop id="stop3183" offset="1" style="stop-color:#e5ff6a;stop-opacity:1"/>
+    </linearGradient>
+    <linearGradient id="linearGradient4306">
+      <stop id="stop4308" offset="0" style="stop-color:#9f863f;stop-opacity:1"/>
+      <stop style="stop-color:#332815;stop-opacity:1" offset="1" id="stop4310"/>
+      <stop id="stop4312" offset="1" style="stop-color:#e9e560;stop-opacity:1"/>
+    </linearGradient>
+    <linearGradient id="linearGradient4296">
+      <stop id="stop4298" offset="0" style="stop-color:#f0bf7a;stop-opacity:0.91071427;"/>
+      <stop style="stop-color:#f0bf7a;stop-opacity:0.45490196;" offset="0.64173013" id="stop4300"/>
+      <stop id="stop4302" offset="1" style="stop-color:#f0bf7a;stop-opacity:0;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient4230">
+      <stop style="stop-color:#f0bf7a;stop-opacity:0.91071427;" offset="0" id="stop4232"/>
+      <stop id="stop4292" offset="0.5" style="stop-color:#f0bf7a;stop-opacity:0.45490196;"/>
+      <stop style="stop-color:#f0bf7a;stop-opacity:0;" offset="1" id="stop4234"/>
+    </linearGradient>
+    <linearGradient id="linearGradient3111">
+      <stop style="stop-color:#f3c87d;stop-opacity:0.7589286;" offset="0" id="stop3113"/>
+      <stop id="stop3119" offset="0.91352373" style="stop-color:#d69c45;stop-opacity:1"/>
+      <stop style="stop-color:#e5ff6a;stop-opacity:1" offset="1" id="stop3115"/>
+    </linearGradient>
+    <linearGradient id="linearGradient3101">
+      <stop style="stop-color:#a5864d;stop-opacity:1" offset="0" id="stop3103"/>
+      <stop id="stop4238" offset="0.78602821" style="stop-color:#332815;stop-opacity:1"/>
+      <stop style="stop-color:#1a1911;stop-opacity:1" offset="1" id="stop3105"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient4230" id="radialGradient4236" cx="306.59958" cy="555.36737" fx="306.59958" fy="555.36737" r="6.0054863" gradientTransform="matrix(0.60886416,0.50796393,-0.90996045,1.0907119,625.30825,-205.98784)" gradientUnits="userSpaceOnUse"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient4306" id="radialGradient4304" cx="327.57648" cy="574.45367" fx="327.57648" fy="574.45367" r="39.671756" gradientTransform="matrix(-1.8589783e-6,1.0770613,-1.1551438,-2.9470962e-6,991.28513,221.58125)" gradientUnits="userSpaceOnUse"/>
+    <linearGradient y2="22.401928" x2="106.24998" y1="22.901928" x1="143.49998" gradientTransform="matrix(1.2113408,0,0,1.2113407,182.53634,525.19736)" gradientUnits="userSpaceOnUse" id="linearGradient6058" xlink:href="#linearGradient5507-3" inkscape:collect="always"/>
+    <linearGradient id="linearGradient5507-3">
+      <stop style="stop-color:#ff0000;stop-opacity:1;" offset="0" id="stop5509-1"/>
+      <stop style="stop-color:#ff6600;stop-opacity:1" offset="1" id="stop5511-9"/>
+    </linearGradient>
+    <linearGradient y2="22.401928" x2="106.24998" y1="22.901928" x1="143.49998" gradientTransform="matrix(1.2113408,0,0,1.2113407,182.53634,525.19736)" gradientUnits="userSpaceOnUse" id="linearGradient7449" xlink:href="#linearGradient5507-3" inkscape:collect="always"/>
+    <linearGradient id="linearGradient7451">
+      <stop style="stop-color:#ff0000;stop-opacity:1;" offset="0" id="stop7453"/>
+      <stop style="stop-color:#ff6600;stop-opacity:1" offset="1" id="stop7455"/>
+    </linearGradient>
+    <linearGradient y2="22.401928" x2="106.24998" y1="22.901928" x1="143.49998" gradientTransform="matrix(0.37606897,0,0,0.37606891,284.34192,546.05033)" gradientUnits="userSpaceOnUse" id="linearGradient7459" xlink:href="#linearGradient5507-3" inkscape:collect="always"/>
+    <linearGradient id="linearGradient3111-5">
+      <stop style="stop-color:#ff0000;stop-opacity:1" offset="0" id="stop3113-4"/>
+      <stop id="stop3119-9" offset="0.91352373" style="stop-color:#d69c45;stop-opacity:1"/>
+      <stop style="stop-color:#e5ff6a;stop-opacity:1" offset="1" id="stop3115-5"/>
+    </linearGradient>
+    <linearGradient id="linearGradient3101-4">
+      <stop style="stop-color:#a5864d;stop-opacity:1" offset="0" id="stop3103-8"/>
+      <stop id="stop4238-2" offset="0.78602821" style="stop-color:#332815;stop-opacity:1"/>
+      <stop style="stop-color:#1a1911;stop-opacity:1" offset="1" id="stop3105-1"/>
+    </linearGradient>
+    <linearGradient id="linearGradient4296-8">
+      <stop id="stop4298-3" offset="0" style="stop-color:#f0bf7a;stop-opacity:0.91071427;"/>
+      <stop style="stop-color:#f0bf7a;stop-opacity:0.45490196;" offset="0.64173013" id="stop4300-1"/>
+      <stop id="stop4302-4" offset="1" style="stop-color:#f0bf7a;stop-opacity:0;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3418" id="linearGradient3416" x1="297.6759" y1="553.48169" x2="359.14716" y2="570.18866" gradientUnits="userSpaceOnUse"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3432" id="linearGradient3438" x1="301.63666" y1="603.81531" x2="324.00909" y2="564.27753" gradientUnits="userSpaceOnUse"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3795" id="linearGradient3791" x1="328.6752" y1="598.91052" x2="335.13403" y2="548.35461" gradientUnits="userSpaceOnUse"/>
+  </defs>
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="6.4192037" inkscape:cx="107.35795" inkscape:cy="40.475082" inkscape:document-units="px" inkscape:current-layer="g4793" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="1280" inkscape:window-height="780" inkscape:window-x="-8" inkscape:window-y="-8" inkscape:window-maximized="1" inkscape:snap-global="true" showguides="true" inkscape:guide-bbox="true"/>
+  <metadata id="metadata3765">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-288.98475,-535.52559)">
+    <g id="g4793" transform="matrix(0.96766596,0,0,0.94944363,10.181651,28.771222)">
+      <text xml:space="preserve" style="font-size:15.04275513px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient7459);fill-opacity:1;stroke:none;font-family:StoneSerITCStd Medium;-inkscape-font-specification:StoneSerITCStd Medium" x="319.97443" y="555.13312" id="text5503" sodipodi:linespacing="125%" transform="scale(0.99053965,1.0095507)"><tspan sodipodi:role="line" id="tspan5505" x="319.97443" y="555.13312" style="font-size:2.25641346px;fill:url(#linearGradient7459);fill-opacity:1">Created by Falzar FZ</tspan></text>
+      <g transform="translate(0.00547206,0.0258127)" id="g3021" style="display:inline">
+        <path style="fill:url(#linearGradient3416);fill-opacity:1;stroke:none" d="m 325.12487,533.76805 c -12.04619,0.12786 -23.83129,6.47825 -30.10708,16.8382 -9.98334,15.47574 -9.2208,37.5796 3.10803,51.55872 7.91058,8.9416 20.14109,13.52621 31.99522,12.68526 12.96871,-0.25474 25.57911,-7.74217 31.66968,-19.25774 5.39871,-9.43832 6.92244,-20.84042 4.7256,-31.45827 -2.298,-13.99137 -13.54381,-26.2257 -27.38604,-29.44165 -4.60618,-0.8471 -9.33291,-0.96193 -14.00541,-0.92452 z" id="path3048" inkscape:connector-curvature="0"/>
+        <g id="g4771" transform="translate(-85.682227,0.42272594)" style="fill:#ffffff;fill-opacity:1"/>
+        <path style="fill:url(#linearGradient3791);fill-opacity:1;stroke:none" d="m 313.77433,554.36015 c -16.09525,1.91834 -22.00562,49.43006 23.19335,43.55164 18.17503,-11.0868 26.88882,-21.81763 25.25395,-29.59012 -4.28871,-9.28069 -6.36597,-6.81399 -12.19801,-3.9823 -22.7935,5.71562 -22.42028,-12.56551 -36.24929,-9.97922 z" id="path3048-3-1" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        <path style="fill:url(#linearGradient3438);fill-opacity:1;stroke:none" d="m 319.25832,534.42259 c -17.1721,2.74453 -27.47255,16.64483 -30.52308,32.75312 -2.26633,13.24516 2.11531,28.84901 11.0273,36.73852 7.14713,6.32713 11.97183,10.97739 31.22638,11.13688 12.89226,0.10679 25.58694,-8.765 32.11536,-20.28954 6.64365,-11.7279 4.06281,-28.09614 3.09577,-32.22298 -2.69983,4.70986 -7.44527,9.41562 -18.39552,9.37863 -7.7157,0.7474 -9.21291,3.73285 -0.53087,8.98006 -6.73148,4.93847 -7.36609,6.57008 -10.86213,7.46593 -2.14967,-2.65959 -6.84292,-8.09326 -10.31532,-7.86934 -2.84444,17.35613 -10.7591,12.69319 -15.17995,6.49425 -9.81332,-15.53051 -11.50843,-17.57165 -11.65137,-25.45428 1.57491,-14.02577 5.3228,-21.8361 19.99343,-27.11125 z" id="path3048-3" inkscape:connector-curvature="0" sodipodi:nodetypes="ccssscccccccc"/>
+      </g>
+      <g id="g3783" transform="translate(-92.915959,-2.0293745)" style="fill:#fff9f9;fill-opacity:1">
+        <path sodipodi:nodetypes="cccccccccccccccccccccccccccscccccccsccccccccccccccccccccccccccccccccccccccccccccccccccc" inkscape:connector-curvature="0" d="m 413.01766,587.4904 c 0,0 -0.55161,1.94613 -0.008,2.97743 -0.005,1.98581 -0.0191,6.96001 -0.0245,8.93742 -0.77264,1.29516 -0.008,2.92702 -0.008,2.92702 l 18.68984,-0.006 c 0,0 0.76573,-1.32511 0.0358,-3.01444 0.0237,-1.9919 0.0828,-6.96675 0.10623,-8.93693 0.60471,-1.0486 0.0343,-2.8842 0.0343,-2.8842 z m 15.35787,2.97189 -0.0174,2.97044 -11.5988,-0.013 -0.0618,-2.92409 z m 0.005,5.95467 -0.0476,2.93962 -11.57866,0.009 -0.0583,-2.96932 z m -7.53731,-22.78955 c -0.008,1.02184 0.72561,2.91431 0.72561,2.91431 0,0 -8.81406,0.0127 -11.01918,0.0759 -0.84154,0.86957 -0.89045,1.6531 0.53266,2.46141 1.25664,-0.42279 3.63252,-0.54071 5.33748,-0.19547 0.26111,0.60596 0.3644,3.63656 0.3644,3.63656 0,0 -7.91714,0.078 -9.13135,0.5929 -2.17006,0.52322 -4.44581,3.53322 -0.0191,3.34867 3.51001,-1.42106 8.7536,-1.29677 14.68306,-1.32488 5.264,-0.025 11.49373,1.10179 15.68613,1.88855 2.27251,-0.77132 2.78907,-2.76731 2.5534,-4.46209 -1.82129,0.0865 -11.70182,-0.21869 -11.70182,-0.21869 0,0 0.20182,-2.27389 0.63401,-3.71781 1.99455,0.0897 4.80944,0.11071 5.69293,-0.34803 0.54582,-0.97375 0.53097,-1.75842 -0.37434,-1.98571 -1.18734,-0.35781 -10.56927,0.17858 -10.56927,0.17858 0,0 -0.39518,-1.38603 -0.72864,-2.52776 -0.5456,-1.86801 -2.65118,-2.13138 -2.66595,-0.31641 z m 5.60505,4.96067 -0.47222,3.96696 -6.95092,-0.0165 -0.39457,-3.91962 z m 0.84294,-21.70474 c 0,0 -0.8205,1.34369 0.026,2.81971 0.0226,2.44416 0.10944,11.84527 0.10944,11.84527 0,0 2.14876,1.45528 4.79874,0.11477 4.01165,0.0272 11.64336,0.0616 11.64336,0.0616 0,0 0.0227,20.79949 0.10443,28.88613 -0.0131,2.48672 3.79959,2.5133 3.75503,0.24226 0.1006,-8.81765 0.0533,-43.93432 0.0533,-43.93432 0,0 -1.43709,-0.95336 -3.13266,-0.082 -2.85262,-0.007 -11.2583,0.0172 -14.12434,0.01 -2.04531,-0.74834 -3.23338,0.0373 -3.23338,0.0373 z m 16.63677,2.03986 -0.0225,3.83293 -13.54429,-0.0476 -0.051,-3.88821 z m -0.024,6.8507 -0.0921,3.90999 -13.40089,-0.0439 -0.09,-3.90559 z m -46.71643,-9.01033 c 0,0 0.24357,29.05173 -0.20401,33.21297 -1.82121,4.43875 -3.87873,6.38363 -4.95587,7.10878 -0.76282,1.12863 0.79281,2.49473 2.81122,3.78774 9.73281,3.21699 6.79265,-28.19443 6.79265,-28.19443 l 16.98372,0.0111 c 0,0 0.0473,-10.66655 0.0591,-13.31582 0.87955,-1.53213 0.0115,-2.57983 0.0115,-2.57983 0,0 -1.25819,-1.11691 -2.82517,-0.004 -2.98278,-0.004 -11.95931,-0.017 -15.0715,-0.0214 -2.29011,-1.30775 -3.60164,-0.005 -3.60164,-0.005 z m 18.47387,6.86575 -14.47058,-0.0129 -0.006,-4.70674 14.57497,0.0916 z m 0.0457,6.98211 -14.48963,0.13086 0.003,-4.99066 14.56805,0.0267 z" style="fill:#fff9f9;stroke:none;fill-opacity:1" id="path3452"/>
+        <g id="g3777" style="fill:#fff9f9;fill-opacity:1">
+          <path style="fill:#fff9f9;stroke:none;fill-opacity:1" d="m 398.00764,542.83244 c -0.10324,0.24039 0.0129,0.55197 0.30074,0.53074 0.37089,0.0738 0.98174,0.0133 1.05965,0.52457 0.10293,1.50778 0.0245,3.02934 0.0403,4.54212 -0.0111,1.52296 -0.0229,3.04592 -0.0343,4.56889 -0.35727,0.38823 -0.99013,0.12577 -1.36444,0.45051 -0.0843,0.2108 -0.0185,0.52432 0.27249,0.41759 2.16053,-0.0371 4.33043,0.0912 6.48441,-0.11644 1.67776,-0.26741 3.37281,-1.13396 4.30387,-2.61748 0.67218,-1.07491 1.01405,-2.35062 0.90626,-3.62658 -0.0532,-1.75274 -1.16321,-3.40653 -2.75956,-4.06517 -1.67411,-0.80289 -3.5676,-0.59266 -5.36243,-0.64393 -1.27321,0.0139 -2.56154,-0.037 -3.82522,0.0252 l -0.0218,0.01 z m 4.71091,0.65211 c 1.14746,0.0173 1.86078,0.003 2.83786,0.70765 1.28512,0.81858 1.81992,2.42919 1.8226,3.91471 0.0326,1.67662 -0.50678,3.56143 -2.00577,4.45355 -1.15782,0.65961 -2.05022,0.72083 -3.34497,0.55967 -0.49529,-0.0525 -0.79216,-0.54398 -0.74075,-1.02445 -0.069,-2.87991 -0.0405,-5.76142 -0.0667,-8.64199 0.49922,0.0103 0.99843,0.0206 1.49764,0.0309 z" id="path3713" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccccccccc"/>
+          <path style="fill:#fff9f9;stroke:none;fill-opacity:1" d="m 415.6698,542.60616 c -0.44074,-0.007 -0.3908,0.56648 -0.58086,0.82774 -1.26974,2.93667 -2.46966,5.90457 -3.79987,8.81554 -0.21818,0.58223 -0.76638,0.99199 -1.36883,1.1196 -0.21809,0.14855 -0.15111,0.63481 0.19739,0.49782 1.04437,-0.0244 2.11043,0.0491 3.14113,-0.037 0.14376,-0.29926 -0.10779,-0.56152 -0.41174,-0.57188 -0.46018,-0.10059 -0.61738,-0.639 -0.4075,-1.01416 0.22677,-0.66837 0.51199,-1.33255 0.76832,-1.99747 1.4517,0 2.90342,0 4.35514,0 0.29139,0.89543 0.80905,1.76079 0.85532,2.701 -0.0752,0.37321 -0.62554,0.27138 -0.88716,0.43611 -0.2281,0.14134 -0.1486,0.62107 0.19314,0.48343 1.30907,-0.018 2.63406,0.036 3.93317,-0.027 0.19025,-0.27382 -0.0891,-0.56946 -0.39091,-0.57572 -0.81071,-0.24229 -0.90332,-1.18412 -1.22348,-1.81905 -1.16566,-2.90442 -2.27438,-5.8305 -3.40969,-8.74635 -0.27039,-0.14154 -0.65186,-0.0678 -0.96357,-0.0926 z m -0.0806,2.09209 c 0.58787,1.59705 1.13468,3.2088 1.7064,4.81162 -1.25259,-0.0149 -2.50771,0.0337 -3.75875,-0.035 0.67494,-1.60247 1.35545,-3.20225 2.04386,-4.79927 l 0.008,0.0226 z" id="path3715" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccccccccc"/>
+          <path style="fill:#fff9f9;stroke:none;fill-opacity:1" d="m 422.23031,542.82421 c -0.0859,0.21531 -0.0336,0.59808 0.29799,0.5328 0.37545,0.0843 1.04542,0.0188 1.14444,0.47519 0.0893,2.98051 0.0815,5.96556 0.006,8.94644 -0.0326,0.44913 -0.65125,0.46394 -1.00037,0.52362 -0.31356,-0.0224 -0.62705,0.2318 -0.43558,0.54197 1.62829,0.0531 3.27341,0.007 4.90813,0.0226 0.25423,-0.13324 0.092,-0.58232 -0.2181,-0.55131 -0.38964,-0.10761 -1.00666,-0.0198 -1.18329,-0.4608 -0.13302,-1.2566 -0.0546,-2.53029 -0.0778,-3.79334 0.53119,0 1.06239,0 1.59357,0 1.00067,1.44512 1.89449,2.96291 2.97338,4.35494 0.35279,0.41153 0.9211,0.49442 1.4489,0.45051 0.45477,-0.0405 0.96989,0.0826 1.3906,-0.1008 0.18111,-0.29256 -0.34321,-0.39966 -0.49664,-0.56982 -1.3656,-1.10571 -2.30906,-2.62199 -3.39244,-3.97626 -0.0443,-0.17278 -0.54112,-0.45662 -0.22008,-0.55559 1.11982,-0.45254 2.13475,-1.34818 2.3083,-2.54467 0.25429,-1.20819 -0.43254,-2.53188 -1.65188,-2.97871 -1.02043,-0.43486 -2.18733,-0.25416 -3.27351,-0.32097 -1.36491,0.005 -2.74641,-0.0595 -4.10067,-0.005 l -0.0215,0.009 z m 4.48706,0.65417 c 0.74689,-0.0108 1.42796,0.003 1.92451,0.62948 0.63747,0.82028 0.5557,1.9544 0.31312,2.89026 -0.2089,0.8436 -1.08176,1.39258 -1.97794,1.3721 -0.49868,0.0331 -0.80535,0.0161 -1.3048,0.0206 0,-1.64433 0,-3.28866 0,-4.93298 0.34837,0.007 0.69674,0.0137 1.04511,0.0206 z" id="path3717" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccccccccccccccccccc"/>
+          <path style="fill:#fff9f9;stroke:none;fill-opacity:1" d="m 433.33878,542.83244 c -0.0872,0.22622 -0.0335,0.5908 0.28644,0.5616 0.37981,0.0571 0.82033,-0.0236 0.93731,0.45256 0.11832,2.87453 0.0834,5.75573 0.0167,8.6317 0.0378,0.2856 0.15627,0.62281 -0.16375,0.69737 -0.3345,0.17122 -0.79682,0.0227 -1.07253,0.288 -0.0923,0.20769 -0.0126,0.50838 0.28016,0.40319 1.51255,-0.018 3.0408,0.036 4.54353,-0.027 0.17017,-0.23815 -0.0342,-0.56517 -0.3349,-0.52636 -0.35051,-0.064 -0.88858,-0.0517 -1.05791,-0.42582 -0.14541,-1.4869 -0.0636,-2.99111 -0.10871,-4.48454 0.41914,-0.0351 0.61651,0.46097 0.90336,0.67542 1.38245,1.46289 2.664,3.03486 4.10603,4.43654 0.53525,0.49418 1.34383,0.30228 2.00708,0.3523 0.24866,-0.0599 0.69792,0.0872 0.81958,-0.19596 -0.25784,-0.43152 -0.81977,-0.62341 -1.18126,-0.97919 -1.41979,-1.07445 -2.51622,-2.45877 -3.77799,-3.70787 -0.38471,-0.40605 -0.78366,-0.81633 -1.15195,-1.2354 1.38747,-1.27381 2.80796,-2.54222 4.30063,-3.6946 0.36391,-0.31545 0.92258,-0.41766 1.19172,-0.82696 0.11389,-0.31275 -0.0818,-0.54365 -0.4244,-0.432 -0.98422,0.0244 -1.98975,-0.049 -2.9605,0.037 -0.11529,0.27204 0.0157,0.61887 0.35125,0.59656 0.22861,0.004 0.63945,0.17495 0.4474,0.45463 -0.81415,0.95335 -1.85766,1.70352 -2.7865,2.54827 -0.58328,0.48436 -1.12299,1.03079 -1.80264,1.37878 -0.0419,-1.30473 -0.0668,-2.63006 0.0627,-3.92499 0.1258,-0.55137 0.82454,-0.43093 1.24398,-0.5328 0.28389,-0.0844 0.29713,-0.70677 -0.10027,-0.55748 -1.51525,0.0184 -3.04645,-0.0363 -4.5519,0.027 l -0.0226,0.01 z" id="path3719" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccccccccccccccccc"/>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/DIVINE.svg b/src/assets/DIVINE.svg
new file mode 100644
index 0000000..6e09c35
--- /dev/null
+++ b/src/assets/DIVINE.svg
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="76.85199" height="77.151932" id="svg3760" version="1.1" inkscape:version="0.48.1 " sodipodi:docname="DIVINE.svg">
+  <defs id="defs3762">
+    <linearGradient id="linearGradient4306">
+      <stop id="stop4308" offset="0" style="stop-color:#9f863f;stop-opacity:1"/>
+      <stop style="stop-color:#332815;stop-opacity:1" offset="1" id="stop4310"/>
+      <stop id="stop4312" offset="1" style="stop-color:#e9e560;stop-opacity:1"/>
+    </linearGradient>
+    <linearGradient id="linearGradient4296">
+      <stop id="stop4298" offset="0" style="stop-color:#f0bf7a;stop-opacity:0.91071427;"/>
+      <stop style="stop-color:#f0bf7a;stop-opacity:0.45490196;" offset="0.64173013" id="stop4300"/>
+      <stop id="stop4302" offset="1" style="stop-color:#f0bf7a;stop-opacity:0;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient4230">
+      <stop style="stop-color:#f0bf7a;stop-opacity:0.91071427;" offset="0" id="stop4232"/>
+      <stop id="stop4292" offset="0.5" style="stop-color:#f0bf7a;stop-opacity:0.45490196;"/>
+      <stop style="stop-color:#f0bf7a;stop-opacity:0;" offset="1" id="stop4234"/>
+    </linearGradient>
+    <linearGradient id="linearGradient3111">
+      <stop style="stop-color:#f3c87d;stop-opacity:0.7589286;" offset="0" id="stop3113"/>
+      <stop id="stop3119" offset="0.91352373" style="stop-color:#d69c45;stop-opacity:1"/>
+      <stop style="stop-color:#e5ff6a;stop-opacity:1" offset="1" id="stop3115"/>
+    </linearGradient>
+    <linearGradient id="linearGradient3101">
+      <stop style="stop-color:#a5864d;stop-opacity:1" offset="0" id="stop3103"/>
+      <stop id="stop4238" offset="0.78602821" style="stop-color:#332815;stop-opacity:1"/>
+      <stop style="stop-color:#1a1911;stop-opacity:1" offset="1" id="stop3105"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient4230" id="radialGradient4236" cx="306.59958" cy="555.36737" fx="306.59958" fy="555.36737" r="6.0054863" gradientTransform="matrix(0.60886416,0.50796393,-0.90996045,1.0907119,625.30825,-205.98784)" gradientUnits="userSpaceOnUse"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient4306" id="radialGradient4304" cx="327.57648" cy="574.45367" fx="327.57648" fy="574.45367" r="39.671756" gradientTransform="matrix(-1.8589783e-6,1.0770613,-1.1551438,-2.9470962e-6,991.28513,221.58125)" gradientUnits="userSpaceOnUse"/>
+    <linearGradient y2="22.401928" x2="106.24998" y1="22.901928" x1="143.49998" gradientTransform="matrix(1.2113408,0,0,1.2113407,182.53634,525.19736)" gradientUnits="userSpaceOnUse" id="linearGradient6058" xlink:href="#linearGradient5507-3" inkscape:collect="always"/>
+    <linearGradient id="linearGradient5507-3">
+      <stop style="stop-color:#ff0000;stop-opacity:1;" offset="0" id="stop5509-1"/>
+      <stop style="stop-color:#ff6600;stop-opacity:1" offset="1" id="stop5511-9"/>
+    </linearGradient>
+    <linearGradient y2="22.401928" x2="106.24998" y1="22.901928" x1="143.49998" gradientTransform="matrix(1.2113408,0,0,1.2113407,182.53634,525.19736)" gradientUnits="userSpaceOnUse" id="linearGradient7449" xlink:href="#linearGradient5507-3" inkscape:collect="always"/>
+    <linearGradient id="linearGradient7451">
+      <stop style="stop-color:#ff0000;stop-opacity:1;" offset="0" id="stop7453"/>
+      <stop style="stop-color:#ff6600;stop-opacity:1" offset="1" id="stop7455"/>
+    </linearGradient>
+    <linearGradient y2="22.401928" x2="106.24998" y1="22.901928" x1="143.49998" gradientTransform="matrix(0.59536999,0,0,0.5953699,257.48367,541.07321)" gradientUnits="userSpaceOnUse" id="linearGradient7459" xlink:href="#linearGradient5507-3" inkscape:collect="always"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3111-5" id="radialGradient4358-4" cx="327.81348" cy="574.35522" fx="327.81348" fy="574.35522" r="39.671757" gradientTransform="matrix(1,0,0,1.0232282,0,-13.341263)" gradientUnits="userSpaceOnUse"/>
+    <linearGradient id="linearGradient3111-5">
+      <stop style="stop-color:#f3c87d;stop-opacity:0.7589286;" offset="0" id="stop3113-4"/>
+      <stop id="stop3119-9" offset="0.91352373" style="stop-color:#d69c45;stop-opacity:1"/>
+      <stop style="stop-color:#e5ff6a;stop-opacity:1" offset="1" id="stop3115-5"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3101-4" id="radialGradient3107-6" cx="316.5849" cy="568.73383" fx="316.5849" fy="568.73383" r="35.220825" gradientTransform="matrix(0.74739457,0.822666,-0.75830964,0.68893224,512.80084,-84.984613)" gradientUnits="userSpaceOnUse"/>
+    <linearGradient id="linearGradient3101-4">
+      <stop style="stop-color:#a5864d;stop-opacity:1" offset="0" id="stop3103-8"/>
+      <stop id="stop4238-2" offset="0.78602821" style="stop-color:#332815;stop-opacity:1"/>
+      <stop style="stop-color:#1a1911;stop-opacity:1" offset="1" id="stop3105-1"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient4296-8" id="radialGradient4294-6" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.60886416,0.50796393,-0.90996045,1.0907119,625.30825,-205.98784)" cx="306.59958" cy="555.36737" fx="306.59958" fy="555.36737" r="6.0054865"/>
+    <linearGradient id="linearGradient4296-8">
+      <stop id="stop4298-3" offset="0" style="stop-color:#f0bf7a;stop-opacity:0.91071427;"/>
+      <stop style="stop-color:#f0bf7a;stop-opacity:0.45490196;" offset="0.64173013" id="stop4300-1"/>
+      <stop id="stop4302-4" offset="1" style="stop-color:#f0bf7a;stop-opacity:0;"/>
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="5.150772" inkscape:cx="89.612686" inkscape:cy="27.572644" inkscape:document-units="px" inkscape:current-layer="g4793" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="1280" inkscape:window-height="780" inkscape:window-x="-8" inkscape:window-y="-8" inkscape:window-maximized="1" inkscape:snap-global="true" showguides="true" inkscape:guide-bbox="true"/>
+  <metadata id="metadata3765">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-288.98475,-535.52559)">
+    <g id="g4793" transform="matrix(0.96766596,0,0,0.94944363,10.181651,28.771222)">
+      <text xml:space="preserve" style="font-size:23.81479454px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient7459);fill-opacity:1;stroke:none;font-family:StoneSerITCStd Medium;-inkscape-font-specification:StoneSerITCStd Medium" x="313.89493" y="555.45251" id="text5503" sodipodi:linespacing="125%" transform="scale(0.99053965,1.0095507)"><tspan sodipodi:role="line" id="tspan5505" x="313.89493" y="555.45251" style="font-size:3.57221937px;fill:url(#linearGradient7459);fill-opacity:1">Created by Falzar FZ</tspan></text>
+      <g transform="translate(0.00547206,0.0258127)" id="g3021">
+        <path style="fill:url(#radialGradient4358-4);fill-opacity:1;stroke:none" d="m 325.12487,533.76805 c -12.04619,0.12786 -23.83129,6.47825 -30.10708,16.8382 -9.98334,15.47574 -9.2208,37.5796 3.10803,51.55872 7.91058,8.9416 20.14109,13.52621 31.99522,12.68526 12.96871,-0.25474 25.57911,-7.74217 31.66968,-19.25774 5.39871,-9.43832 6.92244,-20.84042 4.7256,-31.45827 -2.298,-13.99137 -13.54381,-26.2257 -27.38604,-29.44165 -4.60618,-0.8471 -9.33291,-0.96193 -14.00541,-0.92452 z" id="path3048" inkscape:connector-curvature="0"/>
+        <path style="fill:url(#radialGradient3107-6);fill-opacity:1;stroke:none" d="m 325.42652,538.32169 c -10.69468,0.11351 -21.15757,5.75143 -26.72925,14.94905 -8.86327,13.73946 -8.18628,33.3634 2.75933,45.77415 7.02306,7.9384 17.88138,12.00865 28.40555,11.26205 11.5137,-0.22616 22.70929,-6.87355 28.11653,-17.09714 4.79301,-8.3794 6.14578,-18.50225 4.19542,-27.92884 -2.04018,-12.42163 -12.02428,-23.28334 -24.3135,-26.13848 -4.08939,-0.75206 -8.28581,-0.85401 -12.43408,-0.82079 z" id="path3048-4" inkscape:connector-curvature="0"/>
+        <path style="fill:url(#radialGradient4294-6);fill-opacity:1;stroke:none" d="m 311.71455,548.43287 c -6.29773,-1.46827 -14.76365,7.17281 -10.62999,13.63988 6.56058,3.42979 14.32286,-7.35284 10.62999,-13.63988 z" id="path3109" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+      </g>
+      <g transform="translate(-85.403259,0.65890928)" id="g3199" style="fill:#fffaf1;fill-opacity:1">
+        <path sodipodi:nodetypes="scscccccsscsscccsscccccccsscccccccssccccccccccccccccccccc" inkscape:connector-curvature="0" id="path3092-7" d="m 396.21015,558.50833 c 0.16444,1.16913 0.55155,4.94288 0.55155,4.94288 0,0 -6.52079,-0.0359 -8.25034,0.0898 -2.74899,0.19983 -0.9611,4.47984 1.97119,2.90942 2.29278,-0.0473 12.326,-0.0227 12.326,-0.0227 -3.82829,8.85633 -9.8218,13.52465 -19.04326,15.38779 0.11943,3.52911 3.57245,5.13166 6.29244,3.81069 2.32642,-1.20992 6.35589,-4.65321 6.35589,-4.65321 0,0 -0.0944,15.95249 -0.0732,19.51913 0.0132,2.21909 4.0376,2.29601 4.02986,0.0285 -0.0114,-3.33046 -0.0385,-20.77609 -0.0385,-20.77609 0,0 1.84467,0.91005 3.65177,2.22109 1.70975,1.24041 5.29766,-0.11575 2.50601,-2.77644 -3.11577,-2.9696 -2.40576,-1.86747 -4.70419,-3.5306 6.0327,-7.15973 6.71585,-12.22066 6.71585,-12.22066 l -7.69198,-0.0489 c 0,0 -0.51409,-3.90548 -0.70585,-5.02261 -0.47011,-2.73873 -4.2752,-2.57388 -3.89324,0.14191 z m 27.61367,-1.17404 c -0.0347,3.67477 -0.13541,7.96068 -0.13541,7.96068 0,0 -6.73212,0.003 -8.83148,0.004 -1.09319,-1.31162 -3.76468,0.002 -3.76468,0.002 l 0.091,21.09102 c 0,0 1.69233,0.79086 3.06655,-0.0267 2.07148,-0.018 9.36234,-0.0815 9.36234,-0.0815 0,0 0.19466,12.40798 0.20857,14.6804 0.0162,2.64689 3.71192,2.41013 3.81863,-0.0884 0.1283,-3.00384 0.20873,-14.52723 0.20873,-14.52723 0,0 6.16369,-0.0408 8.0864,-0.0535 1.60823,0.99336 3.44988,-0.0228 3.44988,-0.0228 0,0 -0.007,-14.27341 -0.009,-17.74883 0.69348,-1.23755 -0.001,-3.10368 -0.001,-3.10368 0,0 -1.29341,-0.85163 -2.54934,-0.0256 -1.93323,-0.0204 -9.04999,-0.097 -9.04999,-0.097 0,0 -0.17429,-5.1944 -0.1427,-8.0073 0.0267,-2.37387 -3.78451,-2.50186 -3.80855,0.0445 z m -0.0142,16.90998 -8.23514,0.13725 0.0881,-6.02594 8.12894,0.0148 z m 11.68238,-5.80102 -0.0251,5.8819 -7.79393,-0.0181 0.0249,-5.84689 z m 0.0285,8.86106 0.004,5.93993 -7.87655,-10e-4 0.0234,-5.95692 z m -20.56157,0.058 8.82198,-0.0835 -0.0857,5.92051 -8.63454,0.039 z" style="fill:#fffaf1;fill-opacity:1;stroke:none"/>
+        <g transform="matrix(0.38834167,0,0,0.35851154,249.38733,350.08955)" id="g3191" style="fill:#fffaf1;fill-opacity:1">
+          <path sodipodi:nodetypes="ccccccccccccccccccccccc" style="fill:#fffaf1;stroke:none;fill-opacity:1" d="m 351.31656,537.71773 c -0.12989,0.54387 0.0492,1.22219 0.71941,1.13829 0.89592,0.17737 2.4632,0.13367 2.48021,1.40491 0.36351,4.88074 0.11195,9.81442 0.18199,14.71572 -0.0649,3.38711 0.0848,6.82866 -0.19707,10.18308 -0.75074,0.94899 -2.18035,0.5318 -3.09399,1.04087 -0.25901,0.52489 -0.0846,1.28182 0.65905,0.99472 4.94983,-0.0763 9.92034,0.17835 14.85616,-0.21535 4.91418,-0.62327 9.58543,-3.66615 11.66089,-8.321 1.7386,-3.49671 1.84651,-7.58202 1.09861,-11.36343 -0.70264,-3.17331 -2.81832,-5.88864 -5.50498,-7.57299 -4.06785,-2.40641 -8.94368,-1.97015 -13.46762,-2.10434 -3.09564,-0.0156 -6.19135,-0.005 -9.28702,-0.008 l -0.10564,0.10768 z m 10.7057,1.4203 c 3.27429,-0.0207 5.49894,0.10014 8.02722,2.50731 3.06095,2.77274 3.92621,7.17539 3.78322,11.19318 0.0244,4.47273 -1.66042,9.48629 -5.76538,11.65977 -2.33909,1.20182 -3.66754,1.32866 -6.2463,1.23571 -1.37956,-0.019 -2.20932,-1.03182 -2.10491,-2.54833 -0.20267,-8.01323 -0.0992,-16.03215 -0.17105,-24.04764 1.03301,0 1.44418,0 2.4772,0 z" id="path3146" inkscape:connector-curvature="0"/>
+          <path style="fill:#fffaf1;stroke:none;fill-opacity:1" d="m 383.67513,537.71773 c -0.21691,0.67641 0.23886,1.38337 1.02569,1.25109 1.10211,-0.0174 2.75893,0.31259 2.66336,1.65571 0.2035,8.07485 0.018,16.17797 0.0251,24.26345 -0.8039,1.10433 -2.35916,0.99865 -3.56833,1.20494 -0.29717,0.39971 -0.27961,1.37505 0.48585,1.1024 3.80045,0 7.60089,0 11.40135,0 0.30507,-0.44071 0.14735,-1.31746 -0.60462,-1.19982 -1.02556,-0.1183 -2.79985,-0.12789 -2.9421,-1.3844 -0.20767,-7.53847 -0.19363,-15.10861 -0.10688,-22.65792 0.15178,-0.80612 -0.16367,-2.09774 0.70067,-2.56904 0.90452,-0.38098 1.92834,-0.29332 2.82334,-0.59478 0.47657,-0.44626 0.33518,-1.53166 -0.56142,-1.17931 -3.74288,0 -7.48574,0 -11.2286,0 l -0.11337,0.10768 z" id="path3148" inkscape:connector-curvature="0"/>
+          <path sodipodi:nodetypes="ccccccccccccccccccc" style="fill:#fffaf1;stroke:none;fill-opacity:1" d="m 397.03713,537.71773 c -0.20644,0.67671 0.24149,1.22626 0.93271,1.26575 2.43911,0.46908 3.09193,3.26065 3.87741,5.23661 2.86019,7.60817 5.58016,15.26558 8.35554,22.90345 0.78433,-0.0597 2.32311,0.54635 2.62137,-0.45002 3.73488,-8.77627 7.33201,-17.61482 11.2317,-26.32029 0.60261,-1.02994 1.76792,-1.34694 2.87556,-1.57412 0.38898,-0.36834 0.368,-1.45064 -0.3988,-1.16906 -2.91055,0 -5.82109,0 -8.73163,0 -0.36304,0.56354 -0.0115,1.47014 0.77661,1.35877 1.15549,-0.0764 2.64087,0.64464 2.45053,1.95868 -0.30612,1.85887 -1.31693,3.58757 -1.92278,5.38073 -2.1164,5.18402 -3.44689,7.97163 -5.76642,13.07103 -2.37211,-6.81031 -4.4071,-11.16988 -6.46586,-18.07746 -0.34332,-1.2043 0.76378,-2.22259 1.94154,-2.32272 0.56545,-0.0372 1.40734,-0.17858 1.20163,-0.93832 -0.23644,-0.91703 -1.94904,-0.20665 -2.79684,-0.43071 -2.96651,0 -7.10556,0 -10.07207,0 z" id="path3150" inkscape:connector-curvature="0"/>
+          <path style="fill:#fffaf1;stroke:none;fill-opacity:1" d="m 427.94682,537.71773 c -0.15993,0.57007 0.0599,1.26607 0.85486,1.21007 1.10386,0.12198 2.84404,0.12474 3.05554,1.38441 0.24238,7.64373 0.1,15.32061 0.0232,22.97601 -0.0332,0.83068 0.10172,2.00021 -1.00502,2.33811 -0.86833,0.46533 -1.96212,0.1807 -2.81874,0.50761 -0.30005,0.53353 -0.13843,1.36004 0.7509,1.06138 3.94313,0 7.88626,0 11.82939,0 0.37173,-0.48285 0.0974,-1.35452 -0.72778,-1.20495 -1.15318,-0.0804 -3.12258,-0.32542 -2.96129,-1.7072 -0.30504,-7.74406 -0.33914,-15.50195 -0.10207,-23.24777 -0.16949,-1.15278 0.99479,-1.97747 2.21998,-1.97941 0.69267,-0.0623 1.8597,-0.0463 1.66965,-0.95808 0.007,-1.0178 -2.01257,-0.24852 -2.84796,-0.48786 -3.27311,0 -6.54622,0 -9.81933,0 l -0.1213,0.10768 z" id="path3152" inkscape:connector-curvature="0"/>
+          <path sodipodi:nodetypes="cccccccccccccccccccccccccc" style="fill:#fffaf1;stroke:none;fill-opacity:1" d="m 441.14784,537.71773 c -0.17394,0.65184 0.18844,1.37684 0.92568,1.25622 1.61453,0.12477 2.81491,1.48578 3.90395,2.61499 -0.0565,7.15 0.12626,14.32125 -0.1308,21.45829 0.0483,1.12689 -0.54003,2.19791 -1.61994,2.56371 -0.54908,0.46291 -1.64662,0.048 -1.93689,0.77937 -0.35672,1.17011 1.00364,0.73529 1.70043,0.80501 2.79717,0 5.59434,0 8.3915,0 0.30291,-0.55496 -0.11674,-1.31392 -0.80494,-1.19982 -1.38548,-0.16834 -3.11846,-0.5462 -3.53909,-2.12323 -0.37287,-1.40131 -0.0697,-2.96541 -0.18172,-4.42956 -0.008,-5.47923 -0.10919,-10.96051 0.013,-16.4386 6.66392,8.05495 13.2687,16.18685 19.97256,24.19121 1.14309,0.2428 1.8702,-0.1343 1.52842,-1.42029 0.0786,-8.15329 -0.0655,-16.32786 0.18711,-24.4681 0.0863,-1.64103 1.90115,-2.27104 3.26001,-2.39964 0.42663,-0.24176 0.4503,-1.46051 -0.17105,-1.29724 -3.21975,0 -6.43952,0 -9.65928,0 -0.31372,0.49528 -0.0869,1.42611 0.65877,1.31558 1.38502,0.18858 3.08087,0.48934 3.58418,2.01652 0.52968,1.19474 0.11346,2.62631 0.25576,3.91805 0.003,5.19728 0.005,9.02345 -0.12993,14.21956 -6.36623,-7.53249 -10.54135,-13.90943 -16.85642,-21.46971 -2.46009,0 -6.78567,0 -9.24577,0 l -0.10565,0.10768 z" id="path3154" inkscape:connector-curvature="0"/>
+          <path style="fill:#fffaf1;stroke:none;fill-opacity:1" d="m 474.40378,537.71773 c -0.13736,0.54387 0.0521,1.22219 0.76078,1.13829 1.10261,0.061 2.8257,0.38582 2.71862,1.77409 0.21156,7.25289 0.11014,14.55978 0.0544,21.83254 -0.16531,1.04901 0.39923,2.64299 -0.91089,3.15342 -0.76369,0.47751 -1.8905,0.0988 -2.56966,0.64093 -0.25299,0.66654 0.11323,1.18351 0.90976,0.93832 6.84001,0 13.67999,0 20.51999,0 0.61184,-2.36463 0.81339,-4.92737 1.35134,-7.35273 -0.37159,-0.56807 -1.41509,-0.14321 -1.42521,0.52151 -0.88324,1.9248 -1.768,4.34031 -4.04929,5.01098 -2.59094,0.57433 -5.40884,0.6222 -7.94304,-0.14357 -1.02756,-0.33795 -1.38951,-1.41639 -1.25672,-2.379 -0.091,-3.41908 -0.072,-6.8402 -0.11589,-10.26011 2.02159,0.15425 4.22671,-0.36248 6.1129,0.50249 1.15935,0.70593 1.54393,2.10324 1.77163,3.29694 0.52723,0.3245 1.48009,0.18612 1.14916,-0.62555 0,-2.73463 0,-5.46926 0,-8.20389 -0.53392,-0.34008 -1.43069,-0.0559 -1.33005,0.68195 -0.18202,1.48223 -1.38754,2.81599 -3.01123,2.79958 -1.52019,0.1269 -3.0642,0.0772 -4.59665,0.10254 -0.0272,-4.00283 -0.0575,-8.00565 -0.0905,-12.00844 2.42847,0.0525 4.91058,-0.10378 7.30624,0.0765 1.23909,0.40104 2.12868,1.35735 2.47759,2.55897 0.41451,0.87732 0.3709,1.9298 0.72887,2.77907 1.40712,0.42042 1.34005,-0.74203 1.23961,-1.74846 0,-1.69547 0,-3.39094 0,-5.08641 -1.87431,-0.25087 -3.94871,-0.0362 -5.9001,-0.10767 -4.59665,0 -9.19331,0 -13.78996,0 l -0.11172,0.10767 z" id="path3156" inkscape:connector-curvature="0"/>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/EARTH.svg b/src/assets/EARTH.svg
new file mode 100644
index 0000000..32ff17f
--- /dev/null
+++ b/src/assets/EARTH.svg
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="76.85199" height="77.151932" id="svg3760" version="1.1" inkscape:version="0.48.1 " sodipodi:docname="EARTH.svg">
+  <defs id="defs3762">
+    <linearGradient id="linearGradient3912">
+      <stop style="stop-color:#af9b3c;stop-opacity:1" offset="0" id="stop3914"/>
+      <stop style="stop-color:#e5d892;stop-opacity:1" offset="1" id="stop3916"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" id="linearGradient3747">
+      <stop style="stop-color:#b8ac54;stop-opacity:1" offset="0" id="stop3749"/>
+      <stop style="stop-color:#684f12;stop-opacity:1" offset="1" id="stop3751"/>
+    </linearGradient>
+    <linearGradient id="linearGradient3104">
+      <stop style="stop-color:#1f291e;stop-opacity:0.12612613;" offset="0" id="stop3106"/>
+      <stop style="stop-color:#4c5433;stop-opacity:1" offset="1" id="stop3108"/>
+    </linearGradient>
+    <linearGradient id="linearGradient4306">
+      <stop id="stop4308" offset="0" style="stop-color:#9f863f;stop-opacity:1"/>
+      <stop style="stop-color:#332815;stop-opacity:1" offset="1" id="stop4310"/>
+      <stop id="stop4312" offset="1" style="stop-color:#e9e560;stop-opacity:1"/>
+    </linearGradient>
+    <linearGradient id="linearGradient4296">
+      <stop id="stop4298" offset="0" style="stop-color:#f0bf7a;stop-opacity:0.91071427;"/>
+      <stop style="stop-color:#f0bf7a;stop-opacity:0.45490196;" offset="0.64173013" id="stop4300"/>
+      <stop id="stop4302" offset="1" style="stop-color:#f0bf7a;stop-opacity:0;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient4230">
+      <stop style="stop-color:#f0bf7a;stop-opacity:0.91071427;" offset="0" id="stop4232"/>
+      <stop id="stop4292" offset="0.5" style="stop-color:#f0bf7a;stop-opacity:0.45490196;"/>
+      <stop style="stop-color:#f0bf7a;stop-opacity:0;" offset="1" id="stop4234"/>
+    </linearGradient>
+    <linearGradient id="linearGradient3111">
+      <stop style="stop-color:#f3c87d;stop-opacity:0.7589286;" offset="0" id="stop3113"/>
+      <stop id="stop3119" offset="0.91352373" style="stop-color:#d69c45;stop-opacity:1"/>
+      <stop style="stop-color:#e5ff6a;stop-opacity:1" offset="1" id="stop3115"/>
+    </linearGradient>
+    <linearGradient id="linearGradient3101">
+      <stop style="stop-color:#a5864d;stop-opacity:1" offset="0" id="stop3103"/>
+      <stop id="stop4238" offset="0.78602821" style="stop-color:#332815;stop-opacity:1"/>
+      <stop style="stop-color:#1a1911;stop-opacity:1" offset="1" id="stop3105"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient4230" id="radialGradient4236" cx="306.59958" cy="555.36737" fx="306.59958" fy="555.36737" r="6.0054863" gradientTransform="matrix(0.60886416,0.50796393,-0.90996045,1.0907119,625.30825,-205.98784)" gradientUnits="userSpaceOnUse"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient4306" id="radialGradient4304" cx="327.57648" cy="574.45367" fx="327.57648" fy="574.45367" r="39.671756" gradientTransform="matrix(-1.8589783e-6,1.0770613,-1.1551438,-2.9470962e-6,991.28513,221.58125)" gradientUnits="userSpaceOnUse"/>
+    <linearGradient y2="22.401928" x2="106.24998" y1="22.901928" x1="143.49998" gradientTransform="matrix(1.2113408,0,0,1.2113407,182.53634,525.19736)" gradientUnits="userSpaceOnUse" id="linearGradient6058" xlink:href="#linearGradient5507-3" inkscape:collect="always"/>
+    <linearGradient id="linearGradient5507-3">
+      <stop style="stop-color:#ff0000;stop-opacity:1;" offset="0" id="stop5509-1"/>
+      <stop style="stop-color:#ff6600;stop-opacity:1" offset="1" id="stop5511-9"/>
+    </linearGradient>
+    <linearGradient y2="22.401928" x2="106.24998" y1="22.901928" x1="143.49998" gradientTransform="matrix(1.2113408,0,0,1.2113407,182.53634,525.19736)" gradientUnits="userSpaceOnUse" id="linearGradient7449" xlink:href="#linearGradient5507-3" inkscape:collect="always"/>
+    <linearGradient id="linearGradient7451">
+      <stop style="stop-color:#ff0000;stop-opacity:1;" offset="0" id="stop7453"/>
+      <stop style="stop-color:#ff6600;stop-opacity:1" offset="1" id="stop7455"/>
+    </linearGradient>
+    <linearGradient y2="22.401928" x2="106.24998" y1="22.901928" x1="143.49998" gradientTransform="matrix(0.68518025,0,0,0.68518014,246.48442,539.03493)" gradientUnits="userSpaceOnUse" id="linearGradient7459" xlink:href="#linearGradient5507-3" inkscape:collect="always"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3111-5" id="radialGradient4358-4" cx="323.00903" cy="633.44537" fx="323.00903" fy="633.44537" r="39.671757" gradientTransform="matrix(-1.4017097,1.3659674,-1.3892283,-1.4808254,1627.6594,1046.689)" gradientUnits="userSpaceOnUse"/>
+    <linearGradient id="linearGradient3111-5">
+      <stop style="stop-color:#75824c;stop-opacity:1" offset="0" id="stop3113-4"/>
+      <stop id="stop3216" offset="0.42169747" style="stop-color:#38452d;stop-opacity:1"/>
+      <stop id="stop3212" offset="0.55960143" style="stop-color:#252e21;stop-opacity:1"/>
+      <stop id="stop3119-9" offset="0.72623497" style="stop-color:#131c18;stop-opacity:1"/>
+      <stop style="stop-color:#050607;stop-opacity:1" offset="1" id="stop3115-5"/>
+    </linearGradient>
+    <linearGradient id="linearGradient3101-4">
+      <stop style="stop-color:#a5864d;stop-opacity:1" offset="0" id="stop3103-8"/>
+      <stop id="stop4238-2" offset="0.78602821" style="stop-color:#332815;stop-opacity:1"/>
+      <stop style="stop-color:#1a1911;stop-opacity:1" offset="1" id="stop3105-1"/>
+    </linearGradient>
+    <linearGradient id="linearGradient4296-8">
+      <stop id="stop4298-3" offset="0" style="stop-color:#f0bf7a;stop-opacity:0.91071427;"/>
+      <stop style="stop-color:#f0bf7a;stop-opacity:0.45490196;" offset="0.64173013" id="stop4300-1"/>
+      <stop id="stop4302-4" offset="1" style="stop-color:#f0bf7a;stop-opacity:0;"/>
+    </linearGradient>
+    <filter id="filter3153" inkscape:label="Ink paint" inkscape:menu="Textures" inkscape:menu-tooltip="Ink paint on paper with some turbulent color shift" height="1.3" y="-0.15" width="1.3" x="-0.15" color-interpolation-filters="sRGB">
+      <feTurbulence id="feTurbulence3155" type="fractalNoise" baseFrequency="0.07" numOctaves="4" result="result0"/>
+      <feDisplacementMap id="feDisplacementMap3157" in2="result0" in="SourceGraphic" xChannelSelector="R" yChannelSelector="G" scale="10" result="result2"/>
+      <feBlend id="feBlend3159" in2="result2" result="result5" in="result2" mode="multiply"/>
+      <feGaussianBlur id="feGaussianBlur3161" stdDeviation="10" in="result2" result="result4"/>
+      <feComposite id="feComposite3163" in2="result4" operator="arithmetic" in="result0" k3="0.5" k1="2" result="result6"/>
+      <feComposite id="feComposite3165" in2="result5" operator="in" in="result6" result="result7"/>
+    </filter>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3104" id="linearGradient3243" gradientUnits="userSpaceOnUse" x1="425.63477" y1="588.29926" x2="393.45615" y2="547.57428"/>
+    <filter id="filter3403" inkscape:label="Organic" x="0" y="0" width="1" height="1" inkscape:menu="Textures" inkscape:menu-tooltip="Bulging, knotty, slick 3D surface" color-interpolation-filters="sRGB">
+      <feTurbulence id="feTurbulence3405" numOctaves="3" baseFrequency="0.037" result="result0"/>
+      <feSpecularLighting id="feSpecularLighting3407" specularExponent="24.3" surfaceScale="2" specularConstant="1" result="result1">
+        <feDistantLight id="feDistantLight3409" elevation="45" azimuth="225"/>
+      </feSpecularLighting>
+      <feDiffuseLighting id="feDiffuseLighting3411" in="result0" surfaceScale="3" diffuseConstant="1.21" result="result2">
+        <feDistantLight id="feDistantLight3413" azimuth="225" elevation="42"/>
+      </feDiffuseLighting>
+      <feBlend id="feBlend3415" in2="SourceGraphic" mode="multiply" result="result91"/>
+      <feComposite id="feComposite3417" in2="result91" operator="arithmetic" in="result1" k2="1" k3="1" result="result92"/>
+      <feComposite id="feComposite3419" in2="SourceAlpha" operator="in" result="result2"/>
+    </filter>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3747" id="linearGradient3753" x1="486.98187" y1="576.54858" x2="472.66058" y2="560.51086" gradientUnits="userSpaceOnUse"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3747-7" id="linearGradient3762-0" gradientUnits="userSpaceOnUse" x1="490.34119" y1="581.23376" x2="472.66058" y2="560.51086"/>
+    <linearGradient inkscape:collect="always" id="linearGradient3747-7">
+      <stop style="stop-color:#b8ac54;stop-opacity:1" offset="0" id="stop3749-5"/>
+      <stop style="stop-color:#684f12;stop-opacity:1" offset="1" id="stop3751-5"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3747-1" id="linearGradient3762-7" gradientUnits="userSpaceOnUse" x1="490.34119" y1="581.23376" x2="472.66058" y2="560.51086"/>
+    <linearGradient id="linearGradient3747-1">
+      <stop style="stop-color:#c1bf6a;stop-opacity:1;" offset="0" id="stop3749-6"/>
+      <stop style="stop-color:#d0d51f;stop-opacity:1;" offset="1" id="stop3751-7"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3912" id="linearGradient3918" x1="464.85449" y1="563.13446" x2="489.23349" y2="567.849" gradientUnits="userSpaceOnUse"/>
+  </defs>
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="4.6899659" inkscape:cx="89.738899" inkscape:cy="39.470306" inkscape:document-units="px" inkscape:current-layer="g4793" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="1280" inkscape:window-height="780" inkscape:window-x="-8" inkscape:window-y="-8" inkscape:window-maximized="1" inkscape:snap-global="true" showguides="true" inkscape:guide-bbox="true"/>
+  <metadata id="metadata3765">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-288.98475,-535.52559)">
+    <g id="g4793" transform="matrix(0.96766596,0,0,0.94944363,10.181651,28.771222)">
+      <text xml:space="preserve" style="font-size:27.40720367px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient7459);fill-opacity:1;stroke:none;font-family:StoneSerITCStd Medium;-inkscape-font-specification:StoneSerITCStd Medium" x="311.40518" y="555.58331" id="text5503" sodipodi:linespacing="125%" transform="scale(0.99053965,1.0095507)"><tspan sodipodi:role="line" id="tspan5505" x="311.40518" y="555.58331" style="font-size:4.11108065px;fill:url(#linearGradient7459);fill-opacity:1">Created by Falzar FZ</tspan></text>
+      <g transform="translate(0.00547206,0.0258127)" id="g3021" style="opacity:1">
+        <path style="fill:url(#radialGradient4358-4);fill-opacity:1;stroke:none" d="m 325.12487,533.76805 c -12.04619,0.12786 -23.83129,6.47825 -30.10708,16.8382 -9.98334,15.47574 -9.2208,37.5796 3.10803,51.55872 7.91058,8.9416 20.14109,13.52621 31.99522,12.68526 12.96871,-0.25474 25.57911,-7.74217 31.66968,-19.25774 5.39871,-9.43832 6.92244,-20.84042 4.7256,-31.45827 -2.298,-13.99137 -13.54381,-26.2257 -27.38604,-29.44165 -4.60618,-0.8471 -9.33291,-0.96193 -14.00541,-0.92452 z" id="path3048" inkscape:connector-curvature="0"/>
+        <g id="g4771" transform="translate(-85.682227,0.42272594)" style="fill:#ffffff;fill-opacity:1"/>
+      </g>
+      <g id="g4057" transform="translate(-86.595606,2.9347103)" style="fill:#fffffe;fill-opacity:1">
+        <path sodipodi:nodetypes="cccc" inkscape:connector-curvature="0" id="path3994-2" d="m 376.31671,582.71689 c 15.02339,47.51108 58.14582,21.81886 71.07738,-35.50182 -16.84145,-22.80152 -49.38211,-18.914 -62.35022,-3.5493 -7.58833,7.46916 -12.74189,24.58437 -8.72716,39.05112 z" style="opacity:0.2;fill:url(#linearGradient3243);fill-opacity:1;stroke:none;filter:url(#filter3403)"/>
+        <g transform="translate(105.65211,-1.1183011)" style="fill:#fffffe;fill-opacity:1" id="g3195-6">
+          <path style="opacity:0.4;fill:#010101;fill-opacity:1;stroke:none" d="m 295.89015,572.38955 c 1.95679,-12.56309 15.20005,-18.76232 1.6323,-31.76249 -7.78704,6.65226 -11.11054,15.6773 -19.82874,19.82928 -1.17564,5.50997 -2.08697,13.41392 6.15484,16.37601 2.93424,1.05456 8.69445,0.49924 12.0416,-4.4428 z" id="path3994-8" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccc"/>
+        </g>
+        <g id="g3739" transform="translate(-87.514309,-9.174274)" style="fill:url(#linearGradient3753);fill-opacity:1">
+          <g id="g3755" style="opacity:0.4">
+            <g transform="translate(196.88768,20.637053)" style="fill:url(#linearGradient3753);fill-opacity:1" id="g3195-6-1"/>
+            <path id="path3994-8-7-2-4-1" style="opacity:1;fill:url(#linearGradient3918);fill-opacity:1;stroke:none" d="m 471.76537,568.03778 c -1.86362,1.54832 -1.36752,3.23484 0.21373,1.89522 5.01856,-4.25173 2.03559,-3.76399 -0.21373,-1.89522 z m -1.62526,22.93559 c -1.04533,2.11156 1.85481,5.0701 3.08919,3.29684 0.98339,-1.4127 -2.49148,-4.50423 -3.08919,-3.29684 z M 482.06842,567.525 c -13.22623,35.80863 -6.61312,17.90432 0,0 z m -7.10284,11.35298 c -2.31011,1.41296 -0.56489,6.57098 0.96385,4.18877 1.48364,-2.31195 1.23955,-5.53646 -0.96385,-4.18877 z m -3.07521,-4.34182 c -1.65931,2.24143 -1.16652,7.88725 1.08887,1.25811 3.75311,-2.94042 2.46402,-3.98119 -1.08887,-1.25811 z m 7.17754,-11.21606 c -4.81934,12.88682 11.96063,11.83726 12.84079,1.89521 0.53354,-6.02672 -10.5405,-8.04612 -12.84079,-1.89521 z" inkscape:connector-curvature="0" sodipodi:nodetypes="ssssssccssscccsss"/>
+          </g>
+        </g>
+        <g transform="translate(0.09722067,-0.11962684)" style="fill:#fffffe;fill-opacity:1" id="g3195">
+          <path style="fill:#fffffe;fill-opacity:1;stroke:none" d="m 130.0726,33.475718 -6.20511,1.038966 c 0,0 0.25697,-4.751208 0.23462,-6.635912 -0.0224,-1.884704 -4.12251,-2.669489 -4.14772,-0.525766 -0.0252,2.143724 0.006,8.340294 0.006,8.340294 -1.0759,0.567662 -3.33685,0.452067 -4.70162,1.196273 -1.70554,0.930028 -2.218,3.037913 -0.62006,4.191771 0.99942,0.665911 5.35563,-1.578897 5.35563,-1.578897 0,0 -0.52324,12.056278 -0.23432,18.16974 0.11613,0.814662 1.2246,1.481244 4.35106,1.882989 8.07588,0.521293 18.36261,1.508839 24.72186,2.206304 1.03419,-0.75609 5.33977,-6.006713 2.49252,-7.535982 -8.36918,2.091236 -27.55403,0.837332 -27.55403,0.837332 l 0.1363,-16.142969 5.88079,-1.557825 c 0,0 -1.10986,8.880588 1.49941,12.189985 3.26951,0.04125 2.13227,-4.962807 2.42912,-7.010131 0.0422,-3.422795 0.16077,-6.990827 0.16077,-6.990827 l 8.04227,-0.642603 c 0,0 -2.16144,6.28103 -2.72619,9.522209 0.61615,1.351626 1.68313,1.055067 2.76514,0.369984 0.69759,-0.814683 6.16412,-10.357038 4.84872,-13.553083 -0.76025,-0.981167 -13.3194,1.421516 -13.3194,1.421516 0,0 0.0924,-11.689762 0.0974,-12.715752 0.005,-1.025989 -3.34208,-1.464976 -3.37123,0.837566 -0.0292,2.302544 -0.14189,12.684817 -0.14189,12.684817 z" id="path3992" inkscape:connector-curvature="0" transform="matrix(1.0334145,0,0,1.0532484,288.11916,533.73824)" sodipodi:nodetypes="cczzcsccccccccccccccccczzcc"/>
+          <path style="fill:#fffffe;fill-opacity:1;stroke:none" d="m 102.85727,21.783779 c -0.0242,2.742945 -0.0453,10.142352 -0.0453,10.142352 0,0 -3.930663,0.09968 -6.59062,0.09954 -1.870083,-0.01389 -3.137473,4.02946 0.18707,3.585362 1.928707,-1.076559 6.27359,-0.488373 6.27359,-0.488373 l 0.11684,12.540497 c 0,0 -7.504257,0.891637 -8.801717,3.87509 0.02185,3.848076 3.994794,1.803552 5.569225,1.187843 2.144942,-0.838818 4.718132,-1.746404 6.718122,-2.453576 2.6069,-0.805814 5.69451,-1.389782 7.57492,-2.687249 1.93284,-3.623707 -7.33057,-0.683546 -7.33057,-0.683546 l 0.0322,-12.138259 c 0,0 3.23863,0.02665 6.39288,-0.03025 1.56249,-0.810873 1.22664,-2.497509 0.36024,-2.687249 -3.28208,-0.0434 -6.77511,-0.04479 -6.77511,-0.04479 0,0 0.0215,-7.323449 0.018,-10.042136 -0.003,-2.718686 -3.67569,-2.918205 -3.69983,-0.17526 z" id="path3994" inkscape:connector-curvature="0" transform="matrix(1.0334145,0,0,1.0532484,288.11916,533.73824)" sodipodi:nodetypes="cccccccsccccccczzc"/>
+          <path style="fill:#fffffe;fill-opacity:1;stroke:none" d="m 389.72482,541.1352 c -0.56808,0.0582 -1.20672,-0.0978 -1.73666,0.12933 -0.19486,0.37418 0.38951,0.44384 0.6281,0.45516 0.31354,0.0595 0.85374,0.13571 0.73039,0.59181 0.0639,2.83196 0.10019,5.68501 -0.0273,8.50634 -0.34887,0.38446 -0.99917,0.14076 -1.34879,0.48997 -0.14276,0.41274 0.48242,0.34005 0.71816,0.35743 2.60328,0.023 5.21215,0.0422 7.81251,-0.0192 0.2451,-0.8215 0.32464,-1.73372 0.52549,-2.58419 -0.0312,-0.37301 -0.58937,-0.18783 -0.64562,0.097 -0.34056,0.73124 -0.76324,1.62634 -1.66909,1.74601 -0.95888,0.12913 -1.99243,0.17721 -2.93531,-0.0522 -0.41011,-0.14844 -0.6018,-0.56939 -0.50298,-0.9899 0,-1.11758 0,-2.23515 0,-3.35274 0.76625,0.0585 1.61471,-0.1288 2.33223,0.19898 0.43239,0.2107 0.46904,0.71337 0.67315,1.07944 0.212,0.16492 0.66512,0.10068 0.518,-0.26612 -0.0275,-0.97831 0.0542,-1.98221 -0.04,-2.94484 -0.34593,-0.15425 -0.62292,0.14151 -0.64061,0.46262 -0.1672,0.79215 -1.10872,0.86513 -1.7767,0.86554 -0.32969,-0.0991 -1.12528,0.25369 -1.06603,-0.23628 0,-1.31656 0,-2.63311 0,-3.94967 0.97732,0.0689 1.9982,-0.0631 2.95032,0.15669 0.6899,0.27762 0.8151,1.0707 1.06103,1.6714 0.19884,0.19441 0.70792,0.13982 0.55301,-0.24374 -0.0278,-0.71295 0.0546,-1.45171 -0.04,-2.14894 -2.01583,-0.0508 -4.051,-0.0104 -6.07331,-0.0199 z" id="path4017" inkscape:connector-curvature="0"/>
+          <path style="fill:#fffffe;fill-opacity:1;stroke:none" d="m 402.14877,541.02825 c -1.34901,3.09419 -2.86906,6.23365 -4.29034,9.28717 -0.26787,0.46993 -0.50519,0.71753 -0.9947,0.88792 -0.27764,0.2016 5.4e-4,0.54966 0.29027,0.46512 0.93625,-0.009 1.89639,0.0921 2.8202,-0.0547 0.30453,-0.23207 -0.11926,-0.555 -0.37036,-0.57704 -0.4221,-0.1334 -0.49537,-0.6164 -0.28776,-0.95757 0.20567,-0.61483 0.45554,-1.21362 0.69064,-1.81813 1.40302,0 2.80602,0 4.20904,0 0.28523,0.81334 0.69938,1.61191 0.8533,2.44989 -0.16454,0.42317 -0.7236,0.30921 -0.99845,0.57454 -0.17799,0.36258 0.33002,0.41519 0.57055,0.38799 1.13137,-0.0171 2.28295,0.0863 3.40325,-0.0572 0.32018,-0.18852 -0.0555,-0.55047 -0.31779,-0.53225 -0.87905,-0.35648 -0.96161,-1.4466 -1.35068,-2.18912 -1.04269,-2.59691 -2.04259,-5.21051 -3.06105,-7.81685 -0.32052,-0.10474 -1.08248,-0.15206 -1.4076,-0.0498 z m 0.17767,1.9798 c 0.52585,1.4802 1.12203,3.01116 1.57901,4.47197 -1.18081,0.0276 -2.36275,0.031 -3.54339,-0.005 0.6296,-1.52043 1.27865,-3.03359 1.93687,-4.54161 l 0.0276,0.0746 z" id="path4019" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccccccccc"/>
+          <path style="fill:#fffffe;fill-opacity:1;stroke:none" d="m 410.27158,541.13768 c -0.42284,0.0673 -0.97761,-0.11698 -1.32833,0.15421 -0.12172,0.42508 0.52393,0.38721 0.7886,0.44769 0.35181,0.0312 0.74271,0.22117 0.64159,0.62167 0.0828,2.79462 0.11267,5.59653 -0.0232,8.38943 -0.24894,0.54179 -1.13994,0.10496 -1.41742,0.60687 -0.0674,0.40454 0.55608,0.28299 0.80693,0.31803 1.34475,-0.0227 2.70755,0.0833 4.04266,-0.0594 0.30576,-0.14021 0.0369,-0.5395 -0.24889,-0.49247 -0.43199,-0.0562 -1.09324,-0.0876 -1.15542,-0.6193 -0.0968,-1.12943 -0.0164,-2.26751 -0.0157,-3.4 0.51087,-0.0138 1.02177,-0.0271 1.53268,-0.0398 1.03649,1.41653 1.91963,2.96243 3.09159,4.27299 0.57447,0.51805 1.45763,0.28605 2.17196,0.33577 0.21348,0.0261 0.74149,-0.0491 0.44802,-0.32582 -1.70089,-1.20983 -2.83856,-2.97013 -4.116,-4.53664 0.86513,-0.43312 1.80349,-0.96463 2.18247,-1.88529 0.47416,-1.06 0.23627,-2.48013 -0.82794,-3.13884 -1.38602,-0.86075 -3.13948,-0.57126 -4.70548,-0.65064 -0.62267,-0.002 -1.24536,-9.7e-4 -1.86805,0.002 z m 3.07586,0.6417 c 0.90454,-0.0793 1.74186,0.14136 2.14009,1.0098 0.37532,0.91483 0.28786,2.05961 -0.24106,2.90503 -0.62531,0.88472 -1.62431,0.73658 -2.59595,0.76855 -0.16559,0.006 -0.3865,0.0142 -0.30131,-0.21639 -0.0284,-1.49059 0.007,-2.98135 0.0158,-4.47197 0.3275,0.002 0.655,0.003 0.9825,0.005 z" id="path4021" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccccccccccccccccc"/>
+          <path style="fill:#fffffe;fill-opacity:1;stroke:none" d="m 424.5829,541.1526 c -1.66605,0.0331 -3.35851,-0.0391 -5.00806,0.0597 -0.14186,0.74194 -0.42212,1.49335 -0.43983,2.24594 0.25025,0.30478 0.69216,-0.0559 0.78853,-0.3298 0.37607,-0.74485 1.11825,-1.39466 2.04929,-1.35154 0.54675,-0.0276 1.09432,-0.0393 1.64145,-0.0597 -0.0313,3.00275 0.0707,6.01301 -0.0785,9.0111 -0.1588,0.42727 -0.79408,0.30259 -1.1676,0.41288 -0.30883,0.0332 -0.36267,0.50609 -0.0131,0.50241 1.51279,0.0581 3.03961,0.0762 4.54994,-0.01 0.37443,-0.0812 0.12378,-0.55138 -0.18587,-0.49743 -0.34526,-0.0984 -0.75199,-0.0216 -0.89044,-0.41288 -0.14468,-2.39829 -0.0233,-4.80783 -0.0474,-7.21034 0.003,-0.59777 0.005,-1.19553 0.008,-1.79329 1.09221,0.10169 2.29269,-0.18024 3.04759,0.77351 0.33288,0.32355 0.43814,0.94942 0.95555,1.07198 0.60343,0.0408 0.0605,-0.74199 0.10684,-1.06038 -0.14189,-0.40656 -0.0771,-0.93164 -0.33191,-1.28006 -1.63813,-0.15654 -3.33068,-0.0423 -4.98451,-0.0721 z" id="path4023" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccccc"/>
+          <path style="fill:#fffffe;fill-opacity:1;stroke:none" d="m 431.22624,541.1352 c -0.31106,0.0683 -0.77549,-0.12369 -0.99312,0.18156 -0.0696,0.49335 0.58423,0.39349 0.86207,0.47008 0.47064,-0.0301 0.33199,0.66746 0.39541,0.97497 0.0206,2.56684 0.0618,5.13757 -0.0254,7.70284 -0.002,0.27431 -0.0806,0.6324 -0.41547,0.56992 -0.26325,0.0889 -0.88765,-0.002 -0.81671,0.46724 0.22731,0.30006 0.68773,0.11234 1.0023,0.17908 1.08582,-0.0373 2.19179,0.0881 3.26668,-0.0721 0.25483,-0.15966 0.004,-0.5236 -0.23907,-0.47257 -0.31283,-0.13064 -0.64884,0.0443 -0.68831,-0.47256 -0.13002,-1.42458 -0.0537,-2.8779 -0.0989,-4.3128 1.80613,0 2.90536,0 4.71149,0 -0.051,1.45585 0.0429,2.9345 -0.11265,4.37746 -0.10244,0.47054 -0.25712,0.2612 -0.56799,0.42531 -0.32448,0.0315 -0.26055,0.56496 0.0644,0.49992 1.28797,0.0327 2.58766,0.0799 3.8713,-0.0248 0.30665,-0.0935 0.0948,-0.54387 -0.16782,-0.49993 -0.34197,-0.0565 -0.99603,-0.0529 -0.93104,-0.60688 -0.0607,-2.73613 -0.0536,-5.47634 -0.005,-8.2127 -0.066,-0.49025 0.46383,-0.56935 0.79311,-0.58201 0.24888,0.0431 0.63066,-0.23625 0.38851,-0.50489 -0.76822,-0.18606 -1.58858,-0.0426 -2.37472,-0.0896 -0.59164,0.0491 -1.22948,-0.0959 -1.79772,0.0995 -0.22047,0.28279 0.16113,0.53059 0.40459,0.49745 0.30303,0.0406 0.3702,0.0254 0.34731,0.48997 0.1048,1.11801 0.0499,2.24767 0.0851,3.37014 -1.80537,0 -2.90381,0 -4.70919,0 0.062,-1.18954 -0.0707,-2.42134 0.13334,-3.58652 0.20031,-0.37273 0.44762,-0.18477 0.76875,-0.33826 0.29802,-0.0181 0.29659,-0.5312 -0.0184,-0.49744 -1.04217,-0.0676 -2.08957,-0.0226 -3.13333,-0.0323 z" id="path4025" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccccccccccccccccccccccccccccccc"/>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/FIRE.svg b/src/assets/FIRE.svg
new file mode 100644
index 0000000..c038761
--- /dev/null
+++ b/src/assets/FIRE.svg
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="76.85199" height="77.151932" id="svg3760" version="1.1" inkscape:version="0.48.1 " sodipodi:docname="FIRE.svg">
+  <defs id="defs3762">
+    <linearGradient inkscape:collect="always" id="linearGradient3130">
+      <stop style="stop-color:#fd0201;stop-opacity:1" offset="0" id="stop3132"/>
+      <stop style="stop-color:#fe6c6c;stop-opacity:1" offset="1" id="stop3134"/>
+    </linearGradient>
+    <linearGradient id="linearGradient4306">
+      <stop id="stop4308" offset="0" style="stop-color:#9f863f;stop-opacity:1"/>
+      <stop style="stop-color:#332815;stop-opacity:1" offset="1" id="stop4310"/>
+      <stop id="stop4312" offset="1" style="stop-color:#e9e560;stop-opacity:1"/>
+    </linearGradient>
+    <linearGradient id="linearGradient4296">
+      <stop id="stop4298" offset="0" style="stop-color:#f0bf7a;stop-opacity:0.91071427;"/>
+      <stop style="stop-color:#f0bf7a;stop-opacity:0.45490196;" offset="0.64173013" id="stop4300"/>
+      <stop id="stop4302" offset="1" style="stop-color:#f0bf7a;stop-opacity:0;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient4230">
+      <stop style="stop-color:#f0bf7a;stop-opacity:0.91071427;" offset="0" id="stop4232"/>
+      <stop id="stop4292" offset="0.5" style="stop-color:#f0bf7a;stop-opacity:0.45490196;"/>
+      <stop style="stop-color:#f0bf7a;stop-opacity:0;" offset="1" id="stop4234"/>
+    </linearGradient>
+    <linearGradient id="linearGradient3111">
+      <stop style="stop-color:#f3c87d;stop-opacity:0.7589286;" offset="0" id="stop3113"/>
+      <stop id="stop3119" offset="0.91352373" style="stop-color:#d69c45;stop-opacity:1"/>
+      <stop style="stop-color:#e5ff6a;stop-opacity:1" offset="1" id="stop3115"/>
+    </linearGradient>
+    <linearGradient id="linearGradient3101">
+      <stop style="stop-color:#a5864d;stop-opacity:1" offset="0" id="stop3103"/>
+      <stop id="stop4238" offset="0.78602821" style="stop-color:#332815;stop-opacity:1"/>
+      <stop style="stop-color:#1a1911;stop-opacity:1" offset="1" id="stop3105"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient4230" id="radialGradient4236" cx="306.59958" cy="555.36737" fx="306.59958" fy="555.36737" r="6.0054863" gradientTransform="matrix(0.60886416,0.50796393,-0.90996045,1.0907119,625.30825,-205.98784)" gradientUnits="userSpaceOnUse"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient4306" id="radialGradient4304" cx="327.57648" cy="574.45367" fx="327.57648" fy="574.45367" r="39.671756" gradientTransform="matrix(-1.8589783e-6,1.0770613,-1.1551438,-2.9470962e-6,991.28513,221.58125)" gradientUnits="userSpaceOnUse"/>
+    <linearGradient y2="22.401928" x2="106.24998" y1="22.901928" x1="143.49998" gradientTransform="matrix(1.2113408,0,0,1.2113407,182.53634,525.19736)" gradientUnits="userSpaceOnUse" id="linearGradient6058" xlink:href="#linearGradient5507-3" inkscape:collect="always"/>
+    <linearGradient id="linearGradient5507-3">
+      <stop style="stop-color:#ff0000;stop-opacity:1;" offset="0" id="stop5509-1"/>
+      <stop style="stop-color:#ff6600;stop-opacity:1" offset="1" id="stop5511-9"/>
+    </linearGradient>
+    <linearGradient y2="22.401928" x2="106.24998" y1="22.901928" x1="143.49998" gradientTransform="matrix(1.2113408,0,0,1.2113407,182.53634,525.19736)" gradientUnits="userSpaceOnUse" id="linearGradient7449" xlink:href="#linearGradient5507-3" inkscape:collect="always"/>
+    <linearGradient id="linearGradient7451">
+      <stop style="stop-color:#ff0000;stop-opacity:1;" offset="0" id="stop7453"/>
+      <stop style="stop-color:#ff6600;stop-opacity:1" offset="1" id="stop7455"/>
+    </linearGradient>
+    <linearGradient y2="22.401928" x2="106.24998" y1="22.901928" x1="143.49998" gradientTransform="matrix(0.44916455,0,0,0.44916448,275.38975,544.3914)" gradientUnits="userSpaceOnUse" id="linearGradient7459" xlink:href="#linearGradient5507-3" inkscape:collect="always"/>
+    <linearGradient id="linearGradient3111-5">
+      <stop style="stop-color:#d69c45;stop-opacity:1" offset="0" id="stop3113-4"/>
+      <stop id="stop3119-9" offset="0.91352373" style="stop-color:#d69c45;stop-opacity:1"/>
+      <stop style="stop-color:#e5ff6a;stop-opacity:1" offset="1" id="stop3115-5"/>
+    </linearGradient>
+    <linearGradient id="linearGradient3101-4">
+      <stop style="stop-color:#a5864d;stop-opacity:1" offset="0" id="stop3103-8"/>
+      <stop id="stop4238-2" offset="0.78602821" style="stop-color:#332815;stop-opacity:1"/>
+      <stop style="stop-color:#1a1911;stop-opacity:1" offset="1" id="stop3105-1"/>
+    </linearGradient>
+    <linearGradient id="linearGradient4296-8">
+      <stop id="stop4298-3" offset="0" style="stop-color:#f0bf7a;stop-opacity:0.91071427;"/>
+      <stop style="stop-color:#f0bf7a;stop-opacity:0.45490196;" offset="0.64173013" id="stop4300-1"/>
+      <stop id="stop4302-4" offset="1" style="stop-color:#f0bf7a;stop-opacity:0;"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3130" id="linearGradient3374" x1="400.00031" y1="605.45605" x2="367.8027" y2="473.53757" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0071975,0,0,1.0071975,-72.453521,-3.847163)"/>
+  </defs>
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="7.2842916" inkscape:cx="58.356037" inkscape:cy="37.796034" inkscape:document-units="px" inkscape:current-layer="g4793" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="1280" inkscape:window-height="780" inkscape:window-x="-8" inkscape:window-y="-8" inkscape:window-maximized="1" inkscape:snap-global="true" showguides="true" inkscape:guide-bbox="true"/>
+  <metadata id="metadata3765">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-288.98475,-535.52559)">
+    <g id="g4793" transform="matrix(0.96766596,0,0,0.94944363,10.181651,28.771222)">
+      <text xml:space="preserve" style="font-size:17.96657753px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient7459);fill-opacity:1;stroke:none;font-family:StoneSerITCStd Medium;-inkscape-font-specification:StoneSerITCStd Medium" x="317.94806" y="555.23956" id="text5503" sodipodi:linespacing="125%" transform="scale(0.99053965,1.0095507)"><tspan sodipodi:role="line" id="tspan5505" x="317.94806" y="555.23956" style="font-size:2.69498682px;fill:url(#linearGradient7459);fill-opacity:1">Created by Falzar FZ</tspan></text>
+      <g transform="translate(0.16646001,0.0258127)" id="g3021">
+        <path style="fill:#010101;fill-opacity:1;stroke:none" d="m 325.12487,533.76805 c -12.04619,0.12786 -23.83129,6.47825 -30.10708,16.8382 -9.98334,15.47574 -9.2208,37.5796 3.10803,51.55872 7.91058,8.9416 20.14109,13.52621 31.99522,12.68526 12.96871,-0.25474 25.57911,-7.74217 31.66968,-19.25774 5.39871,-9.43832 6.92244,-20.84042 4.7256,-31.45827 -2.298,-13.99137 -13.54381,-26.2257 -27.38604,-29.44165 -4.60618,-0.8471 -9.33291,-0.96193 -14.00541,-0.92452 z" id="path3048" inkscape:connector-curvature="0"/>
+        <path style="fill:url(#linearGradient3374);fill-opacity:1;stroke:none" d="m 327.84813,534.53552 c -4.59292,0.16372 -9.26598,0.85527 -13.51495,2.68768 -3.07226,0.50757 -5.45724,0.74277 -7.94154,2.36021 -5.80161,3.30499 -9.67699,8.42984 -12.41022,13.17317 -0.88719,2.08954 -2.42914,4.79267 -2.9089,6.99894 -0.0836,3.85619 -0.0301,6.9882 -0.10748,10.84454 -1.63238,0.89195 -1.74951,2.85978 -1.69832,4.52815 0.12374,1.78475 -0.33294,3.78972 0.47295,5.42648 0.97302,0.71321 1.94876,-1.35175 2.85921,-0.75226 1.47897,2.28297 1.25713,5.25338 2.40776,7.69786 0.39741,2.80162 1.72671,5.29057 2.41491,7.77089 1.34993,2.04492 0.65698,4.79552 1.87748,6.84336 9.25418,8.35849 18.6273,11.98821 29.99925,12.57531 9.24653,0.0169 16.75403,-3.05833 23.647,-8.43561 5.5293,-4.15858 8.47974,-10.5076 11.14101,-16.02245 0.54076,-2.04189 0.0557,-4.26426 0.73091,-6.23717 0.86519,-0.92159 2.256,-1.96364 2.14979,-3.3669 -0.42927,-1.70602 -0.099,-3.56341 -0.57327,-5.30231 -0.25052,-4.07705 0.66416,-8.29081 -0.74526,-12.25523 -3.01964,-8.30371 -7.50458,-10.154 -10.64143,-13.27041 4.61657,1.55742 5.47974,2.93892 7.24212,4.20461 0.28821,0.23756 0.37567,-0.15932 -0.026,-1.17367 -4.31691,-5.96816 -8.66944,-10.698 -14.97681,-13.76704 -5.23106,-2.96794 -13.11318,-4.62076 -18.55978,-4.54277 -0.2796,-0.005 -0.55896,0.008 -0.83842,0.0146 z" id="path3340" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccccccccccc"/>
+        <g id="g3305" transform="translate(-85.048806,0.17648662)" style="fill:#ffffff;fill-opacity:1">
+          <g id="g3166" transform="translate(-0.16646104,-0.02581481)" style="fill:#ffffff;fill-opacity:1">
+            <path sodipodi:nodetypes="ccccc" style="fill:#ff7372;fill-opacity:1;stroke:none" d="m 376.62342,559.299 c 1.74826,-5.16178 9.04832,-15.08384 14.87838,-18.05144 -4.41084,5.11502 -8.60514,12.71145 -9.6923,16.63909 5.04005,-9.49183 8.87882,-12.57126 12.76837,-19.75792 -7.05571,2.29047 -16.27173,12.73613 -17.95445,21.17027 z" id="path3164-8" inkscape:connector-curvature="0"/>
+            <path sodipodi:nodetypes="ccc" style="fill:#ff706f;fill-opacity:1;stroke:none" d="m 396.87984,546.6836 c -3.93725,3.46935 -4.35833,7.04915 -2.89245,10.67556 0.0661,-4.47367 0.60938,-7.12782 2.89245,-10.67556 z" id="path3164-4" inkscape:connector-curvature="0"/>
+            <path sodipodi:nodetypes="ccccccc" style="fill:#ff7274;fill-opacity:1;stroke:none" d="m 411.5345,613.95862 c 3.13085,0.24632 18.21025,1.42613 31.75321,-13.11965 4.63617,-5.2262 4.7973,-10.96021 6.05566,-24.98307 0.48837,-4.41622 0.5854,-4.72402 2.52977,-8.79962 -1.88141,1.68444 -3.04,2.73107 -4.54039,6.88008 -1.36818,15.75402 -1.76998,20.64751 -6.95553,27.27147 -7.94008,8.12774 -15.97501,11.37425 -28.84272,12.75079 z" id="path3164-0" inkscape:connector-curvature="0"/>
+            <path sodipodi:nodetypes="cccc" style="fill:#ff5d5e;fill-opacity:1;stroke:none" d="m 414.35729,564.7625 c -1.59038,1.99282 -2.78319,5.82691 -0.64719,6.34685 2.45298,0.5971 3.79664,-9.53869 2.70583,-9.67881 -1.53532,0.43986 -1.8188,1.90932 -2.05864,3.33196 z" id="path3164-6" inkscape:connector-curvature="0"/>
+          </g>
+          <g transform="translate(0.16098296,-0.49223124)" style="fill:#ffffff;fill-opacity:1" id="g3639">
+            <path transform="matrix(1.0334145,0,0,1.0532484,287.9527,533.71243)" inkscape:connector-curvature="0" id="path3152" d="m 120.93992,18.235514 c -2.39279,0.984337 -1.70892,5.241555 -1.72029,6.462308 -0.52021,5.685793 -5.95215,11.200821 -20.415718,12.098632 -1.315693,1.748833 0.312557,4.395105 3.072118,4.572771 8.39393,-0.08353 14.6532,-3.366391 19.43388,-10.943725 4.79587,3.505838 12.50897,7.989126 17.30569,11.435508 1.81275,0.366116 3.2186,0.113002 5.35675,-1.361374 1.84835,-1.274536 3.45313,-3.014093 1.63009,-3.930168 -6.62769,-0.768897 -9.47215,-2.183696 -14.29639,-4.391981 -2.01721,-1.357814 -8.88619,-4.653431 -8.88619,-4.653431 0,0 -0.13089,-1.561214 0.10999,-4.765977 -0.10435,-1.141946 1.18643,-4.457009 -1.58993,-4.522563 z" style="fill:#ffffff;fill-opacity:1;stroke:none" sodipodi:nodetypes="ccccccsccccc"/>
+            <path transform="matrix(1.0334145,0,0,1.0532484,287.9527,533.71243)" inkscape:connector-curvature="0" id="path3158" d="m 129.52743,44.251202 c -0.48855,3.101506 1.60371,5.784549 4.37747,6.669155 1.34198,0.0024 4.21167,-1.26491 3.93743,-3.650867 -2.90508,-0.18868 -5.46855,-1.256546 -8.3149,-3.018288 z" style="fill:#ffffff;fill-opacity:1;stroke:none" sodipodi:nodetypes="cccc"/>
+            <path transform="matrix(1.0334145,0,0,1.0532484,287.9527,533.71243)" inkscape:connector-curvature="0" id="path3160" d="m 111.74875,44.952224 c -1.58285,0.936846 -3.45389,1.049619 -6.75707,1.207315 -1.24459,2.020405 0.51483,5.627691 3.21302,5.413444 1.71404,-1.286587 4.69782,-4.155436 4.84873,-6.270248 0.0475,-0.66515 -0.97202,-0.547407 -1.30468,-0.350511 z" style="fill:#ffffff;fill-opacity:1;stroke:none" sodipodi:nodetypes="sccss"/>
+            <path transform="matrix(1.0334145,0,0,1.0532484,287.9527,533.71243)" inkscape:connector-curvature="0" id="path3162" d="m 104.71629,24.928056 c -0.49908,2.810879 2.15652,5.808611 5.00729,3.433325 1.13764,-1.035415 4.55676,-4.081417 2.7785,-5.302143 -5.42726,2.571091 -6.44805,0.224958 -7.78579,1.868818 z" style="fill:#ffffff;fill-opacity:1;stroke:none" sodipodi:nodetypes="cccc"/>
+            <path transform="matrix(1.0334145,0,0,1.0532484,287.9527,533.71243)" inkscape:connector-curvature="0" id="path3164" d="m 129.81065,23.176075 c -1.90617,0.04951 1.27237,5.697553 3.66977,6.025979 2.41784,0.331225 5.62913,-2.584854 3.99527,-3.874519 -4.92801,-0.298389 -4.49324,-0.897549 -7.66504,-2.15146 z" style="fill:#ffffff;fill-opacity:1;stroke:none" sodipodi:nodetypes="cscc"/>
+            <path inkscape:connector-curvature="0" id="path3152-0" d="m 412.99644,574.74904 c -2.47275,1.03675 -1.76603,5.52066 -1.77778,6.80641 -0.53759,5.98855 -10.93213,13.1895 -25.87899,14.13512 -1.35966,1.84195 0.323,4.62913 3.17477,4.81626 6.90996,0.60812 18.10256,-2.96555 24.86435,-12.74468 4.95612,3.69252 14.57757,10.21285 19.53457,13.84275 1.87332,0.38561 4.19372,0.2831 6.40331,-1.26979 1.91011,-1.3424 3.32704,-3.33866 1.44308,-4.30352 -7.75984,-0.28775 -11.83769,-3.51818 -16.42471,-5.96008 -2.08462,-1.43011 -9.80921,-5.53933 -9.80921,-5.53933 0,0 -0.13527,-1.64435 0.11366,-5.01976 -0.10783,-1.20275 1.22608,-4.69434 -1.64305,-4.76338 z" style="fill:#ffffff;fill-opacity:1;stroke:none" sodipodi:nodetypes="ccccccsccccc" transform="translate(-0.16645639,-0.02581912)"/>
+            <g style="fill:#ffffff;fill-opacity:1" id="g3292">
+              <path inkscape:connector-curvature="0" id="path3241" d="m 395.60465,540.24895 c -0.023,0.16557 -0.12595,0.54618 0.14691,0.5378 0.41107,0.0718 0.89637,0.0161 1.24261,0.28644 0.14664,0.28083 0.0785,0.64186 0.11266,0.95495 0.0192,2.52848 0.0299,5.05774 -0.007,7.58604 -0.0448,0.24668 0.0538,0.59702 -0.17646,0.76017 -0.40614,0.2255 -0.90137,0.1381 -1.32475,0.27688 -0.0143,0.16673 -0.11952,0.55713 0.16384,0.52171 1.57158,0 3.14316,0 4.71474,0 0.16907,-0.0743 0.1399,-0.43623 0.0343,-0.55064 -0.40575,-0.10294 -0.88635,-0.0145 -1.24603,-0.26462 -0.2623,-0.23886 -0.16142,-0.64566 -0.19988,-0.96139 -0.0104,-1.09085 0.007,-2.18173 0.0106,-3.27258 0.7869,0.0362 1.58523,-0.0346 2.36499,0.0884 0.54158,0.14851 0.76241,0.7555 0.81669,1.26519 0.12766,0.16374 0.42968,0.0815 0.61058,0.0533 0.0685,-0.5447 0.0104,-1.1169 0.0295,-1.67226 -0.0107,-0.57202 0.0215,-1.15304 -0.0162,-1.71943 -0.13752,-0.12462 -0.42229,-0.0725 -0.59985,-0.0341 -0.0757,0.39305 -0.13095,0.8666 -0.50551,1.10496 -0.56523,0.35446 -1.26955,0.21406 -1.90012,0.25638 -0.2663,0 -0.5326,0 -0.7989,0 0,-1.52969 0,-3.05937 0,-4.58905 0.9728,0.0239 1.95951,-0.06 2.92257,0.0872 0.53567,0.0797 0.82886,0.59956 0.98501,1.07063 0.12029,0.26641 0.12261,0.5826 0.26098,0.83806 0.17958,-0.0134 0.49392,0.11027 0.58681,-0.091 -0.0107,-0.83182 0.0215,-1.67263 -0.0162,-2.49881 -0.17043,-0.14897 -0.47569,-0.0285 -0.69765,-0.0675 -2.4793,0 -4.95859,0 -7.43788,0 -0.0254,0.0111 -0.0508,0.0222 -0.0761,0.0333 z" style="fill:#ffffff;fill-opacity:1;stroke:none"/>
+              <path inkscape:connector-curvature="0" id="path3243" d="m 404.21794,540.24895 c -0.0235,0.16807 -0.13741,0.55464 0.1572,0.54809 0.42226,0.07 0.90901,0.0186 1.27399,0.25692 0.23697,0.29161 0.11534,0.69878 0.16037,1.03958 0.0193,2.66066 0.005,5.32143 0.01,7.98213 -0.0943,0.27842 -0.37639,0.4251 -0.67142,0.44353 -0.30719,0.067 -0.6457,0.0243 -0.93646,0.13203 -0.0154,0.16673 -0.12791,0.55713 0.17534,0.52171 1.69622,0 3.39244,0 5.08866,0 0.1817,-0.0754 0.14958,-0.44207 0.0363,-0.55618 -0.45867,-0.0785 -0.99413,-0.0117 -1.39818,-0.27061 -0.3053,-0.35397 -0.15802,-0.85892 -0.20795,-1.27802 -0.0184,-2.55795 -0.0397,-5.11718 0.0286,-7.67448 0.008,-0.31638 0.3548,-0.44611 0.6388,-0.48967 0.30842,-0.0951 0.6801,0.004 0.95684,-0.17048 0.099,-0.13875 0.0702,-0.34161 0.0218,-0.48967 -0.63753,-0.0654 -1.29936,-0.01 -1.94629,-0.0282 -1.11395,0.0108 -2.23743,-0.0218 -3.34538,0.0163 l -0.0399,0.0163 -0.002,7e-4 z" style="fill:#ffffff;fill-opacity:1;stroke:none"/>
+              <path inkscape:connector-curvature="0" id="path3245" d="m 410.53853,540.24126 c -0.0236,0.16753 -0.13768,0.55256 0.15804,0.54549 0.43744,0.0684 0.94041,0.0209 1.31907,0.27106 0.18033,0.22146 0.0925,0.55175 0.13383,0.81396 0.0277,2.61477 0.0139,5.23026 -0.0163,7.84498 -0.0159,0.23878 0.0453,0.57447 -0.24735,0.69092 -0.41983,0.19926 -0.9159,0.11883 -1.35277,0.23587 -0.0166,0.16783 -0.132,0.56381 0.1749,0.5294 1.69076,0 3.38152,0 5.07227,0 0.1824,-0.0752 0.15007,-0.43764 0.0371,-0.55351 -0.46325,-0.0949 -1.0171,-0.0454 -1.41583,-0.31943 -0.24748,-0.44668 -0.10701,-0.98236 -0.14443,-1.46773 0.003,-0.81954 0.0111,-1.63907 0.016,-2.4586 0.54749,0.006 1.095,0.0125 1.64247,0.0192 0.99848,1.36327 1.94515,2.76161 2.98731,4.09532 0.27521,0.33376 0.64469,0.65001 1.12407,0.64814 0.69419,0.0327 1.39937,0.0482 2.08893,0.0259 0.19576,-0.1587 -0.0138,-0.41385 -0.19886,-0.49312 -1.24728,-0.73536 -2.05186,-1.92848 -2.97335,-2.96842 -0.44924,-0.53305 -0.90288,-1.07037 -1.33779,-1.61294 1.05131,-0.36806 2.09792,-1.02741 2.47598,-2.06891 0.32921,-0.92925 0.24873,-2.08642 -0.54837,-2.79181 -0.57159,-0.5697 -1.40797,-0.8268 -2.21164,-0.9321 -1.70247,-0.10031 -3.41114,-0.0489 -5.11615,-0.077 -0.54063,0.008 -1.09048,-0.0279 -1.62548,0.007 l -0.0403,0.0158 -10e-4,4.9e-4 z m 4.7033,0.64734 c 0.73036,0.013 1.52827,-0.0109 2.13578,0.43199 0.72356,0.49973 0.78842,1.43448 0.74053,2.20984 -0.0417,0.81838 -0.44604,1.7232 -1.31857,2.03054 -0.66981,0.22833 -1.40491,0.1434 -2.10414,0.19176 -0.34026,0.0733 -0.50893,-0.0189 -0.42104,-0.3584 0,-1.50789 0,-3.01578 0,-4.52367 0.32247,0.006 0.64495,0.012 0.96744,0.0179 z" style="fill:#ffffff;fill-opacity:1;stroke:none"/>
+              <path inkscape:connector-curvature="0" id="path3247" d="m 422.32858,540.24895 c -0.0225,0.16562 -0.1249,0.54574 0.14419,0.53947 0.35874,0.074 0.76861,0.0128 1.0909,0.21298 0.31024,0.23347 0.17423,0.67523 0.21636,1.00882 0.0276,2.68174 0.0484,5.36504 -0.0211,8.04616 -0.005,0.33656 -0.37234,0.43927 -0.63919,0.46794 -0.26303,0.0575 -0.55237,0.0246 -0.79866,0.12947 -0.0121,0.1669 -0.11681,0.55476 0.16351,0.51915 2.90394,-0.0106 5.80898,0.0253 8.71221,-0.032 0.16766,-0.13086 0.10382,-0.41545 0.17565,-0.60806 0.12607,-0.72969 0.28909,-1.45686 0.38907,-2.18895 -0.095,-0.20154 -0.39851,-0.1288 -0.5622,-0.0961 -0.30996,0.70318 -0.61638,1.50487 -1.29293,1.92022 -0.85336,0.4015 -1.83812,0.34865 -2.76322,0.29996 -0.45334,-0.0546 -1.03545,-0.0419 -1.30048,-0.49736 -0.15743,-0.31353 -0.0622,-0.69387 -0.0993,-1.03446 -0.007,-1.0477 -0.0124,-2.09541 -0.0189,-3.14312 0.75044,0.0411 1.52059,-0.033 2.25761,0.11409 0.50471,0.13871 0.75297,0.67811 0.80493,1.16905 0.0297,0.2901 0.3733,0.16967 0.55466,0.1487 0.19013,-0.14352 0.0404,-0.46447 0.088,-0.6781 -0.0107,-0.89716 0.0215,-1.80342 -0.016,-2.69493 -0.11821,-0.12633 -0.35931,-0.0629 -0.52734,-0.0495 -0.17433,0.10574 -0.0904,0.36322 -0.18488,0.52812 -0.14503,0.53387 -0.70693,0.82917 -1.22627,0.78578 -0.58264,0.0148 -1.16551,0.0168 -1.74823,0.0269 0,-1.42371 0,-2.84743 0,-4.27115 0.98458,0.0333 1.98377,-0.0269 2.95941,0.0872 0.56592,0.0964 0.91183,0.64057 1.03828,1.1727 0.0892,0.23964 0.0808,0.51661 0.19805,0.73983 0.18125,-0.0113 0.49802,0.11183 0.59365,-0.0897 -0.0106,-0.83181 0.0213,-1.67263 -0.016,-2.4988 -0.16877,-0.14898 -0.47104,-0.0285 -0.69084,-0.0675 -2.46847,0 -4.93696,0 -7.40543,0 -0.0251,0.0111 -0.0503,0.0222 -0.0754,0.0333 z" style="fill:#ffffff;fill-opacity:1;stroke:none"/>
+            </g>
+          </g>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/LAUGH.svg b/src/assets/LAUGH.svg
new file mode 100644
index 0000000..af6512e
--- /dev/null
+++ b/src/assets/LAUGH.svg
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) by Falzar FZ (http://yugioh.wikia.com/wiki/User:Falzar_FZ) -->
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="76.85199" height="77.151932" id="svg3760" version="1.1" inkscape:version="0.48.1 " sodipodi:docname="LAUGH-JPa.svg">
+  <defs id="defs3762">
+    <linearGradient id="linearGradient3901">
+      <stop style="stop-color:#a73600;stop-opacity:1" offset="0" id="stop3903"/>
+      <stop style="stop-color:#a84b18;stop-opacity:1" offset="1" id="stop3905"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" id="linearGradient3893">
+      <stop style="stop-color:#da6510;stop-opacity:1" offset="0" id="stop3895"/>
+      <stop style="stop-color:#b04819;stop-opacity:1" offset="1" id="stop3897"/>
+    </linearGradient>
+    <linearGradient id="linearGradient3498">
+      <stop style="stop-color:#96452a;stop-opacity:1" offset="0" id="stop3500"/>
+      <stop id="stop3506" offset="0.5" style="stop-color:#bb4a12;stop-opacity:1"/>
+      <stop style="stop-color:#862b01;stop-opacity:1" offset="1" id="stop3502"/>
+    </linearGradient>
+    <linearGradient id="linearGradient3436">
+      <stop id="stop3438" offset="0" style="stop-color:#e7691b;stop-opacity:1"/>
+      <stop style="stop-color:#ee8318;stop-opacity:1" offset="0.32525399" id="stop3444"/>
+      <stop style="stop-color:#db6c14;stop-opacity:1" offset="0.65050799" id="stop3442"/>
+      <stop id="stop3446" offset="0.82525396" style="stop-color:#de7e25;stop-opacity:1"/>
+      <stop id="stop3440" offset="1" style="stop-color:#e1ad48;stop-opacity:1"/>
+    </linearGradient>
+    <linearGradient id="linearGradient5507-3">
+      <stop style="stop-color:#ff0000;stop-opacity:1;" offset="0" id="stop5509-1"/>
+      <stop style="stop-color:#ff6600;stop-opacity:1" offset="1" id="stop5511-9"/>
+    </linearGradient>
+    <linearGradient y2="22.401928" x2="106.24998" y1="22.901928" x1="143.49998" gradientTransform="matrix(0.44916455,0,0,0.44916448,275.38975,544.3914)" gradientUnits="userSpaceOnUse" id="linearGradient7459" xlink:href="#linearGradient5507-3" inkscape:collect="always"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3436" id="linearGradient3434" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.0071975,0,0,1.0071975,-72.453521,-3.847163)" x1="413.17542" y1="609.11823" x2="378.2829" y2="546.47589"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3498" id="linearGradient3504" x1="315.58636" y1="587.26508" x2="326.46906" y2="601.40448" gradientUnits="userSpaceOnUse"/>
+    <linearGradient gradientUnits="userSpaceOnUse" y2="560.51086" x2="472.66058" y1="576.54858" x1="486.98187" id="linearGradient3753" xlink:href="#linearGradient3747" inkscape:collect="always"/>
+    <filter color-interpolation-filters="sRGB" inkscape:menu-tooltip="Bulging, knotty, slick 3D surface" inkscape:menu="Textures" height="1" width="1" y="0" x="0" inkscape:label="Organic" id="filter3403">
+      <feTurbulence result="result0" baseFrequency="0.037" numOctaves="3" id="feTurbulence3405"/>
+      <feSpecularLighting result="result1" specularConstant="1" surfaceScale="2" specularExponent="24.3" id="feSpecularLighting3407">
+        <feDistantLight azimuth="225" elevation="45" id="feDistantLight3409"/>
+      </feSpecularLighting>
+      <feDiffuseLighting result="result2" diffuseConstant="1.21" surfaceScale="3" in="result0" id="feDiffuseLighting3411">
+        <feDistantLight elevation="42" azimuth="225" id="feDistantLight3413"/>
+      </feDiffuseLighting>
+      <feBlend result="result91" mode="multiply" in2="SourceGraphic" id="feBlend3415"/>
+      <feComposite result="result92" k3="1" k2="1" in="result1" operator="arithmetic" in2="result91" id="feComposite3417"/>
+      <feComposite result="result2" operator="in" in2="SourceAlpha" id="feComposite3419"/>
+    </filter>
+    <linearGradient id="linearGradient3111-5-3">
+      <stop id="stop3113-4-9" offset="0" style="stop-color:#75824c;stop-opacity:1"/>
+      <stop style="stop-color:#38452d;stop-opacity:1" offset="0.42169747" id="stop3216"/>
+      <stop style="stop-color:#252e21;stop-opacity:1" offset="0.55960143" id="stop3212"/>
+      <stop style="stop-color:#131c18;stop-opacity:1" offset="0.72623497" id="stop3119-9-9"/>
+      <stop id="stop3115-5-2" offset="1" style="stop-color:#050607;stop-opacity:1"/>
+    </linearGradient>
+    <radialGradient gradientUnits="userSpaceOnUse" gradientTransform="matrix(-1.4017097,1.3659674,-1.3892283,-1.4808254,1627.6594,1046.689)" r="39.671757" fy="633.44537" fx="323.00903" cy="633.44537" cx="323.00903" id="radialGradient4358-4" xlink:href="#linearGradient3111-5-3" inkscape:collect="always"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5507-3-3" id="linearGradient7459-7" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.68518025,0,0,0.68518014,246.48442,539.03493)" x1="143.49998" y1="22.901928" x2="106.24998" y2="22.401928"/>
+    <linearGradient id="linearGradient5507-3-3">
+      <stop id="stop5509-1-7" offset="0" style="stop-color:#ff0000;stop-opacity:1;"/>
+      <stop id="stop5511-9-5" offset="1" style="stop-color:#ff6600;stop-opacity:1"/>
+    </linearGradient>
+    <linearGradient id="linearGradient3104">
+      <stop id="stop3106" offset="0" style="stop-color:#1f291e;stop-opacity:0.12612613;"/>
+      <stop id="stop3108" offset="1" style="stop-color:#4c5433;stop-opacity:1"/>
+    </linearGradient>
+    <linearGradient id="linearGradient3747" inkscape:collect="always">
+      <stop id="stop3749" offset="0" style="stop-color:#b8ac54;stop-opacity:1"/>
+      <stop id="stop3751" offset="1" style="stop-color:#684f12;stop-opacity:1"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3747" id="linearGradient3716" gradientUnits="userSpaceOnUse" x1="486.98187" y1="576.54858" x2="472.66058" y2="560.51086"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3747" id="linearGradient3718" gradientUnits="userSpaceOnUse" x1="486.98187" y1="576.54858" x2="472.66058" y2="560.51086"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3747" id="linearGradient3720" gradientUnits="userSpaceOnUse" x1="486.98187" y1="576.54858" x2="472.66058" y2="560.51086"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3747" id="linearGradient3765" gradientUnits="userSpaceOnUse" x1="486.98187" y1="576.54858" x2="472.66058" y2="560.51086"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3747" id="linearGradient3769" gradientUnits="userSpaceOnUse" x1="486.98187" y1="576.54858" x2="472.66058" y2="560.51086"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3104" id="linearGradient3774" gradientUnits="userSpaceOnUse" x1="425.63477" y1="588.29926" x2="393.45615" y2="547.57428" gradientTransform="translate(-172.75106,-0.54287327)"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3747-3" id="linearGradient3720-0" gradientUnits="userSpaceOnUse" x1="486.98187" y1="576.54858" x2="472.66058" y2="560.51086"/>
+    <linearGradient id="linearGradient3747-3" inkscape:collect="always">
+      <stop id="stop3749-7" offset="0" style="stop-color:#b8ac54;stop-opacity:1"/>
+      <stop id="stop3751-6" offset="1" style="stop-color:#684f12;stop-opacity:1"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3747-3" id="linearGradient3765-6" gradientUnits="userSpaceOnUse" x1="486.98187" y1="576.54858" x2="472.66058" y2="560.51086"/>
+    <linearGradient y2="560.51086" x2="472.66058" y1="576.54858" x1="486.98187" gradientUnits="userSpaceOnUse" id="linearGradient3816" xlink:href="#linearGradient3747-3" inkscape:collect="always"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3893" id="linearGradient3899" x1="496.00613" y1="602.53589" x2="491.02991" y2="612.06464" gradientUnits="userSpaceOnUse"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3901" id="linearGradient3907" x1="540.57458" y1="640.81879" x2="536.20282" y2="643.86169" gradientUnits="userSpaceOnUse"/>
+  </defs>
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.68736806" inkscape:cx="-150.58269" inkscape:cy="104.42556" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="1280" inkscape:window-height="780" inkscape:window-x="-8" inkscape:window-y="-8" inkscape:window-maximized="1" inkscape:snap-global="true" showguides="true" inkscape:guide-bbox="true"/>
+  <metadata id="metadata3765">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-288.98475,-535.52559)">
+    <g id="g3053" transform="matrix(0.96766596,0,0,0.94944363,10.181651,28.771222)">
+      <text xml:space="preserve" style="font-size:17.96657753px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient7459);fill-opacity:1;stroke:none;font-family:StoneSerITCStd Medium;-inkscape-font-specification:StoneSerITCStd Medium" x="317.94806" y="555.23956" id="text5503" sodipodi:linespacing="125%" transform="scale(0.99053965,1.0095507)"><tspan sodipodi:role="line" id="tspan5505" x="317.94806" y="555.23956" style="font-size:2.69498682px;fill:url(#linearGradient7459);fill-opacity:1">Created by Falzar FZ</tspan></text>
+      <g transform="translate(0.16646001,0.0258127)" id="g3021">
+        <path style="fill:url(#linearGradient3504);fill-opacity:1;stroke:none" d="m 325.12487,533.76805 c -12.04619,0.12786 -23.83129,6.47825 -30.10708,16.8382 -9.98334,15.47574 -9.2208,37.5796 3.10803,51.55872 7.91058,8.9416 20.14109,13.52621 31.99522,12.68526 12.96871,-0.25474 25.57911,-7.74217 31.66968,-19.25774 5.39871,-9.43832 6.92244,-20.84042 4.7256,-31.45827 -2.298,-13.99137 -13.54381,-26.2257 -27.38604,-29.44165 -4.60618,-0.8471 -9.33291,-0.96193 -14.00541,-0.92452 z" id="path3048" inkscape:connector-curvature="0"/>
+        <path style="fill:url(#linearGradient3434);fill-opacity:1;stroke:none" d="m 327.42162,533.99215 c -4.59292,0.16372 -9.05273,0.42057 -13.3017,2.25298 -3.07226,0.50757 -5.24398,1.72084 -7.72828,3.33828 -5.80161,3.30499 -9.67699,8.42984 -12.41022,13.17317 -0.88719,2.08954 -2.42914,4.79267 -2.9089,6.99894 -1.21456,2.85721 -2.51821,7.14189 -2.59559,10.99823 -0.12444,2.96675 -0.24157,4.16614 -0.19038,5.83451 0.12374,1.78475 0.11945,3.63603 0.77454,5.73385 0.29445,1.5585 0.21462,2.33679 0.89888,3.85841 0.5742,2.05244 0.42776,2.33329 1.57839,4.77777 0.79726,3.07331 4.30224,8.72568 6.40326,10.74413 3.36672,-5.13731 15.42429,-3.3231 16.64479,-1.27526 2.47714,5.36488 2.63177,10.98511 -4.25889,10.34327 1.68006,1.83566 12.9886,4.95586 18.97076,3.91942 9.24653,0.0169 16.75403,-3.05833 23.647,-8.43561 3.56897,-3.8512 5.32598,-7.0496 7.98725,-12.56445 0.54076,-2.04189 1.47532,-6.10853 2.15053,-8.08144 0.7144,-1.4595 1.99322,-2.81438 1.88701,-4.21764 -0.0523,-1.62918 0.84236,-2.9432 0.36809,-4.6821 -0.25052,-4.07705 0.77079,-8.29081 -0.63863,-12.25523 -3.01964,-8.30371 -4.3611,-9.11121 -4.3611,-9.11121 0,0 -4.05305,-3.36601 -1.64799,-5.01914 0.30731,-0.21123 1.80182,0.15312 1.40015,-0.86123 -4.31691,-5.96816 -6.96339,-8.08981 -13.27076,-11.15885 -5.23106,-2.96794 -13.11318,-4.40341 -18.55978,-4.32542 -0.2796,-0.005 -0.55896,-0.64405 -0.83842,0.0146 z" id="path3340" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccccccsccccc"/>
+        <g id="g3305" transform="translate(-85.048806,0.17648662)" style="fill:#ffffff;fill-opacity:1"/>
+      </g>
+    </g>
+    <g id="g3260" transform="matrix(0.96766596,0,0,0.94944363,10.181651,28.771222)">
+      <path style="fill:#ffffff;fill-opacity:1;stroke:none" d="m 23.129177,14.096438 0,-2.450051 -0.217335,0.320559 c -0.381808,0.563153 -0.829914,1.09433 -1.424852,1.688996 -0.318106,0.317961 -0.589168,0.57787 -0.602359,0.577577 -0.03004,-6.68e-4 -0.624766,-1.071515 -0.62208,-1.120093 0.0011,-0.01958 0.100866,-0.121212 0.22174,-0.225857 0.326873,-0.282986 1.083187,-1.068828 1.448184,-1.504723 0.363081,-0.433607 0.715789,-0.946057 1.015706,-1.4757231 L 23.1524,9.5464642 23.173668,9.064301 c 0.0117,-0.2651896 0.01459,-0.4888451 0.0064,-0.4970118 -0.0082,-0.00817 -0.164563,0.005 -0.347547,0.029268 -0.574945,0.07624 -1.621868,0.1620732 -1.991743,0.1632965 l -0.136932,4.528e-4 -0.01591,-0.1536747 c -0.0088,-0.084521 -0.02406,-0.365624 -0.03401,-0.6246732 l -0.0181,-0.4709983 0.627519,-0.02004 c 0.709886,-0.022671 1.107688,-0.053066 1.62018,-0.1237965 l 0.35443,-0.048916 0.01805,-0.281495 c 0.0099,-0.1548222 0.02706,-0.673885 0.03808,-1.1534728 0.01102,-0.4795878 0.02781,-0.8760438 0.03732,-0.8810133 0.0095,-0.00497 0.366351,0.021241 0.792981,0.058245 0.42663,0.037004 0.811915,0.067934 0.856188,0.068733 0.04427,7.987e-4 0.0805,0.01389 0.0805,0.029091 0,0.060036 -0.137906,0.1817696 -0.248807,0.2196286 -0.106581,0.036385 -0.118937,0.051377 -0.137724,0.1671115 -0.03613,0.2225654 -0.111166,1.5584759 -0.08873,1.5796757 0.01185,0.0112 0.12693,0.063338 0.255724,0.1158625 0.128794,0.052524 0.245638,0.1053601 0.259653,0.1174129 0.01402,0.012053 -0.06674,0.2304215 -0.179456,0.4852637 -0.267125,0.6039477 -0.433201,1.0882823 -0.457481,1.3341726 -0.01073,0.1086699 -0.01301,0.1975817 -0.0051,0.1975817 0.0079,0 0.143418,-0.084508 0.301058,-0.1877948 1.704227,-1.1166246 3.590855,-1.505244 5.046803,-1.0395715 0.506053,0.1618569 1.076129,0.5290449 1.392985,0.8972274 0.572455,0.6651848 0.864703,1.474419 0.906775,2.510856 0.03793,0.934485 -0.177296,1.776937 -0.626128,2.450796 -0.598074,0.897926 -1.923982,1.617258 -3.568848,1.936172 -0.47966,0.093 -0.923241,0.158174 -1.243106,0.18265 l -0.251082,0.01921 -0.09574,-0.274691 c -0.05266,-0.15108 -0.158832,-0.416291 -0.235949,-0.589358 -0.0938,-0.210502 -0.127356,-0.314667 -0.101376,-0.314667 0.02136,0 0.253696,-0.02697 0.516302,-0.05994 1.721499,-0.216118 2.985555,-0.687974 3.606575,-1.346286 0.496694,-0.526523 0.724423,-1.284539 0.637225,-2.121062 -0.118098,-1.132968 -0.720664,-1.9313864 -1.633089,-2.1638933 -1.069097,-0.2724307 -2.632074,0.109796 -3.918798,0.9583433 -0.0966,0.0637 -0.310415,0.216137 -0.475154,0.338745 l -0.299525,0.222925 -5.06e-4,2.875912 -5.06e-4,2.875912 -0.64397,0 -0.64397,0 0,-2.450052 z" id="path3238" inkscape:connector-curvature="0" transform="matrix(1.0334145,0,0,1.0532484,288.11916,533.73824)"/>
+      <path style="fill:#ffffff;fill-opacity:1;stroke:none" d="m 37.421351,16.288386 c -0.06046,-0.171978 -0.161798,-0.431237 -0.225207,-0.57613 -0.06341,-0.144893 -0.122214,-0.279908 -0.130677,-0.300032 -0.01144,-0.0272 0.03614,-0.03665 0.185325,-0.03684 0.308096,-3.89e-4 1.398921,-0.08169 1.98344,-0.14782 0.98647,-0.111613 1.915982,-0.300108 2.44896,-0.496623 0.876216,-0.323072 1.400203,-0.801282 1.561954,-1.4255 0.05984,-0.230947 0.06084,-0.758383 0.0019,-0.984824 -0.174858,-0.671325 -0.705434,-1.100655 -1.527352,-1.235895 -0.706111,-0.116185 -1.92195,0.04789 -2.838045,0.382977 -0.417859,0.152846 -1.117343,0.50536 -1.485993,0.748885 -0.331813,0.219191 -0.733963,0.57763 -0.839307,0.748081 -0.03349,0.05419 -0.07255,0.09854 -0.08678,0.09854 -0.01424,0 -0.29307,-0.117855 -0.619629,-0.2619 -0.362478,-0.159889 -0.591738,-0.276753 -0.588592,-0.300032 0.0028,-0.02097 0.0406,-0.122975 0.08392,-0.226675 0.291505,-0.697766 0.575408,-2.6356118 0.644796,-4.4011981 l 0.02048,-0.5210222 0.07653,0.015149 c 0.04209,0.00833 0.419009,0.05622 0.837589,0.1064178 0.418581,0.050198 0.766682,0.096862 0.773558,0.1036972 0.03046,0.030281 -0.163879,0.1884806 -0.2518,0.2049747 -0.08944,0.01678 -0.09732,0.027035 -0.09732,0.1266616 0,0.1491046 -0.1069,1.285718 -0.161255,1.7145414 -0.09253,0.7300086 -0.209473,1.3100026 -0.323513,1.6045166 -0.01453,0.03752 0.03863,0.01487 0.180872,-0.07707 0.835419,-0.539975 2.130361,-1.021743 3.231033,-1.2020689 1.211179,-0.1984303 2.14902,-0.1119371 2.941772,0.2713079 0.919324,0.444433 1.420372,1.196177 1.504505,2.257273 0.116774,1.472776 -0.5124,2.524959 -1.908694,3.191954 -0.94283,0.45038 -2.516952,0.765951 -4.367044,0.875479 -0.289786,0.01716 -0.614314,0.03674 -0.721174,0.04353 l -0.194289,0.01234 -0.109918,-0.312689 0,0 z" id="path3240" inkscape:connector-curvature="0" transform="matrix(1.0334145,0,0,1.0532484,288.11916,533.73824)"/>
+      <path style="fill:#ffffff;fill-opacity:1;stroke:none" d="M 41.827575,7.1041428 C 40.914537,6.7868479 39.551526,6.4773272 38.095476,6.256635 37.709094,6.1980714 37.364504,6.1447391 37.329721,6.1381189 c -0.06324,-0.012036 -0.06324,-0.012056 0.03163,-0.3121679 0.280488,-0.8873403 0.285827,-0.9001941 0.373908,-0.9001941 0.26124,0 1.943793,0.2649869 2.793797,0.4399978 0.740536,0.1524721 1.780126,0.4414542 2.161823,0.6009373 l 0.101102,0.042243 -0.214389,0.6219477 c -0.135354,0.392666 -0.229488,0.6236033 -0.255349,0.6264387 -0.02253,0.00247 -0.245128,-0.06646 -0.494667,-0.1531788 z" id="path3242" inkscape:connector-curvature="0" transform="matrix(1.0334145,0,0,1.0532484,288.11916,533.73824)"/>
+      <path style="fill:#ffffff;fill-opacity:1;stroke:none" d="m 50.79925,15.890312 c -0.539382,-0.105553 -0.882121,-0.299584 -1.303446,-0.737906 -0.771149,-0.802259 -1.25531,-2.072099 -1.410397,-3.699134 -0.04981,-0.522603 -0.0489,-3.0232696 0.0014,-3.7028281 0.04614,-0.6239148 0.144541,-1.5983447 0.163303,-1.6171069 0.01396,-0.013955 1.776444,0.3125274 1.800631,0.3335479 0.03209,0.027887 -0.162916,0.1844769 -0.25747,0.2067503 l -0.106288,0.025038 -0.06323,0.4088 c -0.284029,1.8363832 -0.286211,4.0645068 -0.0053,5.3702968 0.165511,0.769251 0.393247,1.224301 0.828918,1.656298 0.372968,0.369824 0.709907,0.466824 1.000357,0.287989 0.340874,-0.209881 0.790784,-1.035496 1.1525,-2.114916 0.06284,-0.187515 0.124589,-0.344318 0.137228,-0.348451 0.01264,-0.0041 0.128355,0.07876 0.257149,0.184205 0.175246,0.143477 0.751631,0.551981 0.827924,0.586778 0.01571,0.0072 -0.264615,0.75801 -0.408659,1.09458 -0.474078,1.107723 -1.053103,1.796281 -1.696725,2.017694 -0.237289,0.08163 -0.639585,0.102828 -0.917892,0.04837 l 0,0 z" id="path3244" inkscape:connector-curvature="0" transform="matrix(1.0334145,0,0,1.0532484,288.11916,533.73824)"/>
+      <path style="fill:#ffffff;fill-opacity:1;stroke:none" d="M 58.072972,12.510587 C 58.002791,12.150492 57.858669,11.60752 57.748338,11.287549 57.279588,9.9281239 56.390917,8.8163437 55.150637,8.0376721 55.011269,7.9501742 54.897241,7.8675015 54.897241,7.853955 c 0,-0.013547 0.171238,-0.2256937 0.380528,-0.4714383 0.20929,-0.2457446 0.390245,-0.4610746 0.402123,-0.4785111 0.0261,-0.038314 0.272549,0.091149 0.651646,0.3423171 1.061026,0.7029754 1.919687,1.6804812 2.474125,2.8165593 0.316153,0.647817 0.520768,1.262543 0.65409,1.96508 l 0.03962,0.208798 -0.105715,0.03271 c -0.05814,0.01799 -0.37187,0.116625 -0.697169,0.219183 l -0.591453,0.186469 -0.03207,-0.164539 0,0 z" id="path3246" inkscape:connector-curvature="0" transform="matrix(1.0334145,0,0,1.0532484,288.11916,533.73824)"/>
+    </g>
+    <text sodipodi:linespacing="125%" id="text3267" y="523.45837" x="339.33151" style="font-size:18px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Hanzel;-inkscape-font-specification:Hanzel Bold" xml:space="preserve"><tspan y="523.45837" x="339.33151" id="tspan3269" sodipodi:role="line"/></text>
+    <g id="g4793" transform="matrix(0.96766596,0,0,0.94944363,-77.127292,-56.773112)">
+      <g id="g3298">
+        <g transform="translate(-67.09895,-1.6611744)" style="fill:#fffffe;fill-opacity:1" id="g3195-6"/>
+        <g id="g3739" transform="translate(-98.509702,41.086329)" style="fill:url(#linearGradient3720-0);fill-opacity:1">
+          <g transform="translate(0.1507948,0.15368895)" id="g3755" style="opacity:0.4;fill:url(#linearGradient3816)">
+            <g transform="translate(196.88768,20.637053)" style="fill:url(#linearGradient3765-6);fill-opacity:1" id="g3195-6-1"/>
+            <path id="path3994-8-7-2-4-1" style="fill:url(#linearGradient3899);fill-opacity:1;stroke:none" d="m 497.56199,598.62955 c -2.03769,0.21137 -2.47404,1.80175 -0.73301,1.60209 5.52569,-0.63374 3.19243,-1.85721 0.73301,-1.60209 z m -9.16739,14.69977 c -5.00224,-0.0825 -4.85373,7.16441 -1.92031,6.32487 3.90465,-1.1175 6.80992,-6.24426 1.92031,-6.32487 z m 6.37089,-4.47132 c -2.28976,-0.13523 -3.46334,4.85149 -1.27314,3.80553 2.1256,-1.01512 3.45714,-3.67653 1.27314,-3.80553 z m -0.14597,-5.06246 c -2.21671,0.8652 -4.50193,5.56031 0.18192,1.57342 4.0208,-0.28624 3.59617,-1.79694 -0.18192,-1.57342 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sssssssssccc"/>
+            <path id="path3994-8-7-2-4-1-4" style="fill:url(#linearGradient3907);fill-opacity:1;stroke:none" d="m 537.86943,640.23237 c -3.36056,1.90025 -3.19913,6.38968 -0.0126,5.30173 8.1028,-2.76645 7.87937,-9.75007 0.0126,-5.30173 z" inkscape:connector-curvature="0" sodipodi:nodetypes="sss"/>
+          </g>
+        </g>
+      </g>
+    </g>
+    <path sodipodi:nodetypes="cccccccccccccccccccccccccccccc" inkscape:connector-curvature="0" id="path3060" d="m 338.16594,568.83043 c -9.13589,3.90086 -17.30919,3.87452 -26.98493,4.45786 -1.30953,0.3266 -1.00953,2.77676 0.33255,2.59672 5.5411,-0.1248 9.20002,0.2533 14.70876,-0.45348 -0.0811,1.61418 -0.31296,3.47173 -0.58482,5.05617 -6.07008,0.0741 -12.77152,-0.15945 -18.83427,0.1512 -1.28761,-0.0571 -1.37891,2.24599 -0.0975,2.32718 5.34215,0.39693 11.35694,0.0691 16.71863,0.24325 0.97453,-0.0486 2.06966,-0.16325 1.24294,1.18788 -1.08085,3.28309 -3.17891,5.84926 -5.57514,7.99643 -3.54674,3.08521 -7.90344,4.5744 -12.03683,6.41487 -1.13522,0.33045 -1.51697,1.95203 0.29241,2.36006 0.73976,0.25255 4.37965,1.1199 8.23681,-0.78367 4.52151,-2.35593 11.12361,-9.68948 12.73732,-15.18008 2.02282,4.10188 5.32599,7.46406 8.7424,10.1195 3.20391,2.60211 6.68272,4.85199 10.41196,6.2847 1.41865,-0.18978 3.26047,-0.7289 4.23616,-1.40735 1.15486,-0.70196 1.85275,-1.23891 1.47436,-2.37925 -0.95764,-1.40329 -2.81793,-1.00202 -4.14698,-1.53614 -6.37172,-1.47468 -12.6363,-4.76554 -16.62576,-10.78859 -0.48341,-0.69188 -0.94423,-1.40375 -1.38708,-2.1306 6.5343,-0.20262 10.12512,-0.15183 16.70856,-0.28704 0.7671,0.67066 2.64329,0.34459 3.1522,-0.17922 0.63628,-0.40307 0.61096,-1.76529 -0.29518,-2.21034 -2.58745,-0.0928 -4.61238,-0.17769 -6.94019,-0.17161 -4.99378,-0.0657 -8.64759,-0.0431 -13.64018,-0.19552 0.17508,-1.44967 0.22612,-4.05138 0.6106,-5.44675 2.9441,-0.65738 8.93966,-1.80141 11.02832,-2.18641 2.23967,-1.56833 -0.87822,-2.52762 -2.02125,-3.29457 -0.44357,-0.29903 -0.92213,-0.71167 -1.46387,-0.5652 z" style="fill:#ffffff;fill-opacity:1;stroke:none"/>
+    <path sodipodi:nodetypes="ccccccccccccccccccccc" inkscape:connector-curvature="0" id="path3062" d="m 335.91755,556.29452 c -1.46677,0.32278 -1.68064,1.89117 -2.4219,2.80593 -1.6127,2.93599 -3.70305,5.68779 -6.44876,7.97626 -0.63646,0.49353 -1.50061,1.48907 -0.48235,2.04816 1.21989,0.51429 2.17311,-0.69649 3.08757,-1.18273 1.93568,-1.40558 3.85138,-2.84808 5.45325,-4.52265 1.38652,-0.007 2.77304,-0.0128 4.15955,-0.0194 1.71438,1.82218 3.1199,3.89093 5.13419,5.4949 1.12713,0.60179 2.33916,-0.40156 2.24512,-1.37374 0.33376,-1.75948 -1.47889,-2.97261 -2.9776,-3.89695 -0.21528,-0.3997 2.08941,-0.0942 2.8845,-0.21111 2.01259,-0.0383 3.74546,-0.0334 5.98999,-0.041 0.83353,0.44209 2.10498,0.41086 2.93688,-0.1511 0.41649,-0.69154 0.21294,-1.42781 -0.67714,-1.70749 -4.08603,-0.43694 -5.05567,-0.10515 -6.76425,-0.10609 -3.71263,0.0271 -7.42825,0.021 -11.13867,-0.0971 0.65244,-0.68191 0.66958,-1.32946 1.91445,-2.13315 1.00227,-0.77835 1.54646,-0.97623 1.47291,-1.46512 -1.11663,-0.76769 -2.63502,-1.08738 -4.0139,-1.41292 -0.11764,-0.0142 -0.23546,-0.009 -0.35389,-0.006 z" style="fill:#ffffff;fill-opacity:1;stroke:none"/>
+    <path sodipodi:nodetypes="cccccccccccccccccccccc" inkscape:connector-curvature="0" id="path3066" d="m 312.33905,556.93263 c -1.34788,0.35812 -1.30328,1.82517 -2.01317,2.66893 -1.72548,3.25558 -4.02026,6.27157 -6.9151,8.89163 -0.80569,0.46562 -0.92654,1.71526 0.24946,1.82357 1.27596,0.0409 1.98188,-1.18828 2.91955,-1.75709 1.72814,-1.47372 3.49205,-2.93693 5.01087,-4.56978 1.01294,0.13902 2.44596,-0.42118 2.91696,0.61983 1.55852,1.58207 2.75452,3.38065 4.2303,5.00083 0.79563,0.88273 2.48506,0.54147 2.80784,-0.50305 0.79584,-1.59091 -0.71798,-3.07524 -2.19033,-3.93504 -0.56108,-0.40081 -1.14984,-0.7762 -1.71977,-1.16322 2.27112,-0.091 4.57518,0.0553 6.84637,-0.0484 0.94943,0.30255 1.89557,0.24482 2.47524,-0.21435 0.86067,-0.35973 0.45844,-1.49965 -0.49199,-1.78327 -2.83178,0.0581 -4.42253,0.14958 -6.91519,0.0629 -2.09427,-0.006 -4.18928,0.0173 -6.28284,-0.0387 0.53295,-0.66529 0.81534,-1.24677 1.61858,-2.02189 0.69289,-0.60589 1.83379,-1.1148 1.52573,-1.52367 -1.07243,-0.7374 -2.44517,-1.15366 -3.75346,-1.514 l -0.1856,0.002 -0.13345,0.002 z" style="fill:#ffffff;fill-opacity:1;stroke:none"/>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/LIGHT.svg b/src/assets/LIGHT.svg
new file mode 100644
index 0000000..1748c23
--- /dev/null
+++ b/src/assets/LIGHT.svg
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="76.85199" height="77.151932" id="svg3760" version="1.1" inkscape:version="0.48.1 " sodipodi:docname="LIGHT.svg">
+  <defs id="defs3762">
+    <linearGradient id="linearGradient4306">
+      <stop id="stop4308" offset="0" style="stop-color:#9f863f;stop-opacity:1"/>
+      <stop style="stop-color:#332815;stop-opacity:1" offset="1" id="stop4310"/>
+      <stop id="stop4312" offset="1" style="stop-color:#e9e560;stop-opacity:1"/>
+    </linearGradient>
+    <linearGradient id="linearGradient4296">
+      <stop id="stop4298" offset="0" style="stop-color:#f0bf7a;stop-opacity:0.91071427;"/>
+      <stop style="stop-color:#f0bf7a;stop-opacity:0.45490196;" offset="0.64173013" id="stop4300"/>
+      <stop id="stop4302" offset="1" style="stop-color:#f0bf7a;stop-opacity:0;"/>
+    </linearGradient>
+    <linearGradient id="linearGradient4230">
+      <stop style="stop-color:#f0bf7a;stop-opacity:0.91071427;" offset="0" id="stop4232"/>
+      <stop id="stop4292" offset="0.5" style="stop-color:#f0bf7a;stop-opacity:0.45490196;"/>
+      <stop style="stop-color:#f0bf7a;stop-opacity:0;" offset="1" id="stop4234"/>
+    </linearGradient>
+    <linearGradient id="linearGradient3111">
+      <stop style="stop-color:#f3c87d;stop-opacity:0.7589286;" offset="0" id="stop3113"/>
+      <stop id="stop3119" offset="0.91352373" style="stop-color:#d69c45;stop-opacity:1"/>
+      <stop style="stop-color:#e5ff6a;stop-opacity:1" offset="1" id="stop3115"/>
+    </linearGradient>
+    <linearGradient id="linearGradient3101">
+      <stop style="stop-color:#a5864d;stop-opacity:1" offset="0" id="stop3103"/>
+      <stop id="stop4238" offset="0.78602821" style="stop-color:#332815;stop-opacity:1"/>
+      <stop style="stop-color:#1a1911;stop-opacity:1" offset="1" id="stop3105"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient4230" id="radialGradient4236" cx="306.59958" cy="555.36737" fx="306.59958" fy="555.36737" r="6.0054863" gradientTransform="matrix(0.60886416,0.50796393,-0.90996045,1.0907119,625.30825,-205.98784)" gradientUnits="userSpaceOnUse"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient4306" id="radialGradient4304" cx="327.57648" cy="574.45367" fx="327.57648" fy="574.45367" r="39.671756" gradientTransform="matrix(-1.8589783e-6,1.0770613,-1.1551438,-2.9470962e-6,991.28513,221.58125)" gradientUnits="userSpaceOnUse"/>
+    <linearGradient y2="22.401928" x2="106.24998" y1="22.901928" x1="143.49998" gradientTransform="matrix(1.2113408,0,0,1.2113407,182.53634,525.19736)" gradientUnits="userSpaceOnUse" id="linearGradient6058" xlink:href="#linearGradient5507-3" inkscape:collect="always"/>
+    <linearGradient id="linearGradient5507-3">
+      <stop style="stop-color:#ff0000;stop-opacity:1;" offset="0" id="stop5509-1"/>
+      <stop style="stop-color:#ff6600;stop-opacity:1" offset="1" id="stop5511-9"/>
+    </linearGradient>
+    <linearGradient y2="22.401928" x2="106.24998" y1="22.901928" x1="143.49998" gradientTransform="matrix(1.2113408,0,0,1.2113407,182.53634,525.19736)" gradientUnits="userSpaceOnUse" id="linearGradient7449" xlink:href="#linearGradient5507-3" inkscape:collect="always"/>
+    <linearGradient id="linearGradient7451">
+      <stop style="stop-color:#ff0000;stop-opacity:1;" offset="0" id="stop7453"/>
+      <stop style="stop-color:#ff6600;stop-opacity:1" offset="1" id="stop7455"/>
+    </linearGradient>
+    <linearGradient y2="22.401928" x2="106.24998" y1="22.901928" x1="143.49998" gradientTransform="matrix(0.71708557,0,0,0.71708544,242.57691,538.31081)" gradientUnits="userSpaceOnUse" id="linearGradient7459" xlink:href="#linearGradient5507-3" inkscape:collect="always"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3111-5" id="radialGradient4358-4" cx="327.81348" cy="574.35522" fx="327.81348" fy="574.35522" r="39.671757" gradientTransform="matrix(1,0,0,1.0232282,0,-13.341263)" gradientUnits="userSpaceOnUse"/>
+    <linearGradient id="linearGradient3111-5">
+      <stop style="stop-color:#f3c87d;stop-opacity:0.7589286;" offset="0" id="stop3113-4"/>
+      <stop id="stop3119-9" offset="0.91352373" style="stop-color:#d69c45;stop-opacity:1"/>
+      <stop style="stop-color:#e5ff6a;stop-opacity:1" offset="1" id="stop3115-5"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3101-4" id="radialGradient3107-6" cx="316.5849" cy="568.73383" fx="316.5849" fy="568.73383" r="35.220825" gradientTransform="matrix(0.74739457,0.822666,-0.75830964,0.68893224,512.80084,-84.984613)" gradientUnits="userSpaceOnUse"/>
+    <linearGradient id="linearGradient3101-4">
+      <stop style="stop-color:#a5864d;stop-opacity:1" offset="0" id="stop3103-8"/>
+      <stop id="stop4238-2" offset="0.78602821" style="stop-color:#332815;stop-opacity:1"/>
+      <stop style="stop-color:#1a1911;stop-opacity:1" offset="1" id="stop3105-1"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient4296-8" id="radialGradient4294-6" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.60886416,0.50796393,-0.90996045,1.0907119,625.30825,-205.98784)" cx="306.59958" cy="555.36737" fx="306.59958" fy="555.36737" r="6.0054865"/>
+    <linearGradient id="linearGradient4296-8">
+      <stop id="stop4298-3" offset="0" style="stop-color:#f0bf7a;stop-opacity:0.91071427;"/>
+      <stop style="stop-color:#f0bf7a;stop-opacity:0.45490196;" offset="0.64173013" id="stop4300-1"/>
+      <stop id="stop4302-4" offset="1" style="stop-color:#f0bf7a;stop-opacity:0;"/>
+    </linearGradient>
+  </defs>
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="6.4192037" inkscape:cx="27.90341" inkscape:cy="62.882741" inkscape:document-units="px" inkscape:current-layer="g4793" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="1280" inkscape:window-height="780" inkscape:window-x="-8" inkscape:window-y="-8" inkscape:window-maximized="1" inkscape:snap-global="true" showguides="true" inkscape:guide-bbox="true"/>
+  <metadata id="metadata3765">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-288.98475,-535.52559)">
+    <g id="g4793" transform="matrix(0.96766596,0,0,0.94944363,10.181651,28.771222)">
+      <text xml:space="preserve" style="font-size:28.68341637px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient7459);fill-opacity:1;stroke:none;font-family:StoneSerITCStd Medium;-inkscape-font-specification:StoneSerITCStd Medium" x="310.52072" y="555.62982" id="text5503" sodipodi:linespacing="125%" transform="scale(0.99053965,1.0095507)"><tspan sodipodi:role="line" id="tspan5505" x="310.52072" y="555.62982" style="font-size:4.30251265px;fill:url(#linearGradient7459);fill-opacity:1">Created by Falzar FZ</tspan></text>
+      <g transform="translate(0.00547206,0.0258127)" id="g3021">
+        <path style="fill:url(#radialGradient4358-4);fill-opacity:1;stroke:none" d="m 325.12487,533.76805 c -12.04619,0.12786 -23.83129,6.47825 -30.10708,16.8382 -9.98334,15.47574 -9.2208,37.5796 3.10803,51.55872 7.91058,8.9416 20.14109,13.52621 31.99522,12.68526 12.96871,-0.25474 25.57911,-7.74217 31.66968,-19.25774 5.39871,-9.43832 6.92244,-20.84042 4.7256,-31.45827 -2.298,-13.99137 -13.54381,-26.2257 -27.38604,-29.44165 -4.60618,-0.8471 -9.33291,-0.96193 -14.00541,-0.92452 z" id="path3048" inkscape:connector-curvature="0"/>
+        <path style="fill:url(#radialGradient3107-6);fill-opacity:1;stroke:none" d="m 325.42652,538.32169 c -10.69468,0.11351 -21.15757,5.75143 -26.72925,14.94905 -8.86327,13.73946 -8.18628,33.3634 2.75933,45.77415 7.02306,7.9384 17.88138,12.00865 28.40555,11.26205 11.5137,-0.22616 22.70929,-6.87355 28.11653,-17.09714 4.79301,-8.3794 6.14578,-18.50225 4.19542,-27.92884 -2.04018,-12.42163 -12.02428,-23.28334 -24.3135,-26.13848 -4.08939,-0.75206 -8.28581,-0.85401 -12.43408,-0.82079 z" id="path3048-4" inkscape:connector-curvature="0"/>
+        <path style="fill:url(#radialGradient4294-6);fill-opacity:1;stroke:none" d="m 311.71455,548.43287 c -6.29773,-1.46827 -14.76365,7.17281 -10.62999,13.63988 6.56058,3.42979 14.32286,-7.35284 10.62999,-13.63988 z" id="path3109" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+        <g id="g4771" transform="translate(-85.682227,0.42272594)" style="fill:#ffffff;fill-opacity:1">
+          <g style="fill:#ffffff;fill-opacity:1" transform="translate(-84.567676,0)" id="g4661">
+            <path style="fill:#ffffff;fill-opacity:1;stroke:none" d="m 495.41679,555.45688 c -0.11272,2.8363 0.001,12.46248 0.006,15.75894 -4.04425,-0.1517 -19.22827,0.21676 -20.12967,0.54761 -1.91426,0.70262 -1.78727,3.19112 -0.26081,3.85418 2.08778,0.90687 11.92333,0.29591 14.52689,0.29335 -0.004,4.02407 -2.12215,7.06125 -4.37736,10.43967 -2.27149,3.18701 -6.06524,6.17457 -8.79468,7.81109 -2.21015,1.32517 -4.03255,2.3092 -6.47335,2.18074 -1.95074,-0.10267 -1.26123,1.9273 -1.10708,3.01297 0.29439,2.07328 4.65537,2.28937 5.83018,1.79537 3.8795,-2.42873 6.53772,-3.81595 9.38178,-6.73421 2.15237,-2.20853 4.59339,-6.60577 5.50582,-7.58146 1.28736,-1.37662 3.89491,-8.55697 4.34106,-10.02249 0.49481,-1.62535 0.97865,-1.48229 2.26805,-1.35073 1.27993,0 2.55985,0 3.83978,0 0.626,5.85665 -0.66704,23.48283 0.9179,23.98911 6.1861,1.07405 19.20837,3.28933 25.14775,1.96442 1.52957,-1.42268 2.67635,-4.66847 1.82575,-7.39139 -7.90596,2.06547 -8.94335,1.17023 -23.65929,1.42155 -0.59975,-5.11984 -0.0152,-13.82908 -2e-5,-19.98367 5.34859,0 10.17536,-0.13578 15.65238,-0.0787 1.55757,0.0162 2.75184,-3.86998 0.48769,-3.89196 -8.39851,-0.16659 -13.27633,0.10886 -20.17607,-0.26156 -0.0957,-5.28627 0.10825,-10.51327 -0.0895,-15.79193 -0.0251,-2.27077 -4.44215,-1.95524 -4.66348,0.0191 z" id="path4466" inkscape:connector-curvature="0" sodipodi:nodetypes="ccssccssscssscccccccscccc"/>
+            <path style="fill:#ffffff;fill-opacity:1;stroke:none" d="m 507.27507,559.67595 c 2.33184,1.77217 3.29149,5.74031 5.38996,5.87832 2.81049,0.18485 5.03733,-1.48802 5.84656,-3.18702 0.44606,-0.93652 -8.0955,-3.42564 -10.05858,-4.09577 -1.0472,-0.35748 -1.74088,0.97665 -1.17794,1.40447 z" id="path4468" inkscape:connector-curvature="0" sodipodi:nodetypes="sssss"/>
+            <path style="fill:#ffffff;fill-opacity:1;stroke:none" d="m 486.81056,558.61792 c -3.06262,1.59121 -5.6519,1.51564 -9.20874,1.28084 -1.66188,3.45951 1.84276,5.90505 2.08582,6.4388 0.4218,0.92623 2.26623,0.87082 2.99268,0.28717 2.68397,-2.15638 5.97399,-4.21295 5.89216,-7.64775 -0.0208,-0.87319 -0.86454,-0.8253 -1.76192,-0.35906 z" id="path4470" inkscape:connector-curvature="0" sodipodi:nodetypes="scssss"/>
+          </g>
+          <path sodipodi:nodetypes="ccccccccccccccccccccc" inkscape:connector-curvature="0" id="path4692" d="m 388.32416,541.47719 c -0.10053,0.22296 -0.008,0.69421 0.29401,0.66098 0.34411,0.0707 0.88066,-0.11069 1.04897,0.25543 0.11092,1.44354 0.0413,2.90337 0.0709,4.35381 -0.0226,1.4786 0.0609,2.96545 -0.0563,4.43696 -0.21892,0.45406 -0.67244,0.34586 -1.09018,0.40513 -0.18455,0.12643 -0.17795,0.70693 0.18149,0.58558 2.7392,-0.009 5.26519,0.0202 7.9987,-0.023 0.2116,-0.44522 0.20756,-1.10411 0.33408,-1.58932 0.0378,-0.41748 0.23159,-0.98488 0.17588,-1.39965 -0.20211,-0.25715 -0.58885,0.0688 -0.60737,0.36072 -0.30104,0.72705 -0.76427,1.6387 -1.60977,1.82556 -0.89653,0.20901 -1.0947,0.18991 -2.00202,0.0455 -0.46669,-0.0487 -0.74871,-0.49183 -0.69509,-0.92525 -0.0344,-2.62197 -0.0312,-5.25835 0.0273,-7.87969 -0.0458,-0.44211 0.49897,-0.38159 0.83427,-0.42249 0.209,-0.0208 0.60301,-0.15189 0.56134,-0.45853 0.0753,-0.45494 -0.53507,-0.20674 -0.80216,-0.26891 -1.29323,0.0162 -3.35264,-0.0325 -4.63644,0.0244 l -0.0275,0.0127 z" style="fill:#ffffff;fill-opacity:1;stroke:none"/>
+          <path sodipodi:nodetypes="cccccccccccccccccc" inkscape:connector-curvature="0" id="path4694" d="m 397.87299,541.47719 c -0.0742,0.19273 10e-4,0.65799 0.30793,0.5935 0.34536,0.0764 1.12547,0.0248 1.39216,0.27597 0.1832,0.33578 0.0146,0.6782 0.0682,1.04293 0.0251,2.60565 0.0608,5.22278 -0.0476,7.81955 -0.22439,0.4081 -1.17502,0.32022 -1.57193,0.39013 -0.24595,0.0464 -0.28386,0.71104 0.0981,0.57581 1.45429,0 3.65606,0 5.11036,0 0.19238,-0.11635 0.18842,-0.69274 -0.16646,-0.59667 -0.36009,-0.0484 -0.73677,0.0443 -0.93205,-0.32108 -0.11533,-1.62051 -0.0519,-3.25416 -0.079,-4.88101 0.0181,-1.30452 -0.008,-2.54195 0.0966,-3.83816 0.13661,-0.36792 0.49257,-0.34058 0.80747,-0.43177 0.22583,0.0136 0.44071,-0.19927 0.37874,-0.45229 0.002,-0.40601 -0.43734,-0.13662 -0.70287,-0.21406 -1.27389,0.0162 -3.46769,-0.0325 -4.73214,0.0244 l -0.0275,0.0127 z" style="fill:#ffffff;fill-opacity:1;stroke:none"/>
+          <path sodipodi:nodetypes="cccccccccccccsccccccccssccc" inkscape:connector-curvature="0" id="path4696" d="m 410.404,541.28613 c -1.89028,0.0615 -4.18984,1.00079 -5.27949,2.84189 -0.91864,1.56002 -0.85556,3.79399 -0.13547,5.47156 0.76131,1.69461 2.56904,2.37483 4.15818,2.63919 1.59933,0.24226 3.23029,-0.0505 4.76305,-0.58381 0.15101,-0.27176 0.0306,-0.67785 0.0756,-1.00124 0.0421,-0.92058 -0.0483,-1.71803 0.10304,-2.61494 0.15746,-0.29981 0.52911,-0.23961 0.78919,-0.32729 0.16923,0.009 0.38149,-0.20186 0.34954,-0.45103 0.0673,-0.45864 -0.45679,-0.21084 -0.68666,-0.27245 -1.18982,0.0164 -2.39268,-0.0327 -3.57444,0.0244 -0.16104,0.28021 0.006,0.79766 0.33234,0.69387 0.3499,0.0823 0.59868,-0.006 0.85857,0.32367 0.0244,0.17997 0.0431,0.35362 0.0567,0.52376 0.0487,0.60972 0.0322,1.17447 -0.0195,1.82395 -0.0378,0.50288 -0.0851,1.0247 -0.54949,1.13578 -1.0089,0.29896 -2.10982,0.12259 -3.0542,-0.35028 -1.38784,-0.78517 -1.35657,-2.5763 -1.40429,-4.28792 -0.0352,-1.37179 0.23011,-2.87191 1.16684,-3.82133 0.82934,-0.86995 1.31495,-0.97201 2.40509,-0.92909 0.95981,0.0644 1.04178,0.0325 1.5632,1.03271 0.17189,0.34146 0.24327,0.73706 0.37489,1.0878 0.29428,0.0987 1.21976,0.2106 1.15441,-0.21175 -0.0911,-0.58859 -0.12953,-1.18002 -0.34103,-1.73311 -0.201,-0.52564 -0.94669,-0.64367 -1.39052,-0.81057 -0.74025,-0.20196 -0.95513,-0.22591 -1.71562,-0.20377 z" style="fill:#ffffff;fill-opacity:1;stroke:none"/>
+          <path sodipodi:nodetypes="ccccccccccccccccccccccccccccccccccccc" inkscape:connector-curvature="0" id="path4698" d="m 416.37524,541.47719 c -0.0703,0.19273 -0.036,0.66276 0.25426,0.59827 0.32691,0.0764 0.7302,0.0248 0.98266,0.27597 0.1734,0.33578 0.051,0.67343 0.10178,1.03816 0.0238,2.60565 0.0575,5.1441 -0.0451,7.74087 -0.21243,0.4081 -0.77713,0.32022 -1.15284,0.39013 -0.23282,0.0464 -0.26872,0.78972 0.0929,0.65449 1.41197,-0.0164 3.33905,0.0604 4.74211,0.003 0.12312,-0.24673 0.0179,-0.7635 -0.3492,-0.65045 -0.32326,-0.0548 -0.86106,-3.9e-4 -0.96139,-0.41754 -0.11057,-1.37002 -0.0412,-2.68216 -0.0785,-4.06279 -0.1263,-0.48345 0.49021,-0.20821 0.7674,-0.27958 1.60455,0 1.7069,-0.0278 3.31147,-0.0278 -0.0346,1.47296 0.0288,2.8781 -0.079,4.3406 -0.10245,0.4277 -0.64643,0.36186 -0.97529,0.41301 -0.37636,-0.10094 -0.38064,0.4091 -0.28911,0.65637 1.42336,0.0579 3.86731,0.008 5.29803,0.0247 0.24762,0.003 0.24611,-0.73475 -0.0479,-0.67003 -0.35379,-0.053 -0.6953,0.0244 -0.92766,-0.31799 -0.17321,-0.88887 -0.0682,-1.74323 -0.10433,-2.65107 0.0195,-1.97988 -0.0473,-3.88232 0.0511,-5.85727 -0.0175,-0.23807 0.11438,-0.46827 0.35733,-0.47767 0.29732,-0.10491 0.47535,-0.0697 0.76078,-0.18222 0.12224,-0.1825 0.11274,-0.68334 -0.19928,-0.5788 -1.38911,0.0163 -3.79397,-0.0325 -5.17413,0.0244 -0.14158,0.19236 -0.0385,0.6601 0.25233,0.6181 0.30995,0.0707 0.72527,0.0266 0.94658,0.29545 0.20104,0.76513 0.0824,1.49307 0.11133,2.27832 -0.004,0.42813 -0.008,0.85626 -0.0116,1.28439 -1.84048,0 -2.17876,0.0278 -4.01925,0.0278 0.0221,-1.16481 -0.10029,-2.25713 0.0498,-3.41234 0.10323,-0.42532 0.65038,-0.36638 0.9775,-0.43697 0.23879,0.028 0.44917,-0.23789 0.37622,-0.49743 -0.097,-0.32436 -0.60509,-0.0765 -0.86927,-0.15391 -1.20582,0.0164 -2.92678,-0.0606 -4.12366,-0.003 l -0.026,0.0127 z" style="fill:#ffffff;fill-opacity:1;stroke:none"/>
+          <path sodipodi:nodetypes="ccccccccccccccccccccccc" inkscape:connector-curvature="0" id="path4700" d="m 429.31154,541.51008 c -0.18121,0.78106 -0.3803,1.57908 -0.49816,2.36559 0.24128,0.18648 0.6493,0.0254 0.74657,-0.25326 0.35857,-0.63443 0.82781,-1.36196 1.67005,-1.46307 0.7266,-0.12614 0.99222,-0.0717 1.72727,-0.085 -0.0312,2.97793 0.02,5.96217 -0.0745,8.93584 0.024,0.45102 -0.10161,0.53734 -0.46762,0.56908 -0.21743,0.0153 -0.62141,0.006 -0.57939,0.30664 -0.0758,0.45119 0.56489,0.20263 0.84458,0.26537 1.36163,-0.0162 2.73914,0.0325 4.09083,-0.0244 0.14307,-0.17215 0.0593,-0.54044 -0.24245,-0.52051 -0.34722,-0.0804 -0.92854,-0.0322 -1.19189,-0.28129 -0.20118,-0.80519 -0.0871,-1.65421 -0.13375,-2.47855 -0.0111,-2.26034 -0.0173,-4.5207 -0.0266,-6.78104 0.8158,0.0609 1.42411,-0.063 2.21743,0.1486 0.78908,0.24922 1.15247,1.00792 1.5707,1.61521 0.16571,0.21838 0.7199,0.12248 0.53388,-0.20435 -0.14576,-0.69228 -0.0583,-1.39889 -0.23396,-2.08136 -0.59414,-0.10367 -1.07654,-0.027 -1.68657,-0.0605 -2.72734,-0.0182 -5.45476,-0.007 -8.18215,-0.0102 l -0.0552,0.0244 -0.029,0.0127 z" style="fill:#ffffff;fill-opacity:1;stroke:none"/>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/WATER.svg b/src/assets/WATER.svg
new file mode 100644
index 0000000..e9f0fdf
--- /dev/null
+++ b/src/assets/WATER.svg
@@ -0,0 +1,181 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" sodipodi:docname="WATER.svg" inkscape:version="0.48.1 " version="1.1" id="svg3760" height="77.151932" width="76.85199">
+  <defs id="defs3762">
+    <linearGradient id="linearGradient4188">
+      <stop style="stop-color:#08a3e6;stop-opacity:1" offset="0" id="stop4190"/>
+      <stop id="stop4196" offset="0.75918519" style="stop-color:#08a3e6;stop-opacity:1"/>
+      <stop style="stop-color:#016ead;stop-opacity:1" offset="1" id="stop4192"/>
+    </linearGradient>
+    <linearGradient id="linearGradient4161">
+      <stop style="stop-color:#0aa4e5;stop-opacity:1" offset="0" id="stop4163"/>
+      <stop style="stop-color:#016dac;stop-opacity:1" offset="1" id="stop4165"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" id="linearGradient3711">
+      <stop style="stop-color:#53e1ff;stop-opacity:1;" offset="0" id="stop3713"/>
+      <stop style="stop-color:#53e1ff;stop-opacity:0;" offset="1" id="stop3715"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" id="linearGradient3703">
+      <stop style="stop-color:#53e1ff;stop-opacity:1;" offset="0" id="stop3705"/>
+      <stop style="stop-color:#53e1ff;stop-opacity:0;" offset="1" id="stop3707"/>
+    </linearGradient>
+    <linearGradient id="linearGradient3497">
+      <stop style="stop-color:#005e96;stop-opacity:1" offset="0" id="stop3499"/>
+      <stop id="stop3501" offset="0.30073237" style="stop-color:#006bab;stop-opacity:1"/>
+      <stop style="stop-color:#16afe5;stop-opacity:1" offset="1" id="stop3503"/>
+    </linearGradient>
+    <linearGradient id="linearGradient3479">
+      <stop id="stop3481" offset="0" style="stop-color:#005e96;stop-opacity:1"/>
+      <stop style="stop-color:#006bab;stop-opacity:1" offset="0.55290782" id="stop3483"/>
+      <stop id="stop3485" offset="1" style="stop-color:#16afe5;stop-opacity:1"/>
+    </linearGradient>
+    <linearGradient id="linearGradient3469">
+      <stop style="stop-color:#0069a4;stop-opacity:1" offset="0" id="stop3471"/>
+      <stop id="stop3473" offset="0.62723601" style="stop-color:#006bab;stop-opacity:1"/>
+      <stop style="stop-color:#16b0e5;stop-opacity:1" offset="1" id="stop3475"/>
+    </linearGradient>
+    <linearGradient inkscape:collect="always" id="linearGradient3258">
+      <stop style="stop-color:#26c0e4;stop-opacity:1" offset="0" id="stop3260"/>
+      <stop style="stop-color:#009be6;stop-opacity:1" offset="1" id="stop3262"/>
+    </linearGradient>
+    <linearGradient id="linearGradient4306">
+      <stop id="stop4308" offset="0" style="stop-color:#9f863f;stop-opacity:1"/>
+      <stop style="stop-color:#332815;stop-opacity:1" offset="1" id="stop4310"/>
+      <stop id="stop4312" offset="1" style="stop-color:#e9e560;stop-opacity:1"/>
+    </linearGradient>
+    <linearGradient id="linearGradient4296">
+      <stop id="stop4298" offset="0" style="stop-color:#0068af;stop-opacity:1"/>
+      <stop style="stop-color:#006bab;stop-opacity:1" offset="0.65370244" id="stop4300"/>
+      <stop id="stop4302" offset="1" style="stop-color:#16b0e5;stop-opacity:1"/>
+    </linearGradient>
+    <linearGradient id="linearGradient4230">
+      <stop style="stop-color:#f0bf7a;stop-opacity:0.91071427;" offset="0" id="stop4232"/>
+      <stop id="stop4292" offset="0.5" style="stop-color:#f0bf7a;stop-opacity:0.45490196;"/>
+      <stop style="stop-color:#f0bf7a;stop-opacity:0;" offset="1" id="stop4234"/>
+    </linearGradient>
+    <linearGradient id="linearGradient3111">
+      <stop id="stop3119" offset="0" style="stop-color:#d69c45;stop-opacity:1"/>
+      <stop style="stop-color:#e5ff6a;stop-opacity:1" offset="1" id="stop3115"/>
+    </linearGradient>
+    <linearGradient id="linearGradient3101">
+      <stop style="stop-color:#a5864d;stop-opacity:1" offset="0" id="stop3103"/>
+      <stop id="stop4238" offset="0.78602821" style="stop-color:#332815;stop-opacity:1"/>
+      <stop style="stop-color:#1a1911;stop-opacity:1" offset="1" id="stop3105"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient4230" id="radialGradient4236" cx="306.59958" cy="555.36737" fx="306.59958" fy="555.36737" r="6.0054863" gradientTransform="matrix(0.60886416,0.50796393,-0.90996045,1.0907119,625.30825,-205.98784)" gradientUnits="userSpaceOnUse"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient4306" id="radialGradient4304" cx="327.57648" cy="574.45367" fx="327.57648" fy="574.45367" r="39.671756" gradientTransform="matrix(-1.8589783e-6,1.0770613,-1.1551438,-2.9470962e-6,991.28513,221.58125)" gradientUnits="userSpaceOnUse"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3111" id="radialGradient4358" cx="327.81348" cy="574.35523" fx="327.81348" fy="574.35523" r="39.671756" gradientTransform="matrix(1,0,0,1.0232282,0,-13.341263)" gradientUnits="userSpaceOnUse"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3258" id="linearGradient3264" x1="300.60361" y1="544.72681" x2="354.51379" y2="598.80414" gradientUnits="userSpaceOnUse"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient4296" id="radialGradient3465" cx="304.59238" cy="576.44403" fx="304.59238" fy="576.44403" r="7.8661478" gradientTransform="matrix(0.76699112,0.33797369,-0.65057603,1.5336199,445.57079,-410.2301)" gradientUnits="userSpaceOnUse"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3469" id="radialGradient3467" cx="316.90671" cy="550.9397" fx="316.90671" fy="550.9397" r="3.2352532" gradientTransform="matrix(0.56847698,0.55122442,-0.86018562,0.92148696,610.66295,-131.43075)" gradientUnits="userSpaceOnUse"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3479" id="radialGradient3477" cx="349.59592" cy="562.99506" fx="349.59592" fy="562.99506" r="5.9967934" gradientTransform="matrix(0.62249559,-0.66686048,1.0807302,1.0479273,-476.5318,206.44403)" gradientUnits="userSpaceOnUse"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3497" id="radialGradient3487" cx="348.92651" cy="597.21527" fx="348.92651" fy="597.21527" r="27.162861" gradientTransform="matrix(0.3909718,0.43756795,-2.4916173,2.3125644,1692.1431,-933.55267)" gradientUnits="userSpaceOnUse"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3703" id="radialGradient3709" cx="343.47229" cy="614.76147" fx="343.47229" fy="614.76147" r="18.21089" gradientTransform="matrix(3.5311082,-1.7278711,0.20305564,0.43105154,-994.19633,937.70847)" gradientUnits="userSpaceOnUse"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3711" id="radialGradient3717" cx="362.10602" cy="577.11127" fx="362.10602" fy="577.11127" r="1.8832989" gradientTransform="matrix(8.1481487,-5.9318526,2.3638508,3.372883,-3952.5926,778.81887)" gradientUnits="userSpaceOnUse"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3711" id="radialGradient3739" cx="288.94055" cy="577.95142" fx="288.94055" fy="577.95142" r="1.2844789" gradientTransform="matrix(1.1719452,0.0481994,-0.12453532,3.1453612,22.305156,-1253.771)" gradientUnits="userSpaceOnUse"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3479" id="radialGradient4111" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.62249559,-0.66686048,1.0807302,1.0479273,-476.5318,206.44403)" cx="349.59592" cy="562.99506" fx="349.59592" fy="562.99506" r="5.9967934"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3711-7" id="radialGradient3739-3" cx="288.94055" cy="577.95142" fx="288.94055" fy="577.95142" r="1.2844789" gradientTransform="matrix(1.1719452,0.0481994,-0.12453532,3.1453612,22.305156,-1253.771)" gradientUnits="userSpaceOnUse"/>
+    <linearGradient inkscape:collect="always" id="linearGradient3711-7">
+      <stop style="stop-color:#53e1ff;stop-opacity:1;" offset="0" id="stop3713-8"/>
+      <stop style="stop-color:#53e1ff;stop-opacity:0;" offset="1" id="stop3715-2"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient4188" id="radialGradient4194" cx="343.45349" cy="578.40057" fx="343.45349" fy="578.40057" r="6.5527597" gradientTransform="matrix(1.0098243,1.0314263,-1.7978462,1.8284117,1041.0412,-837.25268)" gradientUnits="userSpaceOnUse"/>
+    <linearGradient y2="22.401928" x2="106.24998" y1="22.901928" x1="143.49998" gradientTransform="matrix(1.2113408,0,0,1.2113407,182.53634,525.19736)" gradientUnits="userSpaceOnUse" id="linearGradient6058" xlink:href="#linearGradient5507-3" inkscape:collect="always"/>
+    <linearGradient id="linearGradient5507-3">
+      <stop style="stop-color:#ff0000;stop-opacity:1;" offset="0" id="stop5509-1"/>
+      <stop style="stop-color:#ff6600;stop-opacity:1" offset="1" id="stop5511-9"/>
+    </linearGradient>
+    <linearGradient y2="22.401928" x2="106.24998" y1="22.901928" x1="143.49998" gradientTransform="matrix(1.2113408,0,0,1.2113407,182.53634,525.19736)" gradientUnits="userSpaceOnUse" id="linearGradient7423" xlink:href="#linearGradient5507-3" inkscape:collect="always"/>
+    <linearGradient id="linearGradient7425">
+      <stop style="stop-color:#ff0000;stop-opacity:1;" offset="0" id="stop7427"/>
+      <stop style="stop-color:#ff6600;stop-opacity:1" offset="1" id="stop7429"/>
+    </linearGradient>
+    <linearGradient y2="22.401928" x2="106.24998" y1="22.901928" x1="143.49998" gradientTransform="matrix(1.2113409,0,0,1.2113407,208.97128,529.26847)" gradientUnits="userSpaceOnUse" id="linearGradient7433" xlink:href="#linearGradient5507-3" inkscape:collect="always"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient5507-3" id="linearGradient3187" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.66768777,0,0,0.66768766,249.27622,537.99469)" x1="143.49998" y1="22.901928" x2="106.24998" y2="22.401928"/>
+    <linearGradient inkscape:collect="always" xlink:href="#linearGradient3258-6" id="linearGradient3264-6" x1="300.60361" y1="544.72681" x2="354.51379" y2="598.80414" gradientUnits="userSpaceOnUse"/>
+    <linearGradient inkscape:collect="always" id="linearGradient3258-6">
+      <stop style="stop-color:#26c0e4;stop-opacity:1" offset="0" id="stop3260-3"/>
+      <stop style="stop-color:#009be6;stop-opacity:1" offset="1" id="stop3262-0"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3479-0" id="radialGradient4111-9" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0.62249559,-0.66686048,1.0807302,1.0479273,-476.5318,206.44403)" cx="349.59592" cy="562.99506" fx="349.59592" fy="562.99506" r="5.9967933"/>
+    <linearGradient id="linearGradient3479-0">
+      <stop id="stop3481-8" offset="0" style="stop-color:#005e96;stop-opacity:1"/>
+      <stop style="stop-color:#006bab;stop-opacity:1" offset="0.55290782" id="stop3483-0"/>
+      <stop id="stop3485-1" offset="1" style="stop-color:#16afe5;stop-opacity:1"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3469-1" id="radialGradient3467-5" cx="316.90671" cy="550.9397" fx="316.90671" fy="550.9397" r="3.2352531" gradientTransform="matrix(0.56847698,0.55122442,-0.86018562,0.92148696,610.66295,-131.43075)" gradientUnits="userSpaceOnUse"/>
+    <linearGradient id="linearGradient3469-1">
+      <stop style="stop-color:#0069a4;stop-opacity:1" offset="0" id="stop3471-0"/>
+      <stop id="stop3473-3" offset="0.62723601" style="stop-color:#006bab;stop-opacity:1"/>
+      <stop style="stop-color:#16b0e5;stop-opacity:1" offset="1" id="stop3475-9"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient4296-8" id="radialGradient3465-5" cx="304.59238" cy="576.44403" fx="304.59238" fy="576.44403" r="7.866148" gradientTransform="matrix(0.76699112,0.33797369,-0.65057603,1.5336199,445.57079,-410.2301)" gradientUnits="userSpaceOnUse"/>
+    <linearGradient id="linearGradient4296-8">
+      <stop id="stop4298-9" offset="0" style="stop-color:#0068af;stop-opacity:1"/>
+      <stop style="stop-color:#006bab;stop-opacity:1" offset="0.65370244" id="stop4300-6"/>
+      <stop id="stop4302-2" offset="1" style="stop-color:#16b0e5;stop-opacity:1"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3497-7" id="radialGradient3487-5" cx="348.92651" cy="597.21527" fx="348.92651" fy="597.21527" r="27.162861" gradientTransform="matrix(0.3909718,0.43756795,-2.4916173,2.3125644,1692.1431,-933.55267)" gradientUnits="userSpaceOnUse"/>
+    <linearGradient id="linearGradient3497-7">
+      <stop style="stop-color:#005e96;stop-opacity:1" offset="0" id="stop3499-6"/>
+      <stop id="stop3501-3" offset="0.30073237" style="stop-color:#006bab;stop-opacity:1"/>
+      <stop style="stop-color:#16afe5;stop-opacity:1" offset="1" id="stop3503-8"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3703-9" id="radialGradient3709-5" cx="343.47229" cy="614.76147" fx="343.47229" fy="614.76147" r="18.21089" gradientTransform="matrix(3.5311082,-1.7278711,0.20305564,0.43105154,-994.19633,937.70847)" gradientUnits="userSpaceOnUse"/>
+    <linearGradient inkscape:collect="always" id="linearGradient3703-9">
+      <stop style="stop-color:#53e1ff;stop-opacity:1;" offset="0" id="stop3705-3"/>
+      <stop style="stop-color:#53e1ff;stop-opacity:0;" offset="1" id="stop3707-0"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3711-5" id="radialGradient3717-2" cx="362.10602" cy="577.11127" fx="362.10602" fy="577.11127" r="1.8832989" gradientTransform="matrix(8.1481487,-5.9318526,2.3638508,3.372883,-3952.5926,778.81887)" gradientUnits="userSpaceOnUse"/>
+    <linearGradient inkscape:collect="always" id="linearGradient3711-5">
+      <stop style="stop-color:#53e1ff;stop-opacity:1;" offset="0" id="stop3713-1"/>
+      <stop style="stop-color:#53e1ff;stop-opacity:0;" offset="1" id="stop3715-5"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3711-5" id="radialGradient3739-7" cx="288.94055" cy="577.95142" fx="288.94055" fy="577.95142" r="1.2844789" gradientTransform="matrix(1.1719452,0.0481994,-0.12453532,3.1453612,22.305156,-1253.771)" gradientUnits="userSpaceOnUse"/>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient4188-9" id="radialGradient4194-7" cx="343.45349" cy="578.40057" fx="343.45349" fy="578.40057" r="6.5527596" gradientTransform="matrix(1.0098243,1.0314263,-1.7978462,1.8284117,1041.0412,-837.25268)" gradientUnits="userSpaceOnUse"/>
+    <linearGradient id="linearGradient4188-9">
+      <stop style="stop-color:#08a3e6;stop-opacity:1" offset="0" id="stop4190-4"/>
+      <stop id="stop4196-1" offset="0.75918519" style="stop-color:#08a3e6;stop-opacity:1"/>
+      <stop style="stop-color:#016ead;stop-opacity:1" offset="1" id="stop4192-7"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3703-9" id="radialGradient3517" gradientUnits="userSpaceOnUse" gradientTransform="matrix(3.5311082,-1.7278711,0.20305564,0.43105154,-994.19633,937.70847)" cx="343.47229" cy="614.76147" fx="343.47229" fy="614.76147" r="18.21089"/>
+  </defs>
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="4.5390625" inkscape:cx="114.45855" inkscape:cy="59.690241" inkscape:document-units="px" inkscape:current-layer="g4793" showgrid="false" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="1280" inkscape:window-height="780" inkscape:window-x="-8" inkscape:window-y="-8" inkscape:window-maximized="1" inkscape:snap-global="false" showguides="true" inkscape:guide-bbox="true"/>
+  <metadata id="metadata3765">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-288.98475,-535.52559)">
+    <g id="g4793" transform="matrix(0.96766596,0,0,0.94944363,10.181651,28.771222)">
+      <text xml:space="preserve" style="font-size:26.70750427px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient3187);fill-opacity:1;stroke:none;font-family:StoneSerITCStd Medium;-inkscape-font-specification:StoneSerITCStd Medium" x="312.53961" y="554.12061" id="text5503" sodipodi:linespacing="125%" transform="scale(0.99053965,1.0095507)"><tspan sodipodi:role="line" id="tspan5505" x="312.53961" y="554.12061" style="font-size:4.00612593px;fill:url(#linearGradient3187);fill-opacity:1">Created by Falzar FZ</tspan></text>
+      <g transform="translate(0.00152892,0.01017347)" id="g3264">
+        <path style="fill:#010101;fill-opacity:1;stroke:none" d="m 325.12487,533.76805 c -12.04619,0.12786 -23.83129,6.47825 -30.10708,16.8382 -9.98334,15.47574 -9.2208,37.5796 3.10803,51.55872 7.91058,8.9416 20.14109,13.52621 31.99522,12.68526 12.96871,-0.25474 25.57911,-7.74217 31.66968,-19.25774 5.39871,-9.43832 6.92244,-20.84042 4.7256,-31.45827 -2.298,-13.99137 -13.54381,-26.2257 -27.38604,-29.44165 -4.60618,-0.8471 -9.33291,-0.96193 -14.00541,-0.92452 z" id="path3048" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccccccccssccccc" inkscape:connector-curvature="0" id="path3145" d="m 329.88599,534.82609 c -5.56596,-0.11419 -15.21291,3.26596 -19.12396,5.04863 3.12484,-2.19454 5.79848,-3.84761 6.92882,-4.82316 -4.86717,0.58915 -10.88914,1.52377 -18.40678,9.41093 -7.35667,6.54181 -7.20755,14.81733 -6.22553,16.68028 0.38786,0.73581 1.31524,-2.2891 2.60287,-3.33027 0.78412,7.50265 -1.90903,16.62544 -1.35934,24.07715 0.99437,5.93651 3.23908,8.72084 5.55404,12.00372 0.4492,5.4792 0.39461,7.45622 4.99275,11.23594 12.07138,6.93759 17.5996,9.69169 27.35451,9.77282 5.27652,-0.31919 15.13155,-3.79847 19.10213,-7.02703 9.02465,-7.33807 14.92286,-17.49475 13.26733,-27.22849 -0.26872,-1.58 1.73714,3.11489 2.06325,1.50077 1.76172,-5.95164 0.005,-15.30426 -1.71264,-20.26763 -2.79318,-7.85221 -8.32489,-10.37294 -15.29301,-18.80026 -2.20536,-2.30672 -4.67073,-4.39974 -10.41954,-6.58402 -2.03618,-1.1538 -6.9747,-2.151 -9.3249,-1.66938 z" style="fill:url(#linearGradient3264-6);fill-opacity:1;stroke:none"/>
+        <path sodipodi:nodetypes="sssss" inkscape:connector-curvature="0" id="path3339" d="m 345.24588,557.39427 c -5.21865,0.33707 0.4045,8.22951 1.83736,10.55349 2.3188,3.76094 7.36229,1.74355 7.90002,-2.35066 0.50908,-3.8761 -1.42506,-8.59568 -5.14411,-7.68492 -0.60461,0.14807 -3.97295,-0.55797 -4.59327,-0.51791 z" style="fill:url(#radialGradient4111-9);fill-opacity:1;stroke:none"/>
+        <path sodipodi:nodetypes="sss" inkscape:connector-curvature="0" id="path3341" d="m 318.17033,547.66277 c -4.39993,0.0406 -7.18565,8.5667 -0.5186,6.10927 1.91509,-0.70589 4.22511,-6.14344 0.5186,-6.10927 z" style="fill:url(#radialGradient3467-5);fill-opacity:1;stroke:none"/>
+        <path sodipodi:nodetypes="ssssss" inkscape:connector-curvature="0" id="path3343" d="m 307.54699,564.01915 c -4.95047,2.50372 -8.03782,7.73897 -10.59883,12.55889 -1.85272,3.48688 -2.00959,8.80878 1.00045,11.40183 2.4949,2.14928 9.04917,0.079 10.50812,-3.26391 4.24477,-9.7261 2.91597,-16.69276 1.60034,-18.24001 -0.75878,-0.89238 -1.37187,-3.03245 -2.51008,-2.4568 z" style="fill:url(#radialGradient3465-5);fill-opacity:1;stroke:none"/>
+        <path sodipodi:nodetypes="ccccccccccccccc" style="fill:url(#radialGradient3487-5);fill-opacity:1;stroke:none" d="m 361.8826,559.26603 c -2.41508,3.30408 -1.93143,7.8378 -3.40591,11.57961 -1.6496,4.2746 -3.51792,8.79073 -7.56233,11.33818 -6.32899,3.31265 -5.24575,0.52613 -10.46283,-1.21999 -3.46818,-0.006 -5.87011,3.23019 -7.69238,5.86282 -2.84612,3.98201 -4.51354,9.04185 -8.35654,12.1027 -3.97896,2.97281 -8.79662,4.53738 -13.07855,6.93137 -1.2868,1.30661 0.61634,2.87511 1.7645,3.37079 4.12711,2.36811 8.97523,2.03089 13.52942,1.67743 7.4485,-0.51948 14.80316,-3.04658 21.09858,-7.11004 2.89375,-2.52091 6.43571,-4.47896 8.75729,-7.58064 1.63382,-4.45435 4.12636,-8.84572 3.91912,-13.79948 0.15507,-4.1226 -0.0208,-8.56443 2.53727,-12.01686 1.73294,-2.67364 3.33218,-6.25421 1.4262,-9.27427 -0.56842,-0.86076 -1.47104,-1.63859 -2.47384,-1.86162 z" id="path3410" inkscape:connector-curvature="0"/>
+        <path style="fill:url(#radialGradient3517);fill-opacity:1;stroke:none" d="m 358.05902,595.44717 c -6.4693,7.00349 -17.56173,16.30017 -36.42178,16.05538 1.83564,1.99741 7.03568,1.21626 9.49511,1.17729 8.5417,-1.30659 24.89403,-8.20669 26.92667,-17.23267 z" id="path3563" inkscape:connector-curvature="0" sodipodi:nodetypes="cccc"/>
+        <path style="fill:url(#radialGradient3717-2);fill-opacity:1;stroke:none" d="m 364.58921,569.21704 c -3.80525,3.27884 -4.04647,13.23384 -3.60507,15.61239 0.97995,-3.60758 1.71247,-9.0971 3.60507,-15.61239 z" id="path3565" inkscape:connector-curvature="0" sodipodi:nodetypes="ccc"/>
+        <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" id="path3719" d="m 288.61547,580.7792 c 2.56263,0.26563 2.18451,-4.10153 2.13511,-5.56824 -3.67048,-3.24718 -2.40921,3.45206 -2.13511,5.56824 z" style="fill:url(#radialGradient3739-7);stroke:none"/>
+        <path sodipodi:nodetypes="ccc" inkscape:connector-curvature="0" id="path3719-6" d="m 345.93033,583.72173 c 7.74025,2.61755 13.36733,-6.35566 13.09612,-14.83118 -2.3917,6.43469 -4.78409,9.22394 -13.09612,14.83118 z" style="fill:url(#radialGradient4194-7);fill-opacity:1;stroke:none"/>
+        <g style="fill:#ffffff;fill-opacity:1" transform="matrix(1.0587556,0,0,1.0587556,-111.43738,-29.537832)" id="g3106">
+          <path style="fill:#ffffff;fill-opacity:1;stroke:none" d="m 422.74886,567.73734 c 3.41933,-0.16258 7.77669,-2.61433 9.52776,-4.27806 1.75108,-1.66372 0.89589,-2.53943 -0.95828,-3.48779 -3.22432,0.70099 -9.90773,4.13611 -13.08557,5.50961 -1.10003,0.96205 -0.0437,-9.77457 -1.26266,-12.5507 -1.38132,-3.09251 -2.90444,-2.54525 -3.6608,-0.22437 -0.611,6.7259 -0.0319,36.6463 -0.0119,42.73497 1.40327,2.55043 2.50857,2.28341 4.07542,0.15453 1.10564,-3.79223 -0.76782,-28.76456 1.3208,-26.15355 4.73789,3.32941 8.27349,8.41545 11.56228,12.71954 2.8671,3.75222 7.02161,13.41369 15.29504,3.34561 -4.32278,4.2e-4 -7.83086,-2.05512 -15.15298,-9.80773" id="path3061" inkscape:connector-curvature="0" sodipodi:nodetypes="cscccccccscc"/>
+          <path style="fill:#ffffff;fill-opacity:1;stroke:none" d="m 394.65047,565.57755 c -0.9882,0.46071 -1.01279,2.8546 -0.39646,3.09634 5.21444,0.13614 9.84726,-0.13094 12.85159,0.10649 -5.01503,10.46534 -9.61862,14.79609 -18.90105,16.38429 2.26911,8.80284 11.96793,1.04504 14.38112,-2.06343 2.81543,-3.62661 7.97553,-8.12728 9.07251,-17.58816 -6.61799,-0.14362 -11.26133,-0.0948 -17.00771,0.0645 z" id="path3063" inkscape:connector-curvature="0" sodipodi:nodetypes="ccccscc"/>
+        </g>
+        <g transform="matrix(1.0173912,0,0,1.0173912,-65.943687,-13.145721)" style="fill:#ffffff;fill-opacity:1" id="g3184">
+          <path style="fill:#ffffff;fill-opacity:1;stroke:none" d="m 359.8794,545.45839 c -0.11838,0.25585 0.0458,0.56803 0.37153,0.54659 0.79146,0.15493 1.03947,1.00638 1.24081,1.63716 0.85644,2.65461 1.6413,5.33986 2.44398,8.01337 0.20201,0.12435 0.61871,0.0842 0.82666,-0.0272 1.01486,-2.52989 1.99396,-5.07345 3.03357,-7.5939 1.03185,2.51717 1.98308,5.07483 3.02592,7.58121 0.19695,0.18398 0.54609,0.10922 0.78241,0.0743 1.05035,-3.01632 1.97573,-6.07725 3.07396,-9.0786 0.16411,-0.41605 0.62534,-0.54285 1.01121,-0.70881 0.20184,-0.14496 0.20443,-0.59425 -0.15379,-0.4804 -1.06509,0.0165 -2.1452,-0.0325 -3.20111,0.024 -0.18236,0.21747 0.03,0.5807 0.34244,0.53253 0.38832,-0.006 0.97087,0.20668 0.88625,0.65987 -0.25112,1.16499 -0.68239,2.3051 -1.02169,3.45512 -0.33327,1.02498 -0.64822,2.04896 -1.01031,3.06378 -1.02082,-2.50152 -2.01096,-5.01366 -3.01438,-7.5214 -0.1836,-0.0928 -0.68047,-0.22368 -0.74278,0.0743 -0.9896,2.48275 -1.9614,4.99219 -2.96365,7.45802 -0.61605,-2.09306 -1.31551,-4.17206 -1.82632,-6.28686 -0.0752,-0.27433 -0.1023,-0.65391 0.24032,-0.78133 0.24979,-0.19065 0.8095,-0.019 0.84971,-0.40244 0.0905,-0.44696 -0.51868,-0.22371 -0.78819,-0.27555 -1.1241,0.0162 -2.26306,-0.0323 -3.37796,0.024 l -0.0287,0.0122 z" id="path3114" inkscape:connector-curvature="0"/>
+          <path style="fill:#ffffff;fill-opacity:1;stroke:none" d="m 379.34418,545.28618 c -1.26221,3.06284 -2.43926,6.18347 -3.81101,9.20006 -0.1869,0.40635 -0.61762,0.6484 -1.05817,0.76501 -0.20454,0.14826 -0.14587,0.59198 0.19508,0.47496 0.92995,-0.0239 1.88241,0.0479 2.79817,-0.0363 0.14086,-0.26424 -0.0814,-0.52595 -0.37639,-0.53659 -0.44759,-0.0993 -0.54818,-0.59904 -0.3703,-0.9426 0.20096,-0.6049 0.44007,-1.21496 0.66194,-1.82014 1.28544,0 2.5709,0 3.85635,0 0.24688,0.81614 0.67438,1.59828 0.74485,2.4455 -0.0314,0.40544 -0.59358,0.27425 -0.86113,0.44776 -0.15729,0.1707 -0.0913,0.55092 0.23056,0.44233 1.15486,-0.0162 2.32493,0.0322 3.47036,-0.024 0.15426,-0.21356 -0.0315,-0.56014 -0.3372,-0.55429 -0.5889,-0.13837 -0.65205,-0.79731 -0.88415,-1.22337 -1.10599,-2.84799 -2.11997,-5.73717 -3.18108,-8.60393 -0.27432,-0.14169 -0.76283,-0.0695 -1.07788,-0.0344 z m 0.14583,1.91977 c 0.49263,1.47154 1.02739,2.9856 1.46607,4.45048 -1.09307,0.0476 -2.19165,0.0446 -3.28488,0.007 0.60636,-1.48184 1.19856,-2.9992 1.81881,-4.45772 z" id="path3116" inkscape:connector-curvature="0"/>
+          <path style="fill:#ffffff;fill-opacity:1;stroke:none" d="m 385.36437,545.45839 c -0.16011,0.72138 -0.31655,1.45696 -0.43332,2.18627 0.13772,0.28408 0.59292,0.0938 0.65956,-0.16135 0.32504,-0.64004 0.81077,-1.40132 1.6585,-1.41762 0.52216,-0.0416 1.04694,-0.0225 1.57029,-0.0272 -0.0213,2.8754 0.0478,5.75291 -0.0478,8.62697 0.0146,0.42441 -0.54362,0.52377 -0.89176,0.50783 -0.31129,-0.0376 -0.49799,0.41376 -0.23774,0.55291 1.36658,-0.016 2.74783,0.032 4.10526,-0.024 0.17406,-0.2008 0.0113,-0.54109 -0.28977,-0.50533 -0.34594,-0.0352 -0.92892,-0.0783 -0.89541,-0.53453 -0.0963,-2.87291 -0.0262,-5.7495 -0.0479,-8.62384 0.75549,0.0535 1.60162,-0.14073 2.28355,0.24654 0.53597,0.35001 0.74543,0.958 1.12548,1.42488 0.16989,0.16366 0.54945,0.039 0.42948,-0.21573 -0.1448,-0.6581 -0.20919,-1.35107 -0.37503,-1.9936 -0.32586,-0.12778 -0.74902,-0.0234 -1.10705,-0.0654 -2.47392,-0.0224 -4.94802,-0.01 -7.42202,-0.0131 l -0.0558,0.024 -0.0286,0.0122 z" id="path3118" inkscape:connector-curvature="0"/>
+          <path style="fill:#ffffff;fill-opacity:1;stroke:none" d="m 395.51,545.45839 c -0.11447,0.22369 0.0164,0.51865 0.30415,0.50397 0.32778,0.0481 0.92153,0.0637 0.90782,0.49834 0.0755,2.61655 0.0525,5.23604 0.0238,7.85332 0.0151,0.30332 -0.0153,0.72025 -0.39599,0.80127 -0.27458,0.0991 -0.8559,-0.0576 -0.86659,0.368 -0.0485,0.43182 0.57707,0.17237 0.84554,0.24007 2.25289,-0.009 4.50577,-0.0174 6.75864,-0.0262 0.25051,-0.23028 0.15464,-0.68596 0.26615,-1.00497 0.0504,-0.54236 0.27408,-1.09009 0.2102,-1.63269 -0.18826,-0.25343 -0.54405,0.0189 -0.57199,0.25379 -0.26956,0.68441 -0.63661,1.50732 -1.47875,1.68049 -0.85602,0.16305 -1.80401,0.1756 -2.63994,-0.0616 -0.49488,-0.15211 -0.35756,-0.74808 -0.40442,-1.12752 -0.0164,-1.04472 -0.005,-2.08962 -0.009,-3.13442 0.65279,0.0545 1.34607,-0.0575 1.97422,0.13052 0.47339,0.1969 0.50352,0.74309 0.68677,1.1312 0.16282,0.17097 0.58056,0.095 0.46103,-0.1976 -0.0169,-0.96338 0.0337,-1.94059 -0.0254,-2.89531 -0.2354,-0.17949 -0.55522,0.0388 -0.54727,0.30869 -0.0531,0.50351 -0.52341,0.93017 -1.07243,0.88471 -0.49182,0.0251 -0.98468,0.0262 -1.47698,0.0396 0,-1.34451 0,-2.68902 0,-4.03353 0.85738,0.0272 1.74155,-0.0607 2.58446,0.0816 0.69294,0.27254 0.79186,1.06432 0.9546,1.66236 0.14929,0.204 0.68998,0.16814 0.56242,-0.16678 -0.026,-0.71998 0.0516,-1.46125 -0.0383,-2.16814 -1.60629,-0.0594 -3.23331,-0.008 -4.84755,-0.0254 -0.71828,0.0237 -1.46144,-0.0477 -2.16552,0.0363 z" id="path3120" inkscape:connector-curvature="0"/>
+          <path style="fill:#ffffff;fill-opacity:1;stroke:none" d="m 405.40896,545.34237 c -0.11684,0.26885 0.10022,0.56583 0.43803,0.52373 0.33504,0.0156 0.88136,0.0901 0.83137,0.49673 0.0874,2.72035 0.0499,5.44392 0.0135,8.1651 0.10297,0.44079 -0.53481,0.49827 -0.87031,0.52826 -0.28433,-0.0125 -0.52762,0.18365 -0.43303,0.44885 0.23963,0.23798 0.75251,0.0407 1.09733,0.10515 1.12744,-0.016 2.27045,0.0319 3.38814,-0.024 0.17204,-0.18595 0.0203,-0.52777 -0.28378,-0.50353 -0.37301,-0.0689 -1.03401,-0.0922 -1.03412,-0.5511 -0.0557,-1.1379 -0.0129,-2.27831 -0.0265,-3.41716 0.45824,0 0.91648,0 1.37473,0 0.91598,1.36159 1.93415,2.79827 2.95875,4.09697 0.38965,0.51481 1.1636,0.37678 1.75817,0.40279 0.23841,-0.043 0.66906,0.0656 0.76081,-0.19794 -0.12218,-0.30388 -0.54434,-0.41448 -0.7404,-0.68343 -1.10272,-1.07456 -1.91178,-2.36001 -2.83398,-3.55644 -0.14996,-0.1831 -0.37829,-0.40056 -0.005,-0.46802 1.19398,-0.487 2.0591,-1.60363 1.98051,-2.79175 0.0684,-0.84699 -0.39659,-1.69655 -1.21972,-2.13731 -1.11983,-0.61152 -2.73164,-0.41759 -3.98267,-0.47134 -1.04527,0.0119 -2.10585,-0.0328 -3.14133,0.0222 l -0.0304,0.0122 z m 3.99975,0.58917 c 0.64908,-0.0163 1.58146,0.0123 2.03481,0.47859 0.68732,0.71985 0.58241,1.75013 0.43852,2.62496 -0.15428,0.67007 -0.90029,1.3485 -1.71866,1.42306 -0.53583,0.0604 -1.09115,0.0866 -1.63376,0.0508 -0.0538,-1.53126 -0.025,-3.06373 -0.0326,-4.59551 0.30389,0.006 0.60781,0.0121 0.91171,0.0181 z" id="path3122" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccccccccccccccccc"/>
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/src/assets/WIND.svg b/src/assets/WIND.svg
new file mode 100644
index 0000000..79f9a50
--- /dev/null
+++ b/src/assets/WIND.svg
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="77.178001" height="77.482025" id="svg3164" version="1.1" inkscape:version="0.48.1 " sodipodi:docname="WIND 3.svg.svg">
+  <defs id="defs3166">
+    <linearGradient y2="22.401928" x2="106.24998" y1="22.901928" x1="143.49998" gradientTransform="matrix(0.55062059,0,0,0.55062049,86.41587,585.27548)" gradientUnits="userSpaceOnUse" id="linearGradient3130" xlink:href="#linearGradient5507-3" inkscape:collect="always"/>
+    <linearGradient id="linearGradient5507-3">
+      <stop style="stop-color:#ff0000;stop-opacity:1;" offset="0" id="stop5509-1"/>
+      <stop style="stop-color:#ff6600;stop-opacity:1" offset="1" id="stop5511-9"/>
+    </linearGradient>
+    <linearGradient y2="22.401928" x2="106.24998" y1="22.901928" x1="143.49998" gradientTransform="matrix(0.55062059,0,0,0.55062049,86.41587,585.27548)" gradientUnits="userSpaceOnUse" id="linearGradient3138" xlink:href="#linearGradient5507-3" inkscape:collect="always"/>
+    <linearGradient id="linearGradient3140">
+      <stop style="stop-color:#ff0000;stop-opacity:1;" offset="0" id="stop3142"/>
+      <stop style="stop-color:#ff6600;stop-opacity:1" offset="1" id="stop3144"/>
+    </linearGradient>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3111-5" id="radialGradient3127" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.5920383,1.7587151,-1.0880994,0.98497827,381.30244,-618.59873)" cx="287.78745" cy="537.69501" fx="287.78745" fy="537.69501" r="39.671757"/>
+    <linearGradient id="linearGradient3111-5">
+      <stop style="stop-color:#96cf6e;stop-opacity:1;" offset="0" id="stop3113-4"/>
+      <stop id="stop3134" offset="0.66444761" style="stop-color:#62b840;stop-opacity:1;"/>
+      <stop id="stop3119-9" offset="0.77443111" style="stop-color:#519b38;stop-opacity:1;"/>
+      <stop style="stop-color:#042500;stop-opacity:1;" offset="1" id="stop3115-5"/>
+    </linearGradient>
+    <linearGradient y2="22.401928" x2="106.24998" y1="22.901928" x1="143.49998" gradientTransform="matrix(0.55062059,0,0,0.55062049,226.3229,426.09964)" gradientUnits="userSpaceOnUse" id="linearGradient3162" xlink:href="#linearGradient5507-3" inkscape:collect="always"/>
+    <filter id="filter3229" inkscape:label="Simple blur" x="0" y="0" width="1" height="1" inkscape:menu="ABCs" inkscape:menu-tooltip="Simple Gaussian blur, same as the blur slider in Fill and Stroke dialog" color-interpolation-filters="sRGB">
+      <feTurbulence id="feTurbulence3231" numOctaves="1" baseFrequency="0.065432098765432101" result="result0" seed="179"/>
+      <feSpecularLighting id="feSpecularLighting3233" specularExponent="24.3" surfaceScale="2" specularConstant="1" result="result1">
+        <feDistantLight id="feDistantLight3235" elevation="45" azimuth="225"/>
+      </feSpecularLighting>
+      <feDiffuseLighting id="feDiffuseLighting3237" in="result0" surfaceScale="3" diffuseConstant="1.21" result="result2">
+        <feDistantLight id="feDistantLight3239" azimuth="225" elevation="42"/>
+      </feDiffuseLighting>
+      <feBlend id="feBlend3241" in2="SourceGraphic" mode="multiply" result="result91"/>
+      <feComposite id="feComposite3243" in2="result91" operator="arithmetic" in="result1" k2="1" k3="1" result="result92"/>
+      <feComposite id="feComposite3245" in2="SourceAlpha" operator="in" result="fbSourceGraphic"/>
+      <feGaussianBlur id="feGaussianBlur3019" stdDeviation="3" in="fbSourceGraphic"/>
+    </filter>
+    <radialGradient inkscape:collect="always" xlink:href="#linearGradient3111-5" id="radialGradient3021" gradientUnits="userSpaceOnUse" gradientTransform="matrix(1.5920383,1.7587151,-1.0880994,0.98497827,381.30244,-618.59873)" cx="287.78745" cy="537.69501" fx="287.78745" fy="537.69501" r="39.671757"/>
+  </defs>
+  <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="1.8027702" inkscape:cx="104.62715" inkscape:cy="97.29765" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" fit-margin-left="0.2" fit-margin-bottom="0.2" fit-margin-top="0.2" fit-margin-right="0.2" inkscape:window-width="1280" inkscape:window-height="780" inkscape:window-x="-8" inkscape:window-y="-8" inkscape:window-maximized="1"/>
+  <metadata id="metadata3169">
+    <rdf:RDF>
+      <cc:Work rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+        <dc:title/>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" transform="translate(-255.69671,-413.62117)">
+    <text sodipodi:linespacing="125%" id="text5503" y="439.39819" x="278.49414" style="font-size:22.02481842px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:url(#linearGradient3162);fill-opacity:1;stroke:none;font-family:StoneSerITCStd Medium;-inkscape-font-specification:StoneSerITCStd Medium" xml:space="preserve"><tspan style="font-size:3.30372286px;fill:url(#linearGradient3162);fill-opacity:1" y="439.39819" x="278.49414" id="tspan5505" sodipodi:role="line">Created by Falzar FZ</tspan></text>
+    <path style="fill:url(#radialGradient3127);fill-opacity:1;stroke:none" d="m 291.68403,413.82694 c -11.65669,0.1214 -23.06073,6.15074 -29.13359,15.98693 -9.66053,14.69334 -8.92265,35.67971 3.00754,48.95209 7.65479,8.48955 19.48984,12.84238 30.96067,12.04394 12.54938,-0.24186 24.75204,-7.35075 30.64568,-18.28413 5.22414,-8.96116 6.6986,-19.78681 4.5728,-29.86786 -2.2237,-13.28402 -13.10589,-24.89982 -26.50054,-27.95319 -4.45724,-0.80427 -9.03114,-0.91329 -13.55256,-0.87778 z" id="path3048" inkscape:connector-curvature="0"/>
+    <path inkscape:connector-curvature="0" id="path3227" d="m 291.68403,413.82694 c -11.65669,0.1214 -23.06073,6.15074 -29.13359,15.98693 -9.66053,14.69334 -8.92265,35.67971 3.00754,48.95209 7.65479,8.48955 19.48984,12.84238 30.96067,12.04394 12.54938,-0.24186 24.75204,-7.35075 30.64568,-18.28413 5.22414,-8.96116 6.6986,-19.78681 4.5728,-29.86786 -2.2237,-13.28402 -13.10589,-24.89982 -26.50054,-27.95319 -4.45724,-0.80427 -9.03114,-0.91329 -13.55256,-0.87778 z" style="fill:url(#radialGradient3021);fill-opacity:1;stroke:none;filter:url(#filter3229);opacity:0.6" transform="matrix(0.93105854,0,0,0.93105854,20.288486,31.186508)"/>
+    <g id="g3240" transform="matrix(0.96766596,0,0,0.94944363,-105.49421,-91.942401)" style="fill:#ffffff;fill-opacity:1">
+      <path sodipodi:nodetypes="cssccccccscsscccccccsscccccccccccccccccccccc" inkscape:connector-curvature="0" d="m 129.07417,25.414499 c -5.4854,1.898261 -14.18733,2.29332 -19.35269,2.455672 -3.5955,0.113009 -0.55689,3.661201 1.74092,3.322916 4.67322,-0.687993 6.82704,-0.254247 6.82704,-0.254247 l 0.0135,5.730395 -10.76021,-0.119822 -0.0668,13.852023 8.34652,-0.08248 c 0,0 -2.40736,5.088053 -6.24805,8.762852 -0.38876,1.235158 0.46396,2.050028 2.19179,2.053178 4.62454,0.0084 13.44698,-0.144463 17.73991,-0.382095 0.68995,-2.717179 -0.40475,-6.614112 -2.28087,-8.22101 -1.17409,-1.005608 -2.68167,-0.78684 -2.39762,0.78164 0.38705,2.137209 1.0323,4.13243 1.0323,4.13243 l -9.31429,-0.03159 c 0,0 2.01332,-3.38023 3.95024,-7.103972 3.9621,0.01504 11.38887,0.100971 11.38887,0.100971 l -0.006,-13.804928 -9.16404,-0.03564 0.0261,-6.289091 c 0,0 3.53579,-0.929078 8.07734,-1.805812 2.20334,-0.425349 -0.0364,-3.652462 -1.74439,-3.061385 z m -17.35904,14.309877 6.70345,-0.01127 -0.42361,6.687383 -6.22848,-0.02882 z m 16.62171,0 -0.11914,6.787891 -6.55343,-0.08355 0.53859,-6.640013 z M 99.695068,19.344908 c 0,0 0.127501,26.647808 0.06911,29.192672 -2.202665,6.936296 -6.967687,7.309558 -10.570679,9.761401 7.380595,11.602927 13.553811,-1.560331 15.324761,-12.558609 0.18502,-7.109434 0.0292,-22.617123 0.0292,-22.617123 l 30.2737,0.06453 c 0,0 -0.83117,20.922662 0.9239,27.614603 3.74097,13.687859 12.23936,16.656021 14.96905,6.004787 -4.46287,-1.439225 -6.76773,-0.864962 -9.98144,-6.502244 -2.15935,-8.393275 -1.02379,-31.04263 -1.02379,-31.04263 z" style="fill:#ffffff;fill-opacity:1;stroke:none" transform="matrix(1.0334145,0,0,1.0532484,288.11368,533.71242)" id="path3144"/>
+      <g transform="matrix(0.38534017,0,0,0.35107479,253.32033,352.34416)" id="g3234" style="fill:#ffffff;fill-opacity:1">
+        <path sodipodi:nodetypes="ccccccccccccccccccccccc" style="fill:#ffffff;fill-opacity:1;stroke:none" d="m 354.22112,533.39526 c -0.74279,0.1892 -2.00251,-0.3011 -2.47593,0.44958 0.11937,1.12862 1.80165,0.81449 2.37632,1.63879 1.97533,2.05255 2.11996,5.18145 3.11692,7.75404 1.96937,6.57779 3.63808,13.31152 5.64131,19.83708 1.6983,0.5415 2.71208,-0.86833 3.08125,-2.2533 2.51892,-6.80942 4.36365,-12.33588 6.97187,-19.10681 2.93122,7.45484 4.35551,13.80911 7.27333,21.23684 1.72587,0.72507 3.20643,-0.71584 3.49059,-2.15074 2.57613,-8.1494 4.79467,-16.46137 7.74149,-24.46146 0.49318,-1.29161 2.10757,-1.25154 2.82454,-2.25514 0.096,-1.00893 -1.48576,-0.51901 -2.06326,-0.68888 -2.27781,0.11868 -4.66375,-0.27552 -6.87995,0.22479 -0.49394,0.93735 1.12441,1.06913 1.68619,1.25448 1.32498,0.23952 2.01414,1.7101 1.38737,2.91501 -1.67222,6.10443 -3.39065,12.35727 -5.37162,18.27323 -3.01401,-7.25189 -5.47887,-14.81409 -8.37403,-22.09465 -1.6565,-0.55815 -1.96193,0.96632 -2.35633,2.24564 -2.47415,6.58379 -4.8202,13.47848 -7.44066,19.84176 -1.88446,-6.38523 -3.6434,-12.84861 -5.16529,-19.31742 -0.19351,-1.46181 1.39286,-2.00035 2.49726,-2.21889 0.82563,-0.237 0.38613,-1.30577 -0.39842,-1.05868 -2.50195,-0.14016 -5.04693,-0.0488 -7.56295,-0.0653 z" id="path3195" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccccccccccccc" style="fill:#ffffff;fill-opacity:1;stroke:none" d="m 399.06525,533.39526 c -0.73654,0.20129 -2.05716,-0.33009 -2.48303,0.48584 0.0938,1.2063 1.78794,0.69866 2.53995,1.21096 1.2465,0.58659 0.47022,2.38175 0.76018,3.45867 0.10664,7.37024 0.29537,14.78525 -0.0842,22.1311 -0.55306,1.28648 -2.25922,0.66009 -3.0878,1.45026 -0.60536,1.17193 0.74616,0.98877 1.5439,0.94266 3.13048,0 6.26096,0 9.39144,0 0.47347,-1.08213 0.82401,-1.45025 -1.05267,-1.45025 -1.02636,-0.0431 -1.93207,-0.85776 -1.72176,-1.97235 -0.11798,-7.75833 -0.17304,-15.54753 0.0356,-23.29111 -0.0295,-1.68546 1.49481,-1.43203 2.55388,-1.88533 0.63789,-0.4096 0.0501,-1.20632 -0.58341,-1.01518 -2.58489,-0.14118 -5.21306,-0.048 -7.81198,-0.0653 z" id="path3201" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="ccccccccccccccccccccccc" style="fill:#ffffff;fill-opacity:1;stroke:none" d="m 411.50181,533.39526 c -0.57153,0.0322 -2.06386,-0.14736 -1.6364,0.87741 0.79203,0.73067 2.12701,0.56962 2.92416,1.3995 0.93565,0.79999 2.20342,1.65526 1.78487,3.11802 -0.13222,7.03369 0.12174,14.10881 -0.33347,21.11575 -0.41509,1.49355 -2.24387,1.45766 -3.32258,2.13188 -0.48813,0.62774 -0.12801,1.39407 0.7684,1.03693 3.05458,0 6.10918,0 9.16377,0 0.46981,-1.08553 -0.81681,-1.50635 -1.65062,-1.47926 -1.63094,-0.0441 -2.83831,-1.46776 -2.71361,-3.11739 -0.19124,-6.52754 0.15471,-13.09457 0.15071,-19.63712 6.52617,7.8054 11.31177,15.86114 18.04573,23.47239 -0.73615,0.82351 3.42677,1.32021 3.09422,-0.0435 0.0645,-8.37044 -0.13827,-16.77858 0.22728,-25.12568 0.24026,-1.6448 1.91563,-2.17762 3.25854,-2.61047 0.57208,-0.29589 0.40741,-1.24929 -0.32727,-1.07319 -3.07429,-0.0489 -6.25197,-0.26185 -9.29895,0.11602 -0.68955,0.56863 0.41481,1.35829 1.03874,1.18921 1.46997,0.064 3.30022,0.86235 3.1376,2.67573 0.28189,6.2235 0.007,10.67796 0.0427,16.91971 -6.23214,-7.5884 -10.04471,-13.59438 -16.31284,-21.13842 -1.8925,0.004 -6.14843,0.15724 -8.04088,0.17224 z" id="path3203" inkscape:connector-curvature="0"/>
+        <path sodipodi:nodetypes="cccccccccccccccccccc" style="fill:#ffffff;fill-opacity:1;stroke:none" d="m 445.68808,533.40252 c -0.54283,-0.0364 -2.28842,-0.0591 -1.55812,0.90641 0.91801,0.69443 3.0838,0.27429 3.01987,1.91365 0.25646,8.1436 0.35317,16.36196 0.0181,24.50276 -0.59037,1.13616 -2.13865,0.74248 -3.09492,1.1457 -0.31654,0.53989 -0.22876,1.56782 0.65456,1.20371 5.84564,-0.17245 11.82487,0.49812 17.54493,-0.98617 6.14071,-1.76884 10.59755,-7.99985 10.4006,-14.49523 0.46476,-5.1212 -2.18259,-10.47169 -6.8717,-12.5883 -4.33519,-2.18253 -9.30264,-1.27151 -13.95903,-1.57077 -2.05125,-0.0265 -4.10291,-0.053 -6.15431,-0.0318 z m 10.77773,1.4285 c 3.38831,0.0495 4.82503,0.33981 7.12231,3.22682 3.3326,3.51181 3.39216,8.89108 2.92415,13.47288 -0.64065,4.28046 -3.29256,8.50871 -7.64121,9.49192 -2.33177,0.48412 -2.34332,0.70137 -4.64639,0.0435 -1.87111,-1.09237 -1.1065,-3.71044 -1.34014,-5.53987 -0.0827,-6.93911 -0.0883,-13.87908 -0.13973,-20.81853 1.24034,0.0411 2.48067,0.0822 3.72101,0.12328 z" id="path3205" inkscape:connector-curvature="0"/>
+      </g>
+    </g>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/src/components.d.ts b/src/components.d.ts
index dc5167e..153ce41 100644
--- a/src/components.d.ts
+++ b/src/components.d.ts
@@ -12,12 +12,15 @@ declare module 'vue' {
     Avatar: typeof import('primevue/avatar')['default']
     Badge: typeof import('primevue/badge')['default']
     Button: typeof import('primevue/button')['default']
+    Card: typeof import('primevue/card')['default']
     CardFilterPanel: typeof import('./components/CardFilterPanel.vue')['default']
     CardListComponent: typeof import('./components/CardListComponent.vue')['default']
     CardListExpansion: typeof import('./components/CardListExpansion.vue')['default']
     CardTable: typeof import('./components/CardTable.vue')['default']
     Carousel: typeof import('primevue/carousel')['default']
+    Checkbox: typeof import('primevue/checkbox')['default']
     Column: typeof import('primevue/column')['default']
+    CustomTag: typeof import('./components/CustomTag.vue')['default']
     DataTable: typeof import('primevue/datatable')['default']
     DataView: typeof import('primevue/dataview')['default']
     DeckIcon: typeof import('./components/DeckIcon.vue')['default']
@@ -28,21 +31,27 @@ declare module 'vue' {
     IconField: typeof import('primevue/iconfield')['default']
     Image: typeof import('primevue/image')['default']
     InputIcon: typeof import('primevue/inputicon')['default']
+    InputNumber: typeof import('primevue/inputnumber')['default']
     InputText: typeof import('primevue/inputtext')['default']
     LinkArrowsComponent: typeof import('./components/LinkArrowsComponent.vue')['default']
     Listbox: typeof import('primevue/listbox')['default']
     Menubar: typeof import('primevue/menubar')['default']
+    MonsterCardTypeTag: typeof import('./components/MonsterCardTypeTag.vue')['default']
     MultiSelect: typeof import('primevue/multiselect')['default']
     Panel: typeof import('primevue/panel')['default']
+    ProgressBar: typeof import('primevue/progressbar')['default']
     Rating: typeof import('primevue/rating')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
     RouterView: typeof import('vue-router')['RouterView']
     ScrollPanel: typeof import('primevue/scrollpanel')['default']
+    SelectButton: typeof import('primevue/selectbutton')['default']
+    Slider: typeof import('primevue/slider')['default']
     SplitButton: typeof import('primevue/splitbutton')['default']
     Splitter: typeof import('primevue/splitter')['default']
     SplitterPanel: typeof import('primevue/splitterpanel')['default']
     TabPanel: typeof import('primevue/tabpanel')['default']
     Tag: typeof import('primevue/tag')['default']
+    Textarea: typeof import('primevue/textarea')['default']
     VirtualScroller: typeof import('primevue/virtualscroller')['default']
   }
 }
diff --git a/src/components/CardFilterPanel.vue b/src/components/CardFilterPanel.vue
index fd9a66d..cf3458c 100644
--- a/src/components/CardFilterPanel.vue
+++ b/src/components/CardFilterPanel.vue
@@ -1,88 +1,216 @@
 <template>
-  <Panel
-      header="Search"
-  >
 
-    <FloatLabel variant="in">
-      <InputText
-          id="in_label"
-          v-model="searchValue"
-          @update="$emit('update:modelValue', $event.target.value)"
-          autocomplete="off"
-      />
-      <label for="in_label">Search by Card name</label>
-    </FloatLabel>
-
-    <div
-        class="flex flex-row gap-2 mt-4"
+  <Panel>
+    <ScrollPanel
+        class="w-full"
+        style="height: 800px"
     >
-      <!-- Card Subtype-->
-      <Listbox
-          class="w-30"
-          v-model="selectedCardTypes"
-          :options="cardTypes"
-          multiple
-          optionLabel="name"
-      />
 
-      <!-- Monster Card Subtype-->
-      <Listbox
-          class="w-30"
-          v-model="selectedMonsterCardTypes"
-          :options="monsterCardTypes"
-          multiple
-          :disabled="!selectedCardTypes.map(type => type.name).includes('Monster')"
-      />
+      <FloatLabel variant="on" class="my-2">
+        <InputText
+            fluid
+            id="in_label"
+            v-model="filters.name"
+            @update:modelValue="updateEvent => updateField('name', updateEvent)"
+            autocomplete="off"
+        />
+        <label for="in_label">Search by Card name</label>
+      </FloatLabel>
 
-      <!-- Trap Card Subtype-->
-      <Listbox
-          class="w-30"
-          v-model="selectedTrapCardTypes"
-          :options="trapCardTypes"
-          multiple
-          :disabled="!selectedCardTypes.map(type => type.name).includes('Trap')"
-      />
+      <div class="flex justify-center">
+        <FloatLabel variant="on" class="w-full">
+          <Textarea id="description" class="w-full" rows="5" cols="30" style="resize: none"/>
+          <label for="description">Search by Card description</label>
+        </FloatLabel>
+      </div>
 
-      <!-- Spell Card Subtype-->
-      <Listbox
-          class="w-30"
-          v-model="selectedSpellCardTypes"
-          :options="spellCardTypes"
-          multiple
-          :disabled="!selectedCardTypes.map(type => type.name).includes('Spell')"
-      />
-    </div>
+      <Divider/>
+
+      <!-- Generic / General -->
+      <div
+          class="flex flex-row mt-4 justify-center"
+      >
+        <SelectButton
+            v-model="filters.cardTypes"
+            @update:modelValue="updateEvent => updateField('cardTypes', updateEvent)"
+            :options="cardTypes"
+            multiple
+            aria-labelledby="multiple"
+        />
+      </div>
+
+      <Divider/>
+
+      <div class="flex">
+        <div class="flex flex-col gap-4 justify-center items-center">
+          <SelectButton
+              :options="monsterCardTypes"
+              v-model="filters.monsterCardTypes"
+              @update:modelValue="updateEvent => updateField('monsterCardType', updateEvent)"
+              multiple
+              size="large"
+              aria-labelledby="custom"
+              :pt="{
+                pcToggleButton: {
+                  root: 'px-1'
+                }
+              }"
+
+          >
+            <template #option="slotProps" class="">
+              <MonsterCardTypeTag
+                  class="m-0 gap-0"
+                  :cardSubType="slotProps.option"
+                  size="small"
+              />
+            </template>
+          </SelectButton>
+
+          <SelectButton
+              :options="monsterCardSubTypes"
+              v-model="filters.monsterCardSubTypes"
+              @update:modelValue="updateEvent => updateField('monsterCardSubTypes', updateEvent)"
+              multiple
+              aria-labelledby="multiple"
+          />
+
+          <SelectButton
+              :options="monsterAttributes"
+              v-model="filters.attributes"
+              @update:modelValue="updateEvent => updateField('attributes', updateEvent)"
+              multiple
+              size="large"
+              aria-labelledby="custom"
+              class="mb-2"
+              :pt="{
+                pcToggleButton: {
+                  root: 'px-1'
+                }
+              }"
+
+          >
+            <template #option="slotProps" class="">
+              <img
+                  class="size-5"
+                  alt="Attribute Icon"
+                  :src="'/src/assets/' + slotProps.option + '.svg'"
+              >
+            </template>
+          </SelectButton>
+
+          <div class="flex items-center gap-4">
+            <div class="flex flex-col w-fit justify-start">
+              <Fieldset legend="Attack" class="max-w-fit">
+                <div class="flex flex-col gap-4">
+                  <Slider range class="w-56"/>
+                  <div class="flex justify-around gap-4">
+                    <Fluid class="w-18">
+                      <InputNumber
+                          v-model="filters.attackMin"
+                          size="small"
+                          :max="10000"
+                          fluid
+                          inputId="integeronly"
+                      />
+                    </Fluid>
+                    <Fluid class="w-18">
+                      <InputNumber
+                          v-model="filters.attackMax"
+                          size="small"
+                          :max="10000"
+                          inputId="integeronly"/>
+                    </Fluid>
+                  </div>
+                </div>
+              </Fieldset>
+
+              <Fieldset legend="Defense" class="w-fit">
+                <div class="flex flex-col gap-4">
+                  <Slider range class="w-56"/>
+                  <div class="flex justify-around gap-4">
+                    <Fluid class="w-18">
+                      <InputNumber size="small" :max="10000" fluid inputId="integeronly"/>
+                    </Fluid>
+                    <Fluid class="w-18">
+                      <InputNumber size="small" :max="10000" fluid inputId="integeronly"/>
+                    </Fluid>
+                  </div>
+                </div>
+              </Fieldset>
+            </div>
+
+            <div class="flex flex-col w-fit justify-start">
+              <Fieldset legend="Release Date / From" class="w-fit">
+                <DatePicker showIcon fluid iconDisplay="input" />
+              </Fieldset>
+
+              <Fieldset legend="Release Date / To" class="w-fit">
+                <DatePicker showIcon fluid iconDisplay="input" />
+              </Fieldset>
+            </div>
+          </div>
+
+
+
+
+        </div>
+        <div class="flex justify-center items-center w-full">
+          <LinkArrowsComponent
+              class=""
+              v-model="linkArrows"
+          />
+        </div>
+      </div>
+
+      <Divider/>
+    </ScrollPanel>
   </Panel>
 </template>
 
 <script setup lang="ts">
-import {computed, type Ref, ref, watch} from "vue";
-import {MonsterCardType, SpellCardType, TrapCardType} from "../api/openapi";
+import {type Ref, ref} from "vue";
+import {
+  Attribute, type CardServiceGetCardPageRequest,
+  MonsterCardSubType,
+  MonsterCardType,
+  SpellCardType,
+  TrapCardType
+} from "../api/openapi";
 
-type StringCardType = {
-  name: 'Monster' | 'Trap' | 'Spell'
-};
-
-const searchValue: Ref<string> = defineModel({
+const filters: Ref<CardServiceGetCardPageRequest> = defineModel({
   required: true,
 })
 
-const selectedCardTypes: Ref<StringCardType[]> = ref([]);
+const emit = defineEmits(['update:modelValue', 'search'])
+
+const linkArrows = ref([])
+
+const selectedCardTypes: Ref<string[]> = ref([]);
 const selectedMonsterCardTypes: Ref<string[]> = ref([]);
+const selectedMonsterCardSubTypes: Ref<string[]> = ref([]);
+const selectedMonsterAttributes: Ref<string[]> = ref([]);
 const selectedSpellCardTypes: Ref<string[]> = ref([]);
 const selectedTrapCardTypes: Ref<string[]> = ref([]);
 
-
-const cardTypes = ref([
-  {name: 'Monster'},
-  {name: 'Trap'},
-  {name: 'Spell'}
+const cardTypes: Ref<string[]> = ref([
+  'MONSTER',
+  'SPELL',
+  'TRAP'
 ]);
 
+
 const monsterCardTypes: Ref<string[]> = ref(
     Object.values(MonsterCardType)
 );
 
+const monsterAttributes: Ref<string[]> = ref(
+    Object.values(Attribute)
+)
+
+const monsterCardSubTypes: Ref<string[]> = ref(
+    Object.values(MonsterCardSubType)
+);
+
 const spellCardTypes: Ref<string[]> = ref(
     Object.values(SpellCardType)
 );
@@ -90,6 +218,13 @@ const spellCardTypes: Ref<string[]> = ref(
 const trapCardTypes: Ref<string[]> = ref(
     Object.values(TrapCardType)
 );
+
+const updateField = (field: string, value?: any) => {
+  emit('update:modelValue', {
+    ...filters.value,
+    [field]: value
+  })
+}
 </script>
 
 <style scoped>
diff --git a/src/components/CardListComponent.vue b/src/components/CardListComponent.vue
index 85fa175..6abd62f 100644
--- a/src/components/CardListComponent.vue
+++ b/src/components/CardListComponent.vue
@@ -12,7 +12,7 @@
         </div>
         <Tag
             :value="getCardType(props.card)"
-            :severity="getCardTypeSeverity(props.card.cardType)"
+            :severity="getCardSeverity(props.card.cardType)"
         ></Tag>
       </div>
       <div class="flex flex-col md:items-end gap-8">
@@ -27,7 +27,7 @@
 <script setup lang="ts">
 
 import type {Card} from "../api/openapi";
-import {getCardType, getCardTypeSeverity} from "../util/card-type-util.ts";
+import {getCardType, getCardSeverity} from "../util/card-type-util.ts";
 
 interface Props {
   card: Card
diff --git a/src/components/CardListExpansion.vue b/src/components/CardListExpansion.vue
index c5eb925..eee450a 100644
--- a/src/components/CardListExpansion.vue
+++ b/src/components/CardListExpansion.vue
@@ -8,7 +8,7 @@
         </Tab>
         <Tab
             :disabled="card.cardPrints.length === 0"
-            value="2"
+            value="1"
             as="div"
             class="flex items-center gap-2"
         >
@@ -22,44 +22,54 @@
           <div class="flex flex-row">
             <div class="flex flex-col justify-around ml-4 mt-2 w-[20%]">
               <div class="flex items-center gap-2">
-                <i class="pi pi-star"/>
-                <Tag severity="danger" :value="card.subType"/>
+                <i class="size-5 text-center pi pi-star"/>
+                <Tag severity="danger" :value="card.type"/>
               </div>
 
               <!-- Monster Card properties-->
               <template v-if="isMonsterCard(card)">
+                <div class="flex items-center gap-2" v-if="card.subTypes.length > 0">
+                  <i class="size-5 text-center pi pi-asterisk"/>
+                  <Tag severity="danger" :value="getFormattedMonsterCardSubTypes(card)"/>
+                </div>
                 <div class="flex items-center gap-2">
-                  <i class="pi pi-asterisk"/>
+                  <img
+                      class="size-5"
+                      alt="Attribute Icon"
+                      :src="'/src/assets/' + card.attribute + '.svg'"
+                  >
                   <Tag severity="danger" :value="card.attribute"/>
                 </div>
                 <div class="flex items-center gap-2">
-                  <i class="pi pi-asterisk"/>
+                  <i class="size-5 text-center pi pi-asterisk"/>
                   <Tag severity="danger" :value="card.monsterType"/>
                 </div>
                 <div class="flex items-center gap-2" v-if="card.attack">
-                  <i class="pi pi-shield"/>
+                  <span class="material-icons size-5 right-0.5 relative" style="font-size: 1.3rem">
+                    fitness_center
+                  </span>
                   <Tag severity="danger" :value="card.attack + ' ATK'"/>
                 </div>
                 <div class="flex items-center gap-2" v-if="card.defense">
-                  <i class="pi pi-shield"/>
+                  <i class="size-5 text-center pi pi-shield mt-1"/>
                   <Tag severity="danger" :value="card.defense + ' DEF'"/>
                 </div>
                 <div class="flex items-center gap-2" v-if="card.level">
-                  <i class="pi pi-star"/>
+                  <i class="size-5 text-center pi pi-star"/>
                   <Tag severity="danger" :value="'Level ' + card.level"/>
                 </div>
 
                 <!-- Monster Card Mutations -->
                 <template v-if="card.isPendulum">
                   <div class="flex items-center gap-2">
-                    <i class="pi pi-star"/>
+                    <i class="size-5 text-center pi pi-star"/>
                     <Tag severity="danger" :value="card.pendulumScale + ' Pendulum Scale'"/>
                   </div>
                 </template>
 
-                <template v-if="card.subType === 'LINK'">
+                <template v-if="card.type === 'LINK'">
                   <div class="flex items-center gap-2">
-                    <i class="pi pi-star"/>
+                    <i class="size-5 text-center pi pi-star"/>
                     <Tag severity="danger" :value="card.linkValue + ' Link Value'"/>
                   </div>
 
@@ -99,7 +109,7 @@
             </div>
           </div>
         </TabPanel>
-        <TabPanel value="2">
+        <TabPanel value="1">
           <ul>
             <li v-for="cardPrint in card.cardPrints">
               {{ cardPrint.id }} - {{ cardPrint.name }}
@@ -117,11 +127,18 @@ import TabPanels from "primevue/tabpanels";
 import TabPanel from "primevue/tabpanel";
 import Tab from "primevue/tab";
 import TabList from "primevue/tablist";
-import {type Card} from "../api/openapi";
+import {type Card, type MonsterCard} from "../api/openapi";
 import type {Ref} from "vue";
 import {isMonsterCard} from "../util/card-type-util.ts";
 
 const card: Ref<Card> = defineModel({
   required: true
 })
+
+const getFormattedMonsterCardSubTypes = (monsterCard: MonsterCard) => {
+  const subTypeArray = [
+      ...monsterCard.subTypes
+  ]
+  return subTypeArray.join(" / ")
+}
 </script>
\ No newline at end of file
diff --git a/src/components/CardTable.vue b/src/components/CardTable.vue
index 23820a6..60cb47b 100644
--- a/src/components/CardTable.vue
+++ b/src/components/CardTable.vue
@@ -44,19 +44,25 @@
         </p>
       </template>
     </Column>
-    <Column field="type" header="Type" filter>
+    <Column header="Variant" filter>
       <template #body="slotProps">
         <Tag
+            v-if="slotProps.data.cardType !== 'FUSION'"
             :value="slotProps.data.cardType"
-            :severity="getCardTypeSeverity(slotProps.data.cardType)"
-        ></Tag>
+            :severity="getCardSeverity(slotProps.data.cardType)"
+        />
+        <CustomTag
+            v-else
+            color="purple"
+            :value="slotProps.data.cardType"
+        />
       </template>
     </Column>
-    <Column field="subType" header="Subtype">
+    <Column header="Type">
       <template #body="slotProps">
         <Tag
-            :value="slotProps.data.subType"
-            :severity="getCardSubtypeSeverity(slotProps.data)"
+            :value="slotProps.data.type"
+            :severity="getCardTypeSeverity(slotProps.data)"
         ></Tag>
       </template>
     </Column>
@@ -70,7 +76,7 @@
 <script setup lang="ts">
 import {inject, onMounted, ref, type Ref} from "vue";
 import {type Card, CardService} from "../api/openapi";
-import {getCardSubtypeSeverity, getCardTypeSeverity} from "../util/card-type-util.ts";
+import {getCardTypeSeverity, getCardSeverity} from "../util/card-type-util.ts";
 import {CardServiceKey} from "../main.ts";
 import type {
   DataTableFilterEvent,
@@ -92,10 +98,10 @@ const expandedCardRows: Ref<Card[]> = ref([]);
 
 const getGetCardPage = async (page: number, pageSize: number): Promise<void> => {
   loading.value = true;
-  const cardPage = (await cardService.getCardPage(
-      null,
-      page,
-      pageSize
+  const cardPage = (await cardService.getCardPage({
+        page: page,
+        pageSize: pageSize
+      }
   )).data
 
   cards.value = cardPage.content
diff --git a/src/components/CustomTag.vue b/src/components/CustomTag.vue
new file mode 100644
index 0000000..c90ab1d
--- /dev/null
+++ b/src/components/CustomTag.vue
@@ -0,0 +1,34 @@
+<template>
+  <Tag
+      :value="value"
+      :class="[colorClass, sizeClass]"
+  />
+</template>
+
+<script setup lang="ts">
+import {computed} from "vue";
+
+const props = defineProps({
+  value: String,
+  color: {
+    type: String,
+    default: 'purple', // Default custom color
+    validator: (val: string) => ['purple'].includes(val)
+  },
+  size: {
+    type: String,
+    default: 'normal',
+    validator: (val: string) => ['small', 'normal', 'large'].includes(val)
+  }
+});
+
+const colorClass = computed(() => `custom-tag-${props.color}`);
+const sizeClass = computed(() => `size-${props.size}`);
+</script>
+
+<style scoped>
+.custom-tag-purple {
+  background: var(--p-violet-950);
+  color: var(--p-violet-300);
+}
+</style>
\ No newline at end of file
diff --git a/src/components/LinkArrowsComponent.vue b/src/components/LinkArrowsComponent.vue
index 6f05e83..47f41c4 100644
--- a/src/components/LinkArrowsComponent.vue
+++ b/src/components/LinkArrowsComponent.vue
@@ -15,15 +15,15 @@
       <span :class="arrowClass('LEFT')">
         west
       </span>
-      <span :class="arrowClass('LEFT')"/>
+      <span :class="arrowClass('LEFT')" class="!text-2xl"/>
       <span :class="arrowClass('RIGHT')">
         east
       </span>
     </div>
     <div class="flex flex-row">
-      <span :class="arrowClass('BOTTOM_LEFT')">
+      <i :class="arrowClass('BOTTOM_LEFT')">
         south_west
-      </span>
+      </i>
       <span :class="arrowClass('BOTTOM')">
         south
       </span>
diff --git a/src/components/MonsterCardTypeTag.vue b/src/components/MonsterCardTypeTag.vue
new file mode 100644
index 0000000..898ab70
--- /dev/null
+++ b/src/components/MonsterCardTypeTag.vue
@@ -0,0 +1,47 @@
+<template>
+  <Tag
+      v-if="requiresCustomization.includes(props.cardSubType)"
+      :value="cardSubType"
+      :class="[colorClass]"
+  />
+  <Tag
+      v-else
+      :value="props.cardSubType"
+      :severity="getSeverityFromMonsterCardType(props.cardSubType)"
+  />
+</template>
+
+<script setup lang="ts">
+import {computed} from "vue";
+import {MonsterCardType} from "../api/openapi";
+import {getSeverityFromMonsterCardType} from "../util/card-type-util.ts";
+
+const requiresCustomization: string[] = [
+    MonsterCardType.Fusion,
+    MonsterCardType.Xyz,
+]
+
+interface Props {
+  cardSubType: MonsterCardType,
+  size?: "small" | "normal" | "large"
+}
+
+const props = defineProps<Props>()
+
+const colorClass = computed(() => `custom-tag-${props.cardSubType.toLowerCase()}`);
+</script>
+
+<style scoped>
+.custom-tag-fusion {
+  background: var(--p-violet-950);
+  color: var(--p-violet-300);
+}
+.custom-tag-xyz {
+  background: var(--p-slate-950);
+  color: var(--p-slate-300);
+}
+.custom-tag-counter {
+  background: var(--p-purple-800);
+  color: var(--p-slate-100);
+}
+</style>
\ No newline at end of file
diff --git a/src/main.ts b/src/main.ts
index ff8cdbc..e0a5803 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,10 +1,18 @@
-import {createApp} from 'vue'
 import './style.css'
+
+import {createApp} from 'vue'
 import App from './App.vue'
 import PrimeVue from 'primevue/config';
 import Aura from '@primeuix/themes/aura';
-import {CardPrintService, CardService, DeckService, SetService} from "./api/openapi";
-import {ToastService} from "primevue";
+import {CardPrintService, CardService, DeckService, JobService, SetService} from "./api/openapi";
+import {
+  Accordion,
+  AccordionContent,
+  AccordionHeader,
+  AccordionPanel,
+  DatePicker, Fluid,
+  ToastService
+} from "primevue";
 import {createPinia} from "pinia";
 import {createRouter, createWebHistory, type Router, type RouteRecordRaw} from "vue-router";
 import HomeView from "./views/HomeView.vue";
@@ -16,18 +24,60 @@ import Callback from "./views/Callback.vue";
 import {useAuthStore} from "./stores/auth.ts";
 import axiosInstance from "./api";
 import SetsView from "./views/set/SetsView.vue";
+import JobsView from "./views/JobsView.vue";
+import {definePreset} from "@primeuix/themes";
 
 export const DeckServiceKey = Symbol("deckServiceKey")
 export const CardServiceKey = Symbol("cardServiceKey")
 export const SetServiceKey = Symbol("setServiceKey")
 export const CardPrintServiceKey = Symbol("cardPrintServiceKey")
+export const JobServiceKey = Symbol("jobServiceKey")
 
 const pinia = createPinia();
 
+const MyPreset = definePreset(Aura, {
+  semantic: {
+    colorScheme: {
+      light: {
+        surface: {
+          0: '#ffffff',
+          50: '{zinc.50}',
+          100: '{zinc.100}',
+          200: '{zinc.200}',
+          300: '{zinc.300}',
+          400: '{zinc.400}',
+          500: '{zinc.500}',
+          600: '{zinc.600}',
+          700: '{zinc.700}',
+          800: '{zinc.800}',
+          900: '{zinc.900}',
+          950: '{zinc.950}'
+        }
+      },
+      dark: {
+        surface: {
+          0: "#ffffff",
+          50: "#f3f3f3",
+          100: "#e7e7e8",
+          200: "#cfd0d0",
+          300: "#b7b8b9",
+          400: "#9fa1a1",
+          500: "#87898a",
+          600: "#6e7173",
+          700: "#565a5b",
+          800: "#3e4244",
+          900: "#262b2c",
+          950: "#0e1315"
+        }
+      }
+    }
+  }
+});
+
 const app = createApp(App);
 app.use(PrimeVue, {
   theme: {
-    preset: Aura,
+    preset: MyPreset,
     options: {
       cssLayer: {
         name: 'primevue',
@@ -39,6 +89,13 @@ app.use(PrimeVue, {
 
 app.use(pinia);
 
+app.component('Accordion', Accordion)
+app.component('AccordionPanel', AccordionPanel)
+app.component('AccordionHeader', AccordionHeader)
+app.component('AccordionContent', AccordionContent)
+app.component('DatePicker', DatePicker)
+app.component('Fluid', Fluid)
+
 const authStore = useAuthStore();
 authStore.initialize();
 const userManager = authStore.userManager;
@@ -49,13 +106,14 @@ userManager.events.addAccessTokenExpired(async() => {
 
 const routes: RouteRecordRaw[] = [
   {path: '/', component: HomeView},
-  {path: '/cards', component: CardsView, meta: {requiresAuth: true}},
+  {path: '/cards', component: CardsView, meta: {requiresAuth: false}},
   {path: '/cards/:id', component: CardView, meta: {requiresAuth: true}},
   {path: '/decks', component: DecksView, meta: {requiresAuth: true}},
   {path: '/decks/:id', component: DeckView, meta: {requiresAuth: true}},
   {path: '/sets', component: SetsView},
   {path: '/sets/:id', component: DeckView, meta: {requiresAuth: true}},
-  {path: '/callback', component: Callback}
+  {path: '/callback', component: Callback},
+  {path: '/jobs', component: JobsView}
 ]
 
 const router: Router = createRouter({
@@ -80,10 +138,12 @@ const deckService: DeckService = new DeckService(undefined, "http://localhost:80
 const cardService: CardService = new CardService(undefined, "http://localhost:8080", axiosInstance)
 const setService: SetService = new SetService(undefined, "http://localhost:8080", axiosInstance)
 const cardPrintService: CardPrintService = new CardPrintService(undefined, "http://localhost:8080", axiosInstance)
+const jobService: JobService = new JobService(undefined, "http://localhost:8080", axiosInstance)
 
 app.provide(DeckServiceKey, deckService)
 app.provide(CardServiceKey, cardService)
 app.provide(SetServiceKey, setService)
 app.provide(CardPrintServiceKey, cardPrintService)
+app.provide(JobServiceKey, jobService)
 
 app.mount('#app');
\ No newline at end of file
diff --git a/src/style.css b/src/style.css
index 9376946..25a86bb 100644
--- a/src/style.css
+++ b/src/style.css
@@ -2,30 +2,11 @@
 @import "tailwindcss-primeui";
 @import 'primeicons/primeicons.css';
 
-:root {
+body {
   font-family: system-ui, Avenir, Helvetica, Arial, sans-serif;
-  line-height: 1.5;
-  font-weight: 400;
-
-  color-scheme: light dark;
-  color: rgba(255, 255, 255, 0.87);
-  background-color: #242424;
-
+  font-size: 14px;
   font-synthesis: none;
   text-rendering: optimizeLegibility;
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
-}
-
-@media (prefers-color-scheme: light) {
-  :root {
-    color: #213547;
-    background-color: #ffffff;
-  }
-  a:hover {
-    color: #747bff;
-  }
-  button {
-    background-color: #f9f9f9;
-  }
-}
+}
\ No newline at end of file
diff --git a/src/util/card-type-util.ts b/src/util/card-type-util.ts
index c1ee964..0ff48fd 100644
--- a/src/util/card-type-util.ts
+++ b/src/util/card-type-util.ts
@@ -1,12 +1,14 @@
 import type {
   Card,
   CardType,
-  MonsterCard,
+  MonsterCard, MonsterCardSubType,
   MonsterCardType,
   SpellCard, SpellCardType,
   TrapCard, TrapCardType
 } from "../api/openapi";
 
+type CardSubTypes = MonsterCardType | TrapCardType | SpellCardType
+
 export const getCardType = (card: Card) => {
   switch (card.cardType) {
     case "MONSTER":
@@ -33,18 +35,18 @@ export const isSpellCard = (card: Card): card is SpellCard => {
 }
 
 export const getMonsterCardType = (monsterCard: MonsterCard) => {
-  return `${monsterCard.subType} MONSTER `
+  return `${monsterCard.type} MONSTER `
 }
 
 export const getSpellCardType = (spellCard: SpellCard) => {
-  return `${spellCard.subType} SPELL`
+  return `${spellCard.type} SPELL`
 }
 
 export const getTrapCardType = (trapCard: TrapCard) => {
-  return `${trapCard.subType} TRAP`
+  return `${trapCard.type} TRAP`
 }
 
-export const getCardTypeSeverity = (cardType: CardType): string => {
+export const getCardSeverity = (cardType: CardType): string => {
   switch (cardType) {
     case "MONSTER":
       return "warn"
@@ -57,14 +59,14 @@ export const getCardTypeSeverity = (cardType: CardType): string => {
   }
 }
 
-export const getCardSubtypeSeverity = (card: Card) => {
+export const getCardTypeSeverity = (card: Card) => {
   switch (card.cardType) {
     case "MONSTER":
-      return getSeverityFromMonsterCardType((card as MonsterCard).subType)
+      return getSeverityFromMonsterCardType((card as MonsterCard).type)
     case "SPELL":
-      return getSeverityFromSpellCardType((card as SpellCard).subType)
+      return getSeverityFromSpellCardType((card as SpellCard).type)
     case "TRAP":
-      return getSeverityFromTrapCardType((card as TrapCard).subType)
+      return getSeverityFromTrapCardType((card as TrapCard).type)
     default:
       return "CONSTRAST"
   }
@@ -75,17 +77,17 @@ export const getSeverityFromMonsterCardType = (monsterCardType: MonsterCardType)
     case 'NORMAL':
       return "secondary"
     case 'EFFECT':
-      return "secondary"
+      return "warn"
     case 'RITUAL':
       return "info"
     case 'FUSION':
       return "info"
     case 'SYNCHRO':
-      return "warn"
+      return "contrast"
     case 'XYZ':
       return "danger"
     case 'LINK':
-      return "contrast"
+      return "info"
   }
 }
 
diff --git a/src/views/JobsView.vue b/src/views/JobsView.vue
new file mode 100644
index 0000000..fe665d0
--- /dev/null
+++ b/src/views/JobsView.vue
@@ -0,0 +1,49 @@
+<template>
+  <div class="flex flex-col gap-2 m-4">
+    <div
+        class="w-96"
+        v-for="job in jobs"
+    >
+      <Tag :severity="getJobSeverity(job)" :value="job.status"/>
+      <ProgressBar :value="getCompletionPercentage(job)"/>
+    </div>
+  </div>
+
+</template>
+
+<script setup lang="ts">
+
+import {type JobDto, JobService} from "../api/openapi";
+import {inject, onMounted, type Ref, ref} from "vue";
+import {JobServiceKey} from "../main.ts";
+
+const jobService: JobService = inject(JobServiceKey) as JobService;
+
+const jobs: Ref<Array<JobDto>> = ref([])
+
+const getJobSeverity = (job: JobDto) => {
+  switch (job.status) {
+    case "COMPLETED":
+      return "success";
+    case "FAILED":
+      return "danger"
+    case "PENDING":
+      return "primary";
+    case "PROCESSING":
+      return "info";
+  }
+}
+
+const getCompletionPercentage = (job: JobDto) => {
+  if (job.totalJobs && job.completedJobs) {
+    return Math.round((job.completedJobs / job.totalJobs) * 100)
+  } else {
+    return 100
+  }
+}
+
+onMounted(async () => {
+  jobs.value = (await jobService.getAllJobs()).data
+  console.log(jobs.value)
+})
+</script>
diff --git a/src/views/card/CardsView.vue b/src/views/card/CardsView.vue
index 54592e9..799767b 100644
--- a/src/views/card/CardsView.vue
+++ b/src/views/card/CardsView.vue
@@ -1,83 +1,92 @@
 <template>
-  <div class="flex w-full">
-    <DataTable
-        class="mt-4 ml-4 w-[60%]"
-        tableStyle="min-width: 50rem"
-        dataKey="id"
-        paginator
-        lazy
-        removableSort
-        :expandedRows="expandedCardRows"
-        :value="cards"
-        :loading="loading"
-        :first="first"
-        :globalFilterFields="['name']"
-        :rows="5"
-        :rowsPerPageOptions="[5, 10, 20, 50]"
-        :totalRecords="totalRecords"
-        paginatorTemplate="RowsPerPageDropdown FirstPageLink PrevPageLink CurrentPageReport NextPageLink LastPageLink"
-        currentPageReportTemplate="{first} to {last} of {totalPages} page(s)"
-        @page="handlePaging"
-        @sort="handleSorting"
-        @filter="handleFiltering"
-        @rowSelect="handleRowSelect"
-    >
-      <Column expander style="width: 5rem" />
-      <Column header="Image">
-        <template #body>
-          <Image alt="Image" preview>
-            <template #previewicon>
-              <i class="pi pi-search"></i>
-            </template>
-            <template #image>
-              <img src="https://upload.wikimedia.org/wikipedia/en/2/2b/Yugioh_Card_Back.jpg" alt="image" width="75" />
-            </template>
-            <template #preview="slotProps">
-              <img src="https://upload.wikimedia.org/wikipedia/en/2/2b/Yugioh_Card_Back.jpg" alt="preview" :style="slotProps.style" @click="slotProps.onClick" />
-            </template>
-          </Image>
-          <!--        <Avatar image="https://upload.wikimedia.org/wikipedia/en/2/2b/Yugioh_Card_Back.jpg" class="mr-2" size="xlarge" shape="circle" />-->
+  <div class="flex w-full min-h-content">
+    <Panel class="min-w-content m-4">
+      <DataTable
+          class="my-4 ml-4 w-full"
+          tableStyle="min-width: 50rem"
+          dataKey="id"
+          paginator
+          lazy
+          removableSort
+          :expandedRows="expandedCardRows"
+          :value="cards"
+          :loading="loading"
+          :first="first"
+          :globalFilterFields="['name']"
+          :rows="5"
+          :rowsPerPageOptions="[5, 10, 20, 50]"
+          :totalRecords="totalRecords"
+          paginatorTemplate="RowsPerPageDropdown FirstPageLink PrevPageLink CurrentPageReport NextPageLink LastPageLink"
+          currentPageReportTemplate="{first} to {last} of {totalPages} page(s)"
+          @page="handlePaging"
+          @sort="handleSorting"
+          @filter="handleFiltering"
+          @rowSelect="handleRowSelect"
+      >
+        <Column expander style="width: 5rem" />
+        <Column header="Image">
+          <template #body>
+            <Image alt="Image" preview>
+              <template #previewicon>
+                <i class="pi pi-search"></i>
+              </template>
+              <template #image>
+                <img src="https://upload.wikimedia.org/wikipedia/en/2/2b/Yugioh_Card_Back.jpg" alt="image" width="75" />
+              </template>
+              <template #preview="slotProps">
+                <img src="https://upload.wikimedia.org/wikipedia/en/2/2b/Yugioh_Card_Back.jpg" alt="preview" :style="slotProps.style" @click="slotProps.onClick" />
+              </template>
+            </Image>
+            <!--        <Avatar image="https://upload.wikimedia.org/wikipedia/en/2/2b/Yugioh_Card_Back.jpg" class="mr-2" size="xlarge" shape="circle" />-->
+          </template>
+        </Column>
+        <Column field="name" header="Name">
+          <template #body="slotProps">
+            <p class="font-bold">
+              {{slotProps.data.name}}
+            </p>
+          </template>
+        </Column>
+        <Column header="Card Type" filter>
+          <template #body="slotProps">
+            <Tag
+                :value="slotProps.data.cardType"
+                :severity="getCardSeverity(slotProps.data.cardType)"
+            ></Tag>
+          </template>
+        </Column>
+        <Column header="Type">
+          <template #body="slotProps">
+            <Tag
+                v-if="slotProps.data.type !== 'FUSION'"
+                :value="slotProps.data.type"
+                :severity="getCardTypeSeverity(slotProps.data)"
+            />
+            <CustomTag
+                v-else
+                color="purple"
+                :value="slotProps.data.type"
+            />
+          </template>
+        </Column>
+        <template #expansion="slotProps">
+          <CardListExpansion v-model="slotProps.data"/>
         </template>
-      </Column>
-      <Column field="name" header="Name">
-        <template #body="slotProps">
-          <p class="font-bold">
-            {{slotProps.data.name}}
-          </p>
-        </template>
-      </Column>
-      <Column field="type" header="Type" filter>
-        <template #body="slotProps">
-          <Tag
-              :value="slotProps.data.cardType"
-              :severity="getCardTypeSeverity(slotProps.data.cardType)"
-          ></Tag>
-        </template>
-      </Column>
-      <Column field="subType" header="Subtype">
-        <template #body="slotProps">
-          <Tag
-              :value="slotProps.data.subType"
-              :severity="getCardSubtypeSeverity(slotProps.data)"
-          ></Tag>
-        </template>
-      </Column>
-      <template #expansion="slotProps">
-        <CardListExpansion v-model="slotProps.data"/>
-      </template>
-      <template #footer> In total there are {{ cards ? cards.length : 0 }} cards. </template>
-    </DataTable>
+        <template #footer> In total there are {{ cards ? cards.length : 0 }} cards. </template>
+      </DataTable>
+    </Panel>
+
     <CardFilterPanel
-        v-model="searchValue"
-        class="fixed right-0 w-[35%] m-4"
+        v-model="filters"
+        class="fixed right-0 w-[42%] m-4"
     />
   </div>
 </template>
 
 <script setup lang="ts">
 import CardFilterPanel from "../../components/CardFilterPanel.vue";
-import {getCardSubtypeSeverity, getCardTypeSeverity} from "../../util/card-type-util.ts";
-import {type Card, CardService} from "../../api/openapi";
+import {getCardTypeSeverity, getCardSeverity} from "../../util/card-type-util.ts";
+import {type Card, CardService, type CardServiceGetCardPageRequest} from "../../api/openapi";
 import {inject, onMounted, ref, type Ref, watch} from "vue";
 import {CardServiceKey} from "../../main.ts";
 import type {
@@ -87,6 +96,7 @@ import type {
   DataTableSortEvent
 } from "primevue";
 import {useDebounceFn} from "@vueuse/core";
+import type {MutableCardRequest} from "../../api/mutableTypes.ts";
 
 const cardService: CardService = inject(CardServiceKey) as CardService;
 
@@ -100,13 +110,42 @@ const first = ref(0);
 const expandedCardRows: Ref<Card[]> = ref([]);
 const searchValue: Ref<string> = ref("");
 
-const getGetCardPage = async (page: number, pageSize: number, cardName: string): Promise<void> => {
+const filters: Ref<MutableCardRequest> = ref({
+  name: null,
+  cardTypes: null,
+
+  monsterCardTypes: null,
+  attack: null,
+  attackMax: null,
+  attackMin: null,
+  defense: null,
+  defenseMax: null,
+  defenseMin: null,
+  level: null,
+  levelMax: null,
+  levelMin: null,
+  isPendulum: null,
+  pendulumScale: null,
+  pendulumScaleMax: null,
+  pendulumScaleMin: null,
+  linkValue: null,
+  linkValueMin: null,
+  linkValueMax: null,
+  linkArrows: null,
+  monsterCardSubTypes: null,
+  attributes: null,
+
+  trapCardType: null,
+
+  spellCardType: null,
+
+  page: 0,
+  pageCount: 10
+})
+
+const getGetCardPage = async (filters: CardServiceGetCardPageRequest): Promise<void> => {
   loading.value = true;
-  const cardPage = (await cardService.getCardPage(
-      cardName,
-      page,
-      pageSize
-  )).data
+  const cardPage = (await cardService.getCardPage(filters)).data
 
   cards.value = cardPage.content
   pageCount.value = cardPage.totalPages!!
@@ -115,10 +154,9 @@ const getGetCardPage = async (page: number, pageSize: number, cardName: string):
 }
 
 const handlePaging = async (e: DataTablePageEvent) => {
-  page.value = e.page;
-  pageSize.value = e.rows
-  await getGetCardPage(page.value, pageSize.value, searchValue.value)
-
+  filters.value.page = e.page;
+  filters.value.pageSize = e.rows
+  await getGetCardPage(filters.value)
 }
 
 const handleSorting = (e: DataTableSortEvent) => {
@@ -136,15 +174,11 @@ const handleRowSelect = (e: DataTableRowSelectEvent) => {
 
 const debouncedGetCardPage = useDebounceFn(getGetCardPage, 150)
 
-watch(searchValue, async (newSearchValue) => {
-  await debouncedGetCardPage(
-      page.value,
-      pageSize.value,
-      newSearchValue
-  )
+watch(filters, async (newFiltersValue) => {
+  await debouncedGetCardPage(newFiltersValue)
 })
 
 onMounted(async () => {
-  await getGetCardPage(page.value, pageSize.value, searchValue.value)
+  await getGetCardPage(filters.value)
 })
 </script>
\ No newline at end of file