💅🏼 Formatting tweaks to tabs

💅🏼 Formatting improvements
🧲 Added visual indicators of torrent progress
2024-03-30 21:28:48 -04:00 · 2024-03-29 23:26:43 -04:00 · 2024-03-29 19:35:57 -04:00 · 2024-03-27 22:23:24 -05:00 · 2024-03-24 17:30:51 -04:00 · 2024-03-16 18:34:41 -04:00
110 changed files with 8470 additions and 9897 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@ comics/
 docs/
 userdata/
 dist/
+storybook-static/*
 src/client/assets/scss/App.css
 /server/
 node_modules/
--- a/.storybook/main.ts
+++ b/.storybook/main.ts
@@ -7,7 +7,6 @@ const config: StorybookConfig = {
    "@storybook/addon-essentials",
    "@storybook/addon-onboarding",
    "@storybook/addon-interactions",
-    "@storybook/addon-mdx-gfm"
  ],
  framework: {
    name: "@storybook/react-vite",
--- a/README.md
+++ b/README.md
@@ -6,14 +6,25 @@ ThreeTwo! _aims to be_ a comic book curation app.

 ### Screenshots

-![](https://github.com/rishighan/threetwo-visual-updates/raw/67e56878eb0381c73c1dea746a45253d3dcaa184/update_december_2022/Dashboard.png)
+#### Dashboard

-![](https://github.com/rishighan/threetwo-visual-updates/raw/67e56878eb0381c73c1dea746a45253d3dcaa184/update_december_2022/Library.png)
+![](https://raw.githubusercontent.com/rishighan/threetwo/ef05dee6005f683f1e4547631217681def9ebe86/screenshots/Dashboard.jpg)

-![](https://github.com/rishighan/threetwo-visual-updates/raw/67e56878eb0381c73c1dea746a45253d3dcaa184/update_december_2022/DC%2B%2B%20integration.png)
+#### Issue View

-![](https://github.com/rishighan/threetwo-visual-updates/raw/67e56878eb0381c73c1dea746a45253d3dcaa184/update_december_2022/ComicVine%20Matching.png)
+![](https://raw.githubusercontent.com/rishighan/threetwo/ef05dee6005f683f1e4547631217681def9ebe86/screenshots/ComicDetail.jpg)

+#### DC++ Search
+
+![](https://raw.githubusercontent.com/rishighan/threetwo/ef05dee6005f683f1e4547631217681def9ebe86/screenshots/DC%2B%2BSearching.jpg)
+
+#### Import
+
+![](https://raw.githubusercontent.com/rishighan/threetwo/ef05dee6005f683f1e4547631217681def9ebe86/screenshots/Import.jpg)
+
+#### Comic Vine Matching, Metadata Scraping
+
+![](https://raw.githubusercontent.com/rishighan/threetwo/ef05dee6005f683f1e4547631217681def9ebe86/screenshots/CVMatching.jpg)

 ### 🦄 Early Development Support Channel

@@ -28,7 +39,8 @@ ThreeTwo! currently is set up as:
 1. The UI, this repo.
 2. [threetwo-core-service](https://github.com/rishighan/threetwo-core-service)
 3. [threetwo-metadata-service](https://github.com/rishighan/threetwo-metadata-service)
-4. [threetwo-ui-typings](https://github.com/rishighan/threetwo-frontend-types) which are the types used across the UI, installable as an `npm` dependency.
+4. [threetwo-acquisition-service](https://github.com/rishighan/threetwo-acquisition-service)
+5. [threetwo-ui-typings](https://github.com/rishighan/threetwo-frontend-types) which are the types used across the UI, installable as an `npm` dependency.

 ## Docker Instructions

@@ -43,20 +55,18 @@ For debugging and troubleshooting, you can run this app locally using these step
 3. This will open `http://localhost:5173` in your default browser
 4. Note that this is simply the UI layer and won't offer anything beyond a scaffold. You have to spin up the microservices locally to get it to work.

-
 ## Troubleshooting
+
 ### Docker

 1. `docker-compose up` is taking a long time
-   
+
   This is primarily because `threetwo-import-service` pulls `calibre` from the CDN and it has been known to be extremely slow. I can't find a more reliable alternative, so give it some time to finish downloading.

 2. What folder do my comics go in?
-   
+
   Your comics go in the `comics` directory at the root of this project.
-   

 ## Contribution Guidelines

 See [contribution guidelines](https://github.com/rishighan/threetwo/blob/master/contributing.md)
-
--- a/index.html
+++ b/index.html
@@ -1,16 +1,14 @@
 <!DOCTYPE html>
 <html lang="en">
-
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta http-equiv="X-UA-Compatible" content="ie=edge">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta http-equiv="X-UA-Compatible" content="ie=edge" />
    <title>Three Two!</title>
-</head>
+  </head>

-<body>
+  <body class="dark:bg-slate-600">
    <div id="root"></div>
    <script type="module" src="/src/client/index.tsx"></script>
-</body>
-
-</html>
+  </body>
+</html>
--- a/jsdoc.json
+++ b/jsdoc.json
@@ -1,34 +1,25 @@
 {
-  "tags": {
-    "allowUnknownTags": true,
-    "dictionaries": [
-      "jsdoc",
-      "closure"
-    ]
-  },
-  "source": {
-    "include": [
-      "./src/client"
+    "tags": {
+        "allowUnknownTags": false
+    },
+    "source": {
+        "include": [
+          "./src/client"
+        ],
+        "includePattern": "\\.(jsx|js|ts|tsx)$"
+    },
+    "plugins": [
+        "plugins/markdown"
    ],
-    "includePattern": "\\.(jsx|js|ts|tsx)$"
-  },
-  "plugins": [
-    "better-docs/component",
-    "better-docs/category",
-    "plugins/markdown",
-    "node_modules/better-docs/typescript"
-  ],
-  "templates": {
-    "better-docs": {
-      "name": "ThreeTwo UI components"
+    "opts": {
+        "template": "node_modules/tui-jsdoc-template",
+        "encoding": "utf8",
+        "destination": "docs/",
+        "recurse": true,
+        "verbose": true
+    },
+    "templates": {
+        "cleverLinks": false,
+        "monospaceLinks": false
    }
-  },
-  "opts": {
-    "destination": "docs/",
-    "readme": "README.md",
-    "recurse": true,
-    "encoding": "utf8",
-    "verbose": true,
-    "template": "node_modules/better-docs"
-  }
 }
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
  "name": "threetwo",
-  "version": "0.0.2",
-  "description": "ThreeTwo! A comic book curator.",
+  "version": "0.1.0",
+  "description": "ThreeTwo! A good comic book curator.",
  "main": "server/index.js",
  "typings": "server/index.js",
  "scripts": {
@@ -15,24 +15,22 @@
  "author": "Rishi Ghan",
  "license": "MIT",
  "dependencies": {
-    "@bluelovers/fast-glob": "https://github.com/rishighan/fast-glob-v2-api.git",
-    "@dnd-kit/core": "^4.0.0",
-    "@dnd-kit/sortable": "^5.0.0",
-    "@dnd-kit/utilities": "^3.2.0",
+    "@dnd-kit/core": "^6.0.8",
+    "@dnd-kit/sortable": "^7.0.2",
+    "@dnd-kit/utilities": "^3.2.1",
    "@fortawesome/fontawesome-free": "^6.3.0",
-    "@redux-devtools/extension": "^3.2.2",
+    "@popperjs/core": "^2.11.8",
    "@rollup/plugin-node-resolve": "^15.0.1",
+    "@tanstack/react-query": "^5.0.5",
    "@tanstack/react-table": "^8.9.3",
    "@types/mime-types": "^2.1.0",
    "@types/react-router-dom": "^5.3.3",
-    "@vitejs/plugin-react": "^3.1.0",
+    "@vitejs/plugin-react": "^4.2.1",
    "airdcpp-apisocket": "^2.5.0-beta.2",
    "axios": "^1.3.4",
    "axios-cache-interceptor": "^1.0.1",
    "axios-rate-limit": "^1.3.0",
-    "babel-polyfill": "^6.26.0",
-    "babel-preset-minify": "^0.5.2",
-    "better-docs": "^2.7.2",
+    "babel-plugin-styled-components": "^2.1.4",
    "date-fns": "^2.28.0",
    "dayjs": "^1.10.6",
    "ellipsize": "^0.5.1",
@@ -40,55 +38,55 @@
    "filename-parser": "^1.0.2",
    "final-form": "^4.20.2",
    "final-form-arrays": "^3.0.2",
+    "focus-trap-react": "^10.2.3",
    "history": "^5.3.0",
    "html-to-text": "^8.1.0",
+    "immer": "^10.0.3",
    "jsdoc": "^3.6.10",
+    "keen-slider": "^6.8.6",
    "lodash": "^4.17.21",
-    "node-sass": "npm:sass",
    "pretty-bytes": "^5.6.0",
    "prop-types": "^15.8.1",
    "qs": "^6.10.5",
    "react": "^18.2.0",
    "react-collapsible": "^2.9.0",
    "react-comic-viewer": "^0.4.0",
-    "react-day-picker": "^8.6.0",
+    "react-day-picker": "^8.10.0",
    "react-dom": "^18.2.0",
    "react-fast-compare": "^3.2.0",
    "react-final-form": "^6.5.9",
    "react-final-form-arrays": "^3.1.4",
    "react-loader-spinner": "^4.0.0",
-    "react-masonry-css": "^1.0.16",
    "react-modal": "^3.15.1",
-    "react-redux": "^8.0.5",
+    "react-popper": "^2.3.0",
    "react-router": "^6.9.0",
    "react-router-dom": "^6.9.0",
-    "react-select": "^5.3.2",
+    "react-select": "^5.8.0",
    "react-select-async-paginate": "^0.7.2",
-    "react-slick": "^0.29.0",
    "react-sliding-pane": "^7.1.0",
-    "react-stickynode": "^4.1.0",
    "react-textarea-autosize": "^8.3.4",
    "reapop": "^4.2.1",
-    "redux-first-history": "^5.1.1",
-    "redux-socket.io-middleware": "^1.0.4",
-    "redux-thunk": "^2.4.2",
-    "slick-carousel": "^1.8.1",
    "socket.io-client": "^4.3.2",
-    "styled-components": "^6.0.7",
+    "styled-components": "^6.1.0",
    "threetwo-ui-typings": "^1.0.14",
+    "vite": "^5.0.5",
    "vite-plugin-html": "^3.2.0",
-    "websocket": "^1.0.34"
+    "websocket": "^1.0.34",
+    "zustand": "^4.4.6"
  },
  "devDependencies": {
-    "@storybook/addon-essentials": "^7.3.2",
-    "@storybook/addon-interactions": "^7.3.2",
-    "@storybook/addon-links": "^7.3.2",
-    "@storybook/addon-mdx-gfm": "^7.3.2",
+    "@iconify-json/solar": "^1.1.8",
+    "@iconify/tailwind": "^0.1.4",
+    "@storybook/addon-essentials": "^7.4.1",
+    "@storybook/addon-interactions": "^7.4.1",
+    "@storybook/addon-links": "^7.4.1",
    "@storybook/addon-onboarding": "^1.0.8",
-    "@storybook/blocks": "^7.3.2",
-    "@storybook/react": "^7.3.2",
-    "@storybook/react-vite": "^7.3.2",
+    "@storybook/blocks": "^7.4.1",
+    "@storybook/react": "^7.4.1",
+    "@storybook/react-vite": "^7.4.1",
    "@storybook/testing-library": "^0.2.0",
+    "@tanstack/eslint-plugin-query": "^5.0.5",
+    "@tanstack/react-query-devtools": "^5.1.0",
    "@tsconfig/node14": "^1.0.0",
    "@types/ellipsize": "^0.1.1",
    "@types/express": "^4.17.8",
@@ -98,17 +96,14 @@
    "@types/react": "^18.0.28",
    "@types/react-dom": "^18.0.11",
    "@types/react-redux": "^7.1.25",
-    "@typescript-eslint/eslint-plugin": "^4.17.0",
-    "@typescript-eslint/parser": "^4.17.0",
-    "babel-plugin-styled-components": "^2.1.4",
+    "autoprefixer": "^10.4.16",
    "body-parser": "^1.19.0",
-    "bulma": "^0.9.4",
-    "eslint": "^7.22.0",
-    "eslint-config-airbnb": "^18.2.1",
-    "eslint-config-airbnb-base": "^14.2.1",
+    "docdash": "^2.0.2",
+    "eslint": "^8.49.0",
    "eslint-config-prettier": "^8.1.0",
    "eslint-plugin-css-modules": "^2.11.0",
    "eslint-plugin-import": "^2.22.1",
+    "eslint-plugin-jsdoc": "^46.6.0",
    "eslint-plugin-jsx-a11y": "^6.0.3",
    "eslint-plugin-prettier": "^3.3.1",
    "eslint-plugin-react": "^7.22.0",
@@ -117,15 +112,18 @@
    "install": "^0.13.0",
    "jest": "^29.6.3",
    "nodemon": "^3.0.1",
-    "npm": "^8.11.0",
+    "postcss": "^8.4.32",
+    "postcss-import": "^15.1.0",
    "prettier": "^2.2.1",
    "react-refresh": "^0.14.0",
    "rimraf": "^4.1.3",
-    "sass": "^1.66.1",
+    "sass": "^1.69.5",
    "storybook": "^7.3.2",
-    "tslint": "^6.1.3",
-    "typescript": "^5.1.6",
-    "vite": "^4.4.9"
-
+    "tailwindcss": "^3.4.1",
+    "tui-jsdoc-template": "^1.2.2",
+    "typescript": "^5.1.6"
+  },
+  "resolutions": {
+    "jackspeak": "2.1.1"
  }
 }
--- a/postcss.config.js
+++ b/postcss.config.js
@@ -0,0 +1,7 @@
+module.exports = {
+  plugins: {
+    "postcss-import": {},
+    tailwindcss: {},
+    autoprefixer: {},
+  },
+};
--- a/public/fonts/Hasklig-Regular.otf
+++ b/public/fonts/Hasklig-Regular.otf
--- a/public/fonts/PPObjectSans-Heavy.otf
+++ b/public/fonts/PPObjectSans-Heavy.otf
--- a/public/fonts/PPObjectSans-HeavySlanted.otf
+++ b/public/fonts/PPObjectSans-HeavySlanted.otf
--- a/public/fonts/PPObjectSans-Regular.otf
+++ b/public/fonts/PPObjectSans-Regular.otf
--- a/public/fonts/PPObjectSans-Slanted.otf
+++ b/public/fonts/PPObjectSans-Slanted.otf
--- a/screenshots/CVMatching.jpg
+++ b/screenshots/CVMatching.jpg
--- a/screenshots/ComicDetail.jpg
+++ b/screenshots/ComicDetail.jpg
--- a/screenshots/DC++Searching.jpg
+++ b/screenshots/DC++Searching.jpg
--- a/screenshots/Dashboard.jpg
+++ b/screenshots/Dashboard.jpg
--- a/screenshots/Import.jpg
+++ b/screenshots/Import.jpg
--- a/screenshots/Library.jpg
+++ b/screenshots/Library.jpg
--- a/src/client/actions/airdcpp.actions.tsx
+++ b/src/client/actions/airdcpp.actions.tsx
@@ -33,9 +33,9 @@ interface SearchData {
  priority: PriorityEnum;
 }

-function sleep(ms: number): Promise<NodeJS.Timeout> {
+export const sleep = (ms: number): Promise<NodeJS.Timeout> => {
  return new Promise((resolve) => setTimeout(resolve, ms));
-}
+};

 export const toggleAirDCPPSocketConnectionStatus =
  (status: String, payload?: any) => async (dispatch) => {
@@ -59,83 +59,6 @@ export const toggleAirDCPPSocketConnectionStatus =
        break;
    }
  };
-export const search =
-  (data: SearchData, ADCPPSocket: any, credentials: any) =>
-  async (dispatch) => {
-    try {
-      if (!ADCPPSocket.isConnected()) {
-        await ADCPPSocket();
-      }
-      const instance: SearchInstance = await ADCPPSocket.post("search");
-      dispatch({
-        type: AIRDCPP_SEARCH_IN_PROGRESS,
-      });
-
-      // We want to get notified about every new result in order to make the user experience better
-      await ADCPPSocket.addListener(
-        `search`,
-        "search_result_added",
-        async (groupedResult) => {
-          // ...add the received result in the UI
-          // (it's probably a good idea to have some kind of throttling for the UI updates as there can be thousands of results)
-
-          dispatch({
-            type: AIRDCPP_SEARCH_RESULTS_ADDED,
-            groupedResult,
-          });
-        },
-        instance.id,
-      );
-
-      // We also want to update the existing items in our list when new hits arrive for the previously listed files/directories
-      await ADCPPSocket.addListener(
-        `search`,
-        "search_result_updated",
-        async (groupedResult) => {
-          // ...update properties of the existing result in the UI
-          dispatch({
-            type: AIRDCPP_SEARCH_RESULTS_UPDATED,
-            groupedResult,
-          });
-        },
-        instance.id,
-      );
-
-      // We need to show something to the user in case the search won't yield any results so that he won't be waiting forever)
-      // Wait for 5 seconds for any results to arrive after the searches were sent to the hubs
-      await ADCPPSocket.addListener(
-        `search`,
-        "search_hub_searches_sent",
-        async (searchInfo) => {
-          await sleep(5000);
-
-          // Check the number of received results (in real use cases we should know that even without calling the API)
-          const currentInstance = await ADCPPSocket.get(
-            `search/${instance.id}`,
-          );
-          if (currentInstance.result_count === 0) {
-            // ...nothing was received, show an informative message to the user
-            console.log("No more search results.");
-          }
-
-          // The search can now be considered to be "complete"
-          // If there's an "in progress" indicator in the UI, that could also be disabled here
-          dispatch({
-            type: AIRDCPP_HUB_SEARCHES_SENT,
-            searchInfo,
-            instance,
-          });
-        },
-        instance.id,
-      );
-      // Finally, perform the actual search
-      await ADCPPSocket.post(`search/${instance.id}/hub_search`, data);
-    } catch (error) {
-      console.log(error);
-      throw error;
-    }
-  };
-
 export const downloadAirDCPPItem =
  (
    searchInstanceId: Number,
--- a/src/client/actions/settings.actions.tsx
+++ b/src/client/actions/settings.actions.tsx
@@ -3,25 +3,14 @@ import {
  SETTINGS_OBJECT_FETCHED,
  SETTINGS_CALL_IN_PROGRESS,
  SETTINGS_DB_FLUSH_SUCCESS,
-} from "../constants/action-types";
+  SETTINGS_QBITTORRENT_TORRENTS_LIST_FETCHED,
+} from "../reducers/settings.reducer";
 import {
  LIBRARY_SERVICE_BASE_URI,
  SETTINGS_SERVICE_BASE_URI,
+  QBITTORRENT_SERVICE_BASE_URI,
 } from "../constants/endpoints";

-export const saveSettings =
-  (settingsPayload, settingsObjectId?: string) => async (dispatch) => {
-    const result = await axios({
-      url: `${SETTINGS_SERVICE_BASE_URI}/saveSettings`,
-      method: "POST",
-      data: { settingsPayload, settingsObjectId },
-    });
-    dispatch({
-      type: SETTINGS_OBJECT_FETCHED,
-      data: result.data,
-    });
-  };
-
 export const getSettings = (settingsKey?) => async (dispatch) => {
  const result = await axios({
    url: `${SETTINGS_SERVICE_BASE_URI}/getSettings`,
@@ -67,3 +56,22 @@ export const flushDb = () => async (dispatch) => {
    });
  }
 };
+
+export const getQBitTorrentClientInfo = (hostInfo) => async (dispatch) => {
+  await axios.request({
+    url: `${QBITTORRENT_SERVICE_BASE_URI}/connect`,
+    method: "POST",
+    data: hostInfo,
+  });
+  const qBittorrentClientInfo = await axios.request({
+    url: `${QBITTORRENT_SERVICE_BASE_URI}/getClientInfo`,
+    method: "GET",
+  });
+
+  dispatch({
+    type: SETTINGS_QBITTORRENT_TORRENTS_LIST_FETCHED,
+    data: qBittorrentClientInfo.data,
+  });
+};
+
+export const getProwlarrConnectionInfo = (hostInfo) => async (dispatch) => {};
--- a/src/client/assets/scss/App.scss
+++ b/src/client/assets/scss/App.scss
@@ -1,635 +1,15 @@
-@import "/node_modules/bulma/bulma.sass";
-$fa-font-path: "/node_modules/@fortawesome/fontawesome-free/webfonts";
-@import "/node_modules/@fortawesome/fontawesome-free/scss/fontawesome.scss";
-@import "/node_modules/@fortawesome/fontawesome-free/scss/regular.scss";
-@import "/node_modules/@fortawesome/fontawesome-free/scss/solid.scss";
-$bg-color: yellow;
-$border-color: red;
+@tailwind base;
+@tailwind components;
+@tailwind utilities;

-$volume-color: #fdecd1;
-$issue-color: #f2f1f9;
-$size-8: 0.9rem;
-$size-9: 0.7rem;
-$flexSize: 4em;
-$boxSpacing: 1em;
-$colorText: #404646;
+@layer base {
+  @font-face {
+    font-family: "PP Object Sans Regular";
+    src: url("/fonts/PPObjectSans-Regular.otf") format("opentype");
+  }

-.is-size-8 {
-  font-size: $size-8;
-}
-
-.is-size-9 {
-  font-size: $size-9;
-}
-
-.small-tag {
-  align-items: center;
-  background-color: #fff6de;
-  border-radius: 4px;
-  color: #4a4a4a;
-  display: inline-flex;
-  font-size: $size-9;
-  height: 1.5em;
-  justify-content: center;
-  line-height: 1.5;
-  padding-left: 0.55em;
-  padding-right: 0.55em;
-  white-space: nowrap;
-}
-
-// global style overrides
-
-pre {
-  border-radius: 0.5rem;
-}
-
-.container {
-  margin-top: 2em;
-}
-.app {
-  font-family: helvetica, arial, sans-serif;
-  padding: 2em;
-  border: 5px solid $border-color;
-
-  p {
-    background-color: $bg-color;
-  }
-}
-// Navbar
-.navbar {
-  border-bottom: 1px solid #f2f1f9;
-  .download-progress-meter {
-    margin-left: -300px;
-    min-width: 500px;
-  }
-  .airdcpp-status {
-    min-width: 300px;
-    line-height: 1.7rem;
-  }
-  body {
-    background: #454a59;
-  }
-
-  body {
-    background: #454a59;
-  }
-
-  .pulsating-circle {
-    position: relative;
-    left: -120%;
-    top: 20%;
-    transform: translateX(-50%) translateY(-50%);
-    width: 15px;
-    height: 15px;
-
-    &:before {
-      content: "";
-      position: relative;
-      display: block;
-      width: 300%;
-      height: 300%;
-      box-sizing: border-box;
-      margin-left: -100%;
-      margin-top: -100%;
-      border-radius: 45px;
-      background-color: #01a4e9;
-      animation: pulse-ring 1.25s cubic-bezier(0.215, 0.61, 0.355, 1) infinite;
-    }
-
-    &:after {
-      content: "";
-      position: absolute;
-      left: 0;
-      top: 0;
-      display: block;
-      width: 100%;
-      height: 100%;
-      background-color: green;
-      border-radius: 15px;
-      box-shadow: 0 0 8px rgba(0, 0, 0, 0.3);
-      animation: pulse-dot 1.25s cubic-bezier(0.455, 0.03, 0.515, 0.955) -0.4s infinite;
-    }
-  }
-
-  @keyframes pulse-ring {
-    0% {
-      transform: scale(0.33);
-    }
-    80%,
-    100% {
-      opacity: 0;
-    }
-  }
-
-  @keyframes pulse-dot {
-    0% {
-      transform: scale(0.8);
-    }
-    50% {
-      transform: scale(1);
-    }
-    100% {
-      transform: scale(0.8);
-    }
-  }
-}
-
-.navbar-item.is-mega {
-  position: static;
-
-  .is-mega-menu-title {
-    margin-bottom: 0;
-    padding: 0.375rem 1rem;
-  }
-}
-
-// Dashboard
-
-// slick slider overrides
-.slick-slider {
-  margin-left: -10px;
-  .slick-list {
-    padding: 0 0px 15px 10px;
-  }
-}
-.recent-comics-container {
-  display: -webkit-box; /* Not needed if autoprefixing */
-  display: -ms-flexbox; /* Not needed if autoprefixing */
-  display: flex;
-  margin-left: -22px; /* gutter size offset */
-  width: auto;
-
-  .recent-comics-column {
-    padding-left: 22px; /* gutter size */
-    background-clip: padding-box;
-    & > div {
-      /* change div to reference your elements you put in <Masonry> */
-      margin-bottom: 20px;
-    }
-  }
-}
-.volumes-container {
-  .stack {
-    display: inline-block;
-    border-radius: 0.5rem;
-    box-shadow:
-    /* The top layer shadow */ 0 -1px 1px rgba(0, 0, 0, 0.15),
-      /* The second layer */ 0 -10px 0 -5px #eee,
-      /* The second layer shadow */ 0 -10px 1px -4px rgba(0, 0, 0, 0.15),
-      /* The third layer */ 0 -20px 0 -10px #eee,
-      /* The third layer shadow */ 0 -20px 1px -9px rgba(0, 0, 0, 0.15);
-    img {
-      height: auto;
-      border-top-left-radius: 0.5rem;
-      border-top-right-radius: 0.5rem;
-      border-bottom-left-radius: 0;
-      border-bottom-right-radius: 0;
-    }
-    .stack-title {
-      margin-bottom: 0.4rem;
-    }
-    .content {
-      margin: -5px 0 0 0;
-      padding: 0.5rem 1rem;
-      border-bottom-left-radius: 0.25rem;
-      box-shadow: 1px 8px 23px 7px rgba(0, 0, 0, 0.12);
-      border-bottom-right-radius: 0.25rem;
-    }
-  }
-
-  .volumes-grid {
-    display: -webkit-box; /* Not needed if autoprefixing */
-    display: -ms-flexbox; /* Not needed if autoprefixing */
-    display: flex;
-    margin-left: -30px; /* gutter size offset */
-    width: auto;
-  }
-  .volumes-grid-column {
-    padding-left: 22px; /* gutter size */
-    background-clip: padding-box;
-    & > div {
-      /* change div to reference your elements you put in <Masonry> */
-      margin-bottom: 20px;
-    }
-  }
-}
-
-.min {
-  overflow: visible;
-  margin: auto;
-  .tag__custom {
-    height: auto !important;
-    padding: 0.3rem;
-    white-space: unset !important;
-    width: 100%;
-    background-color: #effaf5;
-    color: #257953;
-  }
-  .tags {
-    display: inline;
-    margin-right: 5px;
-    margin-left: 5px;
-    &:first-child {
-      margin-left: 0;
-    }
-  }
-  pre {
-    border-radius: 0.4em;
-    margin: 10px 0 10px 0;
-    white-space: pre-wrap;
-  }
-}
-
-.generic-card {
-  display: inline-block;
-  background-color: #fff;
-  border-top-left-radius: 0.4rem;
-  border-top-right-radius: 0.4rem;
-  border-bottom-left-radius: 0.4rem;
-  border-bottom-right-radius: 0.4rem;
-  box-shadow: 1px 8px 23px 7px rgba(0, 0, 0, 0.12);
-
-  .green-border {
-    border: 1px dotted #168b64;
-    border-radius: 0.4rem;
-  }
-
-  .truncate {
-    width: 100px;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-  }
-  .partial-rounded-card-image {
-    figure {
-      display: flex;
-      img {
-        border-top-left-radius: 0.4rem;
-        border-top-right-radius: 0.4rem;
-        border-bottom-left-radius: 0;
-        border-bottom-right-radius: 0;
-      }
-    }
-  }
-  .rounded-card-image {
-    figure {
-      display: flex;
-      img {
-        border-radius: 0.4rem;
-      }
-    }
-  }
-  .card-content {
-    .card-title {
-      margin-bottom: 0.4rem;
-    }
-    .custom-icon,
-    i {
-      margin: 4px 4px 4px 0;
-    }
-    padding: 0.5rem 1rem;
-  }
-}
-.card-container {
-  // display: grid;
-  // grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
-  // column-gap: 0.5em;
-  // row-gap: 1.2em;
-
-  .card {
-    margin: 0 0 15px 0;
-
-    .partial-rounded-card-image {
-      img {
-        border-top-left-radius: 0.4rem;
-        border-top-right-radius: 0.4rem;
-        border-bottom-left-radius: 0;
-        border-bottom-right-radius: 0;
-      }
-    }
-    .rounded-card-image {
-      border-radius: 0.4rem;
-    }
-
-    .is-horizontal {
-      // margin: $boxSpacing / 2;
-      border-radius: 1.5em;
-      height: $flexSize;
-      max-width: $flexSize * 3;
-      flex: 1 1 auto;
-      display: flex;
-      .card-image {
-        // leaving this here... for posterity
-        img.image {
-          border-top-left-radius: 8px;
-          border-bottom-left-radius: 8px;
-          border-top-right-radius: 0;
-          border-bottom-right-radius: 0;
-          height: 100%;
-          max-width: $flexSize * 1.3;
-          object-fit: cover;
-          flex: 1 1 auto;
-        }
-        img.cropped-image {
-          width: 70px;
-          border-top-left-radius: 8px;
-          border-bottom-left-radius: 8px;
-          border-top-right-radius: 0;
-          border-bottom-right-radius: 0;
-          height: 64px;
-          object-fit: cover;
-          object-position: 100% 0;
-          //  flex: 1 1 auto;
-        }
-      }
-    }
-    .card-content {
-      align-self: top;
-      flex: 1;
-      padding-left: 0.7em;
-      padding-top: 0.4em;
-      padding-bottom: 0em;
-    }
-  }
-}
-
-// raw file details
-.raw-file-details {
-  padding: 1rem;
-  background-color: beige;
-  border-radius: 0.5rem;
-}
-
-.comic-viewer {
-  border: 1px solid red;
-}
-
-// comicvine metadata
-.comicvine-metadata {
-  background-color: #f2f1f9;
-  padding: 0.8rem;
-  border-radius: 0.5rem;
-}
-
-.issue-metadata {
-  background-color: #fbffee;
-  padding: 0.8em;
-  border-radius: 0.5rem;
-  .name {
-    font-size: 0.95rem;
-    color: #4a4f50;
-  }
-}
-
-.comicInfo-metadata {
-  background-color: #f7ebdd;
-  padding: 0.8rem;
-  border-radius: 0.5rem;
-}
-
-// Comic Detail
-.comic-detail {
-  dl {
-    dd {
-      margin: 0;
-    }
-  }
-  .button {
-    .airdcpp-text {
-      margin: 0 0 0 0.2rem;
-    }
-  }
-}
-
-// AirDC++ search results
-.dupe-search-result {
-  background: lavender;
-}
-
-// Search
-.search {
-  .main-search-bar {
-    border: 0;
-    border-bottom: 1px solid #999;
-    border-radius: 0;
-    outline: 0;
-    background: transparent;
-    box-shadow: none;
-  }
-}
-// Library
-.header-area {
-  width: 100%;
-  padding: 25px 0 15px 0;
-  position: sticky;
-  z-index:9999;
-  background: #fffffc;
-  top: 50px;
-}
-
-.library {
-  .table-controls {
-    background: #fffffc;
-    justify-content: space-between;
-    position: sticky;
-    top: 126px;
-    padding-bottom: 10px;
-  }
-  .pagination {
-    margin: 0;
-    background: #fffffc;
-  }
-
-  table {
-    border-collapse: separate;
-    width: 100%;
-    thead {
-      position: sticky;
-      top: 250px;
-      z-index: 1;
-      background: #fffffc;
-      min-height: 130px;
-    }
-    tr {
-      td {
-        border: 0 none;
-        .card {
-          margin: 8px 0 7px 0;
-          .name {
-            margin: 0 0 4px 0;
-          }
-        }
-      }
-    }
-    tbody {
-      padding: 10px 0 0 0;
-    }
-  }
-}
-
-// Comic Detail
-.control-palette {
-  background-color: #fff6de;
-  display: inline-block;
-  i {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    // padding: 1.5rem 2rem;
-  }
-}
-
-// airdcpp downloads tab
-.tabs {
-  .download-icon-labels {
-    .downloads-count {
-      margin: 0 1em -1px 0.4em;
-      border: 1px solid #ccc;
-    }
-  }
-  .download-tab-name {
-  }
-}
-
-// drawer content padding override
-.slide-pane__content {
-  padding: 24px 12px;
-}
-
-.slide-pane__header {
-  margin-top: 3.5rem;
-}
-
-.comic-vine-match-drawer {
-  // comic detail drawer
-
-  .search-criteria-card {
-    width: 100%;
-    .card-content {
-      padding: 10px;
-      .ant-divider-horizontal {
-        margin: 12px 0;
-      }
-    }
-  }
-
-  .field {
-    margin: 5px 0 0 0;
-  }
-}
-
-// Volume detail
-.volume-details {
-  .is-volume-related {
-    $tag-background-color: $volume-color;
-  }
-  .issues-container {
-    display: -webkit-box; /* Not needed if autoprefixing */
-    display: -ms-flexbox; /* Not needed if autoprefixing */
-    display: flex;
-    margin-left: -10px; /* gutter size offset */
-    width: auto;
-    .issues-column {
-      max-width: 102px;
-      margin: 10px;
-      background-clip: padding-box;
-      & > div {
-        /* change div to reference your elements you put in <Masonry> */
-        margin-bottom: 20px;
-      }
-    }
-  }
-}
-// Potential issue matches in library slideout panel
-.potential-matches-container {
-  .potential-issue-match {
-    border-radius: 0.3rem;
-    background-color: beige;
-    padding: 10px;
-    pre {
-      padding: 5px;
-      background-color: transparent;
-      border-radius: 0.3rem;
-      white-space: pre-wrap; /* Since CSS 2.1 */
-      white-space: -moz-pre-wrap; /* Mozilla, since 1999 */
-      white-space: -pre-wrap; /* Opera 4-6 */
-      white-space: -o-pre-wrap; /* Opera 7 */
-      word-wrap: break-word;
-    }
-    .generic-card {
-      max-width: 90px;
-    }
-  }
-}
-
-// comicvine search results
-.search-results-container {
-  margin: 15px 0 0 0;
-  overflow: hidden;
-
-  .search-result {
-    margin: 0 0 10px 0;
-    padding: 1em;
-    border-radius: 10px;
-    background: #f2f1f9;
-    .cover-image {
-      border-radius: 5px;
-    }
-    .search-result-details {
-      .score {
-        float: right;
-      }
-    }
-    .volume-information {
-      margin-top: -2.5em;
-      width: 80%;
-      background: #fdecd1;
-      border-radius: 10px;
-    }
-    .vertical-line {
-      position: relative;
-      top: -25px;
-      left: 1.5rem;
-      border: 2px dotted #ccc;
-      width: 20px;
-      min-height: 35px;
-
-      border-color: transparent transparent #f3a22d #f3a22d;
-      border-bottom-left-radius: 10px;
-    }
-  }
-}
-
-// Library grid
-.my-masonry-grid {
-  display: -webkit-box; /* Not needed if autoprefixing */
-  display: -ms-flexbox; /* Not needed if autoprefixing */
-  display: flex;
-  margin-left: -30px; /* gutter size offset */
-  width: auto;
-}
-.my-masonry-grid_column {
-  padding-left: 30px; /* gutter size */
-  background-clip: padding-box;
-}
-
-.my-masonry-grid_column > div {
-  /* change div to reference your elements you put in <Masonry> */
-  margin-bottom: 20px;
-}
-
-// progress
-.progress-indicator-container {
-  height: 100%;
-  padding: 0;
-  margin: 0;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-
-  .indicator {
-    padding: 5px;
-    width: 120px;
-    height: 120px;
+  @font-face {
+    font-family: "Hasklig Regular";
+    src: url("/fonts/Hasklig-Regular.otf") format("opentype");
  }
 }
--- a/src/client/components/AirDCPPSettings/AirDCPPHubsForm.tsx
+++ b/src/client/components/AirDCPPSettings/AirDCPPHubsForm.tsx
@@ -1,96 +0,0 @@
-import React, { ReactElement, useEffect, useState, useContext } from "react";
-import { Form, Field } from "react-final-form";
-import { useDispatch } from "react-redux";
-import { isEmpty, isNil, isUndefined } from "lodash";
-import Select from "react-select";
-import { saveSettings } from "../../actions/settings.actions";
-import { AirDCPPSocketContext } from "../../context/AirDCPPSocket";
-
-export const AirDCPPHubsForm = (airDCPPClientUserSettings): ReactElement => {
-  const dispatch = useDispatch();
-  const [hubList, setHubList] = useState([]);
-  const airDCPPConfiguration = useContext(AirDCPPSocketContext);
-  const {
-    airDCPPState: { settings, socket },
-  } = airDCPPConfiguration;
-
-  useEffect(() => {
-    (async () => {
-      if (!isEmpty(settings)) {
-        const hubs = await socket.get(`hubs`);
-        const hubSelectionOptions = hubs.map(({ hub_url, identity }) => ({
-          value: hub_url,
-          label: identity.name,
-        }));
-
-        setHubList(hubSelectionOptions);
-      }
-    })();
-  }, []);
-
-  const onSubmit = (values) => {
-    if (!isUndefined(values.hubs)) {
-      dispatch(saveSettings({ ...settings, hubs: values.hubs }, settings._id));
-    }
-  };
-
-  const validate = async () => {};
-
-  const SelectAdapter = ({ input, ...rest }) => {
-    return <Select {...input} {...rest} isClearable isMulti />;
-  };
-
-  return (
-    <>
-      <Form
-        onSubmit={onSubmit}
-        validate={validate}
-        render={({ handleSubmit }) => (
-          <form onSubmit={handleSubmit}>
-            <div>
-              <h3 className="title">Hubs</h3>
-              <h6 className="subtitle has-text-grey-light">
-                Select the hubs you want to perform searches against.
-              </h6>
-            </div>
-            <div className="field">
-              <label className="label">AirDC++ Host</label>
-              <div className="control">
-                <Field
-                  name="hubs"
-                  component={SelectAdapter}
-                  className="basic-multi-select"
-                  placeholder="Select Hubs to Search Against"
-                  options={hubList}
-                />
-              </div>
-            </div>
-
-            <button type="submit" className="button is-primary">
-              Submit
-            </button>
-          </form>
-        )}
-      />
-      <div className="mt-4">
-        <article className="message is-warning">
-          <div className="message-body is-size-6 is-family-secondary">
-            Your selection in the dropdown <strong>will replace</strong> the
-            existing selection.
-          </div>
-        </article>
-      </div>
-      <div className="box mt-3">
-        <h6>Selected hubs</h6>
-        {settings.directConnect.client.hubs.map(({ value, label }) => (
-          <div key={value}>
-            <div>{label}</div>
-            <span className="is-size-7">{value}</span>
-          </div>
-        ))}
-      </div>
-    </>
-  );
-};
-
-export default AirDCPPHubsForm;
--- a/src/client/components/AirDCPPSettings/AirDCPPSettingsConfirmation.tsx
+++ b/src/client/components/AirDCPPSettings/AirDCPPSettingsConfirmation.tsx
@@ -1,35 +0,0 @@
-import React, { ReactElement } from "react";
-
-export const AirDCPPSettingsConfirmation = (settingsObject): ReactElement => {
-  const { settings } = settingsObject;
-  console.log(settings);
-  return (
-    <div className="mt-4 is-clearfix">
-      <div className="card">
-        <div className="card-content">
-          <span className="tag is-pulled-right is-primary">Connected</span>
-          <div className="content is-size-7">
-            <dl>
-              <dt>{settings._id}</dt>
-              <dt>Client version: {settings.system_info.client_version}</dt>
-              <dt>Hostname: {settings.system_info.hostname}</dt>
-              <dt>Platform: {settings.system_info.platform}</dt>
-
-              <dt>Username: {settings.user.username}</dt>
-
-              <dt>Active Sessions: {settings.user.active_sessions}</dt>
-              <dt>
-                Permissions:{" "}
-                <pre>
-                  {JSON.stringify(settings.user.permissions, undefined, 2)}
-                </pre>
-              </dt>
-            </dl>
-          </div>
-        </div>
-      </div>
-    </div>
-  );
-};
-
-export default AirDCPPSettingsConfirmation;
--- a/src/client/components/AirDCPPSettings/AirDCPPSettingsForm.tsx
+++ b/src/client/components/AirDCPPSettings/AirDCPPSettingsForm.tsx
@@ -1,162 +0,0 @@
-import React, { ReactElement, useCallback, useContext } from "react";
-import { Form, Field } from "react-final-form";
-import { useDispatch } from "react-redux";
-import { saveSettings, deleteSettings } from "../../actions/settings.actions";
-import { AirDCPPSettingsConfirmation } from "./AirDCPPSettingsConfirmation";
-import { AirDCPPSocketContext } from "../../context/AirDCPPSocket";
-import { isUndefined, isEmpty, isNil } from "lodash";
-
-export const AirDCPPSettingsForm = (): ReactElement => {
-  const dispatch = useDispatch();
-  const airDCPPSettings = useContext(AirDCPPSocketContext);
-
-  const hostValidator = (hostname: string): string | null => {
-    const hostnameRegex = /[\W]+/gm;
-    try {
-      if (!isUndefined(hostname)) {
-        const matches = hostname.match(hostnameRegex);
-        return isNil(matches) && matches.length !== 0
-          ? hostname
-          : "Invalid hostname; it should not contain special characters";
-      }
-    } catch {
-      return null;
-    }
-  };
-
-  const onSubmit = useCallback(async (values) => {
-    try {
-      airDCPPSettings.setSettings(values);
-      dispatch(
-        saveSettings({
-          host: values,
-        }),
-      );
-    } catch (error) {
-      console.log(error);
-    }
-  }, []);
-  const removeSettings = useCallback(async () => {
-    airDCPPSettings.setSettings({});
-    dispatch(deleteSettings());
-  }, []);
-  const validate = async () => {};
-  const initFormData = !isUndefined(
-    airDCPPSettings.airDCPPState.settings.directConnect,
-  )
-    ? airDCPPSettings.airDCPPState.settings.directConnect.client.host
-    : {};
-
-  return (
-    <>
-      <Form
-        onSubmit={onSubmit}
-        validate={validate}
-        initialValues={initFormData}
-        render={({ handleSubmit }) => (
-          <form onSubmit={handleSubmit}>
-            <h2>AirDC++ Connection Information</h2>
-            <label className="label">AirDC++ Hostname</label>
-            <div className="field has-addons">
-              <p className="control">
-                <span className="select">
-                  <Field name="protocol" component="select">
-                    <option>Protocol</option>
-                    <option value="http">http://</option>
-                    <option value="https">https://</option>
-                  </Field>
-                </span>
-              </p>
-              <div className="control is-expanded">
-                <Field name="hostname" validate={hostValidator}>
-                  {({ input, meta }) => (
-                    <div>
-                      <input
-                        {...input}
-                        type="text"
-                        placeholder="AirDC++ hostname"
-                        className="input"
-                      />
-                      {meta.error && meta.touched && (
-                        <span className="is-size-7 has-text-danger">
-                          {meta.error}
-                        </span>
-                      )}
-                    </div>
-                  )}
-                </Field>
-              </div>
-              <p className="control">
-                <Field
-                  name="port"
-                  component="input"
-                  className="input"
-                  placeholder="AirDC++ port"
-                />
-              </p>
-            </div>
-            <div className="field">
-              <div className="is-clearfix">
-                <label className="label">Credentials</label>
-              </div>
-              <div className="field-body">
-                <div className="field">
-                  <p className="control is-expanded has-icons-left">
-                    <Field
-                      name="username"
-                      component="input"
-                      className="input"
-                      placeholder="Username"
-                    />
-                    <span className="icon is-small is-left">
-                      <i className="fa-solid fa-user-ninja"></i>
-                    </span>
-                  </p>
-                </div>
-                <div className="field">
-                  <p className="control is-expanded has-icons-left has-icons-right">
-                    <Field
-                      name="password"
-                      component="input"
-                      type="password"
-                      className="input"
-                      placeholder="Password"
-                    />
-                    <span className="icon is-small is-left">
-                      <i className="fa-solid fa-lock"></i>
-                    </span>
-                    <span className="icon is-small is-right">
-                      <i className="fas fa-check"></i>
-                    </span>
-                  </p>
-                </div>
-              </div>
-            </div>
-            <div className="field is-grouped">
-              <p className="control">
-                <button type="submit" className="button is-primary">
-                  {!isEmpty(initFormData) ? "Update" : "Save"}
-                </button>
-              </p>
-            </div>
-          </form>
-        )}
-      />
-      {!isEmpty(airDCPPSettings.airDCPPState.socketConnectionInformation) ? (
-        <AirDCPPSettingsConfirmation
-          settings={airDCPPSettings.airDCPPState.socketConnectionInformation}
-        />
-      ) : null}
-
-      {!isEmpty(airDCPPSettings.airDCPPState.socketConnectionInformation) ? (
-        <p className="control mt-4">
-          <button className="button is-danger" onClick={removeSettings}>
-            Delete
-          </button>
-        </p>
-      ) : null}
-    </>
-  );
-};
-
-export default AirDCPPSettingsForm;
--- a/src/client/components/App.tsx
+++ b/src/client/components/App.tsx
@@ -1,160 +1,14 @@
-import React, { ReactElement, useContext, useEffect } from "react";
-import Dashboard from "./Dashboard/Dashboard";
-import Import from "./Import";
-import { ComicDetailContainer } from "./ComicDetail/ComicDetailContainer";
-import TabulatedContentContainer from "./Library/TabulatedContentContainer";
-import LibraryGrid from "./Library/LibraryGrid";
-import Search from "./Search";
-import Settings from "./Settings";
-import VolumeDetail from "./VolumeDetail/VolumeDetail";
-import Downloads from "./Downloads/Downloads";
-
-import { Routes, Route } from "react-router-dom";
-import Navbar from "./Navbar";
+import React, { ReactElement } from "react";
+import { Outlet } from "react-router-dom";
+import { Navbar2 } from "./shared/Navbar2";
 import "../assets/scss/App.scss";
-import {
-  AirDCPPSocketContextProvider,
-  AirDCPPSocketContext,
-} from "../context/AirDCPPSocket";
-import { SocketIOProvider } from "../context/SocketIOContext";
-import socketIOConnectionInstance from "../shared/socket.io/instance";
-import { isEmpty, isNil, isUndefined } from "lodash";
-import {
-  AIRDCPP_DOWNLOAD_PROGRESS_TICK,
-  LS_SINGLE_IMPORT,
-} from "../constants/action-types";
-import { useDispatch, useSelector } from "react-redux";

-/**
- * Method that initializes an AirDC++ socket connection
- * 1. Initializes event listeners for download init, tick and complete events
- * 2. Handles errors in case the connection to AirDC++ is not established or terminated
- * @returns void
- */
-const AirDCPPSocketComponent = (): ReactElement => {
-  const airDCPPConfiguration = useContext(AirDCPPSocketContext);
-  const dispatch = useDispatch();
-
-  useEffect(() => {
-    const initializeAirDCPPEventListeners = async () => {
-      if (
-        !isUndefined(airDCPPConfiguration.airDCPPState) &&
-        !isEmpty(airDCPPConfiguration.airDCPPState.settings) &&
-        !isEmpty(airDCPPConfiguration.airDCPPState.socket)
-      ) {
-        await airDCPPConfiguration.airDCPPState.socket.addListener(
-          "queue",
-          "queue_bundle_added",
-          async (data) => {
-            console.log("JEMEN:", data);
-          },
-        );
-        // download tick listener
-        await airDCPPConfiguration.airDCPPState.socket.addListener(
-          `queue`,
-          "queue_bundle_tick",
-          async (downloadProgressData) => {
-            dispatch({
-              type: AIRDCPP_DOWNLOAD_PROGRESS_TICK,
-              downloadProgressData,
-            });
-          },
-        );
-        // download complete listener
-        await airDCPPConfiguration.airDCPPState.socket.addListener(
-          `queue`,
-          "queue_bundle_status",
-          async (bundleData) => {
-            let count = 0;
-            if (bundleData.status.completed && bundleData.status.downloaded) {
-              // dispatch the action for raw import, with the metadata
-              if (count < 1) {
-                console.log(`[AirDCPP]: Download complete.`);
-                dispatch({
-                  type: LS_SINGLE_IMPORT,
-                  meta: { remote: true },
-                  data: bundleData,
-                });
-                count += 1;
-              }
-            }
-          },
-        );
-        console.log(
-          "[AirDCPP]: Listener registered - listening to queue bundle download ticks",
-        );
-        console.log(
-          "[AirDCPP]: Listener registered - listening to queue bundle changes",
-        );
-        console.log(
-          "[AirDCPP]: Listener registered - listening to transfer completion",
-        );
-      }
-    };
-    initializeAirDCPPEventListeners();
-  }, [airDCPPConfiguration]);
-  return <></>;
-};
 export const App = (): ReactElement => {
-  const dispatch = useDispatch();
-  useEffect(() => {
-    // Check if there is a sessionId in localStorage
-    const sessionId = localStorage.getItem("sessionId");
-    if (!isNil(sessionId)) {
-      // Resume the session
-      dispatch({
-        type: "RESUME_SESSION",
-        meta: { remote: true },
-        session: { sessionId },
-      });
-    } else {
-      // Inititalize the session and persist the sessionId to localStorage
-      socketIOConnectionInstance.on("sessionInitialized", (sessionId) => {
-        localStorage.setItem("sessionId", sessionId);
-      });
-    }
-  }, []);
  return (
-    <SocketIOProvider socket={socketIOConnectionInstance}>
-      <AirDCPPSocketContextProvider>
-        <div>
-          <AirDCPPSocketComponent />
-          <Navbar />
-          <Routes>
-            <Route path="/" element={<Dashboard />} />
-            <Route path="/import" element={<Import path={"./comics"} />} />
-            <Route
-              path="/library"
-              element={<TabulatedContentContainer category="library" />}
-            />
-            <Route path="/library-grid" element={<LibraryGrid />} />
-            <Route path="/downloads" element={<Downloads data={{}} />} />
-            <Route path="/search" element={<Search />} />
-            <Route
-              path={"/comic/details/:comicObjectId"}
-              element={<ComicDetailContainer />}
-            />
-            <Route
-              path={"/volume/details/:comicObjectId"}
-              element={<VolumeDetail />}
-            />
-            <Route path="/settings" element={<Settings />} />
-            <Route
-              path="/pull-list/all"
-              element={<TabulatedContentContainer category="pullList" />}
-            />
-            <Route
-              path="/wanted/all"
-              element={<TabulatedContentContainer category="wanted" />}
-            />
-            <Route
-              path="/volumes/all"
-              element={<TabulatedContentContainer category="volumes" />}
-            />
-          </Routes>
-        </div>
-      </AirDCPPSocketContextProvider>
-    </SocketIOProvider>
+    <>
+      <Navbar2 />
+      <Outlet />
+    </>
  );
 };

--- a/src/client/components/Carda.tsx
+++ b/src/client/components/Carda.tsx
@@ -1,92 +0,0 @@
-import React, { ReactElement } from "react";
-import PropTypes from "prop-types";
-import { isEmpty, isNil } from "lodash";
-
-interface ICardProps {
-  orientation: string;
-  imageUrl: string;
-  hasDetails: boolean;
-  title?: PropTypes.ReactElementLike | null;
-  children?: PropTypes.ReactNodeLike;
-  borderColorClass?: string;
-  backgroundColor?: string;
-  onClick?: (event: React.MouseEvent<HTMLElement>) => void;
-  cardContainerStyle?: PropTypes.object;
-  imageStyle?: PropTypes.object;
-}
-
-const renderCard = (props): ReactElement => {
-  switch (props.orientation) {
-    case "horizontal":
-      return (
-        <div className="card-container">
-          <div className="card generic-card">
-            <div className="is-horizontal">
-              <div className="card-image">
-                <img
-                  style={props.imageStyle}
-                  src={props.imageUrl}
-                  alt="Placeholder image"
-                  className="cropped-image"
-                />
-              </div>
-              {props.hasDetails && (
-                <div className="card-content">{props.children}</div>
-              )}
-            </div>
-          </div>
-        </div>
-      );
-    case "vertical":
-      return (
-        <div onClick={props.onClick}>
-          <div className="generic-card" style={props.cardContainerStyle}>
-            <div
-              className={
-                !isNil(props.borderColorClass)
-                  ? `${props.borderColorClass}`
-                  : ""
-              }
-            >
-              <div
-                className={
-                  props.hasDetails
-                    ? "partial-rounded-card-image"
-                    : "rounded-card-image"
-                }
-              >
-                <figure>
-                  <img
-                    src={props.imageUrl}
-                    style={props.imageStyle}
-                    alt="Placeholder image"
-                  />
-                </figure>
-              </div>
-              {props.hasDetails && (
-                <div
-                  className="card-content"
-                  style={{ backgroundColor: props.backgroundColor }}
-                >
-                  {!isNil(props.title) ? (
-                    <div className="card-title is-size-8 is-family-secondary">
-                      {props.title}
-                    </div>
-                  ) : null}
-                  {props.children}
-                </div>
-              )}
-            </div>
-          </div>
-        </div>
-      );
-    default:
-      return <></>;
-  }
-};
-
-export const Card = (props: ICardProps): ReactElement => {
-  return renderCard(props);
-};
-
-export default Card;
--- a/src/client/components/ComicDetail/AcquisitionPanel.tsx
+++ b/src/client/components/ComicDetail/AcquisitionPanel.tsx
@@ -1,21 +1,15 @@
-import React, {
-  useCallback,
-  useContext,
-  ReactElement,
-  useEffect,
-  useState,
-} from "react";
-import {
-  search,
-  downloadAirDCPPItem,
-  getBundlesForComic,
-} from "../../actions/airdcpp.actions";
-import { useDispatch, useSelector } from "react-redux";
+import React, { useCallback, ReactElement, useEffect, useState } from "react";
+import { getBundlesForComic, sleep } from "../../actions/airdcpp.actions";
+import { SearchQuery, PriorityEnum, SearchResponse } from "threetwo-ui-typings";
 import { RootState, SearchInstance } from "threetwo-ui-typings";
 import ellipsize from "ellipsize";
 import { Form, Field } from "react-final-form";
+import { difference } from "../../shared/utils/object.utils";
 import { isEmpty, isNil, map } from "lodash";
-import { AirDCPPSocketContext } from "../../context/AirDCPPSocket";
+import { useStore } from "../../store";
+import { useShallow } from "zustand/react/shallow";
+import { useQuery, useQueryClient } from "@tanstack/react-query";
+import axios from "axios";

 interface IAcquisitionPanelProps {
  query: any;
@@ -27,162 +21,268 @@ interface IAcquisitionPanelProps {
 export const AcquisitionPanel = (
  props: IAcquisitionPanelProps,
 ): ReactElement => {
+  const {
+    airDCPPSocketInstance,
+    airDCPPClientConfiguration,
+    airDCPPSessionInformation,
+    airDCPPDownloadTick,
+  } = useStore(
+    useShallow((state) => ({
+      airDCPPSocketInstance: state.airDCPPSocketInstance,
+      airDCPPClientConfiguration: state.airDCPPClientConfiguration,
+      airDCPPSessionInformation: state.airDCPPSessionInformation,
+      airDCPPDownloadTick: state.airDCPPDownloadTick,
+    })),
+  );
+
+  interface SearchData {
+    query: Pick<SearchQuery, "pattern"> & Partial<Omit<SearchQuery, "pattern">>;
+    hub_urls: string[] | undefined | null;
+    priority: PriorityEnum;
+  }
+
+  /**
+   * Get the hubs list from an AirDCPP Socket
+   */
+  const { data: hubs } = useQuery({
+    queryKey: ["hubs"],
+    queryFn: async () => await airDCPPSocketInstance.get(`hubs`),
+  });
+  const { comicObjectId } = props;
  const issueName = props.query.issue.name || "";
-  // const { settings } = props;
  const sanitizedIssueName = issueName.replace(/[^a-zA-Z0-9 ]/g, " ");

-  // Selectors for picking state
-  const airDCPPSearchResults = useSelector((state: RootState) => {
-    return state.airdcpp.searchResults;
-  });
-  const isAirDCPPSearchInProgress = useSelector(
-    (state: RootState) => state.airdcpp.isAirDCPPSearchInProgress,
-  );
-  const searchInfo = useSelector(
-    (state: RootState) => state.airdcpp.searchInfo,
-  );
-  const searchInstance: SearchInstance = useSelector(
-    (state: RootState) => state.airdcpp.searchInstance,
-  );
-
-  // const settings = useSelector((state: RootState) => state.settings.data);
-  const airDCPPConfiguration = useContext(AirDCPPSocketContext);
-
-  const dispatch = useDispatch();
  const [dcppQuery, setDcppQuery] = useState({});
+  const [airDCPPSearchResults, setAirDCPPSearchResults] = useState([]);
+  const [airDCPPSearchStatus, setAirDCPPSearchStatus] = useState(false);
+  const [airDCPPSearchInstance, setAirDCPPSearchInstance] = useState({});
+  const [airDCPPSearchInfo, setAirDCPPSearchInfo] = useState({});
+  const queryClient = useQueryClient();

+  // Construct a AirDC++ query based on metadata inferred, upon component mount
+  // Pre-populate the search input with the search string, so that
+  // All the user has to do is hit "Search AirDC++"
  useEffect(() => {
-    if (!isEmpty(airDCPPConfiguration.airDCPPState.settings)) {
-      // AirDC++ search query
-      const dcppSearchQuery = {
-        query: {
-          pattern: `${sanitizedIssueName.replace(/#/g, "")}`,
-          extensions: ["cbz", "cbr", "cb7"],
+    // AirDC++ search query
+    const dcppSearchQuery = {
+      query: {
+        pattern: `${sanitizedIssueName.replace(/#/g, "")}`,
+        extensions: ["cbz", "cbr", "cb7"],
+      },
+      hub_urls: map(hubs, (item) => item.value),
+      priority: 5,
+    };
+    setDcppQuery(dcppSearchQuery);
+  }, []);
+
+  /**
+   * Method to perform a search via an AirDC++ websocket
+   * @param {SearchData} data - a SearchData query
+   * @param {any} ADCPPSocket - an intialized AirDC++ socket instance
+   */
+  const search = async (data: SearchData, ADCPPSocket: any) => {
+    try {
+      if (!ADCPPSocket.isConnected()) {
+        await ADCPPSocket();
+      }
+      const instance: SearchInstance = await ADCPPSocket.post("search");
+      setAirDCPPSearchStatus(true);
+
+      // We want to get notified about every new result in order to make the user experience better
+      await ADCPPSocket.addListener(
+        `search`,
+        "search_result_added",
+        async (groupedResult) => {
+          // ...add the received result in the UI
+          // (it's probably a good idea to have some kind of throttling for the UI updates as there can be thousands of results)
+          setAirDCPPSearchResults((state) => [...state, groupedResult]);
        },
-        hub_urls: map(
-          airDCPPConfiguration.airDCPPState.settings.directConnect.client.hubs,
-          (item) => item.value,
-        ),
-        priority: 5,
-      };
-      setDcppQuery(dcppSearchQuery);
+        instance.id,
+      );
+
+      // We also want to update the existing items in our list when new hits arrive for the previously listed files/directories
+      await ADCPPSocket.addListener(
+        `search`,
+        "search_result_updated",
+        async (groupedResult) => {
+          // ...update properties of the existing result in the UI
+          const bundleToUpdateIndex = airDCPPSearchResults?.findIndex(
+            (bundle) => bundle.result.id === groupedResult.result.id,
+          );
+          const updatedState = [...airDCPPSearchResults];
+          if (
+            !isNil(difference(updatedState[bundleToUpdateIndex], groupedResult))
+          ) {
+            updatedState[bundleToUpdateIndex] = groupedResult;
+          }
+          setAirDCPPSearchResults((state) => [...state, ...updatedState]);
+        },
+        instance.id,
+      );
+
+      // We need to show something to the user in case the search won't yield any results so that he won't be waiting forever)
+      // Wait for 5 seconds for any results to arrive after the searches were sent to the hubs
+      await ADCPPSocket.addListener(
+        `search`,
+        "search_hub_searches_sent",
+        async (searchInfo) => {
+          await sleep(5000);
+
+          // Check the number of received results (in real use cases we should know that even without calling the API)
+          const currentInstance = await ADCPPSocket.get(
+            `search/${instance.id}`,
+          );
+          setAirDCPPSearchInstance(currentInstance);
+          setAirDCPPSearchInfo(searchInfo);
+          if (currentInstance.result_count === 0) {
+            // ...nothing was received, show an informative message to the user
+            console.log("No more search results.");
+          }
+
+          // The search can now be considered to be "complete"
+          // If there's an "in progress" indicator in the UI, that could also be disabled here
+          setAirDCPPSearchInstance(instance);
+          setAirDCPPSearchStatus(false);
+        },
+        instance.id,
+      );
+      // Finally, perform the actual search
+      await ADCPPSocket.post(`search/${instance.id}/hub_search`, data);
+    } catch (error) {
+      console.log(error);
+      throw error;
    }
-  }, [airDCPPConfiguration]);
+  };

-  const getDCPPSearchResults = useCallback(
-    async (searchQuery) => {
-      const manualQuery = {
-        query: {
-          pattern: `${searchQuery.issueName}`,
-          extensions: ["cbz", "cbr", "cb7"],
-        },
-        hub_urls: map(
-          airDCPPConfiguration.airDCPPState.settings.directConnect.client.hubs,
-          (item) => item.value,
-        ),
-        priority: 5,
-      };
-      dispatch(
-        search(manualQuery, airDCPPConfiguration.airDCPPState.socket, {
-          username: `${airDCPPConfiguration.airDCPPState.settings.directConnect.client.host.username}`,
-          password: `${airDCPPConfiguration.airDCPPState.settings.directConnect.client.host.password}`,
-        }),
+  /**
+   * Method to download a bundle associated with a search result from AirDC++
+   * @param {Number} searchInstanceId - description
+   * @param {String} resultId - description
+   * @param {String} comicObjectId - description
+   * @param {String} name - description
+   * @param {Number} size - description
+   * @param {any} type - description
+   * @param {any} ADCPPSocket - description
+   * @returns {void}  - description
+   */
+  const download = async (
+    searchInstanceId: Number,
+    resultId: String,
+    comicObjectId: String,
+    name: String,
+    size: Number,
+    type: any,
+    ADCPPSocket: any,
+  ): void => {
+    try {
+      if (!ADCPPSocket.isConnected()) {
+        await ADCPPSocket.connect();
+      }
+      let bundleDBImportResult = {};
+      const downloadResult = await ADCPPSocket.post(
+        `search/${searchInstanceId}/results/${resultId}/download`,
      );
-    },
-    [dispatch, airDCPPConfiguration],
-  );

-  // download via AirDC++
-  const downloadDCPPResult = useCallback(
-    (searchInstanceId, resultId, name, size, type) => {
-      dispatch(
-        downloadAirDCPPItem(
-          searchInstanceId,
-          resultId,
-          props.comicObjectId,
-          name,
-          size,
-          type,
-          airDCPPConfiguration.airDCPPState.socket,
-          {
-            username: `${airDCPPConfiguration.airDCPPState.settings.directConnect.client.host.username}`,
-            password: `${airDCPPConfiguration.airDCPPState.settings.directConnect.client.host.password}`,
+      if (!isNil(downloadResult)) {
+        bundleDBImportResult = await axios({
+          method: "POST",
+          url: `http://localhost:3000/api/library/applyAirDCPPDownloadMetadata`,
+          headers: {
+            "Content-Type": "application/json; charset=utf-8",
          },
-        ),
-      );
-      // this is to update the download count badge on the downloads tab
-      dispatch(
-        getBundlesForComic(
-          props.comicObjectId,
-          airDCPPConfiguration.airDCPPState.socket,
-          {
-            username: `${airDCPPConfiguration.airDCPPState.settings.directConnect.client.host.username}`,
-            password: `${airDCPPConfiguration.airDCPPState.settings.directConnect.client.host.password}`,
+          data: {
+            bundleId: downloadResult.bundle_info.id,
+            comicObjectId,
+            name,
+            size,
+            type,
          },
-        ),
-      );
-    },
-    [airDCPPConfiguration],
-  );
+        });
+        console.log(bundleDBImportResult?.data);
+        queryClient.invalidateQueries({ queryKey: ["comicBookMetadata"] });
+
+        //         dispatch({
+        //           type: AIRDCPP_RESULT_DOWNLOAD_INITIATED,
+        //           downloadResult,
+        //           bundleDBImportResult,
+        //         });
+        //
+        //         dispatch({
+        //           type: IMS_COMIC_BOOK_DB_OBJECT_FETCHED,
+        //           comicBookDetail: bundleDBImportResult.data,
+        //           IMS_inProgress: false,
+        //         });
+      }
+    } catch (error) {
+      throw error;
+    }
+  };
+  const getDCPPSearchResults = async (searchQuery) => {
+    const manualQuery = {
+      query: {
+        pattern: `${searchQuery.issueName}`,
+        extensions: ["cbz", "cbr", "cb7"],
+      },
+      hub_urls: map(hubs, (hub) => hub.hub_url),
+      priority: 5,
+    };
+
+    search(manualQuery, airDCPPSocketInstance);
+  };
+
  return (
    <>
-      <div className="comic-detail columns">
-        {!isEmpty(airDCPPConfiguration.airDCPPState.socket) ? (
+      <div className="mt-5">
+        {!isEmpty(airDCPPSocketInstance) ? (
          <Form
            onSubmit={getDCPPSearchResults}
            initialValues={{
              issueName,
            }}
            render={({ handleSubmit, form, submitting, pristine, values }) => (
-              <form
-                onSubmit={handleSubmit}
-                className="column is-three-quarters"
-              >
-                <div className="box search">
-                  <div className="columns">
-                    <Field name="issueName">
-                      {({ input, meta }) => {
-                        return (
-                          <div className="column is-two-thirds">
-                            <input
-                              {...input}
-                              className="input main-search-bar is-medium"
-                              placeholder="Type an issue/volume name"
-                            />
-                            <span className="help is-clearfix is-light is-info">
-                              Use this to perform a manual search.
-                            </span>
+              <form onSubmit={handleSubmit}>
+                <Field name="issueName">
+                  {({ input, meta }) => {
+                    return (
+                      <div className="max-w-fit">
+                        <div className="flex flex-row bg-slate-300 dark:bg-slate-400 rounded-l-lg">
+                          <div className="w-10 pl-2 pt-1 text-gray-400 dark:text-gray-200">
+                            <i className="icon-[solar--magnifer-bold-duotone] h-7 w-7" />
                          </div>
-                        );
-                      }}
-                    </Field>
+                          <input
+                            {...input}
+                            className="dark:bg-slate-400 bg-slate-300 py-2 px-2 rounded-l-md border-gray-300 h-10 min-w-full dark:text-slate-800 sm:text-md sm:leading-5 focus:outline-none focus:shadow-outline-blue focus:border-blue-300"
+                            placeholder="Type an issue/volume name"
+                          />

-                    <div className="column">
-                      <button
-                        type="submit"
-                        className={
-                          isAirDCPPSearchInProgress
-                            ? "button is-loading is-warning"
-                            : "button"
-                        }
-                      >
-                        <span className="icon is-small">
-                          <img src="/src/client/assets/img/airdcpp_logo.svg" />
-                        </span>
-                        <span className="airdcpp-text">Search on AirDC++</span>
-                      </button>
-                    </div>
-                  </div>
-                </div>
+                          <button
+                            className="sm:mt-0 min-w-fit rounded-r-lg border border-green-400 dark:border-green-200 bg-green-200 px-3 py-1 text-gray-500 hover:bg-transparent hover:text-green-600 focus:outline-none focus:ring active:text-indigo-500"
+                            type="submit"
+                          >
+                            <div className="flex flex-row">
+                              Search DC++
+                              <div className="h-5 w-5 ml-2">
+                                <img
+                                  src="/src/client/assets/img/airdcpp_logo.svg"
+                                  className="h-5 w-5"
+                                />
+                              </div>
+                            </div>
+                          </button>
+                        </div>
+                      </div>
+                    );
+                  }}
+                </Field>
              </form>
            )}
          />
        ) : (
-          <div className="column is-three-fifths">
-            <article className="message is-info">
-              <div className="message-body is-size-6 is-family-secondary">
+          <div className="">
+            <article className="">
+              <div className="">
                AirDC++ is not configured. Please configure it in{" "}
-                <code>Settings</code>.
+                <code>Settings &gt; AirDC++ &gt; Connection</code>.
              </div>
            </article>
          </div>
@@ -190,91 +290,127 @@ export const AcquisitionPanel = (
      </div>

      {/* AirDC++ search instance details */}
-      {!isNil(searchInfo) && !isNil(searchInstance) && (
-        <div className="columns">
-          <div className="column is-one-quarter is-size-7">
-            <div className="card">
-              <div className="card-content">
-                <dl>
-                  <dt>
-                    <div className="tags mb-1">
-                      {airDCPPConfiguration.airDCPPState.settings.directConnect.client.hubs.map(
-                        ({ value }) => (
-                          <span className="tag is-warning" key={value}>
-                            {value}
-                          </span>
-                        ),
-                      )}
-                    </div>
-                  </dt>
-                  <dt>
-                    Query:{" "}
-                    <span className="has-text-weight-semibold">
-                      {searchInfo.query.pattern}
-                    </span>
-                  </dt>
-                  <dd>Extensions: {searchInfo.query.extensions.join(", ")}</dd>
-                  <dd>File type: {searchInfo.query.file_type}</dd>
-                </dl>
-              </div>
+      {!isNil(airDCPPSearchInstance) &&
+        !isEmpty(airDCPPSearchInfo) &&
+        !isNil(hubs) && (
+          <div className="flex flex-row gap-3 my-5 font-hasklig">
+            <div className="block max-w-sm h-fit p-6 text-sm bg-white border border-gray-200 rounded-lg shadow dark:bg-slate-400 dark:border-gray-700">
+              <dl>
+                <dt>
+                  <div className="mb-1">
+                    {hubs.map((value, idx) => (
+                      <span className="tag is-warning" key={idx}>
+                        {value.identity.name}
+                      </span>
+                    ))}
+                  </div>
+                </dt>
+
+                <dt>
+                  Query:
+                  <span className="has-text-weight-semibold">
+                    {airDCPPSearchInfo.query.pattern}
+                  </span>
+                </dt>
+                <dd>
+                  Extensions:
+                  <span className="has-text-weight-semibold">
+                    {airDCPPSearchInfo.query.extensions.join(", ")}
+                  </span>
+                </dd>
+                <dd>
+                  File type:
+                  <span className="has-text-weight-semibold">
+                    {airDCPPSearchInfo.query.file_type}
+                  </span>
+                </dd>
+              </dl>
+            </div>
+            <div className="block max-w-sm p-6 h-fit text-sm bg-white border border-gray-200 rounded-lg shadow dark:bg-slate-400 dark:border-gray-700">
+              <dl>
+                <dt>Search Instance: {airDCPPSearchInstance.id}</dt>
+                <dt>Owned by {airDCPPSearchInstance.owner}</dt>
+                <dd>Expires in: {airDCPPSearchInstance.expires_in}</dd>
+              </dl>
            </div>
          </div>
-          <div className="column is-one-quarter is-size-7">
-            <div className="card">
-              <div className="card-content">
-                <dl>
-                  <dt>Search Instance: {searchInstance.id}</dt>
-                  <dt>Owned by {searchInstance.owner}</dt>
-                  <dd>Expires in: {searchInstance.expires_in}</dd>
-                </dl>
-              </div>
-            </div>
-          </div>
-        </div>
-      )}
+        )}

      {/* AirDC++ results */}
      <div className="columns">
        {!isNil(airDCPPSearchResults) && !isEmpty(airDCPPSearchResults) ? (
-          <div className="column">
-            <table className="table">
+          <div className="overflow-x-auto w-fit mt-4 rounded-lg border border-gray-200 dark:border-gray-500">
+            <table className="min-w-full divide-y-2 divide-gray-200 dark:divide-gray-500 text-md">
              <thead>
                <tr>
-                  <th>Name</th>
-                  <th>Type</th>
-                  <th>Slots</th>
-                  <th>Actions</th>
+                  <th className="whitespace-nowrap px-2 py-2 font-medium text-gray-900 dark:text-slate-200">
+                    Name
+                  </th>
+                  <th className="whitespace-nowrap py-2 font-medium text-gray-900 dark:text-slate-200">
+                    Type
+                  </th>
+                  <th className="whitespace-nowrap py-2 font-medium text-gray-900 dark:text-slate-200">
+                    Slots
+                  </th>
+                  <th className="whitespace-nowrap py-2 font-medium text-gray-900 dark:text-slate-200">
+                    Actions
+                  </th>
                </tr>
              </thead>
-              <tbody>
+              <tbody className="divide-y divide-slate-100 dark:divide-gray-500">
                {map(airDCPPSearchResults, ({ result }, idx) => {
                  return (
                    <tr
                      key={idx}
                      className={
-                        !isNil(result.dupe) ? "dupe-search-result" : ""
+                        !isNil(result.dupe)
+                          ? "bg-gray-100 dark:bg-gray-700"
+                          : "w-fit text-sm"
                      }
                    >
-                      <td>
+                      <td className="whitespace-nowrap px-3 py-3 text-gray-700 dark:text-slate-300">
                        <p className="mb-2">
                          {result.type.id === "directory" ? (
                            <i className="fas fa-folder"></i>
-                          ) : null}{" "}
+                          ) : null}
                          {ellipsize(result.name, 70)}
                        </p>

                        <dl>
                          <dd>
-                            <div className="tags">
+                            <div className="inline-flex flex-row gap-2">
                              {!isNil(result.dupe) ? (
-                                <span className="tag is-warning">Dupe</span>
+                                <span className="inline-flex items-center bg-slate-50 text-slate-800 text-xs font-medium px-2 rounded-md dark:text-slate-900 dark:bg-slate-400">
+                                  <span className="pr-1 pt-1">
+                                    <i className="icon-[solar--copy-bold-duotone] w-5 h-5"></i>
+                                  </span>
+
+                                  <span className="text-md text-slate-500 dark:text-slate-900">
+                                    Dupe
+                                  </span>
+                                </span>
                              ) : null}
-                              <span className="tag is-light is-info">
-                                {result.users.user.nicks}
+
+                              {/* Nicks */}
+                              <span className="inline-flex items-center bg-slate-50 text-slate-800 text-xs font-medium px-2 rounded-md dark:text-slate-900 dark:bg-slate-400">
+                                <span className="pr-1 pt-1">
+                                  <i className="icon-[solar--user-rounded-bold-duotone] w-5 h-5"></i>
+                                </span>
+
+                                <span className="text-md text-slate-500 dark:text-slate-900">
+                                  {result.users.user.nicks}
+                                </span>
                              </span>
+                              {/* Flags */}
                              {result.users.user.flags.map((flag, idx) => (
-                                <span className="tag is-light" key={idx}>
-                                  {flag}
+                                <span className="inline-flex items-center bg-slate-50 text-slate-800 text-xs font-medium px-2 rounded-md dark:text-slate-900 dark:bg-slate-400">
+                                  <span className="pr-1 pt-1">
+                                    <i className="icon-[solar--tag-horizontal-bold-duotone] w-5 h-5"></i>
+                                  </span>
+
+                                  <span className="text-md text-slate-500 dark:text-slate-900">
+                                    {flag}
+                                  </span>
                                </span>
                              ))}
                            </div>
@@ -282,36 +418,49 @@ export const AcquisitionPanel = (
                        </dl>
                      </td>
                      <td>
-                        <span className="tag is-light is-info">
-                          {result.type.id === "directory"
-                            ? "directory"
-                            : result.type.str}
+                        {/* Extension */}
+                        <span className="inline-flex items-center bg-slate-50 text-slate-800 text-xs font-medium px-2 rounded-md dark:text-slate-900 dark:bg-slate-400">
+                          <span className="pr-1 pt-1">
+                            <i className="icon-[solar--zip-file-bold-duotone] w-5 h-5"></i>
+                          </span>
+
+                          <span className="text-md text-slate-500 dark:text-slate-900">
+                            {result.type.str}
+                          </span>
                        </span>
                      </td>
-                      <td>
-                        <div className="tags has-addons">
-                          <span className="tag is-success">
-                            {result.slots.free} free
+                      <td className="px-2">
+                        {/* Slots */}
+                        <span className="inline-flex items-center bg-slate-50 text-slate-800 text-xs font-medium px-2 rounded-md dark:text-slate-900 dark:bg-slate-400">
+                          <span className="pr-1 pt-1">
+                            <i className="icon-[solar--settings-minimalistic-bold-duotone] w-5 h-5"></i>
                          </span>
-                          <span className="tag is-light">
-                            {result.slots.total}
+
+                          <span className="text-md text-slate-500 dark:text-slate-900">
+                            {result.slots.total} slots; {result.slots.free} free
                          </span>
-                        </div>
+                        </span>
                      </td>
-                      <td>
-                        <a
+                      <td className="px-2">
+                        <button
+                          className="flex space-x-1 sm:mt-0 sm:flex-row sm:items-center rounded-lg border border-green-400 dark:border-green-200 bg-green-200 px-3 py-1 text-gray-500 hover:bg-transparent hover:text-green-600 focus:outline-none focus:ring active:text-indigo-500"
                          onClick={() =>
-                            downloadDCPPResult(
-                              searchInstance.id,
+                            download(
+                              airDCPPSearchInstance.id,
                              result.id,
+                              comicObjectId,
                              result.name,
                              result.size,
                              result.type,
+                              airDCPPSocketInstance,
                            )
                          }
                        >
-                          <i className="fas fa-file-download"></i>
-                        </a>
+                          <span className="text-xs">Download</span>
+                          <span className="w-5 h-5">
+                            <i className="h-5 w-5 icon-[solar--download-bold-duotone]"></i>
+                          </span>
+                        </button>
                      </td>
                    </tr>
                  );
@@ -320,13 +469,28 @@ export const AcquisitionPanel = (
            </table>
          </div>
        ) : (
-          <div className="column is-three-fifths">
-            <article className="message is-info">
-              <div className="message-body is-size-6 is-family-secondary">
+          <div className="">
+            <article
+              role="alert"
+              className="mt-4 rounded-lg text-sm max-w-screen-md border-s-4 border-blue-500 bg-blue-50 p-4 dark:border-s-4 dark:border-blue-600 dark:bg-blue-300 dark:text-slate-600"
+            >
+              <div>
+                The default search term is an auto-detected title; you may need
+                to change it to get better matches if the auto-detected one
+                doesn't work.
+              </div>
+            </article>
+
+            <article
+              role="alert"
+              className="mt-4 rounded-lg text-sm max-w-screen-md border-s-4 border-blue-500 bg-blue-50 p-4 dark:border-s-4 dark:border-blue-600 dark:bg-blue-300 dark:text-slate-600"
+            >
+              <div>
                Searching via <strong>AirDC++</strong> is still in{" "}
                <strong>alpha</strong>. Some searches may take arbitrarily long,
-                or may not work at all. Searches from <code>ADCS</code> hubs are
-                more reliable than <code>NMDCS</code> ones.
+                or may not work at all. Searches from{" "}
+                <code className="font-hasklig">ADCS</code> hubs are more
+                reliable than <code className="font-hasklig">NMDCS</code> ones.
              </div>
            </article>
          </div>
@@ -336,4 +500,4 @@ export const AcquisitionPanel = (
  );
 };

-export default AcquisitionPanel;
+export default AcquisitionPanel;
--- a/src/client/components/ComicDetail/ActionMenu/Menu.tsx
+++ b/src/client/components/ComicDetail/ActionMenu/Menu.tsx
@@ -1,87 +1,26 @@
-import { filter, isEmpty, isNil, isUndefined } from "lodash";
-import React, { ReactElement, useCallback } from "react";
-import { useSelector, useDispatch } from "react-redux";
-import Select, { components } from "react-select";
-import { fetchComicVineMatches } from "../../../actions/fileops.actions";
-import { refineQuery } from "filename-parser";
+import React, { ReactElement } from "react";
+import Select from "react-select";

 export const Menu = (props): ReactElement => {
-  const { data } = props;
-  const { setSlidingPanelContentId, setVisible } = props.handlers;
-  const dispatch = useDispatch();
-  const openDrawerWithCVMatches = useCallback(() => {
-    let seriesSearchQuery: IComicVineSearchQuery = {} as IComicVineSearchQuery;
-    let issueSearchQuery: IComicVineSearchQuery = {} as IComicVineSearchQuery;
-
-    if (!isUndefined(data.rawFileDetails)) {
-      issueSearchQuery = refineQuery(data.rawFileDetails.name);
-    } else if (!isEmpty(data.sourcedMetadata)) {
-      issueSearchQuery = refineQuery(data.sourcedMetadata.comicvine.name);
-    }
-    dispatch(fetchComicVineMatches(data, issueSearchQuery, seriesSearchQuery));
-    setSlidingPanelContentId("CVMatches");
-    setVisible(true);
-  }, [dispatch, data]);
-
-  const openEditMetadataPanel = useCallback(() => {
-    setSlidingPanelContentId("editComicBookMetadata");
-    setVisible(true);
-  }, []);
-  //  Actions menu options and handler
-  const CVMatchLabel = (
-    <span>
-      <i className="fa-solid fa-wand-magic"></i> Match on ComicVine
-    </span>
-  );
-  const editLabel = (
-    <span>
-      <i className="fa-regular fa-pen-to-square"></i> Edit Metadata
-    </span>
-  );
-  const deleteLabel = (
-    <span>
-      <i className="fa-regular fa-trash-alt"></i> Delete Comic
-    </span>
-  );
-  const Placeholder = (props) => {
-    return <components.Placeholder {...props} />;
-  };
-  const actionOptions = [
-    { value: "match-on-comic-vine", label: CVMatchLabel },
-    { value: "edit-metdata", label: editLabel },
-    { value: "delete-comic", label: deleteLabel },
-  ];
-
-  const filteredActionOptions = filter(actionOptions, (item) => {
-    if (isUndefined(data.rawFileDetails)) {
-      return item.value !== "match-on-comic-vine";
-    }
-    return item;
-  });
-  const handleActionSelection = (action) => {
-    switch (action.value) {
-      case "match-on-comic-vine":
-        openDrawerWithCVMatches();
-        break;
-      case "edit-metdata":
-        openEditMetadataPanel();
-        break;
-      default:
-        console.log("No valid action selected.");
-        break;
-    }
-  };
+  const {
+    filteredActionOptions,
+    customStyles,
+    handleActionSelection,
+    Placeholder,
+  } = props.configuration;

  return (
    <Select
-      className="basic-single"
-      classNamePrefix="select"
      components={{ Placeholder }}
      placeholder={
-        <span>
-          <i className="fa-solid fa-list"></i> Actions
+        <span className="inline-flex flex-row items-center gap-2 pt-1">
+          <div className="w-6 h-6">
+            <i className="icon-[solar--cursor-bold-duotone] w-6 h-6"></i>
+          </div>
+          <div>Select An Action</div>
        </span>
      }
+      styles={customStyles}
      name="actions"
      isSearchable={false}
      options={filteredActionOptions}
--- a/src/client/components/ComicDetail/AirDCPPBundles.tsx
+++ b/src/client/components/ComicDetail/AirDCPPBundles.tsx
@@ -0,0 +1,51 @@
+import React from "react";
+import prettyBytes from "pretty-bytes";
+import dayjs from "dayjs";
+import ellipsize from "ellipsize";
+import { map } from "lodash";
+
+export const AirDCPPBundles = (props) => {
+  return (
+    <div className="overflow-x-auto w-fit mt-4 rounded-lg border border-gray-200">
+      <table className="min-w-full divide-y-2 divide-gray-200 dark:divide-gray-200 text-md">
+        <thead>
+          <tr>
+            <th className="whitespace-nowrap px-4 py-2 font-medium text-gray-900 dark:text-slate-200">
+              Filename
+            </th>
+            <th className="whitespace-nowrap px-4 py-2 font-medium text-gray-900 dark:text-slate-200">
+              Size
+            </th>
+            <th className="whitespace-nowrap px-4 py-2 font-medium text-gray-900 dark:text-slate-200">
+              Download Time
+            </th>
+            <th className="whitespace-nowrap px-4 py-2 font-medium text-gray-900 dark:text-slate-200">
+              Bundle ID
+            </th>
+          </tr>
+        </thead>
+        <tbody className="divide-y divide-gray-200">
+          {map(props.data, (bundle) => (
+            <tr key={bundle.id} className="text-sm">
+              <td className="whitespace-nowrap px-2 py-2 text-gray-700 dark:text-slate-300">
+                <h5>{ellipsize(bundle.name, 58)}</h5>
+                <span className="text-xs">{ellipsize(bundle.target, 88)}</span>
+              </td>
+              <td className="whitespace-nowrap px-2 py-2 text-gray-700 dark:text-slate-300">
+                {prettyBytes(bundle.size)}
+              </td>
+              <td className="whitespace-nowrap px-2 py-2 text-gray-700 dark:text-slate-300">
+                {dayjs
+                  .unix(bundle.time_finished)
+                  .format("h:mm on ddd, D MMM, YYYY")}
+              </td>
+              <td className="whitespace-nowrap px-2 py-2 text-gray-700 dark:text-slate-300">
+                <span className="tag is-warning">{bundle.id}</span>
+              </td>
+            </tr>
+          ))}
+        </tbody>
+      </table>
+    </div>
+  );
+};
--- a/src/client/components/ComicDetail/ComicDetail.tsx
+++ b/src/client/components/ComicDetail/ComicDetail.tsx
@@ -1,11 +1,10 @@
 import React, { useState, ReactElement, useCallback } from "react";
-import { useDispatch, useSelector } from "react-redux";
 import { useParams } from "react-router-dom";
-import Card from "../Carda";
+import Card from "../shared/Carda";
 import { ComicVineMatchPanel } from "./ComicVineMatchPanel";

 import { RawFileDetails } from "./RawFileDetails";
-import { ComicVineSearchForm } from "../ComicVineSearchForm";
+import { ComicVineSearchForm } from "./ComicVineSearchForm";

 import TabControls from "./TabControls";
 import { EditMetadataPanel } from "./EditMetadataPanel";
@@ -13,10 +12,12 @@ import { Menu } from "./ActionMenu/Menu";
 import { ArchiveOperations } from "./Tabs/ArchiveOperations";
 import { ComicInfoXML } from "./Tabs/ComicInfoXML";
 import AcquisitionPanel from "./AcquisitionPanel";
+import TorrentSearchPanel from "./TorrentSearchPanel";
 import DownloadsPanel from "./DownloadsPanel";
 import { VolumeInformation } from "./Tabs/VolumeInformation";

-import { isEmpty, isUndefined, isNil } from "lodash";
+import { isEmpty, isUndefined, isNil, filter } from "lodash";
+import { components } from "react-select";
 import { RootState } from "threetwo-ui-typings";

 import "react-sliding-pane/dist/react-sliding-pane.css";
@@ -28,6 +29,10 @@ import ComicViewer from "react-comic-viewer";

 import { extractComicArchive } from "../../actions/fileops.actions";
 import { determineCoverFile } from "../../shared/utils/metadata.utils";
+import axios from "axios";
+import { styled } from "styled-components";
+import { COMICVINE_SERVICE_URI } from "../../constants/endpoints";
+import { refineQuery } from "filename-parser";

 type ComicDetailProps = {};
 /**
@@ -47,6 +52,9 @@ export const ComicDetail = (data: ComicDetailProps): ReactElement => {
      rawFileDetails,
      inferredMetadata,
      sourcedMetadata: { comicvine, locg, comicInfo },
+      acquisition,
+      createdAt,
+      updatedAt,
    },
    userSettings,
  } = data;
@@ -54,37 +62,29 @@ export const ComicDetail = (data: ComicDetailProps): ReactElement => {
  const [visible, setVisible] = useState(false);
  const [slidingPanelContentId, setSlidingPanelContentId] = useState("");
  const [modalIsOpen, setIsOpen] = useState(false);
+  const [comicVineMatches, setComicVineMatches] = useState([]);

-  const comicVineSearchResults = useSelector(
-    (state: RootState) => state.comicInfo.searchResults,
-  );
-  const comicVineSearchQueryObject = useSelector(
-    (state: RootState) => state.comicInfo.searchQuery,
-  );
-  const comicVineAPICallProgress = useSelector(
-    (state: RootState) => state.comicInfo.inProgress,
-  );
-
-  const extractedComicBook = useSelector(
-    (state: RootState) => state.fileOps.extractedComicBookArchive.reading,
-  );
  const { comicObjectId } = useParams<{ comicObjectId: string }>();

-  const dispatch = useDispatch();
+  // const dispatch = useDispatch();

  const openModal = useCallback((filePath) => {
    setIsOpen(true);
-    dispatch(
-      extractComicArchive(filePath, {
-        type: "full",
-        purpose: "reading",
-        imageResizeOptions: {
-          baseWidth: 1024,
-        },
-      }),
-    );
+    // dispatch(
+    //   extractComicArchive(filePath, {
+    //     type: "full",
+    //     purpose: "reading",
+    //     imageResizeOptions: {
+    //       baseWidth: 1024,
+    //     },
+    //   }),
+    // );
  }, []);

+  // overridden <SlidingPanel> with some styles
+  const StyledSlidingPanel = styled(SlidingPane)`
+    background: #ccc;
+  `;
  const afterOpenModal = useCallback((things) => {
    // references are now sync'd and can be accessed.
    // subtitle.style.color = "#f00";
@@ -100,57 +100,183 @@ export const ComicDetail = (data: ComicDetailProps): ReactElement => {
    CVMatches: {
      content: (props) => (
        <>
-          <div className="card search-criteria-card">
-            <div className="card-content">
-              <ComicVineSearchForm data={rawFileDetails} />
-            </div>
+          <div>
+            <ComicVineSearchForm data={rawFileDetails} />
          </div>
-          <p className="is-size-5 mt-3 mb-2 ml-3">Searching for:</p>
-          {inferredMetadata.issue ? (
-            <div className="ml-3">
-              <span className="tag mr-3">{inferredMetadata.issue.name} </span>
-              <span className="tag"> # {inferredMetadata.issue.number} </span>
-            </div>
-          ) : null}
-          {!comicVineAPICallProgress ? (
-            <ComicVineMatchPanel
-              props={{
-                comicVineSearchQueryObject,
-                comicVineAPICallProgress,
-                comicVineSearchResults,
-                comicObjectId,
-              }}
-            />
-          ) : (
-            <div className="progress-indicator-container">
-              <div className="indicator">
-                <Loader
-                  type="MutatingDots"
-                  color="#CCC"
-                  secondaryColor="#999"
-                  height={100}
-                  width={100}
-                  visible={comicVineAPICallProgress}
-                />
-              </div>
-            </div>
-          )}
+
+          <div className="border-slate-500 border rounded-lg p-2 mt-3">
+            <p className="">Searching for:</p>
+            {inferredMetadata.issue ? (
+              <>
+                <span className="">{inferredMetadata.issue.name} </span>
+                <span className=""> # {inferredMetadata.issue.number} </span>
+              </>
+            ) : null}
+          </div>
+          <ComicVineMatchPanel
+            props={{
+              comicVineMatches,
+              comicObjectId,
+            }}
+          />
        </>
      ),
    },

    editComicBookMetadata: {
-      content: () => <EditMetadataPanel />,
+      content: () => <EditMetadataPanel data={rawFileDetails} />,
    },
  };

+  // Actions
+
+  const fetchComicVineMatches = async (
+    searchPayload,
+    issueSearchQuery,
+    seriesSearchQuery,
+  ) => {
+    try {
+      const response = await axios({
+        url: `${COMICVINE_SERVICE_URI}/volumeBasedSearch`,
+        method: "POST",
+        data: {
+          format: "json",
+          // hack
+          query: issueSearchQuery.inferredIssueDetails.name
+            .replace(/[^a-zA-Z0-9 ]/g, "")
+            .trim(),
+          limit: "100",
+          page: 1,
+          resources: "volume",
+          scorerConfiguration: {
+            searchParams: issueSearchQuery.inferredIssueDetails,
+          },
+          rawFileDetails: searchPayload,
+        },
+        transformResponse: (r) => {
+          const matches = JSON.parse(r);
+          return matches;
+          // return sortBy(matches, (match) => -match.score);
+        },
+      });
+      let matches: any = [];
+      if (!isNil(response.data.results) && response.data.results.length === 1) {
+        matches = response.data.results;
+      } else {
+        matches = response.data.map((match) => match);
+      }
+      const scoredMatches = matches.sort((a, b) => b.score - a.score);
+      setComicVineMatches(scoredMatches);
+    } catch (err) {
+      console.log(err);
+    }
+  };
+
+  // Action event handlers
+  const openDrawerWithCVMatches = () => {
+    let seriesSearchQuery: IComicVineSearchQuery = {} as IComicVineSearchQuery;
+    let issueSearchQuery: IComicVineSearchQuery = {} as IComicVineSearchQuery;
+
+    if (!isUndefined(rawFileDetails)) {
+      issueSearchQuery = refineQuery(rawFileDetails.name);
+    } else if (!isEmpty(comicvine)) {
+      issueSearchQuery = refineQuery(comicvine.name);
+    }
+    fetchComicVineMatches(rawFileDetails, issueSearchQuery, seriesSearchQuery);
+    setSlidingPanelContentId("CVMatches");
+    setVisible(true);
+  };
+
+  const openEditMetadataPanel = useCallback(() => {
+    setSlidingPanelContentId("editComicBookMetadata");
+    setVisible(true);
+  }, []);
+
+  //  Actions menu options and handler
+  const CVMatchLabel = (
+    <span className="inline-flex flex-row items-center gap-2">
+      <div className="w-6 h-6">
+        <i className="icon-[solar--magic-stick-3-bold-duotone] w-6 h-6"></i>
+      </div>
+      <div>Match on ComicVine</div>
+    </span>
+  );
+  const editLabel = (
+    <span className="inline-flex flex-row items-center gap-2">
+      <div className="w-6 h-6">
+        <i className="icon-[solar--pen-2-bold-duotone] w-6 h-6"></i>
+      </div>
+      <div>Edit Metadata</div>
+    </span>
+  );
+  const deleteLabel = (
+    <span className="inline-flex flex-row items-center gap-2">
+      <div className="w-6 h-6">
+        <i className="icon-[solar--trash-bin-trash-bold-duotone] w-6 h-6"></i>
+      </div>
+      <div>Delete Comic</div>
+    </span>
+  );
+  const Placeholder = (props) => {
+    return <components.Placeholder {...props} />;
+  };
+  const actionOptions = [
+    { value: "match-on-comic-vine", label: CVMatchLabel },
+    { value: "edit-metdata", label: editLabel },
+    { value: "delete-comic", label: deleteLabel },
+  ];
+
+  const filteredActionOptions = filter(actionOptions, (item) => {
+    if (isUndefined(rawFileDetails)) {
+      return item.value !== "match-on-comic-vine";
+    }
+    return item;
+  });
+  const handleActionSelection = (action) => {
+    switch (action.value) {
+      case "match-on-comic-vine":
+        openDrawerWithCVMatches();
+        break;
+      case "edit-metdata":
+        openEditMetadataPanel();
+        break;
+      default:
+        console.log("No valid action selected.");
+        break;
+    }
+  };
+  const customStyles = {
+    menu: (base) => ({
+      ...base,
+      backgroundColor: "rgb(156, 163, 175)",
+    }),
+    placeholder: (base) => ({
+      ...base,
+      color: "black",
+    }),
+    option: (base, { data, isDisabled, isFocused, isSelected }) => ({
+      ...base,
+      backgroundColor: isFocused ? "gray" : "rgb(156, 163, 175)",
+    }),
+    singleValue: (base) => ({
+      ...base,
+      paddingTop: "0.4rem",
+    }),
+    control: (base) => ({
+      ...base,
+      backgroundColor: "rgb(156, 163, 175)",
+      color: "black",
+      border: "1px solid rgb(156, 163, 175)",
+    }),
+  };
+
  // check for the availability of CV metadata
  const isComicBookMetadataAvailable =
    !isUndefined(comicvine) && !isUndefined(comicvine.volumeInformation);

  // check for the availability of rawFileDetails
  const areRawFileDetailsAvailable =
-    !isUndefined(rawFileDetails) && !isEmpty(rawFileDetails.cover);
+    !isUndefined(rawFileDetails) && !isEmpty(rawFileDetails);

  const { issueName, url } = determineCoverFile({
    rawFileDetails,
@@ -170,7 +296,9 @@ export const ComicDetail = (data: ComicDetailProps): ReactElement => {
    {
      id: 1,
      name: "Volume Information",
-      icon: <i className="fa-solid fa-layer-group"></i>,
+      icon: (
+        <i className="h-5 w-5 icon-[solar--book-2-bold] text-slate-500 dark:text-slate-300"></i>
+      ),
      content: isComicBookMetadataAvailable ? (
        <VolumeInformation data={data.data} key={1} />
      ) : null,
@@ -179,27 +307,31 @@ export const ComicDetail = (data: ComicDetailProps): ReactElement => {
    {
      id: 2,
      name: "ComicInfo.xml",
-      icon: <i className="fa-solid fa-code"></i>,
+      icon: (
+        <i className="h-5 w-5 icon-[solar--code-file-bold-duotone] text-slate-500 dark:text-slate-300" />
+      ),
      content: (
-        <div className="columns" key={2}>
-          <div className="column is-three-quarters">
-            {!isNil(comicInfo) && <ComicInfoXML json={comicInfo} />}
-          </div>
+        <div key={2}>
+          {!isNil(comicInfo) && <ComicInfoXML json={comicInfo} />}
        </div>
      ),
      shouldShow: !isEmpty(comicInfo),
    },
    {
      id: 3,
-      icon: <i className="fa-regular fa-file-archive"></i>,
+      icon: (
+        <i className="h-5 w-5 icon-[solar--winrar-bold-duotone] text-slate-500 dark:text-slate-300" />
+      ),
      name: "Archive Operations",
      content: <ArchiveOperations data={data.data} key={3} />,
      shouldShow: areRawFileDetailsAvailable,
    },
    {
      id: 4,
-      icon: <i className="fa-solid fa-floppy-disk"></i>,
-      name: "Acquisition",
+      icon: (
+        <i className="h-5 w-5 icon-[solar--folder-path-connect-bold-duotone] text-slate-500 dark:text-slate-300" />
+      ),
+      name: "DC++ Search",
      content: (
        <AcquisitionPanel
          query={airDCPPQuery}
@@ -213,19 +345,37 @@ export const ComicDetail = (data: ComicDetailProps): ReactElement => {
    },
    {
      id: 5,
-      icon: null,
-      name: !isEmpty(data.data) ? (
-        <span className="download-tab-name">Downloads</span>
-      ) : (
-        "Downloads"
+      icon: (
+        <span className="inline-flex flex-row">
+          <i className="h-5 w-5 icon-[solar--magnet-bold-duotone] text-slate-500 dark:text-slate-300" />
+        </span>
      ),
-      content: !isNil(data.data) && !isEmpty(data.data) && (
-        <DownloadsPanel
-          data={data.data.acquisition.directconnect}
-          comicObjectId={comicObjectId}
-          key={5}
-        />
+      name: "Torrent Search",
+      content: <TorrentSearchPanel comicObjectId={_id} issueName={issueName} />,
+      shouldShow: true,
+    },
+    {
+      id: 6,
+      name: "Downloads",
+      icon: (
+        <>
+          {acquisition?.directconnect?.downloads?.length +
+            acquisition?.torrent.length}
+        </>
      ),
+      content:
+        !isNil(data.data) && !isEmpty(data.data) ? (
+          <DownloadsPanel key={5} />
+        ) : (
+          <div className="column is-three-fifths">
+            <article className="message is-info">
+              <div className="message-body is-size-6 is-family-secondary">
+                AirDC++ is not configured. Please configure it in{" "}
+                <code>Settings</code>.
+              </div>
+            </article>
+          </div>
+        ),
      shouldShow: true,
    },
  ];
@@ -237,71 +387,74 @@ export const ComicDetail = (data: ComicDetailProps): ReactElement => {
  // 2. from the CV-scraped version

  return (
-    <section className="container">
+    <section className="container mx-auto">
      <div className="section">
        {!isNil(data) && !isEmpty(data) && (
          <>
-            <h1 className="title">{issueName}</h1>
-            <div className="columns is-multiline">
-              <div className="column is-narrow">
+            <div>
+              <div className="flex flex-row mt-5">
                <Card
                  imageUrl={url}
-                  orientation={"vertical"}
+                  orientation={"cover-only"}
                  hasDetails={false}
-                  cardContainerStyle={{ maxWidth: 275 }}
                />
-                {/* action dropdown */}
-                <div className="mt-4 is-size-7">
-                  <Menu
-                    data={data.data}
-                    handlers={{ setSlidingPanelContentId, setVisible }}
-                  />
-                </div>
-              </div>
-              {/* raw file details */}
-              <div className="column">
+
+                {/* raw file details */}
                {!isUndefined(rawFileDetails) &&
                  !isEmpty(rawFileDetails.cover) && (
-                    <>
+                    <div className="grid">
                      <RawFileDetails
                        data={{
                          rawFileDetails: rawFileDetails,
                          inferredMetadata: inferredMetadata,
+                          created_at: createdAt,
+                          updated_at: updatedAt,
                        }}
-                      />
-                      {/* Read comic button */}
-                      <button
-                        className="button is-success is-light"
-                        onClick={() => openModal(rawFileDetails.filePath)}
                      >
-                        <i className="fa-solid fa-book-open mr-2"></i>
-                        Read
-                      </button>
-
-                      <Modal
-                        style={{ content: { marginTop: "2rem" } }}
-                        isOpen={modalIsOpen}
-                        onAfterOpen={afterOpenModal}
-                        onRequestClose={closeModal}
-                        contentLabel="Example Modal"
-                      >
-                        <button onClick={closeModal}>close</button>
-                        {extractedComicBook && (
-                          <ComicViewer
-                            pages={extractedComicBook}
-                            direction="ltr"
-                            className={{closeButton: "border: 1px solid red;"}}
+                        {/* action dropdown */}
+                        <div className="mt-1 flex flex-row gap-2 w-full">
+                          <Menu
+                            data={data.data}
+                            handlers={{ setSlidingPanelContentId, setVisible }}
+                            configuration={{
+                              filteredActionOptions,
+                              customStyles,
+                              handleActionSelection,
+                              Placeholder,
+                            }}
                          />
-                        )}
-                      </Modal>
-                    </>
+                        </div>
+                      </RawFileDetails>
+
+                      {/* <Modal
+                      style={{ content: { marginTop: "2rem" } }}
+                      isOpen={modalIsOpen}
+                      onAfterOpen={afterOpenModal}
+                      onRequestClose={closeModal}
+                      contentLabel="Example Modal"
+                    >
+                      <button onClick={closeModal}>close</button>
+                      {extractedComicBook && (
+                        <ComicViewer
+                          pages={extractedComicBook}
+                          direction="ltr"
+                          className={{
+                            closeButton: "border: 1px solid red;",
+                          }}
+                        />
+                      )}
+                    </Modal> */}
+                    </div>
                  )}
              </div>
            </div>

-            {<TabControls filteredTabs={filteredTabs} />}
+            <TabControls
+              filteredTabs={filteredTabs}
+              downloadCount={acquisition?.directconnect?.downloads?.length}
+            />

-            <SlidingPane
+            <StyledSlidingPanel
              isOpen={visible}
              onRequestClose={() => setVisible(false)}
              title={"Comic Vine Search Matches"}
@@ -309,7 +462,7 @@ export const ComicDetail = (data: ComicDetailProps): ReactElement => {
            >
              {slidingPanelContentId !== "" &&
                contentForSlidingPanel[slidingPanelContentId].content()}
-            </SlidingPane>
+            </StyledSlidingPanel>
          </>
        )}
      </div>
@@ -317,4 +470,4 @@ export const ComicDetail = (data: ComicDetailProps): ReactElement => {
  );
 };

-export default ComicDetail;
+export default ComicDetail;
--- a/src/client/components/ComicDetail/ComicDetailContainer.tsx
+++ b/src/client/components/ComicDetail/ComicDetailContainer.tsx
@@ -1,22 +1,35 @@
-import { isEmpty, isNil, isUndefined } from "lodash";
-import React, { ReactElement, useContext, useEffect, useState } from "react";
-import { useSelector, useDispatch } from "react-redux";
+import React, { ReactElement } from "react";
 import { useParams } from "react-router-dom";
-import { getComicBookDetailById } from "../../actions/comicinfo.actions";
 import { ComicDetail } from "../ComicDetail/ComicDetail";
+import { useQuery } from "@tanstack/react-query";
+import { LIBRARY_SERVICE_BASE_URI } from "../../constants/endpoints";
+import axios from "axios";

 export const ComicDetailContainer = (): ReactElement | null => {
-  const comicBookDetailData = useSelector(
-    (state: RootState) => state.comicInfo.comicBookDetail,
-  );
-  const dispatch = useDispatch();
-
  const { comicObjectId } = useParams<{ comicObjectId: string }>();
-  useEffect(() => {
-    dispatch(getComicBookDetailById(comicObjectId));
-    // dispatch(getSettings());
-  }, [dispatch]);
-  return !isEmpty(comicBookDetailData) ? (
-    <ComicDetail data={comicBookDetailData} />
-  ) : null;
+  const {
+    data: comicBookDetailData,
+    isLoading,
+    isError,
+  } = useQuery({
+    queryKey: ["comicBookMetadata"],
+    queryFn: async () =>
+      await axios({
+        url: `${LIBRARY_SERVICE_BASE_URI}/getComicBookById`,
+        method: "POST",
+        data: {
+          id: comicObjectId,
+        },
+      }),
+  });
+
+  {
+    isError && <>Error</>;
+  }
+  {
+    isLoading && <>Loading...</>;
+  }
+  return (
+    comicBookDetailData?.data && <ComicDetail data={comicBookDetailData.data} />
+  );
 };
--- a/src/client/components/ComicDetail/ComicVineDetails.tsx
+++ b/src/client/components/ComicDetail/ComicVineDetails.tsx
@@ -2,105 +2,105 @@ import React, { ReactElement } from "react";
 import PropTypes from "prop-types";
 import { detectIssueTypes } from "../../shared/utils/tradepaperback.utils";
 import dayjs from "dayjs";
-import { isUndefined } from "lodash";
-import Card from "../Carda";
+import { isEmpty, isUndefined } from "lodash";
+import Card from "../shared/Carda";
+import { convert } from "html-to-text";
+
 export const ComicVineDetails = (props): ReactElement => {
  const { data, updatedAt } = props;
  return (
-    <div className="column is-half">
-      <div className="comic-detail comicvine-metadata">
-        <dl>
-          <dt>ComicVine Metadata</dt>
-          <dd className="is-size-7">
-            Last scraped on {dayjs(updatedAt).format("MMM D YYYY [at] h:mm a")}
-          </dd>
-
-          <dd>
-            <div className="columns mt-2">
-              <div className="column is-2">
-                <Card
-                  imageUrl={data.volumeInformation.image.thumb_url}
-                  orientation={"vertical"}
-                  hasDetails={false}
-                  // cardContainerStyle={{ maxWidth: 200 }}
-                />
-              </div>
-              <div className="column is-10">
-                <dl>
-                  <dt>
-                    <h6 className="has-text-weight-bold mb-2">{data.name}</h6>
-                  </dt>
-                  <dd>
-                    Is a part of{" "}
-                    <span className="has-text-info">
-                      {data.volumeInformation.name}
-                    </span>
-                  </dd>
-
-                  <dd>
-                    Published by
-                    <span className="has-text-weight-semibold">
-                      {" "}
-                      {data.volumeInformation.publisher.name}
-                    </span>
-                  </dd>
-                  <dd>
-                    Total issues in this volume:
-                    {data.volumeInformation.count_of_issues}
-                  </dd>
-
-                  <dd>
-                    <div className="field is-grouped mt-2">
-                      {data.issue_number && (
-                        <div className="control">
-                          <div className="tags has-addons">
-                            <span className="tag is-light">Issue Number</span>
-                            <span className="tag is-warning">
-                              {data.issue_number}
-                            </span>
-                          </div>
-                        </div>
-                      )}
-                      {!isUndefined(
-                        detectIssueTypes(data.volumeInformation.description),
-                      ) ? (
-                        <div className="control">
-                          <div className="tags has-addons">
-                            <span className="tag is-light">Detected Type</span>
-                            <span className="tag is-warning">
-                              {
-                                detectIssueTypes(
-                                  data.volumeInformation.description,
-                                ).displayName
-                              }
-                            </span>
-                          </div>
-                        </div>
-                      ) : data.resource_type ? (
-                        <div className="control">
-                          <div className="tags has-addons">
-                            <span className="tag is-light">Type</span>
-                            <span className="tag is-warning">
-                              {data.resource_type}
-                            </span>
-                          </div>
-                        </div>
-                      ) : null}
-                      <div className="control">
-                        <div className="tags has-addons">
-                          <span className="tag is-light">
-                            ComicVine Issue ID
-                          </span>
-                          <span className="tag is-success">{data.id}</span>
-                        </div>
-                      </div>
+    <div className="text-slate-500 dark:text-gray-400">
+      <div className="">
+        <div>
+          <div className="flex flex-row gap-4">
+            <div className="min-w-fit">
+              <Card
+                imageUrl={data.volumeInformation.image.thumb_url}
+                orientation={"cover-only"}
+                hasDetails={false}
+                // cardContainerStyle={{ maxWidth: 200 }}
+              />
+            </div>
+            <div className="flex flex-col gap-5">
+              <div className="flex flex-row">
+                <div>
+                  {/* Title */}
+                  <div>
+                    <div className="text-lg">{data.name}</div>
+                    <div className="text-sm">
+                      Is a part of{" "}
+                      <span className="has-text-info">
+                        {data.volumeInformation.name}
+                      </span>
                    </div>
-                  </dd>
-                </dl>
+                  </div>
+
+                  {/* Comicvine metadata */}
+                  <div className="mt-2">
+                    <div className="text-md">ComicVine Metadata</div>
+                    <div className="text-sm">
+                      Last scraped on{" "}
+                      {dayjs(updatedAt).format("MMM D YYYY [at] h:mm a")}
+                    </div>
+                    <div className="text-sm">
+                      ComicVine Issue ID
+                      <span>{data.id}</span>
+                    </div>
+                  </div>
+                </div>
+
+                {/* Publisher details */}
+                <div className="ml-8">
+                  Published by{" "}
+                  <span>{data.volumeInformation.publisher.name}</span>
+                  <div>
+                    Total issues in this volume{" "}
+                    <span className="inline-flex items-center bg-slate-50 text-slate-800 text-xs font-medium px-2 rounded-md dark:text-slate-900 dark:bg-slate-400">
+                      <span className="text-md text-slate-900 dark:text-slate-900">
+                        {data.volumeInformation.count_of_issues}
+                      </span>
+                    </span>
+                  </div>
+                  <div>
+                    {data.issue_number && (
+                      <div className="">
+                        <span>Issue Number</span>
+                        <span>{data.issue_number}</span>
+                      </div>
+                    )}
+                    {!isUndefined(
+                      detectIssueTypes(data.volumeInformation.description),
+                    ) ? (
+                      <div>
+                        <span>Detected Type</span>
+                        <span>
+                          {
+                            detectIssueTypes(data.volumeInformation.description)
+                              .displayName
+                          }
+                        </span>
+                      </div>
+                    ) : data.resource_type ? (
+                      <div>
+                        <span>Type</span>
+                        <span>{data.resource_type}</span>
+                      </div>
+                    ) : null}
+                  </div>
+                </div>
+              </div>
+              {/* Description */}
+              <div className="mt-3 w-3/4">
+                {!isEmpty(data.description) &&
+                  convert(data.description, {
+                    baseElements: {
+                      selectors: ["p"],
+                    },
+                  })}
              </div>
            </div>
-          </dd>
-        </dl>
+          </div>
+        </div>
      </div>
    </div>
  );
--- a/src/client/components/ComicDetail/ComicVineMatchPanel.tsx
+++ b/src/client/components/ComicDetail/ComicVineMatchPanel.tsx
@@ -1,23 +1,42 @@
 import React, { ReactElement } from "react";
 import { ComicVineSearchForm } from "../ComicVineSearchForm";
-import MatchResult from "../MatchResult";
+import MatchResult from "./MatchResult";
 import { isEmpty } from "lodash";
+import { useStore } from "../../store";
+import { useShallow } from "zustand/react/shallow";

 export const ComicVineMatchPanel = (comicVineData): ReactElement => {
-  const {
-    comicObjectId,
-    comicVineSearchQueryObject,
-    comicVineAPICallProgress,
-    comicVineSearchResults,
-  } = comicVineData.props;
+  const { comicObjectId, comicVineMatches } = comicVineData.props;
+  const { comicvine } = useStore(
+    useShallow((state) => ({
+      comicvine: state.comicvine,
+    })),
+  );
  return (
    <>
-      <div className="search-results-container">
-        {!isEmpty(comicVineSearchResults) && (
+      <div>
+        {!isEmpty(comicVineMatches) ? (
          <MatchResult
-            matchData={comicVineSearchResults}
+            matchData={comicVineMatches}
            comicObjectId={comicObjectId}
          />
+        ) : (
+          <>
+            <article
+              role="alert"
+              className="mt-4 rounded-lg max-w-screen-md border-s-4 border-yellow-500 bg-yellow-50 p-4 dark:border-s-4 dark:border-yellow-600 dark:bg-yellow-300 dark:text-slate-600 text-sm"
+            >
+              <div>
+                <p>ComicVine match results are an approximation.</p>
+                <p>
+                  Auto-matching is not available yet. If you see no results or
+                  poor quality ones, you can override the search query
+                  parameters to get better ones.
+                </p>
+              </div>
+            </article>
+            <div className="text-md my-5">{comicvine.scrapingStatus}</div>
+          </>
        )}
      </div>
    </>
--- a/src/client/components/ComicDetail/ComicVineSearchForm.tsx
+++ b/src/client/components/ComicDetail/ComicVineSearchForm.tsx
@@ -0,0 +1,96 @@
+import React, { useCallback } from "react";
+import { Form, Field } from "react-final-form";
+import Collapsible from "react-collapsible";
+import { fetchComicVineMatches } from "../../actions/fileops.actions";
+
+/**
+ * Component for performing search against ComicVine
+ *
+ * @component
+ * @example
+ * return (
+ *   <ComicVineSearchForm data={rawFileDetails} />
+ * )
+ */
+export const ComicVineSearchForm = (data) => {
+  const onSubmit = useCallback((value) => {
+    const userInititatedQuery = {
+      inferredIssueDetails: {
+        name: value.issueName,
+        number: value.issueNumber,
+        subtitle: "",
+        year: value.issueYear,
+      },
+    };
+    // dispatch(fetchComicVineMatches(data, userInititatedQuery));
+  }, []);
+  const validate = () => {
+    return true;
+  };
+
+  const MyForm = () => (
+    <Form
+      onSubmit={onSubmit}
+      validate={validate}
+      render={({ handleSubmit }) => (
+        <form onSubmit={handleSubmit}>
+          <span className="flex items-center">
+            <span className="text-md text-slate-500 dark:text-slate-500 pr-5">
+              Override Search Query
+            </span>
+            <span className="h-px flex-1 bg-slate-200 dark:bg-slate-400"></span>
+          </span>
+          <label className="block py-1">Issue Name</label>
+          <Field name="issueName">
+            {(props) => (
+              <input
+                {...props.input}
+                className="appearance-none dark:bg-slate-100 bg-slate-100 h-10 w-full rounded-md border-none text-gray-700 dark:text-slate-200 py-1 pr-7 pl-3 sm:text-md sm:leading-5 focus:outline-none focus:shadow-outline-blue focus:border-blue-300"
+                placeholder="Type the issue name"
+              />
+            )}
+          </Field>
+          <div className="flex flex-row gap-4">
+            <div>
+              <label className="block py-1">Number</label>
+              <Field name="issueNumber">
+                {(props) => (
+                  <input
+                    {...props.input}
+                    className="appearance-none dark:bg-slate-100 bg-slate-100 h-10 w-14 rounded-md border-none text-gray-700 dark:text-slate-200 py-1 pr-7 pl-3 sm:text-md sm:leading-5 focus:outline-none focus:shadow-outline-blue focus:border-blue-300"
+                    placeholder="#"
+                  />
+                )}
+              </Field>
+            </div>
+            <div>
+              <label className="block py-1">Year</label>
+              <Field name="issueYear">
+                {(props) => (
+                  <input
+                    {...props.input}
+                    className="appearance-none dark:bg-slate-100 bg-slate-100 h-10 w-20 rounded-md border-none text-gray-700 dark:text-slate-200 py-1 pr-7 pl-3 sm:text-md sm:leading-5 focus:outline-none focus:shadow-outline-blue focus:border-blue-300"
+                    placeholder="1984"
+                  />
+                )}
+              </Field>
+            </div>
+
+            <div className="flex justify-end mt-5">
+              <button
+                type="submit"
+                className="flex h-10 sm:mt-3 sm:flex-row sm:items-center rounded-lg border border-green-400 dark:border-green-200 bg-green-200 px-4 py-2 text-gray-500 hover:bg-transparent hover:text-red-600 focus:outline-none focus:ring active:text-indigo-500"
+              >
+                Search
+              </button>
+            </div>
+          </div>
+        </form>
+      )}
+    />
+  );
+
+  return <MyForm />;
+};
+
+export default ComicVineSearchForm;
--- a/src/client/components/ComicDetail/DownloadProgressTick.tsx
+++ b/src/client/components/ComicDetail/DownloadProgressTick.tsx
@@ -3,10 +3,10 @@ import React, { ReactElement } from "react";

 export const DownloadProgressTick = (props): ReactElement => {
  return (
-    <div >
-      <h4 className="is-size-6">{props.data.name}</h4>
+    <div>
+      <h4 className="is-size-5">{props.data.name}</h4>
      <div>
-        <span className="is-size-3 has-text-weight-semibold">
+        <span className="is-size-4 has-text-weight-semibold">
          {prettyBytes(props.data.downloaded_bytes)} of{" "}
          {prettyBytes(props.data.size)}{" "}
        </span>
@@ -20,13 +20,12 @@ export const DownloadProgressTick = (props): ReactElement => {
          %
        </progress>
      </div>
-      <div className="is-size-5">
-        {prettyBytes(props.data.speed)} per second.
-      </div>
-      <div className="is-size-5">
+      <div className="is-size-6 mt-1 mb-2">
+        <p>{prettyBytes(props.data.speed)} per second.</p>
        Time left:
        {Math.round(parseInt(props.data.seconds_left) / 60)}
      </div>
+
      <div>{props.data.target}</div>
    </div>
  );
--- a/src/client/components/ComicDetail/DownloadsPanel.tsx
+++ b/src/client/components/ComicDetail/DownloadsPanel.tsx
@@ -1,106 +1,147 @@
-import React, { useEffect, useContext, ReactElement } from "react";
-import { getBundlesForComic } from "../../actions/airdcpp.actions";
-import { useDispatch, useSelector } from "react-redux";
+import React, { useEffect, useContext, ReactElement, useState } from "react";
 import { RootState } from "threetwo-ui-typings";
-import { isEmpty, isNil, map } from "lodash";
-import prettyBytes from "pretty-bytes";
-import dayjs from "dayjs";
-import ellipsize from "ellipsize";
-import { AirDCPPSocketContext } from "../../context/AirDCPPSocket";
+import { isEmpty, map } from "lodash";
+import { AirDCPPBundles } from "./AirDCPPBundles";
+import { TorrentDownloads } from "./TorrentDownloads";
+import { useQuery } from "@tanstack/react-query";
+import axios from "axios";
+import {
+  LIBRARY_SERVICE_BASE_URI,
+  QBITTORRENT_SERVICE_BASE_URI,
+  TORRENT_JOB_SERVICE_BASE_URI,
+} from "../../constants/endpoints";
+import { useStore } from "../../store";
+import { useShallow } from "zustand/react/shallow";
+import { useParams } from "react-router-dom";

 interface IDownloadsPanelProps {
-  data: any;
-  comicObjectId: string;
+  key: number;
 }

 export const DownloadsPanel = (
  props: IDownloadsPanelProps,
 ): ReactElement | null => {
-  const bundles = useSelector((state: RootState) => {
-    return state.airdcpp.bundles;
+  const { comicObjectId } = useParams<{ comicObjectId: string }>();
+  const [bundles, setBundles] = useState([]);
+  const [infoHashes, setInfoHashes] = useState<string[]>([]);
+  const [torrentDetails, setTorrentDetails] = useState([]);
+  const [activeTab, setActiveTab] = useState("torrents");
+  const { airDCPPSocketInstance, socketIOInstance } = useStore(
+    useShallow((state: any) => ({
+      airDCPPSocketInstance: state.airDCPPSocketInstance,
+      socketIOInstance: state.socketIOInstance,
+    })),
+  );
+
+  // React to torrent progress data sent over websockets
+  socketIOInstance.on("AS_TORRENT_DATA", (data) => {
+    const torrents = data.torrents
+      .flatMap(({ _id, details }) => {
+        if (_id === comicObjectId) {
+          return details;
+        }
+      })
+      .filter((item) => item !== undefined);
+    setTorrentDetails(torrents);
+  });
+  // Fetch the downloaded files and currently-downloading file(s) from AirDC++
+  const { data: comicObject, isSuccess } = useQuery({
+    queryKey: ["bundles"],
+    queryFn: async () =>
+      await axios({
+        url: `${LIBRARY_SERVICE_BASE_URI}/getComicBookById`,
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json; charset=utf-8",
+        },
+        data: {
+          id: `${comicObjectId}`,
+        },
+      }),
  });

-  // AirDCPP Socket initialization
-  const userSettings = useSelector((state: RootState) => state.settings.data);
-  const airDCPPConfiguration = useContext(AirDCPPSocketContext);
-
-  const {
-    airDCPPState: { socket, settings },
-  } = airDCPPConfiguration;
-
-  const dispatch = useDispatch();
-  // Fetch the downloaded files and currently-downloading file(s) from AirDC++
-  useEffect(() => {
-    try {
-      if (!isEmpty(userSettings)) {
-        dispatch(
-          getBundlesForComic(props.comicObjectId, socket, {
-            username: `${settings.directConnect.client.host.username}`,
-            password: `${settings.directConnect.client.host.password}`,
-          }),
+  const getBundles = async (comicObject) => {
+    if (comicObject?.data.acquisition.directconnect) {
+      const filteredBundles =
+        comicObject.data.acquisition.directconnect.downloads.map(
+          async ({ bundleId }) => {
+            return await airDCPPSocketInstance.get(`queue/bundles/${bundleId}`);
+          },
        );
-      }
-    } catch (error) {
-      throw new Error(error);
+      return await Promise.all(filteredBundles);
    }
-  }, [dispatch, airDCPPConfiguration]);
-
-  const Bundles = (props) => {
-    return !isEmpty(props.data) ? (
-      <div className="column is-full">
-        <table className="table is-striped">
-          <thead>
-            <tr>
-              <th>Filename</th>
-              <th>Size</th>
-              <th>Download Time</th>
-              <th>Bundle ID</th>
-            </tr>
-          </thead>
-          <tbody>
-            {map(props.data, (bundle) => (
-              <tr key={bundle.id}>
-                <td>
-                  <h5>{ellipsize(bundle.name, 58)}</h5>
-                  <span className="is-size-7">{bundle.target}</span>
-                </td>
-                <td>{prettyBytes(bundle.size)}</td>
-                <td>
-                  {dayjs
-                    .unix(bundle.time_finished)
-                    .format("h:mm on ddd, D MMM, YYYY")}
-                </td>
-                <td>
-                  <span className="tag is-warning">{bundle.id}</span>
-                </td>
-              </tr>
-            ))}
-          </tbody>
-        </table>
-      </div>
-    ) : (
-      <div className="column is-full"> {"No Downloads Found"} </div>
-    );
  };

-  return !isNil(props.data) ? (
-    <>
-      <div className="columns is-multiline">
-        {!isEmpty(socket) ? (
-          <Bundles data={bundles} />
-        ) : (
-          <div className="column is-three-fifths">
-            <article className="message is-info">
-              <div className="message-body is-size-6 is-family-secondary">
-                AirDC++ is not configured. Please configure it in{" "}
-                <code>Settings</code>.
-              </div>
-            </article>
-          </div>
-        )}
-      </div>
-    </>
-  ) : null;
-};
+  // Call the scheduled job for fetching torrent data
+  // triggered by the active tab been set to "torrents"
+  const { data: torrentData } = useQuery({
+    queryFn: () =>
+      axios({
+        url: `${TORRENT_JOB_SERVICE_BASE_URI}/getTorrentData`,
+        method: "GET",
+        params: {
+          trigger: activeTab,
+        },
+      }),
+    queryKey: [activeTab],
+  });

+  useEffect(() => {
+    getBundles(comicObject).then((result) => {
+      setBundles(result);
+    });
+  }, [comicObject]);
+
+  return (
+    <div className="columns is-multiline">
+      {!isEmpty(airDCPPSocketInstance) &&
+        !isEmpty(bundles) &&
+        activeTab === "directconnect" && <AirDCPPBundles data={bundles} />}
+
+      <div>
+        <div className="sm:hidden">
+          <label htmlFor="Download Type" className="sr-only">
+            Download Type
+          </label>
+
+          <select id="Tab" className="w-full rounded-md border-gray-200">
+            <option>DC++ Downloads</option>
+            <option>Torrents</option>
+          </select>
+        </div>
+
+        <div className="hidden sm:block">
+          <nav className="flex gap-6" aria-label="Tabs">
+            <a
+              href="#"
+              className={`shrink-0 rounded-lg p-2 text-sm font-medium hover:bg-gray-50 hover:text-gray-700 ${
+                activeTab === "directconnect"
+                  ? "bg-slate-200 dark:text-slate-200 dark:bg-slate-400 text-slate-800"
+                  : "dark:text-slate-400 text-slate-800"
+              }`}
+              aria-current="page"
+              onClick={() => setActiveTab("directconnect")}
+            >
+              DC++ Downloads
+            </a>
+
+            <a
+              href="#"
+              className={`shrink-0 rounded-lg p-2 text-sm font-medium hover:bg-gray-50 hover:text-gray-700 ${
+                activeTab === "torrents"
+                  ? "bg-slate-200 text-slate-800"
+                  : "dark:text-slate-400 text-slate-800"
+              }`}
+              onClick={() => setActiveTab("torrents")}
+            >
+              Torrents
+            </a>
+          </nav>
+        </div>
+      </div>
+
+      {activeTab === "torrents" && <TorrentDownloads data={torrentDetails} />}
+    </div>
+  );
+};
 export default DownloadsPanel;
--- a/src/client/components/ComicDetail/EditMetadataPanel.tsx
+++ b/src/client/components/ComicDetail/EditMetadataPanel.tsx
@@ -1,5 +1,4 @@
 import React, { ReactElement, useCallback, useEffect, useState } from "react";
-import { useSelector, useDispatch } from "react-redux";
 import { Form, Field } from "react-final-form";
 import arrayMutators from "final-form-arrays";
 import { FieldArray } from "react-final-form-arrays";
@@ -9,7 +8,9 @@ import TextareaAutosize from "react-textarea-autosize";
 export const EditMetadataPanel = (props): ReactElement => {
  const validate = async () => {};
  const onSubmit = async () => {};
- 
+
+  const { data } = props;
+
  const AsyncSelectPaginateAdapter = ({ input, ...rest }) => {
    return (
      <AsyncSelectPaginate
@@ -28,10 +29,9 @@ export const EditMetadataPanel = (props): ReactElement => {
      />
    );
  };
-  const rawFileDetails = useSelector(
-    (state: RootState) => state.comicInfo.comicBookDetail.rawFileDetails.name,
-  );
-  const dispatch = useDispatch();
+  // const rawFileDetails = useSelector(
+  //   (state: RootState) => state.comicInfo.comicBookDetail.rawFileDetails.name,
+  // );

  return (
    <>
@@ -58,90 +58,59 @@ export const EditMetadataPanel = (props): ReactElement => {
                <label className="label">Issue Details</label>
              </div>
              <div className="field-body">
-                <div className="field">
-                  <p className="control is-expanded has-icons-left">
-                    <Field
-                      name="issue_name"
-                      component="input"
-                      className="input"
-                      initialValue={rawFileDetails}
-                      placeholder={"Issue Name"}
-                    />
-                    <span className="icon is-small is-left">
-                      <i className="fa-solid fa-user-ninja"></i>
-                    </span>
-                  </p>
-                </div>
+                <Field
+                  name="issue_name"
+                  component="input"
+                  className="appearance-none w-full dark:bg-slate-400 bg-slate-100 h-10 rounded-md border-none text-gray-700 dark:text-slate-200 py-1 pr-7 pl-3 sm:text-md sm:leading-5 focus:outline-none focus:shadow-outline-blue focus:border-blue-300"
+                  initialValue={data.name}
+                  placeholder={"Issue Name"}
+                />
              </div>
            </div>
            {/* Issue Number and year */}
-            <div className="field is-horizontal">
-              <div className="field-label"></div>
-              <div className="field-body">
-                <div className="field">
-                  <p className="control has-icons-left">
-                    <Field
-                      name="issue_number"
-                      component="input"
-                      className="input"
-                      placeholder="Issue Number"
-                    />
-                    <span className="icon is-small is-left">
-                      <i className="fa-solid fa-hashtag"></i>
-                    </span>
-                  </p>
-                  <p className="help">Do not enter the first zero</p>
-                </div>
+            <div className="mt-4 flex flex-row gap-2">
+              <div>
+                <div className="text-sm">Issue Number</div>
+                <Field
+                  name="issue_number"
+                  component="input"
+                  className="dark:bg-slate-400 w-20 bg-slate-100 py-2 px-2 rounded-md border-gray-300 h-10 dark:text-slate-200 sm:text-md sm:leading-5 focus:outline-none focus:shadow-outline-blue focus:border-blue-300"
+                  placeholder="Issue Number"
+                />
+                <p className="text-xs">Do not enter the first zero</p>
+              </div>
+              <div>
                {/* year */}
-                <div className="field">
-                  <p className="control">
-                    <Field
-                      name="issue_year"
-                      component="input"
-                      className="input"
-                    />
-                  </p>
-                </div>
+                <div className="text-sm">Issue Year</div>
+                <Field
+                  name="issue_year"
+                  component="input"
+                  className="dark:bg-slate-400 w-20 bg-slate-100 py-2 px-2 rounded-md border-gray-300 h-10 dark:text-slate-200 sm:text-md sm:leading-5 focus:outline-none focus:shadow-outline-blue focus:border-blue-300"
+                />
+              </div>
+
+              <div>
+                <div className="text-sm">Page Count</div>
+                <Field
+                  name="page_count"
+                  component="input"
+                  className="dark:bg-slate-400 w-20 bg-slate-100 py-2 px-2 rounded-md border-gray-300 h-10 dark:text-slate-200 sm:text-md sm:leading-5 focus:outline-none focus:shadow-outline-blue focus:border-blue-300"
+                  placeholder="Page Count"
+                />
              </div>
            </div>

            {/* page count */}
-            <div className="field is-horizontal">
-              <div className="field-label"></div>
-              <div className="field-body">
-                <div className="field">
-                  <p className="control has-icons-left">
-                    <Field
-                      name="page_count"
-                      component="input"
-                      className="input"
-                      placeholder="Page Count"
-                    />
-                    <span className="icon is-small is-left">
-                      <i className="fa-solid fa-note-sticky"></i>
-                    </span>
-                  </p>
-                </div>
-              </div>
-            </div>

            {/* Description */}
-            <div className="field is-horizontal">
-              <div className="field-label is-normal">
-                <label className="label">Description</label>
-              </div>
-              <div className="field-body">
-                <div className="field">
-                  <p className="control is-expanded has-icons-left">
-                    <Field
-                      name={"description"}
-                      className="textarea"
-                      component={TextareaAutosizeAdapter}
-                      placeholder={"Description"}
-                    />
-                  </p>
-                </div>
-              </div>
+            <div className="mt-2">
+              <label className="text-sm">Description</label>
+              <Field
+                name={"description"}
+                className="dark:bg-slate-400 w-full min-h-24 bg-slate-100 py-2 px-2 rounded-md border-gray-300 h-10 dark:text-slate-200 sm:text-md sm:leading-5 focus:outline-none focus:shadow-outline-blue focus:border-blue-300"
+                component={TextareaAutosizeAdapter}
+                placeholder={"Description"}
+              />
            </div>

            <hr size="1" />
--- a/src/client/components/ComicDetail/MatchResult.tsx
+++ b/src/client/components/ComicDetail/MatchResult.tsx
@@ -0,0 +1,137 @@
+import React from "react";
+import { isNil, map } from "lodash";
+import { convert } from "html-to-text";
+import ellipsize from "ellipsize";
+import { LIBRARY_SERVICE_BASE_URI } from "../../constants/endpoints";
+import axios from "axios";
+
+interface MatchResultProps {
+  matchData: any;
+  comicObjectId: string;
+}
+
+const handleBrokenImage = (e) => {
+  e.target.src = "http://localhost:3050/dist/img/noimage.svg";
+};
+
+export const MatchResult = (props: MatchResultProps) => {
+  const applyCVMatch = async (match, comicObjectId) => {
+    return await axios.request({
+      url: `${LIBRARY_SERVICE_BASE_URI}/applyComicVineMetadata`,
+      method: "POST",
+      data: {
+        match,
+        comicObjectId,
+      },
+    });
+  };
+  return (
+    <>
+      <span className="flex items-center mt-6">
+        <span className="text-md text-slate-500 dark:text-slate-500 pr-5">
+          ComicVine Matches
+        </span>
+        <span className="h-px flex-1 bg-slate-200 dark:bg-slate-400"></span>
+      </span>
+      {map(props.matchData, (match, idx) => {
+        let issueDescription = "";
+        if (!isNil(match.description)) {
+          issueDescription = convert(match.description, {
+            baseElements: {
+              selectors: ["p"],
+            },
+          });
+        }
+        const bestMatchCSSClass = idx === 0 ? "bg-green-100" : "bg-slate-300";
+        return (
+          <div className={`${bestMatchCSSClass} my-5 p-4 rounded-lg`} key={idx}>
+            <div className="flex flex-row gap-4">
+              <div className="min-w-fit">
+                <img
+                  className="rounded-md"
+                  src={match.image.thumb_url}
+                  onError={handleBrokenImage}
+                />
+              </div>
+              <div>
+                <div className="flex flex-row mb-1 justify-end">
+                  {match.name ? (
+                    <p className="text-md w-full">{match.name}</p>
+                  ) : null}
+
+                  {/* score */}
+                  <span className="inline-flex h-fit w-fit items-center bg-green-50 text-sm text-slate-800 font-medium px-2 rounded-md dark:text-slate-900 dark:bg-green-400">
+                    <span className="pr-1 pt-1">
+                      <i className="icon-[solar--course-up-line-duotone] w-4 h-4"></i>
+                    </span>
+                    <span className="text-slate-900 dark:text-slate-900">
+                      {parseInt(match.score, 10)}
+                    </span>
+                  </span>
+                </div>
+                <span className="flex flex-row gap-2 mb-2">
+                  <span className="inline-flex items-center bg-slate-50 text-sm text-slate-800 font-medium px-2 rounded-md dark:text-slate-900 dark:bg-slate-400">
+                    <span className="pr-1 pt-1">
+                      <i className="icon-[solar--hashtag-outline] w-4 h-4"></i>
+                    </span>
+                    <span className="text-slate-900 dark:text-slate-900">
+                      {parseInt(match.issue_number, 10)}
+                    </span>
+                  </span>
+                  <span className="inline-flex items-center bg-slate-50 text-slate-800 text-sm font-medium px-2 rounded-md dark:text-slate-900 dark:bg-slate-400">
+                    <span className="pr-1 pt-1">
+                      <i className="icon-[solar--calendar-mark-bold-duotone] w-5 h-5"></i>
+                    </span>
+                    <span className="text-slate-900 dark:text-slate-900">
+                      Cover Date: {match.cover_date}
+                    </span>
+                  </span>
+                </span>
+                <div className="text-sm">
+                  {ellipsize(issueDescription, 300)}
+                </div>
+              </div>
+            </div>
+
+            <div className="flex flex-row gap-2 my-4 ml-10">
+              <div className="">
+                <img
+                  src={match.volumeInformation.results.image.icon_url}
+                  className="rounded-md w-full"
+                  onError={handleBrokenImage}
+                />
+              </div>
+
+              <div className="">
+                <span>{match.volume.name}</span>
+                <div className="text-sm">
+                  <p>
+                    Total Issues:
+                    {match.volumeInformation.results.count_of_issues}
+                  </p>
+                  <p>
+                    Published by{" "}
+                    {match.volumeInformation.results.publisher.name}
+                  </p>
+                </div>
+              </div>
+            </div>
+            <div className="flex justify-end">
+              <button
+                className="flex space-x-1 sm:mt-0 sm:flex-row sm:items-center rounded-lg border border-green-400 dark:border-green-200 bg-green-200 px-3 py-1 text-gray-500 hover:bg-transparent hover:text-green-600 focus:outline-none focus:ring active:text-indigo-500"
+                onClick={() => applyCVMatch(match, props.comicObjectId)}
+              >
+                <span className="text-md">Apply Match</span>
+                <span className="w-5 h-5">
+                  <i className="h-5 w-5 icon-[solar--magic-stick-3-bold-duotone]"></i>
+                </span>
+              </button>
+            </div>
+          </div>
+        );
+      })}
+    </>
+  );
+};
+
+export default MatchResult;
--- a/src/client/components/ComicDetail/RawFileDetails.tsx
+++ b/src/client/components/ComicDetail/RawFileDetails.tsx
@@ -2,78 +2,96 @@ import React, { ReactElement } from "react";
 import PropTypes from "prop-types";
 import prettyBytes from "pretty-bytes";
 import { isEmpty } from "lodash";
+import { format, parseISO } from "date-fns";

 export const RawFileDetails = (props): ReactElement => {
-  const { rawFileDetails, inferredMetadata } = props.data;
+  const { rawFileDetails, inferredMetadata, created_at, updated_at } =
+    props.data;
  return (
    <>
-      <div className="comic-detail raw-file-details column is-three-fifths">
-        <dl>
-          <dt>Raw File Details</dt>
-          <dd className="is-size-7">
-            {rawFileDetails.containedIn +
-              "/" +
-              rawFileDetails.name +
-              rawFileDetails.extension}
-          </dd>
-          <dd>
-            <div className="field is-grouped mt-2">
-              <div className="control">
-                <div className="tags has-addons">
-                  <span className="tag">Size</span>
-                  <span className="tag is-info is-light">
-                    {prettyBytes(rawFileDetails.fileSize)}
-                  </span>
-                </div>
-              </div>
-              <div className="control">
-                <div className="tags has-addons">
-                  <span className="tag">Extension</span>
+      <div className="max-w-2xl ml-5">
+        <div className="px-4 sm:px-6">
+          <p className="text-gray-500 dark:text-gray-400">
+            <span className="text-xl">{rawFileDetails.name}</span>
+          </p>
+        </div>
+        <div className="px-4 py-5 sm:px-6">
+          <dl className="grid grid-cols-1 gap-x-4 gap-y-4 sm:grid-cols-2">
+            <div className="sm:col-span-1">
+              <dt className="text-sm font-medium text-gray-500 dark:text-gray-400">
+                Raw File Details
+              </dt>
+              <dd className="mt-1 text-sm text-gray-900 dark:text-gray-400">
+                {rawFileDetails.containedIn +
+                  "/" +
+                  rawFileDetails.name +
+                  rawFileDetails.extension}
+              </dd>
+            </div>
+            <div className="sm:col-span-1">
+              <dt className="text-sm font-medium text-gray-500 dark:text-gray-400">
+                Inferred Issue Metadata
+              </dt>
+              <dd className="mt-1 text-sm text-gray-900 dark:text-gray-400">
+                Series Name: {inferredMetadata.issue.name}
+                {!isEmpty(inferredMetadata.issue.number) ? (
                  <span className="tag is-primary is-light">
-                    {rawFileDetails.extension}
+                    {inferredMetadata.issue.number}
                  </span>
-                </div>
-              </div>
-              <div className="control">
-                <div className="tags has-addons">
-                  <span className="tag">MIME type</span>
-                  <span className="tag is-primary is-light">
+                ) : null}
+              </dd>
+            </div>
+            <div className="sm:col-span-1">
+              <dt className="text-sm font-medium text-gray-500 dark:text-gray-400">
+                MIMEType
+              </dt>
+              <dd className="mt-1 text-sm text-gray-500 dark:text-slate-900">
+                {/* File extension */}
+                <span className="inline-flex items-center bg-slate-50 text-slate-800 text-xs font-medium px-2 rounded-md dark:text-slate-900 dark:bg-slate-400">
+                  <span className="pt-1">
+                    <i className="icon-[solar--zip-file-bold-duotone] w-5 h-5"></i>
+                  </span>
+
+                  <span className="text-md text-slate-500 dark:text-slate-900">
                    {rawFileDetails.mimeType}
                  </span>
-                </div>
-              </div>
+                </span>
+              </dd>
            </div>
-          </dd>
-        </dl>
-      </div>
-
-      <div className="content comic-detail raw-file-details mt-3 column is-three-fifths">
-        <dl>
-          {/* inferred metadata */}
-          <dt>Inferred Issue Metadata</dt>
-          <dd>
-            <div className="field is-grouped mt-2">
-              <div className="control">
-                <div className="tags has-addons">
-                  <span className="tag">Name</span>
-                  <span className="tag is-info is-light">
-                    {inferredMetadata.issue.name}
+            <div className="sm:col-span-1">
+              <dt className="text-sm font-medium text-gray-500 dark:text-gray-400">
+                File Size
+              </dt>
+              <dd className="mt-1 text-sm text-gray-500 dark:text-slate-900">
+                {/* size */}
+                <span className="inline-flex items-center bg-slate-50 text-slate-800 text-xs font-medium px-2 rounded-md dark:text-slate-900 dark:bg-slate-400">
+                  <span className="pr-1 pt-1">
+                    <i className="icon-[solar--mirror-right-bold-duotone] w-5 h-5"></i>
                  </span>
-                </div>
-              </div>
-              {!isEmpty(inferredMetadata.issue.number) ? (
-                <div className="control">
-                  <div className="tags has-addons">
-                    <span className="tag">Number</span>
-                    <span className="tag is-primary is-light">
-                      {inferredMetadata.issue.number}
-                    </span>
-                  </div>
-                </div>
-              ) : null}
+
+                  <span className="text-md text-slate-500 dark:text-slate-900">
+                    {prettyBytes(rawFileDetails.fileSize)}
+                  </span>
+                </span>
+              </dd>
            </div>
-          </dd>
-        </dl>
+            <div className="sm:col-span-2">
+              <dt className="text-sm font-medium text-gray-500 dark:text-gray-400">
+                Import Details
+              </dt>
+              <dd className="mt-1 text-sm text-gray-900 dark:text-gray-400">
+                {format(parseISO(created_at), "dd MMMM, yyyy")},{" "}
+                {format(parseISO(created_at), "h aaaa")}
+              </dd>
+            </div>
+            <div className="sm:col-span-2">
+              <dt className="text-sm font-medium text-gray-500 dark:text-gray-400">
+                Actions
+              </dt>
+              <dd className="mt-1 text-sm text-gray-900">{props.children}</dd>
+            </div>
+          </dl>
+        </div>
      </div>
    </>
  );
@@ -102,5 +120,8 @@ RawFileDetails.propTypes = {
        subtitle: PropTypes.string,
      }),
    }),
+    created_at: PropTypes.string,
+    updated_at: PropTypes.string,
  }),
-};
+  children: PropTypes.any,
+};
--- a/src/client/components/ComicDetail/TabControls.tsx
+++ b/src/client/components/ComicDetail/TabControls.tsx
@@ -1,46 +1,47 @@
-import React, { ReactElement, useEffect, useState } from "react";
-import { isEmpty, isNil } from "lodash";
-import { useSelector } from "react-redux";
+import React, { ReactElement, useState } from "react";
+import { isNil } from "lodash";

 export const TabControls = (props): ReactElement => {
-  const comicBookDetailData = useSelector(
-    (state: RootState) => state.comicInfo.comicBookDetail,
-  );
-  const { filteredTabs } = props;
-
+  const { filteredTabs, downloadCount } = props;
  const [active, setActive] = useState(filteredTabs[0].id);
-  useEffect(() => {
-    setActive(filteredTabs[0].id);
-  }, [comicBookDetailData]);

  return (
    <>
-      <div className="tabs">
-        <ul>
-          {filteredTabs.map(({ id, name, icon }) => (
-            <li
-              key={id}
-              className={id === active ? "is-active" : ""}
-              onClick={() => setActive(id)}
-            >
-              {/* Downloads tab and count badge */}
-              <a>
-                {id === 5 &&
-                !isNil(comicBookDetailData.acquisition.directconnect) ? (
-                  <span className="download-icon-labels">
-                    <i className="fa-solid fa-download"></i>
-                    <span className="tag downloads-count is-info is-light">
-                      {comicBookDetailData.acquisition.directconnect.downloads.length}
+      <div className="hidden sm:block mt-7 mb-3 w-fit">
+        <div className="border-b border-gray-200">
+          <nav className="flex gap-6" aria-label="Tabs">
+            {filteredTabs.map(({ id, name, icon }) => (
+              <a
+                key={id}
+                className={`inline-flex shrink-0 items-center gap-2 px-1 py-1 text-md font-medium text-gray-500 dark:text-gray-400 hover:border-gray-300 hover:border-b hover:dark:text-slate-200 ${
+                  active === id
+                    ? "border-b border-cyan-50 dark:text-slate-200"
+                    : "border-b border-transparent"
+                }`}
+                aria-current="page"
+                onClick={() => setActive(id)}
+              >
+                {/* Downloads tab and count badge */}
+                <>
+                  {id === 6 && !isNil(downloadCount) ? (
+                    <span className="inline-flex flex-row">
+                      {/* download count */}
+                      <span className="inline-flex mx-2 items-center bg-slate-200 text-slate-800 text-xs font-medium px-2 rounded-md dark:text-slate-900 dark:bg-orange-400">
+                        <span className="text-md text-slate-500 dark:text-slate-900">
+                          {icon}
+                        </span>
+                      </span>
+                      <i className="h-5 w-5 icon-[solar--download-bold-duotone] text-slate-500 dark:text-slate-300" />
                    </span>
-                  </span>
-                ) : (
-                  <span className="icon is-small">{icon}</span>
-                )}
-                {name}
+                  ) : (
+                    <span className="w-5 h-5">{icon}</span>
+                  )}
+                  {name}
+                </>
              </a>
-            </li>
-          ))}
-        </ul>
+            ))}
+          </nav>
+        </div>
      </div>
      {filteredTabs.map(({ id, content }) => {
        return active === id ? content : null;
--- a/src/client/components/ComicDetail/Tabs/ArchiveOperations.tsx
+++ b/src/client/components/ComicDetail/Tabs/ArchiveOperations.tsx
@@ -1,44 +1,134 @@
-import React, { ReactElement, useCallback, useState } from "react";
-import { useSelector, useDispatch } from "react-redux";
-import { DnD } from "../../DnD";
+import React, { ReactElement, useCallback, useEffect, useState } from "react";
+import { DnD } from "../../shared/Draggable/DnD";
 import { isEmpty } from "lodash";
-import Sticky from "react-stickynode";
 import SlidingPane from "react-sliding-pane";
-import { extractComicArchive } from "../../../actions/fileops.actions";
-import { analyzeImage } from "../../../actions/fileops.actions";
 import { Canvas } from "../../shared/Canvas";
+import { useQuery, useQueryClient } from "@tanstack/react-query";
+import axios from "axios";
+import {
+  IMAGETRANSFORMATION_SERVICE_BASE_URI,
+  LIBRARY_SERVICE_BASE_URI,
+  LIBRARY_SERVICE_HOST,
+} from "../../../constants/endpoints";
+import { useStore } from "../../../store";
+import { useShallow } from "zustand/react/shallow";
+import { escapePoundSymbol } from "../../../shared/utils/formatting.utils";

 export const ArchiveOperations = (props): ReactElement => {
  const { data } = props;
-  const isComicBookExtractionInProgress = useSelector(
-    (state: RootState) => state.fileOps.comicBookExtractionInProgress,
+
+  const { socketIOInstance } = useStore(
+    useShallow((state) => ({
+      socketIOInstance: state.socketIOInstance,
+    })),
  );
-  const extractedComicBookArchive = useSelector(
-    (state: RootState) => state.fileOps.extractedComicBookArchive.analysis,
-  );
-
-  const imageAnalysisResult = useSelector((state: RootState) => {
-    return state.fileOps.imageAnalysisResults;
-  });
-
-  const dispatch = useDispatch();
-  const unpackComicArchive = useCallback(() => {
-    dispatch(
-      extractComicArchive(data.rawFileDetails.filePath, {
-        type: "full",
-        purpose: "analysis",
-        imageResizeOptions: {
-          baseWidth: 275,
-        },
-      }),
-    );
-  }, []);
-
+  const queryClient = useQueryClient();
  // sliding panel config
  const [visible, setVisible] = useState(false);
  const [slidingPanelContentId, setSlidingPanelContentId] = useState("");
  // current image
  const [currentImage, setCurrentImage] = useState([]);
+  const [uncompressedArchive, setUncompressedArchive] = useState([]);
+  const [imageAnalysisResult, setImageAnalysisResult] = useState({});
+  const [shouldRefetchComicBookData, setShouldRefetchComicBookData] =
+    useState(false);
+  const constructImagePaths = (data): Array<string> => {
+    return data?.map((path: string) =>
+      escapePoundSymbol(encodeURI(`${LIBRARY_SERVICE_HOST}/${path}`)),
+    );
+  };
+
+  // Listen to the uncompression complete event and orchestrate the final payload
+  socketIOInstance.on("LS_UNCOMPRESSION_JOB_COMPLETE", (data) => {
+    setUncompressedArchive(constructImagePaths(data?.uncompressedArchive));
+  });
+
+  useEffect(() => {
+    let isMounted = true;
+
+    if (data.rawFileDetails?.archive?.uncompressed) {
+      const fetchUncompressedArchive = async () => {
+        try {
+          const response = await axios({
+            url: `${LIBRARY_SERVICE_BASE_URI}/walkFolders`,
+            method: "POST",
+            data: {
+              basePathToWalk: data?.rawFileDetails?.archive?.expandedPath,
+              extensions: [".jpg", ".jpeg", ".png", ".bmp", "gif"],
+            },
+            transformResponse: async (responseData) => {
+              const parsedData = JSON.parse(responseData);
+              const paths = parsedData.map((pathObject) => {
+                return `${pathObject.containedIn}/${pathObject.name}${pathObject.extension}`;
+              });
+              const uncompressedArchive = constructImagePaths(paths);
+
+              if (isMounted) {
+                setUncompressedArchive(uncompressedArchive);
+                setShouldRefetchComicBookData(true);
+              }
+            },
+          });
+        } catch (error) {
+          console.error("Error fetching uncompressed archive:", error);
+          // Handle error if necessary
+        }
+      };
+      fetchUncompressedArchive();
+    }
+
+    // Cleanup function
+    return () => {
+      isMounted = false;
+      setUncompressedArchive([]);
+    };
+  }, [data]);
+
+  const analyzeImage = async (imageFilePath: string) => {
+    const response = await axios({
+      url: `${IMAGETRANSFORMATION_SERVICE_BASE_URI}/analyze`,
+      method: "POST",
+      data: {
+        imageFilePath,
+      },
+    });
+    setImageAnalysisResult(response?.data);
+    queryClient.invalidateQueries({ queryKey: ["uncompressedArchive"] });
+  };
+
+  const {
+    data: uncompressionResult,
+    refetch,
+    isLoading,
+    isSuccess,
+  } = useQuery({
+    queryFn: async () =>
+      await axios({
+        method: "POST",
+        url: `http://localhost:3000/api/library/uncompressFullArchive`,
+        headers: {
+          "Content-Type": "application/json; charset=utf-8",
+        },
+        data: {
+          filePath: data.rawFileDetails.filePath,
+          comicObjectId: data._id,
+          options: {
+            type: "full",
+            purpose: "analysis",
+            imageResizeOptions: {
+              baseWidth: 275,
+            },
+          },
+        },
+      }),
+    queryKey: ["uncompressedArchive"],
+    enabled: false,
+  });
+
+  if (isSuccess && shouldRefetchComicBookData) {
+    queryClient.invalidateQueries({ queryKey: ["comicBookMetadata"] });
+    setShouldRefetchComicBookData(false);
+  }

  // sliding panel init
  const contentForSlidingPanel = {
@@ -46,13 +136,13 @@ export const ArchiveOperations = (props): ReactElement => {
      content: () => {
        return (
          <div>
-            <pre className="is-size-7">{currentImage}</pre>
+            <pre className="text-sm">{currentImage}</pre>
            {!isEmpty(imageAnalysisResult) ? (
-              <pre className="is-size-7 p-2 mt-3">
+              <pre className="p-2 mt-3">
                <Canvas data={imageAnalysisResult} />
              </pre>
            ) : null}
-            <pre className="is-size-7 mt-3">
+            <pre className="font-hasklig mt-3 text-sm">
              {JSON.stringify(imageAnalysisResult.analyzedData, null, 2)}
            </pre>
          </div>
@@ -64,54 +154,81 @@ export const ArchiveOperations = (props): ReactElement => {
  // sliding panel handlers
  const openImageAnalysisPanel = useCallback((imageFilePath) => {
    setSlidingPanelContentId("imageAnalysis");
-    dispatch(analyzeImage(imageFilePath));
+    analyzeImage(imageFilePath);
    setCurrentImage(imageFilePath);
    setVisible(true);
  }, []);

  return (
    <div key={2}>
-      <button
-        className={
-          isComicBookExtractionInProgress
-            ? "button is-loading is-warning"
-            : "button is-warning"
-        }
-        onClick={unpackComicArchive}
+      <article
+        role="alert"
+        className="mt-4 text-md rounded-lg max-w-screen-md border-s-4 border-blue-500 bg-blue-50 p-4 dark:border-s-4 dark:border-blue-600 dark:bg-blue-300 dark:text-slate-600"
      >
-        <span className="icon is-small">
-          <i className="fa-solid fa-box-open"></i>
-        </span>
-        <span>Unpack comic archive</span>
-      </button>
-      <div className="columns">
-        <div className="mt-5">
-          {!isEmpty(extractedComicBookArchive) ? (
+        <div>
+          <p>You can perform several operations on your comic book archive.</p>
+          <p>
+            Uncompressing, re-organizing the individual pages, then
+            re-compressing to a different format, for example.
+          </p>
+          <p>You can also analyze color histograms of pages.</p>
+        </div>
+      </article>
+      <div className="mt-5">
+        {data.rawFileDetails.archive?.uncompressed &&
+        !isEmpty(uncompressedArchive) ? (
+          <article
+            role="alert"
+            className="mt-4 text-md rounded-lg max-w-screen-md border-s-4 border-yellow-500 bg-yellow-50 p-4 dark:border-s-4 dark:border-yellow-600 dark:bg-yellow-300 dark:text-slate-600"
+          >
+            This issue is already uncompressed at:
+            <p>
+              <code className="font-hasklig text-sm">
+                {data.rawFileDetails.archive.expandedPath}
+              </code>
+              <div className="">It has {uncompressedArchive?.length} pages</div>
+            </p>
+          </article>
+        ) : null}
+
+        <div className="flex flex-row gap-2 mt-4">
+          {isEmpty(uncompressedArchive) ? (
+            <button
+              className="flex space-x-1 sm:mt-0 sm:flex-row sm:items-center rounded-lg border border-green-400 dark:border-green-200 bg-green-200 px-3 py-2 text-gray-500 hover:bg-transparent hover:text-green-600 focus:outline-none focus:ring active:text-indigo-500"
+              onClick={() => refetch()}
+            >
+              <span className="text-md">Unpack Comic Archive</span>
+              <span className="w-6 h-6">
+                <i className="h-6 w-6 icon-[solar--box-bold-duotone]"></i>
+              </span>
+            </button>
+          ) : null}
+
+          {!isEmpty(uncompressedArchive) ? (
+            <div>
+              <button
+                className="flex space-x-1 sm:mt-0 sm:flex-row sm:items-center rounded-lg border border-green-400 dark:border-green-200 bg-green-200 px-3 py-2 text-gray-500 hover:bg-transparent hover:text-green-600 focus:outline-none focus:ring active:text-indigo-500"
+                onClick={() => refetch()}
+              >
+                <span className="text-md">Convert to .cbz</span>
+                <span className="w-6 h-6">
+                  <i className="h-6 w-6 icon-[solar--zip-file-bold-duotone]"></i>
+                </span>
+              </button>
+            </div>
+          ) : null}
+        </div>
+      </div>
+
+      <div>
+        <div className="mt-10">
+          {!isEmpty(uncompressedArchive) ? (
            <DnD
-              data={extractedComicBookArchive}
+              data={uncompressedArchive}
              onClickHandler={openImageAnalysisPanel}
            />
          ) : null}
        </div>
-        {!isEmpty(extractedComicBookArchive) ? (
-          <div className="column mt-5">
-            <Sticky enabled={true} top={70} bottomBoundary={3000}>
-              <div className="card">
-                <div className="card-content">
-                  <span className="has-text-size-4">
-                    {extractedComicBookArchive.length} pages
-                  </span>
-                  <button className="button is-small is-light is-primary is-outlined">
-                    <span className="icon is-small">
-                      <i className="fa-solid fa-compress"></i>
-                    </span>
-                    <span>Convert to CBZ</span>
-                  </button>
-                </div>
-              </div>
-            </Sticky>
-          </div>
-        ) : null}
      </div>
      <SlidingPane
        isOpen={visible}
@@ -126,4 +243,4 @@ export const ArchiveOperations = (props): ReactElement => {
  );
 };

-export default ArchiveOperations;
+export default ArchiveOperations;
--- a/src/client/components/ComicDetail/Tabs/ComicInfoXML.tsx
+++ b/src/client/components/ComicDetail/Tabs/ComicInfoXML.tsx
@@ -4,52 +4,59 @@ import React, { ReactElement } from "react";
 export const ComicInfoXML = (data): ReactElement => {
  const { json } = data;
  return (
-    <div className="comicInfo-metadata">
-      <dl className="has-text-size-7">
-        <dd className="has-text-weight-medium">{json.series[0]}</dd>
-        <dd className="mt-2 mb-2">
-          <div className="field is-grouped is-grouped-multiline">
-            <div className="control">
-              <span className="tags has-addons">
-                <span className="tag">Pages</span>
-                <span className="tag is-warning is-light">
-                  {json.publisher[0]}
+    <div className="flex md:w-4/5 lg:w-78">
+      <dl className="dark:bg-yellow-600 bg-yellow-200 p-3 rounded-lg">
+        <dt>
+          <p className="text-lg">{json.series[0]}</p>
+        </dt>
+        <dd className="text-sm">
+          published by{" "}
+          <span className="underline">
+            {json.publisher[0]}
+            <i className="icon-[solar--arrow-right-up-outline] w-4 h-4" />
+          </span>
+        </dd>
+        <span className="inline-flex flex-row gap-2">
+          {/* Issue number */}
+          {!isUndefined(json.number) && (
+            <dd className="my-2">
+              <span className="inline-flex items-center bg-slate-50 text-sm text-slate-800 font-medium px-2 rounded-md dark:text-slate-900 dark:bg-slate-400">
+                <span className="pr-1 pt-1">
+                  <i className="icon-[solar--hashtag-outline] w-4 h-4"></i>
+                </span>
+                <span className="text-slate-900 dark:text-slate-900">
+                  {parseInt(json.number[0], 10)}
                </span>
              </span>
-            </div>
-            <div className="control">
-              <span className="tags has-addons">
-                <span className="tag">Issue #</span>
-                <span className="tag is-warning is-light">
-                  {!isUndefined(json.number) && parseInt(json.number[0], 10)}
-                </span>
+            </dd>
+          )}
+          <dd className="my-2">
+            {/* Genre */}
+            <span className="inline-flex items-center bg-slate-50 text-slate-800 text-sm font-medium px-2 rounded-md dark:text-slate-900 dark:bg-slate-400">
+              <span className="pr-1 pt-1">
+                <i className="icon-[solar--sticker-smile-circle-bold-duotone] w-5 h-5"></i>
              </span>
-            </div>
-            <div className="control">
-              <span className="tags has-addons">
-                <span className="tag">Pages</span>
-                <span className="tag is-warning is-light">
-                  {json.pagecount[0]}
-                </span>
+
+              <span className="text-slate-500 dark:text-slate-900">
+                {json.genre[0]}
              </span>
-            </div>
-            {!isUndefined(json.genre) && (
-              <div className="control">
-                <span className="tags has-addons">
-                  <span className="tag">Genre</span>
-                  <span className="tag is-success is-light">
-                    {json.genre[0]}
-                  </span>
-                </span>
-              </div>
-            )}
-          </div>
+            </span>
+          </dd>
+        </span>
+
+        <dd className="my-1">
+          {/* Summary */}
+          {!isUndefined(json.summary) && (
+            <span className="text-md text-slate-500 dark:text-slate-900">
+              {json.summary[0]}
+            </span>
+          )}
        </dd>
        <dd>
-          <span className="is-size-7">{json.notes[0]}</span>
-        </dd>
-        <dd className="mt-1 mb-1">
-          {!isUndefined(json.summary) && json.summary[0]}
+          {/* Notes */}
+          <span className="text-sm text-slate-500 dark:text-slate-900">
+            {json.notes[0]}
+          </span>
        </dd>
      </dl>
    </div>
--- a/src/client/components/ComicDetail/Tabs/VolumeInformation.tsx
+++ b/src/client/components/ComicDetail/Tabs/VolumeInformation.tsx
@@ -1,30 +1,15 @@
 import React, { ReactElement } from "react";
 import ComicVineDetails from "../ComicVineDetails";
-import { convert } from "html-to-text";
-import { isEmpty } from "lodash";

 export const VolumeInformation = (props): ReactElement => {
  const { data } = props;
-  const createDescriptionMarkup = (html) => {
-    return { __html: html };
-  };

  return (
    <div key={1}>
-      <div className="columns is-multiline">
-        <ComicVineDetails
-          data={data.sourcedMetadata.comicvine}
-          updatedAt={data.updatedAt}
-        />
-        <div className="column is-8">
-          {!isEmpty(data.sourcedMetadata.comicvine.description) &&
-            convert(data.sourcedMetadata.comicvine.description, {
-              baseElements: {
-                selectors: ["p"],
-              },
-            })}
-        </div>
-      </div>
+      <ComicVineDetails
+        data={data.sourcedMetadata.comicvine}
+        updatedAt={data.updatedAt}
+      />
    </div>
  );
 };
--- a/src/client/components/ComicDetail/TorrentDownloads.tsx
+++ b/src/client/components/ComicDetail/TorrentDownloads.tsx
@@ -0,0 +1,77 @@
+import React from "react";
+import dayjs from "dayjs";
+import prettyBytes from "pretty-bytes";
+
+export const TorrentDownloads = (props) => {
+  const { data } = props;
+  console.log(Object.values(data));
+  return (
+    <>
+      {data.map(({ torrent }) => {
+        return (
+          <dl className="mt-5 dark:text-slate-200 text-slate-600">
+            <dt className="text-lg">{torrent.name}</dt>
+            <p className="text-sm">{torrent.hash}</p>
+            <p className="text-sm">
+              Added on {dayjs.unix(torrent.added_on).format("ddd, D MMM, YYYY")}
+            </p>
+
+            <p className="flex gap-2 mt-1">
+              {torrent.progress > 0 ? (
+                <>
+                  <progress
+                    className="w-80 mt-2 [&::-webkit-progress-bar]:rounded-lg [&::-webkit-progress-value]:rounded-lg [&::-webkit-progress-bar]:bg-slate-300 [&::-webkit-progress-value]:bg-green-400 [&::-moz-progress-bar]:bg-green-400 h-2"
+                    value={Math.floor(torrent.progress * 100).toString()}
+                    max="100"
+                  ></progress>
+
+                  <span>{Math.floor(torrent.progress * 100)}%</span>
+
+                  {/* downloaded/left */}
+                  <p className="inline-flex items-center bg-slate-200 text-green-800 dark:text-green-900 text-xs font-medium px-2.5 py-1 rounded-md dark:bg-slate-400">
+                    <span className="pr-1">
+                      <i className="icon-[solar--arrow-to-down-left-outline] h-4 w-4"></i>
+                    </span>
+                    <span className="text-md">
+                      {prettyBytes(torrent.downloaded)}
+                    </span>
+                    {/* uploaded */}
+                    <span className="pr-1 text-orange-800 dark:text-orange-900 ml-2">
+                      <i className="icon-[solar--arrow-to-top-left-outline] h-4 w-4"></i>
+                    </span>
+                    <span className="text-md text-orange-800 dark:text-orange-900">
+                      {prettyBytes(torrent.uploaded)}
+                    </span>
+                  </p>
+                </>
+              ) : null}
+            </p>
+            <div className="flex gap-4 mt-2">
+              {/* Peers */}
+              <span className="inline-flex items-center bg-slate-200 text-slate-800 text-xs font-medium px-2.5 py-0.5 rounded-md dark:text-slate-900 dark:bg-slate-400">
+                <span className="pr-1">
+                  <i className="icon-[solar--station-minimalistic-line-duotone] h-5 w-5"></i>
+                </span>
+                <span className="text-md text-slate-900">
+                  {torrent.trackers_count}
+                </span>
+              </span>
+
+              {/* Size */}
+              <span className="inline-flex items-center bg-slate-200 text-slate-800 text-xs font-medium px-2.5 py-0.5 rounded-md dark:text-slate-900 dark:bg-slate-400">
+                <span className="pr-1 pt-1">
+                  <i className="icon-[solar--mirror-right-bold-duotone] h-4 w-4"></i>
+                </span>
+                <span className="text-md text-slate-900">
+                  {prettyBytes(torrent.total_size)}
+                </span>
+              </span>
+            </div>
+          </dl>
+        );
+      })}
+    </>
+  );
+};
+
+export default TorrentDownloads;
--- a/src/client/components/ComicDetail/TorrentSearchPanel.tsx
+++ b/src/client/components/ComicDetail/TorrentSearchPanel.tsx
@@ -0,0 +1,200 @@
+import React, { useState } from "react";
+import { useMutation, useQuery } from "@tanstack/react-query";
+import axios from "axios";
+import { Form, Field } from "react-final-form";
+import {
+  PROWLARR_SERVICE_BASE_URI,
+  QBITTORRENT_SERVICE_BASE_URI,
+} from "../../constants/endpoints";
+import { isEmpty, isNil } from "lodash";
+import ellipsize from "ellipsize";
+import prettyBytes from "pretty-bytes";
+
+export const TorrentSearchPanel = (props) => {
+  const { issueName, comicObjectId } = props;
+  // Initialize searchTerm with issueName from props
+  const [searchTerm, setSearchTerm] = useState({ issueName });
+  const [torrentToDownload, setTorrentToDownload] = useState("");
+
+  const { data, isSuccess, isLoading } = useQuery({
+    queryKey: ["searchResults", searchTerm.issueName],
+    queryFn: async () => {
+      return await axios({
+        url: `${PROWLARR_SERVICE_BASE_URI}/search`,
+        method: "POST",
+        data: {
+          port: "9696",
+          apiKey: "c4f42e265fb044dc81f7e88bd41c3367",
+          offset: 0,
+          categories: [7030],
+          query: searchTerm.issueName,
+          host: "localhost",
+          limit: 100,
+          type: "search",
+          indexerIds: [2],
+        },
+      });
+    },
+    enabled: !isNil(searchTerm.issueName) && searchTerm.issueName.trim() !== "", // Make sure searchTerm is not empty
+  });
+  const mutation = useMutation({
+    mutationFn: async (newTorrent) =>
+      axios.post(`${QBITTORRENT_SERVICE_BASE_URI}/addTorrent`, newTorrent),
+    onSuccess: async (data) => {
+      console.log(data);
+    },
+  });
+  const searchIndexer = (values) => {
+    setSearchTerm({ issueName: values.issueName }); // Update searchTerm based on the form submission
+  };
+  const downloadTorrent = (evt) => {
+    const newTorrent = {
+      comicObjectId,
+      torrentToDownload: evt,
+    };
+    mutation.mutate(newTorrent);
+  };
+  return (
+    <>
+      <div className="mt-5">
+        <Form
+          onSubmit={searchIndexer}
+          initialValues={searchTerm}
+          render={({ handleSubmit }) => (
+            <form onSubmit={handleSubmit}>
+              <Field name="issueName">
+                {({ input, meta }) => (
+                  <div className="max-w-fit">
+                    <div className="flex flex-row bg-slate-300 dark:bg-slate-400 rounded-l-lg">
+                      <div className="w-10 pl-2 pt-1 text-gray-400 dark:text-gray-200">
+                        {/* Icon placeholder */}
+                        <i className="icon-[solar--magnifer-bold-duotone] h-7 w-7" />
+                      </div>
+                      <input
+                        {...input}
+                        type="text"
+                        className="dark:bg-slate-400 bg-slate-300 py-2 px-2 rounded-l-md border-gray-300 h-10 min-w-full dark:text-slate-800 sm:text-md sm:leading-5 focus:outline-none focus:shadow-outline-blue focus:border-blue-300"
+                        placeholder="Enter a search term"
+                      />
+                      <button
+                        className="sm:mt-0 min-w-fit rounded-r-lg border border-green-400 dark:border-green-200 bg-green-200 px-3 py-1 text-gray-500 hover:bg-transparent hover:text-green-600 focus:outline-none focus:ring active:text-indigo-500"
+                        type="submit"
+                      >
+                        <div className="flex flex-row">
+                          Search Indexer
+                          <div className="h-5 w-5 ml-1">
+                            <i className="h-6 w-6 icon-[solar--magnet-bold-duotone]" />
+                          </div>
+                        </div>
+                      </button>
+                    </div>
+                  </div>
+                )}
+              </Field>
+            </form>
+          )}
+        />
+      </div>
+
+      <article
+        role="alert"
+        className="mt-4 rounded-lg text-sm max-w-screen-md border-s-4 border-blue-500 bg-blue-50 p-4 dark:border-s-4 dark:border-blue-600 dark:bg-blue-300 dark:text-slate-600"
+      >
+        <div>
+          The default search term is an auto-detected title; you may need to
+          change it to get better matches if the auto-detected one doesn't work.
+        </div>
+      </article>
+      {!isEmpty(data?.data) ? (
+        <div className="overflow-x-auto w-fit mt-4 rounded-lg border border-gray-200 dark:border-gray-500">
+          <table className="min-w-full divide-y-2 divide-gray-200 dark:divide-gray-500 text-md">
+            <thead>
+              <tr>
+                <th className="whitespace-nowrap px-2 py-2 font-medium text-gray-900 dark:text-slate-200">
+                  Name
+                </th>
+                <th className="whitespace-nowrap py-2 font-medium text-gray-900 dark:text-slate-200">
+                  Indexer
+                </th>
+
+                <th className="whitespace-nowrap py-2 font-medium text-gray-900 dark:text-slate-200">
+                  Action
+                </th>
+              </tr>
+            </thead>
+            <tbody className="divide-y divide-slate-100 dark:divide-gray-500">
+              {data?.data.map((result, idx) => (
+                <tr key={idx}>
+                  <td className="px-3 py-3 text-gray-700 dark:text-slate-300 text-md">
+                    <p>{ellipsize(result.fileName, 90)}</p>
+                    {/* Seeders/Leechers */}
+                    <div className="flex gap-3 mt-2">
+                      <span className="inline-flex items-center bg-slate-50 text-slate-800 text-xs font-medium px-2 rounded-md dark:text-slate-900 dark:bg-slate-400">
+                        <span className="pr-1 pt-1">
+                          <i className="icon-[solar--archive-up-minimlistic-bold-duotone] w-5 h-5"></i>
+                        </span>
+
+                        <span className="text-md text-slate-500 dark:text-slate-900">
+                          {result.seeders} seeders
+                        </span>
+                      </span>
+
+                      <span className="inline-flex items-center bg-slate-50 text-slate-800 text-xs font-medium px-2 rounded-md dark:text-slate-900 dark:bg-slate-400">
+                        <span className="pr-1 pt-1">
+                          <i className="icon-[solar--archive-down-minimlistic-bold-duotone] w-5 h-5"></i>
+                        </span>
+
+                        <span className="text-md text-slate-500 dark:text-slate-900">
+                          {result.leechers} leechers
+                        </span>
+                      </span>
+                      {/* Size */}
+                      <span className="inline-flex items-center bg-slate-50 text-slate-800 text-xs font-medium px-2 rounded-md dark:text-slate-900 dark:bg-slate-400">
+                        <span className="pr-1 pt-1">
+                          <i className="icon-[solar--mirror-right-bold-duotone] w-5 h-5"></i>
+                        </span>
+
+                        <span className="text-md text-slate-500 dark:text-slate-900">
+                          {prettyBytes(result.size)}
+                        </span>
+                      </span>
+
+                      {/* Files */}
+                      <span className="inline-flex items-center bg-slate-50 text-slate-800 text-xs font-medium px-2 rounded-md dark:text-slate-900 dark:bg-slate-400">
+                        <span className="pr-1 pt-1">
+                          <i className="icon-[solar--documents-bold-duotone] w-5 h-5"></i>
+                        </span>
+
+                        <span className="text-md text-slate-500 dark:text-slate-900">
+                          {result.files} files
+                        </span>
+                      </span>
+                    </div>
+                  </td>
+
+                  <td className="px-3 py-3 text-gray-700 dark:text-slate-300 text-sm">
+                    {result.indexer}
+                  </td>
+
+                  <td className="px-3 py-3 text-gray-700 dark:text-slate-300 text-sm">
+                    <button
+                      className="flex space-x-1 sm:mt-0 sm:flex-row sm:items-center rounded-lg border border-green-400 dark:border-green-200 bg-green-200 px-3 py-1 text-gray-500 hover:bg-transparent hover:text-green-600 focus:outline-none focus:ring active:text-indigo-500"
+                      onClick={() => downloadTorrent(result.downloadUrl)}
+                    >
+                      <span className="text-xs">Download</span>
+                      <span className="w-5 h-5">
+                        <i className="h-5 w-5 icon-[solar--download-bold-duotone]"></i>
+                      </span>
+                    </button>
+                  </td>
+                </tr>
+              ))}
+            </tbody>
+          </table>
+        </div>
+      ) : null}
+    </>
+  );
+};
+
+export default TorrentSearchPanel;
--- a/src/client/components/ComicVineSearchForm.tsx
+++ b/src/client/components/ComicVineSearchForm.tsx
@@ -1,126 +0,0 @@
-import React, { useCallback } from "react";
-import { Form, Field } from "react-final-form";
-import Collapsible from "react-collapsible";
-import { fetchComicVineMatches } from "../actions/fileops.actions";
-import { useDispatch } from "react-redux";
-
-/**
- * Component for performing search against ComicVine
- *
- * @component
- * @example
- * return (
- *   <ComicVineSearchForm data={rawFileDetails} />
- * )
- */
-export const ComicVineSearchForm = (data) => {
-  const dispatch = useDispatch();
-  const onSubmit = useCallback((value) => {
-    const userInititatedQuery = {
-      inferredIssueDetails: {
-        name: value.issueName,
-        number: value.issueNumber,
-        subtitle: "",
-        year: value.issueYear,
-      },
-    };
-    dispatch(fetchComicVineMatches(data, userInititatedQuery));
-  }, []);
-  const validate = () => {
-    return true;
-  };
-
-  const MyForm = () => (
-    <Form
-      onSubmit={onSubmit}
-      validate={validate}
-      render={({ handleSubmit }) => (
-        <form onSubmit={handleSubmit}>
-          <span className="field is-normal">
-            <label className="label mb-2 is-size-5">Search Manually</label>
-          </span>
-          <div className="field is-horizontal">
-            <div className="field-body">
-              <div className="field">
-                <Field name="issueName">
-                  {(props) => (
-                    <p className="control is-expanded has-icons-left">
-                      <input
-                        {...props.input}
-                        className="input is-normal"
-                        placeholder="Type the issue name"
-                      />
-                      <span className="icon is-small is-left">
-                        <i className="fas fa-journal-whills"></i>
-                      </span>
-                    </p>
-                  )}
-                </Field>
-              </div>
-            </div>
-          </div>
-
-          <div className="field is-horizontal">
-            <div className="field-body">
-              <div className="field">
-                <Field name="issueNumber">
-                  {(props) => (
-                    <p className="control has-icons-left">
-                      <input
-                        {...props.input}
-                        className="input is-normal"
-                        placeholder="Type the issue number"
-                      />
-                      <span className="icon is-small is-left">
-                        <i className="fas fa-hashtag"></i>
-                      </span>
-                    </p>
-                  )}
-                </Field>
-              </div>
-
-              <div className="field">
-                <Field name="issueYear">
-                  {(props) => (
-                    <p className="control has-icons-left">
-                      <input
-                        {...props.input}
-                        className="input is-normal"
-                        placeholder="Type the issue year"
-                      />
-                      <span className="icon is-small is-left">
-                        <i className="fas fa-hashtag"></i>
-                      </span>
-                    </p>
-                  )}
-                </Field>
-              </div>
-            </div>
-          </div>
-
-          <div className="field is-horizontal">
-            <div className="field-body">
-              <div className="field">
-                <div className="control">
-                  <button
-                    type="submit"
-                    className="button is-success is-light is-outlined is-small"
-                  >
-                    <span className="icon">
-                      <i className="fas fa-search"></i>
-                    </span>
-                    <span>Search</span>
-                  </button>
-                </div>
-              </div>
-            </div>
-          </div>
-        </form>
-      )}
-    />
-  );
-
-  return <MyForm />;
-};
-
-export default ComicVineSearchForm;
--- a/src/client/components/Dashboard/Dashboard.tsx
+++ b/src/client/components/Dashboard/Dashboard.tsx
@@ -1,126 +1,77 @@
-import React, { ReactElement, useEffect } from "react";
-import { useDispatch, useSelector } from "react-redux";
+import React, { ReactElement } from "react";
 import ZeroState from "./ZeroState";
 import { RecentlyImported } from "./RecentlyImported";
 import { WantedComicsList } from "./WantedComicsList";
 import { VolumeGroups } from "./VolumeGroups";
 import { LibraryStatistics } from "./LibraryStatistics";
 import { PullList } from "./PullList";
-import {
-  fetchVolumeGroups,
-  getComicBooks,
-} from "../../actions/fileops.actions";
-import { getLibraryStatistics } from "../../actions/comicinfo.actions";
-import { isEmpty, isNil } from "lodash";
-import Header from "../Header";
+import { useQuery } from "@tanstack/react-query";
+import axios from "axios";
+import { LIBRARY_SERVICE_BASE_URI } from "../../constants/endpoints";

 export const Dashboard = (): ReactElement => {
-  const dispatch = useDispatch();
-  useEffect(() => {
-    dispatch(fetchVolumeGroups());
-    dispatch(
-      getComicBooks({
-        paginationOptions: {
-          page: 0,
-          limit: 5,
-          sort: { updatedAt: "-1" },
+  const { data: recentComics } = useQuery({
+    queryFn: async () =>
+      await axios({
+        url: `${LIBRARY_SERVICE_BASE_URI}/getComicBooks`,
+        method: "POST",
+        data: {
+          paginationOptions: {
+            page: 0,
+            limit: 5,
+            sort: { updatedAt: "-1" },
+          },
+          predicate: { "acquisition.source.wanted": false },
+          comicStatus: "recent",
        },
-        predicate: { "acquisition.source.wanted": false },
-        comicStatus: "recent",
      }),
-    );
-    dispatch(
-      getComicBooks({
-        paginationOptions: {
-          page: 0,
-          limit: 5,
-          sort: { updatedAt: "-1" },
+    queryKey: ["recentComics"],
+  });
+
+  const { data: wantedComics } = useQuery({
+    queryFn: async () =>
+      await axios({
+        url: `${LIBRARY_SERVICE_BASE_URI}/getComicBooks`,
+        method: "POST",
+        data: {
+          paginationOptions: {
+            page: 0,
+            limit: 5,
+            sort: { updatedAt: "-1" },
+          },
+          predicate: { "acquisition.source.wanted": true },
        },
-        predicate: { "acquisition.source.wanted": true },
-        comicStatus: "wanted",
      }),
-    );
-    dispatch(getLibraryStatistics());
-  }, []);
+    queryKey: ["wantedComics"],
+  });
+  const { data: volumeGroups } = useQuery({
+    queryFn: async () =>
+      await axios({
+        url: `${LIBRARY_SERVICE_BASE_URI}/getComicBookGroups`,
+        method: "GET",
+      }),
+    queryKey: ["volumeGroups"],
+  });

-  const recentComics = useSelector(
-    (state: RootState) => state.fileOps.recentComics,
-  );
-  const wantedComics = useSelector(
-    (state: RootState) => state.fileOps.wantedComics,
-  );
-  const volumeGroups = useSelector(
-    (state: RootState) => state.fileOps.comicVolumeGroups,
-  );
+  const { data: statistics } = useQuery({
+    queryFn: async () =>
+      await axios({
+        url: `${LIBRARY_SERVICE_BASE_URI}/libraryStatistics`,
+        method: "GET",
+      }),
+    queryKey: ["libraryStatistics"],
+  });

-  const libraryStatistics = useSelector(
-    (state: RootState) => state.comicInfo.libraryStatistics,
-  );
  return (
-    <div className="container">
-      <section className="section">
-        <h1 className="title">Dashboard</h1>
-
-        {!isEmpty(recentComics) ? (
-          <>
-            {/* Pull List */}
-            <PullList issues={recentComics} />
-            <>
-              <div className="content mt-6">
-                <Header
-                  headerContent="Import Activity"
-                  subHeaderContent="Results aggregated from the last import"
-                  iconClassNames="fa-solid fa-file-invoice mr-2"
-                />
-              </div>
-
-              <table className="table">
-                <thead>
-                  <tr>
-                    <th>
-                      <abbr title="Position">Pos</abbr>
-                    </th>
-                    <th>Team</th>
-                    <th>
-                      <abbr title="Played">Pld</abbr>
-                    </th>
-                  </tr>
-                </thead>
-
-                <tbody>
-                  <tr>
-                    <th>1</th>
-                    <td>38</td>
-                  </tr>
-                </tbody>
-              </table>
-            </>
-
-            {/* Stats */}
-            {!isEmpty(libraryStatistics) && (
-              <LibraryStatistics stats={libraryStatistics} />
-            )}
-            {/* Wanted comics */}
-            {!isEmpty(wantedComics) && (
-              <WantedComicsList comics={wantedComics} />
-            )}
-            {/* Recent imports */}
-            <RecentlyImported comicBookCovers={recentComics} />
-
-            {/* Volumes */}
-            {!isEmpty(volumeGroups) && (
-              <VolumeGroups volumeGroups={volumeGroups} />
-            )}
-          </>
-        ) : (
-          <ZeroState
-            header={"Set the source directory"}
-            message={
-              "No comics were found! Please point ThreeTwo! to a directory..."
-            }
-          />
-        )}
-      </section>
+    <div className="container mx-auto max-w-full">
+      <PullList />
+      {recentComics && <RecentlyImported comics={recentComics?.data.docs} />}
+      {/* Wanted comics */}
+      <WantedComicsList comics={wantedComics?.data?.docs} />
+      {/* Library Statistics */}
+      {statistics && <LibraryStatistics stats={statistics?.data} />}
+      {/* Volume groups */}
+      <VolumeGroups volumeGroups={volumeGroups?.data} />
    </div>
  );
 };
--- a/src/client/components/Dashboard/LibraryStatistics.tsx
+++ b/src/client/components/Dashboard/LibraryStatistics.tsx
@@ -1,113 +1,99 @@
 import React, { ReactElement, useEffect } from "react";
 import prettyBytes from "pretty-bytes";
 import { isEmpty, isUndefined, map } from "lodash";
+import Header from "../shared/Header";

 export const LibraryStatistics = (
  props: ILibraryStatisticsProps,
 ): ReactElement => {
-  // const { stats } = props;
+  const { stats } = props;
  return (
    <div className="mt-5">
-      <h4 className="title is-4">
-        <i className="fa-solid fa-chart-simple"></i> Your Library In Numbers 
-      </h4>
-      <p className="subtitle is-7">A brief snapshot of your library.</p>
-      <div className="columns is-multiline">
-        <div className="column is-narrow is-two-quarter">
-          <dl className="box">
-            <dd className="is-size-4">
-              <span className="has-text-weight-bold">
-                {props.stats.totalDocuments}
-              </span>{" "}
-              files
+      <Header
+        headerContent="Your Library In Numbers"
+        subHeaderContent={
+          <span className="text-md">A brief snapshot of your library.</span>
+        }
+        iconClassNames="fa-solid fa-binoculars mr-2"
+      />
+
+      <div className="mt-3">
+        <div className="flex flex-row gap-5">
+          <div className="flex flex-col rounded-lg bg-green-100 dark:bg-green-200 px-4 py-6 text-center">
+            <dt className="text-lg font-medium text-gray-500">Library size</dt>
+            <dd className="text-3xl text-green-600 md:text-5xl">
+              {props.stats.totalDocuments} files
            </dd>
-            <dd className="is-size-4">
-              Library size
-              <span className="has-text-weight-bold">
-                {" "}
+            <dd>
+              <span className="text-2xl text-green-600">
                {props.stats.comicDirectorySize &&
                  prettyBytes(props.stats.comicDirectorySize)}
              </span>
            </dd>
+          </div>
+          {/* comicinfo and comicvine tagged issues */}
+          <div className="flex flex-col gap-4">
            {!isUndefined(props.stats.statistics) &&
              !isEmpty(props.stats.statistics[0].issues) && (
-                <dd className="is-size-6">
-                  <span className="has-text-weight-bold">
+                <div className="flex flex-col h-fit rounded-lg bg-green-100 dark:bg-green-200 px-4 py-3 text-center">
+                  <span className="text-xl">
                    {props.stats.statistics[0].issues.length}
                  </span>{" "}
                  tagged with ComicVine
-                </dd>
+                </div>
              )}
            {!isUndefined(props.stats.statistics) &&
              !isEmpty(props.stats.statistics[0].issuesWithComicInfoXML) && (
-                <dd className="is-size-6">
-                  <span className="has-text-weight-bold">
+                <div className="flex flex-col h-fit rounded-lg bg-green-100 dark:bg-green-200 px-4 py-3 text-center">
+                  <span className="text-xl">
                    {props.stats.statistics[0].issuesWithComicInfoXML.length}
                  </span>{" "}
-                  with
                  <span className="tag is-warning has-text-weight-bold mr-2 ml-1">
-                    ComicInfo.xml
+                    with ComicInfo.xml
                  </span>
-                </dd>
+                </div>
              )}
-          </dl>
-        </div>
+          </div>

-        <div className="p-3 column is-one-quarter">
-          <dl className="box">
-            <dd className="is-size-6">
-              <span className="has-text-weight-bold"></span> Issues
-            </dd>
-            <dd className="is-size-6">
-              <span className="has-text-weight-bold">304</span> Volumes
-            </dd>
-            <dd className="is-size-6">
-              {!isUndefined(props.stats.statistics) &&
-                !isEmpty(props.stats.statistics[0].fileTypes) &&
-                map(props.stats.statistics[0].fileTypes, (fileType, idx) => {
-                  return (
-                    <span key={idx}>
-                      <span className="has-text-weight-bold">
-                        {fileType.data.length}
-                      </span>
-                      <span className="tag is-warning has-text-weight-bold mr-2 ml-1">
-                        {fileType._id}
-                      </span>
-                    </span>
-                  );
-                })}
-            </dd>
-          </dl>
-        </div>
+          <div className="">
+            {!isUndefined(props.stats.statistics) &&
+              !isEmpty(props.stats.statistics[0].fileTypes) &&
+              map(props.stats.statistics[0].fileTypes, (fileType, idx) => {
+                return (
+                  <span
+                    key={idx}
+                    className="flex flex-col mb-4 h-fit text-xl rounded-lg bg-green-100 dark:bg-green-200 px-4 py-3 text-center"
+                  >
+                    {fileType.data.length} {fileType._id}
+                  </span>
+                );
+              })}
+          </div>

-        {/* file types */}
-        <div className="p-3 column is-two-fifths">
-          {/* publisher with most issues */}
-          <dl className="box">
+          {/* file types */}
+          <div className="flex flex-col h-fit text-lg rounded-lg bg-green-100 dark:bg-green-200 px-4 py-3">
+            {/* publisher with most issues */}
            {!isUndefined(props.stats.statistics) &&
              !isEmpty(
                props.stats.statistics[0].publisherWithMostComicsInLibrary[0],
              ) && (
-                <dd className="is-size-6">
-                  <span className="has-text-weight-bold">
+                <>
+                  <span className="">
                    {
                      props.stats.statistics[0]
                        .publisherWithMostComicsInLibrary[0]._id
                    }
                  </span>
                  {" has the most issues "}
-                  <span className="has-text-weight-bold">
+                  <span className="">
                    {
                      props.stats.statistics[0]
                        .publisherWithMostComicsInLibrary[0].count
                    }
                  </span>
-                </dd>
+                </>
              )}
-            <dd className="is-size-6">
-              <span className="has-text-weight-bold">304</span> Volumes
-            </dd>
-          </dl>
+          </div>
        </div>
      </div>
    </div>
--- a/src/client/components/Dashboard/PullList.tsx
+++ b/src/client/components/Dashboard/PullList.tsx
@@ -1,160 +1,165 @@
-import { isNil, map } from "lodash";
-import React, { createRef, ReactElement, useCallback, useEffect } from "react";
-import Card from "../Carda";
-import Header from "../Header";
-import Masonry from "react-masonry-css";
-import { useDispatch, useSelector } from "react-redux";
-import { getWeeklyPullList } from "../../actions/comicinfo.actions";
+import React, { ReactElement, useState } from "react";
+import { map } from "lodash";
+import Card from "../shared/Carda";
+import Header from "../shared/Header";
 import { importToDB } from "../../actions/fileops.actions";
 import ellipsize from "ellipsize";
-import Slider from "react-slick";
-import "slick-carousel/slick/slick.css";
-import "slick-carousel/slick/slick-theme.css";
 import { Link } from "react-router-dom";

+import axios from "axios";
+import rateLimiter from "axios-rate-limit";
+import { setupCache } from "axios-cache-interceptor";
+import { useQuery } from "@tanstack/react-query";
+import "keen-slider/keen-slider.min.css";
+import { useKeenSlider } from "keen-slider/react";
+import { COMICVINE_SERVICE_URI } from "../../constants/endpoints";
+import { Field, Form } from "react-final-form";
+import DatePickerDialog from "../shared/DatePicker";
+import { format } from "date-fns";
+
 type PullListProps = {
  issues: any;
 };

-export const PullList = ({ issues }: PullListProps): ReactElement => {
-  const dispatch = useDispatch();
-  useEffect(() => {
-    dispatch(
-      getWeeklyPullList({
-        startDate: "2023-8-9",
-        pageSize: "15",
-        currentPage: "1",
-      }),
-    );
-  }, []);
-  const addToLibrary = useCallback(
-    (sourceName: string, locgMetadata) =>
-      dispatch(importToDB(sourceName, { locg: locgMetadata })),
-    [],
+const http = rateLimiter(axios.create(), {
+  maxRequests: 1,
+  perMilliseconds: 1000,
+  maxRPS: 1,
+});
+const cachedAxios = setupCache(axios);
+export const PullList = (): ReactElement => {
+  // datepicker
+  const date = new Date();
+  const [inputValue, setInputValue] = useState<string>(
+    format(date, "M-dd-yyyy"),
  );
-  /*
-  const foo = {
-    coverFile: {}, // pointer to which cover file to use
-    rawFileDetails: {}, // #1
-    sourcedMetadata: {
-      comicInfo: {},
-      comicvine: {}, // #2
-      locg: {}, // #2
-    },
-  };
-  */

-  const pullList = useSelector((state: RootState) => state.comicInfo.pullList);
-  let sliderRef = createRef();
-  const settings = {
-    dots: false,
-    infinite: false,
-    speed: 500,
-    slidesToShow: 5,
-    slidesToScroll: 5,
-    initialSlide: 0,
-    responsive: [
-      {
-        breakpoint: 1024,
-        settings: {
-          slidesToShow: 3,
-          slidesToScroll: 3,
-          infinite: false,
-        },
+  // keen slider
+  const [sliderRef, instanceRef] = useKeenSlider(
+    {
+      loop: true,
+      slides: {
+        origin: "auto",
+        number: 15,
+        perView: 5,
+        spacing: 15,
      },
-      {
-        breakpoint: 600,
-        settings: {
-          slidesToShow: 2,
-          slidesToScroll: 2,
-          initialSlide: 0,
-        },
-      },
-      {
-        breakpoint: 480,
-        settings: {
-          slidesToShow: 1,
-          slidesToScroll: 1,
-        },
+      slideChanged() {
+        console.log("slide changed");
      },
+    },
+    [
+      // add plugins here
    ],
-  };
+  );
+
+  const {
+    data: pullList,
+    refetch,
+    isSuccess,
+    isLoading,
+    isError,
+  } = useQuery({
+    queryFn: async (): any =>
+      await cachedAxios(`${COMICVINE_SERVICE_URI}/getWeeklyPullList`, {
+        method: "get",
+        params: { startDate: inputValue, pageSize: "15", currentPage: "1" },
+      }),
+    queryKey: ["pullList", inputValue],
+  });
+  const addToLibrary = (sourceName: string, locgMetadata) =>
+    importToDB(sourceName, { locg: locgMetadata });

  const next = () => {
-    sliderRef.slickNext();
+    // sliderRef.slickNext();
  };
  const previous = () => {
-    sliderRef.slickPrev();
+    // sliderRef.slickPrev();
  };
+
  return (
    <>
      <div className="content">
-        <Header headerContent="Discover"
-                subHeaderContent="Pull List aggregated for the week from League Of Comic Geeks"
-                iconClassNames="fa-solid fa-splotch mr-2"/>
-        <div className="field is-grouped">
+        <Header
+          headerContent="Discover"
+          subHeaderContent={
+            <span className="text-md">
+              Pull List aggregated for the week from{" "}
+              <span className="underline">
+                <a href="https://leagueofcomicgeeks.com/comics/new-comics">
+                  League Of Comic Geeks
+                </a>
+                <i className="icon-[solar--arrow-right-up-outline] w-4 h-4" />
+              </span>
+            </span>
+          }
+          iconClassNames="fa-solid fa-binoculars mr-2"
+          link="/pull-list/all/"
+        />
+        <div className="flex flex-row gap-5 mb-3">
          {/* select week */}
-          <div className="control">
-            <div className="select is-small">
-              <select>
-                <option>Select Week</option>
-                <option>With options</option>
-              </select>
-            </div>
-          </div>
-          {/* See all pull list issues */}
-          <div className="control">
-            <Link to={"/pull-list/all/"}>
-              <button className="button is-small">View all issues</button>
-            </Link>
-          </div>
-          <div className="field has-addons">
-            <div className="control">
-              <button className="button is-rounded is-small" onClick={previous}>
-                <i className="fa-solid fa-caret-left"></i>
-              </button>
-            </div>
-            <div className="control">
-              <button className="button is-rounded is-small" onClick={next}>
-                <i className="fa-solid fa-caret-right"></i>
-              </button>
-            </div>
+          <div className="flex flex-row gap-4 my-3">
+            <Form
+              onSubmit={() => {}}
+              render={({ handleSubmit }) => (
+                <form>
+                  <div className="flex flex-col gap-2">
+                    {/* week selection for pull list */}
+                    <DatePickerDialog
+                      inputValue={inputValue}
+                      setter={setInputValue}
+                    />
+                    {inputValue && (
+                      <div className="text-sm">
+                        Showing pull list for{" "}
+                        <span className="inline-flex mb-2 items-center bg-slate-50 text-slate-800 text-xs font-medium px-2.5 py-1 rounded-md dark:text-slate-900 dark:bg-slate-400">
+                          {inputValue}
+                        </span>
+                      </div>
+                    )}
+                  </div>
+                </form>
+              )}
+            />
          </div>
        </div>
      </div>
-      <Slider {...settings} ref={(c) => (sliderRef = c)}>
-        {!isNil(pullList) &&
-          pullList &&
-          map(pullList, ({ issue }, idx) => {
+
+      {isSuccess && !isLoading && (
+        <div ref={sliderRef} className="keen-slider flex flex-row">
+          {map(pullList?.data.result, (issue, idx) => {
            return (
-              <Card
-                key={idx}
-                orientation={"vertical"}
-                imageUrl={issue.cover}
-                hasDetails
-                title={ellipsize(issue.name, 18)}
-                cardContainerStyle={{
-                  marginRight: 22,
-                  boxShadow: "-2px 4px 15px -6px rgba(0,0,0,0.57)",
-                }}
-              >
-                <div className="content">
-                  <div className="control">
-                    <span className="tag">{issue.publisher}</span>
+              <div key={idx} className="keen-slider__slide">
+                <Card
+                  orientation={"vertical-2"}
+                  imageUrl={issue.cover}
+                  hasDetails
+                  title={ellipsize(issue.name, 25)}
+                >
+                  <div className="px-1">
+                    <span className="inline-flex mb-2 items-center bg-slate-50 text-slate-800 text-xs font-medium px-2.5 py-1 rounded-md dark:text-slate-900 dark:bg-slate-400">
+                      {issue.publisher}
+                    </span>
+                    <div className="flex flex-row justify-end">
+                      <button
+                        className="flex space-x-1 mb-2 sm:mt-0 sm:flex-row sm:items-center rounded-lg border border-green-400 dark:border-green-200 bg-green-200 px-2 py-1 text-gray-500 hover:bg-transparent hover:text-green-600 focus:outline-none focus:ring active:text-indigo-500"
+                        onClick={() => addToLibrary("locg", issue)}
+                      >
+                        <i className="icon-[solar--add-square-bold-duotone] w-5 h-5 mr-2"></i>{" "}
+                        Want
+                      </button>
+                    </div>
                  </div>
-                  <div className="mt-2">
-                    <button
-                      className="button is-small is-success is-outlined is-light"
-                      onClick={() => addToLibrary("locg", issue)}
-                    >
-                      <i className="fa-solid fa-plus"></i> Want
-                    </button>
-                  </div>
-                </div>
-              </Card>
+                </Card>
+              </div>
            );
          })}
-      </Slider>
+        </div>
+      )}
+      {isLoading ? <div>Loading...</div> : null}
+      {isError ? (
+        <div>An error occurred while retrieving the pull list.</div>
+      ) : null}
    </>
  );
 };
--- a/src/client/components/Dashboard/RecentlyImported.tsx
+++ b/src/client/components/Dashboard/RecentlyImported.tsx
@@ -1,50 +1,38 @@
 import React, { ReactElement } from "react";
-import Card from "../Carda";
+import Card from "../shared/Carda";
 import { Link } from "react-router-dom";
 import ellipsize from "ellipsize";
 import { isEmpty, isNil, isUndefined, map } from "lodash";
 import { detectIssueTypes } from "../../shared/utils/tradepaperback.utils";
-import Masonry from "react-masonry-css";
 import {
  determineCoverFile,
  determineExternalMetadata,
 } from "../../shared/utils/metadata.utils";
+import { LIBRARY_SERVICE_HOST } from "../../constants/endpoints";
+import Header from "../shared/Header";

 type RecentlyImportedProps = {
-  comicBookCovers: any;
+  comics: any;
 };

-export const RecentlyImported = ({
-  comicBookCovers,
-}: RecentlyImportedProps): ReactElement => {
-  const breakpointColumnsObj = {
-    default: 5,
-    1100: 4,
-    700: 2,
-    600: 2,
-  };
+export const RecentlyImported = (
+  comics: RecentlyImportedProps,
+): ReactElement => {
  return (
-    <>
-      <div className="content mt-5">
-        <h4 className="title is-4">
-          <i className="fa-solid fa-file-arrow-down"></i> Recently Imported
-        </h4>
-        <p className="subtitle is-7">
-          Recent Library activity such as imports, tagging, etc.
-        </p>
-      </div>
-      <Masonry
-        breakpointCols={breakpointColumnsObj}
-        className="recent-comics-container"
-        columnClassName="recent-comics-column"
-      >
-        {map(
-          comicBookCovers,
+    <div>
+      <Header
+        headerContent="Recently Imported"
+        subHeaderContent="Recent Library activity such as imports, tagging, etc."
+        iconClassNames="fa-solid fa-binoculars mr-2"
+      />
+      <div className="grid grid-cols-5 gap-6 mt-3">
+        {comics?.comics.map(
          (
            {
              _id,
              rawFileDetails,
              sourcedMetadata: { comicvine, comicInfo, locg },
+              inferredMetadata,
              acquisition: {
                source: { name },
              },
@@ -62,85 +50,80 @@ export const RecentlyImported = ({
              comicInfo,
              locg,
            });
-            const isComicBookMetadataAvailable =
+            const isComicVineMetadataAvailable =
              !isUndefined(comicvine) &&
              !isUndefined(comicvine.volumeInformation);

-            const titleElement = (
-              <Link to={"/comic/details/" + _id}>
-                {ellipsize(issueName, 20)}
-              </Link>
-            );
            return (
-              <React.Fragment key={_id}>
-                <Card
-                  orientation={"vertical"}
-                  imageUrl={url}
-                  hasDetails
-                  title={issueName ? titleElement : null}
-                >
-                  <div className="content is-flex is-flex-direction-row">
-                    {/* Raw file presence  */}
-                    {isNil(rawFileDetails) && (
-                      <span className="icon custom-icon is-small has-text-danger mr-2">
-                        <img src="/src/client/assets/img/missing-file.svg" />
+              <Card
+                orientation="vertical-2"
+                key={idx}
+                imageUrl={`${LIBRARY_SERVICE_HOST}/${rawFileDetails.cover.filePath}`}
+                title={inferredMetadata.issue.name}
+                hasDetails
+              >
+                <div>
+                  <dd className="text-sm my-1 flex flex-row gap-1">
+                    {/* Issue number */}
+                    <span className="inline-flex items-center bg-slate-50 text-slate-800 text-xs font-medium px-2.5 py-0.5 rounded-md dark:text-slate-900 dark:bg-slate-400">
+                      <span className="pr-1 pt-1">
+                        <i className="icon-[solar--hashtag-outline]"></i>
                      </span>
-                    )}
+                      <span className="text-md text-slate-900">
+                        {inferredMetadata.issue.number}
+                      </span>
+                    </span>
+                    {/* File extension */}
+                    <span className="inline-flex items-center bg-slate-50 text-slate-800 text-xs font-medium px-2.5 py-0.5 rounded-md dark:text-slate-900 dark:bg-slate-400">
+                      <span className="pr-1 pt-1">
+                        <i className="icon-[solar--file-bold-duotone] w-4 h-4"></i>
+                      </span>
+
+                      <span className="text-md text-slate-500 dark:text-slate-900">
+                        {rawFileDetails.extension}
+                      </span>
+                    </span>
+                    {/* Uncompressed status  */}
+                    {rawFileDetails?.archive?.uncompressed ? (
+                      <span className="inline-flex items-center bg-slate-50 text-slate-800 text-xs font-medium px-2.5 py-0.5 rounded-md dark:text-slate-900 dark:bg-slate-400">
+                        <span className="pr-1 pt-1">
+                          <i className="icon-[solar--bookmark-bold-duotone] w-4 h-4"></i>
+                        </span>
+                      </span>
+                    ) : null}
+                  </dd>
+                </div>
+
+                <div className="flex flex-row items-center gap-1 mt-2 pb-1">
+                  <div className="sm:inline-flex sm:shrink-0 sm:items-center sm:gap-2">
                    {/* ComicInfo.xml presence */}
                    {!isNil(comicInfo) && !isEmpty(comicInfo) && (
-                      <span className="icon custom-icon is-small has-text-danger">
-                        <img
-                          src="/src/client/assets/img/comicinfoxml.svg"
-                          alt={"ComicInfo.xml file detected."}
-                        />
-                      </span>
+                      <div mt-1>
+                        <i className="h-7 w-7 icon-[solar--code-file-bold-duotone] text-yellow-500 dark:text-yellow-300"></i>
+                      </div>
                    )}
                    {/* ComicVine metadata presence */}
-                    {isComicBookMetadataAvailable && (
-                      <span className="icon custom-icon">
+                    {isComicVineMetadataAvailable && (
+                      <span className="w-7 h-7">
                        <img
                          src="/src/client/assets/img/cvlogo.svg"
                          alt={"ComicVine metadata detected."}
                        />
                      </span>
                    )}
-                    {/* Issue type */}
-                    {isComicBookMetadataAvailable &&
-                    !isNil(
-                      detectIssueTypes(comicvine.volumeInformation.description),
-                    ) ? (
-                      <span className="tag is-warning">
-                        {
-                          detectIssueTypes(
-                            comicvine.volumeInformation.description,
-                          ).displayName
-                        }
-                      </span>
-                    ) : null}
                  </div>
-                </Card>
-                {/* metadata card */}
-                {!isNil(name) && (
-                  <Card orientation="horizontal" hasDetails imageUrl={coverURL}>
-                    <dd className="is-size-9">
-                      <dl>
-                        <span className="icon custom-icon">
-                          <img src={`/src/client/assets/img/${icon}`} />
-                        </span>
-                      </dl>
-                      <dl>
-                        <span className="small-tag">
-                          {ellipsize(issue, 15)}
-                        </span>
-                      </dl>
-                    </dd>
-                  </Card>
-                )}
-              </React.Fragment>
+                  {/* Raw file presence  */}
+                  {isNil(rawFileDetails) && (
+                    <span className="h-6 w-5 sm:shrink-0 sm:items-center sm:gap-2">
+                      <i className="icon-[solar--file-corrupted-outline] h-5 w-5" />
+                    </span>
+                  )}
+                </div>
+              </Card>
            );
          },
        )}
-      </Masonry>
-    </>
+      </div>
+    </div>
  );
-};
+};
--- a/src/client/components/Dashboard/VolumeGroups.tsx
+++ b/src/client/components/Dashboard/VolumeGroups.tsx
@@ -2,15 +2,10 @@ import { map, unionBy } from "lodash";
 import React, { ReactElement } from "react";
 import ellipsize from "ellipsize";
 import { Link, useNavigate } from "react-router-dom";
-import Masonry from "react-masonry-css";
+import Card from "../shared/Carda";
+import Header from "../shared/Header";

 export const VolumeGroups = (props): ReactElement => {
-  const breakpointColumnsObj = {
-    default: 5,
-    1100: 4,
-    700: 2,
-    500: 1,
-  };
  // Till mongo gives us back the deduplicated results with the ObjectId
  const deduplicatedGroups = unionBy(props.volumeGroups, "volumes.id");
  const navigate = useNavigate();
@@ -19,44 +14,48 @@ export const VolumeGroups = (props): ReactElement => {
  };

  return (
-    <section className="volumes-container mt-4">
-      <div className="content">
-        <a className="mb-1" onClick={navigateToVolumes}>
-          <span className="is-size-4 has-text-weight-semibold">
-            <i className="fa-solid fa-layer-group"></i> Volumes
-          </span>
-          <span className="icon mt-1">
-            <i className="fa-solid fa-angle-right"></i>
-          </span>
-        </a>
-        <p className="subtitle is-7">Based on ComicVine Volume information</p>
-      </div>
-      <Masonry
-        breakpointCols={breakpointColumnsObj}
-        className="volumes-grid"
-        columnClassName="volumes-grid-column"
-      >
+    <section>
+      <Header
+        headerContent="Volumes"
+        subHeaderContent="Based on ComicVine Volume information"
+        iconClassNames="fa-solid fa-binoculars mr-2"
+        link={"/volumes"}
+      />
+      <div className="grid grid-cols-5 gap-6 mt-3">
        {map(deduplicatedGroups, (data) => {
          return (
-            <div className="stack" key={data._id}>
-              <img src={data.volumes.image.small_url} />
-              <div className="content">
-                <div className="stack-title is-size-8">
-                  <Link to={`/volume/details/${data._id}`}>
-                    {ellipsize(data.volumes.name, 18)}
-                  </Link>
-                </div>
-                <div className="control">
-                  <span className="tags has-addons">
-                    <span className="tag is-primary is-light">Issues</span>
-                    <span className="tag">{data.volumes.count_of_issues}</span>
+            <div className="max-w-sm mx-auto" key={data._id}>
+              <Card
+                orientation="vertical-2"
+                key={data._id}
+                imageUrl={data.volumes.image.small_url}
+                hasDetails
+              >
+                <div className="py-3">
+                  <div className="text-sm">
+                    <Link to={`/volume/details/${data._id}`}>
+                      {ellipsize(data.volumes.name, 48)}
+                    </Link>
+                  </div>
+                  {/* issue count */}
+                  <span className="inline-flex mt-1 items-center bg-slate-50 text-slate-800 text-xs font-medium px-2.5 py-0.5 rounded-md dark:text-slate-600 dark:bg-slate-400">
+                    <span className="pr-1 pt-1">
+                      <i className="icon-[solar--documents-minimalistic-bold-duotone] w-5 h-5"></i>
+                    </span>
+
+                    <span className="text-md text-slate-500 dark:text-slate-900">
+                      {data.volumes.count_of_issues} issues
+                    </span>
                  </span>
                </div>
-              </div>
+              </Card>
+              <div className="w-11/12 h-2 mx-auto bg-slate-900 rounded-b opacity-75"></div>
+              <div className="w-10/12 h-2 mx-auto bg-slate-900 rounded-b opacity-50"></div>
+              <div className="w-9/12 h-2 mx-auto bg-slate-900 rounded-b opacity-25"></div>
            </div>
          );
        })}
-      </Masonry>
+      </div>
    </section>
  );
 };
--- a/src/client/components/Dashboard/WantedComicsList.tsx
+++ b/src/client/components/Dashboard/WantedComicsList.tsx
@@ -1,11 +1,11 @@
 import React, { ReactElement } from "react";
-import Card from "../Carda";
+import Card from "../shared/Carda";
 import { Link, useNavigate } from "react-router-dom";
 import ellipsize from "ellipsize";
 import { isEmpty, isNil, isUndefined, map } from "lodash";
 import { detectIssueTypes } from "../../shared/utils/tradepaperback.utils";
-import Masonry from "react-masonry-css";
 import { determineCoverFile } from "../../shared/utils/metadata.utils";
+import Header from "../shared/Header";

 type WantedComicsListProps = {
  comics: any;
@@ -14,37 +14,17 @@ type WantedComicsListProps = {
 export const WantedComicsList = ({
  comics,
 }: WantedComicsListProps): ReactElement => {
-  const breakpointColumnsObj = {
-    default: 5,
-    1100: 4,
-    700: 2,
-    500: 1,
-  };
-
  const navigate = useNavigate();
-  const navigateToWantedComics = (row) => {
-    navigate(`/wanted/all`);
-  };
+
  return (
    <>
-      <div className="content mt-6">
-        <a className="mb-1" onClick={navigateToWantedComics}>
-          <span className="is-size-4 has-text-weight-semibold">
-            <i className="fa-solid fa-asterisk"></i> Wanted Comics
-          </span>
-          <span className="icon mt-1">
-            <i className="fa-solid fa-angle-right"></i>
-          </span>
-        </a>
-        <p className="subtitle is-7">
-          Comics marked as wanted from various sources.
-        </p>
-      </div>
-      <Masonry
-        breakpointCols={breakpointColumnsObj}
-        className="recent-comics-container"
-        columnClassName="recent-comics-column"
-      >
+      <Header
+        headerContent="Wanted Comics"
+        subHeaderContent="Comics marked as wanted from various sources"
+        iconClassNames="fa-solid fa-binoculars mr-2"
+        link={"/wanted"}
+      />
+      <div className="grid grid-cols-5 gap-6 mt-3">
        {map(
          comics,
          ({
@@ -73,42 +53,54 @@ export const WantedComicsList = ({
            return (
              <Card
                key={_id}
-                orientation={"vertical"}
+                orientation={"vertical-2"}
                imageUrl={url}
                hasDetails
                title={issueName ? titleElement : <span>No Name</span>}
              >
-                <div className="content is-flex is-flex-direction-row">
-                  {/* comicVine metadata presence */}
-                  {isComicBookMetadataAvailable && (
-                    <span className="icon custom-icon">
-                      <img src="/src/client/assets/img/cvlogo.svg" />
-                    </span>
-                  )}
-                  {!isEmpty(locg) && (
-                    <span className="icon custom-icon">
-                      <img src="/src/client/assets/img/locglogo.svg" />
-                    </span>
-                  )}
+                <div className="pb-1">
                  {/* Issue type */}
                  {isComicBookMetadataAvailable &&
                  !isNil(
                    detectIssueTypes(comicvine.volumeInformation.description),
                  ) ? (
-                    <span className="tag is-warning">
-                      {
-                        detectIssueTypes(
-                          comicvine.volumeInformation.description,
-                        ).displayName
-                      }
-                    </span>
+                    <div className="my-2">
+                      <span className="inline-flex items-center bg-slate-50 text-slate-800 text-xs font-medium px-2.5 py-0.5 rounded-md dark:text-slate-900 dark:bg-slate-400">
+                        <span className="pr-1 pt-1">
+                          <i className="icon-[solar--book-2-line-duotone] w-5 h-5"></i>
+                        </span>
+
+                        <span className="text-md text-slate-500 dark:text-slate-900">
+                          {
+                            detectIssueTypes(
+                              comicvine.volumeInformation.description,
+                            ).displayName
+                          }
+                        </span>
+                      </span>
+                    </div>
                  ) : null}
+
+                  {/* comicVine metadata presence */}
+                  {isComicBookMetadataAvailable && (
+                    <img
+                      src="/src/client/assets/img/cvlogo.svg"
+                      alt={"ComicVine metadata detected."}
+                      className="w-7 h-7"
+                    />
+                  )}
+                  {!isEmpty(locg) && (
+                    <img
+                      src="/src/client/assets/img/locglogo.svg"
+                      className="w-7 h-7"
+                    />
+                  )}
                </div>
              </Card>
            );
          },
        )}
-      </Masonry>
+      </div>
    </>
  );
 };
--- a/src/client/components/Dashboard/ZeroState.tsx
+++ b/src/client/components/Dashboard/ZeroState.tsx
@@ -6,8 +6,8 @@ interface ZeroStateProps {
 }
 const ZeroState: React.FunctionComponent<ZeroStateProps> = (props) => {
  return (
-    <article className="message is-info">
-      <div className="message-body">
+    <article className="">
+      <div className="">
        <p>{props.header}</p>
        {props.message}
      </div>
--- a/src/client/components/Downloads/Downloads.tsx
+++ b/src/client/components/Downloads/Downloads.tsx
@@ -1,13 +1,5 @@
-import React, {
-  ReactElement,
-  useCallback,
-  useContext,
-  useEffect,
-  useState,
-} from "react";
+import React, { ReactElement, useEffect, useState } from "react";
 import { getTransfers } from "../../actions/airdcpp.actions";
-import { useDispatch, useSelector } from "react-redux";
-import { AirDCPPSocketContext } from "../../context/AirDCPPSocket";
 import { isEmpty, isNil, isUndefined } from "lodash";
 import { determineCoverFile } from "../../shared/utils/metadata.utils";
 import MetadataPanel from "../shared/MetadataPanel";
@@ -17,18 +9,18 @@ interface IDownloadsProps {
 }

 export const Downloads = (props: IDownloadsProps): ReactElement => {
-  const airDCPPConfiguration = useContext(AirDCPPSocketContext);
+  // const airDCPPConfiguration = useContext(AirDCPPSocketContext);
  const {
    airDCPPState: { settings, socket },
  } = airDCPPConfiguration;
-  const dispatch = useDispatch();
+  // const dispatch = useDispatch();

-  const airDCPPTransfers = useSelector(
-    (state: RootState) => state.airdcpp.transfers,
-  );
-  const issueBundles = useSelector(
-    (state: RootState) => state.airdcpp.issue_bundles,
-  );
+  // const airDCPPTransfers = useSelector(
+  //   (state: RootState) => state.airdcpp.transfers,
+  // );
+  // const issueBundles = useSelector(
+  //   (state: RootState) => state.airdcpp.issue_bundles,
+  // );
  const [bundles, setBundles] = useState([]);
  // Make the call to get all transfers from AirDC++
  useEffect(() => {
--- a/src/client/components/GlobalSearchBar/SearchBar.tsx
+++ b/src/client/components/GlobalSearchBar/SearchBar.tsx
@@ -1,7 +1,7 @@
 import { debounce, isEmpty, map } from "lodash";
 import React, { ReactElement, useCallback, useState } from "react";
 import { useDispatch, useSelector } from "react-redux";
-import Card from "../Carda";
+import Card from "../shared/Carda";

 import { searchIssue } from "../../actions/fileops.actions";
 import MetadataPanel from "../shared/MetadataPanel";
--- a/src/client/components/Header.tsx
+++ b/src/client/components/Header.tsx
@@ -1,20 +0,0 @@
-import React, { ReactElement } from "react";
-
-type IHeaderProps = {
-  headerContent: string;
-  subHeaderContent: string;
-  iconClassNames: string;
-};
-
-export const Header = (props: IHeaderProps): ReactElement => {
-  return (
-    <>
-      <h4 className="title is-4">
-        <i className={props.iconClassNames}></i> {props.headerContent}
-      </h4>
-      <p className="subtitle is-7">{props.subHeaderContent}</p>
-    </>
-  );
-};
-
-export default Header;
--- a/src/client/components/Import.tsx
+++ b/src/client/components/Import.tsx
@@ -1,237 +0,0 @@
-import React, { ReactElement, useCallback, useEffect } from "react";
-import { useSelector, useDispatch } from "react-redux";
-import {
-  fetchComicBookMetadata,
-  getImportJobResultStatistics,
-  setQueueControl,
-} from "../actions/fileops.actions";
-import "react-loader-spinner/dist/loader/css/react-spinner-loader.css";
-import { format } from "date-fns";
-import Loader from "react-loader-spinner";
-import { isEmpty, isNil, isUndefined } from "lodash";
-
-interface IProps {
-  matches?: unknown;
-  fetchComicMetadata?: any;
-  path: string;
-  covers?: any;
-}
-
-/**
- * Returns the average of two numbers.
- *
- * @remarks
- * This method is part of the {@link core-library#Statistics | Statistics subsystem}.
- *
- * @param x - The first input number
- * @param y - The second input number
- * @returns The arithmetic mean of `x` and `y`
- *
- * @beta
- */
-
-export const Import = (props: IProps): ReactElement => {
-  const dispatch = useDispatch();
-  const successfulImportJobCount = useSelector(
-    (state: RootState) => state.fileOps.successfulJobCount,
-  );
-  const failedImportJobCount = useSelector(
-    (state: RootState) => state.fileOps.failedJobCount,
-  );
-
-  const lastQueueJob = useSelector(
-    (state: RootState) => state.fileOps.lastQueueJob,
-  );
-  const libraryQueueImportStatus = useSelector(
-    (state: RootState) => state.fileOps.LSQueueImportStatus,
-  );
-
-  const allImportJobResults = useSelector(
-    (state: RootState) => state.fileOps.importJobStatistics,
-  );
-
-  const initiateImport = useCallback(() => {
-    if (typeof props.path !== "undefined") {
-      dispatch(fetchComicBookMetadata(props.path));
-    }
-  }, [dispatch]);
-
-  const toggleQueue = useCallback(
-    (queueAction: string, queueStatus: string) => {
-      dispatch(setQueueControl(queueAction, queueStatus));
-    },
-    [],
-  );
-  useEffect(() => {
-    dispatch(getImportJobResultStatistics());
-  }, []);
-
-  const renderQueueControls = (status: string): ReactElement | null => {
-    switch (status) {
-      case "running":
-        return (
-          <div className="control">
-            <button
-              className="button is-warning is-light"
-              onClick={() => toggleQueue("pause", "paused")}
-            >
-              <i className="fa-solid fa-pause mr-2"></i> Pause
-            </button>
-          </div>
-        );
-      case "paused":
-        return (
-          <div className="control">
-            <button
-              className="button is-success is-light"
-              onClick={() => toggleQueue("resume", "running")}
-            >
-              <i className="fa-solid fa-play mr-2"></i> Resume
-            </button>
-          </div>
-        );
-
-      case "drained":
-        return null;
-
-      default:
-        return null;
-    }
-  };
-  return (
-    <div className="container">
-      <section className="section is-small">
-        <h1 className="title">Import Comics</h1>
-        <article className="message is-dark">
-          <div className="message-body">
-            <p className="mb-2">
-              <span className="tag is-medium is-info is-light">
-                Import Comics
-              </span>
-              will add comics identified from the mapped folder into ThreeTwo's
-              database.
-            </p>
-            <p>
-              Metadata from ComicInfo.xml, if present, will also be extracted.
-            </p>
-            <p>
-              This process could take a while, if you have a lot of comics, or
-              are importing over a network connection.
-            </p>
-          </div>
-        </article>
-        <p className="buttons">
-          <button
-            className={
-              libraryQueueImportStatus === "drained" ||
-              libraryQueueImportStatus === undefined
-                ? "button is-medium"
-                : "button is-loading is-medium"
-            }
-            onClick={initiateImport}
-          >
-            <span className="icon">
-              <i className="fas fa-file-import"></i>
-            </span>
-            <span>Start Import</span>
-          </button>
-        </p>
-        {libraryQueueImportStatus !== "drained" &&
-          !isUndefined(libraryQueueImportStatus) && (
-            <>
-              <table className="table">
-                <thead>
-                  <tr>
-                    <th>Completed Jobs</th>
-                    <th>Failed Jobs</th>
-                    <th>Queue Controls</th>
-                    <th>Queue Status</th>
-                  </tr>
-                </thead>
-
-                <tbody>
-                  <tr>
-                    <th>
-                      {successfulImportJobCount > 0 && (
-                        <div className="box has-background-success-light has-text-centered">
-                          <span className="is-size-2 has-text-weight-bold">
-                            {successfulImportJobCount}
-                          </span>
-                        </div>
-                      )}
-                    </th>
-                    <td>
-                      {failedImportJobCount > 0 && (
-                        <div className="box has-background-danger has-text-centered">
-                          <span className="is-size-2 has-text-weight-bold">
-                            {failedImportJobCount}
-                          </span>
-                        </div>
-                      )}
-                    </td>
-
-                    <td>{renderQueueControls(libraryQueueImportStatus)}</td>
-                    <td>
-                      {libraryQueueImportStatus !== undefined ? (
-                        <span className="tag is-warning">
-                          {libraryQueueImportStatus}
-                        </span>
-                      ) : null}
-                    </td>
-                  </tr>
-                </tbody>
-              </table>
-              Imported{" "}
-              <span className="has-text-weight-bold">{lastQueueJob}</span>
-            </>
-          )}
-
-        {/* Past imports */}
-
-        <h3 className="subtitle is-4 mt-5">Past Imports</h3>
-        <table className="table">
-          <thead>
-            <tr>
-              <th>Time Started</th>
-              <th>Session Id</th>
-              <th>Imported</th>
-              <th>Failed</th>
-            </tr>
-          </thead>
-
-          <tbody>
-            {allImportJobResults.map((jobResult, id) => {
-              return (
-                <tr key={id}>
-                  <td>
-                    {format(
-                      new Date(jobResult.earliestTimestamp),
-                      "EEEE, hh:mma, do LLLL Y",
-                    )}
-                  </td>
-                  <td>
-                    <span className="tag is-warning">
-                      {jobResult.sessionId}
-                    </span>
-                  </td>
-                  <td>
-                    <span className="tag is-success">
-                      {jobResult.completedJobs}
-                    </span>
-                  </td>
-                  <td>
-                    <span className="tag is-danger">
-                      {jobResult.failedJobs}
-                    </span>
-                  </td>
-                </tr>
-              );
-            })}
-          </tbody>
-        </table>
-      </section>
-    </div>
-  );
-};
-
-export default Import;
--- a/src/client/components/Import/Import.tsx
+++ b/src/client/components/Import/Import.tsx
@@ -0,0 +1,298 @@
+import React, { ReactElement, useCallback, useEffect } from "react";
+import "react-loader-spinner/dist/loader/css/react-spinner-loader.css";
+import { format } from "date-fns";
+import Loader from "react-loader-spinner";
+import { isEmpty, isNil, isUndefined } from "lodash";
+import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query";
+import { useStore } from "../../store";
+import { useShallow } from "zustand/react/shallow";
+import axios from "axios";
+
+interface IProps {
+  matches?: unknown;
+  fetchComicMetadata?: any;
+  path: string;
+  covers?: any;
+}
+
+/**
+ * Component to facilitate the import of comics to the ThreeTwo library
+ *
+ * @param x - The first input number
+ * @param y - The second input number
+ * @returns The arithmetic mean of `x` and `y`
+ *
+ * @beta
+ */
+
+export const Import = (props: IProps): ReactElement => {
+  const queryClient = useQueryClient();
+  const { importJobQueue, socketIOInstance } = useStore(
+    useShallow((state) => ({
+      importJobQueue: state.importJobQueue,
+      socketIOInstance: state.socketIOInstance,
+    })),
+  );
+
+  const sessionId = localStorage.getItem("sessionId");
+  const { mutate: initiateImport } = useMutation({
+    mutationFn: async () =>
+      await axios.request({
+        url: `http://localhost:3000/api/library/newImport`,
+        method: "POST",
+        data: { sessionId },
+      }),
+  });
+
+  const { data, isError, isLoading } = useQuery({
+    queryKey: ["allImportJobResults"],
+    queryFn: async () =>
+      await axios({
+        method: "GET",
+        url: "http://localhost:3000/api/jobqueue/getJobResultStatistics",
+      }),
+  });
+
+  const toggleQueue = (queueAction: string, queueStatus: string) => {
+    socketIOInstance.emit(
+      "call",
+      "socket.setQueueStatus",
+      {
+        queueAction,
+        queueStatus,
+      },
+      (data) => console.log(data),
+    );
+  };
+  /**
+   * Method to render import job queue pause/resume controls on the UI
+   *
+   * @param status The `string` status (either `"pause"` or `"resume"`)
+   * @returns ReactElement A `<button/>` that toggles queue status
+   * @remarks Sets the global `importJobQueue.status` state upon toggling
+   */
+  const renderQueueControls = (status: string): ReactElement | null => {
+    switch (status) {
+      case "running":
+        return (
+          <div>
+            <button
+              className="flex space-x-1 sm:mt-0 sm:flex-row sm:items-center rounded-lg border border-green-400 dark:border-green-200 bg-green-200 px-3 py-1 text-gray-500 hover:bg-transparent hover:text-green-600 focus:outline-none focus:ring active:text-indigo-500"
+              onClick={() => {
+                toggleQueue("pause", "paused");
+                importJobQueue.setStatus("paused");
+              }}
+            >
+              <span className="text-md">Pause</span>
+              <span className="w-5 h-5">
+                <i className="h-5 w-5 icon-[solar--pause-bold]"></i>
+              </span>
+            </button>
+          </div>
+        );
+      case "paused":
+        return (
+          <div>
+            <button
+              className="flex space-x-1 sm:mt-0 sm:flex-row sm:items-center rounded-lg border border-green-400 dark:border-green-200 bg-green-200 px-3 py-1 text-gray-500 hover:bg-transparent hover:text-green-600 focus:outline-none focus:ring active:text-indigo-500"
+              onClick={() => {
+                toggleQueue("resume", "running");
+                importJobQueue.setStatus("running");
+              }}
+            >
+              <span className="text-md">Resume</span>
+              <span className="w-5 h-5">
+                <i className="h-5 w-5 icon-[solar--play-bold]"></i>
+              </span>
+            </button>
+          </div>
+        );
+
+      case "drained":
+        return null;
+
+      default:
+        return null;
+    }
+  };
+  return (
+    <div>
+      <section>
+        <header className="bg-slate-200 dark:bg-slate-500">
+          <div className="mx-auto max-w-screen-xl px-2 py-2 sm:px-6 sm:py-8 lg:px-8 lg:py-4">
+            <div className="sm:flex sm:items-center sm:justify-between">
+              <div className="text-center sm:text-left">
+                <h1 className="text-2xl font-bold text-gray-900 dark:text-white sm:text-3xl">
+                  Import
+                </h1>
+
+                <p className="mt-1.5 text-sm text-gray-500 dark:text-white">
+                  Import comics into the ThreeTwo library.
+                </p>
+              </div>
+            </div>
+          </div>
+        </header>
+
+        <div className="mx-auto max-w-screen-xl px-4 py-4 sm:px-6 sm:py-8 lg:px-8">
+          <article
+            role="alert"
+            className="rounded-lg max-w-screen-md border-s-4 border-blue-500 bg-blue-50 p-4 dark:border-s-4 dark:border-blue-600 dark:bg-blue-300 dark:text-slate-600"
+          >
+            <div>
+              <p>
+                Importing will add comics identified from the mapped folder into
+                ThreeTwo's database.
+              </p>
+              <p>
+                Metadata from ComicInfo.xml, if present, will also be extracted.
+              </p>
+              <p>
+                This process could take a while, if you have a lot of comics, or
+                are importing over a network connection.
+              </p>
+            </div>
+          </article>
+
+          <div className="my-4">
+            {importJobQueue.status === "drained" ||
+              (importJobQueue.status === undefined && (
+                <button
+                  className="flex space-x-1 sm:mt-0 sm:flex-row sm:items-center rounded-lg border border-green-400 dark:border-green-200 bg-green-200 px-5 py-3 text-gray-500 hover:bg-transparent hover:text-green-600 focus:outline-none focus:ring active:text-indigo-500"
+                  onClick={() => {
+                    initiateImport();
+                    importJobQueue.setStatus("running");
+                  }}
+                >
+                  <span className="text-md">Start Import</span>
+                  <span className="w-6 h-6">
+                    <i className="h-6 w-6 icon-[solar--file-left-bold-duotone]"></i>
+                  </span>
+                </button>
+              ))}
+          </div>
+
+          {/* Activity */}
+          {(importJobQueue.status === "running" ||
+            importJobQueue.status === "paused") && (
+            <>
+              <span className="flex items-center my-5 max-w-screen-lg">
+                <span className="text-xl text-slate-500 dark:text-slate-200 pr-5">
+                  Import Activity
+                </span>
+                <span className="h-px flex-1 bg-slate-200 dark:bg-slate-400"></span>
+              </span>
+              <div className="mt-5 flex flex-col gap-4 sm:mt-0 sm:flex-row sm:items-center">
+                <dl className="grid grid-cols-2 gap-4 sm:grid-cols-2">
+                  {/* Successful import counts */}
+                  <div className="flex flex-col rounded-lg bg-green-100 dark:bg-green-200 px-4 py-6 text-center">
+                    <dd className="text-3xl text-green-600 md:text-5xl">
+                      {importJobQueue.successfulJobCount}
+                    </dd>
+                    <dt className="text-lg font-medium text-gray-500">
+                      imported
+                    </dt>
+                  </div>
+                  {/* Failed job counts */}
+                  <div className="flex flex-col rounded-lg bg-red-100 dark:bg-red-200 px-4 py-6 text-center">
+                    <dd className="text-3xl text-red-600 md:text-5xl">
+                      {importJobQueue.failedJobCount}
+                    </dd>
+                    <dt className="text-lg font-medium text-gray-500">
+                      failed
+                    </dt>
+                  </div>
+
+                  <div className="flex flex-col dark:text-slate-200 text-slate-400">
+                    <dd>{renderQueueControls(importJobQueue.status)}</dd>
+                  </div>
+                </dl>
+              </div>
+              <div className="flex">
+                <span className="mt-2 dark:text-slate-200 text-slate-400">
+                  Imported: <span>{importJobQueue.mostRecentImport}</span>
+                </span>
+              </div>
+            </>
+          )}
+
+          {/* Past imports */}
+          {!isLoading && !isEmpty(data?.data) && (
+            <div className="max-w-screen-lg">
+              <span className="flex items-center mt-6">
+                <span className="text-xl text-slate-500 dark:text-slate-200 pr-5">
+                  Past Imports
+                </span>
+                <span className="h-px flex-1 bg-slate-200 dark:bg-slate-400"></span>
+              </span>
+
+              <div className="overflow-x-auto w-fit mt-4 rounded-lg border border-gray-200">
+                <table className="min-w-full divide-y-2 divide-gray-200 dark:divide-gray-200 text-md">
+                  <thead className="ltr:text-left rtl:text-right">
+                    <tr>
+                      <th className="whitespace-nowrap px-4 py-2 font-medium text-gray-900 dark:text-slate-200">
+                        Time Started
+                      </th>
+                      <th className="whitespace-nowrap px-4 py-2 font-medium text-gray-900 dark:text-slate-200">
+                        Session Id
+                      </th>
+                      <th className="whitespace-nowrap px-4 py-2 font-medium text-gray-900 dark:text-slate-200">
+                        Imported
+                      </th>
+                      <th className="whitespace-nowrap px-4 py-2 font-medium text-gray-900 dark:text-slate-200">
+                        Failed
+                      </th>
+                    </tr>
+                  </thead>
+
+                  <tbody className="divide-y divide-gray-200">
+                    {data?.data.map((jobResult, id) => {
+                      return (
+                        <tr key={id}>
+                          <td className="whitespace-nowrap px-2 py-2 text-gray-700 dark:text-slate-300">
+                            {format(
+                              new Date(jobResult.earliestTimestamp),
+                              "EEEE, hh:mma, do LLLL Y",
+                            )}
+                          </td>
+                          <td className="whitespace-nowrap px-2 py-2 text-gray-700 dark:text-slate-300">
+                            <span className="tag is-warning">
+                              {jobResult.sessionId}
+                            </span>
+                          </td>
+                          <td className="whitespace-nowrap px-4 py-2 text-gray-700 dark:text-slate-300">
+                            <span className="inline-flex items-center justify-center rounded-full bg-emerald-100 px-2 py-0.5 text-emerald-700">
+                              <span className="h-5 w-6">
+                                <i className="icon-[solar--check-circle-line-duotone] h-5 w-5"></i>
+                              </span>
+                              <p className="whitespace-nowrap text-sm">
+                                {jobResult.completedJobs}
+                              </p>
+                            </span>
+                          </td>
+                          <td className="whitespace-nowrap px-4 py-2 text-gray-700 dark:text-slate-300">
+                            <span className="inline-flex items-center justify-center rounded-full bg-red-100 px-2 py-0.5 text-red-700">
+                              <span className="h-5 w-6">
+                                <i className="icon-[solar--close-circle-line-duotone] h-5 w-5"></i>
+                              </span>
+
+                              <p className="whitespace-nowrap text-sm">
+                                {jobResult.failedJobs}
+                              </p>
+                            </span>
+                          </td>
+                        </tr>
+                      );
+                    })}
+                  </tbody>
+                </table>
+              </div>
+            </div>
+          )}
+        </div>
+      </section>
+    </div>
+  );
+};
+
+export default Import;
--- a/src/client/components/Library/Library.tsx
+++ b/src/client/components/Library/Library.tsx
@@ -1,12 +1,18 @@
-import React, { useMemo, ReactElement, useCallback, useEffect } from "react";
+import React, { useMemo, ReactElement, useState, useEffect } from "react";
 import PropTypes from "prop-types";
 import { useNavigate } from "react-router-dom";
 import { isEmpty, isNil, isUndefined } from "lodash";
 import MetadataPanel from "../shared/MetadataPanel";
 import T2Table from "../shared/T2Table";
-import { useDispatch, useSelector } from "react-redux";
-import { searchIssue } from "../../actions/fileops.actions";
+import SearchBar from "../Library/SearchBar";
 import ellipsize from "ellipsize";
+import {
+  useQuery,
+  keepPreviousData,
+  useQueryClient,
+} from "@tanstack/react-query";
+import axios from "axios";
+import { format, fromUnixTime, parseISO } from "date-fns";

 /**
 * Component that tabulates the contents of the user's ThreeTwo Library.
@@ -16,30 +22,60 @@ import ellipsize from "ellipsize";
 * <Library />
 */
 export const Library = (): ReactElement => {
-  const searchResults = useSelector(
-    (state: RootState) => state.fileOps.libraryComics,
-  );
-  const searchError = useSelector((state: RootState) => state.fileOps.librarySearchError);
-  const dispatch = useDispatch();
-  useEffect(() => {
-    dispatch(
-      searchIssue(
-        {
-          query: {},
-        },
-        {
-          pagination: {
-            size: 15,
-            from: 0,
-          },
-          type: "all",
-          trigger: "libraryPage",
-        },
-      ),
-    );
-  }, []);
+  // Default page state
+  // offset: 0
+  const [offset, setOffset] = useState(0);
+  const [searchQuery, setSearchQuery] = useState({
+    query: {},
+    pagination: {
+      size: 25,
+      from: offset,
+    },
+    type: "all",
+    trigger: "libraryPage",
+  });
+  const queryClient = useQueryClient();

-  // programatically navigate to comic detail
+  /**
+   * Method that queries the Elasticsearch index "comics" for issues specified by the query
+   * @param searchQuery - A searchQuery object that contains the search term, type, and pagination params.
+   */
+  const fetchIssues = async (searchQuery) => {
+    const { pagination, query, type } = searchQuery;
+    return await axios({
+      method: "POST",
+      url: "http://localhost:3000/api/search/searchIssue",
+      data: {
+        query,
+        pagination,
+        type,
+      },
+    });
+  };
+
+  const searchIssues = (e) => {
+    queryClient.invalidateQueries({ queryKey: ["comics"] });
+    setSearchQuery({
+      query: {
+        volumeName: e.search,
+      },
+      pagination: {
+        size: 15,
+        from: 0,
+      },
+      type: "volumeName",
+      trigger: "libraryPage",
+    });
+  };
+
+  const { data, isLoading, isError, isPlaceholderData } = useQuery({
+    queryKey: ["comics", offset, searchQuery],
+    queryFn: () => fetchIssues(searchQuery),
+    placeholderData: keepPreviousData,
+  });
+
+  const searchResults = data?.data;
+  // Programmatically navigate to comic detail
  const navigate = useNavigate();
  const navigateToComicDetail = (row) => {
    navigate(`/comic/details/${row.original._id}`);
@@ -47,45 +83,42 @@ export const Library = (): ReactElement => {

  const ComicInfoXML = (value) => {
    return value.data ? (
-      <div className="comicvine-metadata mt-3">
-        <dl>
-          <span className="tags has-addons is-size-7">
-            <span className="tag">Series</span>
-            <span className="tag is-warning is-light">
-              {ellipsize(value.data.series[0], 25)}
+      <dl className="flex flex-col text-md p-3 ml-4 my-3 rounded-lg dark:bg-yellow-500 bg-yellow-300 w-max">
+        {/* Series Name */}
+        <span className="inline-flex items-center w-fit bg-slate-50 text-slate-800 text-xs font-medium px-2 rounded-md dark:text-slate-900 dark:bg-slate-400">
+          <span className="pr-1 pt-1">
+            <i className="icon-[solar--bookmark-square-minimalistic-bold-duotone] w-5 h-5"></i>
+          </span>
+          <span className="text-md text-slate-900 dark:text-slate-900">
+            {ellipsize(value.data.series[0], 45)}
+          </span>
+        </span>
+        <div className="flex flex-row mt-2 gap-2">
+          {/* Pages */}
+          <span className="inline-flex items-center bg-slate-50 text-slate-800 text-xs px-2 rounded-md dark:text-slate-900 dark:bg-slate-400">
+            <span className="pr-1 pt-1">
+              <i className="icon-[solar--notebook-minimalistic-bold-duotone] w-5 h-5"></i>
+            </span>
+            <span className="text-md text-slate-900 dark:text-slate-900">
+              Pages: {value.data.pagecount[0]}
            </span>
          </span>
-        </dl>
-        <dl>
-          <div className="field is-grouped is-grouped-multiline">
-            <div className="control">
-              <span className="tags has-addons is-size-7  mt-2">
-                <span className="tag">Pages</span>
-                <span className="tag is-info is-light has-text-weight-bold">
-                  {value.data.pagecount[0]}
-                </span>
-              </span>
-            </div>
-
-            <div className="control">
-              <span className="tags has-addons is-size-7 mt-2">
-                <span className="tag">Issue</span>
-                {!isNil(value.data.number) && (
-                  <span className="tag has-text-weight-bold is-success is-light">
-                    {parseInt(value.data.number[0], 10)}
-                  </span>
-                )}
-              </span>
-            </div>
-          </div>
-        </dl>
-      </div>
+          {/* Issue number */}
+          <span className="inline-flex items-center bg-slate-50 text-slate-800 text-xs px-2 rounded-md dark:text-slate-900 dark:bg-slate-400">
+            <span className="pr-1 pt-1">
+              <i className="icon-[solar--hashtag-outline] w-3.5 h-3.5"></i>
+            </span>
+            <span className="text-slate-900 dark:text-slate-900">
+              {!isNil(value.data.number) && (
+                <span>{parseInt(value.data.number[0], 10)}</span>
+              )}
+            </span>
+          </span>
+        </div>
+      </dl>
    ) : null;
  };

-  const WantedStatus = ({ value }) => {
-    return !value ? <span className="tag is-info is-light">Wanted</span> : null;
-  };
  const columns = useMemo(
    () => [
      {
@@ -104,14 +137,10 @@ export const Library = (): ReactElement => {
          {
            header: "ComicInfo.xml",
            accessorKey: "_source.sourcedMetadata.comicInfo",
-            align: "center",
-            minWidth: 250,
            cell: (info) =>
              !isEmpty(info.getValue()) ? (
                <ComicInfoXML data={info.getValue()} />
-              ) : (
-                <span className="tag mt-5">No ComicInfo.xml</span>
-              ),
+              ) : null,
          },
        ],
      },
@@ -119,28 +148,41 @@ export const Library = (): ReactElement => {
        header: "Additional Metadata",
        columns: [
          {
-            header: "Publisher",
-            accessorKey: "_source.sourcedMetadata.comicvine.volumeInformation",
+            header: "Date of Import",
+            accessorKey: "_source.createdAt",
            cell: (info) => {
-              return (
-                !isNil(info.getValue()) && (
-                  <h6 className="is-size-7 has-text-weight-bold">
-                    {info.getValue().publisher.name}
-                  </h6>
-                )
-              );
+              return !isNil(info.getValue()) ? (
+                <div className="text-sm w-max ml-3 my-3 text-slate-600 dark:text-slate-900">
+                  <p>{format(parseISO(info.getValue()), "dd MMMM, yyyy")} </p>
+                  {format(parseISO(info.getValue()), "h aaaa")}
+                </div>
+              ) : null;
            },
          },
          {
-            header: "Something",
-            accessorKey: "_source.acquisition.source.wanted",
-            cell: (info) => {
-              !isUndefined(info.getValue()) ? (
-                <WantedStatus value={info.getValue().toString()} />
-              ) : (
-                "Nothing"
-              );
-            },
+            header: "Downloads",
+            accessorKey: "_source.acquisition",
+            cell: (info) => (
+              <div className="flex flex-col gap-2 ml-3 my-3">
+                <span className="inline-flex items-center w-fit bg-slate-50 text-slate-800 text-xs px-2 rounded-md dark:text-slate-900 dark:bg-slate-400">
+                  <span className="pr-1 pt-1">
+                    <i className="icon-[solar--folder-path-connect-bold-duotone] w-5 h-5"></i>
+                  </span>
+                  <span className="text-md text-slate-900 dark:text-slate-900">
+                    DC++: {info.getValue().directconnect.downloads.length}
+                  </span>
+                </span>
+
+                <span className="inline-flex w-fit items-center bg-slate-50 text-slate-800 text-xs px-2 rounded-md dark:text-slate-900 dark:bg-slate-400">
+                  <span className="pr-1 pt-1">
+                    <i className="icon-[solar--magnet-bold-duotone] w-5 h-5"></i>
+                  </span>
+                  <span className="text-md text-slate-900 dark:text-slate-900">
+                    Torrent: {info.getValue().torrent.length}
+                  </span>
+                </span>
+              </div>
+            ),
          },
        ],
      },
@@ -156,23 +198,21 @@ export const Library = (): ReactElement => {
   * @returns void
   *
   **/
-  const nextPage = useCallback((pageIndex: number, pageSize: number) => {
-    dispatch(
-      searchIssue(
-        {
-          query: {},
+  const nextPage = (pageIndex: number, pageSize: number) => {
+    if (!isPlaceholderData) {
+      queryClient.invalidateQueries({ queryKey: ["comics"] });
+      setSearchQuery({
+        query: {},
+        pagination: {
+          size: 15,
+          from: pageSize * pageIndex + 1,
        },
-        {
-          pagination: {
-            size: pageSize,
-            from: pageSize * pageIndex + 1,
-          },
-          type: "all",
-          trigger: "libraryPage",
-        },
-      ),
-    );
-  }, []);
+        type: "all",
+        trigger: "libraryPage",
+      });
+      // setOffset(pageSize * pageIndex + 1);
+    }
+  };

  /**
   * Pagination control that fetches the previous x (pageSize) items
@@ -181,77 +221,95 @@ export const Library = (): ReactElement => {
   * @param {number} pageSize
   * @returns void
   **/
-  const previousPage = useCallback((pageIndex: number, pageSize: number) => {
+  const previousPage = (pageIndex: number, pageSize: number) => {
    let from = 0;
    if (pageIndex === 2) {
-      from = (pageIndex - 1) * pageSize + 2 - 17;
+      from = (pageIndex - 1) * pageSize + 2 - (pageSize + 2);
    } else {
-      from = (pageIndex - 1) * pageSize + 2 - 16;
+      from = (pageIndex - 1) * pageSize + 2 - (pageSize + 1);
    }
-    dispatch(
-      searchIssue(
-        {
-          query: {},
-        },
-        {
-          pagination: {
-            size: pageSize,
-            from,
-          },
-          type: "all",
-          trigger: "libraryPage",
-        },
-      ),
-    );
-  }, []);
+    queryClient.invalidateQueries({ queryKey: ["comics"] });
+    setSearchQuery({
+      query: {},
+      pagination: {
+        size: 15,
+        from,
+      },
+      type: "all",
+      trigger: "libraryPage",
+    });
+    // setOffset(from);
+  };

  // ImportStatus.propTypes = {
  //   value: PropTypes.bool.isRequired,
  // };
  return (
-    <section className="container">
-      <div className="section">
-        <div className="header-area">
-          <h1 className="title">Library</h1>
-        </div>
-        {!isEmpty(searchResults) ? (
+    <div>
+      <section>
+        <header className="bg-slate-200 dark:bg-slate-500">
+          <div className="mx-auto max-w-screen-xl px-2 py-2 sm:px-6 sm:py-8 lg:px-8 lg:py-4">
+            <div className="sm:flex sm:items-center sm:justify-between">
+              <div className="text-center sm:text-left">
+                <h1 className="text-2xl font-bold text-gray-900 dark:text-white sm:text-3xl">
+                  Library
+                </h1>
+
+                <p className="mt-1.5 text-sm text-gray-500 dark:text-white">
+                  Browse your comic book collection.
+                </p>
+              </div>
+            </div>
+          </div>
+        </header>
+        {!isUndefined(searchResults?.hits) ? (
          <div>
-            <div className="library">
+            <div>
              <T2Table
-                totalPages={searchResults.total.value}
+                totalPages={searchResults.hits.total.value}
                columns={columns}
-                sourceData={searchResults?.hits}
+                sourceData={searchResults?.hits.hits}
                rowClickHandler={navigateToComicDetail}
                paginationHandlers={{
                  nextPage,
                  previousPage,
                }}
-              />
+              >
+                <SearchBar searchHandler={(e) => searchIssues(e)} />
+              </T2Table>
            </div>
          </div>
        ) : (
-          <div className="columns">
-            <div className="column is-two-thirds">
-              <article className="message is-link">
-                <div className="message-body">
+          <div className="mx-auto max-w-screen-xl mt-5">
+            <article
+              role="alert"
+              className="rounded-lg max-w-screen-md border-s-4 border-yellow-500 bg-yellow-50 p-4 dark:border-s-4 dark:border-yellow-600 dark:bg-yellow-300 dark:text-slate-600"
+            >
+              <div>
+                <p>
                  No comics were found in the library, Elasticsearch reports no
                  indices. Try importing a few comics into the library and come
                  back.
-                </div>
-              </article>
-              <pre>
-                {!isUndefined(searchError.data) &&
-                  JSON.stringify(
-                    searchError.data.meta.body.error.root_cause,
-                    null,
-                    4,
-                  )}
+                </p>
+              </div>
+            </article>
+            <div className="block max-w-md p-6 bg-white border border-gray-200 my-3 rounded-lg shadow dark:bg-slate-400 dark:border-gray-700">
+              <pre className="text-sm font-hasklig text-slate-700 dark:text-slate-700">
+                {!isUndefined(searchResults?.data?.meta?.body) ? (
+                  <p>
+                    {JSON.stringify(
+                      searchResults?.data.meta.body.error.root_cause,
+                      null,
+                      4,
+                    )}
+                  </p>
+                ) : null}
              </pre>
            </div>
          </div>
        )}
-      </div>
-    </section>
+      </section>
+    </div>
  );
 };

--- a/src/client/components/Library/LibraryGrid.tsx
+++ b/src/client/components/Library/LibraryGrid.tsx
@@ -12,7 +12,7 @@ import { useDispatch, useSelector } from "react-redux";
 import { getComicBooks } from "../../actions/fileops.actions";
 import { isNil, isEmpty, isUndefined } from "lodash";
 import Masonry from "react-masonry-css";
-import Card from "../Carda";
+import Card from "../shared/Carda";
 import { detectIssueTypes } from "../../shared/utils/tradepaperback.utils";
 import { Link } from "react-router-dom";
 import { LIBRARY_SERVICE_HOST } from "../../constants/endpoints";
--- a/src/client/components/Library/SearchBar.tsx
+++ b/src/client/components/Library/SearchBar.tsx
@@ -1,63 +1,47 @@
-import React, { ReactElement, useCallback } from "react";
+import React, { ReactElement } from "react";
 import PropTypes from "prop-types";
 import { Form, Field } from "react-final-form";
 import { Link } from "react-router-dom";
-import { useDispatch } from "react-redux";
-import { searchIssue } from "../../actions/fileops.actions";

-export const SearchBar = (): ReactElement => {
-  const dispatch = useDispatch();
-  const handleSubmit = useCallback((e) => {
-    dispatch(
-      searchIssue(
-        {
-          query: {
-            volumeName: e.search,
-          },
-        },
-        {
-          pagination: {
-            size: 25,
-            from: 0,
-          },
-          type: "volumeName",
-          trigger: "libraryPage",
-        },
-      ),
-    );
-  }, []);
+export const SearchBar = (props): ReactElement => {
+  const { searchHandler } = props;
  return (
-    <div className="box">
-      <Form
-        onSubmit={handleSubmit}
-        initialValues={{}}
-        render={({ handleSubmit, form, submitting, pristine, values }) => (
-          <form onSubmit={handleSubmit}>
-            <div className="field is-grouped">
-              <div className="control search is-expanded">
-                <Field name="search">
-                  {({ input, meta }) => {
-                    return (
-                      <input
-                        {...input}
-                        className="input main-search-bar is-medium"
-                        placeholder="Type an issue/volume name"
-                      />
-                    );
-                  }}
-                </Field>
-              </div>
-              <div className="control">
-                <button className="button is-medium" type="submit">
-                  Search
-                </button>
-              </div>
-            </div>
-          </form>
-        )}
-      />
-      
-    </div>
+    <Form
+      onSubmit={searchHandler}
+      initialValues={{}}
+      render={({ handleSubmit, form, submitting, pristine, values }) => (
+        <form onSubmit={handleSubmit}>
+          <Field name="search">
+            {({ input, meta }) => {
+              return (
+                <div className="flex flex-row w-full">
+                  <div className="flex flex-row bg-slate-300 dark:bg-slate-500 rounded-l-lg p-2 min-w-full">
+                    <div className="w-10 text-gray-400">
+                      <i className="icon-[solar--magnifer-bold-duotone] h-7 w-7" />
+                    </div>
+
+                    <input
+                      {...input}
+                      className="bg-slate-300 dark:bg-slate-500 outline-none text-lg text-gray-700 w-full"
+                      type="text"
+                      id="search"
+                      placeholder="Type an issue/volume name"
+                    />
+                  </div>
+
+                  <button
+                    className="sm:mt-0 rounded-r-lg border border-green-400 dark:border-green-200 bg-green-200 px-3 py-1 text-gray-500 hover:bg-transparent hover:text-green-600 focus:outline-none focus:ring active:text-indigo-500"
+                    type="submit"
+                  >
+                    Search
+                  </button>
+                </div>
+              );
+            }}
+          </Field>
+        </form>
+      )}
+    />
  );
 };

--- a/src/client/components/MatchResult.tsx
+++ b/src/client/components/MatchResult.tsx
@@ -1,126 +0,0 @@
-import React, { useCallback } from "react";
-import { useDispatch, useSelector } from "react-redux";
-import { isNil, map } from "lodash";
-import { applyComicVineMatch } from "../actions/comicinfo.actions";
-import { convert } from "html-to-text";
-import ellipsize from "ellipsize";
-
-interface MatchResultProps {
-  matchData: any;
-  comicObjectId: string;
-}
-
-const handleBrokenImage = (e) => {
-  e.target.src = "http://localhost:3050/dist/img/noimage.svg";
-};
-
-export const MatchResult = (props: MatchResultProps) => {
-  const dispatch = useDispatch();
-  const applyCVMatch = useCallback(
-    (match, comicObjectId) => {
-      dispatch(applyComicVineMatch(match, comicObjectId));
-    },
-    [dispatch],
-  );
-  return (
-    <>
-      {map(props.matchData, (match, idx) => {
-        let issueDescription = "";
-        if (!isNil(match.description)) {
-          issueDescription = convert(match.description, {
-            baseElements: {
-              selectors: ["p"],
-            },
-          });
-        }
-        return (
-          <div className="search-result mb-4" key={idx}>
-            <div className="columns">
-              <div className="column is-one-fifth">
-                <img
-                  className="cover-image"
-                  src={match.image.thumb_url}
-                  onError={handleBrokenImage}
-                />
-              </div>
-
-              <div className="search-result-details column">
-                <div className="is-size-5">{match.name}</div>
-
-                <div className="field is-grouped is-grouped-multiline mt-1">
-                  <div className="control">
-                    <div className="tags has-addons">
-                      <span className="tag">Number</span>
-                      <span className="tag is-primary">
-                        {match.issue_number}
-                      </span>
-                    </div>
-                  </div>
-                  <div className="control">
-                    <div className="tags has-addons">
-                      <span className="tag">Cover Date</span>
-                      <span className="tag is-warning">{match.cover_date}</span>
-                    </div>
-                  </div>
-                </div>
-                <div className="is-size-7">
-                  {ellipsize(issueDescription, 300)}
-                </div>
-              </div>
-            </div>
-
-            <div className="vertical-line"></div>
-
-            <div className="columns ml-6 volume-information">
-              <div className="column is-one-fifth">
-                <img
-                  src={match.volumeInformation.results.image.icon_url}
-                  className="cover-image"
-                  onError={handleBrokenImage}
-                />
-              </div>
-
-              <div className="column">
-                <div className="is-size-6">{match.volume.name}</div>
-                <div className="field is-grouped is-grouped-multiline mt-2">
-                  <div className="control">
-                    <div className="tags has-addons">
-                      <span className="tag">Total Issues</span>
-                      <span className="tag is-warning">
-                        {match.volumeInformation.results.count_of_issues}
-                      </span>
-                    </div>
-                  </div>
-
-                  <div className="control">
-                    <div className="tags has-addons">
-                      <span className="tag">Publisher</span>
-                      <span className="tag is-warning">
-                        {match.volumeInformation.results.publisher.name}
-                      </span>
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-            <div className="columns">
-              <div className="column">
-                <button
-                  className="button is-normal is-outlined is-primary is-light is-pulled-right"
-                  onClick={() => applyCVMatch(match, props.comicObjectId)}
-                >
-                  <span className="icon is-size-5">
-                    <i className="fas fa-clipboard-check"></i>
-                  </span>
-                  <span>Apply Match</span>
-                </button>
-              </div>
-            </div>
-          </div>
-        );
-      })}
-    </>
-  );
-};
-
-export default MatchResult;
--- a/src/client/components/PullList/PullList.tsx
+++ b/src/client/components/PullList/PullList.tsx
@@ -1,25 +1,23 @@
 import React, { ReactElement, useEffect, useMemo } from "react";
 import T2Table from "../shared/T2Table";
 import { getWeeklyPullList } from "../../actions/comicinfo.actions";
-import { useDispatch, useSelector } from "react-redux";
-import Card from "../Carda";
+import Card from "../shared/Carda";
 import ellipsize from "ellipsize";
 import { isNil } from "lodash";

 export const PullList = (): ReactElement => {
-  const pullListComics = useSelector(
-    (state: RootState) => state.comicInfo.pullList,
-  );
+  // const pullListComics = useSelector(
+  //   (state: RootState) => state.comicInfo.pullList,
+  // );

-  const dispatch = useDispatch();
  useEffect(() => {
-    dispatch(
-      getWeeklyPullList({
-        startDate: "2023-7-28",
-        pageSize: "15",
-        currentPage: "1",
-      }),
-    );
+    // dispatch(
+    //   getWeeklyPullList({
+    //     startDate: "2023-7-28",
+    //     pageSize: "15",
+    //     currentPage: "1",
+    //   }),
+    // );
  }, []);
  const nextPageHandler = () => {};
  const previousPageHandler = () => {};
--- a/src/client/components/Search.tsx
+++ b/src/client/components/Search.tsx
@@ -1,181 +0,0 @@
-import React, { useCallback, ReactElement } from "react";
-import { isNil, isEmpty } from "lodash";
-import { IExtractedComicBookCoverFile, RootState } from "threetwo-ui-typings";
-import { importToDB } from "../actions/fileops.actions";
-import { useSelector, useDispatch } from "react-redux";
-import { comicinfoAPICall } from "../actions/comicinfo.actions";
-import { search } from "../services/api/SearchApi";
-import { Form, Field } from "react-final-form";
-import Card from "./Carda";
-import ellipsize from "ellipsize";
-import { convert } from "html-to-text";
-import dayjs from "dayjs";
-
-interface ISearchProps {}
-
-export const Search = ({}: ISearchProps): ReactElement => {
-  const formData = {
-    search: "",
-  };
-  const dispatch = useDispatch();
-  const getCVSearchResults = useCallback(
-    (searchQuery) => {
-      dispatch(
-        comicinfoAPICall({
-          callURIAction: "search",
-          callMethod: "GET",
-          callParams: {
-            api_key: "a5fa0663683df8145a85d694b5da4b87e1c92c69",
-            query: searchQuery.search,
-            format: "json",
-            limit: "10",
-            offset: "0",
-            field_list:
-              "id,name,deck,api_detail_url,image,description,volume,cover_date",
-            resources: "issue",
-          },
-        }),
-      );
-    },
-    [dispatch],
-  );
-
-  const addToLibrary = useCallback(
-    (sourceName: string, comicData) =>
-      dispatch(importToDB(sourceName, { comicvine: comicData })),
-    [],
-  );
-
-  const comicVineSearchResults = useSelector(
-    (state: RootState) => state.comicInfo.searchResults,
-  );
-  const createDescriptionMarkup = (html) => {
-    return { __html: html };
-  };
-
-  return (
-    <>
-      <section className="container">
-        <div className="section search">
-          <h1 className="title">Search</h1>
-
-          <Form
-            onSubmit={getCVSearchResults}
-            initialValues={{
-              ...formData,
-            }}
-            render={({ handleSubmit, form, submitting, pristine, values }) => (
-              <form onSubmit={handleSubmit} className="form columns search">
-                <div className="column is-three-quarters search">
-                  <Field name="search">
-                    {({ input, meta }) => {
-                      return (
-                        <input
-                          {...input}
-                          className="input main-search-bar is-large"
-                          placeholder="Type an issue/volume name"
-                        />
-                      );
-                    }}
-                  </Field>
-                </div>
-                <div className="column">
-                  <button type="submit" className="button is-medium">
-                    Search
-                  </button>
-                </div>
-              </form>
-            )}
-          />
-          {!isNil(comicVineSearchResults.results) &&
-          !isEmpty(comicVineSearchResults.results) ? (
-            <div className="columns is-multiline">
-              {comicVineSearchResults.results.map((result) => {
-                return (
-                  <div
-                    key={result.id}
-                    className="comicvine-metadata column is-10 mb-3"
-                  >
-                    <div className="columns">
-                      <div className="column is-one-quarter">
-                        <Card
-                          key={result.id}
-                          orientation={"vertical"}
-                          imageUrl={result.image.small_url}
-                          title={result.name}
-                          hasDetails={false}
-                        ></Card>
-                      </div>
-                      <div className="column">
-                        <div className="is-size-3">
-                          {!isEmpty(result.name) ? (
-                            result.name
-                          ) : (
-                            <span className="is-size-3">No Name</span>
-                          )}
-                        </div>
-                        <div className="field is-grouped mt-1">
-                          <div className="control">
-                            <div className="tags has-addons">
-                              <span className="tag is-light">Cover date</span>
-                              <span className="tag is-info is-light">
-                                {dayjs(result.cover_date).format("MMM D, YYYY")}
-                              </span>
-                            </div>
-                          </div>
-
-                          <div className="control">
-                            <div className="tags has-addons">
-                              <span className="tag is-warning">
-                                {result.id}
-                              </span>
-                            </div>
-                          </div>
-                        </div>
-
-                        <a href={result.api_detail_url}>
-                          {result.api_detail_url}
-                        </a>
-                        <p>
-                          {ellipsize(
-                            convert(result.description, {
-                              baseElements: {
-                                selectors: ["p"],
-                              },
-                            }),
-                            320,
-                          )}
-                        </p>
-                        <button
-                          className="button is-success is-light is-outlined mt-2"
-                          onClick={() => addToLibrary("comicvine", result)}
-                        >
-                          <i className="fa-solid fa-plus mr-2"></i> Want 
-                        </button>
-                      </div>
-                    </div>
-                  </div>
-                );
-              })}
-            </div>
-          ) : (
-            <article className="message is-dark is-half">
-              <div className="message-body">
-                <p className="mb-2">
-                  <span className="tag is-medium is-info is-light">
-                    Search the ComicVine database
-                  </span>
-                  Search and add issues, series and trade paperbacks to your
-                  library. Then, download them using the configured AirDC++ or
-                  torrent clients.
-                </p>
-              </div>
-            </article>
-          )}
-        </div>
-      </section>
-    </>
-  );
-};
-
-export default Search;
--- a/src/client/components/Search/Search.tsx
+++ b/src/client/components/Search/Search.tsx
@@ -0,0 +1,243 @@
+import React, { useCallback, ReactElement, useState } from "react";
+import { isNil, isEmpty } from "lodash";
+import { IExtractedComicBookCoverFile, RootState } from "threetwo-ui-typings";
+
+import { Form, Field } from "react-final-form";
+import Card from "../shared/Carda";
+import ellipsize from "ellipsize";
+import { convert } from "html-to-text";
+import dayjs from "dayjs";
+import { useQuery, useQueryClient } from "@tanstack/react-query";
+import {
+  COMICVINE_SERVICE_URI,
+  LIBRARY_SERVICE_BASE_URI,
+} from "../../constants/endpoints";
+import axios from "axios";
+
+interface ISearchProps {}
+
+export const Search = ({}: ISearchProps): ReactElement => {
+  const formData = {
+    search: "",
+  };
+  const queryClient = useQueryClient();
+  const [searchQuery, setSearchQuery] = useState("");
+  const [comicVineMetadata, setComicVineMetadata] = useState({});
+  const getCVSearchResults = (searchQuery) => {
+    setSearchQuery(searchQuery.search);
+  };
+
+  const {
+    data: comicVineSearchResults,
+    isLoading,
+    isSuccess,
+  } = useQuery({
+    queryFn: async () =>
+      await axios({
+        url: `${COMICVINE_SERVICE_URI}/search`,
+        method: "GET",
+        params: {
+          api_key: "a5fa0663683df8145a85d694b5da4b87e1c92c69",
+          query: searchQuery,
+          format: "json",
+          limit: "10",
+          offset: "0",
+          field_list:
+            "id,name,deck,api_detail_url,image,description,volume,cover_date",
+          resources: "issue",
+        },
+      }),
+    queryKey: ["comicvineSearchResults", searchQuery],
+    enabled: !isNil(searchQuery),
+  });
+
+  // add to library
+  const { data: additionResult } = useQuery({
+    queryFn: async () =>
+      await axios({
+        url: `${LIBRARY_SERVICE_BASE_URI}/rawImportToDb`,
+        method: "POST",
+        data: {
+          importType: "new",
+          payload: {
+            rawFileDetails: {
+              name: "",
+            },
+            importStatus: {
+              isImported: true,
+              tagged: false,
+              matchedResult: {
+                score: "0",
+              },
+            },
+            sourcedMetadata:
+              { comicvine: comicVineMetadata?.comicData } || null,
+            acquisition: { source: { wanted: true, name: "comicvine" } },
+          },
+        },
+      }),
+    queryKey: ["additionResult"],
+    enabled: !isNil(comicVineMetadata.comicData),
+  });
+
+  const addToLibrary = (sourceName: string, comicData) =>
+    setComicVineMetadata({ sourceName, comicData });
+
+  const createDescriptionMarkup = (html) => {
+    return { __html: html };
+  };
+
+  return (
+    <div>
+      <section>
+        <header className="bg-slate-200 dark:bg-slate-500">
+          <div className="px-2 py-2 sm:px-6 sm:py-8 lg:px-8 lg:py-4">
+            <div className="sm:flex sm:items-center sm:justify-between">
+              <div className="text-center sm:text-left">
+                <h1 className="text-2xl font-bold text-gray-900 dark:text-white sm:text-3xl">
+                  Search
+                </h1>
+
+                <p className="mt-1.5 text-sm text-gray-500 dark:text-white">
+                  Browse your comic book collection.
+                </p>
+              </div>
+            </div>
+          </div>
+        </header>
+        <div className="mx-auto max-w-screen-sm px-4 py-4 sm:px-6 sm:py-8 lg:px-8">
+          <Form
+            onSubmit={getCVSearchResults}
+            initialValues={{
+              ...formData,
+            }}
+            render={({ handleSubmit, form, submitting, pristine, values }) => (
+              <form onSubmit={handleSubmit}>
+                <div className="flex flex-row w-full">
+                  <div className="flex flex-row bg-slate-300 dark:bg-slate-500 rounded-l-lg p-2 min-w-full">
+                    <div className="w-10 text-gray-400">
+                      <i className="icon-[solar--magnifer-bold-duotone] h-7 w-7" />
+                    </div>
+
+                    <Field name="search">
+                      {({ input, meta }) => {
+                        return (
+                          <input
+                            {...input}
+                            className="bg-slate-300 dark:bg-slate-500 outline-none text-lg text-gray-700 w-full"
+                            placeholder="Type an issue/volume name"
+                          />
+                        );
+                      }}
+                    </Field>
+                  </div>
+
+                  <button
+                    className="sm:mt-0 rounded-r-lg border border-green-400 dark:border-green-200 bg-green-200 px-3 py-1 text-gray-500 hover:bg-transparent hover:text-green-600 focus:outline-none focus:ring active:text-indigo-500"
+                    type="submit"
+                  >
+                    Search
+                  </button>
+                </div>
+              </form>
+            )}
+          />
+        </div>
+        {isLoading && <>Loading kaka...</>}
+        {!isNil(comicVineSearchResults?.data.results) &&
+        !isEmpty(comicVineSearchResults?.data.results) ? (
+          <div className="mx-auto max-w-screen-xl px-4 py-4 sm:px-6 sm:py-8 lg:px-8">
+            {comicVineSearchResults.data.results.map((result) => {
+              return isSuccess ? (
+                <div key={result.id} className="mb-5">
+                  <div className="flex flex-row">
+                    <div className="mr-5">
+                      <Card
+                        key={result.id}
+                        orientation={"cover-only"}
+                        imageUrl={result.image.small_url}
+                        hasDetails={false}
+                      />
+                    </div>
+                    <div className="column">
+                      <div className="text-xl">
+                        {!isEmpty(result.volume.name) ? (
+                          result.volume.name
+                        ) : (
+                          <span className="is-size-3">No Name</span>
+                        )}
+                      </div>
+                      <div className="field is-grouped mt-1">
+                        <div className="control">
+                          <div className="tags has-addons">
+                            <span className="tag is-light">Cover date</span>
+                            <span className="tag is-info is-light">
+                              {dayjs(result.cover_date).format("MMM D, YYYY")}
+                            </span>
+                          </div>
+                        </div>
+
+                        <div className="control">
+                          <div className="tags has-addons">
+                            <span className="tag is-warning">{result.id}</span>
+                          </div>
+                        </div>
+                      </div>
+
+                      <a href={result.api_detail_url}>
+                        {result.api_detail_url}
+                      </a>
+                      <p>
+                        {ellipsize(
+                          convert(result.description, {
+                            baseElements: {
+                              selectors: ["p", "div"],
+                            },
+                          }),
+                          320,
+                        )}
+                      </p>
+                      <div className="mt-2">
+                        <button
+                          className="flex space-x-1 sm:mt-0 sm:flex-row sm:items-center rounded-lg border border-green-400 dark:border-green-200 bg-green-200 px-2 py-2 text-gray-500 hover:bg-transparent hover:text-green-600 focus:outline-none focus:ring active:text-indigo-500"
+                          onClick={() => addToLibrary("comicvine", result)}
+                        >
+                          <i className="icon-[solar--add-square-bold-duotone] w-6 h-6 mr-2"></i>{" "}
+                          Mark as Wanted
+                        </button>
+                      </div>
+                    </div>
+                  </div>
+                </div>
+              ) : (
+                <div>Loading</div>
+              );
+            })}
+          </div>
+        ) : (
+          <div className="mx-auto mx-auto max-w-screen-md px-4 py-4 sm:px-6 sm:py-8 lg:px-8">
+            <article
+              role="alert"
+              className="mt-4 rounded-lg max-w-screen-md border-s-4 border-blue-500 bg-blue-50 p-4 dark:border-s-4 dark:border-blue-600 dark:bg-blue-300 dark:text-slate-600"
+            >
+              <div>
+                <p> Search the ComicVine database</p>
+                <p>
+                  Note that you need an instance of AirDC++ already running to
+                  use this form to connect to it.
+                </p>
+                <p>
+                  Search and add issues, series and trade paperbacks to your
+                  library. Then, download them using the configured AirDC++ or
+                  torrent clients.
+                </p>
+              </div>
+            </article>
+          </div>
+        )}
+      </section>
+    </div>
+  );
+};
+
+export default Search;
--- a/src/client/components/Settings.tsx
+++ b/src/client/components/Settings.tsx
@@ -1,108 +0,0 @@
-import React, { useState, ReactElement } from "react";
-import { AirDCPPSettingsForm } from "./AirDCPPSettings/AirDCPPSettingsForm";
-import { AirDCPPHubsForm } from "./AirDCPPSettings/AirDCPPHubsForm";
-import { SystemSettingsForm } from "./SystemSettings/SystemSettingsForm";
-import { ServiceStatuses } from "./ServiceStatuses/ServiceStatuses";
-import settingsObject from "../constants/settings/settingsMenu.json";
-import { isUndefined, map } from "lodash";
-
-interface ISettingsProps {}
-
-export const Settings = (props: ISettingsProps): ReactElement => {
-  const [active, setActive] = useState("gen-db");
-  const settingsContent = [
-    {
-      id: "adc-hubs",
-      content: <div key="adc-hubs">{<AirDCPPHubsForm />}</div>,
-    },
-    {
-      id: "adc-connection",
-      content: (
-        <div key="adc-connection">
-          <AirDCPPSettingsForm />
-        </div>
-      ),
-    },
-    {
-      id: "core-service",
-      content: <ServiceStatuses />,
-    },
-    {
-      id: "flushdb",
-      content: (
-        <div key="flushdb">
-          <SystemSettingsForm />
-        </div>
-      ),
-    },
-  ];
-  return (
-    <section className="container">
-      <div className="columns">
-        <div className="section column is-one-quarter">
-          <h1 className="title">Settings</h1>
-          <aside className="menu">
-            {map(settingsObject, (settingObject, idx) => {
-              return (
-                <div key={idx}>
-                  <p className="menu-label">{settingObject.category}</p>
-                  {/* First level children */}
-                  {!isUndefined(settingObject.children) ? (
-                    <ul className="menu-list" key={settingObject.id}>
-                      {map(settingObject.children, (item, idx) => {
-                        return (
-                          <li key={idx}>
-                            <a
-                              className={
-                                item.id.toString() === active ? "is-active" : ""
-                              }
-                              onClick={() => setActive(item.id.toString())}
-                            >
-                              {item.displayName}
-                            </a>
-                            {/* Second level children */}
-                            {!isUndefined(item.children) ? (
-                              <ul>
-                                {map(item.children, (item, idx) => (
-                                  <li key={item.id}>
-                                    <a
-                                      className={
-                                        item.id.toString() === active
-                                          ? "is-active"
-                                          : ""
-                                      }
-                                      onClick={() =>
-                                        setActive(item.id.toString())
-                                      }
-                                    >
-                                      {item.displayName}
-                                    </a>
-                                  </li>
-                                ))}
-                              </ul>
-                            ) : null}
-                          </li>
-                        );
-                      })}
-                    </ul>
-                  ) : null}
-                </div>
-              );
-            })}
-          </aside>
-        </div>
-
-        {/* content for settings */}
-        <div className="section column is-half mt-6">
-          <div className="content">
-            {map(settingsContent, ({ id, content }) =>
-              active === id ? content : null,
-            )}
-          </div>
-        </div>
-      </div>
-    </section>
-  );
-};
-
-export default Settings;
--- a/src/client/components/Settings/AirDCPPSettings/AirDCPPHubsForm.tsx
+++ b/src/client/components/Settings/AirDCPPSettings/AirDCPPHubsForm.tsx
@@ -0,0 +1,139 @@
+import React, { ReactElement, useEffect, useState, useContext } from "react";
+import { Form, Field } from "react-final-form";
+import { isEmpty, isNil, isUndefined } from "lodash";
+import Select from "react-select";
+import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query";
+import { useStore } from "../../../store";
+import axios from "axios";
+
+export const AirDCPPHubsForm = (): ReactElement => {
+  const queryClient = useQueryClient();
+  const {
+    airDCPPSocketInstance,
+    airDCPPClientConfiguration,
+    airDCPPSessionInformation,
+  } = useStore((state) => ({
+    airDCPPSocketInstance: state.airDCPPSocketInstance,
+    airDCPPClientConfiguration: state.airDCPPClientConfiguration,
+    airDCPPSessionInformation: state.airDCPPSessionInformation,
+  }));
+
+  const {
+    data: settings,
+    isLoading,
+    isError,
+  } = useQuery({
+    queryKey: ["settings"],
+    queryFn: async () =>
+      await axios({
+        url: "http://localhost:3000/api/settings/getAllSettings",
+        method: "GET",
+      }),
+  });
+
+  /**
+   * Get the hubs list from an AirDCPP Socket
+   */
+  const { data: hubs } = useQuery({
+    queryKey: ["hubs"],
+    queryFn: async () => await airDCPPSocketInstance.get(`hubs`),
+  });
+  let hubList = {};
+  if (!isNil(hubs)) {
+    hubList = hubs.map(({ hub_url, identity }) => ({
+      value: hub_url,
+      label: identity.name,
+    }));
+  }
+  const { mutate } = useMutation({
+    mutationFn: async (values) =>
+      await axios({
+        url: `http://localhost:3000/api/settings/saveSettings`,
+        method: "POST",
+        data: {
+          settingsPayload: values,
+          settingsObjectId: settings?.data._id,
+          settingsKey: "directConnect",
+        },
+      }),
+    onSuccess: () => {
+      queryClient.invalidateQueries({ queryKey: ["settings"] });
+    },
+  });
+  const validate = async () => {};
+
+  const SelectAdapter = ({ input, ...rest }) => {
+    return <Select {...input} {...rest} isClearable isMulti />;
+  };
+
+  return (
+    <>
+      {!isEmpty(hubList) && !isUndefined(hubs) ? (
+        <Form
+          onSubmit={mutate}
+          validate={validate}
+          render={({ handleSubmit }) => (
+            <form onSubmit={handleSubmit}>
+              <div>
+                <h3 className="title">Hubs</h3>
+                <h6 className="subtitle has-text-grey-light">
+                  Select the hubs you want to perform searches against.
+                </h6>
+              </div>
+              <div className="field">
+                <label className="label">AirDC++ Host</label>
+                <div className="control">
+                  <Field
+                    name="hubs"
+                    component={SelectAdapter}
+                    className="basic-multi-select"
+                    placeholder="Select Hubs to Search Against"
+                    options={hubList}
+                  />
+                </div>
+              </div>
+
+              <button type="submit" className="button is-primary">
+                Submit
+              </button>
+            </form>
+          )}
+        />
+      ) : (
+        <>
+          <article className="message">
+            <div className="message-body">
+              No configured hubs detected in AirDC++. <br />
+              Configure to a hub in AirDC++ and then select a default hub here.
+            </div>
+          </article>
+        </>
+      )}
+      {!isEmpty(settings?.data.directConnect?.client.hubs) ? (
+        <>
+          <div className="mt-4">
+            <article className="message is-warning">
+              <div className="message-body is-size-6 is-family-secondary">
+                Your selection in the dropdown <strong>will replace</strong> the
+                existing selection.
+              </div>
+            </article>
+          </div>
+          <div className="box mt-3">
+            <h6>Default Hub For Searches:</h6>
+            {settings?.data.directConnect?.client.hubs.map(
+              ({ value, label }) => (
+                <div key={value}>
+                  <div>{label}</div>
+                  <span className="is-size-7">{value}</span>
+                </div>
+              ),
+            )}
+          </div>
+        </>
+      ) : null}
+    </>
+  );
+};
+
+export default AirDCPPHubsForm;
--- a/src/client/components/Settings/AirDCPPSettings/AirDCPPSettingsConfirmation.tsx
+++ b/src/client/components/Settings/AirDCPPSettings/AirDCPPSettingsConfirmation.tsx
@@ -0,0 +1,41 @@
+import React, { ReactElement } from "react";
+
+export const AirDCPPSettingsConfirmation = (settingsObject): ReactElement => {
+  const { settings } = settingsObject;
+  return (
+    <div>
+      <span className="flex items-center mt-10 mb-4">
+        <span className="text-xl text-slate-500 dark:text-slate-200 pr-5">
+          AirDC++ Client Information
+        </span>
+        <span className="h-px flex-1 bg-slate-200 dark:bg-slate-400"></span>
+      </span>
+      <div className="block max-w-sm p-6 bg-white border border-gray-200 rounded-lg shadow dark:bg-slate-400 dark:border-gray-700">
+        <span className="inline-flex justify-center rounded-full bg-emerald-100 mb-4 px-2 py-0.5 text-emerald-700">
+          <span className="h-5 w-6">
+            <i className="icon-[solar--plug-circle-bold] h-5 w-5"></i>
+          </span>
+          <p className="whitespace-nowrap text-sm">Connected</p>
+        </span>
+        <p className="font-hasklig text-sm text-slate-700 dark:text-slate-700">
+          <dl>
+            <dt>{settings._id}</dt>
+            <dt>Client version: {settings.system_info.client_version}</dt>
+            <dt>Hostname: {settings.system_info.hostname}</dt>
+            <dt>Platform: {settings.system_info.platform}</dt>
+
+            <dt>Username: {settings.user.username}</dt>
+
+            <dt>Active Sessions: {settings.user.active_sessions}</dt>
+            <dt>
+              Permissions:{" "}
+              {JSON.stringify(settings.user.permissions, undefined, 2)}
+            </dt>
+          </dl>
+        </p>
+      </div>
+    </div>
+  );
+};
+
+export default AirDCPPSettingsConfirmation;
--- a/src/client/components/Settings/AirDCPPSettings/AirDCPPSettingsForm.tsx
+++ b/src/client/components/Settings/AirDCPPSettings/AirDCPPSettingsForm.tsx
@@ -0,0 +1,101 @@
+import React, { ReactElement, useCallback } from "react";
+import { AirDCPPSettingsConfirmation } from "./AirDCPPSettingsConfirmation";
+import { isUndefined, isEmpty } from "lodash";
+import { ConnectionForm } from "../../shared/ConnectionForm/ConnectionForm";
+import { initializeAirDCPPSocket, useStore } from "../../../store/index";
+import { useShallow } from "zustand/react/shallow";
+import { useMutation } from "@tanstack/react-query";
+import axios from "axios";
+
+export const AirDCPPSettingsForm = (): ReactElement => {
+  // cherry-picking selectors for:
+  // 1. initial values for the form
+  // 2. If initial values are present, get the socket information to display
+  const { setState } = useStore;
+  const {
+    airDCPPSocketConnected,
+    airDCPPDisconnectionInfo,
+    airDCPPSessionInformation,
+    airDCPPClientConfiguration,
+    airDCPPSocketInstance,
+    setAirDCPPSocketInstance,
+  } = useStore(
+    useShallow((state) => ({
+      airDCPPSocketConnected: state.airDCPPSocketConnected,
+      airDCPPDisconnectionInfo: state.airDCPPDisconnectionInfo,
+      airDCPPClientConfiguration: state.airDCPPClientConfiguration,
+      airDCPPSessionInformation: state.airDCPPSessionInformation,
+      airDCPPSocketInstance: state.airDCPPSocketInstance,
+      setAirDCPPSocketInstance: state.setAirDCPPSocketInstance,
+    })),
+  );
+
+  /**
+   * Mutation to update settings and subsequently initialize
+   * AirDC++ socket with those settings
+   */
+  const { mutate } = useMutation({
+    mutationFn: async (values) =>
+      await axios({
+        url: `http://localhost:3000/api/settings/saveSettings`,
+        method: "POST",
+        data: { settingsPayload: values, settingsKey: "directConnect" },
+      }),
+    onSuccess: async (values) => {
+      const {
+        data: {
+          directConnect: {
+            client: { host },
+          },
+        },
+      } = values;
+      const dcppSocketInstance = await initializeAirDCPPSocket(host);
+      setState({
+        airDCPPClientConfiguration: host,
+        airDCPPSocketInstance: dcppSocketInstance,
+      });
+    },
+  });
+  const deleteSettingsMutation = useMutation(
+    async () =>
+      await axios.post("http://localhost:3000/api/settings/saveSettings", {
+        settingsPayload: {},
+        settingsKey: "directConnect",
+      }),
+  );
+
+  // const removeSettings = useCallback(async () => {
+  //   // airDCPPSettings.setSettings({});
+  // }, []);
+  //
+  const initFormData = !isUndefined(airDCPPClientConfiguration)
+    ? airDCPPClientConfiguration
+    : {};
+  return (
+    <>
+      <ConnectionForm
+        initialData={initFormData}
+        submitHandler={mutate}
+        formHeading={"Configure AirDC++"}
+      />
+
+      {!isEmpty(airDCPPSessionInformation) ? (
+        <AirDCPPSettingsConfirmation settings={airDCPPSessionInformation} />
+      ) : null}
+
+      {!isEmpty(airDCPPClientConfiguration) ? (
+        <p className="control mt-4">
+          as
+          <button
+            className="button is-danger"
+            onClick={() => deleteSettingsMutation.mutate()}
+          >
+            Delete
+          </button>
+        </p>
+      ) : null}
+    </>
+  );
+};
+
+export default AirDCPPSettingsForm;
--- a/src/client/components/Settings/ProwlarrSettings/ProwlarrSettingsForm.tsx
+++ b/src/client/components/Settings/ProwlarrSettings/ProwlarrSettingsForm.tsx
@@ -0,0 +1,62 @@
+import React from "react";
+import { useQuery } from "@tanstack/react-query";
+import { Form, Field } from "react-final-form";
+import { PROWLARR_SERVICE_BASE_URI } from "../../../constants/endpoints";
+import axios from "axios";
+
+export const ProwlarrSettingsForm = (props) => {
+  const { data } = useQuery({
+    queryFn: async (): any => {
+      return await axios({
+        url: `${PROWLARR_SERVICE_BASE_URI}/getIndexers`,
+        method: "POST",
+        data: {
+          host: "localhost",
+          port: "9696",
+          apiKey: "c4f42e265fb044dc81f7e88bd41c3367",
+        },
+      });
+    },
+    queryKey: ["prowlarrConnectionResult"],
+  });
+  console.log(data);
+  const submitHandler = () => {};
+  const initialData = {};
+  return (
+    <>
+      Prowlarr Settings.
+      <Form
+        onSubmit={submitHandler}
+        initialValues={initialData}
+        render={({ handleSubmit }) => (
+          <form>
+            <article
+              role="alert"
+              className="mt-4 rounded-lg max-w-screen-md border-s-4 border-blue-500 bg-blue-50 p-4 dark:border-s-4 dark:border-blue-600 dark:bg-blue-300 dark:text-slate-600"
+            >
+              <div>
+                <p>Configure Prowlarr integration here.</p>
+                <p>
+                  Note that you need a Prowlarr instance hosted and running to
+                  configure the integration.
+                </p>
+                <p>
+                  See{" "}
+                  <a
+                    className="underline"
+                    href="http://airdcpp.net/docs/installation/installation.html"
+                  >
+                    here
+                  </a>{" "}
+                  for Prowlarr installation instructions for various platforms.
+                </p>
+              </div>
+            </article>
+          </form>
+        )}
+      />
+    </>
+  );
+};
+
+export default ProwlarrSettingsForm;
--- a/src/client/components/Settings/QbittorrentSettings/QbittorrentConnectionForm.tsx
+++ b/src/client/components/Settings/QbittorrentSettings/QbittorrentConnectionForm.tsx
@@ -0,0 +1,82 @@
+import React, { ReactElement } from "react";
+import { ConnectionForm } from "../../shared/ConnectionForm/ConnectionForm";
+import { useQuery, useMutation, QueryClient } from "@tanstack/react-query";
+import axios from "axios";
+
+export const QbittorrentConnectionForm = (): ReactElement => {
+  const queryClient = new QueryClient();
+  // fetch settings
+  const { data, isLoading, isError } = useQuery({
+    queryKey: ["settings"],
+    queryFn: async () =>
+      await axios({
+        url: "http://localhost:3000/api/settings/getAllSettings",
+        method: "GET",
+      }),
+  });
+  const hostDetails = data?.data?.bittorrent?.client?.host;
+  // connect to qbittorrent client
+
+  // get qbittorrent client info
+  const { data: qbittorrentClientInfo } = useQuery({
+    queryKey: ["qbittorrentClientInfo"],
+    queryFn: async () =>
+      await axios({
+        url: "http://localhost:3060/api/qbittorrent/getClientInfo",
+        method: "GET",
+      }),
+  });
+  // Update action using a mutation
+  const { mutate } = useMutation({
+    mutationFn: async (values) =>
+      await axios({
+        url: `http://localhost:3000/api/settings/saveSettings`,
+        method: "POST",
+        data: { settingsPayload: values, settingsKey: "bittorrent" },
+      }),
+    onSuccess: () => {
+      queryClient.invalidateQueries({
+        queryKey: ["settings", "qbittorrentClientInfo"],
+      });
+    },
+  });
+
+  if (isError)
+    return (
+      <>
+        <pre>Something went wrong connecting to qBittorrent.</pre>
+      </>
+    );
+  if (!isLoading) {
+    return (
+      <>
+        <ConnectionForm
+          initialData={hostDetails}
+          formHeading={"qBittorrent Configuration"}
+          submitHandler={mutate}
+        />
+
+        <span className="flex items-center mt-10 mb-4">
+          <span className="text-xl text-slate-500 dark:text-slate-200 pr-5">
+            qBittorrent Client Information
+          </span>
+          <span className="h-px flex-1 bg-slate-200 dark:bg-slate-400"></span>
+        </span>
+
+        <div className="block max-w-sm p-6 bg-white border border-gray-200 rounded-lg shadow dark:bg-slate-400 dark:border-gray-700">
+          <span className="inline-flex justify-center rounded-full bg-emerald-100 mb-4 px-2 py-0.5 text-emerald-700">
+            <span className="h-5 w-6">
+              <i className="icon-[solar--plug-circle-bold] h-5 w-5"></i>
+            </span>
+            <p className="whitespace-nowrap text-sm">Connected</p>
+          </span>
+          <pre className="font-hasklig text-sm text-slate-700 dark:text-slate-700">
+            {JSON.stringify(qbittorrentClientInfo?.data, null, 4)}
+          </pre>
+        </div>
+      </>
+    );
+  }
+};
+
+export default QbittorrentConnectionForm;
--- a/src/client/components/Settings/Settings.tsx
+++ b/src/client/components/Settings/Settings.tsx
@@ -0,0 +1,154 @@
+import React, { useState, ReactElement } from "react";
+import { AirDCPPSettingsForm } from "./AirDCPPSettings/AirDCPPSettingsForm";
+import { AirDCPPHubsForm } from "./AirDCPPSettings/AirDCPPHubsForm";
+import { QbittorrentConnectionForm } from "./QbittorrentSettings/QbittorrentConnectionForm";
+import { SystemSettingsForm } from "./SystemSettings/SystemSettingsForm";
+import ProwlarrSettingsForm from "./ProwlarrSettings/ProwlarrSettingsForm";
+import { ServiceStatuses } from "../ServiceStatuses/ServiceStatuses";
+import settingsObject from "../../constants/settings/settingsMenu.json";
+import { isUndefined, map } from "lodash";
+
+interface ISettingsProps {}
+
+export const Settings = (props: ISettingsProps): ReactElement => {
+  const [active, setActive] = useState("gen-db");
+  console.log(active);
+  const settingsContent = [
+    {
+      id: "adc-hubs",
+      content: (
+        <div key="adc-hubs">
+          <AirDCPPHubsForm />
+        </div>
+      ),
+    },
+    {
+      id: "adc-connection",
+      content: (
+        <div key="adc-connection">
+          <AirDCPPSettingsForm />
+        </div>
+      ),
+    },
+    {
+      id: "qbt-connection",
+      content: (
+        <div key="qbt-connection">
+          <QbittorrentConnectionForm />
+        </div>
+      ),
+    },
+    {
+      id: "prwlr-connection",
+      content: (
+        <>
+          <ProwlarrSettingsForm />
+        </>
+      ),
+    },
+    {
+      id: "core-service",
+      content: <>a</>,
+    },
+    {
+      id: "flushdb",
+      content: (
+        <div key="flushdb">
+          <SystemSettingsForm />
+        </div>
+      ),
+    },
+  ];
+  return (
+    <div>
+      <section>
+        <header className="bg-slate-200 dark:bg-slate-500">
+          <div className="mx-auto max-w-screen-xl px-2 py-2 sm:px-6 sm:py-8 lg:px-8 lg:py-4">
+            <div className="sm:flex sm:items-center sm:justify-between">
+              <div className="text-center sm:text-left">
+                <h1 className="text-2xl font-bold text-gray-900 dark:text-white sm:text-3xl">
+                  Settings
+                </h1>
+
+                <p className="mt-1.5 text-sm text-gray-500 dark:text-white">
+                  Import comics into the ThreeTwo library.
+                </p>
+              </div>
+            </div>
+          </div>
+        </header>
+        <div className="flex flex-row">
+          <div className="inset-y-0 w-80 dark:bg-gray-800 bg-slate-300 text-white overflow-y-auto">
+            <aside className="px-4 py-4 sm:px-6 sm:py-8 lg:px-8">
+              {map(settingsObject, (settingObject, idx) => {
+                return (
+                  <div
+                    className="w-64 py-2 text-slate-700 dark:text-slate-400"
+                    key={idx}
+                  >
+                    <h3 className="text-l pb-2">
+                      {settingObject.category.toUpperCase()}
+                    </h3>
+                    {/* First level children */}
+                    {!isUndefined(settingObject.children) ? (
+                      <ul key={settingObject.id}>
+                        {map(settingObject.children, (item, idx) => {
+                          return (
+                            <li key={idx} className="mb-2">
+                              <a
+                                className={
+                                  item.id.toString() === active
+                                    ? "is-active flex items-center"
+                                    : "flex items-center"
+                                }
+                                onClick={() => setActive(item.id.toString())}
+                              >
+                                {item.displayName}
+                              </a>
+                              {/* Second level children */}
+                              {!isUndefined(item.children) ? (
+                                <ul className="pl-4 mt-2">
+                                  {map(item.children, (item, idx) => (
+                                    <li key={item.id} className="mb-2">
+                                      <a
+                                        className={
+                                          item.id.toString() === active
+                                            ? "is-active flex items-center"
+                                            : "flex items-center"
+                                        }
+                                        onClick={() =>
+                                          setActive(item.id.toString())
+                                        }
+                                      >
+                                        {item.displayName}
+                                      </a>
+                                    </li>
+                                  ))}
+                                </ul>
+                              ) : null}
+                            </li>
+                          );
+                        })}
+                      </ul>
+                    ) : null}
+                  </div>
+                );
+              })}
+            </aside>
+          </div>
+
+          {/* content for settings */}
+          <div className="flex mx-12">
+            <div className="">
+              {map(settingsContent, ({ id, content }) =>
+                active === id ? content : null,
+              )}
+            </div>
+          </div>
+        </div>
+      </section>
+    </div>
+  );
+};
+
+export default Settings;
--- a/src/client/components/Settings/SystemSettings/SystemSettingsForm.tsx
+++ b/src/client/components/Settings/SystemSettings/SystemSettingsForm.tsx
@@ -1,15 +1,16 @@
-import React, { ReactElement, useCallback } from "react";
-import { flushDb } from "../../actions/settings.actions";
-import { useDispatch, useSelector } from "react-redux";
+import React, { ReactElement } from "react";
+import { useMutation } from "@tanstack/react-query";
+import axios from "axios";

 export const SystemSettingsForm = (): ReactElement => {
-  const dispatch = useDispatch();
-  const isSettingsCallInProgress = useSelector(
-    (state: RootState) => state.settings.inProgress,
-  );
-  const flushDatabase = useCallback(() => {
-    dispatch(flushDb());
-  }, []);
+  const { mutate: flushDb, isLoading } = useMutation({
+    mutationFn: async () => {
+      await axios({
+        url: `http://localhost:3000/api/library/flushDb`,
+        method: "POST",
+      });
+    },
+  });

  return (
    <div className="is-clearfix">
@@ -48,11 +49,9 @@ export const SystemSettingsForm = (): ReactElement => {

        <button
          className={
-            isSettingsCallInProgress
-              ? "button is-danger is-loading"
-              : "button is-danger"
+            isLoading ? "button is-danger is-loading" : "button is-danger"
          }
-          onClick={flushDatabase}
+          onClick={() => flushDb()}
        >
          <span className="icon">
            <i className="fas fa-eraser"></i>
--- a/src/client/components/VolumeDetail/PotentialLibraryMatches.tsx
+++ b/src/client/components/VolumeDetail/PotentialLibraryMatches.tsx
@@ -2,7 +2,7 @@ import { isArray, map } from "lodash";
 import React, { useEffect, ReactElement } from "react";
 import { useDispatch, useSelector } from "react-redux";
 import { getComicBooksDetailsByIds } from "../../actions/comicinfo.actions";
-import { Card } from "../Carda";
+import { Card } from "../shared/Carda";
 import ellipsize from "ellipsize";
 import { LIBRARY_SERVICE_HOST } from "../../constants/endpoints";
 import { escapePoundSymbol } from "../../shared/utils/formatting.utils";
--- a/src/client/components/VolumeDetail/VolumeDetail.tsx
+++ b/src/client/components/VolumeDetail/VolumeDetail.tsx
@@ -9,7 +9,7 @@ import {
 } from "../../actions/comicinfo.actions";
 import PotentialLibraryMatches from "./PotentialLibraryMatches";
 import Masonry from "react-masonry-css";
-import { Card } from "../Carda";
+import { Card } from "../shared/Carda";
 import SlidingPane from "react-sliding-pane";
 import { convert } from "html-to-text";
 import ellipsize from "ellipsize";
--- a/src/client/components/Volumes/Volumes.tsx
+++ b/src/client/components/Volumes/Volumes.tsx
@@ -1,22 +1,27 @@
 import React, { ReactElement, useEffect, useMemo } from "react";
-import { useDispatch, useSelector } from "react-redux";
 import { searchIssue } from "../../actions/fileops.actions";
-import Card from "../Carda";
+import Card from "../shared/Carda";
 import T2Table from "../shared/T2Table";
 import ellipsize from "ellipsize";
 import { convert } from "html-to-text";
-import { isUndefined } from "lodash";
+import { useQuery } from "@tanstack/react-query";
+import axios from "axios";
+import { SEARCH_SERVICE_BASE_URI } from "../../constants/endpoints";

 export const Volumes = (props): ReactElement => {
-  const volumes = useSelector((state: RootState) => state.fileOps.volumes);
-  const dispatch = useDispatch();
-  useEffect(() => {
-    dispatch(
-      searchIssue(
-        {
+  // const volumes = useSelector((state: RootState) => state.fileOps.volumes);
+  const {
+    data: volumes,
+    isSuccess,
+    isError,
+    isLoading,
+  } = useQuery({
+    queryFn: async () =>
+      await axios({
+        url: `${SEARCH_SERVICE_BASE_URI}/searchIssue`,
+        method: "POST",
+        data: {
          query: {},
-        },
-        {
          pagination: {
            size: 25,
            from: 0,
@@ -24,106 +29,57 @@ export const Volumes = (props): ReactElement => {
          type: "volumes",
          trigger: "volumesPage",
        },
-      ),
-    );
-  }, []);
+      }),
+    queryKey: ["volumes"],
+  });
+  console.log(volumes);
  const columnData = useMemo(
-    () => [
+    (): any => [
      {
        header: "Volume Details",
        id: "volumeDetails",
        minWidth: 450,
        accessorKey: "_source",
-        cell: (row) => {
+        cell: (row): any => {
          const foo = row.getValue();
          return (
-            <div className="columns">
-              <div className="column">
-                <div className="comic-detail issue-metadata">
-                  <dl>
-                    <dd>
-                      <div className="columns mt-2">
-                        <div className="">
-                          <Card
-                            imageUrl={
-                              foo.sourcedMetadata.comicvine.volumeInformation
-                                .image.thumb_url
-                            }
-                            orientation={"vertical"}
-                            hasDetails={false}
-                            // cardContainerStyle={{ maxWidth: 200 }}
-                          />
-                        </div>
-                        <div className="column">
-                          <dl>
-                            <dt>
-                              <h6 className="name has-text-weight-medium mb-1">
-                                {
-                                  foo.sourcedMetadata.comicvine
-                                    .volumeInformation.name
-                                }
-                              </h6>
-                            </dt>
-                            <dd className="is-size-7">
-                              published by{" "}
-                              <span className="has-text-weight-semibold">
-                                {
-                                  foo.sourcedMetadata.comicvine
-                                    .volumeInformation.publisher.name
-                                }
-                              </span>
-                            </dd>
-
-                            <dd className="is-size-7">
-                              <span>
-                                {ellipsize(
-                                  convert(
-                                    foo.sourcedMetadata.comicvine
-                                      .volumeInformation.description,
-                                    {
-                                      baseElements: {
-                                        selectors: ["p"],
-                                      },
-                                    },
-                                  ),
-                                  120,
-                                )}
-                              </span>
-                            </dd>
-
-                            <dd className="is-size-7 mt-2">
-                              <div className="field is-grouped is-grouped-multiline">
-                                <div className="control">
-                                  <span className="tags">
-                                    <span className="tag is-success is-light has-text-weight-semibold">
-                                      Total Issues
-                                    </span>
-                                    <span className="tag is-success is-light">
-                                      {
-                                        foo.sourcedMetadata.comicvine
-                                          .volumeInformation.count_of_issues
-                                      }
-                                    </span>
-                                  </span>
-                                </div>
-                              </div>
-                            </dd>
-                          </dl>
-                        </div>
-                      </div>
-                    </dd>
-                  </dl>
-                </div>
+            <div className="flex flex-row gap-3 mt-5">
+              <Card
+                imageUrl={
+                  foo.sourcedMetadata.comicvine.volumeInformation.image
+                    .small_url
+                }
+                orientation={"cover-only"}
+                hasDetails={false}
+              />
+              <div className="dark:bg-[#647587] bg-slate-200 p-3 rounded-lg h-fit">
+                <span className="text-xl mb-1">
+                  {foo.sourcedMetadata.comicvine.volumeInformation.name}
+                </span>
+                <p>
+                  {ellipsize(
+                    convert(
+                      foo.sourcedMetadata.comicvine.volumeInformation
+                        .description,
+                      {
+                        baseElements: {
+                          selectors: ["p"],
+                        },
+                      },
+                    ),
+                    120,
+                  )}
+                </p>
              </div>
            </div>
          );
        },
      },
      {
-        header: "Download Status",
+        header: "Other Details",
        columns: [
          {
-            header: "Files",
+            header: "Downloads",
            accessorKey: "_source.acquisition.directconnect",
            align: "right",
            cell: (props) => {
@@ -144,12 +100,34 @@ export const Volumes = (props): ReactElement => {
            },
          },
          {
-            header: "Type",
-            id: "Air",
+            header: "Publisher",
+            accessorKey: "_source.sourcedMetadata.comicvine.volumeInformation",
+            cell: (props): any => {
+              const row = props.getValue();
+              return <div className="mt-5 text-md">{row.publisher.name}</div>;
+            },
          },
          {
-            header: "Type",
-            id: "dcc",
+            header: "Issue Count",
+            accessorKey:
+              "_source.sourcedMetadata.comicvine.volumeInformation.count_of_issues",
+            cell: (props): any => {
+              const row = props.getValue();
+              return (
+                <div className="mt-5">
+                  {/* issue count */}
+                  <span className="inline-flex items-center bg-slate-50 text-slate-800 font-medium px-2.5 py-0.5 rounded-md dark:text-slate-600 dark:bg-slate-400">
+                    <span className="pr-1 pt-1">
+                      <i className="icon-[solar--documents-minimalistic-bold-duotone] w-6 h-6"></i>
+                    </span>
+
+                    <span className="text-lg text-slate-500 dark:text-slate-900">
+                      {row}
+                    </span>
+                  </span>
+                </div>
+              );
+            },
          },
        ],
      },
@@ -157,17 +135,29 @@ export const Volumes = (props): ReactElement => {
    [],
  );
  return (
-    <section className="container">
-      <div className="section">
-        <div className="header-area">
-          <h1 className="title">Volumes</h1>
-        </div>
-        {!isUndefined(volumes.hits) && (
+    <div>
+      <section className="">
+        <header className="bg-slate-200 dark:bg-slate-500">
+          <div className="mx-auto max-w-screen-xl px-2 py-2 sm:px-6 sm:py-8 lg:px-8 lg:py-4">
+            <div className="sm:flex sm:items-center sm:justify-between">
+              <div className="text-center sm:text-left">
+                <h1 className="text-2xl font-bold text-gray-900 dark:text-white sm:text-3xl">
+                  Volumes
+                </h1>
+
+                <p className="mt-1.5 text-sm text-gray-500 dark:text-white">
+                  Browse your collection of volumes.
+                </p>
+              </div>
+            </div>
+          </div>
+        </header>
+        {isSuccess ? (
          <div>
            <div className="library">
              <T2Table
-                sourceData={volumes?.hits}
-                totalPages={volumes.hits.length}
+                sourceData={volumes?.data.hits.hits}
+                totalPages={volumes?.data.hits.hits.length}
                paginationHandlers={{
                  nextPage: () => {},
                  previousPage: () => {},
@@ -176,9 +166,13 @@ export const Volumes = (props): ReactElement => {
              />
            </div>
          </div>
-        )}
-      </div>
-    </section>
+        ) : null}
+        {isError ? (
+          <div>An error was encountered while retrieving volumes</div>
+        ) : null}
+        {isLoading ? <>Loading...</> : null}
+      </section>
+    </div>
  );
 };

--- a/src/client/components/WantedComics/WantedComics.tsx
+++ b/src/client/components/WantedComics/WantedComics.tsx
@@ -1,34 +1,37 @@
 import React, { ReactElement, useCallback, useEffect, useMemo } from "react";
-import { useDispatch, useSelector } from "react-redux";
-import { searchIssue } from "../../actions/fileops.actions";
 import SearchBar from "../Library/SearchBar";
 import T2Table from "../shared/T2Table";
-import { isEmpty, isUndefined } from "lodash";
 import MetadataPanel from "../shared/MetadataPanel";
+import { useQuery } from "@tanstack/react-query";
+import axios from "axios";
+import { SEARCH_SERVICE_BASE_URI } from "../../constants/endpoints";

 export const WantedComics = (props): ReactElement => {
-  const wantedComics = useSelector(
-    (state: RootState) => state.fileOps.wantedComics,
-  );
-  const dispatch = useDispatch();
-  useEffect(() => {
-    dispatch(
-      searchIssue(
-        {
+  const {
+    data: wantedComics,
+    isSuccess,
+    isFetched,
+    isError,
+    isLoading,
+  } = useQuery({
+    queryFn: async () =>
+      await axios({
+        url: `${SEARCH_SERVICE_BASE_URI}/searchIssue`,
+        method: "POST",
+        data: {
          query: {},
-        },
-        {
+
          pagination: {
            size: 25,
            from: 0,
          },
          type: "wanted",
-          trigger: "wantedComicsPage"
+          trigger: "wantedComicsPage",
        },
-      ),
-    );
-  }, []);
-
+      }),
+    queryKey: ["wantedComics"],
+    enabled: true,
+  });
  const columnData = [
    {
      header: "Comic Information",
@@ -37,8 +40,12 @@ export const WantedComics = (props): ReactElement => {
          header: "Details",
          id: "comicDetails",
          minWidth: 350,
-          accessorFn: data => data,
-          cell: (value) => <MetadataPanel data={value.getValue()} />,
+          accessorFn: (data) => data,
+          cell: (value) => {
+            console.log("ASDASd", value);
+            const row = value.getValue()._source;
+            return row && <MetadataPanel data={row} />;
+          },
        },
      ],
    },
@@ -47,10 +54,12 @@ export const WantedComics = (props): ReactElement => {
      columns: [
        {
          header: "Files",
-          accessorKey: "acquisition",
          align: "right",
-          cell: props => {
-            const { directconnect: { downloads } } = props.getValue();
+          accessorKey: "_source.acquisition",
+          cell: (props) => {
+            const {
+              directconnect: { downloads },
+            } = props.getValue();
            return (
              <div
                style={{
@@ -60,9 +69,7 @@ export const WantedComics = (props): ReactElement => {
                }}
              >
                {downloads.length > 0 ? (
-                  <span className="tag is-warning">
-                    {downloads.length}
-                  </span>
+                  <span className="tag is-warning">{downloads.length}</span>
                ) : null}
              </div>
            );
@@ -71,12 +78,18 @@ export const WantedComics = (props): ReactElement => {
        {
          header: "Download Details",
          id: "downloadDetails",
-          accessorKey: "acquisition",
-          cell: data => <ol>
-            {data.getValue().directconnect.downloads.map((download, idx) => {
-              return <li className="is-size-7" key={idx}>{download.name}</li>;
-            })}
-          </ol>
+          accessorKey: "_source.acquisition",
+          cell: (data) => (
+            <ol>
+              {data.getValue().directconnect.downloads.map((download, idx) => {
+                return (
+                  <li className="is-size-7" key={idx}>
+                    {download.name}
+                  </li>
+                );
+              })}
+            </ol>
+          ),
        },
        {
          header: "Type",
@@ -92,26 +105,25 @@ export const WantedComics = (props): ReactElement => {
   * @param {number} pageIndex
   * @param {number} pageSize
   * @returns void
-   *  
+   *
   **/
-  const nextPage = useCallback((pageIndex: number, pageSize: number) => {
-    dispatch(
-      searchIssue(
-        {
-          query: {},
-        },
-        {
-          pagination: {
-            size: pageSize,
-            from: pageSize * pageIndex + 1,
-          },
-          type: "wanted",
-          trigger: "wantedComicsPage",
-        },
-      ),
-    );
-  }, []);
-
+  // const nextPage = useCallback((pageIndex: number, pageSize: number) => {
+  //   dispatch(
+  //     searchIssue(
+  //       {
+  //         query: {},
+  //       },
+  //       {
+  //         pagination: {
+  //           size: pageSize,
+  //           from: pageSize * pageIndex + 1,
+  //         },
+  //         type: "wanted",
+  //         trigger: "wantedComicsPage",
+  //       },
+  //     ),
+  //   );
+  // }, []);

  /**
   * Pagination control that fetches the previous x (pageSize) items
@@ -120,55 +132,71 @@ export const WantedComics = (props): ReactElement => {
   * @param {number} pageSize
   * @returns void
   **/
-  const previousPage = useCallback((pageIndex: number, pageSize: number) => {
-    let from = 0;
-    if (pageIndex === 2) {
-      from = (pageIndex - 1) * pageSize + 2 - 17;
-    } else {
-      from = (pageIndex - 1) * pageSize + 2 - 16;
-    }
-    dispatch(
-      searchIssue(
-        {
-          query: {},
-        },
-        {
-          pagination: {
-            size: pageSize,
-            from,
-          },
-          type: "wanted",
-          trigger: "wantedComicsPage"
-        },
-      ),
-    );
-  }, []);
+  // const previousPage = useCallback((pageIndex: number, pageSize: number) => {
+  //   let from = 0;
+  //   if (pageIndex === 2) {
+  //     from = (pageIndex - 1) * pageSize + 2 - 17;
+  //   } else {
+  //     from = (pageIndex - 1) * pageSize + 2 - 16;
+  //   }
+  //   dispatch(
+  //     searchIssue(
+  //       {
+  //         query: {},
+  //       },
+  //       {
+  //         pagination: {
+  //           size: pageSize,
+  //           from,
+  //         },
+  //         type: "wanted",
+  //         trigger: "wantedComicsPage",
+  //       },
+  //     ),
+  //   );
+  // }, []);

  return (
-    <section className="container">
-      <div className="section">
-        <div className="header-area">
-          <h1 className="title">Wanted Comics</h1>
-        </div>
-        {!isEmpty(wantedComics) && (
+    <div className="">
+      <section className="">
+        <header className="bg-slate-200 dark:bg-slate-500">
+          <div className="mx-auto max-w-screen-xl px-2 py-2 sm:px-6 sm:py-8 lg:px-8 lg:py-4">
+            <div className="sm:flex sm:items-center sm:justify-between">
+              <div className="text-center sm:text-left">
+                <h1 className="text-2xl font-bold text-gray-900 dark:text-white sm:text-3xl">
+                  Wanted Comics
+                </h1>
+
+                <p className="mt-1.5 text-sm text-gray-500 dark:text-white">
+                  Browse through comics you marked as "wanted."
+                </p>
+              </div>
+            </div>
+          </div>
+        </header>
+        {isSuccess && wantedComics?.data.hits?.hits ? (
          <div>
            <div className="library">
              <T2Table
-                sourceData={wantedComics}
-                totalPages={wantedComics.length}
+                sourceData={wantedComics?.data.hits.hits}
+                totalPages={wantedComics?.data.hits.hits.length}
                columns={columnData}
                paginationHandlers={{
-                  nextPage: nextPage,
-                  previousPage: previousPage,
+                  nextPage: () => {},
+                  previousPage: () => {},
                }}
-              // rowClickHandler={navigateToComicDetail}
+                // rowClickHandler={navigateToComicDetail}
              />
              {/* pagination controls */}
            </div>
          </div>
-        )}
-      </div>
-    </section>
+        ) : null}
+        {isLoading ? <div>Loading...</div> : null}
+        {isError ? (
+          <div>An error occurred while retrieving the pull list.</div>
+        ) : null}
+      </section>
+    </div>
  );
 };

--- a/src/client/components/shared/Canvas.tsx
+++ b/src/client/components/shared/Canvas.tsx
@@ -1,8 +1,7 @@
 import React, { useEffect, useRef } from "react";

-export const Canvas = (data) => {
-  const { colorHistogramData } = data.data;
-  console.log(data);
+export const Canvas = ({ data }) => {
+  const { colorHistogramData } = data;
  const width = 559;
  const height = 200;
  const pixelRatio = window.devicePixelRatio;
@@ -10,7 +9,11 @@ export const Canvas = (data) => {
  const canvas = useRef(null);

  useEffect(() => {
-    const context = canvas.current.getContext("2d");
+    const context = canvas.current?.getContext("2d");
+    if (!context) {
+      return;
+    }
+
    context.scale(pixelRatio, pixelRatio);
    const guideHeight = 8;
    const startY = height - guideHeight;
@@ -46,18 +49,24 @@ export const Canvas = (data) => {
      context.stroke();

      // Guide
-      context.strokeStyle = "rgb(" + i + ", " + i + ", " + i + ")";
+      context.strokeStyle = `rgb(${i}, ${i}, ${i})`;
      context.beginPath();
      context.moveTo(x, startY);
      context.lineTo(x, height);
      context.closePath();
      context.stroke();
    }
-  });
+
+    // Cleanup function
+    return () => {
+      // Perform cleanup actions here
+    };
+  }, [colorHistogramData, pixelRatio]);

  const dw = Math.floor(pixelRatio * width);
  const dh = Math.floor(pixelRatio * height);
  const style = { width, height };
+
  return <canvas ref={canvas} width={dw} height={dh} style={style} />;
 };

--- a/src/client/components/shared/Card.tsx
+++ b/src/client/components/shared/Card.tsx
--- a/src/client/components/shared/Carda.tsx
+++ b/src/client/components/shared/Carda.tsx
@@ -0,0 +1,173 @@
+import React, { ReactElement } from "react";
+import PropTypes from "prop-types";
+import { isEmpty, isNil } from "lodash";
+
+interface ICardProps {
+  orientation: string;
+  imageUrl?: string;
+  hasDetails?: boolean;
+  title?: PropTypes.ReactElementLike | null;
+  children?: PropTypes.ReactNodeLike;
+  borderColorClass?: string;
+  backgroundColor?: string;
+  onClick?: (event: React.MouseEvent<HTMLElement>) => void;
+  cardContainerStyle?: PropTypes.object;
+  imageStyle?: PropTypes.object;
+}
+
+const renderCard = (props: ICardProps): ReactElement => {
+  switch (props.orientation) {
+    case "horizontal":
+      return (
+        <div className="card-container">
+          <div className="card generic-card">
+            <div className="is-horizontal">
+              <div className="card-image">
+                <img
+                  style={props.imageStyle}
+                  src={props.imageUrl}
+                  alt="Placeholder image"
+                  className="cropped-image"
+                />
+              </div>
+              {props.hasDetails && (
+                <div className="card-content">{props.children}</div>
+              )}
+            </div>
+          </div>
+        </div>
+      );
+    case "vertical":
+      return (
+        <div onClick={props.onClick}>
+          <div className="generic-card" style={props.cardContainerStyle}>
+            <div
+              className={
+                !isNil(props.borderColorClass)
+                  ? `${props.borderColorClass}`
+                  : ""
+              }
+            >
+              <div
+                className={
+                  props.hasDetails
+                    ? "partial-rounded-card-image"
+                    : "rounded-card-image"
+                }
+              >
+                <figure>
+                  <img
+                    src={props.imageUrl}
+                    style={props.imageStyle}
+                    alt="Placeholder image"
+                  />
+                </figure>
+              </div>
+              {props.hasDetails && (
+                <div
+                  className="card-content"
+                  style={{ backgroundColor: props.backgroundColor }}
+                >
+                  {!isNil(props.title) ? (
+                    <div className="card-title is-size-8 is-family-secondary">
+                      {props.title}
+                    </div>
+                  ) : null}
+                  {props.children}
+                </div>
+              )}
+            </div>
+          </div>
+        </div>
+      );
+
+    case "vertical-2":
+      return (
+        <div className="block rounded-md w-64 h-fit shadow-md shadow-white-400 bg-gray-200 dark:bg-slate-500">
+          <img
+            alt="Home"
+            src={props.imageUrl}
+            className="rounded-t-md object-cover"
+          />
+
+          {props.title ? (
+            <div className="px-3 pt-3 mb-2">
+              <dd className="text-sm text-slate-500 dark:text-black">
+                {props.title}
+              </dd>
+            </div>
+          ) : null}
+
+          {props.hasDetails ? (
+            <div className="px-2">
+              <>{props.children}</>
+            </div>
+          ) : null}
+        </div>
+      );
+
+    case "horizontal-small":
+      return (
+        <>
+          <div className="flex flex-row justify-start align-top gap-3 bg-slate-200 h-fit rounded-md shadow-md shadow-white-400">
+            {/* thumbnail */}
+            <div className="rounded-md overflow-hidden">
+              <img src={props.imageUrl} className="object-cover h-20 w-20" />
+            </div>
+            {/* details */}
+            <div className="w-fit h-fit pl-1 pr-2 py-1">
+              <p className="text-sm">{props.title}</p>
+            </div>
+          </div>
+        </>
+      );
+
+    case "horizontal-medium":
+      return (
+        <>
+          <div className="flex flex-row items-center align-top gap-3 bg-slate-200 h-fit p-2 rounded-md shadow-md shadow-white-400">
+            {/* thumbnail */}
+            <div className="rounded-md overflow-hidden">
+              <img src={props.imageUrl} />
+            </div>
+            {/* details */}
+            <div className="pl-1 pr-2 py-1">
+              <p className="text-sm">{props.title}</p>
+              {props.hasDetails && <>{props.children}</>}
+            </div>
+          </div>
+        </>
+      );
+
+    case "cover-only":
+      return (
+        <>
+          {/* thumbnail */}
+          <div className="rounded-lg shadow-lg overflow-hidden w-fit h-fit">
+            <img src={props.imageUrl} />
+          </div>
+        </>
+      );
+    case "card-with-info-panel":
+      return (
+        <>
+          <div className="flex flex-row">
+            {/* thumbnail */}
+            <div className="rounded-md overflow-hidden w-fit h-fit">
+              <img src={props.imageUrl} />
+            </div>
+            {/* myata-dyata */}
+          </div>
+        </>
+      );
+
+    default:
+      return <></>;
+  }
+};
+
+export const Card = React.memo(
+  (props: ICardProps): ReactElement => renderCard(props),
+);
+
+export default Card;
--- a/src/client/components/shared/ConnectionForm/ConnectionForm.tsx
+++ b/src/client/components/shared/ConnectionForm/ConnectionForm.tsx
@@ -0,0 +1,158 @@
+import React, { ReactElement } from "react";
+import { Form, Field } from "react-final-form";
+import { hostNameValidator } from "../../../shared/utils/validator.utils";
+import { isEmpty } from "lodash";
+
+export const ConnectionForm = ({
+  initialData,
+  submitHandler,
+  formHeading,
+}): ReactElement => {
+  return (
+    <>
+      <Form
+        onSubmit={submitHandler}
+        initialValues={initialData}
+        render={({ handleSubmit }) => (
+          <form onSubmit={handleSubmit} className="mt-10">
+            <h2 className="text-xl">{formHeading}</h2>
+            <article
+              role="alert"
+              className="mt-4 rounded-lg max-w-screen-md border-s-4 border-blue-500 bg-blue-50 p-4 dark:border-s-4 dark:border-blue-600 dark:bg-blue-300 dark:text-slate-600"
+            >
+              <div>
+                <p>Configure your AirDC++ client connection here.</p>
+                <p>
+                  Note that you need an instance of AirDC++ already running to
+                  use this form to connect to it.
+                </p>
+                <p>
+                  See{" "}
+                  <a
+                    className="underline"
+                    href="http://airdcpp.net/docs/installation/installation.html"
+                  >
+                    here
+                  </a>{" "}
+                  for AirDC++ installation instructions for various platforms.
+                </p>
+              </div>
+            </article>
+
+            <span className="flex items-center mt-6">
+              <span className="text-xl text-slate-500 dark:text-slate-200 pr-5">
+                Configure Connection
+              </span>
+              <span className="h-px flex-1 bg-slate-200 dark:bg-slate-400"></span>
+            </span>
+
+            <div className="flex flex-row mt-4">
+              <div className="relative">
+                {/* protocol */}
+                <label className="block py-1">Protocol</label>
+                <Field
+                  name="protocol"
+                  component="select"
+                  className="appearance-none dark:bg-slate-400 bg-slate-100 h-10 rounded-md border-none text-gray-700 dark:text-slate-200 py-1 pr-7 pl-3 sm:text-md sm:leading-5 focus:outline-none focus:shadow-outline-blue focus:border-blue-300"
+                >
+                  <option>Protocol</option>
+                  <option value="http">http://</option>
+                  <option value="https">https://</option>
+                </Field>
+                <div className="absolute h-7 w-7 right-0 px-1 top-11 pointer-events-none">
+                  <i className="icon-[solar--alt-arrow-down-bold]" />
+                </div>
+              </div>
+              {/* hostname */}
+              <Field name="hostname" validate={hostNameValidator}>
+                {({ input, meta }) => (
+                  <div className="flex flex-col">
+                    <label className="block px-2 py-1">Hostname</label>
+                    <input
+                      {...input}
+                      type="text"
+                      placeholder="Hostname"
+                      className="ml-2 dark:bg-slate-400 bg-slate-100 py-2 px-2 rounded-md border-gray-300 h-10 dark:text-slate-200 sm:text-md sm:leading-5 focus:outline-none focus:shadow-outline-blue focus:border-blue-300"
+                    />
+                    <div>
+                      {meta.error && meta.touched && (
+                        <span className="text-sm text-red-400 px-2">
+                          {meta.error}
+                        </span>
+                      )}
+                    </div>
+                  </div>
+                )}
+              </Field>
+
+              {/* port */}
+              <div className="flex flex-col">
+                <label className="block px-2 py-1">Port</label>
+                <Field
+                  name="port"
+                  component="input"
+                  className="ml-2 dark:bg-slate-400 bg-slate-100 px-2 block h-10 rounded-md sm:text-md sm:leading-5 focus:outline-none focus:shadow-outline-blue focus:border-blue-300"
+                  placeholder="Port"
+                />
+              </div>
+            </div>
+
+            <div className="flex flex-row mt-5">
+              <div>
+                <label className="block py-1">Username</label>
+                <div className="relative">
+                  <Field
+                    name="username"
+                    component="input"
+                    className="h-10 dark:bg-slate-500 bg-slate-200 rounded-md text-gray-700 dark:text-slate-200 py-1 px-10 mr-5 sm:text-md sm:leading-5 focus:outline-none focus:shadow-outline-blue focus:border-blue-300"
+                    placeholder="Username"
+                  />
+                  <span className="absolute h-6 w-6 left-2 top-2 inset-y-0 flex items-center px-0 pointer-events-none">
+                    <i className="icon-[solar--user-bold-duotone] h-6 w-6 dark:text-slate-200" />
+                  </span>
+                </div>
+              </div>
+              <div>
+                <div>
+                  <label className="block py-1">Password</label>
+                  <div className="relative">
+                    <Field
+                      name="password"
+                      component="input"
+                      type="password"
+                      className="h-10 dark:bg-slate-500 bg-slate-200 rounded-md text-gray-700 dark:text-slate-200 py-1 px-10 sm:text-md sm:leading-5 focus:outline-none focus:shadow-outline-blue focus:border-blue-300"
+                      placeholder="Password"
+                    />
+                    <span className="absolute left-2 top-2 inset-y-0 flex items-center px-0 pointer-events-none h-6 w-6">
+                      <i className="icon-[solar--lock-password-bold-duotone] h-6 w-6 dark:text-slate-200" />
+                    </span>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div className="flex flex-row gap-2">
+              <button
+                className="flex space-x-1 sm:mt-5 sm:flex-row sm:items-center rounded-lg border border-green-400 dark:border-green-200 bg-green-200 px-4 py-2 text-gray-500 hover:bg-transparent hover:text-green-600 focus:outline-none focus:ring active:text-indigo-500"
+                type="submit"
+              >
+                <span className="text-md">
+                  {!isEmpty(initialData) ? "Update" : "Save"}
+                </span>
+                <span className="w-6 h-6">
+                  <i className="h-6 w-6 icon-[solar--diskette-bold-duotone]"></i>
+                </span>
+              </button>
+
+              <button
+                type="submit"
+                className="flex space-x-1 sm:mt-5 sm:flex-row sm:items-center rounded-lg border border-red-400 dark:border-red-200 bg-red-200 px-4 py-2 text-gray-500 hover:bg-transparent hover:text-red-600 focus:outline-none focus:ring active:text-indigo-500"
+              >
+                {!isEmpty(initialData) && "Delete"}
+              </button>
+            </div>
+          </form>
+        )}
+      />
+    </>
+  );
+};
--- a/src/client/components/shared/DatePicker.tsx
+++ b/src/client/components/shared/DatePicker.tsx
@@ -0,0 +1,127 @@
+import React, { ChangeEventHandler, useRef, useState } from "react";
+
+import { format, isValid, parse, parseISO } from "date-fns";
+import FocusTrap from "focus-trap-react";
+import { DayPicker, SelectSingleEventHandler } from "react-day-picker";
+import { usePopper } from "react-popper";
+
+export const DatePickerDialog = (props) => {
+  const { setter, apiAction } = props;
+  const [selected, setSelected] = useState<Date>();
+  const [isPopperOpen, setIsPopperOpen] = useState(false);
+
+  const popperRef = useRef<HTMLDivElement>(null);
+  const buttonRef = useRef<HTMLButtonElement>(null);
+  const [popperElement, setPopperElement] = useState<HTMLDivElement | null>(
+    null,
+  );
+
+  const customStyles = {
+    container: {
+      // Style for the entire container
+      border: "1px solid #ccc",
+      borderRadius: "4px",
+      padding: "10px",
+      width: "300px",
+    },
+    day: {
+      // Style for individual days
+
+      padding: "5px",
+      margin: "2px",
+    },
+    selected: {
+      // Style for selected days
+      backgroundColor: "#007bff",
+      color: "#fff",
+    },
+    disabled: {
+      // Style for disabled days
+      color: "#ccc",
+    },
+    today: {
+      // Style for today's date
+      backgroundColor: "#f0f0f0",
+    },
+    dayWrapper: {
+      // Style for the wrapper around each day
+      display: "inline-block",
+    },
+  };
+
+  const popper = usePopper(popperRef.current, popperElement, {
+    placement: "bottom-start",
+  });
+
+  const closePopper = () => {
+    setIsPopperOpen(false);
+    buttonRef?.current?.focus();
+  };
+
+  const handleButtonClick = () => {
+    setIsPopperOpen(true);
+  };
+
+  const handleDaySelect: SelectSingleEventHandler = (date) => {
+    setSelected(date);
+    if (date) {
+      setter(format(date, "M-dd-yyyy"));
+      apiAction();
+      closePopper();
+    } else {
+      setter("");
+    }
+  };
+
+  return (
+    <div>
+      <div ref={popperRef}>
+        <button
+          ref={buttonRef}
+          type="button"
+          aria-label="Pick a date"
+          onClick={handleButtonClick}
+          className="flex space-x-1 sm:flex-row sm:items-center rounded-lg border border-green-400 dark:border-green-200 bg-green-200 px-2 py-1 text-gray-500 hover:bg-transparent hover:text-green-600 focus:outline-none focus:ring active:text-indigo-500"
+        >
+          <span className="pr-1 pt-0.5 h-8">
+            <span className="icon-[solar--calendar-date-bold-duotone] w-6 h-6"></span>
+          </span>
+          Pick a date
+        </button>
+      </div>
+      {isPopperOpen && (
+        <FocusTrap
+          active
+          focusTrapOptions={{
+            initialFocus: false,
+            allowOutsideClick: true,
+            clickOutsideDeactivates: true,
+            onDeactivate: closePopper,
+            fallbackFocus: buttonRef.current || undefined,
+          }}
+        >
+          <div
+            tabIndex={-1}
+            style={popper.styles.popper}
+            className="bg-slate-200 mt-3 p-2 rounded-lg z-50"
+            {...popper.attributes.popper}
+            ref={setPopperElement}
+            role="dialog"
+            aria-label="DayPicker calendar"
+          >
+            <DayPicker
+              initialFocus={isPopperOpen}
+              mode="single"
+              defaultMonth={selected}
+              selected={selected}
+              onSelect={handleDaySelect}
+              styles={customStyles}
+            />
+          </div>
+        </FocusTrap>
+      )}
+    </div>
+  );
+};
+
+export default DatePickerDialog;
--- a/src/client/components/shared/Draggable/Cover.tsx
+++ b/src/client/components/shared/Draggable/Cover.tsx
--- a/src/client/components/shared/Draggable/DnD.tsx
+++ b/src/client/components/shared/Draggable/DnD.tsx
@@ -64,7 +64,7 @@ export const DnD = (data) => {
                  className="mt-2 mb-2"
                  onClick={(e) => data.onClickHandler(url)}
                >
-                  <div className="box p-2 pl-3 control-palette">
+                  <div className="box p-2 control-palette">
                    <span className="tag is-warning mr-2">{index}</span>
                    <span className="icon is-small mr-2">
                      <i className="fa-solid fa-vial"></i>
--- a/src/client/components/shared/Draggable/Grid.tsx
+++ b/src/client/components/shared/Draggable/Grid.tsx
@@ -8,7 +8,6 @@ export function Grid({ children, columns }) {
        gridTemplateColumns: `repeat(${columns}, 200px)`,
        columnGap: 1,
        gridGap: 10,
-        padding: 10,
      }}
    >
      {children}
--- a/src/client/components/shared/Draggable/SortableCover.tsx
+++ b/src/client/components/shared/Draggable/SortableCover.tsx
--- a/src/client/components/shared/ErrorPage.tsx
+++ b/src/client/components/shared/ErrorPage.tsx
@@ -0,0 +1,5 @@
+import React from "react";
+
+export const ErrorPage = () => {
+  return <>Error has been encountered.</>;
+};
--- a/src/client/components/shared/Header.tsx
+++ b/src/client/components/shared/Header.tsx
@@ -0,0 +1,33 @@
+import React, { ReactElement } from "react";
+import { Link } from "react-router-dom";
+
+type IHeaderProps = {
+  headerContent: string;
+  subHeaderContent: ReactElement;
+  iconClassNames: string;
+  link?: string;
+};
+
+export const Header = (props: IHeaderProps): ReactElement => {
+  return (
+    <div className="mt-7">
+      <div className="">
+        {props.link ? (
+          <Link to={props.link}>
+            <span className="text-xl">
+              <span className="underline">
+                {props.headerContent}{" "}
+                <i className="icon-[solar--arrow-right-up-outline] w-4 h-4" />
+              </span>
+            </span>
+          </Link>
+        ) : (
+          <div className="text-xl">{props.headerContent}</div>
+        )}
+        <p className="">{props.subHeaderContent}</p>
+      </div>
+    </div>
+  );
+};
+
+export default Header;
--- a/src/client/components/shared/MetadataPanel.tsx
+++ b/src/client/components/shared/MetadataPanel.tsx
@@ -2,7 +2,7 @@ import React, { ReactElement } from "react";
 import PropTypes from "prop-types";
 import ellipsize from "ellipsize";
 import prettyBytes from "pretty-bytes";
-import { Card } from "../Carda";
+import { Card } from "../shared/Carda";
 import { convert } from "html-to-text";
 import { determineCoverFile } from "../../shared/utils/metadata.utils";
 import { find, isUndefined } from "lodash";
@@ -31,61 +31,62 @@ export const MetadataPanel = (props: IMetadatPanelProps): ReactElement => {
    {
      name: "rawFileDetails",
      content: () => (
-        <dl>
+        <dl className="dark:bg-[#647587] bg-slate-200 p-3 rounded-lg">
          <dt>
-            <h6
-              className="name has-text-weight-medium mb-1"
-              style={props.titleStyle}
-            >
-              {issueName}
-            </h6>
+            <p className="text-lg">{issueName}</p>
          </dt>
-          <dd className="is-size-7">
-            Is a part of{" "}
-            <span className="has-text-weight-semibold">
+          <dd className="text-sm">
+            is a part of{" "}
+            <span className="underline">
              {inferredMetadata.issue.name}
+              <i className="icon-[solar--arrow-right-up-outline] w-4 h-4" />
            </span>
          </dd>

-          <dd className="is-size-7 mt-2">
-            <div className="field is-grouped is-grouped-multiline">
-              <div className="control">
-                <span className="tags">
-                  <span
-                    className="tag is-success is-light has-text-weight-semibold"
-                    style={props.tagsStyle}
-                  >
-                    {rawFileDetails.extension}
-                  </span>
-                  <span
-                    className="tag is-success is-light has-text-weight-semibold"
-                    style={props.tagsStyle}
-                  >
-                    {rawFileDetails.mimeType}
-                  </span>
-                  <span
-                    className="tag is-success is-light"
-                    style={props.tagsStyle}
-                  >
-                    {prettyBytes(rawFileDetails.fileSize)}
-                  </span>
+          {/* Issue number */}
+          {inferredMetadata.issue.number && (
+            <dd className="my-2">
+              <span className="inline-flex items-center bg-slate-50 text-slate-800 text-xs font-medium px-2 rounded-md dark:text-slate-900 dark:bg-slate-400">
+                <span className="pr-1 pt-1">
+                  <i className="icon-[solar--hashtag-outline] w-3.5 h-3.5"></i>
                </span>
-              </div>
-              <div className="control">
-                {inferredMetadata.issue.number && (
-                  <div className="tags has-addons">
-                    <span className="tag is-light" style={props.tagsStyle}>
-                      Issue #
-                    </span>
-                    <span className="tag is-warning" style={props.tagsStyle}>
-                      {inferredMetadata.issue.number}
-                    </span>
-                  </div>
-                )}
-              </div>
+                <span className="text-md text-slate-900 dark:text-slate-900">
+                  {inferredMetadata.issue.number}
+                </span>
+              </span>
+            </dd>
+          )}
+          <dd className="flex flex-row gap-2 w-max">
+            {/* File extension */}
+            <span className="inline-flex items-center bg-slate-50 text-slate-800 text-xs font-medium px-2 rounded-md dark:text-slate-900 dark:bg-slate-400">
+              <span className="pr-1 pt-1">
+                <i className="icon-[solar--zip-file-bold-duotone] w-5 h-5"></i>
+              </span>

-            </div>
-            
+              <span className="text-md text-slate-500 dark:text-slate-900">
+                {rawFileDetails.mimeType}
+              </span>
+            </span>
+
+            {/* size */}
+            <span className="inline-flex items-center bg-slate-50 text-slate-800 text-xs font-medium px-2 rounded-md dark:text-slate-900 dark:bg-slate-400">
+              <span className="pr-1 pt-1">
+                <i className="icon-[solar--mirror-right-bold-duotone] w-5 h-5"></i>
+              </span>
+
+              <span className="text-md text-slate-500 dark:text-slate-900">
+                {prettyBytes(rawFileDetails.fileSize)}
+              </span>
+            </span>
+
+            {/* Uncompressed version available? */}
+            {rawFileDetails.archive?.uncompressed && (
+              <span className="inline-flex items-center bg-slate-50 text-slate-800 text-xs px-2 rounded-md dark:text-slate-900 dark:bg-slate-400">
+                <span className="pr-1 pt-1">
+                  <i className="icon-[solar--bookmark-bold-duotone] w-3.5 h-3.5"></i>
+                </span>
+              </span>
+            )}
          </dd>
        </dl>
      ),
@@ -113,7 +114,6 @@ export const MetadataPanel = (props: IMetadatPanelProps): ReactElement => {
                </span>
              </span>
            </dd>
-
            <dd className="is-size-7">
              <span>
                {ellipsize(
@@ -126,42 +126,13 @@ export const MetadataPanel = (props: IMetadatPanelProps): ReactElement => {
                )}
              </span>
            </dd>
-
            <dd className="is-size-7 mt-2">
-              <div className="field is-grouped is-grouped-multiline">
-                <div className="control">
-                  <span className="tags">
-                    <span
-                      className="tag is-success is-light has-text-weight-semibold"
-                      style={props.tagsStyle}
-                    >
-                      {comicvine.volumeInformation.start_year}
-                    </span>
-                    <span
-                      className="tag is-success is-light"
-                      style={props.tagsStyle}
-                    >
-                      {comicvine.volumeInformation.count_of_issues}
-                    </span>
-                  </span>
-                </div>
-                <div className="control">
-                  <div className="tags has-addons">
-                    <span
-                      className="tag is-primary is-light"
-                      style={props.tagsStyle}
-                    >
-                      ComicVine ID
-                    </span>
-                    <span
-                      className="tag is-info is-light"
-                      style={props.tagsStyle}
-                    >
-                      {comicvine.id}
-                    </span>
-                  </div>
-                </div>
-              </div>
+              <span className="my-3 mx-2">
+                {comicvine.volumeInformation.start_year}
+              </span>
+              {comicvine.volumeInformation.count_of_issues}
+              ComicVine ID
+              {comicvine.id}
            </dd>
          </dl>
        ),
@@ -208,25 +179,14 @@ export const MetadataPanel = (props: IMetadatPanelProps): ReactElement => {
  });

  return (
-    <div className="column" style={props.containerStyle}>
-      <div className="comic-detail issue-metadata">
-        <dl>
-          <dd>
-            <div className="columns mt-2">
-              <div className="column is-3">
-                <Card
-                  imageUrl={url}
-                  orientation={"vertical"}
-                  hasDetails={false}
-                  imageStyle={props.imageStyle}
-                // cardContainerStyle={{ maxWidth: 200 }}
-                />
-              </div>
-              <div className="column">{metadataPanel.content()}</div>
-            </div>
-          </dd>
-        </dl>
-      </div>
+    <div className="flex gap-5 my-3">
+      <Card
+        imageUrl={url}
+        orientation={"cover-only"}
+        hasDetails={false}
+        imageStyle={props.imageStyle}
+      />
+      <div>{metadataPanel.content()}</div>
    </div>
  );
 };
--- a/src/client/components/shared/Navbar.tsx
+++ b/src/client/components/shared/Navbar.tsx
@@ -1,48 +1,46 @@
-import React, { useContext } from "react";
-import { SearchBar } from "./GlobalSearchBar/SearchBar";
-import { DownloadProgressTick } from "./ComicDetail/DownloadProgressTick";
+import React from "react";
+import { SearchBar } from "../GlobalSearchBar/SearchBar";
+import { DownloadProgressTick } from "../ComicDetail/DownloadProgressTick";
 import { Link } from "react-router-dom";
-import { useSelector } from "react-redux";
-import { isUndefined } from "lodash";
+import { isEmpty, isNil, isUndefined } from "lodash";
 import { format, fromUnixTime } from "date-fns";
+import { useStore } from "../../store/index";
+import { useShallow } from "zustand/react/shallow";

 const Navbar: React.FunctionComponent = (props) => {
-  const downloadProgressTick = useSelector(
-    (state: RootState) => state.airdcpp.downloadProgressData,
+  const {
+    airDCPPSocketConnected,
+    airDCPPDisconnectionInfo,
+    airDCPPSessionInformation,
+    airDCPPDownloadTick,
+    importJobQueue,
+  } = useStore(
+    useShallow((state) => ({
+      airDCPPSocketConnected: state.airDCPPSocketConnected,
+      airDCPPDisconnectionInfo: state.airDCPPDisconnectionInfo,
+      airDCPPSessionInformation: state.airDCPPSessionInformation,
+      airDCPPDownloadTick: state.airDCPPDownloadTick,
+      importJobQueue: state.importJobQueue,
+    })),
  );
+  //   const downloadProgressTick = useSelector(
+  //     (state: RootState) => state.airdcpp.downloadProgressData,
+  //   );
+  //
+  //   const airDCPPSocketConnectionStatus = useSelector(
+  //     (state: RootState) => state.airdcpp.isAirDCPPSocketConnected,
+  //   );
+  //   const airDCPPSessionInfo = useSelector(
+  //     (state: RootState) => state.airdcpp.airDCPPSessionInfo,
+  //   );
+  //   const socketDisconnectionReason = useSelector(
+  //     (state: RootState) => state.airdcpp.socketDisconnectionReason,
+  //   );

-  const airDCPPSocketConnectionStatus = useSelector(
-    (state: RootState) => state.airdcpp.isAirDCPPSocketConnected,
-  );
-  const airDCPPSessionInfo = useSelector(
-    (state: RootState) => state.airdcpp.airDCPPSessionInfo,
-  );
-  const socketDisconnectionReason = useSelector(
-    (state: RootState) => state.airdcpp.socketDisconnectionReason,
-  );
-
-  // Import-related selector hooks
-  const successfulImportJobCount = useSelector(
-    (state: RootState) => state.fileOps.successfulJobCount,
-  );
-  const failedImportJobCount = useSelector(
-    (state: RootState) => state.fileOps.failedJobCount,
-  );
-
-  const lastQueueJob = useSelector(
-    (state: RootState) => state.fileOps.lastQueueJob,
-  );
-  const libraryQueueImportStatus = useSelector(
-    (state: RootState) => state.fileOps.LSQueueImportStatus,
-  );
-
-  const allImportJobResults = useSelector(
-    (state: RootState) => state.fileOps.importJobStatistics,
-  );
  return (
    <nav className="navbar is-fixed-top">
      <div className="navbar-brand">
-        <Link to="/" className="navbar-item">
+        <Link to="/dashboard" className="navbar-item">
          <img
            src="/src/client/assets/img/threetwo.svg"
            alt="ThreeTwo! A comic book curator"
@@ -88,7 +86,7 @@ const Navbar: React.FunctionComponent = (props) => {
            Downloads
          </Link>

-          <SearchBar />
+          {/* <SearchBar /> */}

          <Link to="/search" className="navbar-item">
            Search ComicVine
@@ -101,18 +99,20 @@ const Navbar: React.FunctionComponent = (props) => {
          <div className="navbar-item has-dropdown is-hoverable">
            <a className="navbar-link is-arrowless">
              <i className="fa-solid fa-download"></i>
-              {downloadProgressTick && <div className="pulsating-circle"></div>}
+              {!isEmpty(airDCPPDownloadTick) && (
+                <div className="pulsating-circle"></div>
+              )}
            </a>
-            {!isUndefined(downloadProgressTick) ? (
+            {!isEmpty(airDCPPDownloadTick) ? (
              <div className="navbar-dropdown is-right is-boxed">
                <a className="navbar-item">
-                  <DownloadProgressTick data={downloadProgressTick} />
+                  <DownloadProgressTick data={airDCPPDownloadTick} />
                </a>
              </div>
            ) : null}
          </div>

-          {!isUndefined(libraryQueueImportStatus) &&
+          {!isUndefined(importJobQueue.status) &&
          location.hash !== "#/import" ? (
            <div className="navbar-item has-dropdown is-hoverable">
              <a className="navbar-link is-arrowless">
@@ -122,18 +122,18 @@ const Navbar: React.FunctionComponent = (props) => {
              <div className="navbar-dropdown is-right is-boxed">
                <a className="navbar-item">
                  <ul>
-                    {successfulImportJobCount > 0 ? (
+                    {importJobQueue.successfulJobCount > 0 ? (
                      <li className="mb-2">
                        <span className="tag is-success mr-2">
-                          {successfulImportJobCount}
+                          {importJobQueue.successfulJobCount}
                        </span>
                        imported.
                      </li>
                    ) : null}
-                    {failedImportJobCount > 0 ? (
+                    {importJobQueue.failedJobCount > 0 ? (
                      <li>
                        <span className="tag is-danger mr-2">
-                          {failedImportJobCount}
+                          {importJobQueue.failedJobCount}
                        </span>
                        failed to import.
                      </li>
@@ -146,7 +146,7 @@ const Navbar: React.FunctionComponent = (props) => {

          {/* AirDC++ socket connection status */}
          <div className="navbar-item has-dropdown is-hoverable">
-            {airDCPPSocketConnectionStatus ? (
+            {!isUndefined(airDCPPSessionInformation.user) ? (
              <>
                <a className="navbar-link is-arrowless has-text-success">
                  <i className="fa-solid fa-bolt"></i>
@@ -158,7 +158,9 @@ const Navbar: React.FunctionComponent = (props) => {
                    Last login was{" "}
                    <span className="tag">
                      {format(
-                        fromUnixTime(airDCPPSessionInfo.user.last_login),
+                        fromUnixTime(
+                          airDCPPSessionInformation?.user.last_login,
+                        ),
                        "dd MMMM, yyyy",
                      )}
                    </span>
@@ -166,19 +168,17 @@ const Navbar: React.FunctionComponent = (props) => {
                  <hr className="navbar-divider" />
                  <p>
                    <span className="tag has-text-success">
-                      {airDCPPSessionInfo.user.username}
+                      {airDCPPSessionInformation.user.username}
                    </span>
                    connected to{" "}
                    <span className="tag has-text-success">
-                      {airDCPPSessionInfo.system_info.client_version}
+                      {airDCPPSessionInformation.system_info.client_version}
                    </span>{" "}
                    with session ID{" "}
                    <span className="tag has-text-success">
-                      {airDCPPSessionInfo.session_id}
+                      {airDCPPSessionInformation.session_id}
                    </span>
                  </p>
-
-                  {/* <pre>{JSON.stringify(airDCPPSessionInfo, null, 2)}</pre> */}
                </div>
              </>
            ) : (
@@ -187,9 +187,7 @@ const Navbar: React.FunctionComponent = (props) => {
                  <i className="fa-solid fa-bolt"></i>
                </a>
                <div className="navbar-dropdown pr-2 pl-2 is-right is-boxed">
-                  <pre>
-                    {JSON.stringify(socketDisconnectionReason, null, 2)}
-                  </pre>
+                  <pre>{JSON.stringify(airDCPPDisconnectionInfo, null, 2)}</pre>
                </div>
              </>
            )}
--- a/src/client/components/shared/Navbar2.tsx
+++ b/src/client/components/shared/Navbar2.tsx
@@ -0,0 +1,129 @@
+import React, { ReactElement, useState } from "react";
+import { Link } from "react-router-dom";
+import { useDarkMode } from "../../hooks/useDarkMode";
+
+export const Navbar2 = (): ReactElement => {
+  const [colorTheme, setTheme] = useDarkMode();
+  const [darkMode, setDarkMode] = useState(false);
+
+  const toggleDarkMode = (checked) => {
+    setTheme(colorTheme);
+    setDarkMode(!darkMode);
+  };
+
+  return (
+    <header className="bg-white dark:bg-gray-900 gap-8 px-5 py-5 h-18 border-b-2 border-gray-300 dark:border-slate-200">
+      {/* Logo */}
+      <div className="mx-auto flex">
+        <img src="/src/client/assets/img/threetwo.png" alt="ThreeTwo!" />
+
+        {/* Main Navigation */}
+        <div className="flex flex-1 items-center justify-end md:justify-between">
+          <nav
+            aria-label="ThreeTwo Main Navigation"
+            className="hidden md:block"
+          >
+            <ul className="flex items-center gap-6 text-md">
+              <li>
+                <Link
+                  to="/dashboard"
+                  className="text-gray-500 transition hover:text-gray-500/75 dark:text-white dark:hover:text-white/75"
+                >
+                  Dashboard
+                </Link>
+              </li>
+
+              <li>
+                <Link
+                  to="/import"
+                  className="text-gray-500 transition hover:text-gray-500/75 dark:text-white dark:hover:text-white/75"
+                >
+                  Import
+                </Link>
+              </li>
+
+              <li>
+                <Link
+                  to="/library"
+                  className="text-gray-500 transition hover:text-gray-500/75 dark:text-white dark:hover:text-white/75"
+                >
+                  Library
+                </Link>
+              </li>
+
+              <li>
+                <Link
+                  to="/volumes"
+                  className="text-gray-500 transition hover:text-gray-500/75 dark:text-white dark:hover:text-white/75"
+                >
+                  Volumes
+                </Link>
+              </li>
+
+              <li>
+                <a
+                  className="text-gray-500 transition hover:text-gray-500/75 dark:text-white dark:hover:text-white/75"
+                  href="/"
+                >
+                  Downloads
+                </a>
+              </li>
+              <li>
+                <Link
+                  className="text-gray-500 transition hover:text-gray-500/75 dark:text-white dark:hover:text-white/75"
+                  to="/search"
+                >
+                  Comicvine Search
+                </Link>
+              </li>
+            </ul>
+          </nav>
+
+          {/* Right-most Nav */}
+          <div className="flex items-center gap-4">
+            <ul className="flex items-center gap-6 text-md">
+              {/* Settings Icon and text */}
+              <li>
+                <Link
+                  to="/settings"
+                  className="flex items-center space-x-1 text-gray-500 transition hover:text-gray-500/75 dark:text-white dark:hover:text-white/75"
+                >
+                  <span className="w-5 h-5">
+                    <i className="icon-[solar--settings-outline] h-5 w-5"></i>
+                  </span>
+                  <span>Settings</span>
+                </Link>
+              </li>
+
+              <li>
+                {/* Light/Dark Mode toggle */}
+                <div className="flex items-center space-x-2">
+                  <span className="text-gray-600 dark:text-white">Light</span>
+                  <label
+                    htmlFor="toggle"
+                    className="relative inline-flex items-center"
+                  >
+                    <input
+                      type="checkbox"
+                      id="toggle"
+                      className="sr-only"
+                      checked={darkMode}
+                      onChange={toggleDarkMode}
+                    />
+                    <span className="bg-gray-300 w-10 h-6 rounded-full"></span>
+                    <span
+                      className={`bg-white w-4 h-4 rounded-full absolute left-1 top-1 transition-transform duration-300 ease-in-out ${
+                        darkMode ? "translate-x-4" : ""
+                      }`}
+                    ></span>
+                  </label>
+                  <span className="text-gray-600 dark:text-white">Dark</span>
+                </div>
+              </li>
+            </ul>
+          </div>
+        </div>
+      </div>
+    </header>
+  );
+};
--- a/src/client/components/shared/T2Table.tsx
+++ b/src/client/components/shared/T2Table.tsx
@@ -1,7 +1,5 @@
 import React, { ReactElement, useMemo, useState } from "react";
 import PropTypes from "prop-types";
-import SearchBar from "../Library/SearchBar";
-import { Link } from "react-router-dom";
 import {
  ColumnDef,
  flexRender,
@@ -12,26 +10,30 @@ import {
 } from "@tanstack/react-table";

 export const T2Table = (tableOptions): ReactElement => {
-  const { sourceData, columns, paginationHandlers: { nextPage, previousPage }, totalPages, rowClickHandler } =
-    tableOptions;
+  const {
+    sourceData,
+    columns,
+    paginationHandlers: { nextPage, previousPage },
+    totalPages,
+    rowClickHandler,
+  } = tableOptions;

-  const [{ pageIndex, pageSize }, setPagination] =
-    useState<PaginationState>({
-      pageIndex: 1,
-      pageSize: 15,
-    });
+  const [{ pageIndex, pageSize }, setPagination] = useState<PaginationState>({
+    pageIndex: 1,
+    pageSize: 15,
+  });

  const pagination = useMemo(
    () => ({
      pageIndex,
      pageSize,
    }),
-    [pageIndex, pageSize]
+    [pageIndex, pageSize],
  );

  /**
-   * Pagination control to move forward one page 
-   * @returns void 
+   * Pagination control to move forward one page
+   * @returns void
   */
  const goToNextPage = () => {
    setPagination({
@@ -39,10 +41,10 @@ export const T2Table = (tableOptions): ReactElement => {
      pageSize,
    });
    nextPage(pageIndex, pageSize);
-  }
+  };

  /**
-   * Pagination control to move backward one page 
+   * Pagination control to move backward one page
   * @returns void
   **/
  const goToPreviousPage = () => {
@@ -51,7 +53,7 @@ export const T2Table = (tableOptions): ReactElement => {
      pageSize,
    });
    previousPage(pageIndex, pageSize);
-  }
+  };

  const table = useReactTable({
    data: sourceData,
@@ -66,62 +68,51 @@ export const T2Table = (tableOptions): ReactElement => {
  });

  return (
-    <>
-      <div className="columns table-controls">
-        {/* Search bar */}
-        <div className="column is-half">
-          <SearchBar />
+    <div className="container max-w-fit mx-14">
+      <div>
+        <div className="flex flex-row gap-2 justify-between mt-7">
+          {/* Search bar */}
+          {tableOptions.children}
+          {/* pagination controls */}
+          <div>
+            Page {pageIndex} of {Math.ceil(totalPages / pageSize)}
+            <p>{totalPages} comics in all</p>
+            {/* Prev/Next buttons */}
+            <div className="inline-flex flex-row mt-4 mb-4">
+              <button
+                onClick={() => goToPreviousPage()}
+                disabled={pageIndex === 1}
+                className="dark:bg-slate-500 bg-slate-400 rounded-l border-slate-600 border-r pt-2 px-2"
+              >
+                <i className="icon-[solar--arrow-left-linear] h-6 w-6"></i>
+              </button>
+              <button
+                className="dark:bg-slate-500 bg-slate-400 rounded-r pt-2 px-2"
+                onClick={() => goToNextPage()}
+                disabled={pageIndex > Math.floor(totalPages / pageSize)}
+              >
+                <i className="icon-[solar--arrow-right-linear] h-6 w-6"></i>
+              </button>
+            </div>
+          </div>
        </div>
-        {/* pagination controls */}
-        <nav className="pagination columns">
-          <div className="mr-4 has-text-weight-semibold has-text-left">
-            <p className="is-size-5">Page {pageIndex} of {Math.ceil(totalPages / pageSize)}</p>
-            {/* <p>{totalPages} comics in all</p> */}
-          </div>
-          <div className="field has-addons">
-            <div className="control">
-              <div className="button" onClick={() => goToPreviousPage()}> <i className="fas fa-chevron-left"></i></div>
-            </div>
-            <div className="control">
-              <div className="button" onClick={() => goToNextPage()}> <i className="fas fa-chevron-right"></i> </div>
-            </div>
-
-            <div className="field has-addons ml-5">
-              <p className="control">
-                <button className="button">
-                  <span className="icon is-small">
-                    <i className="fa-solid fa-list"></i>
-                  </span>
-                </button>
-              </p>
-              <p className="control">
-                <button className="button">
-                  <Link to="/library-grid">
-                    <span className="icon is-small">
-                      <i className="fa-solid fa-image"></i>
-                    </span>
-                  </Link>
-                </button>
-              </p>
-            </div>
-          </div>
-        </nav>
      </div>
-      <table className="table is-hoverable">
-        <thead>
+      <table className="table-auto overflow-auto">
+        <thead className="sticky top-0 bg-slate-200 dark:bg-slate-500">
          {table.getHeaderGroups().map((headerGroup, idx) => (
            <tr key={headerGroup.id}>
              {headerGroup.headers.map((header, idx) => (
                <th
                  key={header.id}
                  colSpan={header.colSpan}
+                  className="px-3 py-3"
                >
                  {header.isPlaceholder
                    ? null
                    : flexRender(
-                      header.column.columnDef.header,
-                      header.getContext()
-                    )}
+                        header.column.columnDef.header,
+                        header.getContext(),
+                      )}
                </th>
              ))}
            </tr>
@@ -131,21 +122,23 @@ export const T2Table = (tableOptions): ReactElement => {
        <tbody>
          {table.getRowModel().rows.map((row, idx) => {
            return (
-              <tr
-                key={row.id}
-                onClick={() => rowClickHandler(row)}
-              >
-                {row.getVisibleCells().map(cell => (
-                  <td key={cell.id}>
-                    {flexRender(cell.column.columnDef.cell, cell.getContext())}
-                  </td>
-                ))}
+              <tr key={row.id} onClick={() => rowClickHandler(row)}>
+                {row.getVisibleCells().map((cell) => {
+                  return (
+                    <td key={cell.id} className="align-top">
+                      {flexRender(
+                        cell.column.columnDef.cell,
+                        cell.getContext(),
+                      )}
+                    </td>
+                  );
+                })}
              </tr>
            );
          })}
        </tbody>
      </table>
-    </>
+    </div>
  );
 };

@@ -158,5 +151,6 @@ T2Table.propTypes = {
    previousPage: PropTypes.func,
  }),
  rowClickHandler: PropTypes.func,
+  children: PropTypes.any,
 };
 export default T2Table;
--- a/src/client/constants/action-types.ts
+++ b/src/client/constants/action-types.ts
@@ -143,6 +143,8 @@ export const SETTINGS_CALL_FAILED = "SETTINGS_CALL_FAILED";
 export const SETTINGS_OBJECT_DELETED = "SETTINGS_OBJECT_DELETED";
 export const SETTINGS_DB_FLUSH_SUCCESS = "SETTINGS_DB_FLUSH_SUCCESS";

+export const SETTINGS_QBITTORRENT_TORRENTS_LIST_FETCHED = "SETTINGS_QBITTORRENT_TORRENTS_LIST_FETCHED";
+
 // Metron Metadata
 export const METRON_DATA_FETCH_SUCCESS = "METRON_DATA_FETCH_SUCCESS";
 export const METRON_DATA_FETCH_IN_PROGRESS = "METRON_DATA_FETCH_IN_PROGRESS";
--- a/src/client/constants/comic.model.js
+++ b/src/client/constants/comic.model.js
@@ -1,48 +0,0 @@
-export const comicModel = {
-  name: "",
-  type: "",
-  import: {
-    isImported: false,
-  },
-  userAddedMetadata: {
-    tags: [],
-  },
-
-  comicStructure: {
-    cover: {
-      thumb: "http://thumb",
-      medium: "http://medium",
-      large: "http://large",
-    },
-    collection: {
-      publishDate: "",
-      type: "", // issue, series, trade paperback
-      metadata: {
-        publisher: "",
-        issueNumber: "",
-        description: "",
-        synopsis: "",
-        team: {},
-      },
-    },
-  },
-  sourcedMetadata: {
-    comicvine: {},
-    shortboxed: {},
-    gcd: {},
-  },
-  rawFileDetails: {
-    fileName: "",
-    path: "",
-    extension: "",
-  },
-  acquisition: {
-    release: {},
-    torrent: {
-      magnet: "",
-      tracker: "",
-      status: "",
-    },
-    usenet: {},
-  },
-};
--- a/src/client/constants/endpoints.ts
+++ b/src/client/constants/endpoints.ts
@@ -8,7 +8,6 @@ export const hostURIBuilder = (options: Record<string, string>): string => {
    options.apiPath
  );
 };
-console.log(import.meta);

 export const CORS_PROXY_SERVER_URI = hostURIBuilder({
  protocol: "http",
@@ -84,3 +83,24 @@ export const JOB_QUEUE_SERVICE_BASE_URI = hostURIBuilder({
  port: "3000",
  apiPath: `/api/jobqueue`,
 });
+
+export const QBITTORRENT_SERVICE_BASE_URI = hostURIBuilder({
+  protocol: "http",
+  host: import.meta.env.UNDERLYING_HOSTNAME || "localhost",
+  port: "3060",
+  apiPath: `/api/qbittorrent`,
+});
+
+export const PROWLARR_SERVICE_BASE_URI = hostURIBuilder({
+  protocol: "http",
+  host: import.meta.env.UNDERLYING_HOSTNAME || "localhost",
+  port: "3060",
+  apiPath: `/api/prowlarr`,
+});
+
+export const TORRENT_JOB_SERVICE_BASE_URI = hostURIBuilder({
+  protocol: "http",
+  host: import.meta.env.UNDERLYING_HOSTNAME || "localhost",
+  port: "3000",
+  apiPath: `/api/torrentjobs`,
+});
--- a/src/client/constants/importer.config.ts
+++ b/src/client/constants/importer.config.ts
@@ -1 +0,0 @@
-export const SUPPORTED_COMIC_ARCHIVES = [".cbz", ".cbr"];
--- a/src/client/constants/settings/settingsMenu.json
+++ b/src/client/constants/settings/settingsMenu.json
@@ -37,6 +37,34 @@
            "displayName": "Additional Configuration"
          }
        ]
+      },
+      {
+        "id": "qbittorrent",
+        "displayName": "qBittorrent",
+        "children": [
+          {
+            "id": "qbt-connection",
+            "displayName": "Connection"
+          },
+          {
+            "id": "qbt-additional-configuration",
+            "displayName": "qbt-configuration"
+          }
+        ]
+      },
+      {
+        "id": "prowlarr",
+        "displayName": "Prowlarr",
+        "children": [
+          {
+            "id": "prwlr-connection",
+            "displayName": "Connection"
+          },
+          {
+            "id": "prowlarr-additional-configuration",
+            "displayName": "prowlarr-configuration"
+          }
+        ]
      }
    ]
  },
--- a/src/client/context/AirDCPPSocket.tsx
+++ b/src/client/context/AirDCPPSocket.tsx
@@ -1,107 +0,0 @@
-import { isEmpty, isUndefined } from "lodash";
-import React, { createContext, useEffect, useState } from "react";
-import { useDispatch, useSelector } from "react-redux";
-import { toggleAirDCPPSocketConnectionStatus } from "../actions/airdcpp.actions";
-import { getSettings } from "../actions/settings.actions";
-
-import AirDCPPSocket from "../services/DcppSearchService";
-
-const AirDCPPSocketContextProvider = ({ children }) => {
-  // setter for settings for use in the context consumer
-  const setSettings = (settingsObject) => {
-    persistSettings({
-      ...airDCPPState,
-      airDCPPState: {
-        settings: settingsObject,
-        socket: {},
-        socketConectionInformation: {},
-      },
-    });
-  };
-  // 1. default zero-state for AirDC++ configuration
-  const initState = {
-    airDCPPState: {
-      settings: {},
-      socket: {},
-      socketConnectionInformation: {},
-    },
-    setSettings: setSettings,
-  };
-  const dispatch = useDispatch();
-  const [airDCPPState, persistSettings] = useState(initState);
-  const airDCPPSettings = useSelector(
-    (state: RootState) => state.settings.data,
-  );
-
-  // 1. get settings from mongo
-  useEffect(() => {
-    dispatch(getSettings());
-  }, []);
-
-  // 2. If available, init AirDC++ Socket with those settings
-  useEffect(() => {
-    if (!isEmpty(airDCPPSettings)) {
-      initializeAirDCPPSocket(airDCPPSettings);
-    }
-  }, [airDCPPSettings]);
-
-  // Method to init AirDC++ Socket with supplied settings
-  const initializeAirDCPPSocket = async (configuration) => {
-    console.log("[AirDCPP]: Initializing socket...");
-    const {
-      directConnect: {
-        client: { host },
-      },
-    } = configuration;
-
-    const initializedAirDCPPSocket = new AirDCPPSocket({
-      protocol: `${host.protocol}`,
-      hostname: `${host.hostname}:${host.port}`,
-      username: `${host.username}`,
-      password: `${host.password}`,
-    });
-
-    // connect and disconnect handlers
-    initializedAirDCPPSocket.onConnected = (sessionInfo) => {
-      dispatch(toggleAirDCPPSocketConnectionStatus("connected", sessionInfo));
-    };
-    initializedAirDCPPSocket.onDisconnected = async (
-      reason,
-      code,
-      wasClean,
-    ) => {
-      dispatch(
-        toggleAirDCPPSocketConnectionStatus("disconnected", {
-          reason,
-          code,
-          wasClean,
-        }),
-      );
-    };
-
-    const socketConnectionInformation = await initializedAirDCPPSocket.connect();
-
-    // update the state with the new socket connection information
-    persistSettings({
-      ...airDCPPState,
-      airDCPPState: {
-        settings: configuration,
-        socket: initializedAirDCPPSocket,
-        socketConnectionInformation,
-      },
-    });
-  };
-
-  // the Provider gives access to the context to its children
-  return (
-    <AirDCPPSocketContext.Provider value={airDCPPState}>
-      {children}
-    </AirDCPPSocketContext.Provider>
-  );
-};
-const AirDCPPSocketContext = createContext({
-  airDCPPState: {},
-  saveSettings: () => { },
-});
-
-export { AirDCPPSocketContext, AirDCPPSocketContextProvider };
--- a/src/client/hooks/useBlazeSlider.tsx
+++ b/src/client/hooks/useBlazeSlider.tsx
@@ -0,0 +1,16 @@
+import React, { useEffect } from "react";
+import BlazeSlider from "blaze-slider";
+
+export const useBlazeSlider = (config) => {
+  const sliderRef = React.useRef();
+  const elRef = React.useRef();
+
+  useEffect(() => {
+    // if not already initialized
+    if (!sliderRef.current) {
+      sliderRef.current = new BlazeSlider(elRef.current, config);
+    }
+  }, []);
+
+  return elRef;
+};
--- a/src/client/hooks/useDarkMode.tsx
+++ b/src/client/hooks/useDarkMode.tsx
@@ -0,0 +1,17 @@
+import React, { useEffect, useState } from "react";
+
+export const useDarkMode = () => {
+  const [theme, setTheme] = useState(localStorage.theme);
+  const colorTheme = theme === "dark" ? "light" : "dark";
+
+  useEffect(() => {
+    const root = window.document.documentElement;
+    root.classList.remove(colorTheme);
+    root.classList.add(theme);
+
+    // save theme to local storage
+    localStorage.setItem("theme", theme);
+  }, [theme, colorTheme]);
+
+  return [colorTheme, setTheme];
+};
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Rishi Ghan	c6f719e78b	💅🏼 Formatting tweaks to tabs	2024-03-30 21:28:48 -04:00
Rishi Ghan	b4d1b678b1	💅🏼 Formatting improvements	2024-03-29 23:26:43 -04:00
Rishi Ghan	aa3192bc1a	🧲 Added visual indicators of torrent progress	2024-03-29 19:35:57 -04:00
Rishi Ghan	56ddfbd16e	🧲 Surfacing torrent progress in UI via scheduled job	2024-03-27 22:23:24 -05:00
Rishi Ghan	173735da45	🧲 Added downloads panel	2024-03-24 17:30:51 -04:00
Rishi Ghan	f4408cd493	🧲 Fixed the auto-population of search box	2024-03-16 18:34:41 -04:00
Rishi Ghan	41a9428729	🧲 Added a torrent download sub-panel	2024-03-07 05:50:49 -06:00
Rishi Ghan	e1da6ddcef	🪢 Wiring up to addTorrent endpoint	2024-02-27 22:15:32 -05:00
Rishi Ghan	df4cecedf0	📝 Added captions to screenshots	2024-02-23 16:59:31 -05:00
Rishi Ghan	3dee53f33f	📝 Updated README	2024-02-23 16:52:45 -05:00
Rishi Ghan	ef05dee600	❌ Removed pngs	2024-02-23 16:42:37 -05:00
Rishi Ghan	2b6bce4731	Merge branch 'main' of https://github.com/rishighan/threetwo	2024-02-23 16:41:21 -05:00
Rishi Ghan	fc4c5c61e2	🌇 Updated screenshots	2024-02-23 16:41:14 -05:00
Rishi Ghan	ae04260f69	❌ Updated .gitignore to ignore storybook static assets (#102 ) * ❌ Updated .gitignore to ignore storybook static assets * 🏗️ Fixed cover-only config for CV detail panel * 🏗️ Added stats to dashboard * 🐯 Prowlarr integration WIP * 🐯 Prowlarr settings form scaffold * 🧲 Added a form for torrent search * 🐯 Mocked a prowlarr call	2024-02-23 16:29:13 -05:00
dependabot[bot]	ad5fc0b8b3	Bump ip from 2.0.0 to 2.0.1 (#103 ) Bumps [ip](https://github.com/indutny/node-ip) from 2.0.0 to 2.0.1. - [Commits](https://github.com/indutny/node-ip/compare/v2.0.0...v2.0.1) --- updated-dependencies: - dependency-name: ip dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2024-02-22 09:07:19 -06:00
Rishi Ghan	c03f706e9d	Dark mode 2 (#100 ) * 🗂️ Added tab icons and styles * 🪑 Styled download panel table * 🪑 Cleaned up the DC++ search results table * 🪑 Many changes to DC++ downloads table * 🏗️ Wired up search with RQ * 🏗️ Changes to ComicDetail section * 🔧 Fixing table styes * 🏗 Fixed the archive ops panel * 🔧 Tweaked Archive ops further * 🃏 Styling the action menu * 🧩 CV Match panel refactor WIP * 🏗️ Refactored the action menu * 🤼 Cleaning up CV match panel * 🏗️ Refactored the scored matches * 🤼 Revamped CV match panel UX * 🖌️ Styling tweaks to the side panel * 🖌️ Cleaned up the form * 🏗️ Refactored the search form * 🤐 Added a uncompress indicator * 🏗️ Fix for encoding # in URIs * 🔧 Fixed # symbol handling in URLs * 🔧 Started work on Edit Metadata panel * 🔎 Added a check for existing uncompressed archives * 🏗️ Settings styling tweaks * 🏗️ Fixed invalidation of archiveOps * 🏗️ Fixed an invalidation query on DC++ download panel * 🏗️ Fixed CV-sourced Volume info panel * 🏗️ Fixed volume group card stacks on Dashboard * 🔍 Fixing CV search page * 🏗️ Refactoring Volume groups and wanted panel * 🏗️ Cleaning up useless files * 🛝 Added keen-slider for pull list * 🏗️ Abstracted heading/subheading into Header * 🏗️ Continued refactoring of PullList, Volumes etc. * 📆 Wired up the datepicker to LoCG pull list	2024-02-06 05:58:56 -05:00
Rishi Ghan	4f49e538a8	Dark mode refactor (#98 ) * 🏗️ Acquisition Panel refactor WIP * 🔧 Formatted the search query box * 🔧 Implementing download method * 🏗️ Refactored the AirDC++ download panel * 🌜 Initial Dark Mode support * 🌜 Trying dark mode on the react-select * Update App.scss * 🏗️ Migrating Navbar to TailwindCSS * 🖼️ Added solar icons * 🔧 Added solar icons * 🔧 Added code for dark mode toggle * 🏗️ Wiring up the dark mode toggle * 🌜 Added Dark mode to the body * 🏗️ Building out the import page * 🪑 Cleaning up the table styles * 🏗️ Cleaned up past imports table * 🏗️ Refactored Import socket events * 🏗️ Refactored the card grid on dashboard * 🏗️ Building variants for Cards * 🏗️ Added a horizontal medium variant * 🏗️ Cleaning up forms and cards * 🔧 Styling form inputs * 🏗️ Form refactor * 🔠 Added a monospace font * 🪑 Refactoring the table * 🧹 Formatting in connection confirmation panels * 🏗️ Refactoring table for library * 🏗️ Added icons and details to metadata * 🏗️ Cleaned the table further * 🏗️ Fixed fonts, and comic detail page first draft * ❌ Removing yarn.lockfile	2023-12-21 16:23:29 -05:00
dependabot[bot]	68442894d0	Bump vite from 5.0.2 to 5.0.5 (#99 ) Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 5.0.2 to 5.0.5. - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/v5.0.5/packages/vite) --- updated-dependencies: - dependency-name: vite dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>	2023-12-06 22:41:14 -06:00
Rishi Ghan	dba520b4c1	🧸 Zustand and Tanstack Query (#96 ) * ↪️ Removed node-sass, added sass * 🏗️ Refactoring Navbar to read from zustand store * ⬆️ Bumped deps * 🏗️ Refactored AirDC++ session status indicator * 🏗️ Refactored Import page to read from global state * 🏗 Wired up the event emit correctly * 🏗️ Added import queue related state * 🏗 Implemented setQueueAction * 🏗️ Wired up job queue control methods * 🏗️ Added null check and removed useless deps * 🏗️ Refactored the Import page * ↪️ Added cache invalidation to job statistics query * 🏗️ Refactoring the Library page * 🏗️ Fixed pagination and disabled states * ✏️ Changed page to offset To better reflect what we are doing with the pagination controls * 🏗️ Refactoring ComicDetail page and its children * 🏗️ Refactored ComicDetailContainer with useQuery * 🔧 Fixed the error check on Library page * 🏗️ Refactoring AcquisitionPanel * 🏗️ Refactoring the AirDC++ Forms * 🦃 Thanksgiving Day bug fixes * ⬆️ Bumped up Vite to 5.0 * 🔧 Refactoring AcquisitionPanel * 🏗️ Wiring up the DC++ search method * 🏗️ Refactoring AirDC++ search method * 🔎 Added some validation to ADC++ Hubs settings form * 🏗️ Fixed the ADC++ search results * 🏗️ Cleanup of the search results pane	2023-11-28 22:54:45 -05:00
Rishi Ghan	ef75dad4e2	Adding zustand and react-query (Settings Page) (#95 ) * 🌊 qBittorrent settings scaffold * 🔧 Added scaffold for the qBittorrent connection form * 🔧 Some refactoring * 🔧 Cleaned up folder structure * 🔧 Fixed broken paths * 🔧 Cleaned up Search and Import component hierarchy * 🔧 More path fixes * 🔧 Tooling changes * 📝 Qbittorrent form scaffold * ⬆️ Bumped @dnd-kit deps * 🧑🏼‍🔧 Fixed the hostname regex * 🏗️ Adding fields to the settings form * 🔧 Formatting and more layout changes * 🔧 Added Prowlarr settings items in JSON * 📝 Purified Card Component * 📝 Abstracted connection form into a component * 🏗️ Reorganized tabs * Migrating from Redux to RTK-query * ⬇️ Fetched qBittorrent settings * 🏗️ Trying out react-query * 🧩 Added react-query query to qBittorrentSettings page * 📝 qbittorrent form RU actions first draft * 🏗️ Added loading state check * 🏗 Added error check state * 🏗️ Refactored AirDCPP context using react-query * 🏗️ Refactoring AirDCPP Settings Form with react-query * 🔧 Removed context * 🔧 Removing context from AirDCPP settings page * 🔧 Fixed early init error on the store * 🐛 Debugging AirDCPP Settings Form page * 🧸 Zustand-ified AirDCPP Form * ❌ AirDCPP code cleaned up from App.tsx * ➕ Re-added yarn.lock	2023-11-07 11:56:29 -06:00
Rishi Ghan	8bebffd95e	🌊 qBittorrent Settings Scaffold (#90 ) * 🌊 qBittorrent settings scaffold * 🔧 Added scaffold for the qBittorrent connection form * 🔧 Some refactoring * 🔧 Cleaned up folder structure * 🔧 Fixed broken paths * 🔧 Cleaned up Search and Import component hierarchy * 🔧 More path fixes * 🔧 Tooling changes * 📝 Qbittorrent form scaffold * ⬆️ Bumped @dnd-kit deps * 🧑🏼‍🔧 Fixed the hostname regex * 🏗️ Adding fields to the settings form * 🔧 Formatting and more layout changes * 🔧 Added Prowlarr settings items in JSON * 📝 Purified Card Component * 📝 Abstracted connection form into a component * 🏗️ Reorganized tabs * Migrating from Redux to RTK-query * ⬇️ Fetched qBittorrent settings * 🏗️ Trying out react-query * 🧩 Added react-query query to qBittorrentSettings page * 📝 qbittorrent form RU actions first draft * 🏗️ Added loading state check * 🏗 Added error check state * 🏗️ Refactored AirDCPP context using react-query * 🏗️ Refactoring AirDCPP Settings Form with react-query * 🔧 Removed context * 🔧 Removing context from AirDCPP settings page * 🔧 Fixed early init error on the store * 🐛 Debugging AirDCPP Settings Form page * 🧸 Zustand-ified AirDCPP Form * ❌ AirDCPP code cleaned up from App.tsx * ➕ Re-added yarn.lock	2023-11-07 11:46:08 -06:00
				`@@ -1 +0,0 @@`
				`export const SUPPORTED_COMIC_ARCHIVES = [".cbz", ".cbr"];`