diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2011ff0..81c4432 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -27,6 +27,11 @@ jobs:
           sudo apt install libx11-dev libxcursor-dev libpng-dev
         continue-on-error: false
 
+      - name: Set Up NodeJS 12.x
+      - uses: actions/setup-node@v1
+        with:
+          node-version: "12.x"
+
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
@@ -39,51 +44,44 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-yarn-
 
-      - uses: actions/setup-node@v1
-        with:
-          node-version: "12.x"
-      - run: yarn install
-      - run: yarn render
-
-      - name: Set up Python
+      - name: Set up Python 3.8
         uses: actions/setup-python@v2
         with:
-          python-version: "3.x"
+          python-version: "3.8"
 
-      - name: Cache pip dependencies
-        uses: actions/cache@v2
+      - name: Get pip cache directory path
+        id: pip-cache-dir-path
+        run: echo "::set-output name=dir::$(pip cache dir)"
+
+      - uses: actions/cache@v2
+        id: pip-cache # use this to check for `cache-hit` (`steps.pip-cache.outputs.cache-hit != 'true'`)
         with:
-          # This path is specific to Ubuntu
-          path: ~/.cache/pip
-          # Look to see if there is a cache hit for the corresponding requirements file
-          key: ${{ runner.os }}-pip-${{ hashFiles('requirements.txt') }}
+          path: ${{ steps.pip-cache-dir-path.outputs.dir }}
+          key: ${{ runner.os }}-pip-${{ hashFiles('**/setup.py') }}
           restore-keys: |
             ${{ runner.os }}-pip-
-            ${{ runner.os }}-
-
-      - name: Install pip dependencies
-        run: |
-          python -m pip install --upgrade pip
-          if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
-        continue-on-error: false
 
       - name: Generating `macOSBigSur` Cursor Theme
-        run: python build.py
+        run: make
 
       - name: Compressing Artifacts
         run: |
-          tar -cvzf logs.tar.gz build.log
-          tar -cvzf bitmaps.tar.gz bitmaps
-          tar -cvzf macOSBigSur.tar.gz themes
+          tar -cvzf macOSBigSur.tar.gz themes/macOSBigSur
 
       - name: Uploading `bitmaps` artifact
         uses: actions/upload-artifact@v2
         with:
-          name: bitmaps
-          path: bitmaps.tar.gz
+          name: bitmaps/*
+          path: bitmaps
 
-      - name: Uploading `macOSBigSur` Theme artifact
+      - name: Uploading `macOSBigSur` UNIX Theme artifact
         uses: actions/upload-artifact@v2
         with:
           name: macOSBigSur
           path: macOSBigSur.tar.gz
+
+      - name: Uploading `macOSBigSur` Windows Theme artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: macOSBigSur_Windows
+          path: themes/macOSBigSur_Windows/*
diff --git a/.gitignore b/.gitignore
index 9409a67..586d00a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 ########## Custom
-pngs
+bitmaps
 themes
 builder/files.txt
 
diff --git a/Makefile b/Makefile
index 7f2010d..817b625 100644
--- a/Makefile
+++ b/Makefile
@@ -9,21 +9,21 @@ root_dest := $(root)/$(theme)
 
 all: clean render build
 
-unix: clean render pngs
+unix: clean render bitmaps
 	@cd builder && make build_unix
 
-windows: clean render pngs
+windows: clean render bitmaps
 	@cd builder && make build_windows
 
 .PHONY: all
 
 clean:
-	@rm -rf pngs themes
+	@rm -rf bitmaps themes
 	
-render: bitmap svg
-	@cd bitmap && $(MAKE)
+render: bitmapper svg
+	@cd bitmapper && $(MAKE)
 
-build: pngs
+build: bitmaps
 	@cd builder && $(MAKE)
 
 .ONESHELL:
diff --git a/bitmap/Makefile b/bitmapper/Makefile
similarity index 100%
rename from bitmap/Makefile
rename to bitmapper/Makefile
diff --git a/bitmap/package.json b/bitmapper/package.json
similarity index 90%
rename from bitmap/package.json
rename to bitmapper/package.json
index c6178db..f4f7051 100644
--- a/bitmap/package.json
+++ b/bitmapper/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "apple_cursor_bitmap",
-  "version": "1.0.7",
+  "name": "apple_cursor_bitmapper",
+  "version": "1.0.8",
   "main": "index.js",
   "scripts": {
     "watch": "nodemon --inspect src/index.ts",
diff --git a/bitmap/src/config.ts b/bitmapper/src/config.ts
similarity index 92%
rename from bitmap/src/config.ts
rename to bitmapper/src/config.ts
index b4d523f..6ab4744 100644
--- a/bitmap/src/config.ts
+++ b/bitmapper/src/config.ts
@@ -4,7 +4,7 @@ import { readdirSync, existsSync } from "fs";
 // Directory resolve
 const projectRoot = path.resolve(__dirname, "../../");
 
-const outDir = path.resolve(projectRoot, "pngs");
+const outDir = path.resolve(projectRoot, "bitmaps");
 const staticSvgDir = path.resolve(projectRoot, "svg", "static");
 const animatedSvgDir = path.resolve(projectRoot, "svg", "animated");
 
diff --git a/bitmap/src/index.ts b/bitmapper/src/index.ts
similarity index 100%
rename from bitmap/src/index.ts
rename to bitmapper/src/index.ts
diff --git a/bitmap/src/utils/getFrameName.ts b/bitmapper/src/utils/getFrameName.ts
similarity index 100%
rename from bitmap/src/utils/getFrameName.ts
rename to bitmapper/src/utils/getFrameName.ts
diff --git a/bitmap/src/utils/toHTML.ts b/bitmapper/src/utils/toHTML.ts
similarity index 100%
rename from bitmap/src/utils/toHTML.ts
rename to bitmapper/src/utils/toHTML.ts
diff --git a/bitmap/tsconfig.json b/bitmapper/tsconfig.json
similarity index 100%
rename from bitmap/tsconfig.json
rename to bitmapper/tsconfig.json
diff --git a/bitmap/yarn.lock b/bitmapper/yarn.lock
similarity index 100%
rename from bitmap/yarn.lock
rename to bitmapper/yarn.lock
diff --git a/builder/build.py b/builder/build.py
index 23a7f21..726c7cc 100644
--- a/builder/build.py
+++ b/builder/build.py
@@ -29,7 +29,7 @@ parser.add_argument(
     dest="png_dir",
     metavar="PNG",
     type=str,
-    default="../pngs",
+    default="../bitmaps",
     help="To change pngs directory. (default: %(default)s)",
 )