diff --git a/appinfo/routes.php b/appinfo/routes.php
index 8631411f..e20204c5 100644
--- a/appinfo/routes.php
+++ b/appinfo/routes.php
@@ -24,11 +24,6 @@
 return [
 	'routes' => [
 		['name' => 'page#index', 'url' => '/', 'verb' => 'GET'],
-		['name' => 'page#get', 'url' => '/announcement', 'verb' => 'GET'],
-		['name' => 'page#add', 'url' => '/announcement', 'verb' => 'POST'],
-		['name' => 'page#delete', 'url' => '/announcement/{id}', 'verb' => 'DELETE'],
-		['name' => 'page#removeNotifications', 'url' => '/announcement/{id}/notifications', 'verb' => 'DELETE'],
-		['name' => 'page#searchGroups', 'url' => '/groups', 'verb' => 'GET'],
 	],
 	'ocs' => [
 		['name' => 'API#get', 'url' => '/api/v1/announcements', 'verb' => 'GET'],
diff --git a/lib/Controller/APIController.php b/lib/Controller/APIController.php
index 9bf237c2..4c287893 100644
--- a/lib/Controller/APIController.php
+++ b/lib/Controller/APIController.php
@@ -25,19 +25,16 @@
 
 namespace OCA\AnnouncementCenter\Controller;
 
+use InvalidArgumentException;
 use OCA\AnnouncementCenter\Manager;
 use OCA\AnnouncementCenter\Model\Announcement;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
-use OCP\AppFramework\Http\Response;
 use OCP\AppFramework\OCSController;
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\BackgroundJob\IJobList;
-use OCP\IConfig;
-use OCP\IDBConnection;
 use OCP\IGroup;
 use OCP\IGroupManager;
-use OCP\IInitialStateService;
 use OCP\IL10N;
 use OCP\IRequest;
 use OCP\IUser;
@@ -50,9 +47,6 @@ class APIController extends OCSController {
 	/** @var IJobList */
 	protected $jobList;
 
-	/** @var IDBConnection */
-	protected $connection;
-
 	/** @var IGroupManager */
 	protected $groupManager;
 
@@ -65,42 +59,30 @@ class APIController extends OCSController {
 	/** @var Manager */
 	protected $manager;
 
-	/** @var IConfig */
-	protected $config;
-
 	/** @var ITimeFactory */
 	protected $timeFactory;
 
 	/** @var IUserSession */
 	protected $userSession;
 
-	/** @var IInitialStateService */
-	protected $initialState;
-
 	public function __construct(string $appName,
 								IRequest $request,
-								IDBConnection $connection,
 								IGroupManager $groupManager,
 								IUserManager $userManager,
 								IJobList $jobList,
 								IL10N $l,
 								Manager $manager,
-								IConfig $config,
 								ITimeFactory $timeFactory,
-								IUserSession $userSession,
-								IInitialStateService $initialState) {
+								IUserSession $userSession) {
 		parent::__construct($appName, $request);
 
-		$this->connection = $connection;
 		$this->groupManager = $groupManager;
 		$this->userManager = $userManager;
 		$this->jobList = $jobList;
 		$this->l = $l;
 		$this->manager = $manager;
-		$this->config = $config;
 		$this->timeFactory = $timeFactory;
 		$this->userSession = $userSession;
-		$this->initialState = $initialState;
 	}
 
 	/**
@@ -139,7 +121,7 @@ public function add(string $subject, string $message, array $groups, bool $activ
 
 		try {
 			$announcement = $this->manager->announce($subject, $message, $userId, $this->timeFactory->getTime(), $groups, $comments);
-		} catch (\InvalidArgumentException $e) {
+		} catch (InvalidArgumentException $e) {
 			return new DataResponse(
 				['error' => $this->l->t('The subject is too long or empty')],
 				Http::STATUS_BAD_REQUEST
@@ -170,7 +152,7 @@ protected function renderAnnouncement(Announcement $announcement): array {
 			'author' => $displayName,
 			'time' => $announcement->getTime(),
 			'subject' => $announcement->getSubject(),
-			'message' => $announcement->getParsedMessage(),
+			'message' => $announcement->getMessage(),
 			'groups' => null,
 			'comments' => $announcement->getAllowComments() ? $this->manager->getNumberOfComments($announcement) : false,
 		];
@@ -226,7 +208,7 @@ public function delete(int $id): DataResponse {
 	 * @NoAdminRequired
 	 *
 	 * @param int $id
-	 * @return Response
+	 * @return DataResponse
 	 */
 	public function removeNotifications(int $id): DataResponse {
 		if (!$this->manager->checkIsAdmin()) {
diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
index 00a8b5ef..b1f89437 100644
--- a/lib/Controller/PageController.php
+++ b/lib/Controller/PageController.php
@@ -27,41 +27,14 @@
 
 use OCA\AnnouncementCenter\AppInfo\Application;
 use OCA\AnnouncementCenter\Manager;
-use OCA\AnnouncementCenter\Model\Announcement;
-use OCP\AppFramework\Http;
-use OCP\AppFramework\Http\JSONResponse;
 use OCP\AppFramework\Http\TemplateResponse;
-use OCP\AppFramework\Http\Response;
 use OCP\AppFramework\Controller;
-use OCP\AppFramework\Utility\ITimeFactory;
-use OCP\BackgroundJob\IJobList;
+use OCP\AppFramework\Services\IInitialState;
 use OCP\IConfig;
-use OCP\IDBConnection;
-use OCP\IGroupManager;
-use OCP\IInitialStateService;
-use OCP\IL10N;
 use OCP\IRequest;
-use OCP\IUser;
-use OCP\IUserManager;
-use OCP\IUserSession;
-use OCA\AnnouncementCenter\BackgroundJob;
 
 class PageController extends Controller {
 
-	/** @var IJobList */
-	protected $jobList;
-
-	/** @var IDBConnection */
-	protected $connection;
-
-	/** @var IGroupManager */
-	protected $groupManager;
-
-	/** @var IUserManager */
-	protected $userManager;
-
-	/** @var IL10N */
-	protected $l;
 
 	/** @var Manager */
 	protected $manager;
@@ -69,159 +42,21 @@ class PageController extends Controller {
 	/** @var IConfig */
 	protected $config;
 
-	/** @var ITimeFactory */
-	protected $timeFactory;
-
-	/** @var IUserSession */
-	protected $userSession;
-
-	/** @var IInitialStateService */
+	/** @var IInitialState */
 	protected $initialState;
 
 	public function __construct(string $AppName,
 								IRequest $request,
-								IDBConnection $connection,
-								IGroupManager $groupManager,
-								IUserManager $userManager,
-								IJobList $jobList,
-								IL10N $l,
 								Manager $manager,
 								IConfig $config,
-								ITimeFactory $timeFactory,
-								IUserSession $userSession,
-								IInitialStateService $initialState) {
+								IInitialState $initialState) {
 		parent::__construct($AppName, $request);
 
-		$this->connection = $connection;
-		$this->groupManager = $groupManager;
-		$this->userManager = $userManager;
-		$this->jobList = $jobList;
-		$this->l = $l;
 		$this->manager = $manager;
 		$this->config = $config;
-		$this->timeFactory = $timeFactory;
-		$this->userSession = $userSession;
 		$this->initialState = $initialState;
 	}
 
-	/**
-	 * @NoAdminRequired
-	 * @NoCSRFRequired
-	 *
-	 * @param int $offset
-	 * @return JSONResponse
-	 */
-	public function get($offset = 0): JSONResponse {
-		$announcements = $this->manager->getAnnouncements($offset);
-		$data = array_map([$this, 'renderAnnouncement'], $announcements);
-		return new JSONResponse($data);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param string $subject
-	 * @param string $message
-	 * @param string[] $groups,
-	 * @param bool $activities
-	 * @param bool $notifications
-	 * @param bool $comments
-	 * @return JSONResponse
-	 */
-	public function add($subject, $message, array $groups, $activities, $notifications, $comments): JSONResponse {
-		if (!$this->manager->checkIsAdmin()) {
-			return new JSONResponse(
-				['message' => 'Logged in user must be an admin'],
-				Http::STATUS_FORBIDDEN
-			);
-		}
-		$user = $this->userSession->getUser();
-		$userId = $user instanceof IUser ? $user->getUID() : '';
-
-		try {
-			$announcement = $this->manager->announce($subject, $message, $userId, $this->timeFactory->getTime(), $groups, $comments);
-		} catch (\InvalidArgumentException $e) {
-			return new JSONResponse(
-				['error' => $this->l->t('The subject is too long or empty')],
-				Http::STATUS_BAD_REQUEST
-			);
-		}
-
-		if ($activities || $notifications) {
-			$this->jobList->add(BackgroundJob::class, [
-				'id' => $announcement->getId(),
-				'activities' => $activities,
-				'notifications' => $notifications,
-			]);
-		}
-
-		return new JSONResponse($this->renderAnnouncement($announcement));
-	}
-
-	protected function renderAnnouncement(Announcement $announcement): array {
-		$displayName = $announcement->getUser();
-		$user = $this->userManager->get($announcement->getUser());
-		if ($user instanceof IUser) {
-			$displayName = $user->getDisplayName();
-		}
-
-		$result = [
-			'id' => $announcement->getId(),
-			'author_id' => $announcement->getUser(),
-			'author' => $displayName,
-			'time' => $announcement->getTime(),
-			'subject' => $announcement->getSubject(),
-			'message' => $announcement->getParsedMessage(),
-			'groups' => null,
-			'comments' => $announcement->getAllowComments() ? $this->manager->getNumberOfComments($announcement) : false,
-		];
-
-		if ($this->manager->checkIsAdmin()) {
-			$result['groups'] = $this->manager->getGroups($announcement);
-			$result['notifications'] = $this->manager->hasNotifications($announcement);
-		}
-
-		return $result;
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param int $id
-	 * @return Response
-	 */
-	public function delete($id): Response {
-		if (!$this->manager->checkIsAdmin()) {
-			return new JSONResponse(
-				['message' => 'Logged in user must be an admin'],
-				Http::STATUS_FORBIDDEN
-			);
-		}
-
-		$this->manager->delete($id);
-
-		return new Response();
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param int $id
-	 * @return Response
-	 */
-	public function removeNotifications($id): Response {
-		if (!$this->manager->checkIsAdmin()) {
-			return new JSONResponse(
-				['message' => 'Logged in user must be an admin'],
-				Http::STATUS_FORBIDDEN
-			);
-		}
-
-		$this->manager->removeNotifications($id);
-
-		return new Response();
-	}
-
 	/**
 	 * @NoAdminRequired
 	 * @NoCSRFRequired
@@ -235,49 +70,22 @@ public function index($announcement = 0): TemplateResponse {
 		}
 
 		$this->initialState->provideInitialState(
-			Application::APP_ID,
 			'isAdmin',
 			$this->manager->checkIsAdmin()
 		);
 		$this->initialState->provideInitialState(
-			Application::APP_ID,
 			'createActivities',
-			$this->config->getAppValue('announcementcenter', 'create_activities', 'yes') === 'yes'
+			$this->config->getAppValue(Application::APP_ID, 'create_activities', 'yes') === 'yes'
 		);
 		$this->initialState->provideInitialState(
-			Application::APP_ID,
 			'createNotifications',
-			$this->config->getAppValue('announcementcenter', 'create_notifications', 'yes') === 'yes'
+			$this->config->getAppValue(Application::APP_ID, 'create_notifications', 'yes') === 'yes'
 		);
 		$this->initialState->provideInitialState(
-			Application::APP_ID,
 			'allowComments',
-			$this->config->getAppValue('announcementcenter', 'allow_comments', 'yes') === 'yes'
+			$this->config->getAppValue(Application::APP_ID, 'allow_comments', 'yes') === 'yes'
 		);
 
-		return new TemplateResponse('announcementcenter', 'main');
-	}
-
-	/**
-	 * @NoAdminRequired
-	 *
-	 * @param string $pattern
-	 * @return JSONResponse
-	 */
-	public function searchGroups($pattern): JSONResponse {
-		if (!$this->manager->checkIsAdmin()) {
-			return new JSONResponse(
-				['message' => 'Logged in user must be an admin'],
-				Http::STATUS_FORBIDDEN
-			);
-		}
-
-		$groups = $this->groupManager->search($pattern, 10);
-		$gids = [];
-		foreach ($groups as $group) {
-			$gids[] = $group->getGID();
-		}
-
-		return new JSONResponse($gids);
+		return new TemplateResponse(Application::APP_ID, 'main');
 	}
 }
diff --git a/package-lock.json b/package-lock.json
index 64eb415e..ea835066 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2487,6 +2487,58 @@
 				"to-fast-properties": "^2.0.0"
 			}
 		},
+		"@juliushaertl/vue-richtext": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/@juliushaertl/vue-richtext/-/vue-richtext-1.0.1.tgz",
+			"integrity": "sha512-h9fyBWgWEAamU2OHpQ+Irq5Y5zxqGdYc3dajh4X+r18bxqK3SY6kL39RA9msoGst5dx/dy7RBDoRemdF6M61ng==",
+			"requires": {
+				"clone": "^2.1.2",
+				"core-js": "^3.6.4",
+				"property-information": "^5.5.0",
+				"rehype-add-classes": "^1.0.0",
+				"rehype-react": "^6.1.0",
+				"remark-breaks": "2.0.0",
+				"remark-disable-tokenizers": "^1.0.0",
+				"remark-external-links": "^8.0.0",
+				"remark-parse": "^8.0.3",
+				"remark-rehype": "^8.0.0 ",
+				"unified": "^9.2.0",
+				"vue": "^2.6.12"
+			},
+			"dependencies": {
+				"remark-parse": {
+					"version": "8.0.3",
+					"resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-8.0.3.tgz",
+					"integrity": "sha512-E1K9+QLGgggHxCQtLt++uXltxEprmWzNfg+MxpfHsZlrddKzZ/hZyWHDbK3/Ap8HJQqYJRXP+jHczdL6q6i85Q==",
+					"requires": {
+						"ccount": "^1.0.0",
+						"collapse-white-space": "^1.0.2",
+						"is-alphabetical": "^1.0.0",
+						"is-decimal": "^1.0.0",
+						"is-whitespace-character": "^1.0.0",
+						"is-word-character": "^1.0.0",
+						"markdown-escapes": "^1.0.0",
+						"parse-entities": "^2.0.0",
+						"repeat-string": "^1.5.4",
+						"state-toggle": "^1.0.0",
+						"trim": "0.0.1",
+						"trim-trailing-lines": "^1.0.0",
+						"unherit": "^1.0.4",
+						"unist-util-remove-position": "^2.0.0",
+						"vfile-location": "^3.0.0",
+						"xtend": "^4.0.1"
+					}
+				}
+			}
+		},
+		"@mapbox/hast-util-table-cell-style": {
+			"version": "0.1.3",
+			"resolved": "https://registry.npmjs.org/@mapbox/hast-util-table-cell-style/-/hast-util-table-cell-style-0.1.3.tgz",
+			"integrity": "sha512-QsEsh5YaDvHoMQ2YHdvZy2iDnU3GgKVBTcHf6cILyoWDZtPSdlG444pL/ioPYO/GpXSfODBb9sefEetfC4v9oA==",
+			"requires": {
+				"unist-util-visit": "^1.3.0"
+			}
+		},
 		"@nextcloud/auth": {
 			"version": "1.3.0",
 			"resolved": "https://registry.npmjs.org/@nextcloud/auth/-/auth-1.3.0.tgz",
@@ -2858,7 +2910,6 @@
 			"version": "3.0.3",
 			"resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.3.tgz",
 			"integrity": "sha512-SXPBMnFVQg1s00dlMCc/jCdvPqdE4mXaMMCeRlxLDmTAEoegHT53xKtkDnzDTOcmMHUfcjyf36/YYZ6SxRdnsw==",
-			"dev": true,
 			"requires": {
 				"@types/unist": "*"
 			}
@@ -2897,8 +2948,7 @@
 		"@types/unist": {
 			"version": "2.0.3",
 			"resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.3.tgz",
-			"integrity": "sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ==",
-			"dev": true
+			"integrity": "sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ=="
 		},
 		"@vue/component-compiler-utils": {
 			"version": "3.2.0",
@@ -3587,8 +3637,7 @@
 		"bail": {
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/bail/-/bail-1.0.5.tgz",
-			"integrity": "sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==",
-			"dev": true
+			"integrity": "sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ=="
 		},
 		"balanced-match": {
 			"version": "1.0.0",
@@ -3702,6 +3751,11 @@
 			"integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
 			"dev": true
 		},
+		"boolbase": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+			"integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24="
+		},
 		"brace-expansion": {
 			"version": "1.1.11",
 			"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -3972,6 +4026,11 @@
 			"integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
 			"dev": true
 		},
+		"ccount": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/ccount/-/ccount-1.1.0.tgz",
+			"integrity": "sha512-vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg=="
+		},
 		"chalk": {
 			"version": "2.4.2",
 			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
@@ -3990,20 +4049,17 @@
 		"character-entities": {
 			"version": "1.2.4",
 			"resolved": "https://registry.npmjs.org/character-entities/-/character-entities-1.2.4.tgz",
-			"integrity": "sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==",
-			"dev": true
+			"integrity": "sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw=="
 		},
 		"character-entities-legacy": {
 			"version": "1.1.4",
 			"resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz",
-			"integrity": "sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==",
-			"dev": true
+			"integrity": "sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA=="
 		},
 		"character-reference-invalid": {
 			"version": "1.1.4",
 			"resolved": "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz",
-			"integrity": "sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==",
-			"dev": true
+			"integrity": "sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg=="
 		},
 		"chardet": {
 			"version": "0.7.0",
@@ -4225,6 +4281,11 @@
 				}
 			}
 		},
+		"clone": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+			"integrity": "sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18="
+		},
 		"clone-deep": {
 			"version": "4.0.1",
 			"resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz",
@@ -4251,6 +4312,11 @@
 			"integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
 			"dev": true
 		},
+		"collapse-white-space": {
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/collapse-white-space/-/collapse-white-space-1.0.6.tgz",
+			"integrity": "sha512-jEovNnrhMuqyCcjfEJA56v0Xq8SkIoPKDyaHahwo3POf4qcSXqMYuwNcOTzp74vTsR9Tn08z4MxWqAhcekogkQ=="
+		},
 		"collection-visit": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
@@ -4287,6 +4353,11 @@
 				"delayed-stream": "~1.0.0"
 			}
 		},
+		"comma-separated-tokens": {
+			"version": "1.0.8",
+			"resolved": "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-1.0.8.tgz",
+			"integrity": "sha512-GHuDRO12Sypu2cV70d1dkA2EUmXHgntrzbpvOB+Qy+49ypNfGgFQIC2fhhXbnyrJRynDCAARsT7Ou0M6hirpfw=="
+		},
 		"commander": {
 			"version": "4.1.1",
 			"resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
@@ -4598,6 +4669,11 @@
 				}
 			}
 		},
+		"css-selector-parser": {
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/css-selector-parser/-/css-selector-parser-1.4.1.tgz",
+			"integrity": "sha512-HYPSb7y/Z7BNDCOrakL4raGO2zltZkbeXyAd6Tg9obzix6QhzxCotdBl6VT0Dv4vZfJGVz3WL/xaEI9Ly3ul0g=="
+		},
 		"cssesc": {
 			"version": "3.0.0",
 			"resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
@@ -5740,8 +5816,7 @@
 		"extend": {
 			"version": "3.0.2",
 			"resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz",
-			"integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==",
-			"dev": true
+			"integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g=="
 		},
 		"extend-shallow": {
 			"version": "3.0.2",
@@ -6570,6 +6645,65 @@
 				"minimalistic-assert": "^1.0.1"
 			}
 		},
+		"hast-to-hyperscript": {
+			"version": "9.0.1",
+			"resolved": "https://registry.npmjs.org/hast-to-hyperscript/-/hast-to-hyperscript-9.0.1.tgz",
+			"integrity": "sha512-zQgLKqF+O2F72S1aa4y2ivxzSlko3MAvxkwG8ehGmNiqd98BIN3JM1rAJPmplEyLmGLO2QZYJtIneOSZ2YbJuA==",
+			"requires": {
+				"@types/unist": "^2.0.3",
+				"comma-separated-tokens": "^1.0.0",
+				"property-information": "^5.3.0",
+				"space-separated-tokens": "^1.0.0",
+				"style-to-object": "^0.3.0",
+				"unist-util-is": "^4.0.0",
+				"web-namespaces": "^1.0.0"
+			}
+		},
+		"hast-util-has-property": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/hast-util-has-property/-/hast-util-has-property-1.0.4.tgz",
+			"integrity": "sha512-ghHup2voGfgFoHMGnaLHOjbYFACKrRh9KFttdCzMCbFoBMJXiNi2+XTrPP8+q6cDJM/RSqlCfVWrjp1H201rZg=="
+		},
+		"hast-util-is-element": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/hast-util-is-element/-/hast-util-is-element-1.1.0.tgz",
+			"integrity": "sha512-oUmNua0bFbdrD/ELDSSEadRVtWZOf3iF6Lbv81naqsIV99RnSCieTbWuWCY8BAeEfKJTKl0gRdokv+dELutHGQ=="
+		},
+		"hast-util-select": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/hast-util-select/-/hast-util-select-1.0.1.tgz",
+			"integrity": "sha1-nxWR76YroL316kKYswGqrh2tYS0=",
+			"requires": {
+				"camelcase": "^3.0.0",
+				"comma-separated-tokens": "^1.0.2",
+				"css-selector-parser": "^1.3.0",
+				"hast-util-has-property": "^1.0.0",
+				"hast-util-is-element": "^1.0.0",
+				"hast-util-whitespace": "^1.0.0",
+				"not": "^0.1.0",
+				"nth-check": "^1.0.1",
+				"property-information": "^3.1.0",
+				"space-separated-tokens": "^1.1.0",
+				"zwitch": "^1.0.0"
+			},
+			"dependencies": {
+				"camelcase": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz",
+					"integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo="
+				},
+				"property-information": {
+					"version": "3.2.0",
+					"resolved": "https://registry.npmjs.org/property-information/-/property-information-3.2.0.tgz",
+					"integrity": "sha1-/RSDyPusYYCPX+NZ52k6H0ilgzE="
+				}
+			}
+		},
+		"hast-util-whitespace": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/hast-util-whitespace/-/hast-util-whitespace-1.0.4.tgz",
+			"integrity": "sha512-I5GTdSfhYfAPNztx2xJRQpG8cuDSNt599/7YUn7Gx/WxNMsG+a835k97TDkFgk123cwjfwINaZknkKkphx/f2A=="
+		},
 		"he": {
 			"version": "1.2.0",
 			"resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
@@ -6767,6 +6901,11 @@
 			"integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
 			"dev": true
 		},
