diff --git a/src/main/java/de/bixilon/minosoft/Minosoft.kt b/src/main/java/de/bixilon/minosoft/Minosoft.kt
index 9f0023bd6..224e14ed3 100644
--- a/src/main/java/de/bixilon/minosoft/Minosoft.kt
+++ b/src/main/java/de/bixilon/minosoft/Minosoft.kt
@@ -14,7 +14,7 @@
 package de.bixilon.minosoft
 
 import de.bixilon.minosoft.config.profile.GlobalProfileManager
-import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateLWatcher.Companion.profileWatch
+import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateWatcher.Companion.profileWatch
 import de.bixilon.minosoft.config.profile.profiles.eros.ErosProfileManager
 import de.bixilon.minosoft.data.assets.JarAssetsManager
 import de.bixilon.minosoft.data.assets.Resources
diff --git a/src/main/java/de/bixilon/minosoft/config/profile/delegate/ProfilesDelegateManager.kt b/src/main/java/de/bixilon/minosoft/config/profile/delegate/ProfilesDelegateManager.kt
index 92eb2c0dd..41de74a97 100644
--- a/src/main/java/de/bixilon/minosoft/config/profile/delegate/ProfilesDelegateManager.kt
+++ b/src/main/java/de/bixilon/minosoft/config/profile/delegate/ProfilesDelegateManager.kt
@@ -9,17 +9,16 @@ import de.bixilon.minosoft.util.KUtil.toSynchronizedSet
 import de.bixilon.minosoft.util.KUtil.unsafeCast
 import de.bixilon.minosoft.util.collections.SynchronizedMap
 import java.lang.ref.WeakReference
