diff --git a/acpMenu.xml b/acpMenu.xml
index d0df55f..6f39d1d 100644
--- a/acpMenu.xml
+++ b/acpMenu.xml
@@ -23,7 +23,7 @@
 			<controller>wcf\acp\form\ApiSecretAddForm</controller>
 			<parent>wcf.acp.menu.link.wscApi.secrets.list</parent>
 			<permissions>admin.wscApi.canManageSecret</permissions>
-			<icon>fa-plus</icon>
+			<icon>plus</icon>
 		</acpmenuitem>
 	</import>
 </data>
diff --git a/acptemplates/apiSecretAdd.tpl b/acptemplates/apiSecretAdd.tpl
index d3230fc..e6d3775 100644
--- a/acptemplates/apiSecretAdd.tpl
+++ b/acptemplates/apiSecretAdd.tpl
@@ -8,7 +8,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link application='wcf' controller='ApiSecretList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.wscApi.secrets.list{/lang}</span></a></li>
+			<li><a href="{link application='wcf' controller='ApiSecretList'}{/link}" class="button">{icon name='list' size=16} <span>{lang}wcf.acp.menu.link.wscApi.secrets.list{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
@@ -107,7 +107,7 @@
     
 	<div class="formSubmit">
 		<input type="submit" value="{lang}wcf.global.button.submit{/lang}" accesskey="s">
-		{@SECURITY_TOKEN_INPUT_TAG}
+		{csrfToken}
 	</div>
 </form>
 
diff --git a/acptemplates/apiSecretDocumentation.tpl b/acptemplates/apiSecretDocumentation.tpl
index ec8c798..a9c71d9 100644
--- a/acptemplates/apiSecretDocumentation.tpl
+++ b/acptemplates/apiSecretDocumentation.tpl
@@ -13,7 +13,7 @@
 
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link application='wcf' controller='ApiSecretList'}{/link}" class="button"><span class="icon icon16 fa-list"></span> <span>{lang}wcf.acp.menu.link.wscApi.secrets.list{/lang}</span></a></li>
+			<li><a href="{link application='wcf' controller='ApiSecretList'}{/link}" class="button">{icon name='list' size=16} <span>{lang}wcf.acp.menu.link.wscApi.secrets.list{/lang}</span></a></li>
 
 			{event name='contentHeaderNavigation'}
 		</ul>
diff --git a/acptemplates/apiSecretList.tpl b/acptemplates/apiSecretList.tpl
index 6fe4daa..91bde46 100644
--- a/acptemplates/apiSecretList.tpl
+++ b/acptemplates/apiSecretList.tpl
@@ -1,11 +1,5 @@
 {include file='header' pageTitle='wcf.acp.menu.link.wscApi.secrets.list'}
 
-<script data-relocate="true">
-	$(function() {
-		new WCF.Action.Delete('wcf\\data\\ApiSecretAction', '.jsSecretRow');
-	});
-</script>
-
 <header class="contentHeader">
 	<div class="contentHeaderTitle">
 		<h1 class="contentTitle">{lang}wcf.acp.menu.link.wscApi.secrets.list{/lang}</h1>
@@ -13,7 +7,7 @@
 	
 	<nav class="contentHeaderNavigation">
 		<ul>
-			<li><a href="{link application='wcf' controller='ApiSecretAdd'}{/link}" class="button"><span class="icon icon16 fa-plus"></span> <span>{lang}wcf.acp.menu.link.wscApi.secrets.add{/lang}</span></a></li>
+			<li><a href="{link application='wcf' controller='ApiSecretAdd'}{/link}" class="button">{icon name='plus' size=16} <span>{lang}wcf.acp.menu.link.wscApi.secrets.add{/lang}</span></a></li>
 			
 			{event name='contentHeaderNavigation'}
 		</ul>
@@ -23,7 +17,7 @@
 {hascontent}
 	<div id="boardNodeList" class="section sortableListContainer">
 		<ol id="boardContainer0" class="sortableList" data-object-id="0">
-			<table class="table">
+			<table class="table jsObjectActionContainer" data-object-action-class-name="wcf\data\ApiSecretAction">
 			<thead>
 				<tr>
 					<th></th>
@@ -34,10 +28,10 @@
 			<tbody>
 			{content}
 				{foreach from=$secrets item=secret}
-					<tr class="jsSecretRow">
+					<tr class="jsObjectActionObject" data-object-id="{$secret.secretID}">
 						<td class="columnIcon">
