diff --git a/install.php b/install.php
index d66f657..84a16a5 100644
--- a/install.php
+++ b/install.php
@@ -16,8 +16,8 @@
     ->ensure();
 
 // Standard settings
-if (!$this->hasConfig('guestbook_article_id')) {
-    $this->setConfig('guestbook_article_id', rex_article::getSiteStartArticleId());
+if (!rex_config::has('d2u_guestbook', 'guestbook_article_id')) {
+    rex_config::set('d2u_guestbook', 'guestbook_article_id', rex_article::getSiteStartArticleId());
 }
 
 // Update modules
@@ -25,7 +25,7 @@
     $modules = [];
     $modules[] = new D2UModule('60-1',
         'D2U Guestbook - Gästebuch mit Bootstrap 4 Tabs',
-        13);
+        14);
     $modules[] = new D2UModule('60-2',
         'D2U Guestbook - Infobox Bewertung',
         3);
diff --git a/lib/d2u_guestbook_backend_helper.php b/lib/d2u_guestbook_backend_helper.php
index 941b80a..8dca86e 100644
--- a/lib/d2u_guestbook_backend_helper.php
+++ b/lib/d2u_guestbook_backend_helper.php
@@ -4,7 +4,6 @@
 
 use rex;
 use rex_addon;
-use rex_addon_interface;
 use rex_config;
 use rex_mailer;
 use rex_yrewrite;