+		"inline-style-parser": {
+			"version": "0.1.1",
+			"resolved": "https://registry.npmjs.org/inline-style-parser/-/inline-style-parser-0.1.1.tgz",
+			"integrity": "sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q=="
+		},
 		"inquirer": {
 			"version": "7.3.3",
 			"resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz",
@@ -6884,6 +7023,11 @@
 			"integrity": "sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==",
 			"dev": true
 		},
+		"is-absolute-url": {
+			"version": "3.0.3",
+			"resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz",
+			"integrity": "sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q=="
+		},
 		"is-accessor-descriptor": {
 			"version": "0.1.6",
 			"resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
@@ -6905,14 +7049,12 @@
 		"is-alphabetical": {
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz",
-			"integrity": "sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==",
-			"dev": true
+			"integrity": "sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg=="
 		},
 		"is-alphanumerical": {
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz",
 			"integrity": "sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==",
-			"dev": true,
 			"requires": {
 				"is-alphabetical": "^1.0.0",
 				"is-decimal": "^1.0.0"
@@ -6978,8 +7120,7 @@
 		"is-decimal": {
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.4.tgz",
-			"integrity": "sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==",
-			"dev": true
+			"integrity": "sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw=="
 		},
 		"is-descriptor": {
 			"version": "0.1.6",
@@ -7031,8 +7172,7 @@
 		"is-hexadecimal": {
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz",
-			"integrity": "sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==",
-			"dev": true
+			"integrity": "sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw=="
 		},
 		"is-negative-zero": {
 			"version": "2.0.1",
@@ -7060,8 +7200,7 @@
 		"is-plain-obj": {
 			"version": "2.1.0",
 			"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-2.1.0.tgz",
-			"integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==",
-			"dev": true
+			"integrity": "sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA=="
 		},
 		"is-plain-object": {
 			"version": "2.0.4",
@@ -7111,11 +7250,21 @@
 			"integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=",
 			"dev": true
 		},
+		"is-whitespace-character": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/is-whitespace-character/-/is-whitespace-character-1.0.4.tgz",
+			"integrity": "sha512-SDweEzfIZM0SJV0EUga669UTKlmL0Pq8Lno0QDQsPnvECB3IM2aP0gdx5TrU0A01MAPfViaZiI2V1QMZLaKK5w=="
+		},
 		"is-windows": {
 			"version": "1.0.2",
 			"resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
 			"integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA=="
 		},
+		"is-word-character": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/is-word-character/-/is-word-character-1.0.4.tgz",
+			"integrity": "sha512-5SMO8RVennx3nZrqtKwCGyyetPE9VDba5ugvKLaD4KopPG5kR4mQ7tNt/r7feL5yt5h3lpuBbIUmCOG2eSzXHA=="
+		},
 		"is-wsl": {
 			"version": "1.1.0",
 			"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz",
@@ -7471,6 +7620,11 @@
 				"object-visit": "^1.0.0"
 			}
 		},
+		"markdown-escapes": {
+			"version": "1.0.4",
+			"resolved": "https://registry.npmjs.org/markdown-escapes/-/markdown-escapes-1.0.4.tgz",
+			"integrity": "sha512-8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg=="
+		},
 		"material-colors": {
 			"version": "1.2.6",
 			"resolved": "https://registry.npmjs.org/material-colors/-/material-colors-1.2.6.tgz",
@@ -7503,6 +7657,35 @@
 				"safe-buffer": "^5.1.2"
 			}
 		},
+		"mdast-util-definitions": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/mdast-util-definitions/-/mdast-util-definitions-4.0.0.tgz",
+			"integrity": "sha512-k8AJ6aNnUkB7IE+5azR9h81O5EQ/cTDXtWdMq9Kk5KcEW/8ritU5CeLg/9HhOC++nALHBlaogJ5jz0Ybk3kPMQ==",
+			"requires": {
+				"unist-util-visit": "^2.0.0"
+			},
+			"dependencies": {
+				"unist-util-visit": {
+					"version": "2.0.3",
+					"resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-2.0.3.tgz",
+					"integrity": "sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q==",
+					"requires": {
+						"@types/unist": "^2.0.0",
+						"unist-util-is": "^4.0.0",
+						"unist-util-visit-parents": "^3.0.0"
+					}
+				},
+				"unist-util-visit-parents": {
+					"version": "3.1.1",
+					"resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz",
+					"integrity": "sha512-1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg==",
+					"requires": {
+						"@types/unist": "^2.0.0",
+						"unist-util-is": "^4.0.0"
+					}
+				}
+			}
+		},
 		"mdast-util-from-markdown": {
 			"version": "0.8.4",
 			"resolved": "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.4.tgz",
@@ -7516,6 +7699,42 @@
 				"unist-util-stringify-position": "^2.0.0"
 			}
 		},
