diff --git a/.gitmodules b/.gitmodules
index 6c6f3eb9..b5d2358c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -8,3 +8,6 @@
 [submodule "components/wifi-manager/UML-State-Machine-in-C"]
 	path = components/wifi-manager/UML-State-Machine-in-C
 	url = https://github.com/kiishor/UML-State-Machine-in-C
+[submodule "components/wifi-manager/webapp/src/bootswatch"]
+	path = components/wifi-manager/webapp/src/bootswatch
+	url = https://github.com/thomaspark/bootswatch.git
diff --git a/CHANGELOG b/CHANGELOG
index e4a3a8c5..1cbb39cb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+2023-10-06
+ - Fix bootswatch bug that caused difficult to read UI ( issue #319)
+
 2023-10-02
  - update cspot
  
diff --git a/components/wifi-manager/webapp/package.json b/components/wifi-manager/webapp/package.json
index d1bbcdbc..1d5ac53e 100644
--- a/components/wifi-manager/webapp/package.json
+++ b/components/wifi-manager/webapp/package.json
@@ -22,7 +22,7 @@
     "babel": "^6.23.0",
     "babel-loader": "^8.2.3",
     "babel-runtime": "^6.26.0",
-    "bootswatch": "^5.1.3",
+    "bootswatch": "file:src/bootswatch",
     "clean-webpack-plugin": "^4.0.0",
     "commander": "^8.3.0",
     "compression-webpack-plugin": "^9.2.0",
@@ -68,7 +68,7 @@
     "typescript": "^4.5.5",
     "webpack": "^5.67.0",
     "webpack-bundle-analyzer": "^4.8.0",
-    "webpack-cli": "^4.9.2",
+    "webpack-cli": "^5.1.4",
     "webpack-dev-server": "^4.7.3"
   },
   "dependencies": {
@@ -76,6 +76,7 @@
     "async-mutex": "^0.3.2",
     "bootstrap": "^5.1.3",
     "jquery": "^3.6.0",
+    "npm": "^10.1.0",
     "popper.js": "^1.16.1",
     "webpack-visualizer-plugin": "^0.1.11",
     "webpack-visualizer-plugin2": "^1.0.0"
diff --git a/components/wifi-manager/webapp/src/bootswatch b/components/wifi-manager/webapp/src/bootswatch
new file mode 160000
index 00000000..3038872b
--- /dev/null
+++ b/components/wifi-manager/webapp/src/bootswatch
@@ -0,0 +1 @@
+Subproject commit 3038872b8389763b64857bac00e102a71251a331