-							<a href="{link controller='ApiSecretEdit' id=$secret.secretID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip"><span class="icon icon16 fa-pencil"></span></a>
-							<span class="icon icon16 fa-times jsDeleteButton jsTooltip pointer" title="{lang}wcf.global.button.delete{/lang}" data-object-id="{@$secret.secretID}" data-confirm-message-html="{lang}TODO{/lang}"></span>
+							<a href="{link controller='ApiSecretEdit' id=$secret.secretID}{/link}" title="{lang}wcf.global.button.edit{/lang}" class="jsTooltip">{icon name='pencil' size=16}</a>
+							{objectAction action="delete" objectTitle=$secret.secretDescription}
 						</td>
 						<td>{$secret.secretID}</td>
 						<td><a title="{lang}wcf.acp.user.edit{/lang}" href="{link controller='ApiSecretEdit' id=$secret.secretID}{/link}">{$secret.secretDescription}</a></td>
diff --git a/files/lib/acp/form/ApiSecretAddForm.class.php b/files/lib/acp/form/ApiSecretAddForm.class.php
index 17a170e..654610e 100644
--- a/files/lib/acp/form/ApiSecretAddForm.class.php
+++ b/files/lib/acp/form/ApiSecretAddForm.class.php
@@ -77,7 +77,7 @@ public function readFormParameters() {
 		if (!empty($_POST['secretKey'])) {
 			$this->secretKey = StringUtil::trim($_POST['secretKey']);
 		} else {
-			$this->secretKey = bin2hex(CryptoUtil::randomBytes(16));
+			$this->secretKey = bin2hex(random_bytes(16));
 		}
 
 		if (!empty($_POST['secretDescription'])) {
diff --git a/files/lib/api/ThreadApi.class.php b/files/lib/api/ThreadApi.class.php
index b4fee83..214ea62 100644
--- a/files/lib/api/ThreadApi.class.php
+++ b/files/lib/api/ThreadApi.class.php
@@ -1,9 +1,12 @@
 <?php
 namespace wcf\api;
 
+use wbb\data\thread\Thread;
+use wbb\data\thread\ThreadAction;
 use wcf\util\StringUtil;
 use wcf\system\exception\ApiException;
 use wbb\data\thread\ThreadList;
+use wbb\system\label\object\ThreadLabelObjectHandler;
 use wcf\system\api\ApiResponse;
 
 /**
@@ -11,6 +14,21 @@
  * @package	at.megathorx.wsc-api
  */
 class ThreadApi extends BaseApi {
+    protected $attachmentHandler;
+
+    protected $htmlInputProcessor;
+
+    protected $enableTimeObj;
+
+    protected $subscribeThread;
+
+    protected $optionHandler;
+
+    protected $type;
+
+    protected $boardIDs;
+
+    protected $labelIDs;
 
     /**
      * @api
diff --git a/files/lib/system/user/notification/event/WscApiUserNotificationEvent.class.php b/files/lib/system/user/notification/event/WscApiUserNotificationEvent.class.php
index 6e5b70a..cf62d53 100644
--- a/files/lib/system/user/notification/event/WscApiUserNotificationEvent.class.php
+++ b/files/lib/system/user/notification/event/WscApiUserNotificationEvent.class.php
@@ -31,7 +31,7 @@ protected function prepare() {
 	/**
 	 * @inheritDoc
 	 */
-	public function getTitle() {
+	public function getTitle(): string {
 		return $this->getUserNotificationObject()->title;
 	}
 
@@ -69,7 +69,7 @@ public function getEventHash() {
 	/**
 	 * @inheritDoc
 	 */
-	public function getLink() {
+	public function getLink(): string {
 		return $this->getUserNotificationObject()->url;
 	}
 
diff --git a/files/lib/system/user/notification/object/ApiNotificationUserNotificationObject.class.php b/files/lib/system/user/notification/object/ApiNotificationUserNotificationObject.class.php
index 14d60f8..114c6e6 100644
--- a/files/lib/system/user/notification/object/ApiNotificationUserNotificationObject.class.php
+++ b/files/lib/system/user/notification/object/ApiNotificationUserNotificationObject.class.php
@@ -13,7 +13,7 @@ class ApiNotificationUserNotificationObject extends DatabaseObjectDecorator impl
 	/**
 	 * @inheritDoc
 	 */
-	public function getTitle() {
+	public function getTitle(): string {
 		return $this->getDecoratedObject()->title;
 	}
 
diff --git a/package.xml b/package.xml
index 828d268..232e005 100644
--- a/package.xml
+++ b/package.xml
@@ -13,12 +13,8 @@
 		<authorurl>https://github.com/eXo-OpenSource/wsc-api</authorurl>
 	</authorinformation>
 	<requiredpackages>
-		<requiredpackage minversion="3.0.0">com.woltlab.wcf</requiredpackage>
+		<requiredpackage minversion="6.0.2">com.woltlab.wcf</requiredpackage>
 	</requiredpackages>
-	<compatibility>
-		<api version="2018"/>
-		<api version="2019"/>
-	</compatibility>
 	<instructions type="install">
 		<instruction type="file"/>
 		<instruction type="language"/>