+		"mdast-util-to-hast": {
+			"version": "10.1.1",
+			"resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-10.1.1.tgz",
+			"integrity": "sha512-+hvJrYiUgK2aY0Q1h1LaHQ4h0P7VVumWdAcUuG9k49lYglyU9GtTrA4O8hMh5gRnyT22wC15takM2qrrlpvNxQ==",
+			"requires": {
+				"@types/mdast": "^3.0.0",
+				"@types/unist": "^2.0.0",
+				"mdast-util-definitions": "^4.0.0",
+				"mdurl": "^1.0.0",
+				"unist-builder": "^2.0.0",
+				"unist-util-generated": "^1.0.0",
+				"unist-util-position": "^3.0.0",
+				"unist-util-visit": "^2.0.0"
+			},
+			"dependencies": {
+				"unist-util-visit": {
+					"version": "2.0.3",
+					"resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-2.0.3.tgz",
+					"integrity": "sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q==",
+					"requires": {
+						"@types/unist": "^2.0.0",
+						"unist-util-is": "^4.0.0",
+						"unist-util-visit-parents": "^3.0.0"
+					}
+				},
+				"unist-util-visit-parents": {
+					"version": "3.1.1",
+					"resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz",
+					"integrity": "sha512-1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg==",
+					"requires": {
+						"@types/unist": "^2.0.0",
+						"unist-util-is": "^4.0.0"
+					}
+				}
+			}
+		},
 		"mdast-util-to-markdown": {
 			"version": "0.6.2",
 			"resolved": "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-0.6.2.tgz",
@@ -7536,6 +7755,11 @@
 			"integrity": "sha512-AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==",
 			"dev": true
 		},
+		"mdurl": {
+			"version": "1.0.1",
+			"resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
+			"integrity": "sha1-/oWy7HWlkDfyrf7BAP1sYBdhFS4="
+		},
 		"memory-fs": {
 			"version": "0.2.0",
 			"resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.2.0.tgz",
@@ -8113,6 +8337,11 @@
 			"integrity": "sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=",
 			"dev": true
 		},
