diff --git a/frontends/qt6/packages/analytics/PackageView.qml b/frontends/qt6/packages/analytics/PackageView.qml
index cafdf65d7..e79d3d36e 100644
--- a/frontends/qt6/packages/analytics/PackageView.qml
+++ b/frontends/qt6/packages/analytics/PackageView.qml
@@ -17,7 +17,7 @@ CPaper {
 
         RowLayout {
             spacing: 12
-            CAvatar { initials: title.left(2).toUpper(); backgroundColor: Theme.primary }
+            CAvatar { initials: title.left(2).toUpper(); bgColor: Theme.primary }
             ColumnLayout {
                 spacing: 4
                 CText { variant: "h3"; text: title }
diff --git a/frontends/qt6/packages/blog/PackageView.qml b/frontends/qt6/packages/blog/PackageView.qml
index c0abe3c88..0cd359431 100644
--- a/frontends/qt6/packages/blog/PackageView.qml
+++ b/frontends/qt6/packages/blog/PackageView.qml
@@ -17,7 +17,7 @@ CPaper {
 
         RowLayout {
             spacing: 12
-            CAvatar { initials: title.left(2).toUpper(); backgroundColor: Theme.primary }
+            CAvatar { initials: title.left(2).toUpper(); bgColor: Theme.primary }
             ColumnLayout {
                 spacing: 4
                 CText { variant: "h3"; text: title }
diff --git a/frontends/qt6/packages/breakout/PackageView.qml b/frontends/qt6/packages/breakout/PackageView.qml
index 74f646502..346c9691b 100644
--- a/frontends/qt6/packages/breakout/PackageView.qml
+++ b/frontends/qt6/packages/breakout/PackageView.qml
@@ -17,7 +17,7 @@ CPaper {
 
         RowLayout {
             spacing: 12
-            CAvatar { initials: title.left(2).toUpper(); backgroundColor: Theme.primary }
+            CAvatar { initials: title.left(2).toUpper(); bgColor: Theme.primary }
             ColumnLayout {
                 spacing: 4
                 CText { variant: "h3"; text: title }
diff --git a/frontends/qt6/packages/connection-hub/PackageView.qml b/frontends/qt6/packages/connection-hub/PackageView.qml
index 08728ea99..ac2fbf94c 100644
--- a/frontends/qt6/packages/connection-hub/PackageView.qml
+++ b/frontends/qt6/packages/connection-hub/PackageView.qml
@@ -128,7 +128,7 @@ Rectangle {
                         // Service icon
                         CAvatar {
                             initials: modelData.icon
-                            backgroundColor: modelData.connected ? Theme.primary : Theme.border
+                            bgColor: modelData.connected ? Theme.primary : Theme.border
                         }
 
                         // Service info
diff --git a/frontends/qt6/packages/forum/PackageView.qml b/frontends/qt6/packages/forum/PackageView.qml
index 2308729c1..f6b3743ca 100644
--- a/frontends/qt6/packages/forum/PackageView.qml
+++ b/frontends/qt6/packages/forum/PackageView.qml
@@ -17,7 +17,7 @@ CPaper {
 
         RowLayout {
             spacing: 12
-            CAvatar { initials: title.left(2).toUpper(); backgroundColor: Theme.primary }
+            CAvatar { initials: title.left(2).toUpper(); bgColor: Theme.primary }
             ColumnLayout {
                 spacing: 4
                 CText { variant: "h3"; text: title }
diff --git a/frontends/qt6/packages/frontpage/PackageView.qml b/frontends/qt6/packages/frontpage/PackageView.qml
index f538857b9..5540c46f3 100644
--- a/frontends/qt6/packages/frontpage/PackageView.qml
+++ b/frontends/qt6/packages/frontpage/PackageView.qml
@@ -17,7 +17,7 @@ CPaper {
 
         RowLayout {
             spacing: 12
-            CAvatar { initials: title.left(2).toUpper(); backgroundColor: Theme.primary }
+            CAvatar { initials: title.left(2).toUpper(); bgColor: Theme.primary }
             ColumnLayout {
                 spacing: 4
                 CText { variant: "h3"; text: title }
diff --git a/frontends/qt6/packages/gallery/PackageView.qml b/frontends/qt6/packages/gallery/PackageView.qml
index 417024663..4260409fa 100644
--- a/frontends/qt6/packages/gallery/PackageView.qml
+++ b/frontends/qt6/packages/gallery/PackageView.qml
@@ -17,7 +17,7 @@ CPaper {
 
         RowLayout {
             spacing: 12
-            CAvatar { initials: title.left(2).toUpper(); backgroundColor: Theme.primary }
+            CAvatar { initials: title.left(2).toUpper(); bgColor: Theme.primary }
             ColumnLayout {
                 spacing: 4
                 CText { variant: "h3"; text: title }
diff --git a/frontends/qt6/packages/god-panel/PackageView.qml b/frontends/qt6/packages/god-panel/PackageView.qml
index a2faf53e0..df2177269 100644
--- a/frontends/qt6/packages/god-panel/PackageView.qml
+++ b/frontends/qt6/packages/god-panel/PackageView.qml
@@ -17,7 +17,7 @@ CPaper {
 
         RowLayout {
             spacing: 12
-            CAvatar { initials: title.left(2).toUpper(); backgroundColor: Theme.primary }
+            CAvatar { initials: title.left(2).toUpper(); bgColor: Theme.primary }
             ColumnLayout {
                 spacing: 4
                 CText { variant: "h3"; text: title }
diff --git a/frontends/qt6/packages/guestbook/PackageView.qml b/frontends/qt6/packages/guestbook/PackageView.qml
index d9fe3a636..12a706f3a 100644
--- a/frontends/qt6/packages/guestbook/PackageView.qml
+++ b/frontends/qt6/packages/guestbook/PackageView.qml
@@ -17,7 +17,7 @@ CPaper {
 
         RowLayout {
             spacing: 12
-            CAvatar { initials: title.left(2).toUpper(); backgroundColor: Theme.primary }
+            CAvatar { initials: title.left(2).toUpper(); bgColor: Theme.primary }
             ColumnLayout {
                 spacing: 4
                 CText { variant: "h3"; text: title }
diff --git a/frontends/qt6/packages/login/PackageView.qml b/frontends/qt6/packages/login/PackageView.qml
index 123abc2cf..2d441b9a1 100644
--- a/frontends/qt6/packages/login/PackageView.qml
+++ b/frontends/qt6/packages/login/PackageView.qml
@@ -17,7 +17,7 @@ CPaper {
 
         RowLayout {
             spacing: 12
-            CAvatar { initials: title.left(2).toUpper(); backgroundColor: Theme.primary }
+            CAvatar { initials: title.left(2).toUpper(); bgColor: Theme.primary }
             ColumnLayout {
                 spacing: 4
                 CText { variant: "h3"; text: title }
diff --git a/frontends/qt6/packages/music-player/PackageView.qml b/frontends/qt6/packages/music-player/PackageView.qml
index 666c49eda..189648b9f 100644
--- a/frontends/qt6/packages/music-player/PackageView.qml
+++ b/frontends/qt6/packages/music-player/PackageView.qml
@@ -17,7 +17,7 @@ CPaper {
 
         RowLayout {
             spacing: 12
-            CAvatar { initials: title.left(2).toUpper(); backgroundColor: Theme.primary }
+            CAvatar { initials: title.left(2).toUpper(); bgColor: Theme.primary }
             ColumnLayout {
                 spacing: 4
                 CText { variant: "h3"; text: title }
diff --git a/frontends/qt6/packages/package-manager/PackageView.qml b/frontends/qt6/packages/package-manager/PackageView.qml
index 7fe9650e7..d43455f3f 100644
--- a/frontends/qt6/packages/package-manager/PackageView.qml
+++ b/frontends/qt6/packages/package-manager/PackageView.qml
@@ -17,7 +17,7 @@ CPaper {
 
         RowLayout {
             spacing: 12
-            CAvatar { initials: title.left(2).toUpper(); backgroundColor: Theme.primary }
+            CAvatar { initials: title.left(2).toUpper(); bgColor: Theme.primary }
             ColumnLayout {
                 spacing: 4
                 CText { variant: "h3"; text: title }
diff --git a/frontends/qt6/packages/profile-page/PackageView.qml b/frontends/qt6/packages/profile-page/PackageView.qml
index c40bad083..a20fdad59 100644
--- a/frontends/qt6/packages/profile-page/PackageView.qml
+++ b/frontends/qt6/packages/profile-page/PackageView.qml
@@ -17,7 +17,7 @@ CPaper {
 
         RowLayout {
             spacing: 12
-            CAvatar { initials: title.left(2).toUpper(); backgroundColor: Theme.primary }
+            CAvatar { initials: title.left(2).toUpper(); bgColor: Theme.primary }
             ColumnLayout {
                 spacing: 4
                 CText { variant: "h3"; text: title }
diff --git a/frontends/qt6/packages/snake-game/PackageView.qml b/frontends/qt6/packages/snake-game/PackageView.qml
index 2d9021a13..37ae62af7 100644
--- a/frontends/qt6/packages/snake-game/PackageView.qml
+++ b/frontends/qt6/packages/snake-game/PackageView.qml
@@ -17,7 +17,7 @@ CPaper {
 
         RowLayout {
             spacing: 12
-            CAvatar { initials: title.left(2).toUpper(); backgroundColor: Theme.primary }
+            CAvatar { initials: title.left(2).toUpper(); bgColor: Theme.primary }
             ColumnLayout {
                 spacing: 4
                 CText { variant: "h3"; text: title }
diff --git a/frontends/qt6/packages/storybook/PackageView.qml b/frontends/qt6/packages/storybook/PackageView.qml
index 43820fdba..f272c856f 100644
--- a/frontends/qt6/packages/storybook/PackageView.qml
+++ b/frontends/qt6/packages/storybook/PackageView.qml
@@ -17,7 +17,7 @@ CPaper {
 
         RowLayout {
             spacing: 12
-            CAvatar { initials: title.left(2).toUpper(); backgroundColor: Theme.primary }
+            CAvatar { initials: title.left(2).toUpper(); bgColor: Theme.primary }
             ColumnLayout {
                 spacing: 4
                 CText { variant: "h3"; text: title }
diff --git a/frontends/qt6/packages/supergod-panel/PackageView.qml b/frontends/qt6/packages/supergod-panel/PackageView.qml
index 37de3272c..70dfa3779 100644
--- a/frontends/qt6/packages/supergod-panel/PackageView.qml
+++ b/frontends/qt6/packages/supergod-panel/PackageView.qml
@@ -17,7 +17,7 @@ CPaper {
 
         RowLayout {
             spacing: 12
-            CAvatar { initials: title.left(2).toUpper(); backgroundColor: Theme.primary }
+            CAvatar { initials: title.left(2).toUpper(); bgColor: Theme.primary }
             ColumnLayout {
                 spacing: 4
                 CText { variant: "h3"; text: title }
diff --git a/frontends/qt6/packages/user-settings/PackageView.qml b/frontends/qt6/packages/user-settings/PackageView.qml
index bb350d92c..6634f868d 100644
--- a/frontends/qt6/packages/user-settings/PackageView.qml
+++ b/frontends/qt6/packages/user-settings/PackageView.qml
@@ -17,7 +17,7 @@ CPaper {
 
         RowLayout {
             spacing: 12
-            CAvatar { initials: title.left(2).toUpper(); backgroundColor: Theme.primary }
+            CAvatar { initials: title.left(2).toUpper(); bgColor: Theme.primary }
             ColumnLayout {
                 spacing: 4
                 CText { variant: "h3"; text: title }
diff --git a/frontends/qt6/packages/watchtower/PackageView.qml b/frontends/qt6/packages/watchtower/PackageView.qml
index 76a1b6244..08b6eb002 100644
--- a/frontends/qt6/packages/watchtower/PackageView.qml
+++ b/frontends/qt6/packages/watchtower/PackageView.qml
@@ -182,7 +182,7 @@ Rectangle {
 
                                 CAvatar {
                                     initials: modelData.icon
-                                    backgroundColor: statusColor(modelData.status)
+                                    bgColor: statusColor(modelData.status)
                                 }
 
                                 ColumnLayout {
diff --git a/qml/qt6/SMTPConfigEditor.qml b/qml/qt6/SMTPConfigEditor.qml
index 91368d95e..201732dc0 100644
--- a/qml/qt6/SMTPConfigEditor.qml
+++ b/qml/qt6/SMTPConfigEditor.qml
@@ -133,11 +133,11 @@ Rectangle {
                 CSmtpServerForm {
                     host: smtpHost; port: smtpPort; username: smtpUsername; password: smtpPassword
                     encryptionIndex: smtpEditor.encryptionIndex; encryptionOptions: smtpEditor.encryptionOptions; connectionStatus: smtpEditor.connectionStatus
-                    onHostChanged: function(v) { smtpHost = v; markDirty() }
-                    onPortChanged: function(v) { smtpPort = v; markDirty() }
-                    onUsernameChanged: function(v) { smtpUsername = v; markDirty() }
-                    onPasswordChanged: function(v) { smtpPassword = v; markDirty() }
-                    onEncryptionChanged: function(i) { encryptionIndex = i; markDirty() }
+                    onHostEdited: function(v) { smtpHost = v; markDirty() }
+                    onPortEdited: function(v) { smtpPort = v; markDirty() }
+                    onUsernameEdited: function(v) { smtpUsername = v; markDirty() }
+                    onPasswordEdited: function(v) { smtpPassword = v; markDirty() }
+                    onEncryptionEdited: function(i) { encryptionIndex = i; markDirty() }
                     onTestRequested: testConnection()
                 }