@@ -16,14 +15,14 @@ class d2u_guestbook_backend_helper
 {
     /**
      * Send mail to admin address when news guestbook entry is created.
-     * @param mixed $yform
+     * @param \rex_yform_action_callback $yform
      */
-    public static function sendAdminNotification($yform)
+    public static function sendAdminNotification($yform):void
     {
-        if (isset($yform->params['values']) && '' != rex_config::get('d2u_guestbook', 'request_form_email')) {
+        if (isset($yform->params['values']) && '' !== (string) rex_config::get('d2u_guestbook', 'request_form_email')) {
             $fields = [];
             foreach ($yform->params['values'] as $value) {
-                if ('' != $value->name) {
+                if ('' !== $value->name) {
                     $fields[$value->name] = $value->value;
                 }
             }
@@ -31,10 +30,10 @@ public static function sendAdminNotification($yform)
             $mail = new rex_mailer();
             $mail->isHTML(false);
             $mail->CharSet = 'utf-8';
-            $mail->From = rex_config::get('d2u_guestbook', 'request_form_email');
-            $mail->Sender = rex_config::get('d2u_guestbook', 'request_form_email');
+            $mail->From = (string) rex_config::get('d2u_guestbook', 'request_form_email');
+            $mail->Sender = (string)  rex_config::get('d2u_guestbook', 'request_form_email');
 
-            $mail->addAddress(rex_config::get('d2u_guestbook', 'request_form_email'));
+            $mail->addAddress((string) rex_config::get('d2u_guestbook', 'request_form_email'));
             $mail->addReplyTo($fields['email'], $fields['name']);
             $mail->Subject = 'New Guestbook entry - Neuer Gästebuch eintrag - '. (rex_addon::get('yrewrite')->isAvailable() ? rex_yrewrite::getCurrentDomain()->getUrl() : rex::getServer());
 
diff --git a/lib/d2u_guestbook_lang_helper.php b/lib/d2u_guestbook_lang_helper.php
index a80fc3d..b9594fd 100644
--- a/lib/d2u_guestbook_lang_helper.php
+++ b/lib/d2u_guestbook_lang_helper.php
@@ -1,5 +1,6 @@
 <?php
 /**
+ * @api
  * Offers helper functions for language issues.
  */
 class d2u_guestbook_lang_helper extends \D2U_Helper\ALangHelper
diff --git a/lib/d2u_guestbook_module_manager.php b/lib/d2u_guestbook_module_manager.php
index a19d7b4..4cdb4ed 100644
--- a/lib/d2u_guestbook_module_manager.php
+++ b/lib/d2u_guestbook_module_manager.php
@@ -15,7 +15,7 @@ public static function getModules()
         $modules = [];
         $modules[] = new D2UModule('60-1',
             'D2U Guestbook - Gästebuch mit Bootstrap 4 Tabs',
-            13);
+            14);
         $modules[] = new D2UModule('60-2',
             'D2U Guestbook - Infobox Bewertung',
             3);
diff --git a/lib/entries.php b/lib/entries.php
index cf90787..236c329 100644
--- a/lib/entries.php
+++ b/lib/entries.php
@@ -16,34 +16,34 @@
 class Entry
 {
     /** @var int Database ID */
-    public $id = 0;
+    public int $id = 0;
 
     /** @var string name */
-    public $name = '';
+    public string $name = '';
 
     /** @var string email address */
-    public $email = '';
+    public string $email = '';
 
     /** @var string description */
-    public $description = '';
+    public string $description = '';
 
     /** @var int Redaxo clang ID */
-    public $clang_id = 1;
+    public int $clang_id = 1;
 
     /** @var int rating */
-    public $rating = 5;
+    public int $rating = 5;
 
     /** @var bool recommendation */
-    public $recommendation = true;
+    public bool $recommendation = true;
 
     /** @var bool Did user accept privacy policy */
-    public $privacy_policy_accepted = false;
+    public bool $privacy_policy_accepted = false;
 
     /** @var string Online status */
-    public $online_status = 'online';
+    public string $online_status = 'online';
 
     /** @var string create date */
-    public $create_date = '';
+    public string $create_date = '';
 
     /**
      * Constructor. Reads a contact stored in database.
@@ -58,16 +58,16 @@ public function __construct($id)
         $num_rows = $result->getRows();
 
         if ($num_rows > 0) {
-            $this->id = $result->getValue('id');
-            $this->clang_id = $result->getValue('clang_id');
-            $this->name = stripslashes($result->getValue('name'));
-            $this->email = $result->getValue('email');
-            $this->rating = $result->getValue('rating');
-            $this->recommendation = 1 == $result->getValue('recommendation') ? true : false;
+            $this->id = (int) $result->getValue('id');
+            $this->clang_id = (int) $result->getValue('clang_id');
+            $this->name = stripslashes((string) $result->getValue('name'));
+            $this->email = (string) $result->getValue('email');
+            $this->rating = (int) $result->getValue('rating');
+            $this->recommendation = 1 === (int) $result->getValue('recommendation') ? true : false;
             $this->privacy_policy_accepted = 1 === (int) $result->getValue('privacy_policy_accepted') ? true : false;
-            $this->description = stripslashes(htmlspecialchars_decode($result->getValue('description')));
-            $this->online_status = $result->getValue('online_status');
-            $this->create_date = $result->getValue('create_date');
+            $this->description = stripslashes(htmlspecialchars_decode((string) $result->getValue('description')));
+            $this->online_status = (string) $result->getValue('online_status');
+            $this->create_date = (string) $result->getValue('create_date');
         }
     }
 
@@ -125,7 +125,7 @@ public static function getAll($online_only = false)
 
         $entries = [];
         for ($i = 0; $i < $result->getRows(); ++$i) {
-            $entries[] = new self($result->getValue('id'));
+            $entries[] = new self((int) $result->getValue('id'));
             $result->next();
         }
         return $entries;
@@ -161,7 +161,7 @@ public static function getRecommendation()
 
     /**
      * Updates or inserts the object into database.
-     * @return in error code if error occurs
+     * @return bool true if error occurs
      */
     public function save()
     {
@@ -175,7 +175,7 @@ public function save()
                 ."privacy_policy_accepted = '". ($this->privacy_policy_accepted ? 'yes' : 'no') ."', "
                 ."description = '". addslashes(htmlspecialchars($this->description)) ."', "
                 ."online_status = '". $this->online_status ."' ";
-        if (0 == $this->id) {
+        if (0 === $this->id) {
             $query = 'INSERT INTO '. $query . ', create_date = CURRENT_TIMESTAMP';
         } else {
             $query = 'UPDATE '. $query .' WHERE id = '. $this->id;
@@ -183,7 +183,7 @@ public function save()
 
         $result = rex_sql::factory();
         $result->setQuery($query);
-        if (0 == $this->id) {
+        if (0 === $this->id) {
             $this->id = (int) $result->getLastId();
             $error = $result->hasError();
         }
diff --git a/modules/60/1/output.php b/modules/60/1/output.php
index b32f31b..19c7734 100644
--- a/modules/60/1/output.php
+++ b/modules/60/1/output.php
@@ -11,14 +11,14 @@
 echo '<div id="d2u_guestbook_module_60_1" class="col-12 col-sm-'. $cols_sm .' col-md-'. $cols_md .' col-lg-'. $cols_lg . $offset_lg .'">';
 echo '<div class="row">';
 
-$hide_rating = 'REX_VALUE[1]' == 'true' ? true : false;
+$hide_rating = 'REX_VALUE[1]' === 'true' ? true : false; /** @phpstan-ignore-line */
 
 if (!function_exists('sendAdminNotification')) {
     /**
      * Send mail to admin address when news guestbook entry is created.
-     * @param mixed $yform
+     * @param \rex_yform_action_callback $yform
      */
-    function sendAdminNotification($yform)
+    function sendAdminNotification($yform):void
     {
         \D2U_Guestbook\d2u_guestbook_backend_helper::sendAdminNotification($yform);
     }
@@ -50,10 +50,9 @@ function sendAdminNotification($yform)
 } else {
     for ($i = 0; $i < count($entries); ++$i) {
         $entry = $entries[$i];
-
-        if (0 == $i % rex_config::get('d2u_guestbook', 'no_entries_page', 10)) {
+        if (0 === $i % (int) rex_config::get('d2u_guestbook', 'no_entries_page', 10)) {
             ++$page_no;
-            if (1 != $page_no) {
+            if (1 !== $page_no) {
                 echo '</div>';
             }
             echo '<div class="row guestbook-page pages-'. $page_no .'">'; // Pagination div
@@ -64,7 +63,7 @@ function sendAdminNotification($yform)
         echo '<div class="entry-header">';
         echo '<div class="row">';
         echo '<div class="col-6"><b>';
-        if ('' != $entry->email && 'true' == rex_config::get('d2u_guestbook', 'allow_answer', 'false')) {
+        if ('' !== $entry->email && 'true' === (string) rex_config::get('d2u_guestbook', 'allow_answer', 'false')) {
             echo '<a href="mailto:'. $entry->email .'">';
             echo $entry->name .' <span class="icon mail"></span>';
             echo '</a>';
@@ -72,14 +71,17 @@ function sendAdminNotification($yform)
             echo $entry->name;
         }
         echo '</b></div>';
-        echo '<div class="col-6 right">'. date('d.m.Y H:i', strtotime($entry->create_date)) .' '. $tag_open .'d2u_guestbook_oclock'. $tag_close .'</div>';
-        echo '</div>';
+		$time = strtotime($entry->create_date);
+		if(false !== $time) {
+        	echo '<div class="col-6 right">'. date('d.m.Y H:i', $time) .' '. $tag_open .'d2u_guestbook_oclock'. $tag_close .'</div>';
+		}
         echo '</div>';
+        echo '</div>'; // entry-header
 
         echo '<div class="entry-body">';
         echo '<div class="row">';
         echo '<div class="col-12">'. nl2br($entry->description) .'</div>';
-        if (!$hide_rating && $entry->rating > 0) {
+        if (!$hide_rating && $entry->rating > 0) { /** @phpstan-ignore-line */
             echo '<div class="col-12"><b>'. $tag_open .'d2u_guestbook_rating'. $tag_close .': ';
             for ($j = 1; $j <= 5; ++$j) {
                 if ($j <= $entry->rating) {
@@ -90,39 +92,40 @@ function sendAdminNotification($yform)
             }
             echo '</b></div>';
         }
-        echo '</div>';
-        echo '</div>';
+        echo '</div>'; // row
+        echo '</div>'; // entry-body
 
-        echo '</div>';
-        echo '</div>';
+        echo '</div>'; // col-12
     }
-}
-echo '</div>'; // tab_guestbook
-
-// Page selection
-if ($page_no > 1) {
-    echo "<script>
-			// show only first page
-			jQuery(document).ready(function($) {
-				$('.guestbook-page').hide();
-				$('.pages-1').show();
-			});
-			// hide pages and show selected page
-			function changePage(pageno) {
-				$('.guestbook-page').slideUp();
-				$('.active-page').removeClass('active-page');
-				$('.pages-' + pageno).slideDown();
-				$('#page-' + pageno).addClass('active-page');
+	if($page_no > 0) {
+		echo '</div>'; // row guestbook-page
+		if($page_no > 1) {
+			// Page selection
+			echo "<script>
+					// show only first page
+					jQuery(document).ready(function($) {
+						$('.guestbook-page').hide();
+						$('.pages-1').show();
+					});
+					// hide pages and show selected page
+					function changePage(pageno) {
+						$('.guestbook-page').slideUp();
+						$('.active-page').removeClass('active-page');
+						$('.pages-' + pageno).slideDown();
+						$('#page-' + pageno).addClass('active-page');
+					}
+				</script>";
+			echo '<div class="row">';
+			echo '<div class="col-12 page-selection">'. $tag_open .'d2u_guestbook_page'. $tag_close .': ';
+			for ($i = 1; $i <= $page_no; ++$i) {
+				echo '<a href="javascript:changePage('. $i .')" class="page'. (1 === $i ? ' active-page' : '') .'" id="page-'. $i .'">'. $i .'</a>';
 			}
-		</script>";
-    echo '<div class="row">';
-    echo '<div class="col-12 page-selection">'. $tag_open .'d2u_guestbook_page'. $tag_close .': ';
-    for ($i = 1; $i <= $page_no; ++$i) {
-        echo '<a href="javascript:changePage('. $i .')" class="page'. (1 == $i ? ' active-page' : '') .'" id="page-'. $i .'">'. $i .'</a>';
-    }
-    echo '</div>';
-    echo '</div>';
+			echo '</div>';
+			echo '</div>';
+		}
+	}
 }
+echo '</div>'; // tab_guestbook
 
 // Entry Form
 echo '<div id="tab_write" class="tab-pane fade guestbook-tab">';
@@ -170,7 +173,7 @@ function d2u_guestbook_module_60_1_click_stars(wert) {
 	textarea|description|'. $tag_open .'d2u_guestbook_form_message'. $tag_close .'
 	choice|recommendation|'. $tag_open .'d2u_guestbook_form_recommendation'. $tag_close .'|{"'. $tag_open .'d2u_guestbook_no'. $tag_close .'":"0","'. $tag_open .'d2u_guestbook_yes'. $tag_close .'":"1"}|1|0|
 	checkbox|privacy_policy_accepted|'. $tag_open .'d2u_guestbook_form_privacy_policy'. $tag_close . ' *|0,1|0
-	'. ($hide_rating ? 'hidden|rating|0' : 'text|rating|'. $tag_open .'d2u_guestbook_form_rating'. $tag_close .'   '. $stars.'|0||{"style":"display:none"}') .'
+	'. ($hide_rating ? 'hidden|rating|0' : 'text|rating|'. $tag_open .'d2u_guestbook_form_rating'. $tag_close .'   '. $stars.'|0||{"style":"display:none"}')  /** @phpstan-ignore-line */ .'
 	html||<br>* '. $tag_open .'d2u_guestbook_form_required'. $tag_close .'<br><br>
 	php|validate_timer|Spamprotection|<input name="validate_timer" type="hidden" value="'. microtime(true) .'" />|
 	hidden|online_status|offline
@@ -208,9 +211,9 @@ function d2u_guestbook_module_60_1_click_stars(wert) {
 
 echo '</div>'; // tab_content
 
-echo '</div>';
-echo '</div>';
-echo '</div>';
+echo '</div>'; // col-12
+echo '</div>'; // row
+echo '</div>'; // d2u_guestbook_module_60_1
 ?>
 <script>
 	// Allow activation of bootstrap tab via URL
diff --git a/modules/60/1/style.css b/modules/60/1/style.css
index a2c075f..b30fc51 100644
--- a/modules/60/1/style.css
+++ b/modules/60/1/style.css
@@ -63,12 +63,12 @@ a.recommendation:hover {
 	border-top: navi_color_bg 1px solid;
 	padding: 0.75em;
 }
-guestbook-page {
-	display: inline-block;
-}
-#tab_guestbook.tab-pane {
+#d2u_guestbook_module_60_1 .tab-pane {
 	border: navi_color_bg 1px solid;
-	padding: 1em 1em 0 1em;
+	padding: 15px 15px 0 15px;
+}
+#d2u_guestbook_module_60_1 #tab_write {
+	padding-bottom: 15px;
 }
 .page-selection {
 	background-color: article_color_box;
diff --git a/modules/60/2/output.php b/modules/60/2/output.php
index 80b97dd..81784e5 100644
--- a/modules/60/2/output.php
+++ b/modules/60/2/output.php
@@ -5,7 +5,7 @@
 $tag_close = $sprog->getConfig('wildcard_close_tag');
 
 $d2u_guestbook = rex_addon::get('d2u_guestbook');
-$show_link = ($d2u_guestbook->hasConfig('guestbook_article_id') && '' != $d2u_guestbook->getConfig('guestbook_article_id')) ? true : false;
+$show_link = ($d2u_guestbook->hasConfig('guestbook_article_id') && 0 < (int) $d2u_guestbook->getConfig('guestbook_article_id')) ? true : false;
 
 $rating = round(D2U_Guestbook\Entry::getRating(), 1);
 $num_recommendations = D2U_Guestbook\Entry::getRecommendation();
@@ -20,7 +20,7 @@
                     echo '<p>'. \Sprog\Wildcard::get('d2u_guestbook_no_entries') . '</p>';
                 } else {
                     if ($show_link) {
-                        echo '<a href="'. rex_getUrl($d2u_guestbook->getConfig('guestbook_article_id')) .'" class="recommendation">';
+                        echo '<a href="'. rex_getUrl((int) $d2u_guestbook->getConfig('guestbook_article_id')) .'" class="recommendation">';
                     }
                     echo '<div class="recommendation-stars">';
                     for ($i = 1; $i <= 5; ++$i) {
@@ -35,7 +35,7 @@
                     echo '</div>';
                     if ($show_link) {
                         echo '</a>';
-                        echo '<a href="'. rex_getUrl($d2u_guestbook->getConfig('guestbook_article_id')) .'">';
+                        echo '<a href="'. rex_getUrl((int) $d2u_guestbook->getConfig('guestbook_article_id')) .'">';
                     }
                     echo $tag_open .'d2u_guestbook_recommended_pre'. $tag_close .' '. $num_recommendations .' '. $tag_open .'d2u_guestbook_recommended_post'. $tag_close;
                     if ($show_link) {
diff --git a/modules/60/3/output.php b/modules/60/3/output.php
index 2b2992f..9986b28 100644
--- a/modules/60/3/output.php
+++ b/modules/60/3/output.php
@@ -2,9 +2,9 @@
 if (!function_exists('sendAdminNotification')) {
     /**
      * Send mail to admin address when news guestbook entry is created.
-     * @param mixed $yform
+     * @param \rex_yform_action_callback $yform
      */
-    function sendAdminNotification($yform)
+    function sendAdminNotification($yform):void
     {
         \D2U_Guestbook\d2u_guestbook_backend_helper::sendAdminNotification($yform);
     }
@@ -15,7 +15,7 @@ function sendAdminNotification($yform)
 $tag_open = $sprog->getConfig('wildcard_open_tag');
 $tag_close = $sprog->getConfig('wildcard_close_tag');
 
-if ('add' == rex_get('entry', 'string')) {
+if ('add' === rex_get('entry', 'string')) {
     // Entry Form
     echo '<div class="col-12">';
     echo '<fieldset><legend>'. $tag_open .'d2u_guestbook_tab_write'. $tag_close .'</legend>';
@@ -109,9 +109,9 @@ function d2u_guestbook_module_60_3_click_stars(wert) {
         for ($i = 0; $i < count($entries); ++$i) {
             $entry = $entries[$i];
 
-            if (0 == $i % rex_config::get('d2u_guestbook', 'no_entries_page', 10)) {
+            if (0 === $i % (int) rex_config::get('d2u_guestbook', 'no_entries_page', 10)) {
                 ++$page_no;
-                if (1 != $page_no) {
+                if ($page_no > 1) {
                     echo '</div>';
                 }
                 echo '<div class="row guestbook-page pages-'. $page_no .'">'; // Pagination div
@@ -121,7 +121,7 @@ function d2u_guestbook_module_60_3_click_stars(wert) {
             echo '<div class="entry-header">';
             echo '<div class="row">';
             echo '<div class="col-6 left"><b>'. $tag_open .'d2u_guestbook_form_name'. $tag_close .': ';
-            if ('' != $entry->email && 'true' == rex_config::get('d2u_guestbook', 'allow_answer', 'false')) {
+            if ('' !== $entry->email && 'true' === (string) rex_config::get('d2u_guestbook', 'allow_answer', 'false')) {
                 echo '<a href="mailto:'. $entry->email .'">';
                 echo $entry->name .' <span class="icon mail"></span>';
                 echo '</a>';
@@ -129,7 +129,10 @@ function d2u_guestbook_module_60_3_click_stars(wert) {
                 echo $entry->name;
             }
             echo '</b></div>';
-            echo '<div class="col-6 right">'. date('d.m.Y H:i', strtotime($entry->create_date)) .' '. $tag_open .'d2u_guestbook_oclock'. $tag_close .'</div>';
+            $time = strtotime($entry->create_date);
+            if(false !== $time) {
+                echo '<div class="col-6 right">'. date('d.m.Y H:i', $time) .' '. $tag_open .'d2u_guestbook_oclock'. $tag_close .'</div>';
+            }
             echo '</div>';
             echo '</div>';
 
@@ -173,7 +176,7 @@ function changePage(pageno) {
         echo '<div class="row">';
         echo '<div class="col-12 page-selection">'. $tag_open .'d2u_guestbook_page'. $tag_close .': ';
         for ($i = 1; $i <= $page_no; ++$i) {
-            echo '<a href="javascript:changePage('. $i .')" class="page'. (1 == $i ? ' active-page' : '') .'" id="page-'. $i .'">'. $i .'</a>';
+            echo '<a href="javascript:changePage('. $i .')" class="page'. (1 === $i ? ' active-page' : '') .'" id="page-'. $i .'">'. $i .'</a>';
         }
         echo '</div>';
         echo '</div>';
diff --git a/pages/entries.php b/pages/entries.php
index e44bc52..a2f07fa 100644
--- a/pages/entries.php
+++ b/pages/entries.php
@@ -17,19 +17,19 @@
     $entry->clang_id = $form['clang_id'];
     $entry->name = $form['name'];
     $entry->email = $form['email'];
-    $entry->rating = '' != $form['rating'] ? $form['rating'] : 0;
+    $entry->rating = '' !== $form['rating'] ? $form['rating'] : 0;
     $entry->recommendation = array_key_exists('recommendation', $form) ? true : false;
     $entry->description = $form['description'];
     $entry->online_status = array_key_exists('online_status', $form) ? 'online' : 'offline';
 
     // message output
     $message = 'form_save_error';
-    if (0 == $entry->save()) {
+    if (false === $entry->save()) {
         $message = 'form_saved';
     }
 
     // Redirect to make reload and thus double save impossible
-    if (1 === (int) filter_input(INPUT_POST, 'btn_apply', FILTER_VALIDATE_INT) && false !== $entry) {
+    if (1 === (int) filter_input(INPUT_POST, 'btn_apply', FILTER_VALIDATE_INT) && $entry->id > 0) {
         header('Location: '. rex_url::currentBackendPage(['entry_id' => $entry->id, 'func' => 'edit', 'message' => $message], false));
     } else {
         header('Location: '. rex_url::currentBackendPage(['message' => $message], false));
@@ -85,7 +85,7 @@
                             d2u_addon_backend_helper::form_checkbox('d2u_guestbook_recommendation', 'form[recommendation]', 'true', $entry->recommendation);
                             d2u_addon_backend_helper::form_checkbox('d2u_guestbook_privacy_policy_accepted', 'form[privacy_policy_accepted]', 'true', $entry->privacy_policy_accepted, true);
                             d2u_addon_backend_helper::form_textarea('d2u_guestbook_description', 'form[description]', $entry->description, 10, true, false, false);
-                            d2u_addon_backend_helper::form_checkbox('d2u_helper_online_status', 'form[online_status]', 'online', 'online' == $entry->online_status ? true : false);
+                            d2u_addon_backend_helper::form_checkbox('d2u_helper_online_status', 'form[online_status]', 'online', 'online' === $entry->online_status ? true : false);
                         ?>
 					</div>
 				</fieldset>
diff --git a/pages/index.php b/pages/index.php
index 9973396..a31d972 100644
--- a/pages/index.php
+++ b/pages/index.php
@@ -2,7 +2,7 @@
 
 echo rex_view::title(rex_i18n::msg('d2u_guestbook'));
 
-if (0 == rex_config::get('d2u_helper', 'article_id_privacy_policy', 0) || 0 == rex_config::get('d2u_helper', 'article_id_impress', 0)) {
+if (0 === (int) rex_config::get('d2u_helper', 'article_id_privacy_policy', 0) || 0 === (int) rex_config::get('d2u_helper', 'article_id_impress', 0)) {
     echo rex_view::warning(rex_i18n::msg('d2u_helper_gdpr_warning'));
 }
 
diff --git a/pages/settings.php b/pages/settings.php
index bdb5a63..30a16d6 100644
--- a/pages/settings.php
+++ b/pages/settings.php
@@ -30,10 +30,10 @@
 				<legend><small><i class="rex-icon fa-book"></i></small> <?= rex_i18n::msg('d2u_helper_settings') ?></legend>
 				<div class="panel-body-wrapper slide">
 					<?php
-                        d2u_addon_backend_helper::form_input('d2u_guestbook_settings_request_form_email', 'settings[request_form_email]', (string) $this->getConfig('request_form_email'), true, false, 'email');
-                        d2u_addon_backend_helper::form_linkfield('d2u_guestbook_settings_article', '1', $this->getConfig('guestbook_article_id'), (int) rex_config::get('d2u_helper', 'default_lang', rex_clang::getStartId()));
-                        d2u_addon_backend_helper::form_checkbox('d2u_guestbook_settings_allow_answer', 'settings[allow_answer]', 'true', 'true' === (string) $this->getConfig('allow_answer'));
-                        d2u_addon_backend_helper::form_input('d2u_guestbook_settings_no_entries_page', 'settings[no_entries_page]', (int) $this->getConfig('no_entries_page', 10), true, false, 'number');
+                        d2u_addon_backend_helper::form_input('d2u_guestbook_settings_request_form_email', 'settings[request_form_email]', (string) rex_config::get('d2u_guestbook', 'request_form_email'), true, false, 'email');
+                        d2u_addon_backend_helper::form_linkfield('d2u_guestbook_settings_article', '1', (int) rex_config::get('d2u_guestbook', 'guestbook_article_id'), (int) rex_config::get('d2u_helper', 'default_lang', rex_clang::getStartId()));
+                        d2u_addon_backend_helper::form_checkbox('d2u_guestbook_settings_allow_answer', 'settings[allow_answer]', 'true', 'true' === (string) rex_config::get('d2u_guestbook', 'allow_answer'));
+                        d2u_addon_backend_helper::form_input('d2u_guestbook_settings_no_entries_page', 'settings[no_entries_page]', (int) rex_config::get('d2u_guestbook', 'no_entries_page', 10), true, false, 'number');
                     ?>
 				</div>
 			</fieldset>
@@ -41,7 +41,7 @@
 				<legend><small><i class="rex-icon rex-icon-language"></i></small> <?= rex_i18n::msg('d2u_helper_lang_replacements') ?></legend>
 				<div class="panel-body-wrapper slide">
 					<?php
-                        d2u_addon_backend_helper::form_checkbox('d2u_helper_lang_wildcard_overwrite', 'settings[lang_wildcard_overwrite]', 'true', 'true' === $this->getConfig('lang_wildcard_overwrite'));
+                        d2u_addon_backend_helper::form_checkbox('d2u_helper_lang_wildcard_overwrite', 'settings[lang_wildcard_overwrite]', 'true', 'true' === rex_config::get('d2u_guestbook', 'lang_wildcard_overwrite'));
                         foreach (rex_clang::getAll() as $rex_clang) {
                             echo '<dl class="rex-form-group form-group">';
                             echo '<dt><label>'. $rex_clang->getName() .'</label></dt>';
@@ -52,7 +52,7 @@
                                 'd2u_helper_lang_german' => 'german',
                             ];
                             foreach ($replacement_options as $key => $value) {
-                                $selected = $value == $this->getConfig('lang_replacement_'. $rex_clang->getId()) ? ' selected="selected"' : '';
+                                $selected = $value === rex_config::get('d2u_guestbook', 'lang_replacement_'. $rex_clang->getId()) ? ' selected="selected"' : '';
                                 echo '<option value="'. $value .'"'. $selected .'>'. rex_i18n::msg('d2u_helper_lang_replacements_install') .' '. rex_i18n::msg($key) .'</option>';
                             }
                             echo '</select>';
diff --git a/pages/setup.php b/pages/setup.php
index cfd2b44..52127c8 100644
--- a/pages/setup.php
+++ b/pages/setup.php
@@ -19,7 +19,7 @@
 $sql = rex_sql::factory();
 $sql->setQuery("SHOW TABLES LIKE '". rex::getTablePrefix() ."771_entries'");
 $tvsgb_available = $sql->getRows() > 0 ? true : false;
-if ('tvsgb' == rex_request('import', 'string') && $tvsgb_available) {
+if ('tvsgb' === rex_request('import', 'string') && $tvsgb_available) {
     $sql->setQuery('UPDATE `'. rex::getTablePrefix() ."771_entries` SET description = REPLACE(description, '\r\n', '<br>');
 		INSERT INTO ". rex::getTablePrefix() .'d2u_guestbook (`name`, `email`, `description`, `clang_id`, `online_status`, `create_date`)
 			SELECT `create_user`, `email`, `description`, `clang`, `status`, FROM_UNIXTIME(`create_date`) FROM '. rex::getTablePrefix() .'771_entries;
@@ -59,7 +59,8 @@
 <h2>Changelog</h2>
 <p>1.0.11-DEV:</p>
 <ul>
-<li>Modul "60-1 D2U Guestbook - Gästebuch mit Bootstrap 4 Tabs": Einige CSS auf Modul beschränkt.</li>
+	<li>Restliche rexstan Verbesserungen.</li>
+	<li>Modul "60-1 D2U Guestbook - Gästebuch mit Bootstrap 4 Tabs": Einige CSS auf Modul beschränkt und Bugfix Paginierung.</li>
 </ul>
 <p>1.0.10:</p>
 <ul>
diff --git a/update.php b/update.php
index 1ddd0c1..dc642b6 100644
--- a/update.php
+++ b/update.php
@@ -1,13 +1,13 @@
 <?php
 
 // remove old default lang setting
-if ($this->hasConfig('default_lang')) {
-    $this->removeConfig('default_lang');
+if (rex_config::has('d2u_guestbook', 'default_lang')) {
+    rex_config::remove('d2u_guestbook', 'default_lang');
 }
 
 $sql = rex_sql::factory();
 // 1.0.6 Update database
-if (rex_version::compare($this->getVersion(), '1.0.6', '<')) {
+if (rex_version::compare($this->getVersion(), '1.0.6', '<')) { /** @phpstan-ignore-line */
     $sql->setQuery('UPDATE '. \rex::getTablePrefix() ."d2u_guestbook SET privacy_policy_accepted = '0' WHERE privacy_policy_accepted = 'no';");
     $sql->setQuery('UPDATE '. \rex::getTablePrefix() ."d2u_guestbook SET privacy_policy_accepted = '1' WHERE privacy_policy_accepted = 'yes';");
     $sql->setQuery('ALTER TABLE '. \rex::getTablePrefix() .'d2u_guestbook CHANGE privacy_policy_accepted privacy_policy_accepted TINYINT(1) DEFAULT 0;');
@@ -15,7 +15,7 @@
 
 // Update database to 1.0.7
 $sql->setQuery('ALTER TABLE `'. rex::getTablePrefix() .'d2u_guestbook` CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;');
-if (rex_version::compare($this->getVersion(), '1.0.7', '<')) {
+if (rex_version::compare($this->getVersion(), '1.0.7', '<')) { /** @phpstan-ignore-line */
     $sql->setQuery('ALTER TABLE '. \rex::getTablePrefix() .'d2u_guestbook ADD COLUMN `create_date_new` DATETIME NOT NULL AFTER `create_date`;');
     $sql->setQuery('UPDATE '. \rex::getTablePrefix() .'d2u_guestbook SET `create_date_new` = FROM_UNIXTIME(`create_date`);');
     $sql->setQuery('ALTER TABLE '. \rex::getTablePrefix() .'d2u_guestbook DROP create_date;');