diff --git a/.github/workflows/weekly-release.yml b/.github/workflows/weekly-release.yml
index d6a3983..5b05ce4 100644
--- a/.github/workflows/weekly-release.yml
+++ b/.github/workflows/weekly-release.yml
@@ -31,7 +31,7 @@ jobs:
       - name: Update CHANGELOG.md
         run: |
           today=$(date +'%Y-%m-%d')
-          sed -i "s/unreleased/$today/" CHANGELOG.md
+          sed -i "s/upcoming/$today/" CHANGELOG.md
 
       - name: Commit changes
         run: |
diff --git a/CHANGELOG.md b/CHANGELOG.md
index f44624c..534c1f4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,16 @@
+## 2.0.0 (upcoming)
+
+### Breaking Changes
+
+- Make the Blog List an custom component due to it's complexity
+  - This will allow for more customization and easier maintenance
+  - **Will require extra effort to implement it again** (example provided in the documentation and package file under `custom/BlogListExample.txt`)
+
+- Remove all fallbacks for the old names
+  - `blog-*` -> `article-*`
+  - `no-blog` -> `minimal`
+  - `simple` -> `minimal` (for the layout)
+
 ## 1.6.0 (2024-05-25)
 
 ### Feature(s)
diff --git a/Layout.vue b/Layout.vue
index 60bd5b9..a45ad09 100644
--- a/Layout.vue
+++ b/Layout.vue
@@ -20,7 +20,7 @@ const { site, frontmatter, page } = useData();
       <h1>{{ site.title }}</h1>
     </div>
     <div
-      v-if="frontmatter.layout === 'article' || frontmatter.layout === 'blog'"
+      v-if="frontmatter.layout === 'article'"
     >
       <ArticleHead />
     </div>
@@ -28,16 +28,10 @@ const { site, frontmatter, page } = useData();
     <div v-else :class="frontmatter.pageClass">
       <Content />
     </div>
-    <ArticleList
-      v-if="
-        frontmatter.layout == 'article-list' ||
-        frontmatter.layout == 'blog-list'
-      "
-    />
     <HelpfulLayout
-      v-if="frontmatter.layout == 'helpful' || frontmatter.layout == 'simple'"
+      v-if="frontmatter.layout == 'helpful'"
     />
-    <div v-if="frontmatter.layout == 'article' || frontmatter.layout == 'blog'">
+    <div v-if="frontmatter.layout == 'article'">
       <ArticleFooter />
     </div>
   </main>