+		"not": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/not/-/not-0.1.0.tgz",
+			"integrity": "sha1-yWkcF0bFXc++VMvYvU/wQbwrUZ0="
+		},
 		"npmlog": {
 			"version": "4.1.2",
 			"resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
@@ -8125,6 +8354,14 @@
 				"set-blocking": "~2.0.0"
 			}
 		},
+		"nth-check": {
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.2.tgz",
+			"integrity": "sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==",
+			"requires": {
+				"boolbase": "~1.0.0"
+			}
+		},
 		"num2fraction": {
 			"version": "1.2.2",
 			"resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz",
@@ -8359,7 +8596,6 @@
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz",
 			"integrity": "sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==",
-			"dev": true,
 			"requires": {
 				"character-entities": "^1.0.0",
 				"character-entities-legacy": "^1.0.0",
@@ -8698,6 +8934,14 @@
 			"integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=",
 			"dev": true
 		},
+		"property-information": {
+			"version": "5.6.0",
+			"resolved": "https://registry.npmjs.org/property-information/-/property-information-5.6.0.tgz",
+			"integrity": "sha512-YUHSPk+A30YPv+0Qf8i9Mbfe/C0hdPXk1s1jPVToV8pk8BQtpw10ct89Eo7OWkutrwqvT0eicAxlOg3dOAu8JA==",
+			"requires": {
+				"xtend": "^4.0.0"
+			}
+		},
 		"prr": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
@@ -8986,6 +9230,23 @@
 				}
 			}
 		},
+		"rehype-add-classes": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/rehype-add-classes/-/rehype-add-classes-1.0.0.tgz",
+			"integrity": "sha512-Iz8t2KhCNAL+0AHKjxb+kVwsHk/pI3Cy4k0R70ZGzoQiZ7WQm3o8+3odJkMhFRfcNIK1lNShIHEdC90H5LwLdg==",
+			"requires": {
+				"hast-util-select": "^1.0.1"
+			}
+		},
+		"rehype-react": {
+			"version": "6.2.0",
+			"resolved": "https://registry.npmjs.org/rehype-react/-/rehype-react-6.2.0.tgz",
+			"integrity": "sha512-XpR3p8ejdJ5CSEKqAfASIrkD+KaHLy0JOqXu9zM32tvkr1cUeM7AeidF6Q8eQ/wtMvcJb+h/L4QRwg1eFwBggQ==",
+			"requires": {
+				"@mapbox/hast-util-table-cell-style": "^0.1.3",
+				"hast-to-hyperscript": "^9.0.0"
+			}
+		},
 		"remark": {
 			"version": "13.0.0",
 			"resolved": "https://registry.npmjs.org/remark/-/remark-13.0.0.tgz",
@@ -8997,6 +9258,52 @@
 				"unified": "^9.1.0"
 			}
 		},
+		"remark-breaks": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/remark-breaks/-/remark-breaks-2.0.0.tgz",
+			"integrity": "sha512-sDiB8dwX2/u42cf3PgjaGROG+q9ijh8SLbGZOU+7WNqL9M5ZQQ2hsVEfwqrJpsQTBcMkJvLACbwRpBftIiCVZQ=="
+		},
+		"remark-disable-tokenizers": {
+			"version": "1.0.24",
+			"resolved": "https://registry.npmjs.org/remark-disable-tokenizers/-/remark-disable-tokenizers-1.0.24.tgz",
+			"integrity": "sha512-HsAmBY5cNliHYAzba4zuskZzkDdp6sG+tRelDb4AoPo2YHNGHnxYsatShzTIsnRNLgCbsxycW5Ge6KigHn701A==",
+			"requires": {
+				"clone": "^2.1.2"
+			}
+		},
+		"remark-external-links": {
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/remark-external-links/-/remark-external-links-8.0.0.tgz",
+			"integrity": "sha512-5vPSX0kHoSsqtdftSHhIYofVINC8qmp0nctkeU9YoJwV3YfiBRiI6cbFRJ0oI/1F9xS+bopXG0m2KS8VFscuKA==",
+			"requires": {
+				"extend": "^3.0.0",
+				"is-absolute-url": "^3.0.0",
+				"mdast-util-definitions": "^4.0.0",
+				"space-separated-tokens": "^1.0.0",
+				"unist-util-visit": "^2.0.0"
+			},
+			"dependencies": {
+				"unist-util-visit": {
+					"version": "2.0.3",
+					"resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-2.0.3.tgz",
+					"integrity": "sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q==",
+					"requires": {
+						"@types/unist": "^2.0.0",
+						"unist-util-is": "^4.0.0",
+						"unist-util-visit-parents": "^3.0.0"
+					}
+				},
+				"unist-util-visit-parents": {
+					"version": "3.1.1",
+					"resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz",
+					"integrity": "sha512-1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg==",
+					"requires": {
+						"@types/unist": "^2.0.0",
+						"unist-util-is": "^4.0.0"
+					}
+				}
+			}
+		},
 		"remark-parse": {
 			"version": "9.0.0",
 			"resolved": "https://registry.npmjs.org/remark-parse/-/remark-parse-9.0.0.tgz",
@@ -9006,6 +9313,14 @@
 				"mdast-util-from-markdown": "^0.8.0"
 			}
 		},
+		"remark-rehype": {
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/remark-rehype/-/remark-rehype-8.0.0.tgz",
+			"integrity": "sha512-gVvOH02TMFqXOWoL6iXU7NXMsDJguNkNuMrzfkQeA4V6WCyHQnOKptn+IQBVVPuIH2sMJBwo8hlrmtn1MLTh9w==",
+			"requires": {
+				"mdast-util-to-hast": "^10.0.0"
+			}
+		},
 		"remark-stringify": {
 			"version": "9.0.1",
 			"resolved": "https://registry.npmjs.org/remark-stringify/-/remark-stringify-9.0.1.tgz",
@@ -9569,6 +9884,11 @@
 			"resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
 			"integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM="
 		},
+		"space-separated-tokens": {
+			"version": "1.1.5",
+			"resolved": "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-1.1.5.tgz",
+			"integrity": "sha512-q/JSVd1Lptzhf5bkYm4ob4iWPjx0KiRe3sRFBNrVqbJkFaBm5vbbowy1mymoPNLRa52+oadOhJ+K49wsSeSjTA=="
+		},
 		"spdx-correct": {
 			"version": "3.1.0",
 			"resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz",
@@ -9647,6 +9967,11 @@
 				"figgy-pudding": "^3.5.1"
 			}
 		},
+		"state-toggle": {
+			"version": "1.0.3",
+			"resolved": "https://registry.npmjs.org/state-toggle/-/state-toggle-1.0.3.tgz",
+			"integrity": "sha512-d/5Z4/2iiCnHw6Xzghyhb+GcmF89bxwgXG60wjIiZaxnymbyOmI8Hk4VqHXiVVp6u2ysaskFfXg3ekCj4WNftQ=="
+		},
 		"static-extend": {
 			"version": "0.1.2",
 			"resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
@@ -9872,6 +10197,14 @@
 			"integrity": "sha1-eVjHk+R+MuB9K1yv5cC/jhLneQI=",
 			"dev": true
 		},
+		"style-to-object": {
+			"version": "0.3.0",
+			"resolved": "https://registry.npmjs.org/style-to-object/-/style-to-object-0.3.0.tgz",
+			"integrity": "sha512-CzFnRRXhzWIdItT3OmF8SQfWyahHhjq3HwcMNCNLn+N7klOOqPjMeG/4JSu77D7ypZdGvSzvkrbyeTMizz2VrA==",
+			"requires": {
+				"inline-style-parser": "0.1.1"
+			}
+		},
 		"stylelint": {
 			"version": "13.9.0",
 			"resolved": "https://registry.npmjs.org/stylelint/-/stylelint-13.9.0.tgz",
@@ -10902,17 +11235,26 @@
 			"resolved": "https://registry.npmjs.org/tributejs/-/tributejs-5.1.3.tgz",
 			"integrity": "sha512-B5CXihaVzXw+1UHhNFyAwUTMDk1EfoLP5Tj1VhD9yybZ1I8DZJEv8tZ1l0RJo0t0tk9ZhR8eG5tEsaCvRigmdQ=="
 		},
+		"trim": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/trim/-/trim-0.0.1.tgz",
+			"integrity": "sha1-WFhUf2spB1fulczMZm+1AITEYN0="
+		},
 		"trim-newlines": {
 			"version": "1.0.0",
 			"resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
 			"integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
 			"dev": true
 		},
+		"trim-trailing-lines": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.4.tgz",
+			"integrity": "sha512-rjUWSqnfTNrjbB9NQWfPMH/xRK1deHeGsHoVfpxJ++XeYXE0d6B1En37AHfw3jtfTU7dzMzZL2jjpe8Qb5gLIQ=="
+		},
 		"trough": {
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz",
-			"integrity": "sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==",
-			"dev": true
+			"integrity": "sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA=="
 		},
 		"true-case-path": {
 			"version": "1.0.3",
@@ -11003,6 +11345,15 @@
 				"is-typedarray": "^1.0.0"
 			}
 		},
+		"unherit": {
+			"version": "1.1.3",
+			"resolved": "https://registry.npmjs.org/unherit/-/unherit-1.1.3.tgz",
+			"integrity": "sha512-Ft16BJcnapDKp0+J/rqFC3Rrk6Y/Ng4nzsC028k2jdDII/rdZ7Wd3pPT/6+vIIxRagwRc9K0IUX0Ra4fKvw+WQ==",
+			"requires": {
+				"inherits": "^2.0.0",
+				"xtend": "^4.0.0"
+			}
+		},
 		"unicode-canonical-property-names-ecmascript": {
 			"version": "1.0.4",
 			"resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz",
@@ -11031,7 +11382,6 @@
 			"version": "9.2.0",
 			"resolved": "https://registry.npmjs.org/unified/-/unified-9.2.0.tgz",
 			"integrity": "sha512-vx2Z0vY+a3YoTj8+pttM3tiJHCwY5UFbYdiWrwBEbHmK8pvsPj2rtAX2BFfgXen8T39CJWblWRDT4L5WGXtDdg==",
-			"dev": true,
 			"requires": {
 				"bail": "^1.0.0",
 				"extend": "^3.0.0",
@@ -11044,8 +11394,7 @@
 				"is-buffer": {
 					"version": "2.0.5",
 					"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz",
-					"integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==",
-					"dev": true
+					"integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ=="
 				}
 			}
 		},