-import java.lang.reflect.Field
 
 object ProfilesDelegateManager {
-    private val listeners: SynchronizedMap<Field, SynchronizedMap<Profile?, MutableSet<Pair<WeakReference<Any>, ProfileDelegateWatcher<Any>>>>> = synchronizedMapOf()
+    private val listeners: SynchronizedMap<String, SynchronizedMap<Profile?, MutableSet<Pair<WeakReference<Any>, ProfileDelegateWatcher<Any>>>>> = synchronizedMapOf()
 
     fun <T> register(reference: Any, listener: ProfileDelegateWatcher<T>) {
-        this.listeners.getOrPut(listener.field) { synchronizedMapOf() }.getOrPut(listener.profile) { synchronizedSetOf() }.add(Pair(WeakReference(reference), listener.unsafeCast()))
+        this.listeners.getOrPut(listener.fieldIdentifier) { synchronizedMapOf() }.getOrPut(listener.profile) { synchronizedSetOf() }.add(Pair(WeakReference(reference), listener.unsafeCast()))
     }
 
-    fun onChange(profile: Profile, field: Field, previous: Any?, value: Any?) {
-        val fieldListeners = listeners[field] ?: return
+    fun onChange(profile: Profile, fieldIdentifier: String, previous: Any?, value: Any?) {
+        val fieldListeners = listeners[fieldIdentifier] ?: return
 
         fun work(queue: MutableSet<Pair<WeakReference<Any>, ProfileDelegateWatcher<Any>>>) {
             val toRemove: MutableSet<Pair<WeakReference<Any>, ProfileDelegateWatcher<Any>>> = mutableSetOf()
diff --git a/src/main/java/de/bixilon/minosoft/config/profile/delegate/delegate/BackingDelegate.kt b/src/main/java/de/bixilon/minosoft/config/profile/delegate/delegate/BackingDelegate.kt
index e7019881f..d101977ab 100644
--- a/src/main/java/de/bixilon/minosoft/config/profile/delegate/delegate/BackingDelegate.kt
+++ b/src/main/java/de/bixilon/minosoft/config/profile/delegate/delegate/BackingDelegate.kt
@@ -4,13 +4,13 @@ import de.bixilon.minosoft.config.StaticConfiguration
 import de.bixilon.minosoft.config.profile.ProfileManager
 import de.bixilon.minosoft.config.profile.delegate.ProfilesDelegateManager
 import de.bixilon.minosoft.config.profile.profiles.Profile
+import de.bixilon.minosoft.util.delegate.DelegateManager.identifier
 import de.bixilon.minosoft.util.delegate.delegate.DelegateSetter
 import de.bixilon.minosoft.util.logging.Log
 import de.bixilon.minosoft.util.logging.LogLevels
 import de.bixilon.minosoft.util.logging.LogMessageType
 import kotlin.properties.ReadWriteProperty
 import kotlin.reflect.KProperty
-import kotlin.reflect.jvm.javaField
 
 abstract class BackingDelegate<V>(
     private val profileManager: ProfileManager<*>,
@@ -45,6 +45,6 @@ abstract class BackingDelegate<V>(
         }
         set(value)
 
-        ProfilesDelegateManager.onChange(profile, property.javaField ?: return, previous, value)
+        ProfilesDelegateManager.onChange(profile, property.identifier, previous, value)
     }
 }
diff --git a/src/main/java/de/bixilon/minosoft/config/profile/delegate/delegate/entry/ListDelegateProfile.kt b/src/main/java/de/bixilon/minosoft/config/profile/delegate/delegate/entry/ListDelegateProfile.kt
index 3e8cb8f47..281814fef 100644
--- a/src/main/java/de/bixilon/minosoft/config/profile/delegate/delegate/entry/ListDelegateProfile.kt
+++ b/src/main/java/de/bixilon/minosoft/config/profile/delegate/delegate/entry/ListDelegateProfile.kt
@@ -3,13 +3,13 @@ package de.bixilon.minosoft.config.profile.delegate.delegate.entry
 import de.bixilon.minosoft.config.StaticConfiguration
 import de.bixilon.minosoft.config.profile.ProfileManager
 import de.bixilon.minosoft.config.profile.delegate.ProfilesDelegateManager
+import de.bixilon.minosoft.util.delegate.DelegateManager.identifier
 import de.bixilon.minosoft.util.logging.Log
 import de.bixilon.minosoft.util.logging.LogLevels
 import de.bixilon.minosoft.util.logging.LogMessageType
 import javafx.collections.FXCollections
 import javafx.collections.ListChangeListener
 import javafx.collections.ObservableList
-import kotlin.reflect.jvm.javaField
 
 open class ListDelegateProfile<V>(
     private var value: ObservableList<V>,
@@ -37,7 +37,7 @@ open class ListDelegateProfile<V>(
                 profileManager.profiles[profileName]?.saved = false
             }
 
-            ProfilesDelegateManager.onChange(profile, property.javaField ?: return@ListChangeListener, null, it)
+            ProfilesDelegateManager.onChange(profile, property.identifier, null, it)
         })
     }
 
diff --git a/src/main/java/de/bixilon/minosoft/config/profile/delegate/delegate/entry/MapDelegateProfile.kt b/src/main/java/de/bixilon/minosoft/config/profile/delegate/delegate/entry/MapDelegateProfile.kt
index b8bf68bf1..34001c190 100644
--- a/src/main/java/de/bixilon/minosoft/config/profile/delegate/delegate/entry/MapDelegateProfile.kt
+++ b/src/main/java/de/bixilon/minosoft/config/profile/delegate/delegate/entry/MapDelegateProfile.kt
@@ -3,6 +3,7 @@ package de.bixilon.minosoft.config.profile.delegate.delegate.entry
 import de.bixilon.minosoft.config.StaticConfiguration
 import de.bixilon.minosoft.config.profile.ProfileManager
 import de.bixilon.minosoft.config.profile.delegate.ProfilesDelegateManager
+import de.bixilon.minosoft.util.delegate.DelegateManager.identifier
 import de.bixilon.minosoft.util.logging.Log
 import de.bixilon.minosoft.util.logging.LogLevels
 import de.bixilon.minosoft.util.logging.LogMessageType
@@ -10,7 +11,6 @@ import javafx.collections.FXCollections
 import javafx.collections.MapChangeListener
 import javafx.collections.ObservableMap
 import kotlin.reflect.KProperty
-import kotlin.reflect.jvm.javaField
 
 open class MapDelegateProfile<K, V>(
     private var value: ObservableMap<K, V>,
@@ -41,7 +41,7 @@ open class MapDelegateProfile<K, V>(
                 profileManager.profiles[profileName]?.saved = false
             }
 
-            ProfilesDelegateManager.onChange(profile, property.javaField ?: return@MapChangeListener, null, it)
+            ProfilesDelegateManager.onChange(profile, property.identifier, null, it)
         })
     }
 
diff --git a/src/main/java/de/bixilon/minosoft/config/profile/delegate/delegate/entry/SetDelegateProfile.kt b/src/main/java/de/bixilon/minosoft/config/profile/delegate/delegate/entry/SetDelegateProfile.kt
index 9fe504675..141ba29de 100644
--- a/src/main/java/de/bixilon/minosoft/config/profile/delegate/delegate/entry/SetDelegateProfile.kt
+++ b/src/main/java/de/bixilon/minosoft/config/profile/delegate/delegate/entry/SetDelegateProfile.kt
@@ -3,13 +3,13 @@ package de.bixilon.minosoft.config.profile.delegate.delegate.entry
 import de.bixilon.minosoft.config.StaticConfiguration
 import de.bixilon.minosoft.config.profile.ProfileManager
 import de.bixilon.minosoft.config.profile.delegate.ProfilesDelegateManager
+import de.bixilon.minosoft.util.delegate.DelegateManager.identifier
 import de.bixilon.minosoft.util.logging.Log
 import de.bixilon.minosoft.util.logging.LogLevels
 import de.bixilon.minosoft.util.logging.LogMessageType
 import javafx.collections.FXCollections
 import javafx.collections.ObservableSet
 import javafx.collections.SetChangeListener
