diff --git a/src/components/generic/Button.astro b/src/components/generic/Button.astro
new file mode 100644
index 0000000..033f996
--- /dev/null
+++ b/src/components/generic/Button.astro
@@ -0,0 +1,53 @@
+---
+const {
+    // Primary Options
+    Icon,
+    Link,
+
+    // Style
+    Color = "white",
+    Background = "#222222",
+    BorderColor = "#222222",
+    BorderWidth = "1px",
+    BorderRadius = "4px",
+
+    // Optionals Options
+    Target = "_self",
+    Onclick = "null",
+} = Astro.props
+---
+
+<a 
+    href={Link}
+    target={Target}
+    onclick={Onclick}
+    class="generic-button"
+    style={
+           '  color: '             + Color
+         + '; background: '      + Background
+         + '; border-color: '    + BorderColor
+         + '; border-width: '     + BorderWidth
+         + '; border-radius: '     + BorderRadius
+    }
+    >
+    <slot/>
+</a>
+
+<style lang="scss" is:global>
+.generic-button {
+    display: flex;
+    align-items: center;
+    gap: 6px;
+    padding-right: 12px;
+    border-style: solid;
+    text-decoration: none;
+    max-width: max-content;
+    svg {
+        background: rgba(255,255,255,0.1);
+        border-radius: 4px 0px 0px 4px;
+        padding: 6px;
+        margin: -1px;
+        margin-right: 6px;
+    }
+}
+</style>
\ No newline at end of file
diff --git a/src/components/generic/PageTitle.astro b/src/components/generic/PageTitle.astro
new file mode 100644
index 0000000..d3d6033
--- /dev/null
+++ b/src/components/generic/PageTitle.astro
@@ -0,0 +1,8 @@
+---
+const {
+    Text,
+    Align = "left"
+} = Astro.props
+---
+
+<h1 style={'text-align: ' + Align} class="page-title">{Text}</h1>
\ No newline at end of file