diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 3c8f55e..a7c0aa7 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -12,7 +12,7 @@ jobs:
       matrix:
         # Use these Java versions
         java: [
-          16,  # Minimum supported by Minecraft
+          17,  # Minimum supported by Minecraft
         ]
         # and run on both Linux and Windows
         os: [ubuntu-20.04, windows-latest]
diff --git a/README.md b/README.md
index 400d523..142148d 100644
--- a/README.md
+++ b/README.md
@@ -8,20 +8,45 @@
 
 This mod|Minecraft|[Fabric API](https://www.curseforge.com/minecraft/mc-mods/fabric-api/files)|[Mod Menu](https://www.curseforge.com/minecraft/mc-mods/modmenu/files) (optional)
 --|--|--|--
-1.16.5-1.1.0 |1.16.5|0.34.2+1.16+|1.16.9+
-1.17-1.1.1 |1.17|0.34.9+1.17+|2.0.0-beta.7+
-1.17-1.1.1 |1.17.1|0.34.9+1.17+|2.0.2
+**1.18.1-1.3.0**|1.18.x|0.44.0+1.18|3.0.0
 1.17.1-1.2.1|1.17.1|0.41.0+1.17|2.0.14
+1.17-1.1.1 |1.17.1|0.34.9+1.17+|2.0.2
+1.17-1.1.1 |1.17|0.34.9+1.17+|2.0.0-beta.7+
+1.16.5-1.1.0 |1.16.5|0.34.2+1.16+|1.16.9+
 
-## Usage
+<hr/> 
 
-- Press `H` to open menu
-- Press `B` to beam location
-- Press `N` to lock beaming
-- Select `SAVE` to save the coordinate
-- Select `PING` to ping the coordinate to other players
-- Select `LIST` to view saved coordinates
-- Select `CONF` to update configs. Reachable through mod menu as well when available
+## Saving a new coordinate
+
+- Press `H` to open menu to save a coordinate. 
+- You can manually enter the coordinates and change the dimension by clicking on the text below the current dimension icon.
+- Provide a world name and some description.
+- Select <img src="src/main/resources/assets/savecoords/textures/gui/ping.png" /> to ping the coordinate to other players.
+- Select `SAVE` to save the coordinate.
+
+<hr/> 
+
+## Managing coordinates
+
+- Press `J` or select `LIST` to open the list of coordinates.
+- Select <img src="src/main/resources/assets/savecoords/textures/gui/ping.png" /> in list view to ping that coordinate to other players.
+- Select <img src="src/main/resources/assets/savecoords/textures/gui/convert.png" /> to convert the coordinate to nether (or vice versa)
+
+<hr/>
+
+## Broadcasting current location
+
+- Press `B` to broadcast current location
+- Press `N` to lock broadcasting current location
+
+<hr/>
+
+## Configs
+
+- Select `CONF` in any window to update configs. 
+- This is reachable through mod menu as well when available.
+
+<hr/>
 
 ## Discord
 
diff --git a/build.gradle b/build.gradle
index ab622a1..43b5b4b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,10 +1,10 @@
 plugins {
-    id 'fabric-loom' version '0.8-SNAPSHOT'
+    id 'fabric-loom' version '0.10-SNAPSHOT'
     id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_16
-targetCompatibility = JavaVersion.VERSION_16
+sourceCompatibility = JavaVersion.VERSION_17
+targetCompatibility = JavaVersion.VERSION_17
 
 archivesBaseName = project.archives_base_name
 version = project.mod_version
@@ -55,6 +55,9 @@ tasks.withType(JavaCompile).configureEach {
     // see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
     // If Javadoc is generated, this must be specified in that task too.
     it.options.encoding = "UTF-8"
+    
+    // Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
+	it.options.release = 17
 }
 
 java {
diff --git a/gradle.properties b/gradle.properties
index 808236a..1f62723 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -3,21 +3,21 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
     # check these on https://fabricmc.net/use
-    minecraft_version=1.17.1
-    yarn_mappings=1.17.1+build.63
-    loader_version=0.11.7
+    minecraft_version=1.18.1
+    yarn_mappings=1.18.1+build.1
+    loader_version=0.12.12
 
 # Mod Properties
-    mod_version = 1.17.1-1.2.1
+    mod_version = 1.18.1-1.3.0
     maven_group = me.neophyte.mods.savecoords
     archives_base_name = save-coordinates
 
 # Dependencies
     # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-    fabric_version=0.41.0+1.17
+    fabric_version=0.44.0+1.18
 
     # https://github.com/CottonMC/LibGui/wiki/Setup
-    libgui_version=4.2.1+1.17.1
+    libgui_version=5.1.0+1.18
 
     #https://maven.terraformersmc.com/releases/com/terraformersmc/modmenu/
-    modmenu_version=2.0.14
+    modmenu_version=3.0.0
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0f80bbf..84d1f85 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index caa253d..5bfbf57 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -27,8 +27,8 @@
     "depends": {
         "fabricloader": ">=0.11.3",
         "fabric": "*",
-        "minecraft": "1.17.1",
-        "java": ">=16"
+        "minecraft": "1.18.x",
+        "java": ">=17"
     },
     "suggests": {
         "another-mod": "modmenu"