diff --git a/src/main/kotlin/com/lambda/client/module/modules/client/Baritone.kt b/src/main/kotlin/com/lambda/client/module/modules/client/Baritone.kt
index b4e5ea52a..e7f46d785 100644
--- a/src/main/kotlin/com/lambda/client/module/modules/client/Baritone.kt
+++ b/src/main/kotlin/com/lambda/client/module/modules/client/Baritone.kt
@@ -19,22 +19,54 @@ object Baritone : Module(
     showOnArray = false,
     alwaysEnabled = true
 ) {
-    private val showOnRadar by setting("Show Path on Radar", true, description = "Show the current path on radar.")
-    private val color by setting("Path Color", ColorHolder(32, 250, 32), visibility = { showOnRadar })
-    private val allowBreak by setting("Allow Break", true)
-    private val allowSprint by setting("Allow Sprint", true)
-    private val allowPlace by setting("Allow Place", true)
-    private val allowInventory by setting("Allow Inventory", false)
-    private val freeLook by setting("Free Look", true)
-    private val allowWaterBucketFall by setting("Water bucket clutch", true, description = "Uses a water bucket to get down quickly.")
-    private val maxFallHeightBucket by setting("Max bucket height", 20, 5..255, 5, { allowWaterBucketFall }, description = "Max height that baritone can use a water bucket.")
-    private val allowDownwardTunneling by setting("Downward Tunneling", true)
-    private val allowParkour by setting("Allow Parkour", true)
-    private val allowParkourPlace by setting("Allow Parkour Place", true)
-    private val avoidPortals by setting("Avoid Portals", false)
-    private val renderGoal by setting("Render Goals", true)
-    private val failureTimeout by setting("Fail Timeout", 2, 1..20, 1, unit = "s")
-    private val blockReachDistance by setting("Reach Distance", 4.5f, 1.0f..10.0f, 0.5f)
+    /*
+     * Baritone variables can be found here.
+     * https://github.com/cabaletta/baritone/blob/master/src/api/java/baritone/api/Settings.java
+     */
+
+    private val page by setting("Page", Page.BASIC)
+
+    /* Basic */
+    private val allowBreak by setting("Allow Break", true, { page == Page.BASIC }, description = "Allow Baritone to break blocks.")
+    private val allowPlace by setting("Allow Place", true, { page == Page.BASIC }, description = "Allow Baritone to place blocks.")
+    private val allowSprint by setting("Allow Sprint", true, { page == Page.BASIC }, description = "Allow Baritone to sprint.")
+    private val allowInventory by setting("Allow Inventory", false, { page == Page.BASIC }, description = "Allow Baritone to move items in your inventory to your hotbar.")
+    private val allowDownwardTunneling by setting("Downward Tunneling", true, { page == Page.BASIC }, description = "Allow mining blocks directly beneath you.")
+    private val allowParkour by setting("Allow Parkour", true, { page == Page.BASIC })
+    private val allowParkourPlace by setting("Allow Parkour Place", true, { allowParkour && page == Page.BASIC })
+    private val buildInLayers by setting("Build In Layers", false, { page == Page.BASIC }, description = "Build/mine one layer at a time in schematics and selections.")
+    private val layerOrder by setting("Top To Bottom", false, { buildInLayers && page == Page.BASIC }, description = "Build/mine from top to bottom in schematics and selections.")
+
+    /* Visual */
+    private val freeLook by setting("Free Look", true, { page == Page.VISUAL }, description = "Move without having to force the client-sided rotations.")
+    private val renderGoal by setting("Render Goals", true, { page == Page.VISUAL }, description = "Render the goal.")
+    private val censorCoordinates by setting("Censor Coordinates", false, { page == Page.VISUAL }, description = "Censor coordinates in goals and block positions.")
+    private val censorRanCommands by setting("Censor RanCommands", false, { page == Page.VISUAL }, description = "Censor arguments to ran commands, to hide, for example, coordinates to #goal.")
+    private val showOnRadar by setting("Show Path on Radar", true, { page == Page.VISUAL }, description = "Show the current path on radar.")
+    private val color by setting("Path Color", ColorHolder(32, 250, 32), visibility = { showOnRadar && page == Page.VISUAL }, description = "Path color for the radar.")
+
+    /* Fall */
+    private val maxFallHeightNoWater by setting("Max Fall Height", 3, 3..5, 1, { page == Page.FALL }, description = "Distance baritone can fall without water.")
+    private val allowWaterBucketFall by setting("Water Bucket Clutch", true, { page == Page.FALL }, description = "Uses a water bucket to get down quickly.")
+    private val maxFallHeightBucket by setting("Max Bucket Height", 20, 10..250, 10, { allowWaterBucketFall && page == Page.FALL }, description = "Max height that baritone can use a water bucket.")
+
+    /* Advanced */
+    private val blockReachDistance by setting("Reach Distance", 4.5f, 1.0f..10.0f, 0.5f, { page == Page.ADVANCED }, description = "Max distance baritone can place blocks.")
+    private val enterPortals by setting("Enter Portals", true, { page == Page.ADVANCED }, description = "Baritone will walk all the way into the portal, instead of stopping one block before.")
+    private val blockPlacementPenalty by setting("Block Placement Penalty", 20, 0..40, 5, { page == Page.ADVANCED }, description = "Decrease to make Baritone more often consider paths that would require placing blocks.")
+    private val blockBreakAdditionalPenalty by setting("Block Break Additional Penalty", 2, 0..10, 1, { page == Page.ADVANCED }, description = "Lower chance to break blocks. This is a tiebreaker.")
+    private val jumpPenalty by setting("Jump Penalty", 2, 0..10, 1, { page == Page.ADVANCED }, description = "Additional penalty for hitting the space bar (ascend, pillar, or parkour) because it uses hunger.")
+    private val assumeWalkOnWater by setting("Assume Walk On Water", false, { page == Page.ADVANCED }, description = "Allow Baritone to assume it can walk on still water just like any other block. Requires jesus to be enabled.")
+    private val failureTimeout by setting("Fail Timeout", 2, 1..20, 1, { page == Page.ADVANCED }, unit = "s")
+    private val avoidance by setting("Avoidance", false, { page == Page.ADVANCED }, description = "Enables the 4 avoidance settings. It's disabled by default because of the noticeable performance impact.")
+    private val mobAvoidanceRadius by setting("Mob Avoidance Radius", 15, 0..65, 5, visibility = { avoidance && page == Page.ADVANCED }, description = "Distance to avoid mobs.")
+    private val mobAvoidanceCoefficient by setting("Mob Avoidance Coefficient", 1.5f, 0f..5f, 0.5f, visibility = { avoidance && page == Page.ADVANCED }, description = "Set to 1.0 to effectively disable this feature. Set below 1.0 to go out of your way to walk near mobs.")
+    private val mobSpawnerAvoidanceRadius by setting("Mob Spawner Avoidance Radius", 10, 0..60, 10, visibility = { avoidance && page == Page.ADVANCED }, description = "Distance to avoid mob spawners.")
+    private val mobSpawnerAvoidanceCoefficient by setting("Mob Spawner Avoidance Coefficient", 1.5f, 0f..5f, 0.5f, visibility = { avoidance && page == Page.ADVANCED }, description = "Set to 1.0 to effectively disable this feature. Set below 1.0 to go out of your way to walk near mob spawners.")
+
+    private enum class Page {
+        BASIC, VISUAL, FALL, ADVANCED
+    }
 
     init {
         settingList.forEach {
@@ -72,20 +104,38 @@ object Baritone : Module(
     private fun sync() {
         BaritoneUtils.settings?.let {
             it.chatControl.value = false // enable chatControlAnyway if you want to use it
+            /* Basic */
             it.allowBreak.value = allowBreak
-            it.allowSprint.value = allowSprint
             it.allowPlace.value = allowPlace
+            it.allowSprint.value = allowSprint
             it.allowInventory.value = allowInventory
-            it.freeLook.value = freeLook
-            it.allowWaterBucketFall.value = allowWaterBucketFall
-            it.maxFallHeightBucket.value = maxFallHeightBucket
             it.allowDownward.value = allowDownwardTunneling
             it.allowParkour.value = allowParkour
             it.allowParkourPlace.value = allowParkourPlace
-            it.enterPortal.value = !avoidPortals
+            it.buildInLayers.value = buildInLayers
+            it.layerOrder.value = layerOrder
+            /* Visual */
+            it.freeLook.value = freeLook
             it.renderGoal.value = renderGoal
-            it.failureTimeoutMS.value = failureTimeout * 1000L
+            it.censorCoordinates.value = censorCoordinates
+            it.censorRanCommands.value = censorRanCommands
+            /* Fall */
+            it.maxFallHeightNoWater.value = maxFallHeightNoWater
+            it.allowWaterBucketFall.value = allowWaterBucketFall
+            it.maxFallHeightBucket.value = maxFallHeightBucket
+            /* Advanced */
             it.blockReachDistance.value = blockReachDistance
+            it.enterPortal.value = enterPortals
+            it.blockPlacementPenalty.value = blockPlacementPenalty.toDouble()
+            it.blockBreakAdditionalPenalty.value = blockBreakAdditionalPenalty.toDouble()
+            it.jumpPenalty.value = jumpPenalty.toDouble()
+            it.assumeWalkOnWater.value = assumeWalkOnWater
+            it.failureTimeoutMS.value = failureTimeout * 1000L
+            it.avoidance.value = avoidance
+            it.mobAvoidanceRadius.value = mobAvoidanceRadius
+            it.mobAvoidanceCoefficient.value = mobAvoidanceCoefficient.toDouble()
+            it.mobSpawnerAvoidanceRadius.value = mobSpawnerAvoidanceRadius
+            it.mobSpawnerAvoidanceCoefficient.value = mobSpawnerAvoidanceCoefficient.toDouble()
         }
     }
 }