@@ -11084,6 +11433,11 @@
 				"imurmurhash": "^0.1.4"
 			}
 		},
+		"unist-builder": {
+			"version": "2.0.3",
+			"resolved": "https://registry.npmjs.org/unist-builder/-/unist-builder-2.0.3.tgz",
+			"integrity": "sha512-f98yt5pnlMWlzP539tPc4grGMsFaQQlP/vM396b00jngsiINumNmsY8rkXjfoi1c6QaM8nQ3vaGDuoKWbe/1Uw=="
+		},
 		"unist-util-find-all-after": {
 			"version": "3.0.2",
 			"resolved": "https://registry.npmjs.org/unist-util-find-all-after/-/unist-util-find-all-after-3.0.2.tgz",
@@ -11093,21 +11447,81 @@
 				"unist-util-is": "^4.0.0"
 			}
 		},
+		"unist-util-generated": {
+			"version": "1.1.6",
+			"resolved": "https://registry.npmjs.org/unist-util-generated/-/unist-util-generated-1.1.6.tgz",
+			"integrity": "sha512-cln2Mm1/CZzN5ttGK7vkoGw+RZ8VcUH6BtGbq98DDtRGquAAOXig1mrBQYelOwMXYS8rK+vZDyyojSjp7JX+Lg=="
+		},
 		"unist-util-is": {
 			"version": "4.0.4",
 			"resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.0.4.tgz",
-			"integrity": "sha512-3dF39j/u423v4BBQrk1AQ2Ve1FxY5W3JKwXxVFzBODQ6WEvccguhgp802qQLKSnxPODE6WuRZtV+ohlUg4meBA==",
-			"dev": true
+			"integrity": "sha512-3dF39j/u423v4BBQrk1AQ2Ve1FxY5W3JKwXxVFzBODQ6WEvccguhgp802qQLKSnxPODE6WuRZtV+ohlUg4meBA=="
+		},
+		"unist-util-position": {
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/unist-util-position/-/unist-util-position-3.1.0.tgz",
+			"integrity": "sha512-w+PkwCbYSFw8vpgWD0v7zRCl1FpY3fjDSQ3/N/wNd9Ffa4gPi8+4keqt99N3XW6F99t/mUzp2xAhNmfKWp95QA=="
+		},
+		"unist-util-remove-position": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/unist-util-remove-position/-/unist-util-remove-position-2.0.1.tgz",
+			"integrity": "sha512-fDZsLYIe2uT+oGFnuZmy73K6ZxOPG/Qcm+w7jbEjaFcJgbQ6cqjs/eSPzXhsmGpAsWPkqZM9pYjww5QTn3LHMA==",
+			"requires": {
+				"unist-util-visit": "^2.0.0"
+			},
+			"dependencies": {
+				"unist-util-visit": {
+					"version": "2.0.3",
+					"resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-2.0.3.tgz",
+					"integrity": "sha512-iJ4/RczbJMkD0712mGktuGpm/U4By4FfDonL7N/9tATGIF4imikjOuagyMY53tnZq3NP6BcmlrHhEKAfGWjh7Q==",
+					"requires": {
+						"@types/unist": "^2.0.0",
+						"unist-util-is": "^4.0.0",
+						"unist-util-visit-parents": "^3.0.0"
+					}
+				},
+				"unist-util-visit-parents": {
+					"version": "3.1.1",
+					"resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-3.1.1.tgz",
+					"integrity": "sha512-1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg==",
+					"requires": {
+						"@types/unist": "^2.0.0",
+						"unist-util-is": "^4.0.0"
+					}
+				}
+			}
 		},
 		"unist-util-stringify-position": {
 			"version": "2.0.3",
 			"resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz",
 			"integrity": "sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==",
-			"dev": true,
 			"requires": {
 				"@types/unist": "^2.0.2"
 			}
 		},
+		"unist-util-visit": {
+			"version": "1.4.1",
+			"resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-1.4.1.tgz",
+			"integrity": "sha512-AvGNk7Bb//EmJZyhtRUnNMEpId/AZ5Ph/KUpTI09WHQuDZHKovQ1oEv3mfmKpWKtoMzyMC4GLBm1Zy5k12fjIw==",
+			"requires": {
+				"unist-util-visit-parents": "^2.0.0"
+			}
+		},
+		"unist-util-visit-parents": {
+			"version": "2.1.2",
+			"resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-2.1.2.tgz",
+			"integrity": "sha512-DyN5vD4NE3aSeB+PXYNKxzGsfocxp6asDc2XXE3b0ekO2BaRUpBicbbUygfSvYfUz1IkmjFR1YF7dPklraMZ2g==",
+			"requires": {
+				"unist-util-is": "^3.0.0"
+			},
+			"dependencies": {
+				"unist-util-is": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-3.0.0.tgz",
+					"integrity": "sha512-sVZZX3+kspVNmLWBPAB6r+7D9ZgAFPNWm66f7YNb420RlQSbn+n8rG8dGZSkrER7ZIXGQYNm5pqC3v3HopH24A=="
+				}
+			}
+		},
 		"universalify": {
 			"version": "0.1.2",
 			"resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
@@ -11353,7 +11767,6 @@
 			"version": "4.2.1",
 			"resolved": "https://registry.npmjs.org/vfile/-/vfile-4.2.1.tgz",
 			"integrity": "sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA==",
-			"dev": true,
 			"requires": {
 				"@types/unist": "^2.0.0",
 				"is-buffer": "^2.0.0",
@@ -11364,16 +11777,19 @@
 				"is-buffer": {
 					"version": "2.0.5",
 					"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz",
-					"integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==",
-					"dev": true
+					"integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ=="
 				}
 			}
 		},
+		"vfile-location": {
+			"version": "3.2.0",
+			"resolved": "https://registry.npmjs.org/vfile-location/-/vfile-location-3.2.0.tgz",
+			"integrity": "sha512-aLEIZKv/oxuCDZ8lkJGhuhztf/BW4M+iHdCwglA/eWc+vtuRFJj8EtgceYFX4LRjOhCAAiNHsKGssC6onJ+jbA=="
+		},
 		"vfile-message": {
 			"version": "2.0.4",
 			"resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.4.tgz",
 			"integrity": "sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==",
-			"dev": true,
 			"requires": {
 				"@types/unist": "^2.0.0",
 				"unist-util-stringify-position": "^2.0.0"
@@ -11586,6 +12002,11 @@
 				}
 			}
 		},
+		"web-namespaces": {
+			"version": "1.1.4",
+			"resolved": "https://registry.npmjs.org/web-namespaces/-/web-namespaces-1.1.4.tgz",
+			"integrity": "sha512-wYxSGajtmoP4WxfejAPIr4l0fVh+jeMXZb08wNc0tMg6xsfZXj3cECqIK0G7ZAqUq0PP8WlMDtaOGVBTAWztNw=="
+		},
 		"webpack": {
 			"version": "4.46.0",
 			"resolved": "https://registry.npmjs.org/webpack/-/webpack-4.46.0.tgz",
@@ -11899,8 +12320,7 @@
 		"xtend": {
 			"version": "4.0.2",
 			"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-			"integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
-			"dev": true
+			"integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
 		},
 		"y18n": {
 			"version": "4.0.0",
@@ -11979,8 +12399,7 @@
 		"zwitch": {
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/zwitch/-/zwitch-1.0.5.tgz",
-			"integrity": "sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==",
-			"dev": true
+			"integrity": "sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw=="
 		}
 	}
 }
