diff --git a/art/themes/luciano_blocktronics/activitypub_menu.ans b/art/themes/luciano_blocktronics/activitypub_menu.ans
index 5530a12d..5b91b3bc 100644
Binary files a/art/themes/luciano_blocktronics/activitypub_menu.ans and b/art/themes/luciano_blocktronics/activitypub_menu.ans differ
diff --git a/art/themes/luciano_blocktronics/theme.hjson b/art/themes/luciano_blocktronics/theme.hjson
index 77497d37..4243dda1 100644
--- a/art/themes/luciano_blocktronics/theme.hjson
+++ b/art/themes/luciano_blocktronics/theme.hjson
@@ -429,140 +429,6 @@
 				}
 			}
 
-			//	:TODO: move this to the right area, rename, etc.
-			mainMenuActivityPubUserConfig: {
-				config: {
-					mainInfoFormat10: "{subject}"
-				}
-				0: {
-					mci: {
-						TM1: {
-							focusTextStyle: first lower
-						}
-						TM2: {
-							focusTextStyle: first lower
-						}
-						TM3: {
-							focusTextStyle: first lower
-						}
-						TM4: {
-							focusTextStyle: first lower
-						}
-						TL5: {
-							width: 70
-						}
-						TL6: {
-							width: 70
-						}
-						BT7: {
-							width: 20
-							itemFormat: "|00|08[ |03{text} |08]"
-							focusItemFormat: "|00|15[ |19|15{text}|16 |15]"
-							focusTextStyle: first lower
-						}
-						TM8: {
-							focusTextStyle: first lower
-						}
-						TL10: {
-							width: 40
-						}
-					}
-				}
-				1: {
-					mci: {
-						ML1: {
-							height: 4
-							width: 70
-						}
-						ML2: {
-							height: 4
-							width: 70
-						}
-						TM3: {
-							focusTextStyle: first lower
-						}
-					}
-				}
-			}
-
-			activityPubFollowingManager: {
-				config: {
-					selectedActorInfoFormat: "|00|15{preferredUsername} |08(|02{name}|08)\n|07following|08: {statusIndicator}\n\n|06{plainTextSummary}"
-					statusIndicatorEnabled: "|00|10√"
-					staticIndicatorDisabled: "|00|12X"
-				}
-				0: {
-					mci: {
-						VM1: {
-							height: 15
-							width: 35
-							itemFormat: "|00|03{subject}|00 {statusIndicator}"
-							focusItemFormat: "|00|19|15{subject!styleUpper}|00 {statusIndicator}"
-							itemFormat: "|00{statusIndicator} |00|03{subject}"
-							focusItemFormat: "|00{statusIndicator} |00|19|15{subject}"
-							textOverflow: "..."
-						}
-						MT2: {
-							height: 15
-							width: 34
-						}
-						TM3: {
-							focusTextStyle: first lower
-							styleSGR1: "|00|08"
-						}
-					}
-				}
-			}
-
-			//	:TODO: move this to the right area, rename, etc.
-			mainMenuActivityPubActorSearch: {
-				config: {
-					followingIndicator: "|00|14> |10Following|08!|14 <"
-					notFollowingIndicator: "|00|14> |02Not Following|14 <"
-					viewInfoFormat10: "{actorFollowingIndicator}"
-				}
-				0: {
-					mci: {
-						TL1: {
-							width: 70
-							submit: true
-						}
-					}
-				}
-				1: {
-					mci: {
-						TL1: {
-							width: 70
-						}
-						TL2: {
-							width: 70
-						}
-						TL3: {
-							width: 70
-						}
-						TL4: {
-							width: 10
-						}
-						TL5: {
-							width: 4
-						}
-						TL6: {
-							width: 4
-						}
-						MT7: {
-							focus: true
-							width: 69
-							height: 3
-							mode: preview
-						}
-						TL10: {
-							width: 24
-
-						}
-					}
-				}
-			}
-
 			mainMenuRumorz: {
 				0: {
 					mci: {
@@ -1394,6 +1260,141 @@
 				}
 			}
 
+			//
+			// ActivityPub
+			//
+			activityPubUserConfig: {
+				config: {
+					mainInfoFormat10: "{subject}"
+				}
+				0: {
+					mci: {
+						TM1: {
+							focusTextStyle: first lower
+						}
+						TM2: {
+							focusTextStyle: first lower
+						}
+						TM3: {
+							focusTextStyle: first lower
+						}
+						TM4: {
+							focusTextStyle: first lower
+						}
+						TL5: {
+							width: 70
+						}
+						TL6: {
+							width: 70
+						}
+						BT7: {
+							width: 20
+							itemFormat: "|00|08[ |03{text} |08]"
+							focusItemFormat: "|00|15[ |19|15{text}|16 |15]"
+							focusTextStyle: first lower
+						}
+						TM8: {
+							focusTextStyle: first lower
+						}
+						TL10: {
+							width: 40
+						}
+					}
+				}
+				1: {
+					mci: {
+						ML1: {
+							height: 4
+							width: 70
+						}
+						ML2: {
+							height: 4
+							width: 70
+						}
+						TM3: {
+							focusTextStyle: first lower
+						}
+					}
+				}
+			}
+
+			activityPubSocialManager: {
+				config: {
+					selectedActorInfoFormat: "|00|15{preferredUsername} |08(|02{name}|08)\n|07following|08: {statusIndicator}\n\n|06{plainTextSummary}"
+					statusIndicatorEnabled: "|00|10√"
+					staticIndicatorDisabled: "|00|12X"
+				}
+				0: {
+					mci: {
+						VM1: {
+							height: 15
+							width: 35
+							itemFormat: "|00|03{subject}|00 {statusIndicator}"
+							focusItemFormat: "|00|19|15{subject!styleUpper}|00 {statusIndicator}"
+							itemFormat: "|00{statusIndicator} |00|03{subject}"
+							focusItemFormat: "|00{statusIndicator} |00|19|15{subject}"
+							textOverflow: "..."
+						}
+						MT2: {
+							height: 15
+							width: 34
+						}
+						TM3: {
+							focusTextStyle: first lower
+							styleSGR1: "|00|08"
+						}
+					}
+				}
+			}
+
+			activityPubActorSearch: {
+				config: {
+					followingIndicator: "|00|14> |10Following|08!|14 <"
+					notFollowingIndicator: "|00|14> |02Not Following|14 <"
+					viewInfoFormat10: "{actorFollowingIndicator}"
+				}
+				0: {
+					mci: {
+						TL1: {
+							width: 70
+							submit: true
+						}
+					}
+				}
+				1: {
+					mci: {
+						TL1: {
+							width: 70
+						}
+						TL2: {
+							width: 70
+						}
+						TL3: {
+							width: 70
+						}
+						TL4: {
+							width: 10
+						}
+						TL5: {
+							width: 4
+						}
+						TL6: {
+							width: 4
+						}
+						MT7: {
+							focus: true
+							width: 69
+							height: 3
+							mode: preview
+						}
+						TL10: {
+							width: 24
+
+						}
+					}
+				}
+			}
+
 			mrc: {
 				config: {
 					messageFormat: "|00|10<|02{fromUserName}|10>|00 |03{message}|00"
diff --git a/core/activitypub/social_manager.js b/core/activitypub/social_manager.js
index bd7ddfe1..ae2bb66f 100644
--- a/core/activitypub/social_manager.js
+++ b/core/activitypub/social_manager.js
@@ -35,7 +35,7 @@ const MciViewIds = {
     },
 };
 
-exports.getModule = class ActivityPubFollowingManager extends MenuModule {
+exports.getModule = class activityPubSocialManager extends MenuModule {
     constructor(options) {
         super(options);
         this.setConfigWithExtraArgs(options);
diff --git a/misc/menu_templates/activitypub.in.hjson b/misc/menu_templates/activitypub.in.hjson
index 8621371d..725f680b 100644
--- a/misc/menu_templates/activitypub.in.hjson
+++ b/misc/menu_templates/activitypub.in.hjson
@@ -1,7 +1,7 @@
 {
   "menus": {
     "activityPubMenu": {
-      "desc": "Menu for all ActivityPub actions",
+      "desc": "ActivityPub",
       "art": "activitypub_menu",
       "prompt": "menuCommand",
       "submit": [
@@ -21,7 +21,7 @@
           "value": {
             "command": "M"
           },
-          "action": "@menu:activityPubFollowingManager"
+          "action": "@menu:activityPubSocialManager"
         },
         {
           "value": {
@@ -211,7 +211,7 @@
         }
       }
     },
-    "activityPubFollowingManager": {
+    "activityPubSocialManager": {
       "desc": "Social Manager",
       "module": "./activitypub/social_manager",
       "config": {