diff --git a/plugin/src/Caelestia/Config/appearanceconfig.hpp b/plugin/src/Caelestia/Config/appearanceconfig.hpp
index c58105a7..f366482d 100644
--- a/plugin/src/Caelestia/Config/appearanceconfig.hpp
+++ b/plugin/src/Caelestia/Config/appearanceconfig.hpp
@@ -169,7 +169,7 @@ class AnimDurations : public ConfigObject {
     Q_OBJECT
     QML_ANONYMOUS
 
-    CONFIG_PROPERTY(qreal, scale, 1)
+    CONFIG_GLOBAL_PROPERTY(qreal, scale, 1)
 
     Q_PROPERTY(int small READ small NOTIFY valuesChanged)
     Q_PROPERTY(int normal READ normal NOTIFY valuesChanged)
diff --git a/plugin/src/Caelestia/Config/tokens.hpp b/plugin/src/Caelestia/Config/tokens.hpp
index ca42ccbd..1a0c7b8f 100644
--- a/plugin/src/Caelestia/Config/tokens.hpp
+++ b/plugin/src/Caelestia/Config/tokens.hpp
@@ -15,15 +15,15 @@ class AnimCurves : public ConfigObject {
     Q_OBJECT
     QML_ANONYMOUS
 
-    CONFIG_PROPERTY(QList<qreal>, emphasized)
-    CONFIG_PROPERTY(QList<qreal>, emphasizedAccel)
-    CONFIG_PROPERTY(QList<qreal>, emphasizedDecel)
-    CONFIG_PROPERTY(QList<qreal>, standard)
-    CONFIG_PROPERTY(QList<qreal>, standardAccel)
-    CONFIG_PROPERTY(QList<qreal>, standardDecel)
-    CONFIG_PROPERTY(QList<qreal>, expressiveFastSpatial)
-    CONFIG_PROPERTY(QList<qreal>, expressiveDefaultSpatial)
-    CONFIG_PROPERTY(QList<qreal>, expressiveSlowSpatial)
+    CONFIG_GLOBAL_PROPERTY(QList<qreal>, emphasized)
+    CONFIG_GLOBAL_PROPERTY(QList<qreal>, emphasizedAccel)
+    CONFIG_GLOBAL_PROPERTY(QList<qreal>, emphasizedDecel)
+    CONFIG_GLOBAL_PROPERTY(QList<qreal>, standard)
+    CONFIG_GLOBAL_PROPERTY(QList<qreal>, standardAccel)
+    CONFIG_GLOBAL_PROPERTY(QList<qreal>, standardDecel)
+    CONFIG_GLOBAL_PROPERTY(QList<qreal>, expressiveFastSpatial)
+    CONFIG_GLOBAL_PROPERTY(QList<qreal>, expressiveDefaultSpatial)
+    CONFIG_GLOBAL_PROPERTY(QList<qreal>, expressiveSlowSpatial)
 
 public:
     explicit AnimCurves(QObject* parent = nullptr)
@@ -103,13 +103,13 @@ class AnimDurationTokens : public ConfigObject {
     Q_OBJECT
     QML_ANONYMOUS
 
-    CONFIG_PROPERTY(int, small, 200)
-    CONFIG_PROPERTY(int, normal, 400)
-    CONFIG_PROPERTY(int, large, 600)
-    CONFIG_PROPERTY(int, extraLarge, 1000)
-    CONFIG_PROPERTY(int, expressiveFastSpatial, 350)
-    CONFIG_PROPERTY(int, expressiveDefaultSpatial, 500)
-    CONFIG_PROPERTY(int, expressiveSlowSpatial, 650)
+    CONFIG_GLOBAL_PROPERTY(int, small, 200)
+    CONFIG_GLOBAL_PROPERTY(int, normal, 400)
+    CONFIG_GLOBAL_PROPERTY(int, large, 600)
+    CONFIG_GLOBAL_PROPERTY(int, extraLarge, 1000)
+    CONFIG_GLOBAL_PROPERTY(int, expressiveFastSpatial, 350)
+    CONFIG_GLOBAL_PROPERTY(int, expressiveDefaultSpatial, 500)
+    CONFIG_GLOBAL_PROPERTY(int, expressiveSlowSpatial, 650)
 
 public:
     explicit AnimDurationTokens(QObject* parent = nullptr)
diff --git a/plugin/src/Caelestia/Config/tokensattached.cpp b/plugin/src/Caelestia/Config/tokensattached.cpp
index 23ee2841..1dd159d7 100644
--- a/plugin/src/Caelestia/Config/tokensattached.cpp
+++ b/plugin/src/Caelestia/Config/tokensattached.cpp
@@ -29,19 +29,11 @@ void Tokens::connectScope() {
     if (!m_scope)
         return;
     connect(m_scope, &ConfigScope::configChanged, this, &Tokens::sourceChanged);
-    connect(m_scope, &ConfigScope::configChanged, this, &Tokens::bindAnim);
 }
 
 void Tokens::bindAnim() {
-    auto* appearance = resolveAppearance(m_scope);
-    if (!appearance)
-        return;
-
-    m_anim->bindDurations(appearance->anim()->durations());
-
-    auto* tokens = TokenConfig::instance();
-    if (tokens)
-        m_anim->bindCurves(tokens->appearance()->curves());
+    m_anim->bindDurations(GlobalConfig::instance()->appearance()->anim()->durations());
+    m_anim->bindCurves(TokenConfig::instance()->appearance()->curves());
 }
 
 const AppearanceRounding* Tokens::rounding() const {