diff --git a/package.json b/package.json
index 37e0b63a..d3cbbcba 100644
--- a/package.json
+++ b/package.json
@@ -14,6 +14,7 @@
 		"stylelint:fix": "stylelint css/*.css css/*.scss src/**/*.scss src/**/*.vue --fix"
 	},
 	"dependencies": {
+		"@juliushaertl/vue-richtext": "^1.0.1",
 		"@nextcloud/auth": "^1.3.0",
 		"@nextcloud/axios": "^1.6.0",
 		"@nextcloud/dialogs": "^3.1.1",
diff --git a/src/Components/Announcement.vue b/src/Components/Announcement.vue
index 62071017..2568b47d 100644
--- a/src/Components/Announcement.vue
+++ b/src/Components/Announcement.vue
@@ -76,9 +76,12 @@
 			v-if="message"
 			class="announcement__message"
 			@click="onClickFoldedMessage">
-			<p
-				:class="{'announcement__message--folded': isMessageFolded}"
-				v-html="message" />
+			<RichText
+				:text="message"
+				:arguments="[]"
+				:autolink="true"
+				:use-markdown="true"
+				:class="{'announcement__message--folded': isMessageFolded}" />
 
 			<div
 				v-if="isMessageFolded"
@@ -95,6 +98,7 @@
 </template>
 
 <script>
+import RichText from '@juliushaertl/vue-richtext'
 import Actions from '@nextcloud/vue/dist/Components/Actions'
 import ActionButton from '@nextcloud/vue/dist/Components/ActionButton'
 import Avatar from '@nextcloud/vue/dist/Components/Avatar'
@@ -113,6 +117,7 @@ export default {
 		Actions,
 		ActionButton,
 		Avatar,
+		RichText,
 	},
 	props: {
 		isAdmin: {
diff --git a/src/main.js b/src/main.js
index 7cd6cf72..3c00b10c 100644
--- a/src/main.js
+++ b/src/main.js
@@ -30,6 +30,7 @@ import Vuex from 'vuex'
 
 // Styles
 import '@nextcloud/dialogs/styles/toast.scss'
+import '@juliushaertl/vue-richtext/dist/vue-richtext.scss'
 
 // eslint-disable-next-line
 __webpack_nonce__ = btoa(getRequestToken())
diff --git a/tests/Controller/APIControllerTest.php b/tests/Controller/APIControllerTest.php
new file mode 100644
index 00000000..1386d397
--- /dev/null
+++ b/tests/Controller/APIControllerTest.php
@@ -0,0 +1,425 @@
+<?php
+/**
+ * @copyright Copyright (c) 2016, Joas Schilling <coding@schilljs.com>
+ *
+ * @author Joas Schilling <coding@schilljs.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\AnnouncementCenter\Tests\Controller;
+
+use OCA\AnnouncementCenter\Controller\APIController;
+use OCA\AnnouncementCenter\Manager;
+use OCA\AnnouncementCenter\Model\Announcement;
+use OCA\AnnouncementCenter\Tests\TestCase;
+use OCP\AppFramework\Http;
+use OCP\AppFramework\Utility\ITimeFactory;
+use OCP\BackgroundJob\IJobList;
+use OCP\IConfig;
+use OCP\IGroupManager;
+use OCP\IInitialStateService;
+use OCP\IL10N;
+use OCP\IRequest;
+use OCP\IUserManager;
+use OCP\IUserSession;
+use OCP\IUser;
+use OCP\AppFramework\Http\DataResponse;
+use OCP\IGroup;
+use PHPUnit\Framework\MockObject\MockBuilder;
+use PHPUnit\Framework\MockObject\MockObject;
+
+/**
+ * @package OCA\AnnouncementCenter\Tests\Controller
+ */
+class APIControllerTest extends TestCase {
+	/** @var IRequest|MockObject */
+	protected $request;
+	/** @var IGroupManager|MockObject */
+	protected $groupManager;
+	/** @var IUserManager|MockObject */
+	protected $userManager;
+	/** @var IJobList|MockObject */
+	protected $jobList;
+	/** @var IL10N|MockObject */
+	protected $l;
+	/** @var Manager|MockObject */
+	protected $manager;
+	/** @var IConfig|MockObject */
+	protected $config;
+	/** @var ITimeFactory|MockObject */
+	protected $timeFactory;
+	/** @var IUserSession|MockObject */
+	protected $userSession;
+	/** @var IInitialStateService|MockObject */
+	protected $initialStateService;
+
+	protected function setUp(): void {
+		parent::setUp();
+
+		$this->request = $this->createMock(IRequest::class);
+		$this->groupManager = $this->createMock(IGroupManager::class);
+		$this->userManager = $this->createMock(IUserManager::class);
+		$this->jobList = $this->createMock(IJobList::class);
+		$this->l = $this->createMock(IL10N::class);
+		$this->manager = $this->createMock(Manager::class);
+		$this->timeFactory = $this->createMock(ITimeFactory::class);
+		$this->userSession = $this->createMock(IUserSession::class);
+
+		$this->l
+			->method('t')
+			->willReturnCallback(function ($string, $args) {
+				return vsprintf($string, $args);
+			});
+	}
+
+	protected function getController(array $methods = []): APIController {
+		if (empty($methods)) {
+			return new APIController(
+				'announcementcenter',
+				$this->request,
+				$this->groupManager,
+				$this->userManager,
+				$this->jobList,
+				$this->l,
+				$this->manager,
+				$this->timeFactory,
+				$this->userSession,
+			);
+		}
+
+		/** @var APIController|MockBuilder $mock */
+		$mock = $this->getMockBuilder(APIController::class);
+		return $mock->setConstructorArgs([
+			'announcementcenter',
+			$this->request,
+			$this->groupManager,
+			$this->userManager,
+			$this->jobList,
+			$this->l,
+			$this->manager,
+			$this->timeFactory,
+			$this->userSession,
+		])
+			->setMethods($methods)
+			->getMock();
+	}
+
+	protected function getUserMock(string $uid, string $displayName): IUser {
+		/** @var IUser|MockObject $user */
+		$user = $this->createMock(IUser::class);
+		$user
+			->method('getUID')
+			->willReturn($uid);
+		$user
+			->method('getDisplayName')
+			->willReturn($displayName);
+		return $user;
+	}
+
+	public function dataGet(): array {
+		return [
+			[0, [], [], []],
+			[1, [], [], []],
+			[2, [], [], []],
+			[
+				1,
+				[
+					['id' => 1337, 'author' => 'author1', 'subject' => 'Subject #1', 'message' => 'Message #1', 'time' => 1440672792, 'groups' => ['gid1'], 'comments' => false],
+				], [],
+				[
+					['id' => 1337, 'author' => 'author1', 'author_id' => 'author1', 'subject' => 'Subject #1', 'message' => 'Message #1', 'time' => 1440672792, 'groups' => ['gid1'], 'comments' => false],
+				],
+			],
+			[
+				1,
+				[
+					['id' => 23, 'author' => 'author1', 'subject' => 'Subject #1', 'message' => 'Message #1', 'time' => 1440672792, 'groups' => ['gid1'], 'comments' => false],
+				],
+				[
+					['author1', $this->getUserMock('author1', 'Author One')],
+				],
+				[
+					['id' => 23, 'author' => 'Author One', 'author_id' => 'author1', 'subject' => 'Subject #1', 'message' => 'Message #1', 'time' => 1440672792, 'groups' => ['gid1'], 'comments' => false],
+				],
+			],
+			[
+				1,
+				[
+					['id' => 42, 'author' => 'author1', 'subject' => "Subject\n<html>#1</html>", 'message' => "Message\n<html>#1</html>", 'time' => 1440672792, 'groups' => null, 'comments' => 31],
+				],
+				[],
+				[
+					['id' => 42, 'author' => 'author1', 'author_id' => 'author1', 'subject' => 'Subject <html>#1</html>', 'message' => 'Message<br />&lt;html&gt;#1&lt;/html&gt;', 'time' => 1440672792, 'groups' => null, 'comments' => 31],
+				],
+			],
+		];
+	}
+
+	/**
+	 * @dataProvider dataGet
+	 * @param int $offset
+	 * @param array $announcements
+	 * @param array $userMap
+	 * @param array $expected
+	 */
+	public function legacyTestGet($offset, $announcements, $userMap, $expected) {
+		$this->userManager
+			->method('get')
+			->willReturnMap($userMap);
+
+		$comments = [];
+		$announcements = array_map(function (array $data) use (&$comments) {
+			$announcement = new Announcement();
+			$announcement->setId($data['id']);
+			$announcement->setUser($data['author']);
+			$announcement->setSubject($data['subject']);
+			$announcement->setMessage($data['message']);
+			$announcement->setTime($data['time']);
+			$announcement->setAllowComments($data['comments'] === false ? 0 : 1);
+
+			if ($data['comments'] !== false) {
+				$comments[] = [$announcement, $data['comments']];
+			}
+
+			return $announcement;
+		}, $announcements);
+
+		$this->manager
+			->method('getAnnouncements')
+			->with($offset)
+			->willReturn($announcements);
+
+		$this->manager->expects(self::exactly(count($comments)))
+			->method('getNumberOfComments')
+			->willReturnMap($comments);
+
+		$controller = $this->getController();
+		$jsonResponse = $controller->get($offset);
+
+		self::assertEquals($expected, $jsonResponse->getData());
+	}
+
+	public function dataDelete(): array {
+		return [
+			[42, true, Http::STATUS_OK],
+			[1337, false, Http::STATUS_FORBIDDEN],
+		];
+	}
+
+	/**
+	 * @dataProvider dataDelete
+	 * @param int $id
+	 * @param bool $isAdmin
+	 * @param int $statusCode
+	 */
+	public function testDelete($id, $isAdmin, $statusCode) {
+		$this->manager->expects(self::once())
+			->method('checkIsAdmin')
+			->willReturn($isAdmin);
+
+		if ($isAdmin) {
+			$this->manager->expects(self::once())
+				->method('delete')
+				->with($id);
+		} else {
+			$this->manager->expects(self::never())
+				->method('delete');
+		}
+
+		$controller = $this->getController();
+		$response = $controller->delete($id);
+
+		self::assertEquals($statusCode, $response->getStatus());
+	}
+
+	public function dataAddThrows() {
+		return [
+			['', ['error' => 'The subject is too long or empty']],
+			[str_repeat('a', 513), ['error' => 'The subject is too long or empty']],
+		];
+	}
+
+	/**
+	 * @dataProvider dataAddThrows
+	 * @param string $subject
+	 * @param array $expectedData
+	 */
+	public function testAddThrows($subject, array $expectedData) {
+		$this->manager->expects(self::once())
+			->method('checkIsAdmin')
+			->willReturn(true);
+		$this->userSession->expects(self::once())
+			->method('getUser')
+			->willReturn($this->getUserMock('author', 'author'));
+
+		$this->manager->expects(self::once())
+			->method('announce')
+			->with($subject, '', 'author', self::anything())
+			->willThrowException(new \InvalidArgumentException());
+
+		$controller = $this->getController(['createPublicity']);
+		$controller->expects(self::never())
+			->method('createPublicity');
+
+		$response = $controller->add($subject, '', [], true, true, true);
+
+		self::assertInstanceOf(DataResponse::class, $response);
+		self::assertSame($expectedData, $response->getData());
+	}
+
+	public function testAddNoAdmin() {
+		$this->manager->expects(self::once())
+			->method('checkIsAdmin')
+			->willReturn(false);
+
+		$this->manager->expects(self::never())
+			->method('announce');
+		$this->jobList->expects(self::never())
+			->method('add');
+
+		$controller = $this->getController(['createPublicity']);
+		$controller->expects(self::never())
+			->method('createPublicity');
+
+		$response = $controller->add('subject', '', [], true, true, true);
+
+		self::assertInstanceOf(DataResponse::class, $response);
+		self::assertSame(Http::STATUS_FORBIDDEN, $response->getStatus());
+	}
+
+	public function dataAdd() {
+		return [
+			['subject1', 'message1', ['gid1'], true, true, false],
+			['subject2', 'message2', ['gid2'], true, false, false],
+			['subject3', 'message3', ['gid3'], false, true, false],
+			['subject4', 'message4', ['gid4'], false, false, false],
+			['subject4', 'message4', ['gid4'], false, false, true],
+		];
+	}
+
+	/**
+	 * @dataProvider dataAdd
+	 *
+	 * @param string $subject
+	 * @param string $message
+	 * @param array $groups
+	 * @param bool $activities
+	 * @param bool $notifications
+	 * @param bool $comments
+	 */
+	public function legacyTestAdd($subject, $message, array $groups, $activities, $notifications, $comments) {
+		$this->manager->expects(self::once())
+			->method('checkIsAdmin')
+			->willReturn(true);
+		$this->userSession->expects(self::once())
+			->method('getUser')
+			->willReturn($this->getUserMock('author', 'author'));
+
+		$this->manager->expects(self::once())
+			->method('announce')
+			->with($subject, $message, 'author', self::anything(), $groups, $comments)
+			->willReturn([
+				'author' => 'author',
+				'subject' => $subject,
+				'message' => $message,
+				'time' => time(),
+				'id' => 10,
+				'comments' => $comments,
+			]);
+		$this->userManager->expects(self::once())
+			->method('get')
+			->with('author')
+			->willReturn($this->getUserMock('author', 'Author'));
+		$this->jobList->expects(($activities || $notifications) ? self::once() : self::never())
+			->method('add')
+			->with('OCA\AnnouncementCenter\BackgroundJob', [
+				'id' => 10,
+				'activities' => $activities,
+				'notifications' => $notifications,
+			]);
+
+		$controller = $this->getController();
+
+		$response = $controller->add($subject, $message, $groups, $activities, $notifications, $comments);
+
+		self::assertInstanceOf(DataResponse::class, $response);
+		$data = $response->getData();
+		self::assertArrayHasKey('time', $data);
+		self::assertInternalType('int', $data['time']);
+		unset($data['time']);
+		self::assertEquals([
+			'author' => 'Author',
+			'author_id' => 'author',
+			'subject' => $subject,
+			'message' => $message,
+			'id' => 10,
+			'comments' => $comments,
+			'notifications' => $notifications,
+		], $data);
+	}
+
+	protected function getGroupMock(string $gid): IGroup {
+		/** @var IGroup|MockObject $group */
+		$group = $this->createMock(IGroup::class);
+
+		$group
+			->method('getGID')
+			->willReturn($gid);
+		$group
+			->method('getDisplayName')
+			->willReturn($gid . '-displayname');
+
+		return $group;
+	}
+
+	public function dataSearchGroup(): array {
+		return [
+			[true, 'gid', [], [], Http::STATUS_OK],
+			[true, 'gid', [$this->getGroupMock('gid1'), $this->getGroupMock('gid2')], [['id' => 'gid1', 'label' => 'gid1-displayname'], ['id' => 'gid2', 'label' => 'gid2-displayname']], Http::STATUS_OK],
+			[false, '', null, ['message' => 'Logged in user must be an admin'], Http::STATUS_FORBIDDEN],
+		];
+	}
+
+	/**
+	 * @dataProvider dataSearchGroup
+	 * @param bool $isAdmin
+	 * @param string $pattern
+	 * @param array|null $groupSearch
+	 * @param string $expected
+	 * @param int $code
+	 */
+	public function testSearchGroup(bool $isAdmin, string $pattern, $groupSearch, array $expected, int $code) {
+		$this->manager->expects(self::once())
+			->method('checkIsAdmin')
+			->willReturn($isAdmin);
+
+		if ($groupSearch !== null) {
+			$this->groupManager->expects(self::once())
+				->method('search')
+				->willReturn($groupSearch);
+		} else {
+			$this->groupManager->expects(self::never())
+				->method('search');
+		}
+
+		$controller = $this->getController();
+		$response = $controller->searchGroups($pattern);
+		self::assertSame($code, $response->getStatus());
+		self::assertSame($expected, $response->getData());
+	}
+}
diff --git a/tests/Controller/PageControllerTest.php b/tests/Controller/PageControllerTest.php
index d4755c5f..fe94feec 100644
--- a/tests/Controller/PageControllerTest.php
+++ b/tests/Controller/PageControllerTest.php
@@ -23,366 +23,44 @@
 
 namespace OCA\AnnouncementCenter\Tests\Controller;
 
-use OCA\AnnouncementCenter\AppInfo\Application;
 use OCA\AnnouncementCenter\Controller\PageController;
 use OCA\AnnouncementCenter\Manager;
-use OCA\AnnouncementCenter\Model\Announcement;
 use OCA\AnnouncementCenter\Tests\TestCase;
-use OCP\AppFramework\Http;
-use OCP\AppFramework\Utility\ITimeFactory;
-use OCP\BackgroundJob\IJobList;
+use OCP\AppFramework\Services\IInitialState;
 use OCP\IConfig;
-use OCP\IGroupManager;
-use OCP\IInitialStateService;
-use OCP\IL10N;
 use OCP\IRequest;
-use OCP\IUserManager;
-use OCP\IUserSession;
-use OCP\IUser;
-use OCP\AppFramework\Http\JSONResponse;
-use OCP\IGroup;
-use PHPUnit\Framework\MockObject\MockBuilder;
 use PHPUnit\Framework\MockObject\MockObject;
 
 /**
- * Class PageController
- *
  * @package OCA\AnnouncementCenter\Tests\Controller
- * @group DB
  */
 class PageControllerTest extends TestCase {
 	/** @var IRequest|MockObject */
 	protected $request;
-	/** @var IGroupManager|MockObject */
-	protected $groupManager;
-	/** @var IUserManager|MockObject */
-	protected $userManager;
-	/** @var IJobList|MockObject */
-	protected $jobList;
-	/** @var IL10N|MockObject */
-	protected $l;
 	/** @var Manager|MockObject */
 	protected $manager;
 	/** @var IConfig|MockObject */
 	protected $config;
-	/** @var ITimeFactory|MockObject */
-	protected $timeFactory;
-	/** @var IUserSession|MockObject */
-	protected $userSession;
-	/** @var IInitialStateService|MockObject */
-	protected $initialStateService;
+	/** @var IInitialState|MockObject */
+	protected $initialState;
 
 	protected function setUp(): void {
 		parent::setUp();
 
 		$this->request = $this->createMock(IRequest::class);
-		$this->groupManager = $this->createMock(IGroupManager::class);
-		$this->userManager = $this->createMock(IUserManager::class);
-		$this->l = $this->createMock(IL10N::class);
-		$this->jobList = $this->createMock(IJobList::class);
 		$this->manager = $this->createMock(Manager::class);
 		$this->config = $this->createMock(IConfig::class);
-		$this->timeFactory = $this->createMock(ITimeFactory::class);
-		$this->userSession = $this->createMock(IUserSession::class);
-		$this->initialStateService = $this->createMock(IInitialStateService::class);
-
-		$this->l
-			->method('t')
-			->willReturnCallback(function ($string, $args) {
-				return vsprintf($string, $args);
-			});
+		$this->initialState = $this->createMock(IInitialState::class);
 	}
 
-	protected function getController(array $methods = []): PageController {
-		if (empty($methods)) {
-			return new PageController(
-				'announcementcenter',
-				$this->request,
-				\OC::$server->getDatabaseConnection(),
-				$this->groupManager,
-				$this->userManager,
-				$this->jobList,
-				$this->l,
-				$this->manager,
-				$this->config,
-				$this->timeFactory,
-				$this->userSession,
-				$this->initialStateService
-			);
-		}
-
-		/** @var PageController|MockBuilder $mock */
-		$mock = $this->getMockBuilder(PageController::class);
-		return $mock->setConstructorArgs([
+	protected function getController(): PageController {
+		return new PageController(
 			'announcementcenter',
 			$this->request,
-			\OC::$server->getDatabaseConnection(),
-			$this->groupManager,
-			$this->userManager,
-			$this->jobList,
-			$this->l,
 			$this->manager,
 			$this->config,
-			$this->timeFactory,
-			$this->userSession,
-			$this->initialStateService,
-		])
-			->setMethods($methods)
-			->getMock();
-	}
-
-	protected function getUserMock(string $uid, string $displayName): IUser {
-		/** @var IUser|MockObject $user */
-		$user = $this->createMock(IUser::class);
-		$user
-			->method('getUID')
-			->willReturn($uid);
-		$user
-			->method('getDisplayName')
-			->willReturn($displayName);
-		return $user;
-	}
-
-	public function dataGet(): array {
-		return [
-			[0, [], [], []],
-			[1, [], [], []],
-			[2, [], [], []],
-			[
-				1,
-				[
-					['id' => 1337, 'author' => 'author1', 'subject' => 'Subject #1', 'message' => 'Message #1', 'time' => 1440672792, 'groups' => ['gid1'], 'comments' => false],
-				], [],
-				[
-					['id' => 1337, 'author' => 'author1', 'author_id' => 'author1', 'subject' => 'Subject #1', 'message' => 'Message #1', 'time' => 1440672792, 'groups' => ['gid1'], 'comments' => false],
-				],
-			],
-			[
-				1,
-				[
-					['id' => 23, 'author' => 'author1', 'subject' => 'Subject #1', 'message' => 'Message #1', 'time' => 1440672792, 'groups' => ['gid1'], 'comments' => false],
-				],
-				[
-					['author1', $this->getUserMock('author1', 'Author One')],
-				],
-				[
-					['id' => 23, 'author' => 'Author One', 'author_id' => 'author1', 'subject' => 'Subject #1', 'message' => 'Message #1', 'time' => 1440672792, 'groups' => ['gid1'], 'comments' => false],
-				],
-			],
-			[
-				1,
-				[
-					['id' => 42, 'author' => 'author1', 'subject' => "Subject\n<html>#1</html>", 'message' => "Message\n<html>#1</html>", 'time' => 1440672792, 'groups' => null, 'comments' => 31],
-				],
-				[],
-				[
-					['id' => 42, 'author' => 'author1', 'author_id' => 'author1', 'subject' => 'Subject <html>#1</html>', 'message' => 'Message<br />&lt;html&gt;#1&lt;/html&gt;', 'time' => 1440672792, 'groups' => null, 'comments' => 31],
-				],
-			],
-		];
-	}
-
-	/**
-	 * @dataProvider dataGet
-	 * @param int $offset
-	 * @param array $announcements
-	 * @param array $userMap
-	 * @param array $expected
-	 */
-	public function legacyTestGet($offset, $announcements, $userMap, $expected) {
-		$this->userManager
-			->method('get')
-			->willReturnMap($userMap);
-
-		$comments = [];
-		$announcements = array_map(function (array $data) use (&$comments) {
-			$announcement = new Announcement();
-			$announcement->setId($data['id']);
-			$announcement->setUser($data['author']);
-			$announcement->setSubject($data['subject']);
-			$announcement->setMessage($data['message']);
-			$announcement->setTime($data['time']);
-			$announcement->setAllowComments($data['comments'] === false ? 0 : 1);
-
-			if ($data['comments'] !== false) {
-				$comments[] = [$announcement, $data['comments']];
-			}
-
-			return $announcement;
-		}, $announcements);
-
-		$this->manager
-			->method('getAnnouncements')
-			->with($offset)
-			->willReturn($announcements);
-
-		$this->manager->expects(self::exactly(count($comments)))
-			->method('getNumberOfComments')
-			->willReturnMap($comments);
-
-		$controller = $this->getController();
-		$jsonResponse = $controller->get($offset);
-
-		self::assertEquals($expected, $jsonResponse->getData());
-	}
-
-	public function dataDelete(): array {
-		return [
-			[42, true, Http::STATUS_OK],
-			[1337, false, Http::STATUS_FORBIDDEN],
-		];
-	}
-
-	/**
-	 * @dataProvider dataDelete
-	 * @param int $id
-	 * @param bool $isAdmin
-	 * @param int $statusCode
-	 */
-	public function testDelete($id, $isAdmin, $statusCode) {
-		$this->manager->expects(self::once())
-			->method('checkIsAdmin')
-			->willReturn($isAdmin);
-
-		if ($isAdmin) {
-			$this->manager->expects(self::once())
-				->method('delete')
-				->with($id);
-		} else {
-			$this->manager->expects(self::never())
-				->method('delete');
-		}
-
-		$controller = $this->getController();
-		$response = $controller->delete($id);
-
-		self::assertEquals($statusCode, $response->getStatus());
-	}
-
-	public function dataAddThrows() {
-		return [
-			['', ['error' => 'The subject is too long or empty']],
-			[str_repeat('a', 513), ['error' => 'The subject is too long or empty']],
-		];
-	}
-
-	/**
-	 * @dataProvider dataAddThrows
-	 * @param string $subject
-	 * @param array $expectedData
-	 */
-	public function testAddThrows($subject, array $expectedData) {
-		$this->manager->expects(self::once())
-			->method('checkIsAdmin')
-			->willReturn(true);
-		$this->userSession->expects(self::once())
-			->method('getUser')
-			->willReturn($this->getUserMock('author', 'author'));
-
-		$this->manager->expects(self::once())
-			->method('announce')
-			->with($subject, '', 'author', self::anything())
-			->willThrowException(new \InvalidArgumentException());
-
-		$controller = $this->getController(['createPublicity']);
-		$controller->expects(self::never())
-			->method('createPublicity');
-
-		$response = $controller->add($subject, '', [], true, true, true);
-
-		self::assertInstanceOf(JSONResponse::class, $response);
-		self::assertSame($expectedData, $response->getData());
-	}
-
-	public function testAddNoAdmin() {
-		$this->manager->expects(self::once())
-			->method('checkIsAdmin')
-			->willReturn(false);
-
-		$this->manager->expects(self::never())
-			->method('announce');
-		$this->jobList->expects(self::never())
-			->method('add');
-
-		$controller = $this->getController(['createPublicity']);
-		$controller->expects(self::never())
-			->method('createPublicity');
-
-		$response = $controller->add('subject', '', [], true, true, true);
-
-		self::assertInstanceOf(JSONResponse::class, $response);
-		self::assertSame(Http::STATUS_FORBIDDEN, $response->getStatus());
-	}
-
-	public function dataAdd() {
-		return [
-			['subject1', 'message1', ['gid1'], true, true, false],
-			['subject2', 'message2', ['gid2'], true, false, false],
-			['subject3', 'message3', ['gid3'], false, true, false],
-			['subject4', 'message4', ['gid4'], false, false, false],
-			['subject4', 'message4', ['gid4'], false, false, true],
-		];
-	}
-
-	/**
-	 * @dataProvider dataAdd
-	 *
-	 * @param string $subject
-	 * @param string $message
-	 * @param array $groups
-	 * @param bool $activities
-	 * @param bool $notifications
-	 * @param bool $comments
-	 */
-	public function legacyTestAdd($subject, $message, array $groups, $activities, $notifications, $comments) {
-		$this->manager->expects(self::once())
-			->method('checkIsAdmin')
-			->willReturn(true);
-		$this->userSession->expects(self::once())
-			->method('getUser')
-			->willReturn($this->getUserMock('author', 'author'));
-
-		$this->manager->expects(self::once())
-			->method('announce')
-			->with($subject, $message, 'author', self::anything(), $groups, $comments)
-			->willReturn([
-				'author' => 'author',
-				'subject' => $subject,
-				'message' => $message,
-				'time' => time(),
-				'id' => 10,
-				'comments' => $comments,
-			]);
-		$this->userManager->expects(self::once())
-			->method('get')
-			->with('author')
-			->willReturn($this->getUserMock('author', 'Author'));
-		$this->jobList->expects(($activities || $notifications) ? self::once() : self::never())
-			->method('add')
-			->with('OCA\AnnouncementCenter\BackgroundJob', [
-				'id' => 10,
-				'activities' => $activities,
-				'notifications' => $notifications,
-			]);
-
-		$controller = $this->getController();
-
-		$response = $controller->add($subject, $message, $groups, $activities, $notifications, $comments);
-
-		self::assertInstanceOf(JSONResponse::class, $response);
-		$data = $response->getData();
-		self::assertArrayHasKey('time', $data);
-		self::assertInternalType('int', $data['time']);
-		unset($data['time']);
-		self::assertEquals([
-			'author' => 'Author',
-			'author_id' => 'author',
-			'subject' => $subject,
-			'message' => $message,
-			'id' => 10,
-			'comments' => $comments,
-			'notifications' => $notifications,
-		], $data);
+			$this->initialState
+		);
 	}
 
 	public function dataIndex(): array {
@@ -404,23 +82,21 @@ public function dataIndex(): array {
 	 * @param bool $allowComments
 	 */
 	public function testIndex(bool $isAdmin, string $createActivitiesConfig, bool $createActivities, string $createNotificationsConfig, bool $createNotifications, string $allowCommentsConfig, bool $allowComments) {
-		$this->manager->expects(self::once())
-			->method('checkIsAdmin')
+		$this->manager->method('checkIsAdmin')
 			->willReturn($isAdmin);
-		$this->config->expects(self::exactly(3))
-			->method('getAppValue')
+		$this->config->method('getAppValue')
 			->willReturnMap([
 				['announcementcenter', 'create_activities', 'yes', $createActivitiesConfig],
 				['announcementcenter', 'create_notifications', 'yes', $createNotificationsConfig],
 				['announcementcenter', 'allow_comments', 'yes', $allowCommentsConfig],
 			]);
 
-		$this->initialStateService->method('provideInitialState')
+		$this->initialState->method('provideInitialState')
 			->withConsecutive(
-				[Application::APP_ID, 'isAdmin', $isAdmin],
-				[Application::APP_ID, 'createActivities', $createActivities],
-				[Application::APP_ID, 'createNotifications', $createNotifications],
-				[Application::APP_ID, 'allowComments', $allowComments]
+				['isAdmin', $isAdmin],
+				['createActivities', $createActivities],
+				['createNotifications', $createNotifications],
+				['allowComments', $allowComments]
 			);
 
 		$controller = $this->getController();
@@ -429,51 +105,4 @@ public function testIndex(bool $isAdmin, string $createActivitiesConfig, bool $c
 		self::assertSame('user', $response->getRenderAs());
 		self::assertSame('main', $response->getTemplateName());
 	}
-
-	protected function getGroupMock(string $gid): IGroup {
-		/** @var IGroup|MockObject $group */
-		$group = $this->createMock(IGroup::class);
-
-		$group
-			->method('getGID')
-			->willReturn($gid);
-
-		return $group;
-	}
-
-	public function dataSearchGroup(): array {
-		return [
-			[true, 'gid', [], [], Http::STATUS_OK],
-			[true, 'gid', [$this->getGroupMock('gid1'), $this->getGroupMock('gid2')], ['gid1', 'gid2'], Http::STATUS_OK],
-			[false, '', null, ['message' => 'Logged in user must be an admin'], Http::STATUS_FORBIDDEN],
-		];
-	}
-
-	/**
-	 * @dataProvider dataSearchGroup
-	 * @param bool $isAdmin
-	 * @param string $pattern
-	 * @param array|null $groupSearch
-	 * @param string $expected
-	 * @param int $code
-	 */
-	public function testSearchGroup(bool $isAdmin, string $pattern, $groupSearch, array $expected, int $code) {
-		$this->manager->expects(self::once())
-			->method('checkIsAdmin')
-			->willReturn($isAdmin);
-
-		if ($groupSearch !== null) {
-			$this->groupManager->expects(self::once())
-				->method('search')
-				->willReturn($groupSearch);
-		} else {
-			$this->groupManager->expects(self::never())
-				->method('search');
-		}
-
-		$controller = $this->getController();
-		$response = $controller->searchGroups($pattern);
-		self::assertSame($code, $response->getStatus());
-		self::assertSame($expected, $response->getData());
-	}
 }