diff --git a/README.md b/README.md
index c79ca55..b4cbff1 100644
--- a/README.md
+++ b/README.md
@@ -69,11 +69,11 @@ Now that Aplós is an NPM Package, a release cycle is required. There is a new v
 
 Aplós uses [Semantic Versioning](https://semver.org/), so you can understand the changes by looking at the version number (using the `major.minor.patch` format).
 
-It might be possible that the pre-release versions start as a patch version and end up becoming a minor version (e.g: `2.1.3-1` -> `2.2.0-2`).
+It might be possible that the pre-release versions start as a patch version and end up becoming a minor/major version (e.g: `2.1.3-1` -> `2.2.0-0`) if there are significant changes or breaking changes.
 
 ### 'Next' Tag
 
-The 'next' tag is an nightly version of Aplós, used to test the next version before it is released. Use the 'next' tag if you want to test the next version of Aplós.
+The 'next' tag is version of Aplós, used to test the next version before it is released. Use the 'next' tag if you want to test the next version of Aplós.
 
 You can install the 'next' tag with the following command:
 
diff --git a/custom/ArticleList.scss b/custom/ArticleList.scss
new file mode 100644
index 0000000..3c66410
--- /dev/null
+++ b/custom/ArticleList.scss
@@ -0,0 +1,92 @@
+.article-list {
+	margin: 0 auto;
+}
+
+.post-container {
+	display: grid;
+	grid-template-columns: repeat(auto-fill, minmax(100%, 1fr));
+	gap: 15px;
+
+	@media screen and (max-width: 600px) {
+		grid-template-columns: repeat(auto-fill, minmax(250px, 1fr));
+	}
+
+	.post {
+		transition: transform 0.3s ease;
+		border-radius: 8px;
+		background-color: var(--color-background-second);
+		padding: 20px;
+
+		&:first-child {
+			background-color: var(--color-background-mute);
+		}
+
+		h3 {
+			margin: 0 !important;
+			font-size: 24px;
+
+			a {
+				font-weight: 900;
+			}
+		}
+
+		p {
+			margin: 0;
+			color: var(--color-text);
+			font-weight: 500;
+			text-decoration: none;
+		}
+
+		.date {
+			font-feature-settings: "zero", "tnum", "cv03", "cv02";
+			margin: 5px 0;
+			color: var(--color-text-secondary);
+			font-weight: 600;
+			font-size: 0.9rem;
+		}
+	}
+}
+
+.filter-tags {
+	margin-bottom: 20px;
+
+	#all-tags {
+		background-color: var(--color-accent-alpha);
+		color: var(--color-accent);
+	}
+
+	button {
+		transition: all 0.3s ease;
+		cursor: pointer;
+		margin-right: 10px;
+		margin-bottom: 3px;
+		border-radius: 20px;
+		background-color: var(--color-background-second);
+		padding: 0.25rem 0.75rem;
+		font-size: 0.8rem;
+
+		&:hover {
+			background-color: var(--color-accent-alpha);
+			color: var(--color-accent);
+		}
+
+		&:active {
+			transform: scale(0.8);
+		}
+	}
+}
+
+.tags {
+	margin-top: 10px;
+	text-align: right;
+
+	span {
+		margin-right: 5px;
+		border-radius: 20px;
+		background-color: var(--color-background);
+		padding: 0.15rem 0.45rem;
+		color: var(--color-text-accent);
+		font-weight: 500;
+		font-size: 12px;
+	}
+}
\ No newline at end of file
diff --git a/custom/ArticleListExample.txt b/custom/ArticleListExample.txt
new file mode 100644
index 0000000..b9d6b27
--- /dev/null
+++ b/custom/ArticleListExample.txt
@@ -0,0 +1,66 @@
+<template>
+  <div class="article-list">
+    <noscript>
+      <small>To use the filter you need JavaScript to be enabled.</small>
+    </noscript>
+    <div class="filter-tags">
+      <button @click="filterPosts('')" id="all-tags">All</button>
+      <button v-for="tag in uniqueTags" :key="tag" @click="filterPosts(tag)">
+        <span class="hashtag">#</span>{{ tag }}
+      </button>
+    </div>
+    <div class="post-container">
+      <article v-for="post in filteredPosts" :key="post.title" class="post">
+        <h3>
+          <a
+            :href="`posts/${post.title
+              .toLowerCase()
+              .replace(/\s+/g, '-')}.html`"
+            >{{ post.title }}</a
+          >
+        </h3>
+        <p class="date">{{ post.date }}</p>
+        <p>{{ post.description }}</p>
+        <div class="tags">
+          <span v-if="typeof post.tags === 'string'" :key="post.tags"
+            >#{{ post.tags }}</span
+          >
+          <span v-else v-for="tag in post.tags" :key="tag">#{{ tag }}</span>
+        </div>
+      </article>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import "aplos/custom/ArticleList.scss";
+import { data as posts } from "./posts.data";
+import { computed, ref } from "vue";
+
+const selectedTag = ref(null);
+
+const allTags = computed(() => {
+  return posts.reduce((tags, post) => {
+    return tags.concat(Array.isArray(post.tags) ? post.tags : [post.tags]);
+  }, []);
+});
+
+const uniqueTags = computed(() => {
+  const tags = [...new Set(allTags.value)];
+  return tags.filter((tag) => tag !== "");
+});
+
+const filteredPosts = computed(() => {
+  return selectedTag.value === null
+    ? posts
+    : posts.filter((post) =>
+        Array.isArray(post.tags)
+          ? post.tags.includes(selectedTag.value)
+          : post.tags === selectedTag.value
+      );
+});
+
+function filterPosts(tag: string) {
+  selectedTag.value = tag === "" ? null : tag;
+}
+</script>
\ No newline at end of file
diff --git a/layouts/ArticleList.vue b/layouts/ArticleList.vue
deleted file mode 100644
index 6da61cd..0000000
--- a/layouts/ArticleList.vue
+++ /dev/null
@@ -1,171 +0,0 @@
-<template>
-	<div class="blog-posts">
-		<noscript>
-			<small>To use the filter you need JavaScript to be enabled.</small>
-		</noscript>
-		<div class="filter-tags">
-			<button @click="filterPosts('')" id="all-tags">All</button>
-			<button
-				v-for="tag in uniqueTags"
-				:key="tag"
-				@click="filterPosts(tag)"
-			>
-				<span class="hashtag">#</span>{{ tag }}
-			</button>
-		</div>
-		<div class="post-container">
-			<article
-				v-for="post in filteredPosts"
-				:key="post.title"
-				class="post"
-			>
-				<h3>
-					<a
-						:href="`posts/${post.title
-							.toLowerCase()
-							.replace(/\s+/g, '-')}.html`"
-						>{{ post.title }}</a
-					>
-				</h3>
-				<p class="date">{{ post.date }}</p>
-				<p>{{ post.description }}</p>
-				<div class="tags">
-					<span v-if="typeof post.tags === 'string'" :key="post.tags"
-						>#{{ post.tags }}</span
-					>
-					<span v-else v-for="tag in post.tags" :key="tag"
-						>#{{ tag }}</span
-					>
-				</div>
-			</article>
-		</div>
-	</div>
-</template>
-
-<script setup lang="ts">
-import { ref, computed } from "vue";
-
-import { data as posts } from "../../../../../../pages/.vitepress/theme/posts.data";
-
-const selectedTag = ref(null);
-
-const allTags = computed(() => {
-	return posts.reduce((tags, post) => {
-		return tags.concat(Array.isArray(post.tags) ? post.tags : [post.tags]);
-	}, []);
-});
-
-const uniqueTags = computed(() => {
-	const tags = [...new Set(allTags.value)];
-	return tags.filter((tag) => tag !== "");
-});
-
-const filteredPosts = computed(() => {
-	return selectedTag.value === null
-		? posts
-		: posts.filter((post) =>
-				Array.isArray(post.tags)
-					? post.tags.includes(selectedTag.value)
-					: post.tags === selectedTag.value
-		  );
-});
-
-function filterPosts(tag: string) {
-	selectedTag.value = tag === "" ? null : tag;
-}
-</script>
-
-<style lang="scss">
-.blog-posts {
-	margin: 0 auto;
-}
-
-.post-container {
-	display: grid;
-	grid-template-columns: repeat(auto-fill, minmax(100%, 1fr));
-	gap: 15px;
-
-	@media screen and (max-width: 600px) {
-		grid-template-columns: repeat(auto-fill, minmax(250px, 1fr));
-	}
-
-	.post {
-		transition: transform 0.3s ease;
-		border-radius: 8px;
-		background-color: var(--color-background-second);
-		padding: 20px;
-
-		&:first-child {
-			background-color: var(--color-background-mute);
-		}
-
-		h3 {
-			margin: 0 !important;
-			font-size: 24px;
-
-			a {
-				font-weight: 900;
-			}
-		}
-
-		p {
-			margin: 0;
-			color: var(--color-text);
-			font-weight: 500;
-			text-decoration: none;
-		}
-
-		.date {
-			font-feature-settings: "zero", "tnum", "cv03", "cv02";
-			margin: 5px 0;
-			color: var(--color-text-secondary);
-			font-weight: 600;
-			font-size: 0.9rem;
-		}
-	}
-}
-
-.filter-tags {
-	margin-bottom: 20px;
-
-	#all-tags {
-		background-color: var(--color-accent-alpha);
-		color: var(--color-accent);
-	}
-
-	button {
-		transition: all 0.3s ease;
-		cursor: pointer;
-		margin-right: 10px;
-		margin-bottom: 3px;
-		border-radius: 20px;
-		background-color: var(--color-background-second);
-		padding: 0.25rem 0.75rem;
-		font-size: 0.8rem;
-
-		&:hover {
-			background-color: var(--color-accent-alpha);
-			color: var(--color-accent);
-		}
-
-		&:active {
-			transform: scale(0.8);
-		}
-	}
-}
-
-.tags {
-	margin-top: 10px;
-	text-align: right;
-
-	span {
-		margin-right: 5px;
-		border-radius: 20px;
-		background-color: var(--color-background);
-		padding: 0.15rem 0.45rem;
-		color: var(--color-text-accent);
-		font-weight: 500;
-		font-size: 12px;
-	}
-}
-</style>
diff --git a/minimal/Layout.vue b/minimal/Layout.vue
index bf59315..f3f45fa 100644
--- a/minimal/Layout.vue
+++ b/minimal/Layout.vue
@@ -22,8 +22,7 @@ const { site, frontmatter, page } = useData();
 		</div>
 		<HelpfulLayout
 			v-if="
-				frontmatter.layout == 'helpful' ||
-				frontmatter.layout == 'simple'
+				frontmatter.layout == 'helpful'
 			"
 		/>
 	</main>
diff --git a/no-blog.ts b/no-blog.ts
deleted file mode 100644
index 53d59c4..0000000
--- a/no-blog.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file serves as a fallback for the breaking change of renaming "no-blog" to "minimal".
-// Will be removed in the next major version (v2.0.0).
-import "./minimal.ts";
diff --git a/package.json b/package.json
index 73970ff..65bb01b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aplos",
-  "version": "1.6.0",
+  "version": "2.0.0-0",
   "type": "module",
   "description": "A sleek, contemporary, and purposefully designed VitePress theme",
   "main": "index.ts",