diff --git a/build.gradle b/build.gradle
index bcd41e5..84dfb8d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,9 +13,9 @@ apply plugin: 'net.minecraftforge.gradle'
 apply plugin: 'eclipse'
 apply plugin: 'maven-publish'
 
-version = '0.1-1.16.4-alpha'
-group = 'markil3.immersive_hud' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
-archivesBaseName = 'immersive_hud'
+archivesBaseName = project.archives_base_name
+version = project.mod_version + "-" + project.minecraft_version + "-forge"
+group = project.maven_group // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 
 sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
 
@@ -26,7 +26,7 @@ minecraft {
     // stable_#            Stables are built at the discretion of the MCP team.
     // Use non-default mappings at your own risk. they may not always work.
     // Simply re-run your setup task after changing the mappings to update your workspace.
-    mappings channel: 'snapshot', version: '20201028-1.16.3'
+    mappings channel: 'snapshot', version: project.mappings
     // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
     
     // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
@@ -94,7 +94,7 @@ dependencies {
     // Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed
     // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied.
     // The userdev artifact is a special name and will get all sorts of transformations applied to it.
-    minecraft 'net.minecraftforge:forge:1.16.4-35.1.37'
+    minecraft "net.minecraftforge:forge:${project.minecraft_version}-${project.forge_version}"
 
     // You may put jars on which you depend on in ./libs or you may define them like so..
     // compile "some.group:artifact:version:classifier"
@@ -116,13 +116,22 @@ dependencies {
 
 }
 
+task sourcesJar(type: Jar, dependsOn: classes) {
+    classifier = 'sources'
+    from sourceSets.main.allSource
+}
+
+artifacts {
+    archives sourcesJar
+}
+
 // Example for how to get properties into the manifest for reading by the runtime..
 jar {
     manifest {
         attributes([
-            "Specification-Title": "immersive_hud",
+            "Specification-Title": project.archivesBaseName,
             "Specification-Vendor": "Markil 3",
-            "Specification-Version": "0.1-alpha", // We are version 1 of ourselves
+            "Specification-Version": project.version,
             "Implementation-Title": project.name,
             "Implementation-Version": "${version}",
             "Implementation-Vendor" :"Markil 3",
diff --git a/gradle.properties b/gradle.properties
index 878bf1f..dae7e30 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,14 @@
 # Sets default memory used for gradle commands. Can be overridden by user or command line properties.
 # This is required to provide enough memory for the Minecraft decompilation process.
 org.gradle.jvmargs=-Xmx3G
-org.gradle.daemon=false
\ No newline at end of file
+org.gradle.daemon=false
+
+# Forge Properties
+minecraft_version=1.16.4
+mappings=20201028-1.16.3
+forge_version=35.1.37
+
+# Mod Properties
+mod_version = 0.1
+maven_group = markil3
+archives_base_name = immersive_hud
\ No newline at end of file
diff --git a/src/main/java/markil3/immersive_hud/EventBus.java b/src/main/java/markil3/immersive_hud/EventBus.java
index 29a445a..8201399 100644
--- a/src/main/java/markil3/immersive_hud/EventBus.java
+++ b/src/main/java/markil3/immersive_hud/EventBus.java
@@ -55,7 +55,7 @@ import java.util.Optional;
  * Contains the logic for changing the HUD.
  *
  * @author Markil 3
- * @version 0.1
+ * @version 0.1-1.16.4-forge
  */
 @Mod.EventBusSubscriber(Dist.CLIENT)
 public class EventBus
diff --git a/src/main/java/markil3/immersive_hud/Main.java b/src/main/java/markil3/immersive_hud/Main.java
index 8b4b563..7e936c0 100644
--- a/src/main/java/markil3/immersive_hud/Main.java
+++ b/src/main/java/markil3/immersive_hud/Main.java
@@ -1,20 +1,19 @@
 /**
  * This Minecraft mod aims to move the ingame HUD out of the way whenever
- * possible.
- * Copyright (C) 2021 Markil 3
- * 
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ * possible. Copyright (C) 2021 Markil 3
+ * <p>
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.
+ * <p>
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ * <p>
+ * You should have received a copy of the GNU General Public License along with
+ * this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 package markil3.immersive_hud;
 
@@ -29,22 +28,25 @@ import org.apache.logging.log4j.Logger;
 
 /**
  * The main entry point for the Immersive HUD mod.
+ *
+ * @author Markil 3
+ * @version 0.1-1.16.4-forge
  */
 @Mod("immersive_hud")
 public class Main
 {
-/**
- * Class logger.
- */
-private static final Logger LOGGER = LogManager.getLogger();
+    /**
+     * Class logger.
+     */
+    private static final Logger LOGGER = LogManager.getLogger();
 
-public Main()
-{
-//Make sure the mod being absent on the other network side does not
-// cause the client to display the server as incompatible
-ModLoadingContext.get()
-.registerExtensionPoint(ExtensionPoint.DISPLAYTEST, () -> Pair
-.of(() -> FMLNetworkConstants.IGNORESERVERONLY,
-(a, b) -> true));
-}
+    public Main()
+    {
+        //Make sure the mod being absent on the other network side does not
+        // cause the client to display the server as incompatible
+        ModLoadingContext.get()
+                .registerExtensionPoint(ExtensionPoint.DISPLAYTEST, () -> Pair
+                        .of(() -> FMLNetworkConstants.IGNORESERVERONLY,
+                                (a, b) -> true));
+    }
 }
diff --git a/src/main/java/markil3/immersive_hud/RenderUtils.java b/src/main/java/markil3/immersive_hud/RenderUtils.java
index 50fb4d4..8116411 100644
--- a/src/main/java/markil3/immersive_hud/RenderUtils.java
+++ b/src/main/java/markil3/immersive_hud/RenderUtils.java
@@ -47,6 +47,7 @@ import net.minecraft.world.World;
  *
  * @author Mojang Studios
  * @author Markil 3
+ * @version 0.1-1.16.4-forge
  */
 public class RenderUtils
 {