-import kotlin.reflect.jvm.javaField
 
 open class SetDelegateProfile<V>(
     private var value: ObservableSet<V>,
@@ -38,7 +38,7 @@ open class SetDelegateProfile<V>(
                 profileManager.profiles[profileName]?.saved = false
             }
 
-            ProfilesDelegateManager.onChange(profile, property.javaField ?: return@SetChangeListener, null, it)
+            ProfilesDelegateManager.onChange(profile, property.identifier, null, it)
         })
     }
 
diff --git a/src/main/java/de/bixilon/minosoft/config/profile/delegate/watcher/ProfileDelegateWatcher.kt b/src/main/java/de/bixilon/minosoft/config/profile/delegate/watcher/ProfileDelegateWatcher.kt
index 399017e3b..f0f820267 100644
--- a/src/main/java/de/bixilon/minosoft/config/profile/delegate/watcher/ProfileDelegateWatcher.kt
+++ b/src/main/java/de/bixilon/minosoft/config/profile/delegate/watcher/ProfileDelegateWatcher.kt
@@ -1,12 +1,11 @@
 package de.bixilon.minosoft.config.profile.delegate.watcher
 
 import de.bixilon.minosoft.config.profile.profiles.Profile
-import java.lang.reflect.Field
 import kotlin.reflect.KProperty
 
 interface ProfileDelegateWatcher<T> {
     val property: KProperty<T>
-    val field: Field
+    val fieldIdentifier: String
     val profile: Profile?
 
 
diff --git a/src/main/java/de/bixilon/minosoft/config/profile/delegate/watcher/SimpleProfileDelegateLWatcher.kt b/src/main/java/de/bixilon/minosoft/config/profile/delegate/watcher/SimpleProfileDelegateWatcher.kt
similarity index 84%
rename from src/main/java/de/bixilon/minosoft/config/profile/delegate/watcher/SimpleProfileDelegateLWatcher.kt
rename to src/main/java/de/bixilon/minosoft/config/profile/delegate/watcher/SimpleProfileDelegateWatcher.kt
index 3d9e04db6..0d5ff28af 100644
--- a/src/main/java/de/bixilon/minosoft/config/profile/delegate/watcher/SimpleProfileDelegateLWatcher.kt
+++ b/src/main/java/de/bixilon/minosoft/config/profile/delegate/watcher/SimpleProfileDelegateWatcher.kt
@@ -5,18 +5,17 @@ import de.bixilon.minosoft.config.profile.profiles.Profile
 import de.bixilon.minosoft.gui.eros.util.JavaFXUtil
 import de.bixilon.minosoft.gui.rendering.Rendering
 import de.bixilon.minosoft.util.KUtil.unsafeCast
-import java.lang.reflect.Field
+import de.bixilon.minosoft.util.delegate.DelegateManager.identifier
 import kotlin.reflect.KProperty
 import kotlin.reflect.KProperty0
-import kotlin.reflect.jvm.javaField
 
-class SimpleProfileDelegateLWatcher<T>(
+class SimpleProfileDelegateWatcher<T>(
     override val property: KProperty<T>,
-    override val field: Field,
     override val profile: Profile?,
     instant: Boolean,
     private val callback: (T) -> Unit,
 ) : ProfileDelegateWatcher<T> {
+    override val fieldIdentifier: String = property.identifier
 
     init {
         if (instant) {
@@ -35,18 +34,18 @@ class SimpleProfileDelegateLWatcher<T>(
 
         @JvmOverloads
         fun <T> KProperty<T>.profileWatch(reference: Any, instant: Boolean = false, profile: Profile? = null, callback: ((T) -> Unit)) {
-            ProfilesDelegateManager.register(reference, SimpleProfileDelegateLWatcher(this, javaField!!, profile, instant, callback))
+            ProfilesDelegateManager.register(reference, SimpleProfileDelegateWatcher(this, profile, instant, callback))
         }
 
         @JvmOverloads
         fun <T> KProperty<T>.profileWatchFX(reference: Any, instant: Boolean = false, profile: Profile? = null, callback: ((T) -> Unit)) {
-            ProfilesDelegateManager.register(reference, SimpleProfileDelegateLWatcher(this, javaField!!, profile, instant) { JavaFXUtil.runLater { callback(it) } })
+            ProfilesDelegateManager.register(reference, SimpleProfileDelegateWatcher(this, profile, instant) { JavaFXUtil.runLater { callback(it) } })
         }
 
         @JvmOverloads
         fun <T> KProperty<T>.profileWatchRendering(reference: Any, instant: Boolean = false, profile: Profile? = null, callback: ((T) -> Unit)) {
             val context = Rendering.currentContext ?: throw IllegalStateException("Can only be registered in a render context!")
-            ProfilesDelegateManager.register(reference, SimpleProfileDelegateLWatcher(this, javaField!!, profile, instant) {
+            ProfilesDelegateManager.register(reference, SimpleProfileDelegateWatcher(this, profile, instant) {
                 val changeContext = Rendering.currentContext
                 if (changeContext === context) {
                     callback(it)
diff --git a/src/main/java/de/bixilon/minosoft/config/profile/delegate/watcher/entry/ListProfileDelegateWatcher.kt b/src/main/java/de/bixilon/minosoft/config/profile/delegate/watcher/entry/ListProfileDelegateWatcher.kt
index bb686c767..3f0eb7470 100644
--- a/src/main/java/de/bixilon/minosoft/config/profile/delegate/watcher/entry/ListProfileDelegateWatcher.kt
+++ b/src/main/java/de/bixilon/minosoft/config/profile/delegate/watcher/entry/ListProfileDelegateWatcher.kt
@@ -5,17 +5,16 @@ import de.bixilon.minosoft.config.profile.delegate.watcher.ProfileDelegateWatche
 import de.bixilon.minosoft.config.profile.profiles.Profile
 import de.bixilon.minosoft.gui.eros.util.JavaFXUtil
 import de.bixilon.minosoft.util.KUtil.unsafeCast
+import de.bixilon.minosoft.util.delegate.DelegateManager.identifier
 import javafx.collections.ListChangeListener
-import java.lang.reflect.Field
 import kotlin.reflect.KProperty
-import kotlin.reflect.jvm.javaField
 
 class ListProfileDelegateWatcher<V>(
     override val property: KProperty<MutableList<V>>,
-    override val field: Field,
     override val profile: Profile?,
     private val callback: (ListChangeListener.Change<V>) -> Unit,
 ) : ProfileDelegateWatcher<MutableList<V>> {
+    override val fieldIdentifier = property.identifier
 
     override fun invoke(previous: Any?, value: Any?) {
         callback(value.unsafeCast())
@@ -25,12 +24,12 @@ class ListProfileDelegateWatcher<V>(
 
         @JvmOverloads
         fun <V> KProperty<MutableList<V>>.profileWatchList(reference: Any, profile: Profile? = null, callback: ((ListChangeListener.Change<V>) -> Unit)) {
-            ProfilesDelegateManager.register(reference, ListProfileDelegateWatcher(this, javaField!!, profile, callback))
+            ProfilesDelegateManager.register(reference, ListProfileDelegateWatcher(this, profile, callback))
         }
 
         @JvmOverloads
         fun <V> KProperty<MutableList<V>>.profileWatchListFX(reference: Any, profile: Profile? = null, callback: ((ListChangeListener.Change<V>) -> Unit)) {
-            ProfilesDelegateManager.register(reference, ListProfileDelegateWatcher(this, javaField!!, profile) { JavaFXUtil.runLater { callback(it) } })
+            ProfilesDelegateManager.register(reference, ListProfileDelegateWatcher(this, profile) { JavaFXUtil.runLater { callback(it) } })
         }
     }
 }
diff --git a/src/main/java/de/bixilon/minosoft/config/profile/delegate/watcher/entry/MapProfileDelegateWatcher.kt b/src/main/java/de/bixilon/minosoft/config/profile/delegate/watcher/entry/MapProfileDelegateWatcher.kt
index 2b4bb8b6c..83a110166 100644
--- a/src/main/java/de/bixilon/minosoft/config/profile/delegate/watcher/entry/MapProfileDelegateWatcher.kt
+++ b/src/main/java/de/bixilon/minosoft/config/profile/delegate/watcher/entry/MapProfileDelegateWatcher.kt
@@ -5,17 +5,16 @@ import de.bixilon.minosoft.config.profile.delegate.watcher.ProfileDelegateWatche
 import de.bixilon.minosoft.config.profile.profiles.Profile
 import de.bixilon.minosoft.gui.eros.util.JavaFXUtil
 import de.bixilon.minosoft.util.KUtil.unsafeCast
+import de.bixilon.minosoft.util.delegate.DelegateManager.identifier
 import javafx.collections.MapChangeListener
-import java.lang.reflect.Field
 import kotlin.reflect.KProperty
-import kotlin.reflect.jvm.javaField
 
 class MapProfileDelegateWatcher<K, V>(
     override val property: KProperty<MutableMap<K, V>>,
-    override val field: Field,
     override val profile: Profile?,
     private val callback: (MapChangeListener.Change<K, V>) -> Unit,
 ) : ProfileDelegateWatcher<MutableMap<K, V>> {
+    override val fieldIdentifier = property.identifier
 
     override fun invoke(previous: Any?, value: Any?) {
         callback(value.unsafeCast())
@@ -25,12 +24,12 @@ class MapProfileDelegateWatcher<K, V>(
 
         @JvmOverloads
         fun <K, V> KProperty<MutableMap<K, V>>.profileWatchMap(reference: Any, profile: Profile? = null, callback: ((MapChangeListener.Change<K, V>) -> Unit)) {
-            ProfilesDelegateManager.register(reference, MapProfileDelegateWatcher(this, javaField!!, profile, callback))
+            ProfilesDelegateManager.register(reference, MapProfileDelegateWatcher(this, profile, callback))
         }
 
         @JvmOverloads
         fun <K, V> KProperty<MutableMap<K, V>>.profileWatchMapFX(reference: Any, profile: Profile? = null, callback: ((MapChangeListener.Change<K, V>) -> Unit)) {
-            ProfilesDelegateManager.register(reference, MapProfileDelegateWatcher(this, javaField!!, profile) { JavaFXUtil.runLater { callback(it) } })
+            ProfilesDelegateManager.register(reference, MapProfileDelegateWatcher(this, profile) { JavaFXUtil.runLater { callback(it) } })
         }
     }
 }
diff --git a/src/main/java/de/bixilon/minosoft/config/profile/delegate/watcher/entry/SetProfileDelegateWatcher.kt b/src/main/java/de/bixilon/minosoft/config/profile/delegate/watcher/entry/SetProfileDelegateWatcher.kt
index 04558fb4b..a124be471 100644
--- a/src/main/java/de/bixilon/minosoft/config/profile/delegate/watcher/entry/SetProfileDelegateWatcher.kt
+++ b/src/main/java/de/bixilon/minosoft/config/profile/delegate/watcher/entry/SetProfileDelegateWatcher.kt
@@ -5,17 +5,16 @@ import de.bixilon.minosoft.config.profile.delegate.watcher.ProfileDelegateWatche
 import de.bixilon.minosoft.config.profile.profiles.Profile
 import de.bixilon.minosoft.gui.eros.util.JavaFXUtil
 import de.bixilon.minosoft.util.KUtil.unsafeCast
+import de.bixilon.minosoft.util.delegate.DelegateManager.identifier
 import javafx.collections.SetChangeListener
-import java.lang.reflect.Field
 import kotlin.reflect.KProperty
-import kotlin.reflect.jvm.javaField
 
 class SetProfileDelegateWatcher<V>(
     override val property: KProperty<MutableSet<V>>,
-    override val field: Field,
     override val profile: Profile?,
     private val callback: (SetChangeListener.Change<V>) -> Unit,
 ) : ProfileDelegateWatcher<MutableSet<V>> {
+    override val fieldIdentifier = property.identifier
 
     override fun invoke(previous: Any?, value: Any?) {
         callback(value.unsafeCast())
@@ -25,12 +24,12 @@ class SetProfileDelegateWatcher<V>(
 
         @JvmOverloads
         fun <V> KProperty<MutableSet<V>>.profileWatchSet(reference: Any, profile: Profile? = null, callback: ((SetChangeListener.Change<V>) -> Unit)) {
-            ProfilesDelegateManager.register(reference, SetProfileDelegateWatcher(this, javaField!!, profile, callback))
+            ProfilesDelegateManager.register(reference, SetProfileDelegateWatcher(this, profile, callback))
         }
 
         @JvmOverloads
         fun <V> KProperty<MutableSet<V>>.profileWatchSetFX(reference: Any, profile: Profile? = null, callback: ((SetChangeListener.Change<V>) -> Unit)) {
-            ProfilesDelegateManager.register(reference, SetProfileDelegateWatcher(this, javaField!!, profile) { JavaFXUtil.runLater { callback(it) } })
+            ProfilesDelegateManager.register(reference, SetProfileDelegateWatcher(this, profile) { JavaFXUtil.runLater { callback(it) } })
         }
     }
 }
diff --git a/src/main/java/de/bixilon/minosoft/data/world/biome/accessor/NoiseBiomeAccessor.kt b/src/main/java/de/bixilon/minosoft/data/world/biome/accessor/NoiseBiomeAccessor.kt
index 9ffab879b..f039ce62f 100644
--- a/src/main/java/de/bixilon/minosoft/data/world/biome/accessor/NoiseBiomeAccessor.kt
+++ b/src/main/java/de/bixilon/minosoft/data/world/biome/accessor/NoiseBiomeAccessor.kt
@@ -13,7 +13,7 @@
 
 package de.bixilon.minosoft.data.world.biome.accessor
 
-import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateLWatcher.Companion.profileWatch
+import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateWatcher.Companion.profileWatch
 import de.bixilon.minosoft.data.registries.biomes.Biome
 import de.bixilon.minosoft.data.world.Chunk
 import de.bixilon.minosoft.data.world.biome.source.SpatialBiomeArray
diff --git a/src/main/java/de/bixilon/minosoft/gui/eros/dialog/ServerModifyDialog.kt b/src/main/java/de/bixilon/minosoft/gui/eros/dialog/ServerModifyDialog.kt
index 553859f2a..58421dc86 100644
--- a/src/main/java/de/bixilon/minosoft/gui/eros/dialog/ServerModifyDialog.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/eros/dialog/ServerModifyDialog.kt
@@ -14,7 +14,7 @@
 package de.bixilon.minosoft.gui.eros.dialog
 
 import de.bixilon.minosoft.Minosoft
-import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateLWatcher.Companion.profileWatchFX
+import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateWatcher.Companion.profileWatchFX
 import de.bixilon.minosoft.config.profile.profiles.eros.ErosProfileManager
 import de.bixilon.minosoft.config.profile.profiles.eros.server.entries.Server
 import de.bixilon.minosoft.data.registries.ResourceLocation
diff --git a/src/main/java/de/bixilon/minosoft/gui/eros/main/MainErosController.kt b/src/main/java/de/bixilon/minosoft/gui/eros/main/MainErosController.kt
index d1b39d652..f3a6a672e 100644
--- a/src/main/java/de/bixilon/minosoft/gui/eros/main/MainErosController.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/eros/main/MainErosController.kt
@@ -14,7 +14,7 @@
 package de.bixilon.minosoft.gui.eros.main
 
 import de.bixilon.minosoft.ShutdownReasons
-import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateLWatcher.Companion.profileWatchFX
+import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateWatcher.Companion.profileWatchFX
 import de.bixilon.minosoft.config.profile.profiles.eros.ErosProfileManager
 import de.bixilon.minosoft.data.accounts.Account
 import de.bixilon.minosoft.gui.eros.controller.EmbeddedJavaFXController
diff --git a/src/main/java/de/bixilon/minosoft/gui/eros/main/play/server/ServerListController.kt b/src/main/java/de/bixilon/minosoft/gui/eros/main/play/server/ServerListController.kt
index d78358a8b..7d1c39b25 100644
--- a/src/main/java/de/bixilon/minosoft/gui/eros/main/play/server/ServerListController.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/eros/main/play/server/ServerListController.kt
@@ -15,7 +15,7 @@ package de.bixilon.minosoft.gui.eros.main.play.server
 
 import de.bixilon.minosoft.Minosoft
 import de.bixilon.minosoft.config.profile.ConnectionProfiles
-import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateLWatcher.Companion.profileWatchFX
+import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateWatcher.Companion.profileWatchFX
 import de.bixilon.minosoft.config.profile.profiles.eros.ErosProfileManager
 import de.bixilon.minosoft.config.profile.profiles.eros.server.entries.Server
 import de.bixilon.minosoft.data.registries.ResourceLocation
diff --git a/src/main/java/de/bixilon/minosoft/gui/eros/main/profiles/ProfileCardController.kt b/src/main/java/de/bixilon/minosoft/gui/eros/main/profiles/ProfileCardController.kt
index 1dc6ee0be..ed0954426 100644
--- a/src/main/java/de/bixilon/minosoft/gui/eros/main/profiles/ProfileCardController.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/eros/main/profiles/ProfileCardController.kt
@@ -13,6 +13,7 @@
 
 package de.bixilon.minosoft.gui.eros.main.profiles
 
+import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateWatcher.Companion.profileWatchFX
 import de.bixilon.minosoft.config.profile.profiles.Profile
 import de.bixilon.minosoft.data.registries.ResourceLocation
 import de.bixilon.minosoft.gui.eros.card.AbstractCardController
@@ -45,7 +46,7 @@ class ProfileCardController : AbstractCardController<Profile>() {
 
 
         profileNameFX.text = item.name
-        profileDescriptionFX.text = item.description
+        item::description.profileWatchFX(this, true, item) { profileDescriptionFX.text = it }
     }
 
     companion object : CardFactory<ProfileCardController> {
diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/RenderWindow.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/RenderWindow.kt
index 00bf794a5..be894d950 100644
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/RenderWindow.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/RenderWindow.kt
@@ -16,7 +16,7 @@ package de.bixilon.minosoft.gui.rendering
 import de.bixilon.minosoft.config.key.KeyAction
 import de.bixilon.minosoft.config.key.KeyBinding
 import de.bixilon.minosoft.config.key.KeyCodes
-import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateLWatcher.Companion.profileWatch
+import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateWatcher.Companion.profileWatch
 import de.bixilon.minosoft.data.registries.ResourceLocation
 import de.bixilon.minosoft.data.text.BaseComponent
 import de.bixilon.minosoft.data.text.ChatColors
diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/entity/EntityHitboxRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/entity/EntityHitboxRenderer.kt
index 1ac95c259..08593b919 100644
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/entity/EntityHitboxRenderer.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/entity/EntityHitboxRenderer.kt
@@ -16,7 +16,7 @@ package de.bixilon.minosoft.gui.rendering.entity
 import de.bixilon.minosoft.config.key.KeyAction
 import de.bixilon.minosoft.config.key.KeyBinding
 import de.bixilon.minosoft.config.key.KeyCodes
-import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateLWatcher.Companion.profileWatch
+import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateWatcher.Companion.profileWatch
 import de.bixilon.minosoft.data.entities.entities.Entity
 import de.bixilon.minosoft.data.player.LocalPlayerEntity
 import de.bixilon.minosoft.data.registries.ResourceLocation
diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/HUDRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/HUDRenderer.kt
index 0e058122c..dd99126f6 100644
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/HUDRenderer.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/HUDRenderer.kt
@@ -16,7 +16,7 @@ package de.bixilon.minosoft.gui.rendering.gui.hud
 import de.bixilon.minosoft.config.key.KeyAction
 import de.bixilon.minosoft.config.key.KeyBinding
 import de.bixilon.minosoft.config.key.KeyCodes
-import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateLWatcher.Companion.profileWatchRendering
+import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateWatcher.Companion.profileWatchRendering
 import de.bixilon.minosoft.data.registries.ResourceLocation
 import de.bixilon.minosoft.gui.rendering.Drawable
 import de.bixilon.minosoft.gui.rendering.RenderWindow
diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/chat/ChatHUDElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/chat/ChatHUDElement.kt
index f5cf17a03..282ea5bed 100644
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/chat/ChatHUDElement.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/chat/ChatHUDElement.kt
@@ -13,7 +13,7 @@
 
 package de.bixilon.minosoft.gui.rendering.gui.hud.elements.chat
 
-import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateLWatcher.Companion.profileWatchRendering
+import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateWatcher.Companion.profileWatchRendering
 import de.bixilon.minosoft.data.ChatTextPositions
 import de.bixilon.minosoft.data.registries.ResourceLocation
 import de.bixilon.minosoft.gui.rendering.gui.elements.text.TextFlowElement
diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/chat/InternalMessagesHUDElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/chat/InternalMessagesHUDElement.kt
index 73a3f085b..0ebcae5f3 100644
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/chat/InternalMessagesHUDElement.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/chat/InternalMessagesHUDElement.kt
@@ -13,7 +13,7 @@
 
 package de.bixilon.minosoft.gui.rendering.gui.hud.elements.chat
 
-import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateLWatcher.Companion.profileWatchRendering
+import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateWatcher.Companion.profileWatchRendering
 import de.bixilon.minosoft.data.registries.ResourceLocation
 import de.bixilon.minosoft.gui.rendering.gui.elements.text.TextFlowElement
 import de.bixilon.minosoft.gui.rendering.gui.hud.HUDRenderer
diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/other/CrosshairHUDElement.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/other/CrosshairHUDElement.kt
index b0df3f4e5..4dd30c904 100644
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/other/CrosshairHUDElement.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/gui/hud/elements/other/CrosshairHUDElement.kt
@@ -13,7 +13,7 @@
 
 package de.bixilon.minosoft.gui.rendering.gui.hud.elements.other
 
-import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateLWatcher.Companion.profileWatch
+import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateWatcher.Companion.profileWatch
 import de.bixilon.minosoft.data.abilities.Gamemodes
 import de.bixilon.minosoft.data.registries.ResourceLocation
 import de.bixilon.minosoft.gui.rendering.gui.hud.HUDRenderer
diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/ParticleRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/ParticleRenderer.kt
index 396bbaf67..7a6e16591 100644
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/particle/ParticleRenderer.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/particle/ParticleRenderer.kt
@@ -13,7 +13,7 @@
 
 package de.bixilon.minosoft.gui.rendering.particle
 
-import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateLWatcher.Companion.profileWatch
+import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateWatcher.Companion.profileWatch
 import de.bixilon.minosoft.data.registries.ResourceLocation
 import de.bixilon.minosoft.gui.rendering.*
 import de.bixilon.minosoft.gui.rendering.modding.events.CameraMatrixChangeEvent
diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/sound/AudioPlayer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/sound/AudioPlayer.kt
index eb61ce101..757baf1a4 100644
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/sound/AudioPlayer.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/sound/AudioPlayer.kt
@@ -13,7 +13,7 @@
 
 package de.bixilon.minosoft.gui.rendering.sound
 
-import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateLWatcher.Companion.profileWatch
+import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateWatcher.Companion.profileWatch
 import de.bixilon.minosoft.data.registries.ResourceLocation
 import de.bixilon.minosoft.data.world.AbstractAudioPlayer
 import de.bixilon.minosoft.gui.rendering.Rendering
diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/system/window/BaseWindow.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/system/window/BaseWindow.kt
index 459e5a25f..15c3b476b 100644
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/system/window/BaseWindow.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/system/window/BaseWindow.kt
@@ -14,7 +14,7 @@
 package de.bixilon.minosoft.gui.rendering.system.window
 
 import de.bixilon.minosoft.config.StaticConfiguration
-import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateLWatcher.Companion.profileWatchRendering
+import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateWatcher.Companion.profileWatchRendering
 import de.bixilon.minosoft.config.profile.profiles.rendering.RenderingProfile
 import de.bixilon.minosoft.data.assets.AssetsManager
 import de.bixilon.minosoft.util.KUtil.toResourceLocation
diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/world/WorldRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/world/WorldRenderer.kt
index a4b87e496..cb7f5a494 100644
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/world/WorldRenderer.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/world/WorldRenderer.kt
@@ -16,7 +16,7 @@ package de.bixilon.minosoft.gui.rendering.world
 import de.bixilon.minosoft.config.key.KeyAction
 import de.bixilon.minosoft.config.key.KeyBinding
 import de.bixilon.minosoft.config.key.KeyCodes
-import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateLWatcher.Companion.profileWatch
+import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateWatcher.Companion.profileWatch
 import de.bixilon.minosoft.data.assets.AssetsUtil
 import de.bixilon.minosoft.data.assets.Resources
 import de.bixilon.minosoft.data.direction.Directions
diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/world/outline/BlockOutlineRenderer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/world/outline/BlockOutlineRenderer.kt
index a4a45c7bc..5f06bb78d 100644
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/world/outline/BlockOutlineRenderer.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/world/outline/BlockOutlineRenderer.kt
@@ -13,7 +13,7 @@
 
 package de.bixilon.minosoft.gui.rendering.world.outline
 
-import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateLWatcher.Companion.profileWatch
+import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateWatcher.Companion.profileWatch
 import de.bixilon.minosoft.data.abilities.Gamemodes
 import de.bixilon.minosoft.data.registries.ResourceLocation
 import de.bixilon.minosoft.data.registries.blocks.BlockState
diff --git a/src/main/java/de/bixilon/minosoft/gui/rendering/world/preparer/cull/SolidCullSectionPreparer.kt b/src/main/java/de/bixilon/minosoft/gui/rendering/world/preparer/cull/SolidCullSectionPreparer.kt
index c877889c4..ff3801eef 100644
--- a/src/main/java/de/bixilon/minosoft/gui/rendering/world/preparer/cull/SolidCullSectionPreparer.kt
+++ b/src/main/java/de/bixilon/minosoft/gui/rendering/world/preparer/cull/SolidCullSectionPreparer.kt
@@ -1,6 +1,6 @@
 package de.bixilon.minosoft.gui.rendering.world.preparer.cull
 
-import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateLWatcher.Companion.profileWatch
+import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateWatcher.Companion.profileWatch
 import de.bixilon.minosoft.data.direction.Directions
 import de.bixilon.minosoft.data.direction.Directions.Companion.O_DOWN
 import de.bixilon.minosoft.data.direction.Directions.Companion.O_EAST
diff --git a/src/main/java/de/bixilon/minosoft/protocol/network/connection/play/clientsettings/ClientSettingsManager.kt b/src/main/java/de/bixilon/minosoft/protocol/network/connection/play/clientsettings/ClientSettingsManager.kt
index f40425c2e..942b2a9d8 100644
--- a/src/main/java/de/bixilon/minosoft/protocol/network/connection/play/clientsettings/ClientSettingsManager.kt
+++ b/src/main/java/de/bixilon/minosoft/protocol/network/connection/play/clientsettings/ClientSettingsManager.kt
@@ -13,7 +13,7 @@
 
 package de.bixilon.minosoft.protocol.network.connection.play.clientsettings
 
-import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateLWatcher.Companion.profileWatch
+import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateWatcher.Companion.profileWatch
 import de.bixilon.minosoft.data.language.LanguageManager
 import de.bixilon.minosoft.protocol.network.connection.play.PlayConnection
 import de.bixilon.minosoft.protocol.packets.c2s.play.ClientSettingsC2SP
diff --git a/src/main/java/de/bixilon/minosoft/protocol/protocol/LANServerListener.kt b/src/main/java/de/bixilon/minosoft/protocol/protocol/LANServerListener.kt
index 4ea612fe1..4b20f2882 100644
--- a/src/main/java/de/bixilon/minosoft/protocol/protocol/LANServerListener.kt
+++ b/src/main/java/de/bixilon/minosoft/protocol/protocol/LANServerListener.kt
@@ -13,7 +13,7 @@
 package de.bixilon.minosoft.protocol.protocol
 
 import com.google.common.collect.HashBiMap
-import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateLWatcher.Companion.profileWatch
+import de.bixilon.minosoft.config.profile.delegate.watcher.SimpleProfileDelegateWatcher.Companion.profileWatch
 import de.bixilon.minosoft.config.profile.profiles.eros.server.entries.Server
 import de.bixilon.minosoft.config.profile.profiles.other.OtherProfileManager
 import de.bixilon.minosoft.data.text.BaseComponent