diff --git a/CHANGELOG.md b/CHANGELOG.md
index 48783f3..2e8a8dd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,15 @@
 # Changelog
 
 ## [v1.2.20](https://github.com/hibbitts-design/docsify-open-course-starter-kit/releases/tag/v1.2.20)
-### 10/15/2024
+### 10/17/2024
+
+**Improved:**
+* Updated CSS with word-wrap for code blocks
 
 **Bugfix:**
 * Scroll offset fix (with thanks and appreciation to @rizdaprasetya for the initial code)
 * Added missing Prism language files
+* Fix formatting conflict with Prism formatted code blocks
 
 ## [v1.2.19](https://github.com/hibbitts-design/docsify-open-course-starter-kit/releases/tag/v1.2.19)
 ### 10/09/2024
diff --git a/docs/assets/css/theme.css b/docs/assets/css/theme.css
index e4310a4..52f1376 100644
--- a/docs/assets/css/theme.css
+++ b/docs/assets/css/theme.css
@@ -229,12 +229,18 @@
 }
 
 .markdown-section code {
-  white-space: pre-wrap!important;
-  overflow-wrap: anywhere;
+  white-space: pre-wrap !important;
+  overflow-wrap: break-word;
+}
+
+.markdown-section pre {
+  white-space: pre-wrap !important;
+  overflow-wrap: break-word;
 }
 
 .markdown-section pre code {
-  word-break: break-all!important;
+  white-space: pre-wrap !important;
+  overflow-wrap: break-word;
 }
 
 .markdown-section a {
diff --git a/docs/assets/css/toc.css b/docs/assets/css/toc.css
index 95ca108..3f2772e 100644
--- a/docs/assets/css/toc.css
+++ b/docs/assets/css/toc.css
@@ -16,6 +16,10 @@
   flex-direction: row-reverse;
   justify-content: center;
 }
+/* Specific style for .token.content inside code blocks */
+.content code .token.content {
+  display: inline;
+}
 .markdown-section {
   flex: 1 1 0%;
   margin: 0 48px;