Merge branch 'edge' into latest

71 files changed, 3930 insertions, 4054 deletions

diff --git a/p/.htaccess b/p/.htaccess
index f2f2ad901..79e315c07 100644
--- a/p/.htaccess
+++ b/p/.htaccess
@@ -20,8 +20,6 @@ AddDefaultCharset	UTF-8
 <IfModule mod_expires.c>
 	ExpiresActive	on
 	ExpiresDefault	"access plus 1 month"
-	ExpiresByType	application/font-woff	"access plus 1 month"
-	ExpiresByType	application/font-woff2	"access plus 1 month"
 	ExpiresByType	application/javascript	"access plus 1 month"
 	ExpiresByType	application/xhtml+xml	"access plus 1 month"
 	ExpiresByType	image/x-icon	"access plus 1 month"
diff --git a/p/api/fever.php b/p/api/fever.php
index b7f9b9167..88bd05d81 100644
--- a/p/api/fever.php
+++ b/p/api/fever.php
@@ -17,8 +17,9 @@ require(LIB_PATH . '/lib_rss.php');	//Includes class autoloader
 FreshRSS_Context::initSystem();
 
 // check if API is enabled globally
-if (!FreshRSS_Context::$system_conf->api_enabled) {
-	Minz_Log::warning('Fever API: serviceUnavailable() ' . debugInfo(), API_LOG);
+if (FreshRSS_Context::$system_conf == null || !FreshRSS_Context::$system_conf->api_enabled) {
+	Minz_Log::warning('Fever API: service unavailable!');
+	Minz_Log::debug('Fever API: serviceUnavailable() ' . debugInfo(), API_LOG);
 	header('HTTP/1.1 503 Service Unavailable');
 	header('Content-Type: text/plain; charset=UTF-8');
 	die('Service Unavailable!');
@@ -28,12 +29,9 @@ Minz_Session::init('FreshRSS', true);
 // ================================================================================================
 
 // <Debug>
-$ORIGINAL_INPUT = file_get_contents('php://input', false, null, 0, 1048576);
+$ORIGINAL_INPUT = file_get_contents('php://input', false, null, 0, 1048576) ?: '';;
 
-/**
- * @return string
- */
-function debugInfo() {
+function debugInfo(): string {
 	if (function_exists('getallheaders')) {
 		$ALL_HEADERS = getallheaders();
 	} else {	//nginx	http://php.net/getallheaders#84262
@@ -45,24 +43,28 @@ function debugInfo() {
 		}
 	}
 	global $ORIGINAL_INPUT;
-	return print_r(
-		array(
+	$log = sensitive_log([
 			'date' => date('c'),
 			'headers' => $ALL_HEADERS,
 			'_SERVER' => $_SERVER,
 			'_GET' => $_GET,
 			'_POST' => $_POST,
 			'_COOKIE' => $_COOKIE,
-			'INPUT' => $ORIGINAL_INPUT
-		), true);
+			'INPUT' => $ORIGINAL_INPUT,
+		]);
+	return print_r($log, true);
 }
 
 //Minz_Log::debug('----------------------------------------------------------------', API_LOG);
 //Minz_Log::debug(debugInfo(), API_LOG);
 // </Debug>
 
-class FeverDAO extends Minz_ModelPdo
+final class FeverDAO extends Minz_ModelPdo
 {
+	/**
+	 * @param array<string|int> $values
+	 * @param array<string,string|int> $bindArray
+	 */
 	protected function bindParamArray(string $prefix, array $values, array &$bindArray): string {
 		$str = '';
 		for ($i = 0; $i < count($values); $i++) {
@@ -73,9 +75,11 @@ class FeverDAO extends Minz_ModelPdo
 	}
 
 	/**
+	 * @param array<string|int> $feed_ids
+	 * @param array<string> $entry_ids
 	 * @return FreshRSS_Entry[]
 	 */
-	public function findEntries(array $feed_ids, array $entry_ids, string $max_id, string $since_id) {
+	public function findEntries(array $feed_ids, array $entry_ids, string $max_id, string $since_id): array {
 		$values = array();
 		$order = '';
 		$entryDAO = FreshRSS_Factory::createEntryDao();
@@ -109,36 +113,34 @@ class FeverDAO extends Minz_ModelPdo
 		$sql .= ' LIMIT 50';
 
 		$stm = $this->pdo->prepare($sql);
-		$stm->execute($values);
-		$result = $stm->fetchAll(PDO::FETCH_ASSOC);
+		if ($stm && $stm->execute($values)) {
+			$result = $stm->fetchAll(PDO::FETCH_ASSOC);
 
-		$entries = array();
-		foreach ($result as $dao) {
-			$entries[] = FreshRSS_Entry::fromArray($dao);
-		}
+			$entries = array();
+			foreach ($result as $dao) {
+				$entries[] = FreshRSS_Entry::fromArray($dao);
+			}
 
-		return $entries;
+			return $entries;
+		}
+		return [];
 	}
 }
 
 /**
  * Class FeverAPI
  */
-class FeverAPI
+final class FeverAPI
 {
 	const API_LEVEL = 3;
 	const STATUS_OK = 1;
 	const STATUS_ERR = 0;
 
-	/**
-	 * @var FreshRSS_EntryDAO|null
-	 */
-	private $entryDAO = null;
+	/** @var FreshRSS_EntryDAO */
+	private $entryDAO;
 
-	/**
-	 * @var FreshRSS_FeedDAO|null
-	 */
-	private $feedDAO = null;
+	/** @var FreshRSS_FeedDAO */
+	private $feedDAO;
 
 	/**
 	 * Authenticate the user
@@ -147,6 +149,9 @@ class FeverAPI
 	 * your FreshRSS "username:your-api-password" combination
 	 */
 	private function authenticate(): bool {
+		if (FreshRSS_Context::$system_conf === null) {
+			throw new FreshRSS_Context_Exception('System configuration not initialised!');
+		}
 		FreshRSS_Context::$user_conf = null;
 		Minz_Session::_param('currentUser');
 		$feverKey = empty($_POST['api_key']) ? '' : substr(trim($_POST['api_key']), 0, 128);
@@ -175,16 +180,12 @@ class FeverAPI
 
 	public function isAuthenticatedApiUser(): bool {
 		$this->authenticate();
-
-		if (FreshRSS_Context::$user_conf !== null) {
-			return true;
-		}
-
-		return false;
+		return FreshRSS_Context::$user_conf !== null;
 	}
 
 	/**
 	 * This does all the processing, since the fever api does not have a specific variable that specifies the operation
+	 * @return array<string,mixed>
 	 * @throws Exception
 	 */
 	public function process(): array {
@@ -225,37 +226,54 @@ class FeverAPI
 			$response_arr['saved_item_ids'] = $this->getSavedItemIds();
 		}
 
-		$id = isset($_REQUEST['id']) ? '' . $_REQUEST['id'] : '';
-		if (isset($_REQUEST['mark'], $_REQUEST['as'], $_REQUEST['id']) && ctype_digit($id)) {
-			$method_name = 'set' . ucfirst($_REQUEST['mark']) . 'As' . ucfirst($_REQUEST['as']);
-			$allowedMethods = array(
-				'setFeedAsRead', 'setGroupAsRead', 'setItemAsRead',
-				'setItemAsSaved', 'setItemAsUnread', 'setItemAsUnsaved'
-			);
-			if (in_array($method_name, $allowedMethods)) {
-				switch (strtolower($_REQUEST['mark'])) {
-					case 'item':
-						$this->{$method_name}($id);
-						break;
-					case 'feed':
-					case 'group':
-						$before = $_REQUEST['before'] ?? '';
-						$this->{$method_name}($id, $before);
-						break;
-				}
+		if (isset($_REQUEST['mark'], $_REQUEST['as'], $_REQUEST['id']) && ctype_digit($_REQUEST['id'])) {
+			$id = intval($_REQUEST['id']);
+			$before = intval($_REQUEST['before'] ?? '0');
+			switch (strtolower($_REQUEST['mark'])) {
+				case 'item':
+					switch ($_REQUEST['as']) {
+						case 'read':
+							$this->setItemAsRead($id);
+							break;
+						case 'saved':
+							$this->setItemAsSaved($id);
+							break;
+						case 'unread':
+							$this->setItemAsUnread($id);
+							break;
+						case 'unsaved':
+							$this->setItemAsUnsaved($id);
+							break;
+					}
+					break;
+				case 'feed':
+					switch ($_REQUEST['as']) {
+						case 'read':
+							$this->setFeedAsRead($id, $before);
+							break;
+					}
+					break;
+				case 'group':
+					switch ($_REQUEST['as']) {
+						case 'read':
+							$this->setFeedAsRead($id, $before);
+							break;
+					}
+					break;
+			}
 
-				switch ($_REQUEST['as']) {
-					case 'read':
-					case 'unread':
-						$response_arr['unread_item_ids'] = $this->getUnreadItemIds();
-						break;
+			switch ($_REQUEST['as']) {
+				case 'read':
+				case 'unread':
+					$response_arr['unread_item_ids'] = $this->getUnreadItemIds();
+					break;
 
-					case 'saved':
-					case 'unsaved':
-						$response_arr['saved_item_ids'] = $this->getSavedItemIds();
-						break;
-				}
+				case 'saved':
+				case 'unsaved':
+					$response_arr['saved_item_ids'] = $this->getSavedItemIds();
+					break;
 			}
+
 		}
 
 		return $response_arr;
@@ -263,6 +281,7 @@ class FeverAPI
 
 	/**
 	 * Returns the complete JSON, with 'api_version' and status as 'auth'.
+	 * @param array<string,mixed> $reply
 	 */
 	public function wrap(int $status, array $reply = array()): string {
 		$arr = array('api_version' => self::API_LEVEL, 'auth' => $status);
@@ -272,7 +291,7 @@ class FeverAPI
 			$arr = array_merge($arr, $reply);
 		}
 
-		return json_encode($arr);
+		return json_encode($arr) ?: '';
 	}
 
 	/**
@@ -291,6 +310,7 @@ class FeverAPI
 		return $lastUpdate;
 	}
 
+	/** @return array<array<string,string|int>> */
 	protected function getFeeds(): array {
 		$feeds = array();
 		$myFeeds = $this->feedDAO->listFeeds();
@@ -311,6 +331,7 @@ class FeverAPI
 		return $feeds;
 	}
 
+	/** @return array<array<string,int|string>> */
 	protected function getGroups(): array {
 		$groups = array();
 
@@ -328,12 +349,15 @@ class FeverAPI
 		return $groups;
 	}
 
+	/** @return array<array<string,int|string>> */
 	protected function getFavicons(): array {
+		if (FreshRSS_Context::$system_conf == null) {
+			return [];
+		}
 		$favicons = array();
 		$salt = FreshRSS_Context::$system_conf->salt;
 		$myFeeds = $this->feedDAO->listFeeds();
 
-		/** @var FreshRSS_Feed $feed */
 		foreach ($myFeeds as $feed) {
 
 			$id = hash('crc32b', $salt . $feed->url());
@@ -344,7 +368,7 @@ class FeverAPI
 
 			$favicons[] = array(
 				'id' => $feed->id(),
-				'data' => image_type_to_mime_type(exif_imagetype($filename)) . ';base64,' . base64_encode(file_get_contents($filename))
+				'data' => image_type_to_mime_type(exif_imagetype($filename) ?: 0) . ';base64,' . base64_encode(file_get_contents($filename) ?: '')
 			);
 		}
 
@@ -358,17 +382,19 @@ class FeverAPI
 		return $this->entryDAO->count();
 	}
 
+	/**
+	 * @return array<array<string,int|string>>
+	 */
 	protected function getFeedsGroup(): array {
 		$groups = array();
 		$ids = array();
 		$myFeeds = $this->feedDAO->listFeeds();
 
-		/** @var FreshRSS_Feed $feed */
 		foreach ($myFeeds as $feed) {
 			$ids[$feed->categoryId()][] = $feed->id();
 		}
 
-		foreach($ids as $category => $feedIds) {
+		foreach ($ids as $category => $feedIds) {
 			$groups[] = array(
 				'group_id' => $category,
 				'feed_ids' => implode(',', $feedIds)
@@ -380,13 +406,14 @@ class FeverAPI
 
 	/**
 	 * AFAIK there is no 'hot links' alternative in FreshRSS
+	 * @return array<string>
 	 */
 	protected function getLinks(): array {
 		return array();
 	}
 
 	/**
-	 * @param array $ids
+	 * @param array<string> $ids
 	 */
 	protected function entriesToIdList(array $ids = array()): string {
 		return implode(',', array_values($ids));
@@ -397,10 +424,7 @@ class FeverAPI
 		return $this->entriesToIdList($entries);
 	}
 
-	/**
-	 * @return string
-	 */
-	protected function getSavedItemIds() {
+	protected function getSavedItemIds(): string {
 		$entries = $this->entryDAO->listIdsWhere('a', '', FreshRSS_Entry::STATE_FAVORITE, 'ASC', 0);
 		return $this->entriesToIdList($entries);
 	}
@@ -408,31 +432,32 @@ class FeverAPI
 	/**
 	 * @return integer|false
 	 */
-	protected function setItemAsRead($id) {
+	protected function setItemAsRead(int $id) {
 		return $this->entryDAO->markRead($id, true);
 	}
 
 	/**
 	 * @return integer|false
 	 */
-	protected function setItemAsUnread($id) {
+	protected function setItemAsUnread(int $id) {
 		return $this->entryDAO->markRead($id, false);
 	}
 
 	/**
 	 * @return integer|false
 	 */
-	protected function setItemAsSaved($id) {
+	protected function setItemAsSaved(int $id) {
 		return $this->entryDAO->markFavorite($id, true);
 	}
 
 	/**
 	 * @return integer|false
 	 */
-	protected function setItemAsUnsaved($id) {
+	protected function setItemAsUnsaved(int $id) {
 		return $this->entryDAO->markFavorite($id, false);
 	}
 
+	/** @return array<array<string,string|int>> */
 	protected function getItems(): array {
 		$feed_ids = array();
 		$entry_ids = array();
@@ -447,16 +472,16 @@ class FeverAPI
 			if (isset($_REQUEST['group_ids'])) {
 				$categoryDAO = FreshRSS_Factory::createCategoryDao();
 				$group_ids = explode(',', $_REQUEST['group_ids']);
+				$feeds = [];
 				foreach ($group_ids as $id) {
-					/** @var FreshRSS_Category $category */
 					$category = $categoryDAO->searchById($id);	//TODO: Transform to SQL query without loop! Consider FreshRSS_CategoryDAO::listCategories(true)
-					/** @var FreshRSS_Feed $feed */
-					$feeds = [];
+					if ($category == null) {
+						continue;
+					}
 					foreach ($category->feeds() as $feed) {
 						$feeds[] = $feed->id();
 					}
 				}
-
 				$feed_ids = array_unique($feeds);
 			}
 		}
@@ -510,30 +535,30 @@ class FeverAPI
 	/**
 	 * TODO replace by a dynamic fetch for id <= $before timestamp
 	 */
-	protected function convertBeforeToId(string $beforeTimestamp): string {
-		return $beforeTimestamp == '0' ? '0' : $beforeTimestamp . '000000';
+	protected function convertBeforeToId(int $beforeTimestamp): string {
+		return $beforeTimestamp == 0 ? '0' : $beforeTimestamp . '000000';
 	}
 
 	/**
 	 * @return integer|false
 	 */
-	protected function setFeedAsRead(string $id, string $before) {
+	protected function setFeedAsRead(int $id, int $before) {
 		$before = $this->convertBeforeToId($before);
-		return $this->entryDAO->markReadFeed(intval($id), $before);
+		return $this->entryDAO->markReadFeed($id, $before);
 	}
 
 	/**
 	 * @return integer|false
 	 */
-	protected function setGroupAsRead(string $id, string $before) {
+	protected function setGroupAsRead(int $id, int $before) {
 		$before = $this->convertBeforeToId($before);
 
 		// special case to mark all items as read
-		if ($id == '0') {
+		if ($id == 0) {
 			return $this->entryDAO->markReadEntries($before);
 		}
 
-		return $this->entryDAO->markReadCat(intval($id), $before);
+		return $this->entryDAO->markReadCat($id, $before);
 	}
 }
 
diff --git a/p/api/greader.php b/p/api/greader.php
index b08013850..5412bcf1d 100644
--- a/p/api/greader.php
+++ b/p/api/greader.php
@@ -26,23 +26,15 @@ Server-side API compatible with Google Reader API layer 2
 require(__DIR__ . '/../../constants.php');
 require(LIB_PATH . '/lib_rss.php');	//Includes class autoloader
 
-$ORIGINAL_INPUT = file_get_contents('php://input', false, null, 0, 1048576);
+$ORIGINAL_INPUT = file_get_contents('php://input', false, null, 0, 1048576) ?: '';
 
 if (PHP_INT_SIZE < 8) {	//32-bit
-	/**
-	 * @param string $hex
-	 * @return string
-	 */
-	function hex2dec($hex) {
+	function hex2dec(string $hex): string {
 		if (!ctype_xdigit($hex)) return '0';
 		return gmp_strval(gmp_init($hex, 16), 10);
 	}
 } else {	//64-bit
-	/**
-	 * @param string $hex
-	 * @return string
-	 */
-	function hex2dec($hex) {
+	function hex2dec(string $hex): string {
 		if (!ctype_xdigit($hex)) return '0';
 		return '' . hexdec($hex);
 	}
@@ -50,24 +42,28 @@ if (PHP_INT_SIZE < 8) {	//32-bit
 
 define('JSON_OPTIONS', JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
 
-function headerVariable($headerName, $varName) {
+function headerVariable(string $headerName, string $varName): string {
 	$header = '';
 	$upName = 'HTTP_' . strtoupper($headerName);
 	if (isset($_SERVER[$upName])) {
-		$header = $_SERVER[$upName];
+		$header = '' . $_SERVER[$upName];
 	} elseif (isset($_SERVER['REDIRECT_' . $upName])) {
-		$header = $_SERVER['REDIRECT_' . $upName];
+		$header = '' . $_SERVER['REDIRECT_' . $upName];
 	} elseif (function_exists('getallheaders')) {
 		$ALL_HEADERS = getallheaders();
 		if (isset($ALL_HEADERS[$headerName])) {
-			$header = $ALL_HEADERS[$headerName];
+			$header = '' . $ALL_HEADERS[$headerName];
 		}
 	}
 	parse_str($header, $pairs);
-	return isset($pairs[$varName]) ? $pairs[$varName] : null;
+	if (empty($pairs[$varName])) {
+		return '';
+	}
+	return is_string($pairs[$varName]) ? $pairs[$varName] : '';
 }
 
-function multiplePosts($name) {
+/** @return array<string> */
+function multiplePosts(string $name): array {
 	//https://bugs.php.net/bug.php?id=51633
 	global $ORIGINAL_INPUT;
 	$inputs = explode('&', $ORIGINAL_INPUT);
@@ -82,10 +78,7 @@ function multiplePosts($name) {
 	return $result;
 }
 
-/**
- * @return string
- */
-function debugInfo() {
+function debugInfo(): string {
 	if (function_exists('getallheaders')) {
 		$ALL_HEADERS = getallheaders();
 	} else {	//nginx	http://php.net/getallheaders#84262
@@ -97,1035 +90,1119 @@ function debugInfo() {
 		}
 	}
 	global $ORIGINAL_INPUT;
-	return print_r(
-		array(
+	$log = sensitive_log([
 			'date' => date('c'),
 			'headers' => $ALL_HEADERS,
 			'_SERVER' => $_SERVER,
 			'_GET' => $_GET,
 			'_POST' => $_POST,
 			'_COOKIE' => $_COOKIE,
-			'INPUT' => $ORIGINAL_INPUT
-		), true);
+			'INPUT' => $ORIGINAL_INPUT,
+		]);
+	return print_r($log, true);
 }
 
-function badRequest() {
-	Minz_Log::warning('badRequest() ' . debugInfo(), API_LOG);
-	header('HTTP/1.1 400 Bad Request');
-	header('Content-Type: text/plain; charset=UTF-8');
-	die('Bad Request!');
-}
+final class GReaderAPI {
 
-function unauthorized() {
-	Minz_Log::warning('unauthorized() ' . debugInfo(), API_LOG);
-	header('HTTP/1.1 401 Unauthorized');
-	header('Content-Type: text/plain; charset=UTF-8');
-	header('Google-Bad-Token: true');
-	die('Unauthorized!');
-}
+	/** @return never */
+	private static function badRequest() {
+		Minz_Log::warning(__METHOD__, API_LOG);
+		Minz_Log::debug(__METHOD__ . ' ' . debugInfo(), API_LOG);
+		header('HTTP/1.1 400 Bad Request');
+		header('Content-Type: text/plain; charset=UTF-8');
+		die('Bad Request!');
+	}
 
-function notImplemented() {
-	Minz_Log::warning('notImplemented() ' . debugInfo(), API_LOG);
-	header('HTTP/1.1 501 Not Implemented');
-	header('Content-Type: text/plain; charset=UTF-8');
-	die('Not Implemented!');
-}
+	/** @return never */
+	private static function unauthorized() {
+		Minz_Log::warning(__METHOD__, API_LOG);
+		Minz_Log::debug(__METHOD__ . ' ' . debugInfo(), API_LOG);
+		header('HTTP/1.1 401 Unauthorized');
+		header('Content-Type: text/plain; charset=UTF-8');
+		header('Google-Bad-Token: true');
+		die('Unauthorized!');
+	}
 
-function serviceUnavailable() {
-	Minz_Log::warning('serviceUnavailable() ' . debugInfo(), API_LOG);
-	header('HTTP/1.1 503 Service Unavailable');
-	header('Content-Type: text/plain; charset=UTF-8');
-	die('Service Unavailable!');
-}
+	/** @return never */
+	private static function internalServerError() {
+		Minz_Log::warning(__METHOD__, API_LOG);
+		Minz_Log::debug(__METHOD__ . ' ' . debugInfo(), API_LOG);
+		header('HTTP/1.1 500 Internal Server Error');
+		header('Content-Type: text/plain; charset=UTF-8');
+		die('Internal Server Error!');
+	}
 
-function checkCompatibility() {
-	Minz_Log::warning('checkCompatibility() ' . debugInfo(), API_LOG);
-	header('Content-Type: text/plain; charset=UTF-8');
-	if (PHP_INT_SIZE < 8 && !function_exists('gmp_init')) {
-		die('FAIL 64-bit or GMP extension! Wrong PHP configuration.');
+	/** @return never */
+	private static function notImplemented() {
+		Minz_Log::warning(__METHOD__, API_LOG);
+		Minz_Log::debug(__METHOD__ . ' ' . debugInfo(), API_LOG);
+		header('HTTP/1.1 501 Not Implemented');
+		header('Content-Type: text/plain; charset=UTF-8');
+		die('Not Implemented!');
 	}
-	$headerAuth = headerVariable('Authorization', 'GoogleLogin_auth');
-	if ($headerAuth == '') {
-		die('FAIL get HTTP Authorization header! Wrong Web server configuration.');
+
+	/** @return never */
+	private static function serviceUnavailable() {
+		Minz_Log::warning(__METHOD__, API_LOG);
+		Minz_Log::debug(__METHOD__ . ' ' . debugInfo(), API_LOG);
+		header('HTTP/1.1 503 Service Unavailable');
+		header('Content-Type: text/plain; charset=UTF-8');
+		die('Service Unavailable!');
 	}
-	echo 'PASS';
-	exit();
-}
 
-function authorizationToUser() {
-	//Input is 'GoogleLogin auth', but PHP replaces spaces by '_'	http://php.net/language.variables.external
-	$headerAuth = headerVariable('Authorization', 'GoogleLogin_auth');
-	if ($headerAuth != '') {
-		$headerAuthX = explode('/', $headerAuth, 2);
-		if (count($headerAuthX) === 2) {
-			$user = $headerAuthX[0];
-			if (FreshRSS_user_Controller::checkUsername($user)) {
-				FreshRSS_Context::initUser($user);
-				if (FreshRSS_Context::$user_conf == null) {
-					Minz_Log::warning('Invalid API user ' . $user . ': configuration cannot be found.');
-					unauthorized();
-				}
-				if (!FreshRSS_Context::$user_conf->enabled) {
-					Minz_Log::warning('Invalid API user ' . $user . ': configuration cannot be found.');
-					unauthorized();
-				}
-				if ($headerAuthX[1] === sha1(FreshRSS_Context::$system_conf->salt . $user . FreshRSS_Context::$user_conf->apiPasswordHash)) {
-					return $user;
+	/** @return never */
+	private static function checkCompatibility() {
+		Minz_Log::warning(__METHOD__, API_LOG);
+		Minz_Log::debug(__METHOD__ . ' ' . debugInfo(), API_LOG);
+		header('Content-Type: text/plain; charset=UTF-8');
+		if (PHP_INT_SIZE < 8 && !function_exists('gmp_init')) {
+			die('FAIL 64-bit or GMP extension! Wrong PHP configuration.');
+		}
+		$headerAuth = headerVariable('Authorization', 'GoogleLogin_auth');
+		if ($headerAuth == '') {
+			die('FAIL get HTTP Authorization header! Wrong Web server configuration.');
+		}
+		echo 'PASS';
+		exit();
+	}
+
+	private static function authorizationToUser(): string {
+		//Input is 'GoogleLogin auth', but PHP replaces spaces by '_'	http://php.net/language.variables.external
+		$headerAuth = headerVariable('Authorization', 'GoogleLogin_auth');
+		if ($headerAuth != '') {
+			$headerAuthX = explode('/', $headerAuth, 2);
+			if (count($headerAuthX) === 2) {
+				$user = $headerAuthX[0];
+				if (FreshRSS_user_Controller::checkUsername($user)) {
+					FreshRSS_Context::initUser($user);
+					if (FreshRSS_Context::$user_conf == null || FreshRSS_Context::$system_conf == null) {
+						Minz_Log::warning('Invalid API user ' . $user . ': configuration cannot be found.');
+						self::unauthorized();
+					}
+					if (!FreshRSS_Context::$user_conf->enabled) {
+						Minz_Log::warning('Invalid API user ' . $user . ': configuration cannot be found.');
+						self::unauthorized();
+					}
+					if ($headerAuthX[1] === sha1(FreshRSS_Context::$system_conf->salt . $user . FreshRSS_Context::$user_conf->apiPasswordHash)) {
+						return $user;
+					} else {
+						Minz_Log::warning('Invalid API authorisation for user ' . $user);
+						self::unauthorized();
+					}
 				} else {
-					Minz_Log::warning('Invalid API authorisation for user ' . $user . ': ' . $headerAuthX[1], API_LOG);
-					Minz_Log::warning('Invalid API authorisation for user ' . $user . ': ' . $headerAuthX[1]);
-					unauthorized();
+					self::badRequest();
 				}
-			} else {
-				badRequest();
 			}
 		}
+		return '';
 	}
-	return '';
-}
 
-function clientLogin($email, $pass) {
-	//https://web.archive.org/web/20130604091042/http://undoc.in/clientLogin.html
-	if (FreshRSS_user_Controller::checkUsername($email)) {
-		FreshRSS_Context::initUser($email);
-		if (FreshRSS_Context::$user_conf == null) {
-			Minz_Log::warning('Invalid API user ' . $email . ': configuration cannot be found.');
-			unauthorized();
-		}
+	/** @return never */
+	private static function clientLogin(string $email, string $pass) {
+		//https://web.archive.org/web/20130604091042/http://undoc.in/clientLogin.html
+		if (FreshRSS_user_Controller::checkUsername($email)) {
+			FreshRSS_Context::initUser($email);
+			if (FreshRSS_Context::$user_conf == null || FreshRSS_Context::$system_conf == null) {
+				Minz_Log::warning('Invalid API user ' . $email . ': configuration cannot be found.');
+				self::unauthorized();
+			}
 
-		if (FreshRSS_Context::$user_conf->apiPasswordHash != '' && password_verify($pass, FreshRSS_Context::$user_conf->apiPasswordHash)) {
-			header('Content-Type: text/plain; charset=UTF-8');
-			$auth = $email . '/' . sha1(FreshRSS_Context::$system_conf->salt . $email . FreshRSS_Context::$user_conf->apiPasswordHash);
-			echo 'SID=', $auth, "\n",
-				'LSID=null', "\n",	//Vienna RSS
-				'Auth=', $auth, "\n";
-			exit();
+			if (FreshRSS_Context::$user_conf->apiPasswordHash != '' && password_verify($pass, FreshRSS_Context::$user_conf->apiPasswordHash)) {
+				header('Content-Type: text/plain; charset=UTF-8');
+				$auth = $email . '/' . sha1(FreshRSS_Context::$system_conf->salt . $email . FreshRSS_Context::$user_conf->apiPasswordHash);
+				echo 'SID=', $auth, "\n",
+					'LSID=null', "\n",	//Vienna RSS
+					'Auth=', $auth, "\n";
+				exit();
+			} else {
+				Minz_Log::warning('Password API mismatch for user ' . $email);
+				self::unauthorized();
+			}
 		} else {
-			Minz_Log::warning('Password API mismatch for user ' . $email);
-			unauthorized();
+			self::badRequest();
 		}
-	} else {
-		badRequest();
 	}
-	die();
-}
 
-function token($conf) {
-//http://blog.martindoms.com/2009/08/15/using-the-google-reader-api-part-1/
-//https://github.com/ericmann/gReader-Library/blob/master/greader.class.php
-	$user = Minz_Session::param('currentUser', '_');
-	//Minz_Log::debug('token('. $user . ')', API_LOG);	//TODO: Implement real token that expires
-	$token = str_pad(sha1(FreshRSS_Context::$system_conf->salt . $user . $conf->apiPasswordHash), 57, 'Z');	//Must have 57 characters
-	echo $token, "\n";
-	exit();
-}
+	/**
+	 * @return never
+	 */
+	private static function token(?FreshRSS_UserConfiguration $conf) {
+		//http://blog.martindoms.com/2009/08/15/using-the-google-reader-api-part-1/
+		//https://github.com/ericmann/gReader-Library/blob/master/greader.class.php
+		if ($conf == null || FreshRSS_Context::$system_conf == null) {
+			self::unauthorized();
+		}
+		$user = Minz_Session::param('currentUser', '_');
+		//Minz_Log::debug('token('. $user . ')', API_LOG);	//TODO: Implement real token that expires
+		$token = str_pad(sha1(FreshRSS_Context::$system_conf->salt . $user . $conf->apiPasswordHash), 57, 'Z');	//Must have 57 characters
+		echo $token, "\n";
+		exit();
+	}
 
-function checkToken($conf, $token) {
-//http://code.google.com/p/google-reader-api/wiki/ActionToken
-	$user = Minz_Session::param('currentUser', '_');
-	if ($user !== '_' && (	//TODO: Check security consequences
-		$token == '' || //FeedMe
-		$token === 'x')) { //Reeder
-		return true;
+	private static function checkToken(?FreshRSS_UserConfiguration $conf, string $token): bool {
+		//http://code.google.com/p/google-reader-api/wiki/ActionToken
+		if ($conf == null || FreshRSS_Context::$system_conf == null) {
+			self::unauthorized();
+		}
+		$user = Minz_Session::param('currentUser', '_');
+		if ($user !== '_' && (	//TODO: Check security consequences
+			$token == '' || //FeedMe
+			$token === 'x')) { //Reeder
+			return true;
+		}
+		if ($token === str_pad(sha1(FreshRSS_Context::$system_conf->salt . $user . $conf->apiPasswordHash), 57, 'Z')) {
+			return true;
+		}
+		Minz_Log::warning('Invalid POST token: ' . $token, API_LOG);
+		self::unauthorized();
 	}
-	if ($token === str_pad(sha1(FreshRSS_Context::$system_conf->salt . $user . $conf->apiPasswordHash), 57, 'Z')) {
-		return true;
+
+	/** @return never */
+	private static function userInfo() {
+		//https://github.com/theoldreader/api#user-info
+		if (FreshRSS_Context::$user_conf == null) {
+			self::unauthorized();
+		}
+		$user = Minz_Session::param('currentUser', '_');
+		exit(json_encode(array(
+				'userId' => $user,
+				'userName' => $user,
+				'userProfileId' => $user,
+				'userEmail' => FreshRSS_Context::$user_conf->mail_login,
+			), JSON_OPTIONS));
 	}
-	Minz_Log::warning('Invalid POST token: ' . $token, API_LOG);
-	unauthorized();
-}
 
-function userInfo() {
-	//https://github.com/theoldreader/api#user-info
-	$user = Minz_Session::param('currentUser', '_');
-	exit(json_encode(array(
-			'userId' => $user,
-			'userName' => $user,
-			'userProfileId' => $user,
-			'userEmail' => FreshRSS_Context::$user_conf->mail_login,
-		), JSON_OPTIONS));
-}
+	/** @return never */
+	private static function tagList() {
+		header('Content-Type: application/json; charset=UTF-8');
 
-function tagList() {
-	header('Content-Type: application/json; charset=UTF-8');
-
-	$tags = array(
-		array('id' => 'user/-/state/com.google/starred'),
-		//array('id' => 'user/-/state/com.google/broadcast', 'sortid' => '2'),
-	);
-
-	$categoryDAO = FreshRSS_Factory::createCategoryDao();
-	$categories = $categoryDAO->listCategories(true, false);
-	foreach ($categories as $cat) {
-		$tags[] = array(
-			'id' => 'user/-/label/' . htmlspecialchars_decode($cat->name(), ENT_QUOTES),
-			//'sortid' => $cat->name(),
-			'type' => 'folder',	//Inoreader
+		$tags = array(
+			array('id' => 'user/-/state/com.google/starred'),
+			//array('id' => 'user/-/state/com.google/broadcast', 'sortid' => '2'),
 		);
-	}
 
-	$tagDAO = FreshRSS_Factory::createTagDao();
-	$labels = $tagDAO->listTags(true);
-	foreach ($labels as $label) {
-		$tags[] = array(
-			'id' => 'user/-/label/' . htmlspecialchars_decode($label->name(), ENT_QUOTES),
-			//'sortid' => $label->name(),
-			'type' => 'tag',	//Inoreader
-			'unread_count' => $label->nbUnread(),	//Inoreader
-		);
-	}
+		$categoryDAO = FreshRSS_Factory::createCategoryDao();
+		$categories = $categoryDAO->listCategories(true, false);
+		foreach ($categories as $cat) {
+			$tags[] = array(
+				'id' => 'user/-/label/' . htmlspecialchars_decode($cat->name(), ENT_QUOTES),
+				//'sortid' => $cat->name(),
+				'type' => 'folder',	//Inoreader
+			);
+		}
 
-	echo json_encode(array('tags' => $tags), JSON_OPTIONS), "\n";
-	exit();
-}
+		$tagDAO = FreshRSS_Factory::createTagDao();
+		$labels = $tagDAO->listTags(true);
+		foreach ($labels as $label) {
+			$tags[] = array(
+				'id' => 'user/-/label/' . htmlspecialchars_decode($label->name(), ENT_QUOTES),
+				//'sortid' => $label->name(),
+				'type' => 'tag',	//Inoreader
+				'unread_count' => $label->nbUnread(),	//Inoreader
+			);
+		}
 
-function subscriptionExport() {
-	$user = Minz_Session::param('currentUser', '_');
-	$export_service = new FreshRSS_Export_Service($user);
-	list($filename, $content) = $export_service->generateOpml();
-	header('Content-Type: application/xml; charset=UTF-8');
-	header('Content-disposition: attachment; filename="' . $filename . '"');
-	echo $content;
-	exit();
-}
+		echo json_encode(array('tags' => $tags), JSON_OPTIONS), "\n";
+		exit();
+	}
 
-function subscriptionImport($opml) {
-	$user = Minz_Session::param('currentUser', '_');
-	$importService = new FreshRSS_Import_Service($user);
-	$importService->importOpml($opml);
-	if ($importService->lastStatus()) {
-		list($nbUpdatedFeeds, $feed, $nbNewArticles) = FreshRSS_feed_Controller::actualizeFeed(0, '', true);
-		invalidateHttpCache($user);
-		exit('OK');
-	} else {
-		badRequest();
+	/** @return never */
+	private static function subscriptionExport() {
+		$user = '' . Minz_Session::param('currentUser', '_');
+		$export_service = new FreshRSS_Export_Service($user);
+		list($filename, $content) = $export_service->generateOpml();
+		header('Content-Type: application/xml; charset=UTF-8');
+		header('Content-disposition: attachment; filename="' . $filename . '"');
+		echo $content;
+		exit();
 	}
-}
 
-function subscriptionList() {
-	header('Content-Type: application/json; charset=UTF-8');
-
-	$salt = FreshRSS_Context::$system_conf->salt;
-	$faviconsUrl = Minz_Url::display('/f.php?', '', true);
-	$faviconsUrl = str_replace('/api/greader.php/reader/api/0/subscription', '', $faviconsUrl);	//Security if base_url is not set properly
-	$subscriptions = array();
-
-	$categoryDAO = FreshRSS_Factory::createCategoryDao();
-	foreach ($categoryDAO->listCategories(true, true) as $cat) {
-		foreach ($cat->feeds() as $feed) {
-			$subscriptions[] = [
-				'id' => 'feed/' . $feed->id(),
-				'title' => escapeToUnicodeAlternative($feed->name(), true),
-				'categories' => [
-					[
-						'id' => 'user/-/label/' . htmlspecialchars_decode($cat->name(), ENT_QUOTES),
-						'label' => htmlspecialchars_decode($cat->name(), ENT_QUOTES),
-					],
-				],
-				//'sortid' => $feed->name(),
-				//'firstitemmsec' => 0,
-				'url' => htmlspecialchars_decode($feed->url(), ENT_QUOTES),
-				'htmlUrl' => htmlspecialchars_decode($feed->website(), ENT_QUOTES),
-				'iconUrl' => $faviconsUrl . hash('crc32b', $salt . $feed->url()),
-			];
+	/** @return never */
+	private static function subscriptionImport(string $opml) {
+		$user = '' . Minz_Session::param('currentUser', '_');
+		$importService = new FreshRSS_Import_Service($user);
+		$importService->importOpml($opml);
+		if ($importService->lastStatus()) {
+			FreshRSS_feed_Controller::actualizeFeed(0, '', true);
+			invalidateHttpCache($user);
+			exit('OK');
+		} else {
+			self::badRequest();
 		}
 	}
 
-	echo json_encode(array('subscriptions' => $subscriptions), JSON_OPTIONS), "\n";
-	exit();
-}
+	/** @return never */
+	private static function subscriptionList() {
+		if (FreshRSS_Context::$system_conf == null) {
+			self::internalServerError();
+		}
+		header('Content-Type: application/json; charset=UTF-8');
+		$salt = FreshRSS_Context::$system_conf->salt;
+		$faviconsUrl = Minz_Url::display('/f.php?', '', true);
+		$faviconsUrl = str_replace('/api/greader.php/reader/api/0/subscription', '', $faviconsUrl);	//Security if base_url is not set properly
+		$subscriptions = array();
 
-function subscriptionEdit($streamNames, $titles, $action, $add = '', $remove = '') {
-	//https://github.com/mihaip/google-reader-api/blob/master/wiki/ApiSubscriptionEdit.wiki
-	switch ($action) {
-		case 'subscribe':
-		case 'unsubscribe':
-		case 'edit':
-			break;
-		default:
-			badRequest();
-	}
-	$addCatId = 0;
-	$categoryDAO = null;
-	if ($add != '' || $remove != '') {
 		$categoryDAO = FreshRSS_Factory::createCategoryDao();
-	}
-	$c_name = '';
-	if ($add != '' && strpos($add, 'user/') === 0) {	//user/-/label/Example ; user/username/label/Example
-		if (strpos($add, 'user/-/label/') === 0) {
-			$c_name = substr($add, 13);
-		} else {
-			$user = Minz_Session::param('currentUser', '_');
-			$prefix = 'user/' . $user . '/label/';
-			if (strpos($add, $prefix) === 0) {
-				$c_name = substr($add, strlen($prefix));
-			} else {
-				$c_name = '';
+		foreach ($categoryDAO->listCategories(true, true) as $cat) {
+			foreach ($cat->feeds() as $feed) {
+				$subscriptions[] = [
+					'id' => 'feed/' . $feed->id(),
+					'title' => escapeToUnicodeAlternative($feed->name(), true),
+					'categories' => [
+						[
+							'id' => 'user/-/label/' . htmlspecialchars_decode($cat->name(), ENT_QUOTES),
+							'label' => htmlspecialchars_decode($cat->name(), ENT_QUOTES),
+						],
+					],
+					//'sortid' => $feed->name(),
+					//'firstitemmsec' => 0,
+					'url' => htmlspecialchars_decode($feed->url(), ENT_QUOTES),
+					'htmlUrl' => htmlspecialchars_decode($feed->website(), ENT_QUOTES),
+					'iconUrl' => $faviconsUrl . hash('crc32b', $salt . $feed->url()),
+				];
 			}
 		}
-		$c_name = htmlspecialchars($c_name, ENT_COMPAT, 'UTF-8');
-		$cat = $categoryDAO->searchByName($c_name);
-		$addCatId = $cat == null ? 0 : $cat->id();
-	} elseif ($remove != '' && strpos($remove, 'user/-/label/') === 0) {
-		$addCatId = 1;	//Default category
-	}
-	$feedDAO = FreshRSS_Factory::createFeedDao();
-	if (!is_array($streamNames) || count($streamNames) < 1) {
-		badRequest();
+
+		echo json_encode(array('subscriptions' => $subscriptions), JSON_OPTIONS), "\n";
+		exit();
 	}
-	for ($i = count($streamNames) - 1; $i >= 0; $i--) {
-		$streamUrl = $streamNames[$i];	//feed/http://example.net/sample.xml	;	feed/338
-		if (strpos($streamUrl, 'feed/') === 0) {
-			$streamUrl = preg_replace('%^(feed/)+%', '', $streamUrl);
-			$feedId = 0;
-			if (ctype_digit($streamUrl)) {
-				if ($action === 'subscribe') {
-					continue;
-				}
-				$feedId = $streamUrl;
+
+	/**
+	 * @param array<string> $streamNames
+	 * @param array<string> $titles
+	 * @return never
+	 */
+	private static function subscriptionEdit(array $streamNames, array $titles, string $action, string $add = '', string $remove = '') {
+		//https://github.com/mihaip/google-reader-api/blob/master/wiki/ApiSubscriptionEdit.wiki
+		switch ($action) {
+			case 'subscribe':
+			case 'unsubscribe':
+			case 'edit':
+				break;
+			default:
+			self::badRequest();
+		}
+		$addCatId = 0;
+		$categoryDAO = null;
+		if ($add != '' || $remove != '') {
+			$categoryDAO = FreshRSS_Factory::createCategoryDao();
+		}
+		$c_name = '';
+		if ($add != '' && strpos($add, 'user/') === 0) {	//user/-/label/Example ; user/username/label/Example
+			if (strpos($add, 'user/-/label/') === 0) {
+				$c_name = substr($add, 13);
 			} else {
-				$streamUrl = htmlspecialchars($streamUrl, ENT_COMPAT, 'UTF-8');
-				$feed = $feedDAO->searchByUrl($streamUrl);
-				$feedId = $feed == null ? -1 : $feed->id();
+				$user = Minz_Session::param('currentUser', '_');
+				$prefix = 'user/' . $user . '/label/';
+				if (strpos($add, $prefix) === 0) {
+					$c_name = substr($add, strlen($prefix));
+				} else {
+					$c_name = '';
+				}
 			}
-			$title = isset($titles[$i]) ? $titles[$i] : '';
-			$title = htmlspecialchars($title, ENT_COMPAT, 'UTF-8');
-			switch ($action) {
-				case 'subscribe':
-					if ($feedId <= 0) {
-						$http_auth = '';
-						try {
-							$feed = FreshRSS_feed_Controller::addFeed($streamUrl, $title, $addCatId, $c_name, $http_auth);
-							continue 2;
-						} catch (Exception $e) {
-							Minz_Log::error('subscriptionEdit error subscribe: ' . $e->getMessage(), API_LOG);
-						}
-					}
-					badRequest();
-					break;
-				case 'unsubscribe':
-					if (!($feedId > 0 && FreshRSS_feed_Controller::deleteFeed($feedId))) {
-						badRequest();
+			$c_name = htmlspecialchars($c_name, ENT_COMPAT, 'UTF-8');
+			$cat = $categoryDAO->searchByName($c_name);
+			$addCatId = $cat == null ? 0 : $cat->id();
+		} elseif ($remove != '' && strpos($remove, 'user/-/label/') === 0) {
+			$addCatId = 1;	//Default category
+		}
+		$feedDAO = FreshRSS_Factory::createFeedDao();
+		if (!is_array($streamNames) || count($streamNames) < 1) {
+			self::badRequest();
+		}
+		for ($i = count($streamNames) - 1; $i >= 0; $i--) {
+			$streamUrl = $streamNames[$i];	//feed/http://example.net/sample.xml	;	feed/338
+			if (strpos($streamUrl, 'feed/') === 0) {
+				$streamUrl = '' . preg_replace('%^(feed/)+%', '', $streamUrl);
+				$feedId = 0;
+				if (ctype_digit($streamUrl)) {
+					if ($action === 'subscribe') {
+						continue;
 					}
-					break;
-				case 'edit':
-					if ($feedId > 0) {
-						if ($addCatId > 0 || $c_name != '') {
-							FreshRSS_feed_Controller::moveFeed($feedId, $addCatId, $c_name);
+					$feedId = $streamUrl;
+				} else {
+					$streamUrl = htmlspecialchars($streamUrl, ENT_COMPAT, 'UTF-8');
+					$feed = $feedDAO->searchByUrl($streamUrl);
+					$feedId = $feed == null ? -1 : $feed->id();
+				}
+				$title = isset($titles[$i]) ? $titles[$i] : '';
+				$title = htmlspecialchars($title, ENT_COMPAT, 'UTF-8');
+				switch ($action) {
+					case 'subscribe':
+						if ($feedId <= 0) {
+							$http_auth = '';
+							try {
+								$feed = FreshRSS_feed_Controller::addFeed($streamUrl, $title, $addCatId, $c_name, $http_auth);
+								continue 2;
+							} catch (Exception $e) {
+								Minz_Log::error('subscriptionEdit error subscribe: ' . $e->getMessage(), API_LOG);
+							}
 						}
-						if ($title != '') {
-							FreshRSS_feed_Controller::renameFeed($feedId, $title);
+						self::badRequest();
+						// Always exits
+					case 'unsubscribe':
+						if (!($feedId > 0 && FreshRSS_feed_Controller::deleteFeed($feedId))) {
+							self::badRequest();
 						}
-					} else {
-						badRequest();
-					}
-					break;
+						break;
+					case 'edit':
+						if ($feedId > 0) {
+							if ($addCatId > 0 || $c_name != '') {
+								FreshRSS_feed_Controller::moveFeed($feedId, $addCatId, $c_name);
+							}
+							if ($title != '') {
+								FreshRSS_feed_Controller::renameFeed($feedId, $title);
+							}
+						} else {
+							self::badRequest();
+						}
+						break;
+				}
 			}
 		}
+		exit('OK');
 	}
-	exit('OK');
-}
 
-function quickadd($url) {
-	try {
-		$url = htmlspecialchars($url, ENT_COMPAT, 'UTF-8');
-		if (substr($url, 0, 5) === 'feed/') {
-			$url = substr($url, 5);
+	/** @return never */
+	private static function quickadd(string $url) {
+		try {
+			$url = htmlspecialchars($url, ENT_COMPAT, 'UTF-8');
+			if (substr($url, 0, 5) === 'feed/') {
+				$url = substr($url, 5);
+			}
+			$feed = FreshRSS_feed_Controller::addFeed($url);
+			exit(json_encode(array(
+					'numResults' => 1,
+					'query' => $feed->url(),
+					'streamId' => 'feed/' . $feed->id(),
+					'streamName' => $feed->name(),
+				), JSON_OPTIONS));
+		} catch (Exception $e) {
+			Minz_Log::error('quickadd error: ' . $e->getMessage(), API_LOG);
+			die(json_encode(array(
+					'numResults' => 0,
+					'error' => $e->getMessage(),
+				), JSON_OPTIONS));
 		}
-		$feed = FreshRSS_feed_Controller::addFeed($url);
-		exit(json_encode(array(
-				'numResults' => 1,
-				'query' => $feed->url(),
-				'streamId' => 'feed/' . $feed->id(),
-				'streamName' => $feed->name(),
-			), JSON_OPTIONS));
-	} catch (Exception $e) {
-		Minz_Log::error('quickadd error: ' . $e->getMessage(), API_LOG);
-		die(json_encode(array(
-				'numResults' => 0,
-				'error' => $e->getMessage(),
-			), JSON_OPTIONS));
 	}
-}
-
-function unreadCount() {
-	//http://blog.martindoms.com/2009/10/16/using-the-google-reader-api-part-2/#unread-count
-	header('Content-Type: application/json; charset=UTF-8');
 
-	$totalUnreads = 0;
-	$totalLastUpdate = 0;
+	/** @return never */
+	private static function unreadCount() {
+		//http://blog.martindoms.com/2009/10/16/using-the-google-reader-api-part-2/#unread-count
+		header('Content-Type: application/json; charset=UTF-8');
 
-	$categoryDAO = FreshRSS_Factory::createCategoryDao();
-	$feedDAO = FreshRSS_Factory::createFeedDao();
-	$feedsNewestItemUsec = $feedDAO->listFeedsNewestItemUsec();
+		$totalUnreads = 0;
+		$totalLastUpdate = 0;
 
-	foreach ($categoryDAO->listCategories(true, true) as $cat) {
-		$catLastUpdate = 0;
-		foreach ($cat->feeds() as $feed) {
-			$lastUpdate = isset($feedsNewestItemUsec['f_' . $feed->id()]) ? $feedsNewestItemUsec['f_' . $feed->id()] : 0;
+		$categoryDAO = FreshRSS_Factory::createCategoryDao();
+		$feedDAO = FreshRSS_Factory::createFeedDao();
+		$feedsNewestItemUsec = $feedDAO->listFeedsNewestItemUsec();
+
+		foreach ($categoryDAO->listCategories(true, true) as $cat) {
+			$catLastUpdate = 0;
+			foreach ($cat->feeds() as $feed) {
+				$lastUpdate = isset($feedsNewestItemUsec['f_' . $feed->id()]) ? $feedsNewestItemUsec['f_' . $feed->id()] : 0;
+				$unreadcounts[] = array(
+					'id' => 'feed/' . $feed->id(),
+					'count' => $feed->nbNotRead(),
+					'newestItemTimestampUsec' => '' . $lastUpdate,
+				);
+				if ($catLastUpdate < $lastUpdate) {
+					$catLastUpdate = $lastUpdate;
+				}
+			}
 			$unreadcounts[] = array(
-				'id' => 'feed/' . $feed->id(),
-				'count' => $feed->nbNotRead(),
-				'newestItemTimestampUsec' => '' . $lastUpdate,
+				'id' => 'user/-/label/' . htmlspecialchars_decode($cat->name(), ENT_QUOTES),
+				'count' => $cat->nbNotRead(),
+				'newestItemTimestampUsec' => '' . $catLastUpdate,
 			);
-			if ($catLastUpdate < $lastUpdate) {
-				$catLastUpdate = $lastUpdate;
+			$totalUnreads += $cat->nbNotRead();
+			if ($totalLastUpdate < $catLastUpdate) {
+				$totalLastUpdate = $catLastUpdate;
 			}
 		}
-		$unreadcounts[] = array(
-			'id' => 'user/-/label/' . htmlspecialchars_decode($cat->name(), ENT_QUOTES),
-			'count' => $cat->nbNotRead(),
-			'newestItemTimestampUsec' => '' . $catLastUpdate,
-		);
-		$totalUnreads += $cat->nbNotRead();
-		if ($totalLastUpdate < $catLastUpdate) {
-			$totalLastUpdate = $catLastUpdate;
+
+		$tagDAO = FreshRSS_Factory::createTagDao();
+		$tagsNewestItemUsec = $tagDAO->listTagsNewestItemUsec();
+		foreach ($tagDAO->listTags(true) as $label) {
+			$lastUpdate = isset($tagsNewestItemUsec['t_' . $label->id()]) ? $tagsNewestItemUsec['t_' . $label->id()] : 0;
+			$unreadcounts[] = array(
+				'id' => 'user/-/label/' . htmlspecialchars_decode($label->name(), ENT_QUOTES),
+				'count' => $label->nbUnread(),
+				'newestItemTimestampUsec' => '' . $lastUpdate,
+			);
 		}
-	}
 
-	$tagDAO = FreshRSS_Factory::createTagDao();
-	$tagsNewestItemUsec = $tagDAO->listTagsNewestItemUsec();
-	foreach ($tagDAO->listTags(true) as $label) {
-		$lastUpdate = isset($tagsNewestItemUsec['t_' . $label->id()]) ? $tagsNewestItemUsec['t_' . $label->id()] : 0;
 		$unreadcounts[] = array(
-			'id' => 'user/-/label/' . htmlspecialchars_decode($label->name(), ENT_QUOTES),
-			'count' => $label->nbUnread(),
-			'newestItemTimestampUsec' => '' . $lastUpdate,
+			'id' => 'user/-/state/com.google/reading-list',
+			'count' => $totalUnreads,
+			'newestItemTimestampUsec' => '' . $totalLastUpdate,
 		);
-	}
 
-	$unreadcounts[] = array(
-		'id' => 'user/-/state/com.google/reading-list',
-		'count' => $totalUnreads,
-		'newestItemTimestampUsec' => '' . $totalLastUpdate,
-	);
-
-	echo json_encode(array(
-		'max' => $totalUnreads,
-		'unreadcounts' => $unreadcounts,
-	), JSON_OPTIONS), "\n";
-	exit();
-}
-
-function entriesToArray($entries) {
-	if (empty($entries)) {
-		return array();
+		echo json_encode(array(
+			'max' => $totalUnreads,
+			'unreadcounts' => $unreadcounts,
+		), JSON_OPTIONS), "\n";
+		exit();
 	}
-	$catDAO = FreshRSS_Factory::createCategoryDao();
-	$categories = $catDAO->listCategories(true);
 
-	$tagDAO = FreshRSS_Factory::createTagDao();
-	$entryIdsTagNames = $tagDAO->getEntryIdsTagNames($entries);
-	if ($entryIdsTagNames == false) {
-		$entryIdsTagNames = array();
-	}
+	/**
+	 * @param array<FreshRSS_Entry> $entries
+	 * @return array<array<string,mixed>>
+	 */
+	private static function entriesToArray(array $entries): array {
+		if (empty($entries)) {
+			return array();
+		}
+		$catDAO = FreshRSS_Factory::createCategoryDao();
+		$categories = $catDAO->listCategories(true);
 
-	$items = array();
-	foreach ($entries as $item) {
-		/** @var FreshRSS_Entry $entry */
-		$entry = Minz_ExtensionManager::callHook('entry_before_display', $item);
-		if ($entry == null) {
-			continue;
+		$tagDAO = FreshRSS_Factory::createTagDao();
+		$entryIdsTagNames = $tagDAO->getEntryIdsTagNames($entries);
+		if ($entryIdsTagNames == false) {
+			$entryIdsTagNames = array();
 		}
 
-		$feed = FreshRSS_CategoryDAO::findFeed($categories, $entry->feedId());
-		$entry->_feed($feed);
+		$items = array();
+		foreach ($entries as $item) {
+			/** @var FreshRSS_Entry $entry */
+			$entry = Minz_ExtensionManager::callHook('entry_before_display', $item);
+			if ($entry == null) {
+				continue;
+			}
 
-		if (isset($entryIdsTagNames['e_' . $entry->id()])) {
-			$entry->_tags($entryIdsTagNames['e_' . $entry->id()]);
-		}
+			$feed = FreshRSS_CategoryDAO::findFeed($categories, $entry->feedId());
+			$entry->_feed($feed);
 
-		$items[] = $entry->toGReader('compat');
+			if (isset($entryIdsTagNames['e_' . $entry->id()])) {
+				$entry->_tags($entryIdsTagNames['e_' . $entry->id()]);
+			}
+
+			$items[] = $entry->toGReader('compat');
+		}
+		return $items;
 	}
-	return $items;
-}
 
-function streamContentsFilters($type, $streamId, $filter_target, $exclude_target, $start_time, $stop_time) {
-	switch ($type) {
-		case 'f':	//feed
-			if ($streamId != '' && !ctype_digit($streamId)) {
-				$feedDAO = FreshRSS_Factory::createFeedDao();
+	/**
+	 * @return array<string|int|FreshRSS_BooleanSearch>
+	 */
+	private static function streamContentsFilters(string $type, string $streamId,
+		string $filter_target, string $exclude_target, int $start_time, int $stop_time): array {
+		switch ($type) {
+			case 'f':	//feed
+				if ($streamId != '' && !ctype_digit($streamId)) {
+					$feedDAO = FreshRSS_Factory::createFeedDao();
+					$streamId = htmlspecialchars($streamId, ENT_COMPAT, 'UTF-8');
+					$feed = $feedDAO->searchByUrl($streamId);
+					$streamId = $feed == null ? -1 : $feed->id();
+				}
+				break;
+			case 'c':	//category or label
+				$categoryDAO = FreshRSS_Factory::createCategoryDao();
 				$streamId = htmlspecialchars($streamId, ENT_COMPAT, 'UTF-8');
-				$feed = $feedDAO->searchByUrl($streamId);
-				$streamId = $feed == null ? -1 : $feed->id();
-			}
-			break;
-		case 'c':	//category or label
-			$categoryDAO = FreshRSS_Factory::createCategoryDao();
-			$streamId = htmlspecialchars($streamId, ENT_COMPAT, 'UTF-8');
-			$cat = $categoryDAO->searchByName($streamId);
-			if ($cat != null) {
-				$type = 'c';
-				$streamId = $cat->id();
-			} else {
-				$tagDAO = FreshRSS_Factory::createTagDao();
-				$tag = $tagDAO->searchByName($streamId);
-				if ($tag != null) {
-					$type = 't';
-					$streamId = $tag->id();
+				$cat = $categoryDAO->searchByName($streamId);
+				if ($cat != null) {
+					$type = 'c';
+					$streamId = $cat->id();
 				} else {
-					$type = 'A';
-					$streamId = -1;
+					$tagDAO = FreshRSS_Factory::createTagDao();
+					$tag = $tagDAO->searchByName($streamId);
+					if ($tag != null) {
+						$type = 't';
+						$streamId = $tag->id();
+					} else {
+						$type = 'A';
+						$streamId = -1;
+					}
 				}
-			}
-			break;
-	}
+				break;
+		}
 
-	switch ($filter_target) {
-		case 'user/-/state/com.google/read':
-			$state = FreshRSS_Entry::STATE_READ;
-			break;
-		case 'user/-/state/com.google/unread':
-			$state = FreshRSS_Entry::STATE_NOT_READ;
-			break;
-		case 'user/-/state/com.google/starred':
-			$state = FreshRSS_Entry::STATE_FAVORITE;
-			break;
-		default:
-			$state = FreshRSS_Entry::STATE_ALL;
-			break;
-	}
+		switch ($filter_target) {
+			case 'user/-/state/com.google/read':
+				$state = FreshRSS_Entry::STATE_READ;
+				break;
+			case 'user/-/state/com.google/unread':
+				$state = FreshRSS_Entry::STATE_NOT_READ;
+				break;
+			case 'user/-/state/com.google/starred':
+				$state = FreshRSS_Entry::STATE_FAVORITE;
+				break;
+			default:
+				$state = FreshRSS_Entry::STATE_ALL;
+				break;
+		}
 
-	switch ($exclude_target) {
-		case 'user/-/state/com.google/read':
-			$state &= FreshRSS_Entry::STATE_NOT_READ;
-			break;
-		case 'user/-/state/com.google/unread':
-			$state &= FreshRSS_Entry::STATE_READ;
-			break;
-		case 'user/-/state/com.google/starred':
-			$state &= FreshRSS_Entry::STATE_NOT_FAVORITE;
-			break;
-	}
+		switch ($exclude_target) {
+			case 'user/-/state/com.google/read':
+				$state &= FreshRSS_Entry::STATE_NOT_READ;
+				break;
+			case 'user/-/state/com.google/unread':
+				$state &= FreshRSS_Entry::STATE_READ;
+				break;
+			case 'user/-/state/com.google/starred':
+				$state &= FreshRSS_Entry::STATE_NOT_FAVORITE;
+				break;
+		}
 
-	$searches = new FreshRSS_BooleanSearch('');
-	if ($start_time != '') {
-		$search = new FreshRSS_Search('');
-		$search->setMinDate($start_time);
-		$searches->add($search);
-	}
-	if ($stop_time != '') {
-		$search = new FreshRSS_Search('');
-		$search->setMaxDate($stop_time);
-		$searches->add($search);
+		$searches = new FreshRSS_BooleanSearch('');
+		if ($start_time != '') {
+			$search = new FreshRSS_Search('');
+			$search->setMinDate($start_time);
+			$searches->add($search);
+		}
+		if ($stop_time != '') {
+			$search = new FreshRSS_Search('');
+			$search->setMaxDate($stop_time);
+			$searches->add($search);
+		}
+
+		return array($type, $streamId, $state, $searches);
 	}
 
-	return array($type, $streamId, $state, $searches);
-}
+	/** @return never */
+	private static function streamContents(string $path, string $include_target, int $start_time, int $stop_time, int $count,
+		string $order, string $filter_target, string $exclude_target, string $continuation) {
+		//http://code.google.com/p/pyrfeed/wiki/GoogleReaderAPI
+		//http://blog.martindoms.com/2009/10/16/using-the-google-reader-api-part-2/#feed
+		header('Content-Type: application/json; charset=UTF-8');
+
+		switch ($path) {
+			case 'reading-list':
+				$type = 'A';
+				break;
+			case 'starred':
+				$type = 's';
+				break;
+			case 'feed':
+				$type = 'f';
+				break;
+			case 'label':
+				$type = 'c';
+				break;
+			default:
+				$type = 'A';
+				break;
+		}
 
-function streamContents($path, $include_target, $start_time, $stop_time, $count, $order, $filter_target, $exclude_target, $continuation) {
-//http://code.google.com/p/pyrfeed/wiki/GoogleReaderAPI
-//http://blog.martindoms.com/2009/10/16/using-the-google-reader-api-part-2/#feed
-	header('Content-Type: application/json; charset=UTF-8');
+		list($type, $include_target, $state, $searches) =
+			self::streamContentsFilters($type, $include_target, $filter_target, $exclude_target, $start_time, $stop_time);
 
-	switch ($path) {
-		case 'reading-list':
-			$type = 'A';
-			break;
-		case 'starred':
-			$type = 's';
-			break;
-		case 'feed':
-			$type = 'f';
-			break;
-		case 'label':
-			$type = 'c';
-			break;
-		default:
-			$type = 'A';
-			break;
-	}
+		if ($continuation != '') {
+			$count++;	//Shift by one element
+		}
 
-	list($type, $include_target, $state, $searches) = streamContentsFilters($type, $include_target, $filter_target, $exclude_target, $start_time, $stop_time);
+		$entryDAO = FreshRSS_Factory::createEntryDao();
+		$entries = $entryDAO->listWhere($type, $include_target, $state, $order === 'o' ? 'ASC' : 'DESC', $count, $continuation, $searches);
+		$entries = iterator_to_array($entries);	//TODO: Improve
 
-	if ($continuation != '') {
-		$count++;	//Shift by one element
-	}
+		$items = self::entriesToArray($entries);
 
-	$entryDAO = FreshRSS_Factory::createEntryDao();
-	$entries = $entryDAO->listWhere($type, $include_target, $state, $order === 'o' ? 'ASC' : 'DESC', $count, $continuation, $searches);
-	$entries = iterator_to_array($entries);	//TODO: Improve
+		if ($continuation != '') {
+			array_shift($items);	//Discard first element that was already sent in the previous response
+			$count--;
+		}
 
-	$items = entriesToArray($entries);
+		$response = array(
+			'id' => 'user/-/state/com.google/reading-list',
+			'updated' => time(),
+			'items' => $items,
+		);
+		if (count($entries) >= $count) {
+			$entry = end($entries);
+			if ($entry != false) {
+				$response['continuation'] = '' . $entry->id();
+			}
+		}
 
-	if ($continuation != '') {
-		array_shift($items);	//Discard first element that was already sent in the previous response
-		$count--;
+		echo json_encode($response, JSON_OPTIONS), "\n";
+		exit();
 	}
 
-	$response = array(
-		'id' => 'user/-/state/com.google/reading-list',
-		'updated' => time(),
-		'items' => $items,
-	);
-	if (count($entries) >= $count) {
-		$entry = end($entries);
-		if ($entry != false) {
-			$response['continuation'] = '' . $entry->id();
+	/** @return never */
+	private static function streamContentsItemsIds(string $streamId, int $start_time, int $stop_time, int $count,
+		string $order, string $filter_target, string $exclude_target, string $continuation) {
+		//http://code.google.com/p/google-reader-api/wiki/ApiStreamItemsIds
+		//http://code.google.com/p/pyrfeed/wiki/GoogleReaderAPI
+		//http://blog.martindoms.com/2009/10/16/using-the-google-reader-api-part-2/#feed
+		$type = 'A';
+		$id = '';
+		if ($streamId === 'user/-/state/com.google/reading-list') {
+			$type = 'A';
+		} elseif ($streamId === 'user/-/state/com.google/starred') {
+			$type = 's';
+		} elseif (strpos($streamId, 'feed/') === 0) {
+			$type = 'f';
+			$streamId = substr($streamId, 5);
+		} elseif (strpos($streamId, 'user/-/label/') === 0) {
+			$type = 'c';
+			$streamId = substr($streamId, 13);
 		}
-	}
-
-	echo json_encode($response, JSON_OPTIONS), "\n";
-	exit();
-}
 
-function streamContentsItemsIds($streamId, $start_time, $stop_time, $count, $order, $filter_target, $exclude_target, $continuation) {
-//http://code.google.com/p/google-reader-api/wiki/ApiStreamItemsIds
-//http://code.google.com/p/pyrfeed/wiki/GoogleReaderAPI
-//http://blog.martindoms.com/2009/10/16/using-the-google-reader-api-part-2/#feed
-	$type = 'A';
-	$id = '';
-	if ($streamId === 'user/-/state/com.google/reading-list') {
-		$type = 'A';
-	} elseif ($streamId === 'user/-/state/com.google/starred') {
-		$type = 's';
-	} elseif (strpos($streamId, 'feed/') === 0) {
-		$type = 'f';
-		$streamId = substr($streamId, 5);
-	} elseif (strpos($streamId, 'user/-/label/') === 0) {
-		$type = 'c';
-		$streamId = substr($streamId, 13);
-	}
+		list($type, $id, $state, $searches) = self::streamContentsFilters($type, $streamId, $filter_target, $exclude_target, $start_time, $stop_time);
 
-	list($type, $id, $state, $searches) = streamContentsFilters($type, $streamId, $filter_target, $exclude_target, $start_time, $stop_time);
+		if ($continuation != '') {
+			$count++;	//Shift by one element
+		}
 
-	if ($continuation != '') {
-		$count++;	//Shift by one element
-	}
+		$entryDAO = FreshRSS_Factory::createEntryDao();
+		$ids = $entryDAO->listIdsWhere($type, $id, $state, $order === 'o' ? 'ASC' : 'DESC', $count, $continuation, $searches);
+		if ($ids === false) {
+			self::internalServerError();
+		}
 
-	$entryDAO = FreshRSS_Factory::createEntryDao();
-	$ids = $entryDAO->listIdsWhere($type, $id, $state, $order === 'o' ? 'ASC' : 'DESC', $count, $continuation, $searches);
+		if ($continuation != '') {
+			array_shift($ids);	//Discard first element that was already sent in the previous response
+			$count--;
+		}
 
-	if ($continuation != '') {
-		array_shift($ids);	//Discard first element that was already sent in the previous response
-		$count--;
-	}
+		if (empty($ids) && isset($_GET['client']) && $_GET['client'] === 'newsplus') {
+			$ids = [ 0 ];	//For News+ bug https://github.com/noinnion/newsplus/issues/84#issuecomment-57834632
+		}
+		$itemRefs = array();
+		foreach ($ids as $id) {
+			$itemRefs[] = array(
+				'id' => '' . $id,	//64-bit decimal
+			);
+		}
 
-	if (empty($ids) && isset($_GET['client']) && $_GET['client'] === 'newsplus') {
-		$ids[] = 0;	//For News+ bug https://github.com/noinnion/newsplus/issues/84#issuecomment-57834632
-	}
-	$itemRefs = array();
-	foreach ($ids as $id) {
-		$itemRefs[] = array(
-			'id' => '' . $id,	//64-bit decimal
+		$response = array(
+			'itemRefs' => $itemRefs,
 		);
-	}
-
-	$response = array(
-		'itemRefs' => $itemRefs,
-	);
-	if (count($ids) >= $count) {
-		$id = end($ids);
-		if ($id != false) {
-			$response['continuation'] = '' . $id;
+		if (count($ids) >= $count) {
+			$id = end($ids);
+			if ($id != false) {
+				$response['continuation'] = '' . $id;
+			}
 		}
-	}
 
-	echo json_encode($response, JSON_OPTIONS), "\n";
-	exit();
-}
+		echo json_encode($response, JSON_OPTIONS), "\n";
+		exit();
+	}
 
-function streamContentsItems($e_ids, $order) {
-	header('Content-Type: application/json; charset=UTF-8');
+	/**
+	 * @param array<string> $e_ids
+	 * @return never
+	 */
+	private static function streamContentsItems(array $e_ids, string $order) {
+		header('Content-Type: application/json; charset=UTF-8');
 
-	foreach ($e_ids as $i => $e_id) {
-		// https://feedhq.readthedocs.io/en/latest/api/terminology.html#items
-		if (!ctype_digit($e_id) || $e_id[0] === '0') {
-			$e_ids[$i] = hex2dec(basename($e_id));	//Strip prefix 'tag:google.com,2005:reader/item/'
+		foreach ($e_ids as $i => $e_id) {
+			// https://feedhq.readthedocs.io/en/latest/api/terminology.html#items
+			if (!ctype_digit($e_id) || $e_id[0] === '0') {
+				$e_ids[$i] = hex2dec(basename($e_id));	//Strip prefix 'tag:google.com,2005:reader/item/'
+			}
 		}
-	}
 
-	$entryDAO = FreshRSS_Factory::createEntryDao();
-	$entries = $entryDAO->listByIds($e_ids, $order === 'o' ? 'ASC' : 'DESC');
-	$entries = iterator_to_array($entries);	//TODO: Improve
+		$entryDAO = FreshRSS_Factory::createEntryDao();
+		$entries = $entryDAO->listByIds($e_ids, $order === 'o' ? 'ASC' : 'DESC');
+		$entries = iterator_to_array($entries);	//TODO: Improve
 
-	$items = entriesToArray($entries);
+		$items = self::entriesToArray($entries);
 
-	$response = array(
-		'id' => 'user/-/state/com.google/reading-list',
-		'updated' => time(),
-		'items' => $items,
-	);
+		$response = array(
+			'id' => 'user/-/state/com.google/reading-list',
+			'updated' => time(),
+			'items' => $items,
+		);
 
-	echo json_encode($response, JSON_OPTIONS), "\n";
-	exit();
-}
+		echo json_encode($response, JSON_OPTIONS), "\n";
+		exit();
+	}
 
-function editTag($e_ids, $a, $r) {
-	foreach ($e_ids as $i => $e_id) {
-		if (!ctype_digit($e_id) || $e_id[0] === '0') {
-			$e_ids[$i] = hex2dec(basename($e_id));	//Strip prefix 'tag:google.com,2005:reader/item/'
+	/**
+	 * @param array<string> $e_ids
+	 * @return never
+	 */
+	private static function editTag(array $e_ids, string $a, string $r): void {
+		foreach ($e_ids as $i => $e_id) {
+			if (!ctype_digit($e_id) || $e_id[0] === '0') {
+				$e_ids[$i] = hex2dec(basename($e_id));	//Strip prefix 'tag:google.com,2005:reader/item/'
+			}
 		}
-	}
 
-	$entryDAO = FreshRSS_Factory::createEntryDao();
-	$tagDAO = FreshRSS_Factory::createTagDao();
-
-	switch ($a) {
-		case 'user/-/state/com.google/read':
-			$entryDAO->markRead($e_ids, true);
-			break;
-		case 'user/-/state/com.google/starred':
-			$entryDAO->markFavorite($e_ids, true);
-			break;
-		/*case 'user/-/state/com.google/tracking-kept-unread':
-			break;
-		case 'user/-/state/com.google/like':
-			break;
-		case 'user/-/state/com.google/broadcast':
-			break;*/
-		default:
-			$tagName = '';
-			if (strpos($a, 'user/-/label/') === 0) {
-				$tagName = substr($a, 13);
-			} else {
-				$user = Minz_Session::param('currentUser', '_');
-				$prefix = 'user/' . $user . '/label/';
-				if (strpos($a, $prefix) === 0) {
-					$tagName = substr($a, strlen($prefix));
+		$entryDAO = FreshRSS_Factory::createEntryDao();
+		$tagDAO = FreshRSS_Factory::createTagDao();
+
+		switch ($a) {
+			case 'user/-/state/com.google/read':
+				$entryDAO->markRead($e_ids, true);
+				break;
+			case 'user/-/state/com.google/starred':
+				$entryDAO->markFavorite($e_ids, true);
+				break;
+			/*case 'user/-/state/com.google/tracking-kept-unread':
+				break;
+			case 'user/-/state/com.google/like':
+				break;
+			case 'user/-/state/com.google/broadcast':
+				break;*/
+			default:
+				$tagName = '';
+				if (strpos($a, 'user/-/label/') === 0) {
+					$tagName = substr($a, 13);
+				} else {
+					$user = Minz_Session::param('currentUser', '_');
+					$prefix = 'user/' . $user . '/label/';
+					if (strpos($a, $prefix) === 0) {
+						$tagName = substr($a, strlen($prefix));
+					}
 				}
-			}
-			if ($tagName != '') {
-				$tagName = htmlspecialchars($tagName, ENT_COMPAT, 'UTF-8');
-				$tag = $tagDAO->searchByName($tagName);
-				if ($tag == null) {
-					$tagDAO->addTag(array('name' => $tagName));
+				if ($tagName != '') {
+					$tagName = htmlspecialchars($tagName, ENT_COMPAT, 'UTF-8');
 					$tag = $tagDAO->searchByName($tagName);
-				}
-				if ($tag != null) {
-					foreach ($e_ids as $e_id) {
-						$tagDAO->tagEntry($tag->id(), $e_id, true);
+					if ($tag == null) {
+						$tagDAO->addTag(array('name' => $tagName));
+						$tag = $tagDAO->searchByName($tagName);
+					}
+					if ($tag != null) {
+						foreach ($e_ids as $e_id) {
+							$tagDAO->tagEntry($tag->id(), $e_id, true);
+						}
 					}
 				}
-			}
-			break;
-	}
-	switch ($r) {
-		case 'user/-/state/com.google/read':
-			$entryDAO->markRead($e_ids, false);
-			break;
-		case 'user/-/state/com.google/starred':
-			$entryDAO->markFavorite($e_ids, false);
-			break;
-		default:
-			if (strpos($r, 'user/-/label/') === 0) {
-				$tagName = substr($r, 13);
-				$tagName = htmlspecialchars($tagName, ENT_COMPAT, 'UTF-8');
-				$tag = $tagDAO->searchByName($tagName);
-				if ($tag != null) {
-					foreach ($e_ids as $e_id) {
-						$tagDAO->tagEntry($tag->id(), $e_id, false);
+				break;
+		}
+		switch ($r) {
+			case 'user/-/state/com.google/read':
+				$entryDAO->markRead($e_ids, false);
+				break;
+			case 'user/-/state/com.google/starred':
+				$entryDAO->markFavorite($e_ids, false);
+				break;
+			default:
+				if (strpos($r, 'user/-/label/') === 0) {
+					$tagName = substr($r, 13);
+					$tagName = htmlspecialchars($tagName, ENT_COMPAT, 'UTF-8');
+					$tag = $tagDAO->searchByName($tagName);
+					if ($tag != null) {
+						foreach ($e_ids as $e_id) {
+							$tagDAO->tagEntry($tag->id(), $e_id, false);
+						}
 					}
 				}
-			}
-			break;
-	}
+				break;
+		}
 
-	exit('OK');
-}
+		exit('OK');
+	}
 
-function renameTag($s, $dest) {
-	if ($s != '' && strpos($s, 'user/-/label/') === 0 &&
-		$dest != '' && strpos($dest, 'user/-/label/') === 0) {
-		$s = substr($s, 13);
-		$s = htmlspecialchars($s, ENT_COMPAT, 'UTF-8');
-		$dest = substr($dest, 13);
-		$dest = htmlspecialchars($dest, ENT_COMPAT, 'UTF-8');
+	/** @return never */
+	private static function renameTag(string $s, string $dest) {
+		if ($s != '' && strpos($s, 'user/-/label/') === 0 &&
+			$dest != '' && strpos($dest, 'user/-/label/') === 0) {
+			$s = substr($s, 13);
+			$s = htmlspecialchars($s, ENT_COMPAT, 'UTF-8');
+			$dest = substr($dest, 13);
+			$dest = htmlspecialchars($dest, ENT_COMPAT, 'UTF-8');
 
-		$categoryDAO = FreshRSS_Factory::createCategoryDao();
-		$cat = $categoryDAO->searchByName($s);
-		if ($cat != null) {
-			$categoryDAO->updateCategory($cat->id(), array('name' => $dest));
-			exit('OK');
-		} else {
-			$tagDAO = FreshRSS_Factory::createTagDao();
-			$tag = $tagDAO->searchByName($s);
-			if ($tag != null) {
-				$tagDAO->updateTag($tag->id(), array('name' => $dest));
+			$categoryDAO = FreshRSS_Factory::createCategoryDao();
+			$cat = $categoryDAO->searchByName($s);
+			if ($cat != null) {
+				$categoryDAO->updateCategory($cat->id(), array('name' => $dest));
 				exit('OK');
+			} else {
+				$tagDAO = FreshRSS_Factory::createTagDao();
+				$tag = $tagDAO->searchByName($s);
+				if ($tag != null) {
+					$tagDAO->updateTag($tag->id(), array('name' => $dest));
+					exit('OK');
+				}
 			}
 		}
+		self::badRequest();
 	}
-	badRequest();
-}
 
-function disableTag($s) {
-	if ($s != '' && strpos($s, 'user/-/label/') === 0) {
-		$s = substr($s, 13);
-		$s = htmlspecialchars($s, ENT_COMPAT, 'UTF-8');
-		$categoryDAO = FreshRSS_Factory::createCategoryDao();
-		$cat = $categoryDAO->searchByName($s);
-		if ($cat != null) {
-			$feedDAO = FreshRSS_Factory::createFeedDao();
-			$feedDAO->changeCategory($cat->id(), 0);
-			if ($cat->id() > 1) {
-				$categoryDAO->deleteCategory($cat->id());
-			}
-			exit('OK');
-		} else {
-			$tagDAO = FreshRSS_Factory::createTagDao();
-			$tag = $tagDAO->searchByName($s);
-			if ($tag != null) {
-				$tagDAO->deleteTag($tag->id());
+	/** @return never */
+	private static function disableTag(string $s) {
+		if ($s != '' && strpos($s, 'user/-/label/') === 0) {
+			$s = substr($s, 13);
+			$s = htmlspecialchars($s, ENT_COMPAT, 'UTF-8');
+			$categoryDAO = FreshRSS_Factory::createCategoryDao();
+			$cat = $categoryDAO->searchByName($s);
+			if ($cat != null) {
+				$feedDAO = FreshRSS_Factory::createFeedDao();
+				$feedDAO->changeCategory($cat->id(), 0);
+				if ($cat->id() > 1) {
+					$categoryDAO->deleteCategory($cat->id());
+				}
 				exit('OK');
+			} else {
+				$tagDAO = FreshRSS_Factory::createTagDao();
+				$tag = $tagDAO->searchByName($s);
+				if ($tag != null) {
+					$tagDAO->deleteTag($tag->id());
+					exit('OK');
+				}
 			}
 		}
+		self::badRequest();
 	}
-	badRequest();
-}
 
-function markAllAsRead($streamId, $olderThanId) {
-	$entryDAO = FreshRSS_Factory::createEntryDao();
-	if (strpos($streamId, 'feed/') === 0) {
-		$f_id = basename($streamId);
-		if (!ctype_digit($f_id)) {
-			badRequest();
-		}
-		$f_id = intval($f_id);
-		$entryDAO->markReadFeed($f_id, $olderThanId);
-	} elseif (strpos($streamId, 'user/-/label/') === 0) {
-		$c_name = substr($streamId, 13);
-		$c_name = htmlspecialchars($c_name, ENT_COMPAT, 'UTF-8');
-		$categoryDAO = FreshRSS_Factory::createCategoryDao();
-		$cat = $categoryDAO->searchByName($c_name);
-		if ($cat != null) {
-			$entryDAO->markReadCat($cat->id(), $olderThanId);
-		} else {
-			$tagDAO = FreshRSS_Factory::createTagDao();
-			$tag = $tagDAO->searchByName($c_name);
-			if ($tag != null) {
-				$entryDAO->markReadTag($tag->id(), $olderThanId);
+	/** @return never */
+	private static function markAllAsRead(string $streamId, string $olderThanId) {
+		$entryDAO = FreshRSS_Factory::createEntryDao();
+		if (strpos($streamId, 'feed/') === 0) {
+			$f_id = basename($streamId);
+			if (!ctype_digit($f_id)) {
+				self::badRequest();
+			}
+			$f_id = intval($f_id);
+			$entryDAO->markReadFeed($f_id, $olderThanId);
+		} elseif (strpos($streamId, 'user/-/label/') === 0) {
+			$c_name = substr($streamId, 13);
+			$c_name = htmlspecialchars($c_name, ENT_COMPAT, 'UTF-8');
+			$categoryDAO = FreshRSS_Factory::createCategoryDao();
+			$cat = $categoryDAO->searchByName($c_name);
+			if ($cat != null) {
+				$entryDAO->markReadCat($cat->id(), $olderThanId);
 			} else {
-				badRequest();
+				$tagDAO = FreshRSS_Factory::createTagDao();
+				$tag = $tagDAO->searchByName($c_name);
+				if ($tag != null) {
+					$entryDAO->markReadTag($tag->id(), $olderThanId);
+				} else {
+					self::badRequest();
+				}
 			}
+		} elseif ($streamId === 'user/-/state/com.google/reading-list') {
+			$entryDAO->markReadEntries($olderThanId, false, -1);
+		} else {
+			self::badRequest();
 		}
-	} elseif ($streamId === 'user/-/state/com.google/reading-list') {
-		$entryDAO->markReadEntries($olderThanId, false, -1);
-	} else {
-		badRequest();
+		exit('OK');
 	}
-	exit('OK');
-}
 
-$pathInfo = '';
-if (empty($_SERVER['PATH_INFO'])) {
-	if (!empty($_SERVER['ORIG_PATH_INFO'])) {
-		// Compatibility https://php.net/reserved.variables.server
-		$pathInfo = $_SERVER['ORIG_PATH_INFO'];
-	}
-} else {
-	$pathInfo = $_SERVER['PATH_INFO'];
-}
-$pathInfo = urldecode($pathInfo);
-$pathInfo = preg_replace('%^(/api)?(/greader\.php)?%', '', $pathInfo);	//Discard common errors
-if ($pathInfo == '') {
-	exit('OK');
-}
-$pathInfos = explode('/', $pathInfo);
-if (count($pathInfos) < 3) {
-	badRequest();
-}
+	/** @return never */
+	public static function parse() {
+		global $ORIGINAL_INPUT;
 
-FreshRSS_Context::initSystem();
+		$pathInfo = '';
+		if (empty($_SERVER['PATH_INFO'])) {
+			if (!empty($_SERVER['ORIG_PATH_INFO'])) {
+				// Compatibility https://php.net/reserved.variables.server
+				$pathInfo = $_SERVER['ORIG_PATH_INFO'];
+			}
+		} else {
+			$pathInfo = $_SERVER['PATH_INFO'];
+		}
+		$pathInfo = urldecode($pathInfo);
+		$pathInfo = '' . preg_replace('%^(/api)?(/greader\.php)?%', '', $pathInfo);	//Discard common errors
+		if ($pathInfo == '') {
+			exit('OK');
+		}
+		$pathInfos = explode('/', $pathInfo);
+		if (count($pathInfos) < 3) {
+			self::badRequest();
+		}
 
-//Minz_Log::debug('----------------------------------------------------------------', API_LOG);
-//Minz_Log::debug(debugInfo(), API_LOG);
+		FreshRSS_Context::initSystem();
 
-if (!FreshRSS_Context::$system_conf->api_enabled) {
-	serviceUnavailable();
-} elseif ($pathInfos[1] === 'check' && $pathInfos[2] === 'compatibility') {
-	checkCompatibility();
-}
+		//Minz_Log::debug('----------------------------------------------------------------', API_LOG);
+		//Minz_Log::debug(debugInfo(), API_LOG);
 
-Minz_Session::init('FreshRSS', true);
+		if (FreshRSS_Context::$system_conf == null || !FreshRSS_Context::$system_conf->api_enabled) {
+			self::serviceUnavailable();
+		} elseif ($pathInfos[1] === 'check' && $pathInfos[2] === 'compatibility') {
+			self::checkCompatibility();
+		}
 
-if ($pathInfos[1] !== 'accounts') {
-	authorizationToUser();
-}
-if (FreshRSS_Context::$user_conf != null) {
-	Minz_Translate::init(FreshRSS_Context::$user_conf->language);
-	Minz_ExtensionManager::init();
-	Minz_ExtensionManager::enableByList(FreshRSS_Context::$user_conf->extensions_enabled);
-} else {
-	Minz_Translate::init();
-}
+		Minz_Session::init('FreshRSS', true);
 
-if ($pathInfos[1] === 'accounts') {
-	if (($pathInfos[2] === 'ClientLogin') && isset($_REQUEST['Email']) && isset($_REQUEST['Passwd'])) {
-		clientLogin($_REQUEST['Email'], $_REQUEST['Passwd']);
-	}
-} elseif ($pathInfos[1] === 'reader' && $pathInfos[2] === 'api' && isset($pathInfos[3]) && $pathInfos[3] === '0' && isset($pathInfos[4])) {
-	if (Minz_Session::param('currentUser', '') == '') {
-		unauthorized();
-	}
-	$timestamp = isset($_GET['ck']) ? intval($_GET['ck']) : 0;	//ck=[unix timestamp] : Use the current Unix time here, helps Google with caching.
-	switch ($pathInfos[4]) {
-		case 'stream':
-			/* xt=[exclude target] : Used to exclude certain items from the feed.
-			 * For example, using xt=user/-/state/com.google/read will exclude items
-			 * that the current user has marked as read, or xt=feed/[feedurl] will
-			 * exclude items from a particular feed (obviously not useful in this
-			 * request, but xt appears in other listing requests). */
-			$exclude_target = isset($_GET['xt']) ? $_GET['xt'] : '';
-			$filter_target = isset($_GET['it']) ? $_GET['it'] : '';
-			//n=[integer] : The maximum number of results to return.
-			$count = isset($_GET['n']) ? intval($_GET['n']) : 20;
-			//r=[d|n|o] : Sort order of item results. d or n gives items in descending date order, o in ascending order.
-			$order = isset($_GET['r']) ? $_GET['r'] : 'd';
-			/* ot=[unix timestamp] : The time from which you want to retrieve
-			 * items. Only items that have been crawled by Google Reader after
-			 * this time will be returned. */
-			$start_time = isset($_GET['ot']) ? intval($_GET['ot']) : 0;
-			$stop_time = isset($_GET['nt']) ? intval($_GET['nt']) : 0;
-			/* Continuation token. If a StreamContents response does not represent
-			 * all items in a timestamp range, it will have a continuation attribute.
-			 * The same request can be re-issued with the value of that attribute put
-			 * in this parameter to get more items */
-			$continuation = isset($_GET['c']) ? trim($_GET['c']) : '';
-			if (!ctype_digit($continuation)) {
-				$continuation = '';
+		if ($pathInfos[1] !== 'accounts') {
+			self::authorizationToUser();
+		}
+		if (FreshRSS_Context::$user_conf != null) {
+			Minz_Translate::init(FreshRSS_Context::$user_conf->language);
+			Minz_ExtensionManager::init();
+			Minz_ExtensionManager::enableByList(FreshRSS_Context::$user_conf->extensions_enabled);
+		} else {
+			Minz_Translate::init();
+		}
+
+		if ($pathInfos[1] === 'accounts') {
+			if (($pathInfos[2] === 'ClientLogin') && isset($_REQUEST['Email']) && isset($_REQUEST['Passwd'])) {
+				self::clientLogin($_REQUEST['Email'], $_REQUEST['Passwd']);
+			}
+		} elseif ($pathInfos[1] === 'reader' && $pathInfos[2] === 'api' && isset($pathInfos[3]) && $pathInfos[3] === '0' && isset($pathInfos[4])) {
+			if (Minz_Session::param('currentUser', '') == '') {
+				self::unauthorized();
 			}
-			if (isset($pathInfos[5]) && $pathInfos[5] === 'contents') {
-				if (!isset($pathInfos[6]) && isset($_GET['s'])) {
-					// Compatibility BazQux API https://github.com/bazqux/bazqux-api#fetching-streams
-					$streamIdInfos = explode('/', $_GET['s']);
-					foreach ($streamIdInfos as $streamIdInfo) {
-						$pathInfos[] = $streamIdInfo;
+			$timestamp = isset($_GET['ck']) ? intval($_GET['ck']) : 0;	//ck=[unix timestamp] : Use the current Unix time here, helps Google with caching.
+			switch ($pathInfos[4]) {
+				case 'stream':
+					/* xt=[exclude target] : Used to exclude certain items from the feed.
+					* For example, using xt=user/-/state/com.google/read will exclude items
+					* that the current user has marked as read, or xt=feed/[feedurl] will
+					* exclude items from a particular feed (obviously not useful in this
+					* request, but xt appears in other listing requests). */
+					$exclude_target = isset($_GET['xt']) ? $_GET['xt'] : '';
+					$filter_target = isset($_GET['it']) ? $_GET['it'] : '';
+					//n=[integer] : The maximum number of results to return.
+					$count = isset($_GET['n']) ? intval($_GET['n']) : 20;
+					//r=[d|n|o] : Sort order of item results. d or n gives items in descending date order, o in ascending order.
+					$order = isset($_GET['r']) ? $_GET['r'] : 'd';
+					/* ot=[unix timestamp] : The time from which you want to retrieve
+					* items. Only items that have been crawled by Google Reader after
+					* this time will be returned. */
+					$start_time = isset($_GET['ot']) ? intval($_GET['ot']) : 0;
+					$stop_time = isset($_GET['nt']) ? intval($_GET['nt']) : 0;
+					/* Continuation token. If a StreamContents response does not represent
+					* all items in a timestamp range, it will have a continuation attribute.
+					* The same request can be re-issued with the value of that attribute put
+					* in this parameter to get more items */
+					$continuation = isset($_GET['c']) ? trim($_GET['c']) : '';
+					if (!ctype_digit($continuation)) {
+						$continuation = '';
 					}
-				}
-				if (isset($pathInfos[6]) && isset($pathInfos[7])) {
-					if ($pathInfos[6] === 'feed') {
-						$include_target = $pathInfos[7];
-						if ($include_target != '' && !ctype_digit($include_target)) {
-							$include_target = empty($_SERVER['REQUEST_URI']) ? '' : $_SERVER['REQUEST_URI'];
-							if (preg_match('#/reader/api/0/stream/contents/feed/([A-Za-z0-9\'!*()%$_.~+-]+)#', $include_target, $matches) && isset($matches[1])) {
-								$include_target = urldecode($matches[1]);
-							} else {
-								$include_target = '';
+					if (isset($pathInfos[5]) && $pathInfos[5] === 'contents') {
+						if (!isset($pathInfos[6]) && isset($_GET['s'])) {
+							// Compatibility BazQux API https://github.com/bazqux/bazqux-api#fetching-streams
+							$streamIdInfos = explode('/', $_GET['s']);
+							foreach ($streamIdInfos as $streamIdInfo) {
+								$pathInfos[] = $streamIdInfo;
 							}
 						}
-						streamContents($pathInfos[6], $include_target, $start_time, $stop_time, $count, $order, $filter_target, $exclude_target, $continuation);
-					} elseif ($pathInfos[6] === 'user' && isset($pathInfos[8]) && isset($pathInfos[9])) {
-						if ($pathInfos[8] === 'state') {
-							if ($pathInfos[9] === 'com.google' && isset($pathInfos[10])) {
-								if ($pathInfos[10] === 'reading-list' || $pathInfos[10] === 'starred') {
-									$include_target = '';
-									streamContents($pathInfos[10], $include_target, $start_time, $stop_time, $count, $order,
-										$filter_target, $exclude_target, $continuation);
+						if (isset($pathInfos[6]) && isset($pathInfos[7])) {
+							if ($pathInfos[6] === 'feed') {
+								$include_target = $pathInfos[7];
+								if ($include_target != '' && !ctype_digit($include_target)) {
+									$include_target = empty($_SERVER['REQUEST_URI']) ? '' : $_SERVER['REQUEST_URI'];
+									if (preg_match('#/reader/api/0/stream/contents/feed/([A-Za-z0-9\'!*()%$_.~+-]+)#', $include_target, $matches)) {
+										$include_target = urldecode($matches[1]);
+									} else {
+										$include_target = '';
+									}
+								}
+								self::streamContents($pathInfos[6], $include_target, $start_time, $stop_time,
+									$count, $order, $filter_target, $exclude_target, $continuation);
+							} elseif ($pathInfos[6] === 'user' && isset($pathInfos[8]) && isset($pathInfos[9])) {
+								if ($pathInfos[8] === 'state') {
+									if ($pathInfos[9] === 'com.google' && isset($pathInfos[10])) {
+										if ($pathInfos[10] === 'reading-list' || $pathInfos[10] === 'starred') {
+											$include_target = '';
+											self::streamContents($pathInfos[10], $include_target, $start_time, $stop_time, $count, $order,
+												$filter_target, $exclude_target, $continuation);
+										}
+									}
+								} elseif ($pathInfos[8] === 'label') {
+									$include_target = $pathInfos[9];
+									self::streamContents($pathInfos[8], $include_target, $start_time, $stop_time,
+										$count, $order, $filter_target, $exclude_target, $continuation);
 								}
 							}
-						} elseif ($pathInfos[8] === 'label') {
-							$include_target = $pathInfos[9];
-							streamContents($pathInfos[8], $include_target, $start_time, $stop_time, $count, $order, $filter_target, $exclude_target, $continuation);
+						} else {	//EasyRSS, FeedMe
+							$include_target = '';
+							self::streamContents('reading-list', $include_target, $start_time, $stop_time,
+								$count, $order, $filter_target, $exclude_target, $continuation);
 						}
-					}
-				} else {	//EasyRSS, FeedMe
-					$include_target = '';
-					streamContents('reading-list', $include_target, $start_time, $stop_time, $count, $order, $filter_target, $exclude_target, $continuation);
-				}
-			} elseif ($pathInfos[5] === 'items') {
-				if ($pathInfos[6] === 'ids' && isset($_GET['s'])) {
-					/* StreamId for which to fetch the item IDs. The parameter may
-					 * be repeated to fetch the item IDs from multiple streams at once
-					 * (more efficient from a backend perspective than multiple requests). */
-					$streamId = $_GET['s'];
-					streamContentsItemsIds($streamId, $start_time, $stop_time, $count, $order, $filter_target, $exclude_target, $continuation);
-				} elseif ($pathInfos[6] === 'contents' && isset($_POST['i'])) {	//FeedMe
-					$e_ids = multiplePosts('i');	//item IDs
-					streamContentsItems($e_ids, $order);
-				}
-			}
-			break;
-		case 'tag':
-			if (isset($pathInfos[5]) && $pathInfos[5] === 'list') {
-				$output = isset($_GET['output']) ? $_GET['output'] : '';
-				if ($output !== 'json') notImplemented();
-				tagList();
-			}
-			break;
-		case 'subscription':
-			if (isset($pathInfos[5])) {
-				switch ($pathInfos[5]) {
-					case 'export':
-						subscriptionExport();
-						break;
-					case 'import':
-						if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'POST' && $ORIGINAL_INPUT != '') {
-							subscriptionImport($ORIGINAL_INPUT);
+					} elseif ($pathInfos[5] === 'items') {
+						if ($pathInfos[6] === 'ids' && isset($_GET['s'])) {
+							/* StreamId for which to fetch the item IDs. The parameter may
+							* be repeated to fetch the item IDs from multiple streams at once
+							* (more efficient from a backend perspective than multiple requests). */
+							$streamId = $_GET['s'];
+							self::streamContentsItemsIds($streamId, $start_time, $stop_time, $count, $order, $filter_target, $exclude_target, $continuation);
+						} elseif ($pathInfos[6] === 'contents' && isset($_POST['i'])) {	//FeedMe
+							$e_ids = multiplePosts('i');	//item IDs
+							self::streamContentsItems($e_ids, $order);
 						}
-						break;
-					case 'list':
+					}
+					break;
+				case 'tag':
+					if (isset($pathInfos[5]) && $pathInfos[5] === 'list') {
 						$output = isset($_GET['output']) ? $_GET['output'] : '';
-						if ($output !== 'json') notImplemented();
-						subscriptionList();
-						break;
-					case 'edit':
-						if (isset($_REQUEST['s']) && isset($_REQUEST['ac'])) {
-							//StreamId to operate on. The parameter may be repeated to edit multiple subscriptions at once
-							$streamNames = empty($_POST['s']) && isset($_GET['s']) ? array($_GET['s']) : multiplePosts('s');
-							/* Title to use for the subscription. For the `subscribe` action,
-							 * if not specified then the feed’s current title will be used. Can
-							 * be used with the `edit` action to rename a subscription */
-							$titles = empty($_POST['t']) && isset($_GET['t']) ? array($_GET['t']) : multiplePosts('t');
-							$action = $_REQUEST['ac'];	//Action to perform on the given StreamId. Possible values are `subscribe`, `unsubscribe` and `edit`
-							$add = isset($_REQUEST['a']) ? $_REQUEST['a'] : '';	//StreamId to add the subscription to (generally a user label)
-							$remove = isset($_REQUEST['r']) ? $_REQUEST['r'] : '';	//StreamId to remove the subscription from (generally a user label)
-							subscriptionEdit($streamNames, $titles, $action, $add, $remove);
-						}
-						break;
-					case 'quickadd':	//https://github.com/theoldreader/api
-						if (isset($_REQUEST['quickadd'])) {
-							quickadd($_REQUEST['quickadd']);
+						if ($output !== 'json') self::notImplemented();
+						self::tagList();
+					}
+					break;
+				case 'subscription':
+					if (isset($pathInfos[5])) {
+						switch ($pathInfos[5]) {
+							case 'export':
+								self::subscriptionExport();
+								// Always exits
+							case 'import':
+								if (isset($_SERVER['REQUEST_METHOD']) && $_SERVER['REQUEST_METHOD'] === 'POST' && $ORIGINAL_INPUT != '') {
+									self::subscriptionImport($ORIGINAL_INPUT);
+								}
+								break;
+							case 'list':
+								$output = isset($_GET['output']) ? $_GET['output'] : '';
+								if ($output !== 'json') self::notImplemented();
+								self::subscriptionList();
+								// Always exits
+							case 'edit':
+								if (isset($_REQUEST['s']) && isset($_REQUEST['ac'])) {
+									//StreamId to operate on. The parameter may be repeated to edit multiple subscriptions at once
+									$streamNames = empty($_POST['s']) && isset($_GET['s']) ? array($_GET['s']) : multiplePosts('s');
+									/* Title to use for the subscription. For the `subscribe` action,
+									* if not specified then the feed’s current title will be used. Can
+									* be used with the `edit` action to rename a subscription */
+									$titles = empty($_POST['t']) && isset($_GET['t']) ? array($_GET['t']) : multiplePosts('t');
+									$action = $_REQUEST['ac'];	//Action to perform on the given StreamId. Possible values are `subscribe`, `unsubscribe` and `edit`
+									$add = isset($_REQUEST['a']) ? $_REQUEST['a'] : '';	//StreamId to add the subscription to (generally a user label)
+									$remove = isset($_REQUEST['r']) ? $_REQUEST['r'] : '';	//StreamId to remove the subscription from (generally a user label)
+									self::subscriptionEdit($streamNames, $titles, $action, $add, $remove);
+								}
+								break;
+							case 'quickadd':	//https://github.com/theoldreader/api
+								if (isset($_REQUEST['quickadd'])) {
+									self::quickadd($_REQUEST['quickadd']);
+								}
+								break;
 						}
-						break;
-				}
-			}
-			break;
-		case 'unread-count':
-			$output = isset($_GET['output']) ? $_GET['output'] : '';
-			if ($output !== 'json') notImplemented();
-			unreadCount();
-			break;
-		case 'edit-tag':	//http://blog.martindoms.com/2010/01/20/using-the-google-reader-api-part-3/
-			$token = isset($_POST['T']) ? trim($_POST['T']) : '';
-			checkToken(FreshRSS_Context::$user_conf, $token);
-			$a = isset($_POST['a']) ? $_POST['a'] : '';	//Add:	user/-/state/com.google/read	user/-/state/com.google/starred
-			$r = isset($_POST['r']) ? $_POST['r'] : '';	//Remove:	user/-/state/com.google/read	user/-/state/com.google/starred
-			$e_ids = multiplePosts('i');	//item IDs
-			editTag($e_ids, $a, $r);
-			break;
-		case 'rename-tag':	//https://github.com/theoldreader/api
-			$token = isset($_POST['T']) ? trim($_POST['T']) : '';
-			checkToken(FreshRSS_Context::$user_conf, $token);
-			$s = isset($_POST['s']) ? $_POST['s'] : '';	//user/-/label/Folder
-			$dest = isset($_POST['dest']) ? $_POST['dest'] : '';	//user/-/label/NewFolder
-			renameTag($s, $dest);
-			break;
-		case 'disable-tag':	//https://github.com/theoldreader/api
-			$token = isset($_POST['T']) ? trim($_POST['T']) : '';
-			checkToken(FreshRSS_Context::$user_conf, $token);
-			$s_s = multiplePosts('s');
-			foreach ($s_s as $s) {
-				disableTag($s);	//user/-/label/Folder
-			}
-			break;
-		case 'mark-all-as-read':
-			$token = isset($_POST['T']) ? trim($_POST['T']) : '';
-			checkToken(FreshRSS_Context::$user_conf, $token);
-			$streamId = $_POST['s'] ?? '';
-			$ts = isset($_POST['ts']) ? $_POST['ts'] : '0';	//Older than timestamp in nanoseconds
-			if (!ctype_digit($ts)) {
-				badRequest();
+					}
+					break;
+				case 'unread-count':
+					$output = isset($_GET['output']) ? $_GET['output'] : '';
+					if ($output !== 'json') self::notImplemented();
+					self::unreadCount();
+					// Always exits
+				case 'edit-tag':	//http://blog.martindoms.com/2010/01/20/using-the-google-reader-api-part-3/
+					$token = isset($_POST['T']) ? trim($_POST['T']) : '';
+					self::checkToken(FreshRSS_Context::$user_conf, $token);
+					$a = isset($_POST['a']) ? $_POST['a'] : '';	//Add:	user/-/state/com.google/read	user/-/state/com.google/starred
+					$r = isset($_POST['r']) ? $_POST['r'] : '';	//Remove:	user/-/state/com.google/read	user/-/state/com.google/starred
+					$e_ids = multiplePosts('i');	//item IDs
+					self::editTag($e_ids, $a, $r);
+					// Always exits
+				case 'rename-tag':	//https://github.com/theoldreader/api
+					$token = isset($_POST['T']) ? trim($_POST['T']) : '';
+					self::checkToken(FreshRSS_Context::$user_conf, $token);
+					$s = isset($_POST['s']) ? $_POST['s'] : '';	//user/-/label/Folder
+					$dest = isset($_POST['dest']) ? $_POST['dest'] : '';	//user/-/label/NewFolder
+					self::renameTag($s, $dest);
+					// Always exits
+				case 'disable-tag':	//https://github.com/theoldreader/api
+					$token = isset($_POST['T']) ? trim($_POST['T']) : '';
+					self::checkToken(FreshRSS_Context::$user_conf, $token);
+					$s_s = multiplePosts('s');
+					foreach ($s_s as $s) {
+						self::disableTag($s);	//user/-/label/Folder
+					}
+					// Always exits
+				case 'mark-all-as-read':
+					$token = isset($_POST['T']) ? trim($_POST['T']) : '';
+					self::checkToken(FreshRSS_Context::$user_conf, $token);
+					$streamId = trim($_POST['s'] ?? '');
+					$ts = trim($_POST['ts'] ?? '0');	//Older than timestamp in nanoseconds
+					if (!ctype_digit($ts)) {
+						self::badRequest();
+					}
+					self::markAllAsRead($streamId, $ts);
+					// Always exits
+				case 'token':
+					self::token(FreshRSS_Context::$user_conf);
+					// Always exits
+				case 'user-info':
+					self::userInfo();
+					// Always exits
 			}
-			markAllAsRead($streamId, $ts);
-			break;
-		case 'token':
-			token(FreshRSS_Context::$user_conf);
-			break;
-		case 'user-info':
-			userInfo();
-			break;
+		}
+
+		self::badRequest();
 	}
 }
 
-badRequest();
+GReaderAPI::parse();
diff --git a/p/api/pshb.php b/p/api/pshb.php
index 26d1e125b..b3e3f400f 100644
--- a/p/api/pshb.php
+++ b/p/api/pshb.php
@@ -7,9 +7,13 @@ const MAX_PAYLOAD = 3145728;
 header('Content-Type: text/plain; charset=UTF-8');
 header('X-Content-Type-Options: nosniff');
 
-$ORIGINAL_INPUT = file_get_contents('php://input', false, null, 0, MAX_PAYLOAD);
+$ORIGINAL_INPUT = file_get_contents('php://input', false, null, 0, MAX_PAYLOAD) ?: '';
 
 FreshRSS_Context::initSystem();
+if (FreshRSS_Context::$system_conf == null) {
+	header('HTTP/1.1 500 Internal Server Error');
+	die('Invalid system init!');
+}
 FreshRSS_Context::$system_conf->auth_type = 'none';	// avoid necessity to be logged in (not saved!)
 
 //Minz_Log::debug(print_r(array('_SERVER' => $_SERVER, '_GET' => $_GET, '_POST' => $_POST, 'INPUT' => $ORIGINAL_INPUT), true), PSHB_LOG);
@@ -41,7 +45,7 @@ if ($hubFile === false) {
 	die('Feed info not found!');
 }
 $hubJson = json_decode($hubFile, true);
-if (!$hubJson || empty($hubJson['key']) || $hubJson['key'] !== $key) {
+if (!is_array($hubJson) || empty($hubJson['key']) || $hubJson['key'] !== $key) {
 	header('HTTP/1.1 500 Internal Server Error');
 	Minz_Log::error('Error: Invalid key cross-check!: ' . $key, PSHB_LOG);
 	die('Invalid key cross-check!');
@@ -120,15 +124,12 @@ foreach ($users as $userFilename) {
 
 	try {
 		FreshRSS_Context::initUser($username);
-		if (FreshRSS_Context::$user_conf != null) {
-			Minz_ExtensionManager::enableByList(FreshRSS_Context::$user_conf->extensions_enabled);
-			Minz_Translate::reset(FreshRSS_Context::$user_conf->language);
-		}
-
-		if (!FreshRSS_Context::$user_conf->enabled) {
+		if (FreshRSS_Context::$user_conf == null || !FreshRSS_Context::$user_conf->enabled) {
 			Minz_Log::warning('FreshRSS skip disabled user ' . $username);
 			continue;
 		}
+		Minz_ExtensionManager::enableByList(FreshRSS_Context::$user_conf->extensions_enabled);
+		Minz_Translate::reset(FreshRSS_Context::$user_conf->language);
 
 		list($updated_feeds, $feed, $nb_new_articles) = FreshRSS_feed_Controller::actualizeFeed(0, $self, false, $simplePie);
 		if ($updated_feeds > 0 || $feed != false) {
diff --git a/p/ext.php b/p/ext.php
index 2979e2365..abc07ad12 100644
--- a/p/ext.php
+++ b/p/ext.php
@@ -13,10 +13,7 @@ const SUPPORTED_TYPES = [
 	'svg' => 'image/svg+xml',
 ];
 
-/**
- * @return string
- */
-function get_absolute_filename(string $file_name) {
+function get_absolute_filename(string $file_name): string {
 	$core_extension = realpath(CORE_EXTENSIONS_PATH . '/' . $file_name);
 	if (false !== $core_extension) {
 		return $core_extension;
@@ -40,9 +37,12 @@ function get_absolute_filename(string $file_name) {
 	return '';
 }
 
-function is_valid_path_extension($path, $extensionPath, $isStatic = true) {
+function is_valid_path_extension(string $path, string $extensionPath, bool $isStatic = true): bool {
 	// It must be under the extension path.
 	$real_ext_path = realpath($extensionPath);
+	if ($real_ext_path == false) {
+		return false;
+	}
 
 	//Windows compatibility
 	$real_ext_path = str_replace('\\', '/', $real_ext_path);
@@ -60,8 +60,7 @@ function is_valid_path_extension($path, $extensionPath, $isStatic = true) {
 
 	// Static files to serve must be under a `ext_dir/static/` directory.
 	$path_relative_to_ext = substr($path, strlen($real_ext_path) + 1);
-	// @phpstan-ignore-next-line
-	list(,$static,$file) = sscanf($path_relative_to_ext, '%[^/]/%[^/]/%s');
+	list(, $static, $file) = sscanf($path_relative_to_ext, '%[^/]/%[^/]/%s') ?? [null, null, null];
 	if (null === $file || 'static' !== $static) {
 		return false;
 	}
@@ -79,16 +78,18 @@ function is_valid_path_extension($path, $extensionPath, $isStatic = true) {
  * @return bool true if it can be served, false otherwise.
  *
  */
-function is_valid_path($path) {
+function is_valid_path(string $path): bool {
 	return is_valid_path_extension($path, CORE_EXTENSIONS_PATH) || is_valid_path_extension($path, THIRDPARTY_EXTENSIONS_PATH)
 		|| is_valid_path_extension($path, USERS_PATH, false);
 }
 
+/** @return never */
 function sendBadRequestResponse(string $message = null) {
 	header('HTTP/1.1 400 Bad Request');
 	die($message);
 }
 
+/** @return never */
 function sendNotFoundResponse() {
 	header('HTTP/1.1 404 Not Found');
 	die();
diff --git a/p/f.php b/p/f.php
index d856256aa..7837407e2 100644
--- a/p/f.php
+++ b/p/f.php
@@ -4,7 +4,7 @@ require(LIB_PATH . '/lib_rss.php');	//Includes class autoloader
 require(LIB_PATH . '/favicons.php');
 require(LIB_PATH . '/http-conditional.php');
 
-function show_default_favicon($cacheSeconds = 3600) {
+function show_default_favicon(int $cacheSeconds = 3600): void {
 	$default_mtime = @filemtime(DEFAULT_FAVICON);
 	if (!httpConditional($default_mtime, $cacheSeconds, 2)) {
 		header('Content-Type: image/x-icon');
diff --git a/p/i/index.php b/p/i/index.php
index 48cedfc92..360a858ca 100755..100644
--- a/p/i/index.php
+++ b/p/i/index.php
@@ -35,8 +35,8 @@ if (!file_exists($applied_migrations_path)) {
 		require(LIB_PATH . '/http-conditional.php');
 		$currentUser = Minz_Session::param('currentUser', '');
 		$dateLastModification = $currentUser === '' ? time() : max(
-			@filemtime(join_path(USERS_PATH, $currentUser, LOG_FILENAME)),
-			@filemtime(join_path(DATA_PATH, 'config.php'))
+			@filemtime(USERS_PATH . '/' . $currentUser . '/' . LOG_FILENAME),
+			@filemtime(DATA_PATH . '/config.php')
 		);
 		if (httpConditional($dateLastModification, 0, 0, false, PHP_COMPRESSION, true)) {
 			Minz_Session::init('FreshRSS');
diff --git a/p/index.html b/p/index.html
index 3f4284eb5..86cd81c84 100644
--- a/p/index.html
+++ b/p/index.html
@@ -14,6 +14,6 @@
 
 <body>
 <h1><a href="i/">FreshRSS</a></h1>
-<p><a href="i/"><img class="logo" width="25%" src="themes/icons/icon.svg" alt="⊚" /></a></p>
+<p><a href="i/"><img class="logo" width="25%" src="themes/icons/icon.svg" alt="⊚" loading="lazy" /></a></p>
 </body>
 </html>
diff --git a/p/scripts/extra.js b/p/scripts/extra.js
index 52a480c9a..707719430 100644
--- a/p/scripts/extra.js
+++ b/p/scripts/extra.js
@@ -145,6 +145,9 @@ function init_archiving(parent) {
 const freshrssSliderLoadEvent = new Event('freshrss:slider-load');
 
 function open_slider_listener(ev) {
+	if (ev.ctrlKey || ev.shiftKey) {
+		return;
+	}
 	const a = ev.target.closest('.open-slider');
 	if (a) {
 		if (!context.ajax_loading) {
@@ -175,21 +178,24 @@ function open_slider_listener(ev) {
 function init_slider(slider) {
 	window.onclick = open_slider_listener;
 
-	const closer = document.getElementById('close-slider');
-	closer.addEventListener('click', function (ev) {
-		if (data_leave_validation(slider) || confirm(context.i18n.confirmation_default)) {
-			slider.querySelectorAll('form').forEach(function (f) { f.reset(); });
-			document.documentElement.classList.remove('slider-active');
-			return true;
-		} else {
-			return false;
-		}
-	});
+	document.getElementById('close-slider').addEventListener('click', close_slider_listener);
+	document.querySelector('#slider .toggle_aside').addEventListener('click', close_slider_listener);
 
 	if (slider.children.length > 0) {
 		slider.dispatchEvent(freshrssSliderLoadEvent);
 	}
 }
+
+function close_slider_listener(ev) {
+	const slider = document.getElementById('slider');
+	if (data_leave_validation(slider) || confirm(context.i18n.confirmation_default)) {
+		slider.querySelectorAll('form').forEach(function (f) { f.reset(); });
+		document.documentElement.classList.remove('slider-active');
+		return true;
+	} else {
+		return false;
+	}
+}
 // </slider>
 
 // overwrites the href attribute from the url input
diff --git a/p/scripts/feed.js b/p/scripts/feed.js
index 1a6833db6..29af2a3ea 100644
--- a/p/scripts/feed.js
+++ b/p/scripts/feed.js
@@ -88,10 +88,17 @@ function init_disable_elements_on_update(parent) {
 function init_select_show(parent) {
 	const listener = (select) => {
 		const options = select.querySelectorAll('option[data-show]');
+		const shows = {};	// To allow multiple options to show the same element
 		for (const option of options) {
-			const elem = document.getElementById(option.dataset.show);
+			if (!shows[option.dataset.show]) {
+				shows[option.dataset.show] = option.selected;
+			}
+		}
+
+		for (const show in shows) {
+			const elem = document.getElementById(show);
 			if (elem) {
-				elem.style.display = option.selected ? 'block' : 'none';
+				elem.style.display = shows[show] ? 'block' : 'none';
 			}
 		}
 	};
diff --git a/p/scripts/main.js b/p/scripts/main.js
index 268fd2858..bca6c2407 100644
--- a/p/scripts/main.js
+++ b/p/scripts/main.js
@@ -264,6 +264,7 @@ function send_mark_read_queue(queue, asRead, callback) {
 				incUnreadsTag(tagId, (asRead ? -1 : 1) * json.tags[tagId].length);
 			}
 		}
+		toggle_bigMarkAsRead_button();
 		onScroll();
 		if (callback) {
 			callback();
@@ -1012,11 +1013,13 @@ function init_shortcuts() {
 			}
 
 			const link_go_website = document.querySelector('.flux.current a.go_website');
-			const newWindow = window.open();
-			if (link_go_website && newWindow) {
-				newWindow.opener = null;
-				newWindow.location = link_go_website.href;
-				ev.preventDefault();
+			if (link_go_website) {
+				const newWindow = window.open();
+				if (newWindow) {
+					newWindow.opener = null;
+					newWindow.location = link_go_website.href;
+					ev.preventDefault();
+				}
 			}
 			return;
 		}
@@ -1101,6 +1104,12 @@ function init_stream(stream) {
 			return false;
 		}
 
+		el = ev.target.closest('.item.share > a[data-type="email-webmail-firefox-fix"]');
+		if (el) {
+			window.open(el.href);
+			return false;
+		}
+
 		el = ev.target.closest('.item.share > a[href="POST"]');
 		if (el) {	// Share by POST
 			const f = el.parentElement.querySelector('form');
@@ -1562,7 +1571,7 @@ function notifs_html5_show(nb, nb_new) {
 
 	const notification = new window.Notification(context.i18n.notif_title_articles, {
 		icon: '../themes/icons/favicon-256-padding.png',
-		body: context.i18n.notif_body_new_articles.replace('%d', nb_new) + ' ' + context.i18n.notif_body_unread_articles.replace('%d', nb),
+		body: context.i18n.notif_body_new_articles.replace('%%d', nb_new) + ' ' + context.i18n.notif_body_unread_articles.replace('%%d', nb),
 		tag: 'freshRssNewArticles',
 	});
 
@@ -1655,6 +1664,23 @@ function refreshUnreads() {
 	req.send();
 }
 
+function toggle_bigMarkAsRead_button() {
+	const bigMarkAsRead_button = document.getElementById('bigMarkAsRead');
+	if (bigMarkAsRead_button) {
+		if (document.querySelector('.flux.not_read') != null) {
+			bigMarkAsRead_button.style = '';
+			bigMarkAsRead_button.querySelector('.markAllRead').style.visibility = '';
+		} else {
+			if (bigMarkAsRead_button.querySelector('.jumpNext')) {
+				bigMarkAsRead_button.querySelector('.markAllRead').style.visibility = 'hidden';
+			} else {
+				bigMarkAsRead_button.querySelector('.markAllRead').style.visibility = '';
+				bigMarkAsRead_button.style.visibility = 'hidden';
+			}
+		}
+	}
+}
+
 // <endless_mode>
 let url_load_more = '';
 let load_more = false;
@@ -1691,6 +1717,7 @@ function load_more_posts() {
 			} else {
 				bigMarkAsRead.formAction = readAll.formAction;
 			}
+			toggle_bigMarkAsRead_button();
 		}
 
 		document.querySelectorAll('[id^=day_]').forEach(function (div) {
@@ -1843,6 +1870,7 @@ function init_main_afterDOM() {
 		init_posts();
 		init_nav_entries();
 		init_notifs_html5();
+		toggle_bigMarkAsRead_button();
 		setTimeout(faviconNbUnread, 1000);
 		setInterval(refreshUnreads, 120000);
 	}
diff --git a/p/themes/.htaccess b/p/themes/.htaccess
index 796c55ae0..0e78aab3a 100644
--- a/p/themes/.htaccess
+++ b/p/themes/.htaccess
@@ -1,6 +1,6 @@
 <IfModule mod_mime.c>
-	AddType application/font-woff .woff
-	AddType application/font-woff2 .woff2
+	AddType font/woff .woff
+	AddType font/woff2 .woff2
 
 	AddCharset	UTF-8	.css
 	AddCharset	UTF-8	.svg
@@ -8,8 +8,9 @@
 
 <IfModule mod_expires.c>
 	ExpiresActive	on
-	ExpiresByType	application/font-woff	"access plus 1 month"
 	ExpiresByType	application/json	"access plus 1 month"
+	ExpiresByType	font/woff	"access plus 1 month"
+	ExpiresByType	font/woff2	"access plus 1 month"
 	ExpiresByType	image/gif	"access plus 1 month"
 	ExpiresByType	image/png	"access plus 1 month"
 	ExpiresByType	image/svg+xml	"access plus 1 month"
diff --git a/p/themes/Alternative-Dark/adark.css b/p/themes/Alternative-Dark/adark.css
index 3b5a9d337..0f600fa2e 100644
--- a/p/themes/Alternative-Dark/adark.css
+++ b/p/themes/Alternative-Dark/adark.css
@@ -114,17 +114,12 @@ input:disabled, select:disabled {
 	border-color: var(--border-color-dark);
 }
 
-input.extend {
-	transition: width 200ms linear;
-}
-
 /*=== Tables */
 table {
 	border-collapse: collapse;
 }
 
-tr, th, td {
-	padding: 0.5em;
+th, td {
 	border: 1px solid var(--border-color-dark);
 }
 
@@ -153,7 +148,6 @@ form th {
 
 .form-group .group-name {
 	padding: 10px 0;
-	text-align: right;
 }
 
 .form-group .group-controls {
@@ -282,13 +276,17 @@ a.btn {
 }
 
 /*=== Navigation */
-.nav-list .nav-header,
-.nav-list .item {
-	line-height: 2.5;
+.nav-list {
 	color: var(--font-color-light);
 	font-size: 0.9rem;
 }
 
+.nav-list .item,
+.nav-list .item.nav-header {
+	min-height: 2.5em;
+	line-height: 2.5;
+}
+
 .nav-list .item a {
 	color: var(--font-color-middle);
 }
@@ -304,33 +302,15 @@ a.btn {
 }
 
 .nav-list .item > a {
-	padding: 0 10px;
+	padding: 0 1rem;
 }
 
 .nav-list a:hover {
 	text-decoration: none;
 }
 
-.nav-list .item.empty a {
-	color: var(--empty-feed-color);
-}
-
-.nav-list .item.active.empty a {
-	background: var(--empty-feed-color);
-	color: var(--font-color-light);
-}
-
-.nav-list .item.error a {
-	color: var(--font-color-error);
-}
-
-.nav-list .item.active.error a {
-	background: var(--contrast-attention-background-color);
-	color: var(--font-color-light);
-}
-
 .nav-list .nav-header {
-	padding: 0 10px;
+	padding: 0 1rem;
 	color: var(--font-color-middle);
 	font-weight: bold;
 }
@@ -343,7 +323,7 @@ a.btn {
 /*=== Dropdown */
 .dropdown-menu {
 	margin: 5px 0 0;
-	padding: 5px 0;
+	padding: 0.5rem 0 0.25rem 0;
 	background: var(--background-color-active);
 	font-size: 0.8rem;
 	border: 2px solid var(--background-color-light);
@@ -355,23 +335,35 @@ a.btn {
 	border-color: var(--border-color-dark);
 }
 
-.dropdown-header {
-	padding: 0 5px 5px;
+.dropdown-header,
+.dropdown-section .dropdown-section-title {
+	padding: 0.25rem 0.5rem 0.25rem 1rem;
 	color: var(--font-color-middle);
 	font-weight: bold;
 	text-align: left;
 }
 
-.dropdown-menu > .item > a,
-.dropdown-menu > .item > span,
-.dropdown-menu > .item > .as-link {
+.dropdown-menu .item > a,
+.dropdown-menu .item > span,
+.dropdown-menu .item > .as-link {
 	padding: 0 22px;
 	line-height: 2.5;
-	font-size: 0.8rem;
+	font-size: inherit;
+}
+
+.dropdown-menu .dropdown-section .item > a,
+.dropdown-menu .dropdown-section .item > span,
+.dropdown-menu .dropdown-section .item > .as-link {
+	padding-left: 2rem;
 }
 
-.dropdown-menu > .item > a:hover,
-.dropdown-menu > .item > button:hover {
+.dropdown-menu .dropdown-section .item:last-child {
+	margin-bottom: 0.5rem;
+}
+
+.dropdown-menu .item > a:hover,
+.dropdown-menu .item > button:hover:not([disabled]),
+.dropdown-menu .item > label:hover:not(.noHover) {
 	background: var(--background-color-hover);
 	color: var(--font-color-light);
 }
@@ -389,14 +381,13 @@ a.btn {
 }
 
 .item ~ .dropdown-header,
+.dropdown-section ~ .dropdown-section,
 .item.separator {
 	border-top-color: var(--border-color-dark);
 }
 
 /*=== Alerts */
 .alert {
-	margin: 15px auto;
-	padding: 10px 15px;
 	background-color: var(--background-color-dark);
 	color: var(--font-color-middle);
 	font-size: 0.9em;
@@ -524,8 +515,6 @@ kbd {
 }
 
 .tree-folder-items > .item {
-	padding: 0 10px;
-	line-height: 3.1;
 	font-size: 0.8rem;
 }
 
@@ -549,26 +538,20 @@ kbd {
 }
 
 .header > .item {
-	padding: 10px;
 	border-bottom: 1px solid var(--border-color-dark);
 	vertical-align: middle;
 	text-align: center;
 }
 
-.header > .item.title {
-	width: 230px;
-}
-
 .header > .item.title .logo {
-	margin: 0.5em 0;
 	filter: grayscale(100%) brightness(2.5);
 }
 
-.header > .item.search input {
-	width: 230px;
+.header > .item.title a:hover .logo {
+	filter: grayscale(100%) brightness(2.8);
 }
 
-.header .item.search input:focus {
+.header > .item.search input {
 	width: 350px;
 }
 
@@ -595,7 +578,8 @@ kbd {
 
 .aside.aside_feed .category .title:not([data-unread="0"])::after,
 .aside.aside_feed .feed .item-title:not([data-unread="0"])::after,
-.global .box.category .title:not([data-unread="0"])::after {
+.global .box.category .title:not([data-unread="0"])::after,
+.global .feed .item-title:not([data-unread="0"])::after {
 	background-color: var(--background-color-dark);
 	color: var(--font-color-middle);
 }
@@ -742,7 +726,7 @@ kbd {
 	border-left-style: solid;
 }
 
-.flux:hover {
+.flux .flux_header:hover {
 	background: var(--background-color-hover) !important;
 }
 
@@ -915,15 +899,6 @@ kbd {
 	color: var(--font-color-contrast);
 }
 
-.notification a.close {
-	padding: 0 15px;
-	line-height: 3;
-}
-
-.notification#actualizeProgress {
-	line-height: 2;
-}
-
 /*=== "Load more" part */
 #bigMarkAsRead {
 	background: var(--background-color-dark);
@@ -1013,6 +988,10 @@ kbd {
 	text-shadow: none;
 }
 
+#stream.global .feed .item-title:not([data-unread="0"])::after {
+	margin: 1rem 0px 0px;
+}
+
 /*=== Slider */
 #slider {
 	background: var(--background-color-dark);
@@ -1071,7 +1050,6 @@ kbd {
 @media (max-width: 840px) {
 	.form-group .group-name {
 		padding-bottom: 0;
-		text-align: left;
 	}
 
 	.aside {
@@ -1127,21 +1105,6 @@ kbd {
 		margin: 5px 0;
 	}
 
-	.nav_menu .search {
-		display: inline-block;
-		max-width: 97%;
-	}
-
-	.nav_menu .search input {
-		padding: 3px 5px;
-		max-width: 97%;
-		width: 90px;
-	}
-
-	.nav_menu .search input:focus {
-		width: 400px;
-	}
-
 	.dropdown-target:target ~ .dropdown-toggle::after {
 		background-color: var(--background-color-active);
 		border-top: 2px solid var(--background-color-light);
diff --git a/p/themes/Alternative-Dark/adark.rtl.css b/p/themes/Alternative-Dark/adark.rtl.css
index 64ddd4403..a42fa2a71 100644
--- a/p/themes/Alternative-Dark/adark.rtl.css
+++ b/p/themes/Alternative-Dark/adark.rtl.css
@@ -114,17 +114,12 @@ input:disabled, select:disabled {
 	border-color: var(--border-color-dark);
 }
 
-input.extend {
-	transition: width 200ms linear;
-}
-
 /*=== Tables */
 table {
 	border-collapse: collapse;
 }
 
-tr, th, td {
-	padding: 0.5em;
+th, td {
 	border: 1px solid var(--border-color-dark);
 }
 
@@ -153,7 +148,6 @@ form th {
 
 .form-group .group-name {
 	padding: 10px 0;
-	text-align: left;
 }
 
 .form-group .group-controls {
@@ -282,13 +276,17 @@ a.btn {
 }
 
 /*=== Navigation */
-.nav-list .nav-header,
-.nav-list .item {
-	line-height: 2.5;
+.nav-list {
 	color: var(--font-color-light);
 	font-size: 0.9rem;
 }
 
+.nav-list .item,
+.nav-list .item.nav-header {
+	min-height: 2.5em;
+	line-height: 2.5;
+}
+
 .nav-list .item a {
 	color: var(--font-color-middle);
 }
@@ -304,33 +302,15 @@ a.btn {
 }
 
 .nav-list .item > a {
-	padding: 0 10px;
+	padding: 0 1rem;
 }
 
 .nav-list a:hover {
 	text-decoration: none;
 }
 
-.nav-list .item.empty a {
-	color: var(--empty-feed-color);
-}
-
-.nav-list .item.active.empty a {
-	background: var(--empty-feed-color);
-	color: var(--font-color-light);
-}
-
-.nav-list .item.error a {
-	color: var(--font-color-error);
-}
-
-.nav-list .item.active.error a {
-	background: var(--contrast-attention-background-color);
-	color: var(--font-color-light);
-}
-
 .nav-list .nav-header {
-	padding: 0 10px;
+	padding: 0 1rem;
 	color: var(--font-color-middle);
 	font-weight: bold;
 }
@@ -343,7 +323,7 @@ a.btn {
 /*=== Dropdown */
 .dropdown-menu {
 	margin: 5px 0 0;
-	padding: 5px 0;
+	padding: 0.5rem 0 0.25rem 0;
 	background: var(--background-color-active);
 	font-size: 0.8rem;
 	border: 2px solid var(--background-color-light);
@@ -355,23 +335,35 @@ a.btn {
 	border-color: var(--border-color-dark);
 }
 
-.dropdown-header {
-	padding: 0 5px 5px;
+.dropdown-header,
+.dropdown-section .dropdown-section-title {
+	padding: 0.25rem 1rem 0.25rem 0.5rem;
 	color: var(--font-color-middle);
 	font-weight: bold;
 	text-align: right;
 }
 
-.dropdown-menu > .item > a,
-.dropdown-menu > .item > span,
-.dropdown-menu > .item > .as-link {
+.dropdown-menu .item > a,
+.dropdown-menu .item > span,
+.dropdown-menu .item > .as-link {
 	padding: 0 22px;
 	line-height: 2.5;
-	font-size: 0.8rem;
+	font-size: inherit;
+}
+
+.dropdown-menu .dropdown-section .item > a,
+.dropdown-menu .dropdown-section .item > span,
+.dropdown-menu .dropdown-section .item > .as-link {
+	padding-right: 2rem;
 }
 
-.dropdown-menu > .item > a:hover,
-.dropdown-menu > .item > button:hover {
+.dropdown-menu .dropdown-section .item:last-child {
+	margin-bottom: 0.5rem;
+}
+
+.dropdown-menu .item > a:hover,
+.dropdown-menu .item > button:hover:not([disabled]),
+.dropdown-menu .item > label:hover:not(.noHover) {
 	background: var(--background-color-hover);
 	color: var(--font-color-light);
 }
@@ -389,14 +381,13 @@ a.btn {
 }
 
 .item ~ .dropdown-header,
+.dropdown-section ~ .dropdown-section,
 .item.separator {
 	border-top-color: var(--border-color-dark);
 }
 
 /*=== Alerts */
 .alert {
-	margin: 15px auto;
-	padding: 10px 15px;
 	background-color: var(--background-color-dark);
 	color: var(--font-color-middle);
 	font-size: 0.9em;
@@ -524,8 +515,6 @@ kbd {
 }
 
 .tree-folder-items > .item {
-	padding: 0 10px;
-	line-height: 3.1;
 	font-size: 0.8rem;
 }
 
@@ -549,26 +538,20 @@ kbd {
 }
 
 .header > .item {
-	padding: 10px;
 	border-bottom: 1px solid var(--border-color-dark);
 	vertical-align: middle;
 	text-align: center;
 }
 
-.header > .item.title {
-	width: 230px;
-}
-
 .header > .item.title .logo {
-	margin: 0.5em 0;
 	filter: grayscale(100%) brightness(2.5);
 }
 
-.header > .item.search input {
-	width: 230px;
+.header > .item.title a:hover .logo {
+	filter: grayscale(100%) brightness(2.8);
 }
 
-.header .item.search input:focus {
+.header > .item.search input {
 	width: 350px;
 }
 
@@ -595,7 +578,8 @@ kbd {
 
 .aside.aside_feed .category .title:not([data-unread="0"])::after,
 .aside.aside_feed .feed .item-title:not([data-unread="0"])::after,
-.global .box.category .title:not([data-unread="0"])::after {
+.global .box.category .title:not([data-unread="0"])::after,
+.global .feed .item-title:not([data-unread="0"])::after {
 	background-color: var(--background-color-dark);
 	color: var(--font-color-middle);
 }
@@ -742,7 +726,7 @@ kbd {
 	border-right-style: solid;
 }
 
-.flux:hover {
+.flux .flux_header:hover {
 	background: var(--background-color-hover) !important;
 }
 
@@ -915,15 +899,6 @@ kbd {
 	color: var(--font-color-contrast);
 }
 
-.notification a.close {
-	padding: 0 15px;
-	line-height: 3;
-}
-
-.notification#actualizeProgress {
-	line-height: 2;
-}
-
 /*=== "Load more" part */
 #bigMarkAsRead {
 	background: var(--background-color-dark);
@@ -1013,6 +988,10 @@ kbd {
 	text-shadow: none;
 }
 
+#stream.global .feed .item-title:not([data-unread="0"])::after {
+	margin: 1rem 0px 0px;
+}
+
 /*=== Slider */
 #slider {
 	background: var(--background-color-dark);
@@ -1071,7 +1050,6 @@ kbd {
 @media (max-width: 840px) {
 	.form-group .group-name {
 		padding-bottom: 0;
-		text-align: right;
 	}
 
 	.aside {
@@ -1127,21 +1105,6 @@ kbd {
 		margin: 5px 0;
 	}
 
-	.nav_menu .search {
-		display: inline-block;
-		max-width: 97%;
-	}
-
-	.nav_menu .search input {
-		padding: 3px 5px;
-		max-width: 97%;
-		width: 90px;
-	}
-
-	.nav_menu .search input:focus {
-		width: 400px;
-	}
-
 	.dropdown-target:target ~ .dropdown-toggle::after {
 		background-color: var(--background-color-active);
 		border-top: 2px solid var(--background-color-light);
diff --git a/p/themes/Ansum/_components.scss b/p/themes/Ansum/_components.scss
index 35298b4de..88ab37296 100644
--- a/p/themes/Ansum/_components.scss
+++ b/p/themes/Ansum/_components.scss
@@ -22,6 +22,12 @@
 }
 
 /*=== Dropdown */
+.dropdown {
+	.dropdown-target:target + .btn {
+		background-color: variables.$grey-medium-light;
+	}
+}
+
 .dropdown-menu {
 	margin: 9px 0 0 0;
 	padding: 0.5rem 0 1rem 0;
@@ -37,44 +43,61 @@
 		right: 17px;
 	}
 
-	.dropdown-header {
-		padding: 1rem 0.5rem 1rem 1rem;
+	.dropdown-header,
+	.dropdown-section .dropdown-section-title {
+		padding: 1rem 1.5rem;
 		font-weight: bold;
 		text-align: left;
 		color: variables.$grey-dark;
 		text-transform: uppercase;
 		letter-spacing: 1px;
-
-
 	}
 
 	.item {
 
 		@include mixins.transition(all, 0.075s, ease-in-out);
 
-		a, span, .as-link {
+		> a,
+		> span,
+		> .as-link {
 			padding: 0 2rem;
 			color: variables.$main-font-color;
-			font-size: 1rem;
+			font-size: inherit;
 			line-height: 2.5em;
-		}
 
-		&:not(.addItem):hover {
-			background: variables.$main-first;
-			color: variables.$white;
+			span.icon {
+				padding: 0 0.25rem !important;
+			}
+		}
 
-			a, button, label {
-				text-decoration: none;
+		> a,
+		> .as-link {
+			&:not(.addItem):hover {
+				background: variables.$main-first;
 				color: variables.$white;
+
+				.icon {
+					filter: grayscale(100%) brightness(2.5);
+				}
 			}
+		}
 
-			.icon {
-				filter: grayscale(100%) brightness(2.5);
+		&.dropdown-section {
+			margin-top: 0.75rem;
+
+			~ .dropdown-section {
+				border-top-color: variables.$grey-light;
+			}
+
+			.item {
+				a, .as-link {
+					padding-left: 2rem;
+				}
 			}
 		}
 
 		&:not(.addItem) {
-			a:hover,
+			> a:hover,
 			button:hover {
 				background: variables.$main-first;
 				color: variables.$white;
@@ -139,9 +162,6 @@
 
 /*=== Alerts */
 .alert {
-	margin: 1rem 0;
-	// width: 100%;
-	padding: 1rem;
 	background: variables.$grey-lighter;
 	color: variables.$grey-dark;
 	font-size: 1rem;
diff --git a/p/themes/Ansum/_forms.scss b/p/themes/Ansum/_forms.scss
index 77c9e3552..3bdb30664 100644
--- a/p/themes/Ansum/_forms.scss
+++ b/p/themes/Ansum/_forms.scss
@@ -120,24 +120,17 @@ input:disabled, select:disabled {
 	border-color: variables.$grey-medium-dark;
 }
 
-input.extend {
-	transition: width 200ms linear;
-}
-
-
 .form-group {
 	padding: 5px;
 	border-radius: 3px;
 
 	&::after {
-		content: "";
 		display: block;
 		clear: both;
 	}
 
 	.group-name {
 		padding: 10px 0;
-		text-align: right;
 	}
 
 	.group-controls {
diff --git a/p/themes/Ansum/_layout.scss b/p/themes/Ansum/_layout.scss
index 4d099ab4a..78431f462 100644
--- a/p/themes/Ansum/_layout.scss
+++ b/p/themes/Ansum/_layout.scss
@@ -6,31 +6,30 @@
 /*===============*/
 /*=== Header */
 .header {
-	padding: 0.5rem 1.35rem;
 	background: variables.$sid-bg;
-	display: block;
-	width: auto;
-	height: 3.5rem;
-	table-layout: none;
 
 	.item {
 		vertical-align: middle;
 
 		&.title {
-			width: 280px;
-			font-weight: 400;
-
 			a {
-				img {
-					margin: 0.6em 0 0.3em;
+				padding: 0.5rem 1rem;
+
+				.logo {
 					filter: invert(80%);
 				}
+
+				&:hover {
+					.logo {
+						filter: invert(80%) opacity(80%);
+					}
+				}
 			}
 		}
 
 		&.search {
 			input {
-				width: 230px;
+				width: 350px;
 				color: variables.$sid-font-color;
 				border: none;
 				border-radius: 2px 0 0 2px;
@@ -43,9 +42,7 @@
 				}
 
 				&:focus {
-					width: 350px;
 					color: variables.$grey-dark;
-
 					background-color: variables.$white;
 				}
 			}
@@ -81,10 +78,6 @@
 		}
 
 		&.configure {
-			width: 3rem;
-			position: absolute;
-			right: 1rem;
-			top: 1rem;
 			text-align: center;
 
 			.btn {
@@ -97,7 +90,7 @@
 
 /*=== Body */
 #global {
-	height: calc(100% - 3.5rem);
+	height: calc(100vh - (calc(3rem + 2 * var(--frss-padding-top-bottom))));
 }
 
 /*=== Prompt (centered) */
@@ -214,7 +207,7 @@ main.prompt {
 			}
 		}
 
-		.dropdown {
+		.dropdown:not(#dropdown-search-wrapper) {
 			a.dropdown-toggle {
 				border-left-width: 0;
 				background-image: url(icons/more.svg);
@@ -224,6 +217,12 @@ main.prompt {
 				}
 			}
 		}
+
+		#dropdown-search-wrapper.dropdown {
+			a.dropdown-toggle {
+				border-left-width: 0;
+			}
+		}
 	}
 }
 
@@ -348,9 +347,7 @@ main.prompt {
 	}
 
 	a.close {
-		padding: 0 15px;
 		border-radius: 0 3px 3px 0;
-		line-height: 3em;
 	}
 
 	&.good a.close:hover {
@@ -362,11 +359,13 @@ main.prompt {
 	}
 
 	&#actualizeProgress {
-		line-height: 2em;
-
 		br {
 			display: none;
 		}
+
+		.title {
+			margin: 0 2rem;
+		}
 	}
 }
 
diff --git a/p/themes/Ansum/_list-view.scss b/p/themes/Ansum/_list-view.scss
index c85c6f8fb..1ffd68dc7 100644
--- a/p/themes/Ansum/_list-view.scss
+++ b/p/themes/Ansum/_list-view.scss
@@ -11,11 +11,13 @@
 
 	@include mixins.transition(all, 0.15s, ease-in-out);
 
-	&:hover {
-		background: variables.$grey-lighter;
-
-		&:not(.current):hover .item.title {
+	.flux_header {
+		&:hover {
 			background: variables.$grey-lighter;
+
+			&:not(.current):hover .item.title {
+				background: variables.$grey-lighter;
+			}
 		}
 	}
 
diff --git a/p/themes/Ansum/_mobile.scss b/p/themes/Ansum/_mobile.scss
index 9e90010c6..6fbca4a52 100644
--- a/p/themes/Ansum/_mobile.scss
+++ b/p/themes/Ansum/_mobile.scss
@@ -6,10 +6,6 @@
 /*===========*/
 
 @media (max-width: 840px) {
-	.form-group .group-name {
-		text-align: left;
-	}
-
 	.aside {
 
 		@include mixins.transition(all, 0.2s, ease-in-out);
@@ -39,35 +35,15 @@
 	}
 
 	.header {
-		padding: 0.5rem;
-		height: 8rem;
-
 		.item {
 			&.search {
-				display: block;
-
-				form {
-					display: inherit;
-				}
-
-				.stick {
-					display: flex;
-				}
-
-				input {
-					width: 90%;
-					height: 3.5rem;
-
-					&:focus {
-						width: 100%;
-
-					}
-				}
+				display: none;
+			}
 
-				.btn {
-					min-height: 49px;
-					padding: 0.5rem 2rem;
-				}
+			&.configure {
+				position: absolute;
+				top: 0;
+				right: 0;
 			}
 		}
 	}
@@ -101,11 +77,7 @@
 		}
 
 		.search {
-			display: none;
-			max-width: 97%;
-
 			.input {
-
 				max-width: 97%;
 				width: 90px;
 
diff --git a/p/themes/Ansum/_sidebar.scss b/p/themes/Ansum/_sidebar.scss
index 7aaa6b0a8..7c21d159d 100644
--- a/p/themes/Ansum/_sidebar.scss
+++ b/p/themes/Ansum/_sidebar.scss
@@ -93,7 +93,7 @@
 		border-radius: 5px 0 0 5px;
 	}
 
-	.btn:last-child, input:last-child, .btn + .dropdown > .btn {
+	.btn:last-child, input:last-child, .dropdown:last-child > .btn {
 		border-radius: 0 5px 5px 0;
 	}
 
@@ -135,15 +135,23 @@
 
 /*=== Navigation */
 .nav-list {
-	.nav-header,
+	font-size: 1rem;
+
+	.item.nav-header,
 	.item {
-		height: 2.5em;
+		min-height: 2.5em;
 		line-height: 2.5em;
-		font-size: 1rem;
 	}
 
 	.item {
 		background: variables.$sid-bg;
+		min-height: 2.5em;
+		line-height: 2.5em;
+
+		&.nav-header {
+			min-height: 2.5em;
+			line-height: 2.5em;
+		}
 
 		a {
 			padding: 0 1rem;
@@ -152,51 +160,15 @@
 			@include mixins.transition(all, 0.15s, ease-in-out);
 		}
 
-		.error {
-			a {
-				color: variables.$alert-bg;
-			}
-		}
-
-		&:hover {
-			.error {
-				a {
-					background: variables.$main-first;
-					color: variables.$sid-font-color;
-				}
-			}
-
-			.empty {
-				a {
-					background: variables.$warning-bg;
-					color: variables.$sid-font-color;
-				}
-			}
-
-			a {
-				background: variables.$sid-bg-dark;
-				text-decoration: none;
-			}
+		a:hover {
+			background: variables.$sid-bg-dark;
+			text-decoration: none;
 		}
 
 		&.active {
 			background: variables.$main-first;
 			color: variables.$white;
 
-			.error {
-				a {
-					background: variables.$main-first;
-					color: variables.$white;
-				}
-			}
-
-			.empty {
-				a {
-					background: variables.$warning-bg;
-					color: variables.$white;
-				}
-			}
-
 			a {
 				background: variables.$main-first;
 				color: variables.$white;
@@ -205,14 +177,8 @@
 		}
 	}
 
-	&.empty {
-		a {
-			color: variables.$warning-bg;
-		}
-	}
-
 	.nav-header {
-		padding: 0 10px;
+		padding: 0 1rem;
 		font-weight: bold;
 		color: variables.$grey-dark;
 		text-transform: uppercase;
diff --git a/p/themes/Ansum/_tables.scss b/p/themes/Ansum/_tables.scss
index 4955fff6a..7376279e0 100644
--- a/p/themes/Ansum/_tables.scss
+++ b/p/themes/Ansum/_tables.scss
@@ -5,8 +5,7 @@ table {
 	border-collapse: collapse;
 }
 
-tr, th, td {
-	padding: 0.5em;
+th, td {
 	border: 1px solid variables.$grey-medium-light;
 }
 
diff --git a/p/themes/Ansum/ansum.css b/p/themes/Ansum/ansum.css
index 21d718949..709861e18 100644
--- a/p/themes/Ansum/ansum.css
+++ b/p/themes/Ansum/ansum.css
@@ -164,22 +164,16 @@ input:disabled, select:disabled {
 	border-color: #ba9;
 }
 
-input.extend {
-	transition: width 200ms linear;
-}
-
 .form-group {
 	padding: 5px;
 	border-radius: 3px;
 }
 .form-group::after {
-	content: "";
 	display: block;
 	clear: both;
 }
 .form-group .group-name {
 	padding: 10px 0;
-	text-align: right;
 }
 .form-group .group-controls {
 	min-height: 25px;
@@ -201,8 +195,7 @@ table {
 	border-collapse: collapse;
 }
 
-tr, th, td {
-	padding: 0.5em;
+th, td {
 	border: 1px solid #e4d8cc;
 }
 
@@ -228,6 +221,10 @@ form th {
 }
 
 /*=== Dropdown */
+.dropdown .dropdown-target:target + .btn {
+	background-color: #e4d8cc;
+}
+
 .dropdown-menu {
 	margin: 9px 0 0 0;
 	padding: 0.5rem 0 1rem 0;
@@ -242,8 +239,9 @@ form th {
 	border: none;
 	right: 17px;
 }
-.dropdown-menu .dropdown-header {
-	padding: 1rem 0.5rem 1rem 1rem;
+.dropdown-menu .dropdown-header,
+.dropdown-menu .dropdown-section .dropdown-section-title {
+	padding: 1rem 1.5rem;
 	font-weight: bold;
 	text-align: left;
 	color: #766556;
@@ -253,29 +251,43 @@ form th {
 .dropdown-menu .item {
 	transition: all 0.075s ease-in-out;
 }
-.dropdown-menu .item a, .dropdown-menu .item span, .dropdown-menu .item .as-link {
+.dropdown-menu .item > a,
+.dropdown-menu .item > span,
+.dropdown-menu .item > .as-link {
 	padding: 0 2rem;
 	color: #363330;
-	font-size: 1rem;
+	font-size: inherit;
 	line-height: 2.5em;
 }
-.dropdown-menu .item:not(.addItem):hover {
-	background: #ca7227;
-	color: #fff;
+.dropdown-menu .item > a span.icon,
+.dropdown-menu .item > span span.icon,
+.dropdown-menu .item > .as-link span.icon {
+	padding: 0 0.25rem !important;
 }
-.dropdown-menu .item:not(.addItem):hover a, .dropdown-menu .item:not(.addItem):hover button, .dropdown-menu .item:not(.addItem):hover label {
-	text-decoration: none;
+.dropdown-menu .item > a:not(.addItem):hover,
+.dropdown-menu .item > .as-link:not(.addItem):hover {
+	background: #ca7227;
 	color: #fff;
 }
-.dropdown-menu .item:not(.addItem):hover .icon {
+.dropdown-menu .item > a:not(.addItem):hover .icon,
+.dropdown-menu .item > .as-link:not(.addItem):hover .icon {
 	filter: grayscale(100%) brightness(2.5);
 }
-.dropdown-menu .item:not(.addItem) a:hover,
+.dropdown-menu .item.dropdown-section {
+	margin-top: 0.75rem;
+}
+.dropdown-menu .item.dropdown-section ~ .dropdown-section {
+	border-top-color: #f5f0ec;
+}
+.dropdown-menu .item.dropdown-section .item a, .dropdown-menu .item.dropdown-section .item .as-link {
+	padding-left: 2rem;
+}
+.dropdown-menu .item:not(.addItem) > a:hover,
 .dropdown-menu .item:not(.addItem) button:hover {
 	background: #ca7227;
 	color: #fff;
 }
-.dropdown-menu .item:not(.addItem) a:hover .icon,
+.dropdown-menu .item:not(.addItem) > a:hover .icon,
 .dropdown-menu .item:not(.addItem) button:hover .icon {
 	filter: brightness(3);
 }
@@ -315,8 +327,6 @@ form th {
 
 /*=== Alerts */
 .alert {
-	margin: 1rem 0;
-	padding: 1rem;
 	background: #fcfaf8;
 	color: #766556;
 	font-size: 1rem;
@@ -518,7 +528,7 @@ form th {
 .stick .btn:first-child {
 	border-radius: 5px 0 0 5px;
 }
-.stick .btn:last-child, .stick input:last-child, .stick .btn + .dropdown > .btn {
+.stick .btn:last-child, .stick input:last-child, .stick .dropdown:last-child > .btn {
 	border-radius: 0 5px 5px 0;
 }
 .stick .btn + .btn,
@@ -548,32 +558,29 @@ form th {
 
 /* Sidebar des pages de configuration */
 /*=== Navigation */
-.nav-list .nav-header,
+.nav-list {
+	font-size: 1rem;
+}
+.nav-list .item.nav-header,
 .nav-list .item {
-	height: 2.5em;
+	min-height: 2.5em;
 	line-height: 2.5em;
-	font-size: 1rem;
 }
 .nav-list .item {
 	background: #fbf9f6;
+	min-height: 2.5em;
+	line-height: 2.5em;
+}
+.nav-list .item.nav-header {
+	min-height: 2.5em;
+	line-height: 2.5em;
 }
 .nav-list .item a {
 	padding: 0 1rem;
 	color: #363330;
 	transition: all 0.15s ease-in-out;
 }
-.nav-list .item .error a {
-	color: #f5633e;
-}
-.nav-list .item:hover .error a {
-	background: #ca7227;
-	color: #363330;
-}
-.nav-list .item:hover .empty a {
-	background: #f4f762;
-	color: #363330;
-}
-.nav-list .item:hover a {
+.nav-list .item a:hover {
 	background: #efe3d3;
 	text-decoration: none;
 }
@@ -581,24 +588,13 @@ form th {
 	background: #ca7227;
 	color: #fff;
 }
-.nav-list .item.active .error a {
-	background: #ca7227;
-	color: #fff;
-}
-.nav-list .item.active .empty a {
-	background: #f4f762;
-	color: #fff;
-}
 .nav-list .item.active a {
 	background: #ca7227;
 	color: #fff;
 	text-decoration: none;
 }
-.nav-list.empty a {
-	color: #f4f762;
-}
 .nav-list .nav-header {
-	padding: 0 10px;
+	padding: 0 1rem;
 	font-weight: bold;
 	color: #766556;
 	text-transform: uppercase;
@@ -668,26 +664,22 @@ form th {
 /*===============*/
 /*=== Header */
 .header {
-	padding: 0.5rem 1.35rem;
 	background: #fbf9f6;
-	display: block;
-	width: auto;
-	height: 3.5rem;
-	table-layout: none;
 }
 .header .item {
 	vertical-align: middle;
 }
-.header .item.title {
-	width: 280px;
-	font-weight: 400;
+.header .item.title a {
+	padding: 0.5rem 1rem;
 }
-.header .item.title a img {
-	margin: 0.6em 0 0.3em;
+.header .item.title a .logo {
 	filter: invert(80%);
 }
+.header .item.title a:hover .logo {
+	filter: invert(80%) opacity(80%);
+}
 .header .item.search input {
-	width: 230px;
+	width: 350px;
 	color: #363330;
 	border: none;
 	border-radius: 2px 0 0 2px;
@@ -698,7 +690,6 @@ form th {
 	background-color: #efe3d3;
 }
 .header .item.search input:focus {
-	width: 350px;
 	color: #766556;
 	background-color: #fff;
 }
@@ -727,10 +718,6 @@ form th {
 	filter: brightness(3);
 }
 .header .item.configure {
-	width: 3rem;
-	position: absolute;
-	right: 1rem;
-	top: 1rem;
 	text-align: center;
 }
 .header .item.configure .btn {
@@ -740,7 +727,7 @@ form th {
 
 /*=== Body */
 #global {
-	height: calc(100% - 3.5rem);
+	height: calc(100vh - (3rem + 2 * var(--frss-padding-top-bottom)));
 }
 
 /*=== Prompt (centered) */
@@ -842,13 +829,16 @@ main.prompt {
 .nav_menu .stick .btn.read_all:hover {
 	background-color: #e4d8cc;
 }
-.nav_menu .stick .dropdown a.dropdown-toggle {
+.nav_menu .stick .dropdown:not(#dropdown-search-wrapper) a.dropdown-toggle {
 	border-left-width: 0;
 	background-image: url(icons/more.svg);
 }
-.nav_menu .stick .dropdown a.dropdown-toggle .icon {
+.nav_menu .stick .dropdown:not(#dropdown-search-wrapper) a.dropdown-toggle .icon {
 	display: none;
 }
+.nav_menu .stick #dropdown-search-wrapper.dropdown a.dropdown-toggle {
+	border-left-width: 0;
+}
 
 #dropdown-query ~ .dropdown-menu .dropdown-header .icon {
 	vertical-align: middle;
@@ -951,9 +941,7 @@ main.prompt {
 	color: #fff;
 }
 .notification a.close {
-	padding: 0 15px;
 	border-radius: 0 3px 3px 0;
-	line-height: 3em;
 }
 .notification.good a.close:hover {
 	background: #0c7556;
@@ -961,12 +949,12 @@ main.prompt {
 .notification.bad a.close:hover {
 	background: #73341f;
 }
-.notification#actualizeProgress {
-	line-height: 2em;
-}
 .notification#actualizeProgress br {
 	display: none;
 }
+.notification#actualizeProgress .title {
+	margin: 0 2rem;
+}
 
 /*=== Navigation menu (for articles) */
 #nav_entries {
@@ -982,10 +970,10 @@ main.prompt {
 	background: #fff;
 	transition: all 0.15s ease-in-out;
 }
-.flux:hover {
+.flux .flux_header:hover {
 	background: #fcfaf8;
 }
-.flux:hover:not(.current):hover .item.title {
+.flux .flux_header:hover:not(.current):hover .item.title {
 	background: #fcfaf8;
 }
 .flux.current {
@@ -1194,9 +1182,6 @@ main.prompt {
 /*=== MOBILE */
 /*===========*/
 @media (max-width: 840px) {
-	.form-group .group-name {
-		text-align: left;
-	}
 	.aside {
 		transition: all 0.2s ease-in-out;
 	}
@@ -1224,29 +1209,13 @@ main.prompt {
 #slider .toggle_aside .icon {
 		filter: grayscale(100%) brightness(2.5);
 	}
-	.header {
-		padding: 0.5rem;
-		height: 8rem;
-	}
 	.header .item.search {
-		display: block;
-	}
-	.header .item.search form {
-		display: inherit;
-	}
-	.header .item.search .stick {
-		display: flex;
-	}
-	.header .item.search input {
-		width: 90%;
-		height: 3.5rem;
-	}
-	.header .item.search input:focus {
-		width: 100%;
+		display: none;
 	}
-	.header .item.search .btn {
-		min-height: 49px;
-		padding: 0.5rem 2rem;
+	.header .item.configure {
+		position: absolute;
+		top: 0;
+		right: 0;
 	}
 	#global {
 		height: calc(100% - 8rem);
@@ -1269,10 +1238,6 @@ main.prompt {
 	.nav_menu .stick .btn.read_all {
 		padding: 0.85rem 1.25rem;
 	}
-	.nav_menu .search {
-		display: none;
-		max-width: 97%;
-	}
 	.nav_menu .search .input {
 		max-width: 97%;
 		width: 90px;
diff --git a/p/themes/Ansum/ansum.rtl.css b/p/themes/Ansum/ansum.rtl.css
index a4d0e32b5..ad480c952 100644
--- a/p/themes/Ansum/ansum.rtl.css
+++ b/p/themes/Ansum/ansum.rtl.css
@@ -164,22 +164,16 @@ input:disabled, select:disabled {
 	border-color: #ba9;
 }
 
-input.extend {
-	transition: width 200ms linear;
-}
-
 .form-group {
 	padding: 5px;
 	border-radius: 3px;
 }
 .form-group::after {
-	content: "";
 	display: block;
 	clear: both;
 }
 .form-group .group-name {
 	padding: 10px 0;
-	text-align: left;
 }
 .form-group .group-controls {
 	min-height: 25px;
@@ -201,8 +195,7 @@ table {
 	border-collapse: collapse;
 }
 
-tr, th, td {
-	padding: 0.5em;
+th, td {
 	border: 1px solid #e4d8cc;
 }
 
@@ -228,6 +221,10 @@ form th {
 }
 
 /*=== Dropdown */
+.dropdown .dropdown-target:target + .btn {
+	background-color: #e4d8cc;
+}
+
 .dropdown-menu {
 	margin: 9px 0 0 0;
 	padding: 0.5rem 0 1rem 0;
@@ -242,8 +239,9 @@ form th {
 	border: none;
 	left: 17px;
 }
-.dropdown-menu .dropdown-header {
-	padding: 1rem 1rem 1rem 0.5rem;
+.dropdown-menu .dropdown-header,
+.dropdown-menu .dropdown-section .dropdown-section-title {
+	padding: 1rem 1.5rem;
 	font-weight: bold;
 	text-align: right;
 	color: #766556;
@@ -253,29 +251,43 @@ form th {
 .dropdown-menu .item {
 	transition: all 0.075s ease-in-out;
 }
-.dropdown-menu .item a, .dropdown-menu .item span, .dropdown-menu .item .as-link {
+.dropdown-menu .item > a,
+.dropdown-menu .item > span,
+.dropdown-menu .item > .as-link {
 	padding: 0 2rem;
 	color: #363330;
-	font-size: 1rem;
+	font-size: inherit;
 	line-height: 2.5em;
 }
-.dropdown-menu .item:not(.addItem):hover {
-	background: #ca7227;
-	color: #fff;
+.dropdown-menu .item > a span.icon,
+.dropdown-menu .item > span span.icon,
+.dropdown-menu .item > .as-link span.icon {
+	padding: 0 0.25rem !important;
 }
-.dropdown-menu .item:not(.addItem):hover a, .dropdown-menu .item:not(.addItem):hover button, .dropdown-menu .item:not(.addItem):hover label {
-	text-decoration: none;
+.dropdown-menu .item > a:not(.addItem):hover,
+.dropdown-menu .item > .as-link:not(.addItem):hover {
+	background: #ca7227;
 	color: #fff;
 }
-.dropdown-menu .item:not(.addItem):hover .icon {
+.dropdown-menu .item > a:not(.addItem):hover .icon,
+.dropdown-menu .item > .as-link:not(.addItem):hover .icon {
 	filter: grayscale(100%) brightness(2.5);
 }
-.dropdown-menu .item:not(.addItem) a:hover,
+.dropdown-menu .item.dropdown-section {
+	margin-top: 0.75rem;
+}
+.dropdown-menu .item.dropdown-section ~ .dropdown-section {
+	border-top-color: #f5f0ec;
+}
+.dropdown-menu .item.dropdown-section .item a, .dropdown-menu .item.dropdown-section .item .as-link {
+	padding-right: 2rem;
+}
+.dropdown-menu .item:not(.addItem) > a:hover,
 .dropdown-menu .item:not(.addItem) button:hover {
 	background: #ca7227;
 	color: #fff;
 }
-.dropdown-menu .item:not(.addItem) a:hover .icon,
+.dropdown-menu .item:not(.addItem) > a:hover .icon,
 .dropdown-menu .item:not(.addItem) button:hover .icon {
 	filter: brightness(3);
 }
@@ -315,8 +327,6 @@ form th {
 
 /*=== Alerts */
 .alert {
-	margin: 1rem 0;
-	padding: 1rem;
 	background: #fcfaf8;
 	color: #766556;
 	font-size: 1rem;
@@ -518,7 +528,7 @@ form th {
 .stick .btn:first-child {
 	border-radius: 0 5px 5px 0;
 }
-.stick .btn:last-child, .stick input:last-child, .stick .btn + .dropdown > .btn {
+.stick .btn:last-child, .stick input:last-child, .stick .dropdown:last-child > .btn {
 	border-radius: 5px 0 0 5px;
 }
 .stick .btn + .btn,
@@ -548,32 +558,29 @@ form th {
 
 /* Sidebar des pages de configuration */
 /*=== Navigation */
-.nav-list .nav-header,
+.nav-list {
+	font-size: 1rem;
+}
+.nav-list .item.nav-header,
 .nav-list .item {
-	height: 2.5em;
+	min-height: 2.5em;
 	line-height: 2.5em;
-	font-size: 1rem;
 }
 .nav-list .item {
 	background: #fbf9f6;
+	min-height: 2.5em;
+	line-height: 2.5em;
+}
+.nav-list .item.nav-header {
+	min-height: 2.5em;
+	line-height: 2.5em;
 }
 .nav-list .item a {
 	padding: 0 1rem;
 	color: #363330;
 	transition: all 0.15s ease-in-out;
 }
-.nav-list .item .error a {
-	color: #f5633e;
-}
-.nav-list .item:hover .error a {
-	background: #ca7227;
-	color: #363330;
-}
-.nav-list .item:hover .empty a {
-	background: #f4f762;
-	color: #363330;
-}
-.nav-list .item:hover a {
+.nav-list .item a:hover {
 	background: #efe3d3;
 	text-decoration: none;
 }
@@ -581,24 +588,13 @@ form th {
 	background: #ca7227;
 	color: #fff;
 }
-.nav-list .item.active .error a {
-	background: #ca7227;
-	color: #fff;
-}
-.nav-list .item.active .empty a {
-	background: #f4f762;
-	color: #fff;
-}
 .nav-list .item.active a {
 	background: #ca7227;
 	color: #fff;
 	text-decoration: none;
 }
-.nav-list.empty a {
-	color: #f4f762;
-}
 .nav-list .nav-header {
-	padding: 0 10px;
+	padding: 0 1rem;
 	font-weight: bold;
 	color: #766556;
 	text-transform: uppercase;
@@ -668,26 +664,22 @@ form th {
 /*===============*/
 /*=== Header */
 .header {
-	padding: 0.5rem 1.35rem;
 	background: #fbf9f6;
-	display: block;
-	width: auto;
-	height: 3.5rem;
-	table-layout: none;
 }
 .header .item {
 	vertical-align: middle;
 }
-.header .item.title {
-	width: 280px;
-	font-weight: 400;
+.header .item.title a {
+	padding: 0.5rem 1rem;
 }
-.header .item.title a img {
-	margin: 0.6em 0 0.3em;
+.header .item.title a .logo {
 	filter: invert(80%);
 }
+.header .item.title a:hover .logo {
+	filter: invert(80%) opacity(80%);
+}
 .header .item.search input {
-	width: 230px;
+	width: 350px;
 	color: #363330;
 	border: none;
 	border-radius: 0 2px 2px 0;
@@ -698,7 +690,6 @@ form th {
 	background-color: #efe3d3;
 }
 .header .item.search input:focus {
-	width: 350px;
 	color: #766556;
 	background-color: #fff;
 }
@@ -727,10 +718,6 @@ form th {
 	filter: brightness(3);
 }
 .header .item.configure {
-	width: 3rem;
-	position: absolute;
-	left: 1rem;
-	top: 1rem;
 	text-align: center;
 }
 .header .item.configure .btn {
@@ -740,7 +727,7 @@ form th {
 
 /*=== Body */
 #global {
-	height: calc(100% - 3.5rem);
+	height: calc(100vh - (3rem + 2 * var(--frss-padding-top-bottom)));
 }
 
 /*=== Prompt (centered) */
@@ -842,13 +829,16 @@ main.prompt {
 .nav_menu .stick .btn.read_all:hover {
 	background-color: #e4d8cc;
 }
-.nav_menu .stick .dropdown a.dropdown-toggle {
+.nav_menu .stick .dropdown:not(#dropdown-search-wrapper) a.dropdown-toggle {
 	border-right-width: 0;
 	background-image: url(icons/more.svg);
 }
-.nav_menu .stick .dropdown a.dropdown-toggle .icon {
+.nav_menu .stick .dropdown:not(#dropdown-search-wrapper) a.dropdown-toggle .icon {
 	display: none;
 }
+.nav_menu .stick #dropdown-search-wrapper.dropdown a.dropdown-toggle {
+	border-right-width: 0;
+}
 
 #dropdown-query ~ .dropdown-menu .dropdown-header .icon {
 	vertical-align: middle;
@@ -951,9 +941,7 @@ main.prompt {
 	color: #fff;
 }
 .notification a.close {
-	padding: 0 15px;
 	border-radius: 3px 0 0 3px;
-	line-height: 3em;
 }
 .notification.good a.close:hover {
 	background: #0c7556;
@@ -961,12 +949,12 @@ main.prompt {
 .notification.bad a.close:hover {
 	background: #73341f;
 }
-.notification#actualizeProgress {
-	line-height: 2em;
-}
 .notification#actualizeProgress br {
 	display: none;
 }
+.notification#actualizeProgress .title {
+	margin: 0 2rem;
+}
 
 /*=== Navigation menu (for articles) */
 #nav_entries {
@@ -982,10 +970,10 @@ main.prompt {
 	background: #fff;
 	transition: all 0.15s ease-in-out;
 }
-.flux:hover {
+.flux .flux_header:hover {
 	background: #fcfaf8;
 }
-.flux:hover:not(.current):hover .item.title {
+.flux .flux_header:hover:not(.current):hover .item.title {
 	background: #fcfaf8;
 }
 .flux.current {
@@ -1194,9 +1182,6 @@ main.prompt {
 /*=== MOBILE */
 /*===========*/
 @media (max-width: 840px) {
-	.form-group .group-name {
-		text-align: right;
-	}
 	.aside {
 		transition: all 0.2s ease-in-out;
 	}
@@ -1224,29 +1209,13 @@ main.prompt {
 #slider .toggle_aside .icon {
 		filter: grayscale(100%) brightness(2.5);
 	}
-	.header {
-		padding: 0.5rem;
-		height: 8rem;
-	}
 	.header .item.search {
-		display: block;
-	}
-	.header .item.search form {
-		display: inherit;
-	}
-	.header .item.search .stick {
-		display: flex;
-	}
-	.header .item.search input {
-		width: 90%;
-		height: 3.5rem;
-	}
-	.header .item.search input:focus {
-		width: 100%;
+		display: none;
 	}
-	.header .item.search .btn {
-		min-height: 49px;
-		padding: 0.5rem 2rem;
+	.header .item.configure {
+		position: absolute;
+		top: 0;
+		left: 0;
 	}
 	#global {
 		height: calc(100% - 8rem);
@@ -1269,10 +1238,6 @@ main.prompt {
 	.nav_menu .stick .btn.read_all {
 		padding: 0.85rem 1.25rem;
 	}
-	.nav_menu .search {
-		display: none;
-		max-width: 97%;
-	}
 	.nav_menu .search .input {
 		max-width: 97%;
 		width: 90px;
diff --git a/p/themes/Ansum/icons/up.svg b/p/themes/Ansum/icons/up.svg
index 306b076e9..631ef9fdb 100644
--- a/p/themes/Ansum/icons/up.svg
+++ b/p/themes/Ansum/icons/up.svg
@@ -1,59 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16"
-   height="10"
-   viewBox="0 0 16 10"
-   version="1.1"
-   id="svg5"
-   sodipodi:docname="up.svg"
-   inkscape:version="0.92.3 (unknown)">
-  <metadata
-     id="metadata11">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs9" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1026"
-     id="namedview7"
-     showgrid="false"
-     inkscape:zoom="26.222222"
-     inkscape:cx="7.5"
-     inkscape:cy="4.5"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg5" />
-  <g
-     id="surface2">
-    <path
-       style="fill:#515151;fill-opacity:1;fill-rule:nonzero;stroke:none"
-       d="M 14.386719,9.46875 15.800781,8.054688 8.09375,0.347656 0.386719,8.054688 1.800781,9.46875 8.09375,3.175781 Z m 0,0"
-       id="path2"
-       inkscape:connector-curvature="0" />
-  </g>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
+  <path d="M14.387 9.469 15.8 8.055 8.094.348.387 8.055 1.8 9.469l6.293-6.293Zm0 0" style="fill:#515151;fill-opacity:1;fill-rule:nonzero;stroke:none" transform="translate(-.094 3.092)"/>
 </svg>
diff --git a/p/themes/BlueLagoon/BlueLagoon.css b/p/themes/BlueLagoon/BlueLagoon.css
index caf81bb51..14a369a2e 100644
--- a/p/themes/BlueLagoon/BlueLagoon.css
+++ b/p/themes/BlueLagoon/BlueLagoon.css
@@ -66,17 +66,12 @@ input:disabled, select:disabled {
 	border-color: #ccc;
 }
 
-input.extend {
-	transition: width 200ms linear;
-}
-
 /*=== Tables */
 table {
 	border-collapse: collapse;
 }
 
-tr, th, td {
-	padding: 0.5em;
+th, td {
 	border: 1px solid #ddd;
 }
 
@@ -107,7 +102,6 @@ form th {
 
 .form-group .group-name {
 	padding: 10px 0;
-	text-align: right;
 }
 
 .form-group .group-controls {
@@ -267,13 +261,16 @@ a.btn {
 	box-shadow: 0 -1px rgba(255,255,255,0.08) inset;
 }
 /*=== Navigation */
-.nav-list .nav-header,
-.nav-list .item {
-	height: 2.5em;
-	line-height: 2.5em;
+.nav-list {
 	font-size: 0.9rem;
 }
 
+.nav-list .item,
+.nav-list .item.nav-header {
+	min-height: 2.5em;
+	line-height: 2.5;
+}
+
 .nav-list .item a:hover {
 	text-shadow: 0 0 2px rgba(255,255,255,0.28);
 	color: #fff;
@@ -288,7 +285,7 @@ a.btn {
 }
 
 .nav-list .item > a {
-	padding: 0 10px;
+	padding: 0 1rem;
 	color: #ccc;
 }
 
@@ -296,27 +293,8 @@ a.btn {
 	text-decoration: none;
 }
 
-.nav-list .item.empty a {
-	color: #f39c12;
-}
-
-.nav-list .item.active.empty a {
-	background: linear-gradient(180deg, #e4992c 0%, #d18114 100%) #e4992c;
-	background: -webkit-linear-gradient(180deg, #e4992c 0%, #d18114 100%);
-	color: #fff;
-}
-
-.nav-list .item.error a {
-	color: #bd362f;
-}
-
-.nav-list .item.active.error a {
-	background: #bd362f;
-	color: #fff;
-}
-
 .nav-list .nav-header {
-	padding: 0 10px;
+	padding: 0 1rem;
 	background: transparent;
 	color: #222;
 }
@@ -344,7 +322,6 @@ a.btn {
 	height: 10px;
 	border-top: 1px solid #171717;
 	border-left: 1px solid #171717;
-	content: "";
 	position: absolute;
 	top: -6px;
 	right: 13px;
@@ -352,7 +329,8 @@ a.btn {
 	transform: rotate(45deg);
 }
 
-.dropdown-header {
+.dropdown-header,
+.dropdown-section .dropdown-section-title {
 	padding: 0 5px 5px;
 	color: #ccc;
 	font-weight: bold;
@@ -362,9 +340,9 @@ a.btn {
 	filter: grayscale(100%) brightness(2.5);
 }
 
-.dropdown-menu > .item > a,
-.dropdown-menu > .item > span,
-.dropdown-menu > .item > .as-link {
+.dropdown-menu .item > a,
+.dropdown-menu .item > span,
+.dropdown-menu .item > .as-link {
 	padding: 0 22px;
 	line-height: 2.5em;
 	color: #ccc;
@@ -375,8 +353,19 @@ a.btn {
 	color: #ccc;
 }
 
-.dropdown-menu > .item > a:hover,
-.dropdown-menu > .item > button:hover {
+.dropdown-menu .dropdown-section .item > a,
+.dropdown-menu .dropdown-section .item > span,
+.dropdown-menu .dropdown-section .item > .as-link {
+	padding-left: 2rem;
+}
+
+.dropdown-menu .dropdown-section .item:last-child {
+	margin-bottom: 0.5rem;
+}
+
+.dropdown-menu .item > a:hover,
+.dropdown-menu .item > button:hover:not([disabled]),
+.dropdown-menu .item > label:hover:not(.noHover) {
 	background: linear-gradient(180deg,  #0090ff 0%, #0062be 100%) #e4992c;
 	background: -webkit-linear-gradient(top,  #0090ff 0%, #0062be 100%);
 	color: #fff;
@@ -394,8 +383,6 @@ a.btn {
 
 /*=== Alerts */
 .alert {
-	margin: 15px auto;
-	padding: 10px 15px;
 	background: #f4f4f4;
 	color: #aaa;
 	font-size: 0.9em;
@@ -528,8 +515,6 @@ a.btn {
 }
 
 .tree-folder-items > .item {
-	padding: 0 10px;
-	line-height: 2.5rem;
 	font-size: 0.8rem;
 }
 
@@ -604,10 +589,6 @@ a.btn {
 }
 
 .header > .item.search input {
-	width: 230px;
-}
-
-.header .item.search input:focus {
 	width: 350px;
 }
 
@@ -802,7 +783,7 @@ a.btn {
 	background: #f9f7f4;
 }
 
-.flux:hover {
+.flux .flux_header:hover {
 	background: #f9f7f4;
 }
 
@@ -950,11 +931,6 @@ a.btn {
 	color: #eb2901;
 }
 
-.notification a.close {
-	padding: 0 15px;
-	line-height: 3em;
-}
-
 .notification a.close:hover {
 	background: rgba(255,255,255,0.2);
 }
@@ -963,10 +939,6 @@ a.btn {
 	filter: brightness(2);
 }
 
-.notification#actualizeProgress {
-	line-height: 2em;
-}
-
 /*=== "Load more" part */
 #bigMarkAsRead {
 	background: #f9f7f4;
@@ -1061,6 +1033,10 @@ a.btn {
 	color: #222;
 }
 
+#stream.global .feed .item-title:not([data-unread="0"])::after {
+	margin-top: 1rem;
+}
+
 /*=== PANEL */
 /*===========*/
 #panel {
@@ -1116,7 +1092,6 @@ a.btn {
 @media screen and (max-width: 840px) {
 	.form-group .group-name {
 		padding-bottom: 0;
-		text-align: left;
 	}
 
 	.header {
diff --git a/p/themes/BlueLagoon/BlueLagoon.rtl.css b/p/themes/BlueLagoon/BlueLagoon.rtl.css
index f4c4e0d84..7c16ee958 100644
--- a/p/themes/BlueLagoon/BlueLagoon.rtl.css
+++ b/p/themes/BlueLagoon/BlueLagoon.rtl.css
@@ -66,17 +66,12 @@ input:disabled, select:disabled {
 	border-color: #ccc;
 }
 
-input.extend {
-	transition: width 200ms linear;
-}
-
 /*=== Tables */
 table {
 	border-collapse: collapse;
 }
 
-tr, th, td {
-	padding: 0.5em;
+th, td {
 	border: 1px solid #ddd;
 }
 
@@ -107,7 +102,6 @@ form th {
 
 .form-group .group-name {
 	padding: 10px 0;
-	text-align: left;
 }
 
 .form-group .group-controls {
@@ -267,13 +261,16 @@ a.btn {
 	box-shadow: 0 -1px rgba(255,255,255,0.08) inset;
 }
 /*=== Navigation */
-.nav-list .nav-header,
-.nav-list .item {
-	height: 2.5em;
-	line-height: 2.5em;
+.nav-list {
 	font-size: 0.9rem;
 }
 
+.nav-list .item,
+.nav-list .item.nav-header {
+	min-height: 2.5em;
+	line-height: 2.5;
+}
+
 .nav-list .item a:hover {
 	text-shadow: 0 0 2px rgba(255,255,255,0.28);
 	color: #fff;
@@ -288,7 +285,7 @@ a.btn {
 }
 
 .nav-list .item > a {
-	padding: 0 10px;
+	padding: 0 1rem;
 	color: #ccc;
 }
 
@@ -296,27 +293,8 @@ a.btn {
 	text-decoration: none;
 }
 
-.nav-list .item.empty a {
-	color: #f39c12;
-}
-
-.nav-list .item.active.empty a {
-	background: linear-gradient(-180deg, #e4992c 0%, #d18114 100%) #e4992c;
-	background: -webkit-linear-gradient(-180deg, #e4992c 0%, #d18114 100%);
-	color: #fff;
-}
-
-.nav-list .item.error a {
-	color: #bd362f;
-}
-
-.nav-list .item.active.error a {
-	background: #bd362f;
-	color: #fff;
-}
-
 .nav-list .nav-header {
-	padding: 0 10px;
+	padding: 0 1rem;
 	background: transparent;
 	color: #222;
 }
@@ -344,7 +322,6 @@ a.btn {
 	height: 10px;
 	border-top: 1px solid #171717;
 	border-right: 1px solid #171717;
-	content: "";
 	position: absolute;
 	top: -6px;
 	left: 13px;
@@ -352,7 +329,8 @@ a.btn {
 	transform: rotate(-45deg);
 }
 
-.dropdown-header {
+.dropdown-header,
+.dropdown-section .dropdown-section-title {
 	padding: 0 5px 5px;
 	color: #ccc;
 	font-weight: bold;
@@ -362,9 +340,9 @@ a.btn {
 	filter: grayscale(100%) brightness(2.5);
 }
 
-.dropdown-menu > .item > a,
-.dropdown-menu > .item > span,
-.dropdown-menu > .item > .as-link {
+.dropdown-menu .item > a,
+.dropdown-menu .item > span,
+.dropdown-menu .item > .as-link {
 	padding: 0 22px;
 	line-height: 2.5em;
 	color: #ccc;
@@ -375,8 +353,19 @@ a.btn {
 	color: #ccc;
 }
 
-.dropdown-menu > .item > a:hover,
-.dropdown-menu > .item > button:hover {
+.dropdown-menu .dropdown-section .item > a,
+.dropdown-menu .dropdown-section .item > span,
+.dropdown-menu .dropdown-section .item > .as-link {
+	padding-right: 2rem;
+}
+
+.dropdown-menu .dropdown-section .item:last-child {
+	margin-bottom: 0.5rem;
+}
+
+.dropdown-menu .item > a:hover,
+.dropdown-menu .item > button:hover:not([disabled]),
+.dropdown-menu .item > label:hover:not(.noHover) {
 	background: linear-gradient(-180deg,  #0090ff 0%, #0062be 100%) #e4992c;
 	background: -webkit-linear-gradient(top,  #0090ff 0%, #0062be 100%);
 	color: #fff;
@@ -394,8 +383,6 @@ a.btn {
 
 /*=== Alerts */
 .alert {
-	margin: 15px auto;
-	padding: 10px 15px;
 	background: #f4f4f4;
 	color: #aaa;
 	font-size: 0.9em;
@@ -528,8 +515,6 @@ a.btn {
 }
 
 .tree-folder-items > .item {
-	padding: 0 10px;
-	line-height: 2.5rem;
 	font-size: 0.8rem;
 }
 
@@ -604,10 +589,6 @@ a.btn {
 }
 
 .header > .item.search input {
-	width: 230px;
-}
-
-.header .item.search input:focus {
 	width: 350px;
 }
 
@@ -802,7 +783,7 @@ a.btn {
 	background: #f9f7f4;
 }
 
-.flux:hover {
+.flux .flux_header:hover {
 	background: #f9f7f4;
 }
 
@@ -950,11 +931,6 @@ a.btn {
 	color: #eb2901;
 }
 
-.notification a.close {
-	padding: 0 15px;
-	line-height: 3em;
-}
-
 .notification a.close:hover {
 	background: rgba(255,255,255,0.2);
 }
@@ -963,10 +939,6 @@ a.btn {
 	filter: brightness(2);
 }
 
-.notification#actualizeProgress {
-	line-height: 2em;
-}
-
 /*=== "Load more" part */
 #bigMarkAsRead {
 	background: #f9f7f4;
@@ -1061,6 +1033,10 @@ a.btn {
 	color: #222;
 }
 
+#stream.global .feed .item-title:not([data-unread="0"])::after {
+	margin-top: 1rem;
+}
+
 /*=== PANEL */
 /*===========*/
 #panel {
@@ -1116,7 +1092,6 @@ a.btn {
 @media screen and (max-width: 840px) {
 	.form-group .group-name {
 		padding-bottom: 0;
-		text-align: right;
 	}
 
 	.header {
diff --git a/p/themes/BlueLagoon/icons/bookmark.svg b/p/themes/BlueLagoon/icons/bookmark.svg
deleted file mode 100644
index 898488038..000000000
--- a/p/themes/BlueLagoon/icons/bookmark.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="14.031" height="12.989">
-  <path fill="#666" d="M69.003 398.01a1.03 1.03 0 0 0-.665.24c-.166.138-.277.32-.39.5-.224.357-.392.768-.565 1.203-.173.435-.347.888-.504 1.232a2.606 2.606 0 0 1-.36.588 2.621 2.621 0 0 1-.695.152c-.388.035-.881.05-1.363.07-.482.02-.97.036-1.393.128-.211.038-.415.11-.604.21a.987.987 0 0 0-.45.53.994.994 0 0 0 .036.7c.085.196.227.366.368.524.283.317.633.606 1.008.899.375.293.777.559 1.068.81.29.251.454.508.459.523.018.235 0 .472-.055.702-.085.367-.223.812-.352 1.26-.13.449-.252.902-.292 1.319-.02.208-.043.407.005.614a.987.987 0 0 0 1.067.752c.22-.018.436-.07.636-.152.4-.162.801-.428 1.206-.682.405-.254.808-.522 1.146-.711.337-.19.648-.269.664-.269.016 0 .303.095.639.288.336.192.725.465 1.128.722.402.257.82.497 1.218.663.199.082.389.15.607.17.219.02.48-.03.696-.18a.947.947 0 0 0 .389-.56c.05-.206.043-.435.025-.643-.037-.417-.16-.864-.284-1.314-.126-.45-.262-.887-.345-1.255a2.64 2.64 0 0 1-.066-.701c.005-.015.187-.253.48-.501.293-.249.676-.538 1.054-.827.378-.29.767-.572 1.053-.886a1.93 1.93 0 0 0 .329-.53.916.916 0 0 0 .055-.672c-.082-.245-.271-.413-.46-.523a1.965 1.965 0 0 0-.577-.23c-.422-.095-.914-.14-1.396-.164-.482-.024-.946-.039-1.334-.077a3.698 3.698 0 0 1-.729-.14 2.713 2.713 0 0 1-.338-.582 28.41 28.41 0 0 1-.496-1.224c-.168-.437-.334-.865-.556-1.224a2.01 2.01 0 0 0-.398-.494 1.061 1.061 0 0 0-.669-.258z" style="color:#000;text-indent:0;text-align:start;text-transform:none;direction:ltr;baseline-shift:baseline;enable-background:accumulate;fill:#0062bf;fill-opacity:1" transform="translate(-61.966 -398.01)"/>
-</svg>
diff --git a/p/themes/BlueLagoon/metadata.json b/p/themes/BlueLagoon/metadata.json
index 7822d7346..37750c631 100644
--- a/p/themes/BlueLagoon/metadata.json
+++ b/p/themes/BlueLagoon/metadata.json
@@ -3,5 +3,6 @@
   "author": "Mister aiR",
   "description": "C’est un cocktail (bis)! C’est la version plus fresh de Screwdriver. C’est… c’est… un thème pour l’agrégateur de flux RSS FreshRSS. En toute modestie, ce thème tue du Nyan Cat.",
   "version": 1.0,
-  "files": ["_frss.css","BlueLagoon.css"]
+  "files": ["_frss.css","BlueLagoon.css"],
+  "deprecated": true
 }
diff --git a/p/themes/Dark-pink/pinkdark.css b/p/themes/Dark-pink/pinkdark.css
index 4ccfbbb95..1d8e6e855 100644
--- a/p/themes/Dark-pink/pinkdark.css
+++ b/p/themes/Dark-pink/pinkdark.css
@@ -1,3 +1,7 @@
+:root {
+	--background-color-hover: #2f1d22;
+}
+
 .btn:hover {
 	background: unset;
 	border-color: #ff449a;
@@ -87,6 +91,10 @@ input:focus {
 	filter: sepia(62%) brightness(107%) hue-rotate(315deg) saturate(248%) contrast(104%) invert(100%);
 }
 
+.header > .item.title a:hover .logo {
+	filter: sepia(62%) brightness(70%) hue-rotate(315deg) saturate(248%) contrast(104%) invert(100%);
+}
+
 .icon[src*="/all"],
 .icon[src*="/down"],
 .icon[src*="/help"],
diff --git a/p/themes/Dark-pink/pinkdark.rtl.css b/p/themes/Dark-pink/pinkdark.rtl.css
index 9c88010e5..03161d0b0 100644
--- a/p/themes/Dark-pink/pinkdark.rtl.css
+++ b/p/themes/Dark-pink/pinkdark.rtl.css
@@ -1,3 +1,7 @@
+:root {
+	--background-color-hover: #2f1d22;
+}
+
 .btn:hover {
 	background: unset;
 	border-color: #ff449a;
@@ -87,6 +91,10 @@ input:focus {
 	filter: sepia(62%) brightness(107%) hue-rotate(315deg) saturate(248%) contrast(104%) invert(100%);
 }
 
+.header > .item.title a:hover .logo {
+	filter: sepia(62%) brightness(70%) hue-rotate(315deg) saturate(248%) contrast(104%) invert(100%);
+}
+
 .icon[src*="/all"],
 .icon[src*="/down"],
 .icon[src*="/help"],
diff --git a/p/themes/Dark-pink/thumbs/original.png b/p/themes/Dark-pink/thumbs/original.png
index 4bae257b5..835496eac 100644
--- a/p/themes/Dark-pink/thumbs/original.png
+++ b/p/themes/Dark-pink/thumbs/original.png
diff --git a/p/themes/Dark/dark.css b/p/themes/Dark/dark.css
index c0a5fa507..fa194bb9e 100644
--- a/p/themes/Dark/dark.css
+++ b/p/themes/Dark/dark.css
@@ -78,17 +78,12 @@ input:disabled, select:disabled {
 	border-color: #000;
 }
 
-input.extend {
-	transition: width 200ms linear;
-}
-
 /*=== Tables */
 table {
 	border-collapse: collapse;
 }
 
-tr, th, td {
-	padding: 0.5em;
+th, td {
 	border: 1px solid #333;
 }
 
@@ -117,7 +112,6 @@ form th {
 
 .form-group .group-name {
 	padding: 10px 0;
-	text-align: right;
 }
 
 .form-group .group-controls {
@@ -263,13 +257,16 @@ a.btn {
 }
 
 /*=== Navigation */
-.nav-list .nav-header,
-.nav-list .item {
-	height: 2.5em;
-	line-height: 2.5em;
+.nav-list {
 	font-size: 0.9rem;
 }
 
+.nav-list .item,
+.nav-list .item.nav-header {
+	min-height: 2.5em;
+	line-height: 2.5;
+}
+
 .nav-list .item a:hover {
 	background: #26303f;
 }
@@ -284,35 +281,15 @@ a.btn {
 }
 
 .nav-list .item > a {
-	padding: 0 10px;
+	padding: 0 1rem;
 }
 
 .nav-list a:hover {
 	text-decoration: none;
 }
 
-.nav-list .item.empty a {
-	color: #c95;
-}
-
-.nav-list .item:hover.empty a,
-.nav-list .item.active.empty a {
-	background: #c95;
-	color: #fff;
-}
-
-.nav-list .item.error a {
-	color: #a44;
-}
-
-.nav-list .item:hover.error a,
-.nav-list .item.active.error a {
-	background: #a44;
-	color: #fff;
-}
-
 .nav-list .nav-header {
-	padding: 0 10px;
+	padding: 0 1rem;
 	font-weight: bold;
 	background: #111;
 	border-bottom: 1px solid #333;
@@ -338,23 +315,35 @@ a.btn {
 	border-color: #888;
 }
 
-.dropdown-header {
-	padding: 0 5px 5px;
+.dropdown-header,
+.dropdown-section .dropdown-section-title {
+	padding: 0.25rem 0.5rem 0.25rem 1rem;
 	font-weight: bold;
 	text-align: left;
 	color: #888;
 }
 
-.dropdown-menu > .item > a,
-.dropdown-menu > .item > span,
-.dropdown-menu > .item > .as-link {
+.dropdown-menu .item > a,
+.dropdown-menu .item > span,
+.dropdown-menu .item > .as-link {
 	padding: 0 22px;
 	line-height: 2.5em;
-	font-size: 0.8rem;
+	font-size: inherit;
 }
 
-.dropdown-menu > .item > a:hover,
-.dropdown-menu > .item > button:hover {
+.dropdown-menu .dropdown-section .item > a,
+.dropdown-menu .dropdown-section .item > span,
+.dropdown-menu .dropdown-section .item > .as-link {
+	padding-left: 2rem;
+}
+
+.dropdown-menu .dropdown-section .item:last-child {
+	margin-bottom: 0.5rem;
+}
+
+.dropdown-menu .item > a:hover,
+.dropdown-menu .item > button:hover:not([disabled]),
+.dropdown-menu .item > label:hover:not(.noHover) {
 	background: #26303f;
 	color: #888;
 }
@@ -372,14 +361,13 @@ a.btn {
 }
 
 .item ~ .dropdown-header,
+.dropdown-section ~ .dropdown-section,
 .item.separator {
 	border-top-color: #333;
 }
 
 /*=== Alerts */
 .alert {
-	margin: 15px auto;
-	padding: 10px 15px;
 	background: #111;
 	color: #aaa;
 	font-size: 0.9em;
@@ -497,8 +485,6 @@ a.btn {
 }
 
 .tree-folder-items > .item {
-	padding: 0 10px;
-	line-height: 2.5rem;
 	font-size: 0.8rem;
 }
 
@@ -540,25 +526,20 @@ a.btn {
 /*===============*/
 /*=== Header */
 .header > .item {
-	padding: 10px;
 	vertical-align: middle;
 	text-align: center;
 	border-bottom: 1px solid #333;
 }
 
-.header > .item.title {
-	width: 230px;
-}
-
 .header > .item.title .logo {
 	filter: grayscale(60%) brightness(1.1);
 }
 
-.header > .item.search input {
-	width: 230px;
+.header > .item.title a:hover .logo {
+	filter: grayscale(60%) brightness(1.5);
 }
 
-.header .item.search input:focus {
+.header > .item.search input {
 	width: 350px;
 }
 
@@ -717,7 +698,7 @@ a.btn {
 	border-left: 2px solid #2f2f2f;
 }
 
-.flux:hover {
+.flux .flux_header:hover {
 	background: #111;
 }
 
@@ -841,11 +822,6 @@ a.btn {
 	color: #a44;
 }
 
-.notification a.close {
-	padding: 0 15px;
-	line-height: 3em;
-}
-
 .notification a.close:hover {
 	background: #222;
 	border-radius: 0 3px 3px 0;
@@ -859,10 +835,6 @@ a.btn {
 	background: #a44;
 }
 
-.notification#actualizeProgress {
-	line-height: 2em;
-}
-
 /*=== "Load more" part */
 #bigMarkAsRead {
 	text-align: center;
@@ -934,6 +906,11 @@ a.btn {
 	text-shadow: none;
 }
 
+#stream.global .feed .item-title:not([data-unread="0"])::after {
+	background-color: #171717;
+	margin-top: 1rem;
+}
+
 /*=== Panel */
 #panel {
 	background: #1c1c1c;
@@ -989,7 +966,6 @@ a.btn {
 @media (max-width: 840px) {
 	.form-group .group-name {
 		padding-bottom: 0;
-		text-align: left;
 	}
 
 	.aside {
@@ -1019,20 +995,6 @@ a.btn {
 		margin: 5px 0;
 	}
 
-	.nav_menu .search {
-		display: inline-block;
-		max-width: 97%;
-	}
-
-	.nav_menu .search input {
-		max-width: 97%;
-		width: 90px;
-	}
-
-	.nav_menu .search input:focus {
-		width: 400px;
-	}
-
 	.dropdown-target:target ~ .dropdown-toggle::after {
 		background-color: #1a1a1a;
 		border-top: 1px solid #888;
diff --git a/p/themes/Dark/dark.rtl.css b/p/themes/Dark/dark.rtl.css
index 82ec53464..2610e49d5 100644
--- a/p/themes/Dark/dark.rtl.css
+++ b/p/themes/Dark/dark.rtl.css
@@ -78,17 +78,12 @@ input:disabled, select:disabled {
 	border-color: #000;
 }
 
-input.extend {
-	transition: width 200ms linear;
-}
-
 /*=== Tables */
 table {
 	border-collapse: collapse;
 }
 
-tr, th, td {
-	padding: 0.5em;
+th, td {
 	border: 1px solid #333;
 }
 
@@ -117,7 +112,6 @@ form th {
 
 .form-group .group-name {
 	padding: 10px 0;
-	text-align: left;
 }
 
 .form-group .group-controls {
@@ -263,13 +257,16 @@ a.btn {
 }
 
 /*=== Navigation */
-.nav-list .nav-header,
-.nav-list .item {
-	height: 2.5em;
-	line-height: 2.5em;
+.nav-list {
 	font-size: 0.9rem;
 }
 
+.nav-list .item,
+.nav-list .item.nav-header {
+	min-height: 2.5em;
+	line-height: 2.5;
+}
+
 .nav-list .item a:hover {
 	background: #26303f;
 }
@@ -284,35 +281,15 @@ a.btn {
 }
 
 .nav-list .item > a {
-	padding: 0 10px;
+	padding: 0 1rem;
 }
 
 .nav-list a:hover {
 	text-decoration: none;
 }
 
-.nav-list .item.empty a {
-	color: #c95;
-}
-
-.nav-list .item:hover.empty a,
-.nav-list .item.active.empty a {
-	background: #c95;
-	color: #fff;
-}
-
-.nav-list .item.error a {
-	color: #a44;
-}
-
-.nav-list .item:hover.error a,
-.nav-list .item.active.error a {
-	background: #a44;
-	color: #fff;
-}
-
 .nav-list .nav-header {
-	padding: 0 10px;
+	padding: 0 1rem;
 	font-weight: bold;
 	background: #111;
 	border-bottom: 1px solid #333;
@@ -338,23 +315,35 @@ a.btn {
 	border-color: #888;
 }
 
-.dropdown-header {
-	padding: 0 5px 5px;
+.dropdown-header,
+.dropdown-section .dropdown-section-title {
+	padding: 0.25rem 1rem 0.25rem 0.5rem;
 	font-weight: bold;
 	text-align: right;
 	color: #888;
 }
 
-.dropdown-menu > .item > a,
-.dropdown-menu > .item > span,
-.dropdown-menu > .item > .as-link {
+.dropdown-menu .item > a,
+.dropdown-menu .item > span,
+.dropdown-menu .item > .as-link {
 	padding: 0 22px;
 	line-height: 2.5em;
-	font-size: 0.8rem;
+	font-size: inherit;
 }
 
-.dropdown-menu > .item > a:hover,
-.dropdown-menu > .item > button:hover {
+.dropdown-menu .dropdown-section .item > a,
+.dropdown-menu .dropdown-section .item > span,
+.dropdown-menu .dropdown-section .item > .as-link {
+	padding-right: 2rem;
+}
+
+.dropdown-menu .dropdown-section .item:last-child {
+	margin-bottom: 0.5rem;
+}
+
+.dropdown-menu .item > a:hover,
+.dropdown-menu .item > button:hover:not([disabled]),
+.dropdown-menu .item > label:hover:not(.noHover) {
 	background: #26303f;
 	color: #888;
 }
@@ -372,14 +361,13 @@ a.btn {
 }
 
 .item ~ .dropdown-header,
+.dropdown-section ~ .dropdown-section,
 .item.separator {
 	border-top-color: #333;
 }
 
 /*=== Alerts */
 .alert {
-	margin: 15px auto;
-	padding: 10px 15px;
 	background: #111;
 	color: #aaa;
 	font-size: 0.9em;
@@ -497,8 +485,6 @@ a.btn {
 }
 
 .tree-folder-items > .item {
-	padding: 0 10px;
-	line-height: 2.5rem;
 	font-size: 0.8rem;
 }
 
@@ -540,25 +526,20 @@ a.btn {
 /*===============*/
 /*=== Header */
 .header > .item {
-	padding: 10px;
 	vertical-align: middle;
 	text-align: center;
 	border-bottom: 1px solid #333;
 }
 
-.header > .item.title {
-	width: 230px;
-}
-
 .header > .item.title .logo {
 	filter: grayscale(60%) brightness(1.1);
 }
 
-.header > .item.search input {
-	width: 230px;
+.header > .item.title a:hover .logo {
+	filter: grayscale(60%) brightness(1.5);
 }
 
-.header .item.search input:focus {
+.header > .item.search input {
 	width: 350px;
 }
 
@@ -717,7 +698,7 @@ a.btn {
 	border-right: 2px solid #2f2f2f;
 }
 
-.flux:hover {
+.flux .flux_header:hover {
 	background: #111;
 }
 
@@ -841,11 +822,6 @@ a.btn {
 	color: #a44;
 }
 
-.notification a.close {
-	padding: 0 15px;
-	line-height: 3em;
-}
-
 .notification a.close:hover {
 	background: #222;
 	border-radius: 3px 0 0 3px;
@@ -859,10 +835,6 @@ a.btn {
 	background: #a44;
 }
 
-.notification#actualizeProgress {
-	line-height: 2em;
-}
-
 /*=== "Load more" part */
 #bigMarkAsRead {
 	text-align: center;
@@ -934,6 +906,11 @@ a.btn {
 	text-shadow: none;
 }
 
+#stream.global .feed .item-title:not([data-unread="0"])::after {
+	background-color: #171717;
+	margin-top: 1rem;
+}
+
 /*=== Panel */
 #panel {
 	background: #1c1c1c;
@@ -989,7 +966,6 @@ a.btn {
 @media (max-width: 840px) {
 	.form-group .group-name {
 		padding-bottom: 0;
-		text-align: right;
 	}
 
 	.aside {
@@ -1019,20 +995,6 @@ a.btn {
 		margin: 5px 0;
 	}
 
-	.nav_menu .search {
-		display: inline-block;
-		max-width: 97%;
-	}
-
-	.nav_menu .search input {
-		max-width: 97%;
-		width: 90px;
-	}
-
-	.nav_menu .search input:focus {
-		width: 400px;
-	}
-
 	.dropdown-target:target ~ .dropdown-toggle::after {
 		background-color: #1a1a1a;
 		border-top: 1px solid #888;
diff --git a/p/themes/Flat/flat.css b/p/themes/Flat/flat.css
index 2f0362b9d..8fd09bb35 100644
--- a/p/themes/Flat/flat.css
+++ b/p/themes/Flat/flat.css
@@ -70,17 +70,12 @@ input:disabled, select:disabled {
 	background: #eee;
 }
 
-input.extend {
-	transition: width 200ms linear;
-}
-
 /*=== Tables */
 table {
 	border-collapse: collapse;
 }
 
-tr, th, td {
-	padding: 0.5em;
+th, td {
 	border: 1px solid #ddd;
 }
 
@@ -104,7 +99,6 @@ form th {
 }
 
 .form-group::after {
-	content: "";
 	display: block;
 	clear: both;
 }
@@ -129,7 +123,6 @@ form th {
 
 .form-group .group-name {
 	padding: 10px 0;
-	text-align: right;
 }
 
 .form-group .group-controls {
@@ -154,7 +147,7 @@ form th {
 
 .stick .btn:last-child,
 .stick input:last-child,
-.stick .btn + .dropdown > .btn {
+.stick .dropdown:last-child > .btn {
 	border-radius: 0 5px 5px 0;
 }
 
@@ -253,13 +246,16 @@ a.btn {
 }
 
 /*=== Navigation */
-.nav-list .nav-header,
-.nav-list .item {
-	height: 2.5em;
-	line-height: 2.5em;
+.nav-list {
 	font-size: 0.9rem;
 }
 
+.nav-list .item,
+.nav-list .item.nav-header {
+	min-height: 2.5em;
+	line-height: 2.5;
+}
+
 .nav-list .item a:hover,
 .nav-list .item.active {
 	background: #2980b9;
@@ -271,35 +267,15 @@ a.btn {
 }
 
 .nav-list .item > a {
-	padding: 0 10px;
+	padding: 0 1rem;
 }
 
 .nav-list a:hover {
 	text-decoration: none;
 }
 
-.nav-list .item.empty a {
-	color: #f39c12;
-}
-
-.nav-list .item:hover.empty a,
-.nav-list .item.active.empty a {
-	background: #f39c12;
-	color: #fff;
-}
-
-.nav-list .item.error a {
-	color: #bd362f;
-}
-
-.nav-list .item:hover.error a,
-.nav-list .item.active.error a {
-	background: #bd362f;
-	color: #fff;
-}
-
 .nav-list .nav-header {
-	padding: 0 10px;
+	padding: 0 1rem;
 	font-weight: bold;
 	background: #34495e;
 	color: #fff;
@@ -313,7 +289,7 @@ a.btn {
 /*=== Dropdown */
 .dropdown-menu {
 	margin: 0.5rem 0 0;
-	padding: 0.5rem 0;
+	padding: 0.5rem 0 0.25rem 0;
 	background: #fafafa;
 	font-size: 0.8rem;
 	border: 1px solid #95a5a6;
@@ -326,7 +302,8 @@ a.btn {
 	right: 12px;
 }
 
-.dropdown-header {
+.dropdown-header,
+.dropdown-section .dropdown-section-title {
 	padding: 0 0.5rem 0.5rem;
 	font-weight: bold;
 	text-align: left;
@@ -338,16 +315,27 @@ a.btn {
 	right: 0.5rem;
 }
 
-.dropdown-menu > .item > a,
-.dropdown-menu > .item > span,
-.dropdown-menu > .item > .as-link {
+.dropdown-menu .item > a,
+.dropdown-menu .item > span,
+.dropdown-menu .item > .as-link {
 	padding: 0 22px;
 	line-height: 2.5em;
-	font-size: 0.8rem;
+	font-size: inherit;
+}
+
+.dropdown-menu .dropdown-section .item > a,
+.dropdown-menu .dropdown-section .item > span,
+.dropdown-menu .dropdown-section .item > .as-link {
+	padding-left: 2rem;
+}
+
+.dropdown-menu .dropdown-section .item:last-child {
+	margin-bottom: 0.5rem;
 }
 
-.dropdown-menu > .item > a:hover,
-.dropdown-menu > .item > button:hover {
+.dropdown-menu .item > a:hover,
+.dropdown-menu .item > button:hover:not([disabled]),
+.dropdown-menu .item > label:hover:not(.noHover) {
 	background: #2980b9;
 	color: #fff;
 }
@@ -370,14 +358,13 @@ a.btn {
 }
 
 .item ~ .dropdown-header,
+.dropdown-section ~ .dropdown-section,
 .item.separator {
 	border-top-color: #ddd;
 }
 
 /*=== Alerts */
 .alert {
-	margin: 15px auto;
-	padding: 10px 15px;
 	background: #f4f4f4;
 	color: #aaa;
 	font-size: 0.9em;
@@ -456,7 +443,6 @@ a.btn {
 
 .box .box-content .item {
 	font-size: 0.9rem;
-	line-height: 2.5em;
 }
 
 .box .box-title .configure .icon,
@@ -498,8 +484,6 @@ a.btn {
 }
 
 .tree-folder-items > .item {
-	padding: 0 10px;
-	line-height: 2.5rem;
 	font-size: 0.8rem;
 }
 
@@ -542,13 +526,12 @@ a.btn {
 }
 
 .header > .item {
-	padding: 10px;
 	vertical-align: middle;
 	text-align: center;
 }
 
-.header > .item.title {
-	width: 230px;
+.header > .item.title a:hover .logo {
+	filter: brightness(1.5);
 }
 
 .header > .item.title h1 {
@@ -560,10 +543,6 @@ a.btn {
 }
 
 .header > .item.search input {
-	width: 230px;
-}
-
-.header .item.search input:focus {
 	width: 350px;
 }
 
@@ -728,7 +707,7 @@ a.btn {
 	border-left: 2px solid #ecf0f1;
 }
 
-.flux:hover {
+.flux .flux_header:hover {
 	background: #fff;
 }
 
@@ -745,10 +724,6 @@ a.btn {
 	background: #fff3ed;
 }
 
-.flux.not_read:not(.current):hover .item.title {
-	background: inherit;
-}
-
 .flux.favorite {
 	border-left-color: #ffc300;
 }
@@ -757,10 +732,6 @@ a.btn {
 	background: #fff6da;
 }
 
-.flux.favorite:not(.current):hover .item.title {
-	background: #fff6da;
-}
-
 .flux_header {
 	font-size: 0.8rem;
 	cursor: pointer;
@@ -863,8 +834,6 @@ a.btn {
 }
 
 .notification a.close {
-	padding: 0 15px;
-	line-height: 3em;
 	border-radius: 0 3px 3px 0;
 }
 
@@ -876,10 +845,6 @@ a.btn {
 	background: #c0392b;
 }
 
-.notification#actualizeProgress {
-	line-height: 2em;
-}
-
 /*=== "Load more" part */
 #bigMarkAsRead {
 	text-align: center;
@@ -989,7 +954,6 @@ a.btn {
 @media (max-width: 840px) {
 	.form-group .group-name {
 		padding-bottom: 0;
-		text-align: left;
 	}
 
 	.aside {
diff --git a/p/themes/Flat/flat.rtl.css b/p/themes/Flat/flat.rtl.css
index 63d0103c4..43327ddeb 100644
--- a/p/themes/Flat/flat.rtl.css
+++ b/p/themes/Flat/flat.rtl.css
@@ -70,17 +70,12 @@ input:disabled, select:disabled {
 	background: #eee;
 }
 
-input.extend {
-	transition: width 200ms linear;
-}
-
 /*=== Tables */
 table {
 	border-collapse: collapse;
 }
 
-tr, th, td {
-	padding: 0.5em;
+th, td {
 	border: 1px solid #ddd;
 }
 
@@ -104,7 +99,6 @@ form th {
 }
 
 .form-group::after {
-	content: "";
 	display: block;
 	clear: both;
 }
@@ -129,7 +123,6 @@ form th {
 
 .form-group .group-name {
 	padding: 10px 0;
-	text-align: left;
 }
 
 .form-group .group-controls {
@@ -154,7 +147,7 @@ form th {
 
 .stick .btn:last-child,
 .stick input:last-child,
-.stick .btn + .dropdown > .btn {
+.stick .dropdown:last-child > .btn {
 	border-radius: 5px 0 0 5px;
 }
 
@@ -253,13 +246,16 @@ a.btn {
 }
 
 /*=== Navigation */
-.nav-list .nav-header,
-.nav-list .item {
-	height: 2.5em;
-	line-height: 2.5em;
+.nav-list {
 	font-size: 0.9rem;
 }
 
+.nav-list .item,
+.nav-list .item.nav-header {
+	min-height: 2.5em;
+	line-height: 2.5;
+}
+
 .nav-list .item a:hover,
 .nav-list .item.active {
 	background: #2980b9;
@@ -271,35 +267,15 @@ a.btn {
 }
 
 .nav-list .item > a {
-	padding: 0 10px;
+	padding: 0 1rem;
 }
 
 .nav-list a:hover {
 	text-decoration: none;
 }
 
-.nav-list .item.empty a {
-	color: #f39c12;
-}
-
-.nav-list .item:hover.empty a,
-.nav-list .item.active.empty a {
-	background: #f39c12;
-	color: #fff;
-}
-
-.nav-list .item.error a {
-	color: #bd362f;
-}
-
-.nav-list .item:hover.error a,
-.nav-list .item.active.error a {
-	background: #bd362f;
-	color: #fff;
-}
-
 .nav-list .nav-header {
-	padding: 0 10px;
+	padding: 0 1rem;
 	font-weight: bold;
 	background: #34495e;
 	color: #fff;
@@ -313,7 +289,7 @@ a.btn {
 /*=== Dropdown */
 .dropdown-menu {
 	margin: 0.5rem 0 0;
-	padding: 0.5rem 0;
+	padding: 0.5rem 0 0.25rem 0;
 	background: #fafafa;
 	font-size: 0.8rem;
 	border: 1px solid #95a5a6;
@@ -326,7 +302,8 @@ a.btn {
 	left: 12px;
 }
 
-.dropdown-header {
+.dropdown-header,
+.dropdown-section .dropdown-section-title {
 	padding: 0 0.5rem 0.5rem;
 	font-weight: bold;
 	text-align: right;
@@ -338,16 +315,27 @@ a.btn {
 	left: 0.5rem;
 }
 
-.dropdown-menu > .item > a,
-.dropdown-menu > .item > span,
-.dropdown-menu > .item > .as-link {
+.dropdown-menu .item > a,
+.dropdown-menu .item > span,
+.dropdown-menu .item > .as-link {
 	padding: 0 22px;
 	line-height: 2.5em;
-	font-size: 0.8rem;
+	font-size: inherit;
+}
+
+.dropdown-menu .dropdown-section .item > a,
+.dropdown-menu .dropdown-section .item > span,
+.dropdown-menu .dropdown-section .item > .as-link {
+	padding-right: 2rem;
+}
+
+.dropdown-menu .dropdown-section .item:last-child {
+	margin-bottom: 0.5rem;
 }
 
-.dropdown-menu > .item > a:hover,
-.dropdown-menu > .item > button:hover {
+.dropdown-menu .item > a:hover,
+.dropdown-menu .item > button:hover:not([disabled]),
+.dropdown-menu .item > label:hover:not(.noHover) {
 	background: #2980b9;
 	color: #fff;
 }
@@ -370,14 +358,13 @@ a.btn {
 }
 
 .item ~ .dropdown-header,
+.dropdown-section ~ .dropdown-section,
 .item.separator {
 	border-top-color: #ddd;
 }
 
 /*=== Alerts */
 .alert {
-	margin: 15px auto;
-	padding: 10px 15px;
 	background: #f4f4f4;
 	color: #aaa;
 	font-size: 0.9em;
@@ -456,7 +443,6 @@ a.btn {
 
 .box .box-content .item {
 	font-size: 0.9rem;
-	line-height: 2.5em;
 }
 
 .box .box-title .configure .icon,
@@ -498,8 +484,6 @@ a.btn {
 }
 
 .tree-folder-items > .item {
-	padding: 0 10px;
-	line-height: 2.5rem;
 	font-size: 0.8rem;
 }
 
@@ -542,13 +526,12 @@ a.btn {
 }
 
 .header > .item {
-	padding: 10px;
 	vertical-align: middle;
 	text-align: center;
 }
 
-.header > .item.title {
-	width: 230px;
+.header > .item.title a:hover .logo {
+	filter: brightness(1.5);
 }
 
 .header > .item.title h1 {
@@ -560,10 +543,6 @@ a.btn {
 }
 
 .header > .item.search input {
-	width: 230px;
-}
-
-.header .item.search input:focus {
 	width: 350px;
 }
 
@@ -728,7 +707,7 @@ a.btn {
 	border-right: 2px solid #ecf0f1;
 }
 
-.flux:hover {
+.flux .flux_header:hover {
 	background: #fff;
 }
 
@@ -745,10 +724,6 @@ a.btn {
 	background: #fff3ed;
 }
 
-.flux.not_read:not(.current):hover .item.title {
-	background: inherit;
-}
-
 .flux.favorite {
 	border-right-color: #ffc300;
 }
@@ -757,10 +732,6 @@ a.btn {
 	background: #fff6da;
 }
 
-.flux.favorite:not(.current):hover .item.title {
-	background: #fff6da;
-}
-
 .flux_header {
 	font-size: 0.8rem;
 	cursor: pointer;
@@ -863,8 +834,6 @@ a.btn {
 }
 
 .notification a.close {
-	padding: 0 15px;
-	line-height: 3em;
 	border-radius: 3px 0 0 3px;
 }
 
@@ -876,10 +845,6 @@ a.btn {
 	background: #c0392b;
 }
 
-.notification#actualizeProgress {
-	line-height: 2em;
-}
-
 /*=== "Load more" part */
 #bigMarkAsRead {
 	text-align: center;
@@ -989,7 +954,6 @@ a.btn {
 @media (max-width: 840px) {
 	.form-group .group-name {
 		padding-bottom: 0;
-		text-align: right;
 	}
 
 	.aside {
diff --git a/p/themes/Flat/metadata.json b/p/themes/Flat/metadata.json
index 27a83fe83..bd7ce6157 100644
--- a/p/themes/Flat/metadata.json
+++ b/p/themes/Flat/metadata.json
@@ -3,5 +3,6 @@
   "author": "Marien Fressinaud",
   "description": "Thème plat pour FreshRSS",
   "version": 0.2,
-  "files": ["_frss.css", "flat.css"]
+  "files": ["_frss.css", "flat.css"],
+  "deprecated": true
 }
diff --git a/p/themes/Mapco/_components.scss b/p/themes/Mapco/_components.scss
index cf7aca73d..5f7e04e56 100644
--- a/p/themes/Mapco/_components.scss
+++ b/p/themes/Mapco/_components.scss
@@ -22,6 +22,12 @@
 }
 
 /*=== Dropdown */
+.dropdown {
+	.dropdown-target:target + .btn {
+		background-color: variables.$grey-medium-light;
+	}
+}
+
 .dropdown-menu {
 	margin: 9px 0 0 0;
 	padding: 0.5rem 0 1rem 0;
@@ -37,8 +43,9 @@
 		right: 18px;
 	}
 
-	.dropdown-header {
-		padding: 1rem 0.5rem 1rem 1rem;
+	.dropdown-header,
+	.dropdown-section .dropdown-section-title {
+		padding: 1rem 1.5rem;
 		font-weight: bold;
 		text-align: left;
 		color: variables.$grey-dark;
@@ -50,16 +57,22 @@
 
 		@include mixins.transition(all, 0.075s, ease-in-out);
 
-		a, span, .as-link {
+		> a,
+		> span,
+		> .as-link {
 			padding: 0 2rem;
 			color: variables.$main-font-color;
-			font-size: 1rem;
+			font-size: inherit;
 			line-height: 2.5em;
+
+			span.icon {
+				padding: 0 0.25rem !important;
+			}
 		}
 
-		&:not(.addItem) {
-			a:hover,
-			button:hover {
+		> a,
+		> .as-link {
+			&:not(.addItem):hover {
 				background: variables.$main-first;
 				color: variables.$white;
 
@@ -69,6 +82,20 @@
 			}
 		}
 
+		&.dropdown-section {
+			margin-top: 0.75rem;
+
+			~ .dropdown-section {
+				border-top-color: variables.$grey-light;
+			}
+
+			.item {
+				a, .as-link {
+					padding-left: 2rem;
+				}
+			}
+		}
+
 		&[aria-checked="true"] {
 			a::before {
 				margin: 0 0 0 -14px;
@@ -122,8 +149,6 @@
 
 /*=== Alerts */
 .alert {
-	margin: 1rem 0;
-	padding: 1rem;
 	background: variables.$grey-lighter;
 	color: variables.$grey-dark;
 	font-size: 1rem;
diff --git a/p/themes/Mapco/_fonts.scss b/p/themes/Mapco/_fonts.scss
index 687525743..57c9c9bf2 100644
--- a/p/themes/Mapco/_fonts.scss
+++ b/p/themes/Mapco/_fonts.scss
@@ -19,7 +19,7 @@
 	font-style: normal;
 	font-stretch: normal;
 	font-weight: 700;
-	src: url("../fonts/LatoLatin-Regular.woff") format("woff");
+	src: url("../fonts/LatoLatin-Bold.woff") format("woff");
 }
 
 @font-face {
diff --git a/p/themes/Mapco/_forms.scss b/p/themes/Mapco/_forms.scss
index 0f5f96681..977a70346 100644
--- a/p/themes/Mapco/_forms.scss
+++ b/p/themes/Mapco/_forms.scss
@@ -119,24 +119,17 @@ input:disabled, select:disabled {
 	background: variables.$grey-light;
 }
 
-input.extend {
-	transition: width 200ms linear;
-}
-
-
 .form-group {
 	padding: 5px;
 	border-radius: 3px;
 
 	&::after {
-		content: "";
 		display: block;
 		clear: both;
 	}
 
 	.group-name {
 		padding: 10px 0;
-		text-align: right;
 	}
 
 	.group-controls {
diff --git a/p/themes/Mapco/_layout.scss b/p/themes/Mapco/_layout.scss
index a4aaf6fa8..b57a48fd0 100644
--- a/p/themes/Mapco/_layout.scss
+++ b/p/themes/Mapco/_layout.scss
@@ -6,36 +6,30 @@
 /*===============*/
 /*=== Header */
 .header {
-	padding: 0.5rem 1.35rem;
 	background: variables.$sid-bg;
-	display: block;
-	width: auto;
-	height: 3.5rem;
-	table-layout: none;
-
-	.logo {
-		margin: 11px 0 5px;
-		filter: grayscale(100%) brightness(100);
-	}
 
 	.item {
 		vertical-align: middle;
 
 		&.title {
-			width: 280px;
+			a {
+				padding: 0.5rem 1rem;
 
-			font-weight: 400;
+				.logo {
+					filter: grayscale(100%) brightness(3);
+				}
 
-			a {
-				img {
-					margin-right: 0.5rem;
+				&:hover {
+					.logo {
+						filter: grayscale(100%) brightness(2.2);
+					}
 				}
 			}
 		}
 
 		&.search {
 			input {
-				width: 230px;
+				width: 350px;
 				color: variables.$sid-font-color;
 				border: none;
 				border-radius: 2px 0 0 2px;
@@ -48,9 +42,7 @@
 				}
 
 				&:focus {
-					width: 350px;
 					color: variables.$grey-dark;
-
 					background-color: variables.$white;
 				}
 			}
@@ -82,10 +74,6 @@
 		}
 
 		&.configure {
-			width: 3rem;
-			position: absolute;
-			right: 1rem;
-			top: 1rem;
 			text-align: center;
 
 			.btn .icon,
@@ -107,7 +95,7 @@
 
 /*=== Body */
 #global {
-	height: calc(100% - 3.5rem);
+	height: calc(100vh - (calc(3rem + 2 * var(--frss-padding-top-bottom))));
 }
 
 /*=== Prompt (centered) */
@@ -238,7 +226,7 @@ main.prompt {
 			}
 		}
 
-		.dropdown {
+		.dropdown:not(#dropdown-search-wrapper) {
 			a.dropdown-toggle {
 				border-left-width: 0;
 				background-image: url(icons/more.svg);
@@ -248,6 +236,12 @@ main.prompt {
 				}
 			}
 		}
+
+		#dropdown-search-wrapper.dropdown {
+			a.dropdown-toggle {
+				border-left-width: 0;
+			}
+		}
 	}
 }
 
@@ -366,9 +360,7 @@ main.prompt {
 	}
 
 	a.close {
-		padding: 0 15px;
 		border-radius: 0 3px 3px 0;
-		line-height: 3em;
 	}
 
 	&.good a.close:hover {
@@ -380,11 +372,13 @@ main.prompt {
 	}
 
 	&#actualizeProgress {
-		line-height: 2em;
-
 		br {
 			display: none;
 		}
+
+		.title {
+			margin: 0 2rem;
+		}
 	}
 }
 
diff --git a/p/themes/Mapco/_list-view.scss b/p/themes/Mapco/_list-view.scss
index 40fab3c1c..7d0fb87f4 100644
--- a/p/themes/Mapco/_list-view.scss
+++ b/p/themes/Mapco/_list-view.scss
@@ -10,11 +10,13 @@
 
 	@include mixins.transition(all, 0.15s, ease-in-out);
 
-	&:hover {
-		background: variables.$grey-lighter;
-
-		&:not(.current):hover .item.title {
+	.flux_header {
+		&:hover {
 			background: variables.$grey-lighter;
+
+			&:not(.current):hover .item.title {
+				background: variables.$grey-lighter;
+			}
 		}
 	}
 
diff --git a/p/themes/Mapco/_mobile.scss b/p/themes/Mapco/_mobile.scss
index 1c11448f0..3faea3d7e 100644
--- a/p/themes/Mapco/_mobile.scss
+++ b/p/themes/Mapco/_mobile.scss
@@ -6,10 +6,6 @@
 /*===========*/
 
 @media (max-width: 840px) {
-	.form-group .group-name {
-		text-align: left;
-	}
-
 	.aside {
 
 		@include mixins.transition(all, 0.2s, ease-in-out);
@@ -39,30 +35,15 @@
 	}
 
 	.header {
-		padding: 0.5rem;
-		height: 8rem;
-
 		.item {
 			&.search {
-				display: block;
-
-				form {
-					display: inherit;
-				}
-
-				.stick {
-					display: flex;
-				}
-
-				input {
-					width: 90%;
-					height: 3.5rem;
-
-					&:focus {
-						width: 100%;
+				display: none;
+			}
 
-					}
-				}
+			&.configure {
+				position: absolute;
+				top: 0;
+				right: 0;
 			}
 
 		}
@@ -103,11 +84,7 @@
 		}
 
 		.search {
-			display: none;
-			max-width: 97%;
-
 			.input {
-
 				max-width: 97%;
 				width: 90px;
 
diff --git a/p/themes/Mapco/_sidebar.scss b/p/themes/Mapco/_sidebar.scss
index 77438c836..090a69580 100644
--- a/p/themes/Mapco/_sidebar.scss
+++ b/p/themes/Mapco/_sidebar.scss
@@ -93,7 +93,7 @@
 		border-radius: 5px 0 0 5px;
 	}
 
-	.btn:last-child, input:last-child, .btn + .dropdown > .btn {
+	.btn:last-child, input:last-child, .dropdown:last-child > .btn {
 		border-radius: 0 5px 5px 0;
 	}
 
@@ -133,16 +133,24 @@
 
 /*=== Navigation */
 .nav-list {
-	.nav-header,
+	font-size: 1rem;
+
+	.item.nav-header,
 	.item {
-		height: 2.5em;
+		min-height: 2.5em;
 		line-height: 2.5em;
-		font-size: 1rem;
 	}
 
 	.item {
 		background: variables.$sid-bg;
 		color: variables.$white;
+		min-height: 2.5em;
+		line-height: 2.5em;
+
+		&.nav-header {
+			min-height: 2.5em;
+			line-height: 2.5em;
+		}
 
 		a {
 			padding: 0 1rem;
@@ -151,51 +159,15 @@
 			@include mixins.transition(all, 0.15s, ease-in-out);
 		}
 
-		.error {
-			a {
-				color: variables.$alert-bg;
-			}
-		}
-
-		&:hover {
-			.error {
-				a {
-					background: variables.$main-first;
-					color: variables.$sid-font-color;
-				}
-			}
-
-			.empty {
-				a {
-					background: variables.$warning-bg;
-					color: variables.$sid-font-color;
-				}
-			}
-
-			a {
-				background: variables.$sid-bg-dark;
-				text-decoration: none;
-			}
+		a:hover {
+			background: variables.$sid-bg-dark;
+			text-decoration: none;
 		}
 
 		&.active {
 			background: variables.$main-first;
 			color: variables.$white;
 
-			.error {
-				a {
-					background: variables.$main-first;
-					color: variables.$white;
-				}
-			}
-
-			.empty {
-				a {
-					background: variables.$warning-bg;
-					color: variables.$white;
-				}
-			}
-
 			a {
 				background: variables.$main-first;
 				color: variables.$white;
@@ -204,14 +176,8 @@
 		}
 	}
 
-	&.empty {
-		a {
-			color: variables.$warning-bg;
-		}
-	}
-
 	.nav-header {
-		padding: 0 10px;
+		padding: 0 1rem;
 		font-weight: bold;
 		color: variables.$grey-dark;
 		text-transform: uppercase;
diff --git a/p/themes/Mapco/_tables.scss b/p/themes/Mapco/_tables.scss
index 4955fff6a..7376279e0 100644
--- a/p/themes/Mapco/_tables.scss
+++ b/p/themes/Mapco/_tables.scss
@@ -5,8 +5,7 @@ table {
 	border-collapse: collapse;
 }
 
-tr, th, td {
-	padding: 0.5em;
+th, td {
 	border: 1px solid variables.$grey-medium-light;
 }
 
diff --git a/p/themes/Mapco/icons/up.svg b/p/themes/Mapco/icons/up.svg
index 65da6b1a7..b5baff62f 100644
--- a/p/themes/Mapco/icons/up.svg
+++ b/p/themes/Mapco/icons/up.svg
@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="10">
-  <path fill="#666" d="M14.387 9.469 15.8 8.055 8.094.348.387 8.055 1.8 9.469l6.293-6.293Zm0 0"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
+  <path fill="#666" d="m14.293 12.56 1.414-1.414L8 3.44.293 11.146l1.413 1.414L8 6.267zm0 0"/>
 </svg>
diff --git a/p/themes/Mapco/mapco.css b/p/themes/Mapco/mapco.css
index 028c12e12..967accc00 100644
--- a/p/themes/Mapco/mapco.css
+++ b/p/themes/Mapco/mapco.css
@@ -17,7 +17,7 @@
 	font-style: normal;
 	font-stretch: normal;
 	font-weight: 700;
-	src: url("../fonts/LatoLatin-Regular.woff") format("woff");
+	src: url("../fonts/LatoLatin-Bold.woff") format("woff");
 }
 @font-face {
 	font-family: "lato";
@@ -163,22 +163,16 @@ input:disabled, select:disabled {
 	background: #eff0f2;
 }
 
-input.extend {
-	transition: width 200ms linear;
-}
-
 .form-group {
 	padding: 5px;
 	border-radius: 3px;
 }
 .form-group::after {
-	content: "";
 	display: block;
 	clear: both;
 }
 .form-group .group-name {
 	padding: 10px 0;
-	text-align: right;
 }
 .form-group .group-controls {
 	min-height: 25px;
@@ -200,8 +194,7 @@ table {
 	border-collapse: collapse;
 }
 
-tr, th, td {
-	padding: 0.5em;
+th, td {
 	border: 1px solid #d5d8db;
 }
 
@@ -227,6 +220,10 @@ form th {
 }
 
 /*=== Dropdown */
+.dropdown .dropdown-target:target + .btn {
+	background-color: #d5d8db;
+}
+
 .dropdown-menu {
 	margin: 9px 0 0 0;
 	padding: 0.5rem 0 1rem 0;
@@ -241,8 +238,9 @@ form th {
 	border: none;
 	right: 18px;
 }
-.dropdown-menu .dropdown-header {
-	padding: 1rem 0.5rem 1rem 1rem;
+.dropdown-menu .dropdown-header,
+.dropdown-menu .dropdown-section .dropdown-section-title {
+	padding: 1rem 1.5rem;
 	font-weight: bold;
 	text-align: left;
 	color: #5b6871;
@@ -252,21 +250,37 @@ form th {
 .dropdown-menu .item {
 	transition: all 0.075s ease-in-out;
 }
-.dropdown-menu .item a, .dropdown-menu .item span, .dropdown-menu .item .as-link {
+.dropdown-menu .item > a,
+.dropdown-menu .item > span,
+.dropdown-menu .item > .as-link {
 	padding: 0 2rem;
 	color: #303136;
-	font-size: 1rem;
+	font-size: inherit;
 	line-height: 2.5em;
 }
-.dropdown-menu .item:not(.addItem) a:hover,
-.dropdown-menu .item:not(.addItem) button:hover {
+.dropdown-menu .item > a span.icon,
+.dropdown-menu .item > span span.icon,
+.dropdown-menu .item > .as-link span.icon {
+	padding: 0 0.25rem !important;
+}
+.dropdown-menu .item > a:not(.addItem):hover,
+.dropdown-menu .item > .as-link:not(.addItem):hover {
 	background: #36c;
 	color: #fff;
 }
-.dropdown-menu .item:not(.addItem) a:hover .icon,
-.dropdown-menu .item:not(.addItem) button:hover .icon {
+.dropdown-menu .item > a:not(.addItem):hover .icon,
+.dropdown-menu .item > .as-link:not(.addItem):hover .icon {
 	filter: brightness(3);
 }
+.dropdown-menu .item.dropdown-section {
+	margin-top: 0.75rem;
+}
+.dropdown-menu .item.dropdown-section ~ .dropdown-section {
+	border-top-color: #eff0f2;
+}
+.dropdown-menu .item.dropdown-section .item a, .dropdown-menu .item.dropdown-section .item .as-link {
+	padding-left: 2rem;
+}
 .dropdown-menu .item[aria-checked=true] a::before {
 	margin: 0 0 0 -14px;
 	font-weight: bold;
@@ -303,8 +317,6 @@ form th {
 
 /*=== Alerts */
 .alert {
-	margin: 1rem 0;
-	padding: 1rem;
 	background: #f9fafb;
 	color: #5b6871;
 	font-size: 1rem;
@@ -530,7 +542,7 @@ form th {
 .stick .btn:first-child {
 	border-radius: 5px 0 0 5px;
 }
-.stick .btn:last-child, .stick input:last-child, .stick .btn + .dropdown > .btn {
+.stick .btn:last-child, .stick input:last-child, .stick .dropdown:last-child > .btn {
 	border-radius: 0 5px 5px 0;
 }
 .stick .btn + .btn,
@@ -559,33 +571,30 @@ form th {
 
 /* Sidebar des pages de configuration */
 /*=== Navigation */
-.nav-list .nav-header,
+.nav-list {
+	font-size: 1rem;
+}
+.nav-list .item.nav-header,
 .nav-list .item {
-	height: 2.5em;
+	min-height: 2.5em;
 	line-height: 2.5em;
-	font-size: 1rem;
 }
 .nav-list .item {
 	background: #303136;
 	color: #fff;
+	min-height: 2.5em;
+	line-height: 2.5em;
+}
+.nav-list .item.nav-header {
+	min-height: 2.5em;
+	line-height: 2.5em;
 }
 .nav-list .item a {
 	padding: 0 1rem;
 	color: #ffffff;
 	transition: all 0.15s ease-in-out;
 }
-.nav-list .item .error a {
-	color: #f5633e;
-}
-.nav-list .item:hover .error a {
-	background: #36c;
-	color: #ffffff;
-}
-.nav-list .item:hover .empty a {
-	background: #f4f762;
-	color: #ffffff;
-}
-.nav-list .item:hover a {
+.nav-list .item a:hover {
 	background: #17181a;
 	text-decoration: none;
 }
@@ -593,24 +602,13 @@ form th {
 	background: #36c;
 	color: #fff;
 }
-.nav-list .item.active .error a {
-	background: #36c;
-	color: #fff;
-}
-.nav-list .item.active .empty a {
-	background: #f4f762;
-	color: #fff;
-}
 .nav-list .item.active a {
 	background: #36c;
 	color: #fff;
 	text-decoration: none;
 }
-.nav-list.empty a {
-	color: #f4f762;
-}
 .nav-list .nav-header {
-	padding: 0 10px;
+	padding: 0 1rem;
 	font-weight: bold;
 	color: #5b6871;
 	text-transform: uppercase;
@@ -680,29 +678,22 @@ form th {
 /*===============*/
 /*=== Header */
 .header {
-	padding: 0.5rem 1.35rem;
 	background: #303136;
-	display: block;
-	width: auto;
-	height: 3.5rem;
-	table-layout: none;
-}
-.header .logo {
-	margin: 11px 0 5px;
-	filter: grayscale(100%) brightness(100);
 }
 .header .item {
 	vertical-align: middle;
 }
-.header .item.title {
-	width: 280px;
-	font-weight: 400;
+.header .item.title a {
+	padding: 0.5rem 1rem;
 }
-.header .item.title a img {
-	margin-right: 0.5rem;
+.header .item.title a .logo {
+	filter: grayscale(100%) brightness(3);
+}
+.header .item.title a:hover .logo {
+	filter: grayscale(100%) brightness(2.2);
 }
 .header .item.search input {
-	width: 230px;
+	width: 350px;
 	color: #ffffff;
 	border: none;
 	border-radius: 2px 0 0 2px;
@@ -713,7 +704,6 @@ form th {
 	background-color: #17181a;
 }
 .header .item.search input:focus {
-	width: 350px;
 	color: #5b6871;
 	background-color: #fff;
 }
@@ -739,10 +729,6 @@ form th {
 	filter: brightness(3);
 }
 .header .item.configure {
-	width: 3rem;
-	position: absolute;
-	right: 1rem;
-	top: 1rem;
 	text-align: center;
 }
 .header .item.configure .btn .icon,
@@ -759,7 +745,7 @@ form th {
 
 /*=== Body */
 #global {
-	height: calc(100% - 3.5rem);
+	height: calc(100vh - (3rem + 2 * var(--frss-padding-top-bottom)));
 }
 
 /*=== Prompt (centered) */
@@ -867,13 +853,16 @@ main.prompt {
 .nav_menu .stick .btn.read_all:hover {
 	background-color: #d5d8db;
 }
-.nav_menu .stick .dropdown a.dropdown-toggle {
+.nav_menu .stick .dropdown:not(#dropdown-search-wrapper) a.dropdown-toggle {
 	border-left-width: 0;
 	background-image: url(icons/more.svg);
 }
-.nav_menu .stick .dropdown a.dropdown-toggle .icon {
+.nav_menu .stick .dropdown:not(#dropdown-search-wrapper) a.dropdown-toggle .icon {
 	display: none;
 }
+.nav_menu .stick #dropdown-search-wrapper.dropdown a.dropdown-toggle {
+	border-left-width: 0;
+}
 
 /*=== Content of feed articles */
 .content, .content.thin {
@@ -969,9 +958,7 @@ main.prompt {
 	color: #fff;
 }
 .notification a.close {
-	padding: 0 15px;
 	border-radius: 0 3px 3px 0;
-	line-height: 3em;
 }
 .notification.good a.close:hover {
 	background: #0c7540;
@@ -979,12 +966,12 @@ main.prompt {
 .notification.bad a.close:hover {
 	background: #73341f;
 }
-.notification#actualizeProgress {
-	line-height: 2em;
-}
 .notification#actualizeProgress br {
 	display: none;
 }
+.notification#actualizeProgress .title {
+	margin: 0 2rem;
+}
 
 /*=== Navigation menu (for articles) */
 #nav_entries {
@@ -1000,10 +987,10 @@ main.prompt {
 	background: #fff;
 	transition: all 0.15s ease-in-out;
 }
-.flux:hover {
+.flux .flux_header:hover {
 	background: #f9fafb;
 }
-.flux:hover:not(.current):hover .item.title {
+.flux .flux_header:hover:not(.current):hover .item.title {
 	background: #f9fafb;
 }
 .flux.current {
@@ -1212,9 +1199,6 @@ main.prompt {
 /*=== MOBILE */
 /*===========*/
 @media (max-width: 840px) {
-	.form-group .group-name {
-		text-align: left;
-	}
 	.aside {
 		transition: all 0.2s ease-in-out;
 	}
@@ -1242,25 +1226,13 @@ main.prompt {
 #slider .toggle_aside .icon {
 		filter: grayscale(100%) brightness(2.5);
 	}
-	.header {
-		padding: 0.5rem;
-		height: 8rem;
-	}
 	.header .item.search {
-		display: block;
-	}
-	.header .item.search form {
-		display: inherit;
-	}
-	.header .item.search .stick {
-		display: flex;
-	}
-	.header .item.search input {
-		width: 90%;
-		height: 3.5rem;
+		display: none;
 	}
-	.header .item.search input:focus {
-		width: 100%;
+	.header .item.configure {
+		position: absolute;
+		top: 0;
+		right: 0;
 	}
 	#global {
 		height: calc(100% - 8rem);
@@ -1288,10 +1260,6 @@ main.prompt {
 	.nav_menu .stick .btn.read_all {
 		padding: 0.85rem 1.25rem;
 	}
-	.nav_menu .search {
-		display: none;
-		max-width: 97%;
-	}
 	.nav_menu .search .input {
 		max-width: 97%;
 		width: 90px;
diff --git a/p/themes/Mapco/mapco.rtl.css b/p/themes/Mapco/mapco.rtl.css
index 21cc44222..b962e5fe0 100644
--- a/p/themes/Mapco/mapco.rtl.css
+++ b/p/themes/Mapco/mapco.rtl.css
@@ -17,7 +17,7 @@
 	font-style: normal;
 	font-stretch: normal;
 	font-weight: 700;
-	src: url("../fonts/LatoLatin-Regular.woff") format("woff");
+	src: url("../fonts/LatoLatin-Bold.woff") format("woff");
 }
 @font-face {
 	font-family: "lato";
@@ -163,22 +163,16 @@ input:disabled, select:disabled {
 	background: #eff0f2;
 }
 
-input.extend {
-	transition: width 200ms linear;
-}
-
 .form-group {
 	padding: 5px;
 	border-radius: 3px;
 }
 .form-group::after {
-	content: "";
 	display: block;
 	clear: both;
 }
 .form-group .group-name {
 	padding: 10px 0;
-	text-align: left;
 }
 .form-group .group-controls {
 	min-height: 25px;
@@ -200,8 +194,7 @@ table {
 	border-collapse: collapse;
 }
 
-tr, th, td {
-	padding: 0.5em;
+th, td {
 	border: 1px solid #d5d8db;
 }
 
@@ -227,6 +220,10 @@ form th {
 }
 
 /*=== Dropdown */
+.dropdown .dropdown-target:target + .btn {
+	background-color: #d5d8db;
+}
+
 .dropdown-menu {
 	margin: 9px 0 0 0;
 	padding: 0.5rem 0 1rem 0;
@@ -241,8 +238,9 @@ form th {
 	border: none;
 	left: 18px;
 }
-.dropdown-menu .dropdown-header {
-	padding: 1rem 1rem 1rem 0.5rem;
+.dropdown-menu .dropdown-header,
+.dropdown-menu .dropdown-section .dropdown-section-title {
+	padding: 1rem 1.5rem;
 	font-weight: bold;
 	text-align: right;
 	color: #5b6871;
@@ -252,21 +250,37 @@ form th {
 .dropdown-menu .item {
 	transition: all 0.075s ease-in-out;
 }
-.dropdown-menu .item a, .dropdown-menu .item span, .dropdown-menu .item .as-link {
+.dropdown-menu .item > a,
+.dropdown-menu .item > span,
+.dropdown-menu .item > .as-link {
 	padding: 0 2rem;
 	color: #303136;
-	font-size: 1rem;
+	font-size: inherit;
 	line-height: 2.5em;
 }
-.dropdown-menu .item:not(.addItem) a:hover,
-.dropdown-menu .item:not(.addItem) button:hover {
+.dropdown-menu .item > a span.icon,
+.dropdown-menu .item > span span.icon,
+.dropdown-menu .item > .as-link span.icon {
+	padding: 0 0.25rem !important;
+}
+.dropdown-menu .item > a:not(.addItem):hover,
+.dropdown-menu .item > .as-link:not(.addItem):hover {
 	background: #36c;
 	color: #fff;
 }
-.dropdown-menu .item:not(.addItem) a:hover .icon,
-.dropdown-menu .item:not(.addItem) button:hover .icon {
+.dropdown-menu .item > a:not(.addItem):hover .icon,
+.dropdown-menu .item > .as-link:not(.addItem):hover .icon {
 	filter: brightness(3);
 }
+.dropdown-menu .item.dropdown-section {
+	margin-top: 0.75rem;
+}
+.dropdown-menu .item.dropdown-section ~ .dropdown-section {
+	border-top-color: #eff0f2;
+}
+.dropdown-menu .item.dropdown-section .item a, .dropdown-menu .item.dropdown-section .item .as-link {
+	padding-right: 2rem;
+}
 .dropdown-menu .item[aria-checked=true] a::before {
 	margin: 0 -14px 0 0;
 	font-weight: bold;
@@ -303,8 +317,6 @@ form th {
 
 /*=== Alerts */
 .alert {
-	margin: 1rem 0;
-	padding: 1rem;
 	background: #f9fafb;
 	color: #5b6871;
 	font-size: 1rem;
@@ -530,7 +542,7 @@ form th {
 .stick .btn:first-child {
 	border-radius: 0 5px 5px 0;
 }
-.stick .btn:last-child, .stick input:last-child, .stick .btn + .dropdown > .btn {
+.stick .btn:last-child, .stick input:last-child, .stick .dropdown:last-child > .btn {
 	border-radius: 5px 0 0 5px;
 }
 .stick .btn + .btn,
@@ -559,33 +571,30 @@ form th {
 
 /* Sidebar des pages de configuration */
 /*=== Navigation */
-.nav-list .nav-header,
+.nav-list {
+	font-size: 1rem;
+}
+.nav-list .item.nav-header,
 .nav-list .item {
-	height: 2.5em;
+	min-height: 2.5em;
 	line-height: 2.5em;
-	font-size: 1rem;
 }
 .nav-list .item {
 	background: #303136;
 	color: #fff;
+	min-height: 2.5em;
+	line-height: 2.5em;
+}
+.nav-list .item.nav-header {
+	min-height: 2.5em;
+	line-height: 2.5em;
 }
 .nav-list .item a {
 	padding: 0 1rem;
 	color: #ffffff;
 	transition: all 0.15s ease-in-out;
 }
-.nav-list .item .error a {
-	color: #f5633e;
-}
-.nav-list .item:hover .error a {
-	background: #36c;
-	color: #ffffff;
-}
-.nav-list .item:hover .empty a {
-	background: #f4f762;
-	color: #ffffff;
-}
-.nav-list .item:hover a {
+.nav-list .item a:hover {
 	background: #17181a;
 	text-decoration: none;
 }
@@ -593,24 +602,13 @@ form th {
 	background: #36c;
 	color: #fff;
 }
-.nav-list .item.active .error a {
-	background: #36c;
-	color: #fff;
-}
-.nav-list .item.active .empty a {
-	background: #f4f762;
-	color: #fff;
-}
 .nav-list .item.active a {
 	background: #36c;
 	color: #fff;
 	text-decoration: none;
 }
-.nav-list.empty a {
-	color: #f4f762;
-}
 .nav-list .nav-header {
-	padding: 0 10px;
+	padding: 0 1rem;
 	font-weight: bold;
 	color: #5b6871;
 	text-transform: uppercase;
@@ -680,29 +678,22 @@ form th {
 /*===============*/
 /*=== Header */
 .header {
-	padding: 0.5rem 1.35rem;
 	background: #303136;
-	display: block;
-	width: auto;
-	height: 3.5rem;
-	table-layout: none;
-}
-.header .logo {
-	margin: 11px 0 5px;
-	filter: grayscale(100%) brightness(100);
 }
 .header .item {
 	vertical-align: middle;
 }
-.header .item.title {
-	width: 280px;
-	font-weight: 400;
+.header .item.title a {
+	padding: 0.5rem 1rem;
 }
-.header .item.title a img {
-	margin-left: 0.5rem;
+.header .item.title a .logo {
+	filter: grayscale(100%) brightness(3);
+}
+.header .item.title a:hover .logo {
+	filter: grayscale(100%) brightness(2.2);
 }
 .header .item.search input {
-	width: 230px;
+	width: 350px;
 	color: #ffffff;
 	border: none;
 	border-radius: 0 2px 2px 0;
@@ -713,7 +704,6 @@ form th {
 	background-color: #17181a;
 }
 .header .item.search input:focus {
-	width: 350px;
 	color: #5b6871;
 	background-color: #fff;
 }
@@ -739,10 +729,6 @@ form th {
 	filter: brightness(3);
 }
 .header .item.configure {
-	width: 3rem;
-	position: absolute;
-	left: 1rem;
-	top: 1rem;
 	text-align: center;
 }
 .header .item.configure .btn .icon,
@@ -759,7 +745,7 @@ form th {
 
 /*=== Body */
 #global {
-	height: calc(100% - 3.5rem);
+	height: calc(100vh - (3rem + 2 * var(--frss-padding-top-bottom)));
 }
 
 /*=== Prompt (centered) */
@@ -867,13 +853,16 @@ main.prompt {
 .nav_menu .stick .btn.read_all:hover {
 	background-color: #d5d8db;
 }
-.nav_menu .stick .dropdown a.dropdown-toggle {
+.nav_menu .stick .dropdown:not(#dropdown-search-wrapper) a.dropdown-toggle {
 	border-right-width: 0;
 	background-image: url(icons/more.svg);
 }
-.nav_menu .stick .dropdown a.dropdown-toggle .icon {
+.nav_menu .stick .dropdown:not(#dropdown-search-wrapper) a.dropdown-toggle .icon {
 	display: none;
 }
+.nav_menu .stick #dropdown-search-wrapper.dropdown a.dropdown-toggle {
+	border-right-width: 0;
+}
 
 /*=== Content of feed articles */
 .content, .content.thin {
@@ -969,9 +958,7 @@ main.prompt {
 	color: #fff;
 }
 .notification a.close {
-	padding: 0 15px;
 	border-radius: 3px 0 0 3px;
-	line-height: 3em;
 }
 .notification.good a.close:hover {
 	background: #0c7540;
@@ -979,12 +966,12 @@ main.prompt {
 .notification.bad a.close:hover {
 	background: #73341f;
 }
-.notification#actualizeProgress {
-	line-height: 2em;
-}
 .notification#actualizeProgress br {
 	display: none;
 }
+.notification#actualizeProgress .title {
+	margin: 0 2rem;
+}
 
 /*=== Navigation menu (for articles) */
 #nav_entries {
@@ -1000,10 +987,10 @@ main.prompt {
 	background: #fff;
 	transition: all 0.15s ease-in-out;
 }
-.flux:hover {
+.flux .flux_header:hover {
 	background: #f9fafb;
 }
-.flux:hover:not(.current):hover .item.title {
+.flux .flux_header:hover:not(.current):hover .item.title {
 	background: #f9fafb;
 }
 .flux.current {
@@ -1212,9 +1199,6 @@ main.prompt {
 /*=== MOBILE */
 /*===========*/
 @media (max-width: 840px) {
-	.form-group .group-name {
-		text-align: right;
-	}
 	.aside {
 		transition: all 0.2s ease-in-out;
 	}
@@ -1242,25 +1226,13 @@ main.prompt {
 #slider .toggle_aside .icon {
 		filter: grayscale(100%) brightness(2.5);
 	}
-	.header {
-		padding: 0.5rem;
-		height: 8rem;
-	}
 	.header .item.search {
-		display: block;
-	}
-	.header .item.search form {
-		display: inherit;
-	}
-	.header .item.search .stick {
-		display: flex;
-	}
-	.header .item.search input {
-		width: 90%;
-		height: 3.5rem;
+		display: none;
 	}
-	.header .item.search input:focus {
-		width: 100%;
+	.header .item.configure {
+		position: absolute;
+		top: 0;
+		left: 0;
 	}
 	#global {
 		height: calc(100% - 8rem);
@@ -1288,10 +1260,6 @@ main.prompt {
 	.nav_menu .stick .btn.read_all {
 		padding: 0.85rem 1.25rem;
 	}
-	.nav_menu .search {
-		display: none;
-		max-width: 97%;
-	}
 	.nav_menu .search .input {
 		max-width: 97%;
 		width: 90px;
diff --git a/p/themes/Nord/nord.css b/p/themes/Nord/nord.css
index 9de1f0189..403a27dd0 100644
--- a/p/themes/Nord/nord.css
+++ b/p/themes/Nord/nord.css
@@ -16,6 +16,8 @@
 	--alert: #a3be8c;
 	--alert-bg: #8fbcbb;
 	--code-bg: #2e3440;
+
+	--frss-background-color-transparent: #2e34407f;
 }
 
 
@@ -95,10 +97,6 @@ button.as-link[disabled] {
 }
 
 /*=== Tables */
-tr, th, td {
-	padding: 0.5em;
-}
-
 form td,
 form th {
 	font-weight: normal;
@@ -138,7 +136,6 @@ table td span {
 
 .form-group .group-name {
 	padding: 10px 0;
-	text-align: right;
 }
 
 .form-group .group-controls {
@@ -177,7 +174,7 @@ a.btn {
 	line-height: 25px;
 }
 
-.btn-important, .read_all, #actualize {
+.btn-important, #nav_menu_read_all .read_all, #actualize {
 	font-weight: bold !important;
 	background-color: var(--accent) !important;
 	color: var(--bg) !important;
@@ -191,17 +188,29 @@ a.btn {
 	opacity: .8;
 	cursor: pointer;
 }
-/*=== Navigation */
-.nav-list .nav-header,
-.nav-list .item {
-	height: 2.5em;
-	font-size: 0.9rem;
-	line-height: 2.5em;
+
+.stick input {
+	margin: 0 5px 0 0;
 }
 
+.stick .btn {
+	margin-top: 0;
+	margin-bottom: 0;
+}
+
+.stick {
+	margin: 0 5px;
+}
+
+.header .stick,
+.header .btn {
+	margin: 0
+}
+
+/*=== Navigation */
 .dropdown-menu {
 	margin: 5px 0 0;
-	padding: 5px 0;
+	padding: 0.5rem 0 0.25rem 0;
 	background: var(--accent-bg);
 	font-size: 0.8rem;
 	border: 1px solid var(--border);
@@ -209,21 +218,39 @@ a.btn {
 	text-align: left;
 }
 
-.dropdown-header {
+.dropdown-header,
+.dropdown-section .dropdown-section-title {
 	padding: 0 5px 5px;
 	font-weight: bold;
 	text-align: left;
 }
 
-.dropdown-menu > .item > a,
-.dropdown-menu > .item > span,
-.dropdown-menu > .item > .as-link {
+.dropdown-menu .item > a,
+.dropdown-menu .item > span,
+.dropdown-menu .item > .as-link {
 	padding: 0 22px;
 	color: var(--text);
 	line-height: 2.5em;
+	font-size: inherit;
 	min-width: 200px;
 }
 
+.dropdown-menu .dropdown-section .item > a,
+.dropdown-menu .dropdown-section .item > span,
+.dropdown-menu .dropdown-section .item > .as-link {
+	padding-left: 2rem;
+}
+
+.dropdown-menu .dropdown-section .item:last-child {
+	margin-bottom: 0.5rem;
+}
+
+.dropdown-menu .item > a:hover,
+.dropdown-menu .item > button:hover:not([disabled]),
+.dropdown-menu .item > label:hover:not(.noHover) {
+	/* no hover color */
+}
+
 .dropdown-menu > .item[aria-checked="true"] > a::before {
 	font-weight: bold;
 	margin: 0 0 0 -14px;
@@ -279,14 +306,13 @@ a.btn {
 }
 
 .item ~ .dropdown-header,
+.dropdown-section ~ .dropdown-section,
 .item.separator {
 	border-top-color: var(--border);
 }
 
 /*=== Alerts */
 .alert {
-	margin: 15px auto;
-	padding: 10px 15px;
 	font-size: 0.9em;
 	border-radius: 6px;
 }
@@ -355,7 +381,6 @@ img.favicon {
 .box .box-content .item {
 	padding: 0 10px;
 	font-size: 0.9rem;
-	line-height: 2.5em;
 }
 
 /*=== Draggable */
@@ -383,10 +408,8 @@ img.favicon {
 }
 
 .tree-folder-items > .item {
-	padding: 0 10px;
 	color: var(--text);
 	font-size: 0.8rem;
-	line-height: 2.5rem;
 }
 
 .tree-folder-items > .item > a {
@@ -412,16 +435,10 @@ img.favicon {
 /*===============*/
 /*=== Header */
 .header > .item {
-	padding: 10px;
 	vertical-align: middle;
 	text-align: center;
 }
 
-
-.header > .item.title {
-	width: 230px;
-}
-
 .header > .item.title h1 {
 	margin: 0.5em 0;
 }
@@ -431,10 +448,6 @@ img.favicon {
 }
 
 .header > .item.search input {
-	width: 230px;
-}
-
-.header .item.search input:focus {
 	width: 350px;
 }
 
@@ -442,6 +455,10 @@ img.favicon {
 	filter: grayscale(100%) brightness(2.5);
 }
 
+.header > .item.title a:hover .logo {
+	filter: grayscale(85%) brightness(2.5);
+}
+
 /*=== Body */
 .aside {
 	background-color: var(--accent-bg);
@@ -495,10 +512,6 @@ img.favicon {
 
 }
 
-.category .title:not([data-unread="0"])::after {
-	content: attr(data-unread);
-}
-
 li.item.active {
 	background-color: var(--bg);
 	font-weight: bold;
@@ -664,16 +677,6 @@ li.item.active {
 	vertical-align: middle;
 }
 
-
-.notification a.close {
-	padding: 0 15px;
-	line-height: 3em;
-}
-
-.notification#actualizeProgress {
-	line-height: 2em;
-}
-
 .notification.closed {
 	opacity: 0;
 	visibility: hidden;
@@ -735,7 +738,6 @@ li.item.active {
 /*===========*/
 .category .title.error::before {
 	color: var(--accent-light);
-	content: "⚠ ";
 }
 
 
@@ -744,105 +746,6 @@ li.item.active {
 	text-align: center;
 }
 
-/*=== MOBILE */
-/*===========*/
-
-@media (max-width: 840px) {
-	.aside:target + .close-aside {
-		background: rgba(0, 0, 0, 0.2);
-		display: block;
-		font-size: 0;
-		position: fixed;
-		top: 0;
-		bottom: 0;
-		left: 0;
-		right: 0;
-		cursor: pointer;
-		z-index: 99;
-	}
-
-	.nav_mobile {
-		display: block;
-	}
-
-	.aside {
-		position: fixed;
-		top: 0; bottom: 0;
-		left: 0;
-		width: 0;
-		overflow: hidden;
-		z-index: 100;
-	}
-
-	.aside:target,
-	.reader .aside:target {
-		width: 90%;
-		height: 100vh;
-	}
-
-	.aside_feed .configure-feeds {
-		margin-top: 10px;
-	}
-
-	.flux_header .item.website {
-		width: 40px;
-	}
-
-	.flux:not(.current):hover .item.title {
-		position: relative;
-		width: auto;
-		white-space: nowrap;
-	}
-
-	.notification {
-		top: 0;
-		left: 0;
-		right: 0;
-	}
-
-	#nav_entries {
-		width: 100%;
-	}
-
-	#panel {
-		top: 25px; bottom: 30px;
-		left: 0; right: 0;
-	}
-
-	#panel .close {
-		top: 0; right: 0;
-		left: auto; bottom: auto;
-		display: inline-block;
-		width: 30px;
-		height: 30px;
-	}
-
-	#slider.active {
-		left: 0;
-		top: 50px;
-		background-color: var(--bg);
-	}
-
-	#close-slider img {
-		display: initial;
-	}
-
-	#close-slider.active {
-		background: var(--bg);
-		display: block;
-		width: 100%;
-		height: 50px;
-		z-index: 10;
-		text-align: center;
-		line-height: 50px;
-		border-bottom: 1px solid #ddd;
-	}
-
-	.stat.half {
-		grid-column: 1 / span 2;
-	}
-}
-
 /*=== PRINTER */
 /*============*/
 
@@ -874,11 +777,6 @@ li.item.active {
 	.flux_content .content a {
 		color: #000;
 	}
-
-	.flux_content .content a::after {
-		content: " [" attr(href) "] ";
-		font-style: italic;
-	}
 }
 
 /*=== PREVIEW */
@@ -914,15 +812,6 @@ li.item.active {
 	margin: -1px;
 }
 
-.feed .item-title:not([data-unread="0"])::before {
-	content: "(" attr(data-unread) ") ";
-	display: none
-}
-
-.feed .item-title:not([data-unread="0"])::after {
-	content: " (" attr(data-unread) ")";
-}
-
 
 /*BEGINS BASE.CSS*/
 
@@ -940,17 +829,10 @@ textarea {
 	height: 100px;
 }
 
-
 option {
 	padding: 0 .5em;
 }
 
-
-input.extend {
-	transition: width 200ms linear;
-}
-
-
 /*=== COMPONENTS */
 /*===============*/
 /*=== Forms */
@@ -959,8 +841,18 @@ input.extend {
 }
 
 /*=== Navigation */
+.nav-list {
+	font-size: 0.9rem;
+}
+
+.nav-list .item,
+.nav-list .item.nav-header {
+	min-height: 2.5em;
+	line-height: 2.5;
+}
+
 .nav-list .item > a {
-	padding: 0 10px;
+	padding: 0 1rem;
 }
 
 .nav-list a:hover {
@@ -968,7 +860,7 @@ input.extend {
 }
 
 .nav-list .nav-header {
-	padding: 0 10px;
+	padding: 0 1rem;
 	font-weight: bold;
 }
 
@@ -979,7 +871,6 @@ input.extend {
 
 /*=== Dropdown */
 .dropdown-menu::after {
-	content: "";
 	position: absolute;
 	top: -6px;
 	right: 13px;
@@ -1088,7 +979,30 @@ input.extend {
 /*===========*/
 
 @media (max-width: 840px) {
+	.aside:target + .close-aside {
+		background: rgba(0, 0, 0, 0.2);
+		display: block;
+		font-size: 0;
+		position: fixed;
+		top: 0;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		cursor: pointer;
+		z-index: 99;
+	}
+
+	.nav_mobile {
+		display: block;
+	}
+
 	.aside {
+		position: fixed;
+		top: 0; bottom: 0;
+		left: 0;
+		width: 0;
+		overflow: hidden;
+		z-index: 100;
 		transition: width 200ms linear;
 	}
 
@@ -1096,6 +1010,78 @@ input.extend {
 		padding: 0;
 	}
 
+	.aside:target,
+	.reader .aside:target {
+		width: 90%;
+		height: 100vh;
+	}
+
+	.aside_feed .configure-feeds {
+		margin-top: 10px;
+	}
+
+	.flux_header .item.website {
+		width: 40px;
+	}
+
+	.flux:not(.current):hover .item.title {
+		position: relative;
+		width: auto;
+		white-space: nowrap;
+	}
+
+	.flux .website .favicon {
+		position: relative;
+	}
+
+	.notification {
+		top: 0;
+		left: 0;
+		right: 0;
+	}
+
+	#nav_entries {
+		width: 100%;
+	}
+
+	#panel {
+		top: 25px; bottom: 30px;
+		left: 0; right: 0;
+	}
+
+	#panel .close {
+		top: 0; right: 0;
+		left: auto; bottom: auto;
+		display: inline-block;
+		width: 30px;
+		height: 30px;
+	}
+
+	#slider.active {
+		left: 0;
+		top: 50px;
+		background-color: var(--bg);
+	}
+
+	#close-slider img {
+		display: initial;
+	}
+
+	#close-slider.active {
+		background: var(--bg);
+		display: block;
+		width: 100%;
+		height: 50px;
+		z-index: 10;
+		text-align: center;
+		line-height: 50px;
+		border-bottom: 1px solid #ddd;
+	}
+
+	.stat.half {
+		grid-column: 1 / span 2;
+	}
+
 	.nav_menu .btn {
 		margin: 5px 10px;
 	}
@@ -1122,6 +1108,10 @@ input.extend {
 		width: 400px;
 	}
 
+	.post {
+		padding: 1rem;
+	}
+
 	.day .name {
 		font-size: 1.1rem;
 	}
diff --git a/p/themes/Nord/nord.rtl.css b/p/themes/Nord/nord.rtl.css
index 52bdd752d..2ae7464fa 100644
--- a/p/themes/Nord/nord.rtl.css
+++ b/p/themes/Nord/nord.rtl.css
@@ -16,6 +16,8 @@
 	--alert: #a3be8c;
 	--alert-bg: #8fbcbb;
 	--code-bg: #2e3440;
+
+	--frss-background-color-transparent: #2e34407f;
 }
 
 
@@ -95,10 +97,6 @@ button.as-link[disabled] {
 }
 
 /*=== Tables */
-tr, th, td {
-	padding: 0.5em;
-}
-
 form td,
 form th {
 	font-weight: normal;
@@ -138,7 +136,6 @@ table td span {
 
 .form-group .group-name {
 	padding: 10px 0;
-	text-align: left;
 }
 
 .form-group .group-controls {
@@ -177,7 +174,7 @@ a.btn {
 	line-height: 25px;
 }
 
-.btn-important, .read_all, #actualize {
+.btn-important, #nav_menu_read_all .read_all, #actualize {
 	font-weight: bold !important;
 	background-color: var(--accent) !important;
 	color: var(--bg) !important;
@@ -191,17 +188,29 @@ a.btn {
 	opacity: .8;
 	cursor: pointer;
 }
-/*=== Navigation */
-.nav-list .nav-header,
-.nav-list .item {
-	height: 2.5em;
-	font-size: 0.9rem;
-	line-height: 2.5em;
+
+.stick input {
+	margin: 0 0 0 5px;
 }
 
+.stick .btn {
+	margin-top: 0;
+	margin-bottom: 0;
+}
+
+.stick {
+	margin: 0 5px;
+}
+
+.header .stick,
+.header .btn {
+	margin: 0
+}
+
+/*=== Navigation */
 .dropdown-menu {
 	margin: 5px 0 0;
-	padding: 5px 0;
+	padding: 0.5rem 0 0.25rem 0;
 	background: var(--accent-bg);
 	font-size: 0.8rem;
 	border: 1px solid var(--border);
@@ -209,21 +218,39 @@ a.btn {
 	text-align: right;
 }
 
-.dropdown-header {
+.dropdown-header,
+.dropdown-section .dropdown-section-title {
 	padding: 0 5px 5px;
 	font-weight: bold;
 	text-align: right;
 }
 
-.dropdown-menu > .item > a,
-.dropdown-menu > .item > span,
-.dropdown-menu > .item > .as-link {
+.dropdown-menu .item > a,
+.dropdown-menu .item > span,
+.dropdown-menu .item > .as-link {
 	padding: 0 22px;
 	color: var(--text);
 	line-height: 2.5em;
+	font-size: inherit;
 	min-width: 200px;
 }
 
+.dropdown-menu .dropdown-section .item > a,
+.dropdown-menu .dropdown-section .item > span,
+.dropdown-menu .dropdown-section .item > .as-link {
+	padding-right: 2rem;
+}
+
+.dropdown-menu .dropdown-section .item:last-child {
+	margin-bottom: 0.5rem;
+}
+
+.dropdown-menu .item > a:hover,
+.dropdown-menu .item > button:hover:not([disabled]),
+.dropdown-menu .item > label:hover:not(.noHover) {
+	/* no hover color */
+}
+
 .dropdown-menu > .item[aria-checked="true"] > a::before {
 	font-weight: bold;
 	margin: 0 -14px 0 0;
@@ -279,14 +306,13 @@ a.btn {
 }
 
 .item ~ .dropdown-header,
+.dropdown-section ~ .dropdown-section,
 .item.separator {
 	border-top-color: var(--border);
 }
 
 /*=== Alerts */
 .alert {
-	margin: 15px auto;
-	padding: 10px 15px;
 	font-size: 0.9em;
 	border-radius: 6px;
 }
@@ -355,7 +381,6 @@ img.favicon {
 .box .box-content .item {
 	padding: 0 10px;
 	font-size: 0.9rem;
-	line-height: 2.5em;
 }
 
 /*=== Draggable */
@@ -383,10 +408,8 @@ img.favicon {
 }
 
 .tree-folder-items > .item {
-	padding: 0 10px;
 	color: var(--text);
 	font-size: 0.8rem;
-	line-height: 2.5rem;
 }
 
 .tree-folder-items > .item > a {
@@ -412,16 +435,10 @@ img.favicon {
 /*===============*/
 /*=== Header */
 .header > .item {
-	padding: 10px;
 	vertical-align: middle;
 	text-align: center;
 }
 
-
-.header > .item.title {
-	width: 230px;
-}
-
 .header > .item.title h1 {
 	margin: 0.5em 0;
 }
@@ -431,10 +448,6 @@ img.favicon {
 }
 
 .header > .item.search input {
-	width: 230px;
-}
-
-.header .item.search input:focus {
 	width: 350px;
 }
 
@@ -442,6 +455,10 @@ img.favicon {
 	filter: grayscale(100%) brightness(2.5);
 }
 
+.header > .item.title a:hover .logo {
+	filter: grayscale(85%) brightness(2.5);
+}
+
 /*=== Body */
 .aside {
 	background-color: var(--accent-bg);
@@ -495,10 +512,6 @@ img.favicon {
 
 }
 
-.category .title:not([data-unread="0"])::after {
-	content: attr(data-unread);
-}
-
 li.item.active {
 	background-color: var(--bg);
 	font-weight: bold;
@@ -664,16 +677,6 @@ li.item.active {
 	vertical-align: middle;
 }
 
-
-.notification a.close {
-	padding: 0 15px;
-	line-height: 3em;
-}
-
-.notification#actualizeProgress {
-	line-height: 2em;
-}
-
 .notification.closed {
 	opacity: 0;
 	visibility: hidden;
@@ -735,7 +738,6 @@ li.item.active {
 /*===========*/
 .category .title.error::before {
 	color: var(--accent-light);
-	content: "⚠ ";
 }
 
 
@@ -744,105 +746,6 @@ li.item.active {
 	text-align: center;
 }
 
-/*=== MOBILE */
-/*===========*/
-
-@media (max-width: 840px) {
-	.aside:target + .close-aside {
-		background: rgba(0, 0, 0, 0.2);
-		display: block;
-		font-size: 0;
-		position: fixed;
-		top: 0;
-		bottom: 0;
-		right: 0;
-		left: 0;
-		cursor: pointer;
-		z-index: 99;
-	}
-
-	.nav_mobile {
-		display: block;
-	}
-
-	.aside {
-		position: fixed;
-		top: 0; bottom: 0;
-		right: 0;
-		width: 0;
-		overflow: hidden;
-		z-index: 100;
-	}
-
-	.aside:target,
-	.reader .aside:target {
-		width: 90%;
-		height: 100vh;
-	}
-
-	.aside_feed .configure-feeds {
-		margin-top: 10px;
-	}
-
-	.flux_header .item.website {
-		width: 40px;
-	}
-
-	.flux:not(.current):hover .item.title {
-		position: relative;
-		width: auto;
-		white-space: nowrap;
-	}
-
-	.notification {
-		top: 0;
-		right: 0;
-		left: 0;
-	}
-
-	#nav_entries {
-		width: 100%;
-	}
-
-	#panel {
-		top: 25px; bottom: 30px;
-		right: 0; left: 0;
-	}
-
-	#panel .close {
-		top: 0; left: 0;
-		right: auto; bottom: auto;
-		display: inline-block;
-		width: 30px;
-		height: 30px;
-	}
-
-	#slider.active {
-		right: 0;
-		top: 50px;
-		background-color: var(--bg);
-	}
-
-	#close-slider img {
-		display: initial;
-	}
-
-	#close-slider.active {
-		background: var(--bg);
-		display: block;
-		width: 100%;
-		height: 50px;
-		z-index: 10;
-		text-align: center;
-		line-height: 50px;
-		border-bottom: 1px solid #ddd;
-	}
-
-	.stat.half {
-		grid-column: 1 / span 2;
-	}
-}
-
 /*=== PRINTER */
 /*============*/
 
@@ -874,11 +777,6 @@ li.item.active {
 	.flux_content .content a {
 		color: #000;
 	}
-
-	.flux_content .content a::after {
-		content: " [" attr(href) "] ";
-		font-style: italic;
-	}
 }
 
 /*=== PREVIEW */
@@ -914,15 +812,6 @@ li.item.active {
 	margin: -1px;
 }
 
-.feed .item-title:not([data-unread="0"])::before {
-	content: "(" attr(data-unread) ") ";
-	display: none
-}
-
-.feed .item-title:not([data-unread="0"])::after {
-	content: " (" attr(data-unread) ")";
-}
-
 
 /*BEGINS BASE.CSS*/
 
@@ -940,17 +829,10 @@ textarea {
 	height: 100px;
 }
 
-
 option {
 	padding: 0 .5em;
 }
 
-
-input.extend {
-	transition: width 200ms linear;
-}
-
-
 /*=== COMPONENTS */
 /*===============*/
 /*=== Forms */
@@ -959,8 +841,18 @@ input.extend {
 }
 
 /*=== Navigation */
+.nav-list {
+	font-size: 0.9rem;
+}
+
+.nav-list .item,
+.nav-list .item.nav-header {
+	min-height: 2.5em;
+	line-height: 2.5;
+}
+
 .nav-list .item > a {
-	padding: 0 10px;
+	padding: 0 1rem;
 }
 
 .nav-list a:hover {
@@ -968,7 +860,7 @@ input.extend {
 }
 
 .nav-list .nav-header {
-	padding: 0 10px;
+	padding: 0 1rem;
 	font-weight: bold;
 }
 
@@ -979,7 +871,6 @@ input.extend {
 
 /*=== Dropdown */
 .dropdown-menu::after {
-	content: "";
 	position: absolute;
 	top: -6px;
 	left: 13px;
@@ -1088,7 +979,30 @@ input.extend {
 /*===========*/
 
 @media (max-width: 840px) {
+	.aside:target + .close-aside {
+		background: rgba(0, 0, 0, 0.2);
+		display: block;
+		font-size: 0;
+		position: fixed;
+		top: 0;
+		bottom: 0;
+		right: 0;
+		left: 0;
+		cursor: pointer;
+		z-index: 99;
+	}
+
+	.nav_mobile {
+		display: block;
+	}
+
 	.aside {
+		position: fixed;
+		top: 0; bottom: 0;
+		right: 0;
+		width: 0;
+		overflow: hidden;
+		z-index: 100;
 		transition: width 200ms linear;
 	}
 
@@ -1096,6 +1010,78 @@ input.extend {
 		padding: 0;
 	}
 
+	.aside:target,
+	.reader .aside:target {
+		width: 90%;
+		height: 100vh;
+	}
+
+	.aside_feed .configure-feeds {
+		margin-top: 10px;
+	}
+
+	.flux_header .item.website {
+		width: 40px;
+	}
+
+	.flux:not(.current):hover .item.title {
+		position: relative;
+		width: auto;
+		white-space: nowrap;
+	}
+
+	.flux .website .favicon {
+		position: relative;
+	}
+
+	.notification {
+		top: 0;
+		right: 0;
+		left: 0;
+	}
+
+	#nav_entries {
+		width: 100%;
+	}
+
+	#panel {
+		top: 25px; bottom: 30px;
+		right: 0; left: 0;
+	}
+
+	#panel .close {
+		top: 0; left: 0;
+		right: auto; bottom: auto;
+		display: inline-block;
+		width: 30px;
+		height: 30px;
+	}
+
+	#slider.active {
+		right: 0;
+		top: 50px;
+		background-color: var(--bg);
+	}
+
+	#close-slider img {
+		display: initial;
+	}
+
+	#close-slider.active {
+		background: var(--bg);
+		display: block;
+		width: 100%;
+		height: 50px;
+		z-index: 10;
+		text-align: center;
+		line-height: 50px;
+		border-bottom: 1px solid #ddd;
+	}
+
+	.stat.half {
+		grid-column: 1 / span 2;
+	}
+
 	.nav_menu .btn {
 		margin: 5px 10px;
 	}
@@ -1122,6 +1108,10 @@ input.extend {
 		width: 400px;
 	}
 
+	.post {
+		padding: 1rem;
+	}
+
 	.day .name {
 		font-size: 1.1rem;
 	}
diff --git a/p/themes/Origine-compact/origine-compact.css b/p/themes/Origine-compact/origine-compact.css
index 880af2433..d94b09fb7 100644
--- a/p/themes/Origine-compact/origine-compact.css
+++ b/p/themes/Origine-compact/origine-compact.css
@@ -2,10 +2,8 @@
 
 /*=== GENERAL */
 /*============*/
-input, select, textarea {
-	padding: 3px 5px 2px 5px;
-	min-height: 25px;
-	line-height: 2;
+:root {
+	--frss-padding-top-bottom: 0.125rem;
 }
 
 /*=== COMPONENTS */
@@ -41,73 +39,45 @@ a.btn,
 	font-size: 0.9rem;
 }
 
-.horizontal-list .item {
-	line-height: 2.2;
-}
-
-.horizontal-list .item .item-element {
-	padding: 1px 0 0 0;
-}
-
 /*=== Dropdown */
-.item ~ .dropdown-header,
-.item.separator {
-	border-top-color: #ddd;
-}
-
 /*=== Alerts */
 /*=== Pagination */
 /*=== Boxes */
 /*=== Tree */
-.tree-folder-title {
-	padding: 0 5px;
-	line-height: 2.2;
-	font-size: 0.9rem;
-}
-
-.tree-folder-items > .item {
-	line-height: 2.4;
-}
-
 /*=== STRUCTURE */
 /*===============*/
 /*=== Header */
 .header {
-	height: 40px;
-}
-
-.header > .item {
-	padding: 0px;
+	/* search bar and config button height = 2.1rem */
+	height: calc(2.1rem + 2 * var(--frss-padding-top-bottom));
 }
 
-.header .item.configure .btn,
-.header .item.search .btn {
-	min-height: 18px;
-	padding: 4px 10px;
-	line-height: 1.4;
+.header > .item.title a {
+	padding: 0 1rem;
 }
 
 .header > .item.title .logo {
-	height: 25px;
-}
-
-.header > .item.search input {
-	padding: 1px 5px;
+	/* logo is smaller than needed */
+	height: 1.5rem;
 }
 
 /*=== Body */
 #global {
-	height: calc(100vh - 40px);
+	height: calc(100vh - (calc(2.1rem + 2 * var(--frss-padding-top-bottom))))
 }
 
 /*=== Aside main page (categories) */
 .aside.aside_feed .category .title:not([data-unread="0"])::after,
 .global .box.category .title:not([data-unread="0"])::after {
-	margin: 0.4em 0 0 0;
+	font-size: 0.8rem;
+}
+
+#stream.global .feed .item-title:not([data-unread="0"])::after {
+	margin-top: 0.125rem;
 }
 
 .aside.aside_feed .feed .item-title:not([data-unread="0"])::after {
-	margin: 0.5em 0 0 0;
+	font-size: 0.7rem;
 }
 
 /*=== Day indication */
@@ -123,10 +93,6 @@ a.btn,
 
 /*=== Index menu */
 /*=== Feed articles */
-.flux .item {
-	padding: 0;
-}
-
 .flux .item.thumbnail {
 	padding: 5px;
 	height: 50px;
@@ -169,14 +135,6 @@ a.btn,
 }
 
 /*=== Content of feed articles */
-.content {
-	padding: 10px 10px;
-}
-
-#stream.normal .content > h1.title {
-	display: none;
-}
-
 /*=== Notification and actualize notification */
 /*=== "Load more" part */
 #bigMarkAsRead {
@@ -188,10 +146,6 @@ a.btn,
 }
 
 /*=== Navigation menu (for articles) */
-#nav_entries {
-	line-height: 2.2;
-}
-
 /*=== READER VIEW */
 /*================*/
 /*=== GLOBAL VIEW */
@@ -213,7 +167,7 @@ a.btn,
 	}
 
 	.post {
-		padding-left: 15px;
-		padding-right: 15px;
+		padding-left: 1rem;
+		padding-right: 1rem;
 	}
 }
diff --git a/p/themes/Origine-compact/origine-compact.rtl.css b/p/themes/Origine-compact/origine-compact.rtl.css
index cfa978650..c98c5f6da 100644
--- a/p/themes/Origine-compact/origine-compact.rtl.css
+++ b/p/themes/Origine-compact/origine-compact.rtl.css
@@ -2,10 +2,8 @@
 
 /*=== GENERAL */
 /*============*/
-input, select, textarea {
-	padding: 3px 5px 2px 5px;
-	min-height: 25px;
-	line-height: 2;
+:root {
+	--frss-padding-top-bottom: 0.125rem;
 }
 
 /*=== COMPONENTS */
@@ -41,73 +39,45 @@ a.btn,
 	font-size: 0.9rem;
 }
 
-.horizontal-list .item {
-	line-height: 2.2;
-}
-
-.horizontal-list .item .item-element {
-	padding: 1px 0 0 0;
-}
-
 /*=== Dropdown */
-.item ~ .dropdown-header,
-.item.separator {
-	border-top-color: #ddd;
-}
-
 /*=== Alerts */
 /*=== Pagination */
 /*=== Boxes */
 /*=== Tree */
-.tree-folder-title {
-	padding: 0 5px;
-	line-height: 2.2;
-	font-size: 0.9rem;
-}
-
-.tree-folder-items > .item {
-	line-height: 2.4;
-}
-
 /*=== STRUCTURE */
 /*===============*/
 /*=== Header */
 .header {
-	height: 40px;
-}
-
-.header > .item {
-	padding: 0px;
+	/* search bar and config button height = 2.1rem */
+	height: calc(2.1rem + 2 * var(--frss-padding-top-bottom));
 }
 
-.header .item.configure .btn,
-.header .item.search .btn {
-	min-height: 18px;
-	padding: 4px 10px;
-	line-height: 1.4;
+.header > .item.title a {
+	padding: 0 1rem;
 }
 
 .header > .item.title .logo {
-	height: 25px;
-}
-
-.header > .item.search input {
-	padding: 1px 5px;
+	/* logo is smaller than needed */
+	height: 1.5rem;
 }
 
 /*=== Body */
 #global {
-	height: calc(100vh - 40px);
+	height: calc(100vh - (calc(2.1rem + 2 * var(--frss-padding-top-bottom))))
 }
 
 /*=== Aside main page (categories) */
 .aside.aside_feed .category .title:not([data-unread="0"])::after,
 .global .box.category .title:not([data-unread="0"])::after {
-	margin: 0.4em 0 0 0;
+	font-size: 0.8rem;
+}
+
+#stream.global .feed .item-title:not([data-unread="0"])::after {
+	margin-top: 0.125rem;
 }
 
 .aside.aside_feed .feed .item-title:not([data-unread="0"])::after {
-	margin: 0.5em 0 0 0;
+	font-size: 0.7rem;
 }
 
 /*=== Day indication */
@@ -123,10 +93,6 @@ a.btn,
 
 /*=== Index menu */
 /*=== Feed articles */
-.flux .item {
-	padding: 0;
-}
-
 .flux .item.thumbnail {
 	padding: 5px;
 	height: 50px;
@@ -169,14 +135,6 @@ a.btn,
 }
 
 /*=== Content of feed articles */
-.content {
-	padding: 10px 10px;
-}
-
-#stream.normal .content > h1.title {
-	display: none;
-}
-
 /*=== Notification and actualize notification */
 /*=== "Load more" part */
 #bigMarkAsRead {
@@ -188,10 +146,6 @@ a.btn,
 }
 
 /*=== Navigation menu (for articles) */
-#nav_entries {
-	line-height: 2.2;
-}
-
 /*=== READER VIEW */
 /*================*/
 /*=== GLOBAL VIEW */
@@ -213,7 +167,7 @@ a.btn,
 	}
 
 	.post {
-		padding-right: 15px;
-		padding-left: 15px;
+		padding-right: 1rem;
+		padding-left: 1rem;
 	}
 }
diff --git a/p/themes/Origine/origine.css b/p/themes/Origine/origine.css
index 4b41e1434..3a7d395a0 100644
--- a/p/themes/Origine/origine.css
+++ b/p/themes/Origine/origine.css
@@ -3,6 +3,8 @@
 /*=== GENERAL */
 /*============*/
 :root {
+	--frss-padding-top-bottom: 0.5rem;
+
 	--background-color-light-gradient: #eee;
 	--background-color-light: #fff;
 	--background-color-light-shadowed: #f6f6f6;
@@ -10,8 +12,10 @@
 	--background-color-hover: #f6f6f6;
 
 	--unread-article-background-color: #fff3ed;
+	--unread-article-background-color-hover: #faeee8;
 	--unread-article-border-color: #ff5300;
 	--favorite-article-background-color: #fff6da;
+	--favorite-article-background-color-hover: #fcf2d6;
 	--favorite-article-border-color: #ffc300;
 
 	--contrast-background-color: #0084cc;
@@ -147,17 +151,12 @@ input:disabled, select:disabled {
 	background-color: var(--background-color-light-shadowed);
 }
 
-input.extend {
-	transition: width 200ms linear;
-}
-
 /*=== Tables */
 table {
 	border-collapse: collapse;
 }
 
-tr, th, td {
-	padding: 0.5em;
+th, td {
 	border: 1px solid var(--border-color);
 }
 
@@ -187,7 +186,6 @@ form th {
 
 .form-group .group-name {
 	padding: 10px 0;
-	text-align: right;
 }
 
 .form-group .group-controls {
@@ -218,7 +216,8 @@ form th {
 }
 
 .stick .btn:first-child,
-.stick input:first-child {
+.stick input:first-child,
+.stick select:first-child {
 	border-radius: 3px 0 0 3px;
 }
 
@@ -235,6 +234,7 @@ form th {
 .stick .btn + input,
 .stick .btn + .dropdown > .btn,
 .stick input + .btn,
+.stick select + .btn,
 .stick input + input,
 .stick input + .dropdown > .btn,
 .stick .dropdown + .btn,
@@ -293,6 +293,10 @@ a:hover .icon {
 	filter: brightness(1.1);
 }
 
+#toggle-search.active > .icon {
+	filter: invert(8%) sepia(99%) saturate(7064%) hue-rotate(248deg) brightness(99%) contrast(142%);
+}
+
 .btn.active,
 .btn:active,
 .dropdown-target:target ~ .btn.dropdown-toggle {
@@ -351,21 +355,22 @@ a:hover .icon {
 }
 
 /*=== Navigation */
-.nav-list .nav-header,
-.nav-list .item {
-	height: 2.5em;
-	line-height: 2.5;
+.nav-list {
 	font-size: 0.9rem;
 }
 
-.nav-list .item:hover {
-	background-color: var(--background-color-hover);
+.nav-list .item,
+.nav-list .item.nav-header {
+	min-height: 2.5em;
+	line-height: 2.5;
 }
 
-.nav-list .item:hover a {
+.nav-list .nav-section .item:hover a {
+	background-color: var(--background-color-hover);
 	color: var(--font-color-link-hover);
 }
 
+.nav-list .nav-section .item.active:hover a,
 .nav-list .item.active {
 	background-color: var(--contrast-background-color-active);
 	color: var(--font-color-light);
@@ -376,8 +381,8 @@ a:hover .icon {
 }
 
 .nav-list .item > a,
-.nav-list .item > span {
-	padding: 0 10px;
+.nav-list .item > div {
+	padding: 0 1rem;
 }
 
 .nav-list .item > span {
@@ -389,26 +394,7 @@ a:hover .icon {
 	text-decoration: none;
 }
 
-.nav-list .item.empty a {
-	color: var(--empty-feed-color);
-}
-
-.nav-list .item.active.empty a {
-	background-color: var(--empty-feed-color);
-	color: var(--font-color-light);
-}
-
-.nav-list .item.error a {
-	color: var(--error-feed-color);
-}
-
-.nav-list .item.active.error a {
-	background-color: var(--error-feed-color);
-	color: var(--font-color-light);
-}
-
 .nav-list .nav-header {
-	padding: 0 10px;
 	background-color: var(--background-color-grey);
 	color: var(--font-color-grey);
 	border-bottom: 1px solid var(--border-color);
@@ -436,33 +422,45 @@ a:hover .icon {
 	border-color: var(--border-color);
 }
 
-.dropdown-header {
-	padding: 0 5px 5px;
+.dropdown-header,
+.dropdown-section .dropdown-section-title {
+	padding: 0.25rem 0.5rem 0.25rem 1rem;
 	color: var(--font-color-grey);
 	font-weight: bold;
 	text-align: left;
 }
 
-.dropdown-menu > .item > a,
-.dropdown-menu > .item > span,
-.dropdown-menu > .item > .as-link {
+.dropdown-menu .item > a,
+.dropdown-menu .item > span,
+.dropdown-menu .item > .as-link {
 	padding: 0 22px;
 	line-height: 2.5;
-	font-size: 0.8rem;
+	font-size: inherit;
+}
+
+.dropdown-menu .dropdown-section .item > a,
+.dropdown-menu .dropdown-section .item > span,
+.dropdown-menu .dropdown-section .item > .as-link {
+	padding-left: 2rem;
 }
 
-.dropdown-menu > .item > a:hover,
-.dropdown-menu > .item > button:hover,
-.dropdown-menu > .item > label:hover:not(.noHover) {
+.dropdown-menu .dropdown-section .item:last-child {
+	margin-bottom: 0.5rem;
+}
+
+.dropdown-menu .item > a:hover,
+.dropdown-menu .item > button:hover:not([disabled]),
+.dropdown-menu .item > label:hover:not(.noHover) {
 	background-color: var(--contrast-background-color-active);
 	color: var(--font-color-light);
 }
 
-.dropdown-menu > .item > label {
+.dropdown-menu .item > label {
 	padding: 0;
 }
 
-.dropdown-menu > .item:hover .icon {
+.dropdown-menu > .item:hover > a > .icon,
+.dropdown-menu .item.dropdown-section .item:hover .icon {
 	filter: grayscale(100%) brightness(2.5);
 }
 
@@ -479,14 +477,13 @@ a:hover .icon {
 }
 
 .item ~ .dropdown-header,
+.dropdown-section ~ .dropdown-section,
 .item.separator {
 	border-top-color: var(--border-color);
 }
 
 /*=== Alerts */
 .alert {
-	margin: 15px auto;
-	padding: 10px 15px;
 	background-color: var(--background-color-grey);
 	color: var(--font-color-grey);
 	font-size: 0.9em;
@@ -567,7 +564,7 @@ a:hover .icon {
 }
 
 .box .box-content .item {
-	padding: 0.5rem 0 0.25rem 0;
+	padding-bottom: 0.25rem;
 	font-size: 0.9rem;
 	line-height: 1.5;
 }
@@ -579,9 +576,9 @@ a:hover .icon {
 
 .tree-folder-title {
 	position: relative;
-	padding: 0 10px;
+	padding-left: 0.75rem;
+	padding-right: 0.75rem;
 	background-color: var(--background-color-light);
-	line-height: 2.5;
 	font-size: 1rem;
 }
 
@@ -615,7 +612,7 @@ a:hover .icon {
 
 .tree-folder-items > .item {
 	padding: 0 10px;
-	line-height: 3.125;
+	line-height: 1.7;
 	font-size: 0.8rem;
 }
 
@@ -643,35 +640,28 @@ a:hover .icon {
 /*===============*/
 /*=== Header */
 .header {
-	height: 4rem;
 	background-color: var(--background-color-grey);
 }
 
 .header > .item {
-	padding: 10px;
 	border-bottom: 1px solid var(--border-color);
 	vertical-align: middle;
 	text-align: center;
 }
 
 .header > .item.title {
-	padding: 10px 0;
 	width: 300px;
 }
 
-.header > .item.search input {
-	width: 230px;
+.header > .item.title a:hover .logo {
+	filter: brightness(1.4);
 }
 
-.header .item.search input:focus {
+.header > .item.search input {
 	width: 350px;
 }
 
 /*=== Body */
-#global {
-	height: calc(100vh - 4rem);
-}
-
 .aside {
 	background-color: var(--background-color-light);
 	border-right: 1px solid var(--border-color);
@@ -689,7 +679,8 @@ a:hover .icon {
 
 /*=== Aside main page (categories) */
 .aside.aside_feed .category .title:not([data-unread="0"])::after,
-.global .box.category .title:not([data-unread="0"])::after {
+.global .box.category .title:not([data-unread="0"])::after,
+.global .feed .item-title:not([data-unread="0"])::after {
 	background-color: var(--background-color-light-shadowed);
 	color: var(--font-color-grey);
 }
@@ -781,7 +772,6 @@ a:hover .icon {
 }
 
 #new-article > a {
-	padding: 1em;
 	color: var(--font-color-light);
 	font-weight: bold;
 }
@@ -820,10 +810,8 @@ a:hover .icon {
 
 /*=== Index menu */
 .nav_menu {
-	padding: 0.5rem 0;
 	background-color: var(--background-color-light-shadowed);
 	border-bottom: 1px solid var(--border-color);
-	text-align: center;
 }
 
 /*=== Feed articles */
@@ -832,39 +820,47 @@ a:hover .icon {
 	border-left: 2px solid transparent;
 }
 
-.flux:hover:not(.active) {
-	background-color: var(--background-color-hover) !important;
+.flux.current {
+	background-color: var(--background-color-light);
+	border-left: 2px solid var(--contrast-border-color-active);
 }
 
-.flux:not(.current):hover .item.title {
-	background: inherit;
+.flux .flux_header:hover,
+.flux .flux_header:hover .item {
+	background-color: var(--background-color-hover);
 }
 
-.flux.current {
-	background-color: var(--background-color-light);
-	border-left: 2px solid var(--contrast-border-color-active);
+.flux .flux_header:not(.current):hover .flux_header,
+.flux .flux_header:not(.current):hover .flux_header .item {
+	background-color: var(--background-color-hover);
 }
 
 .flux.not_read {
 	border-left: 2px solid var(--unread-article-border-color);
 }
 
-.flux.not_read:not(.current) {
+.flux.not_read .flux_header .item {
 	background-color: var(--unread-article-background-color);
 }
 
-.flux.not_read:not(.current):hover .item.title {
-	background: inherit;
+.flux.not_read:not(.current):hover .flux_header,
+.flux.not_read:not(.current):hover .flux_header .item {
+	background-color: var(--unread-article-background-color-hover);
 }
 
 .flux.favorite {
 	border-left: 2px solid var(--favorite-article-border-color);
 }
 
-.flux.favorite:not(.current) {
+.flux.favorite:not(.current) .flux_header .item {
 	background-color: var(--favorite-article-background-color);
 }
 
+.flux.favorite:not(.current):hover .flux_header,
+.flux.favorite:not(.current):hover .flux_header .item {
+	background-color: var(--favorite-article-background-color-hover);
+}
+
 .flux_header {
 	font-size: 0.9rem;
 	border-top: 1px solid var(--border-color);
@@ -882,10 +878,6 @@ a:hover .icon {
 }
 
 /*=== Content of feed articles */
-.content {
-	padding: 20px 10px;
-}
-
 .content h1.title > a {
 	color: var(--font-color);
 }
@@ -963,15 +955,6 @@ a:hover .icon {
 	border: 1px solid var(--notification-bad-border-color);
 }
 
-.notification a.close {
-	padding: 0 15px;
-	line-height: 3;
-}
-
-.notification a.close:hover .icon {
-	filter: brightness(0.5);
-}
-
 .notification.good a.close:hover {
 	background-color: var(--notification-close-background-color-hover);
 }
@@ -981,7 +964,7 @@ a:hover .icon {
 }
 
 .notification#actualizeProgress {
-	line-height: 2;
+	line-height: 2em;
 }
 
 /*=== "Load more" part */
@@ -1104,22 +1087,22 @@ a:hover .icon {
 /*===========*/
 
 @media (max-width: 840px) {
+	.header > .item {
+		padding: 0.5rem 1rem;
+	}
+
 	.header > .item.title {
-		padding: 10px 20px;
 		width: 75%;
 		text-align: left;
 	}
 
 	.header > .item.configure {
-		padding: 10px 20px;
 		width: 25%;
 		text-align: right;
 	}
 
 	.form-group .group-name {
 		padding-bottom: 0;
-
-		text-align: left;
 	}
 
 	.aside {
@@ -1143,8 +1126,8 @@ a:hover .icon {
 	}
 
 	.post {
-		padding-left: 15px;
-		padding-right: 15px;
+		padding-left: 1rem;
+		padding-right: 1rem;
 	}
 
 	.nav_menu .btn {
@@ -1161,28 +1144,16 @@ a:hover .icon {
 		margin: 5px 0;
 	}
 
-	.nav_menu .search {
-		display: inline-block;
-		max-width: 97%;
-	}
-
-	.nav_menu .search input {
-		padding: 3px 5px;
-		max-width: 97%;
-		width: 90px;
-		line-height: 2;
-	}
-
-	.nav_menu .search input:focus {
-		width: 400px;
-	}
-
 	.dropdown-target:target ~ .dropdown-toggle::after {
 		background-color: var(--background-color-light);
 		border-top: 1px solid var(--border-color);
 		border-left: 1px solid var(--border-color);
 	}
 
+	.dropdown-menu .dropdown-section:last-child {
+		margin-bottom: 3rem;
+	}
+
 	.form-group.form-actions {
 		margin-left: -15px;
 		margin-right: -15px;
@@ -1209,3 +1180,96 @@ a:hover .icon {
 		display: none;
 	}
 }
+
+@media screen and (prefers-color-scheme: dark) {
+	:root .darkMode_auto {
+		--frss-background-color: #000;
+		--frss-background-color-middle: #222;
+		--frss-border-color: #444;
+		--frss-font-color-grey-dark: #999;
+		--frss-font-color-dark: #ddd;
+		--frss-modal-background-color-transparent: #000000a3;
+		--frss-background-color-transparent: #000000a3;
+		--frss-scrollbar-handle: #fff1;
+		--frss-scrollbar-handle-hover: #fff4;
+
+		--background-color-light-gradient: #111;
+		--background-color-light: #111;
+		--background-color-light-shadowed: #191919;
+		--background-color-grey: #1f1f1f;
+		--background-color-hover: #09090977;
+
+		--unread-article-background-color: #201f1e;
+		--unread-article-background-color-hover: #1a1918;
+		--unread-article-border-color: #ff5300;
+		--favorite-article-background-color: #24221d;
+		--favorite-article-background-color-hover: #1d1b17;
+		--favorite-article-border-color: #ffc300;
+
+		--contrast-background-color: #0084cc;
+		--contrast-background-color-gradient: #0045cc;
+		--contrast-background-color-hover: #06c;
+		--contrast-background-color-active: #038;
+		--contrast-border-color: #0062b7;
+
+		--contrast-background-font-color: #eee;
+
+		--attention-background-color-gradient1: #ea4a46;
+		--attention-background-color-gradient2: #911811;
+
+		--attention-background-color-gradient1-hover: #d14641;
+		--attention-background-color-gradient2-hover: #bd362f;
+		--attention-background-color-active: #bd362f;
+		--attention-border-color: #c44742;
+
+		--empty-feed-color: #e67e22;
+		--error-feed-color: #bd362f;
+
+		--alert-warn-background-color: #ffffe022;
+		--alert-warn-font-color: #ccc;
+		--alert-warn-border-color: #eeb;
+		--alert-success-background-color: #e8ffe814;
+		--alert-success-font-color: #96c196;
+		--alert-success-border-color: #cec;
+		--alert-error-background-color: #fdda;
+		--alert-error-font-color: #693a3a;
+		--alert-error-boder-color: #ecc;
+
+		--notification-good-background-color: #ffe;
+		--notification-good-border-color: #eeb;
+		--notification-good-font-color: #916a37;
+		--notification-bad-background-color: #fdd;
+		--notification-bad-font-color: #643838;
+		--notification-bad-border-color: #ecc;
+		--notification-close-background-color-hover: #aaa2;
+
+		--font-color: #ccc;
+		--font-color-grey: #aaa;
+		--font-color-light-shadowed: #555;
+		--font-color-light: #ccc;
+
+		--text-shadow-color: #1c1c1c;
+		--text-shadow-color-dark: #666;
+		--box-shadow-color: #4446;
+		--box-shadow-color-inset: #1f1f1f;
+
+		--font-color-link: #467eb3;
+		--font-color-link-hover: #0062be;
+
+		--border-color: #222;
+		--border-color-shadow-side: #333;
+		--contrast-border-color-active: #0062be;
+
+		--form-element-font-color-focus: #879db1;
+		--form-element-border-color-focus: #0062be;
+		--form-element-focus-box-shadow-color-inset: #110;
+		--form-element-border-color-invalid: #f00;
+		--form-element-invalid-box-shadow-color-inset: #fdd;
+	}
+
+	.btn.active,
+	.btn:active,
+	.dropdown-target:target ~ .btn.dropdown-toggle {
+		background: var(--border-color);
+	}
+}
diff --git a/p/themes/Origine/origine.rtl.css b/p/themes/Origine/origine.rtl.css
index 8f0c9095a..ae5f1ca39 100644
--- a/p/themes/Origine/origine.rtl.css
+++ b/p/themes/Origine/origine.rtl.css
@@ -3,6 +3,8 @@
 /*=== GENERAL */
 /*============*/
 :root {
+	--frss-padding-top-bottom: 0.5rem;
+
 	--background-color-light-gradient: #eee;
 	--background-color-light: #fff;
 	--background-color-light-shadowed: #f6f6f6;
@@ -10,8 +12,10 @@
 	--background-color-hover: #f6f6f6;
 
 	--unread-article-background-color: #fff3ed;
+	--unread-article-background-color-hover: #faeee8;
 	--unread-article-border-color: #ff5300;
 	--favorite-article-background-color: #fff6da;
+	--favorite-article-background-color-hover: #fcf2d6;
 	--favorite-article-border-color: #ffc300;
 
 	--contrast-background-color: #0084cc;
@@ -147,17 +151,12 @@ input:disabled, select:disabled {
 	background-color: var(--background-color-light-shadowed);
 }
 
-input.extend {
-	transition: width 200ms linear;
-}
-
 /*=== Tables */
 table {
 	border-collapse: collapse;
 }
 
-tr, th, td {
-	padding: 0.5em;
+th, td {
 	border: 1px solid var(--border-color);
 }
 
@@ -187,7 +186,6 @@ form th {
 
 .form-group .group-name {
 	padding: 10px 0;
-	text-align: left;
 }
 
 .form-group .group-controls {
@@ -218,7 +216,8 @@ form th {
 }
 
 .stick .btn:first-child,
-.stick input:first-child {
+.stick input:first-child,
+.stick select:first-child {
 	border-radius: 0 3px 3px 0;
 }
 
@@ -235,6 +234,7 @@ form th {
 .stick .btn + input,
 .stick .btn + .dropdown > .btn,
 .stick input + .btn,
+.stick select + .btn,
 .stick input + input,
 .stick input + .dropdown > .btn,
 .stick .dropdown + .btn,
@@ -293,6 +293,10 @@ a:hover .icon {
 	filter: brightness(1.1);
 }
 
+#toggle-search.active > .icon {
+	filter: invert(8%) sepia(99%) saturate(7064%) hue-rotate(248deg) brightness(99%) contrast(142%);
+}
+
 .btn.active,
 .btn:active,
 .dropdown-target:target ~ .btn.dropdown-toggle {
@@ -351,21 +355,22 @@ a:hover .icon {
 }
 
 /*=== Navigation */
-.nav-list .nav-header,
-.nav-list .item {
-	height: 2.5em;
-	line-height: 2.5;
+.nav-list {
 	font-size: 0.9rem;
 }
 
-.nav-list .item:hover {
-	background-color: var(--background-color-hover);
+.nav-list .item,
+.nav-list .item.nav-header {
+	min-height: 2.5em;
+	line-height: 2.5;
 }
 
-.nav-list .item:hover a {
+.nav-list .nav-section .item:hover a {
+	background-color: var(--background-color-hover);
 	color: var(--font-color-link-hover);
 }
 
+.nav-list .nav-section .item.active:hover a,
 .nav-list .item.active {
 	background-color: var(--contrast-background-color-active);
 	color: var(--font-color-light);
@@ -376,8 +381,8 @@ a:hover .icon {
 }
 
 .nav-list .item > a,
-.nav-list .item > span {
-	padding: 0 10px;
+.nav-list .item > div {
+	padding: 0 1rem;
 }
 
 .nav-list .item > span {
@@ -389,26 +394,7 @@ a:hover .icon {
 	text-decoration: none;
 }
 
-.nav-list .item.empty a {
-	color: var(--empty-feed-color);
-}
-
-.nav-list .item.active.empty a {
-	background-color: var(--empty-feed-color);
-	color: var(--font-color-light);
-}
-
-.nav-list .item.error a {
-	color: var(--error-feed-color);
-}
-
-.nav-list .item.active.error a {
-	background-color: var(--error-feed-color);
-	color: var(--font-color-light);
-}
-
 .nav-list .nav-header {
-	padding: 0 10px;
 	background-color: var(--background-color-grey);
 	color: var(--font-color-grey);
 	border-bottom: 1px solid var(--border-color);
@@ -436,33 +422,45 @@ a:hover .icon {
 	border-color: var(--border-color);
 }
 
-.dropdown-header {
-	padding: 0 5px 5px;
+.dropdown-header,
+.dropdown-section .dropdown-section-title {
+	padding: 0.25rem 1rem 0.25rem 0.5rem;
 	color: var(--font-color-grey);
 	font-weight: bold;
 	text-align: right;
 }
 
-.dropdown-menu > .item > a,
-.dropdown-menu > .item > span,
-.dropdown-menu > .item > .as-link {
+.dropdown-menu .item > a,
+.dropdown-menu .item > span,
+.dropdown-menu .item > .as-link {
 	padding: 0 22px;
 	line-height: 2.5;
-	font-size: 0.8rem;
+	font-size: inherit;
+}
+
+.dropdown-menu .dropdown-section .item > a,
+.dropdown-menu .dropdown-section .item > span,
+.dropdown-menu .dropdown-section .item > .as-link {
+	padding-right: 2rem;
 }
 
-.dropdown-menu > .item > a:hover,
-.dropdown-menu > .item > button:hover,
-.dropdown-menu > .item > label:hover:not(.noHover) {
+.dropdown-menu .dropdown-section .item:last-child {
+	margin-bottom: 0.5rem;
+}
+
+.dropdown-menu .item > a:hover,
+.dropdown-menu .item > button:hover:not([disabled]),
+.dropdown-menu .item > label:hover:not(.noHover) {
 	background-color: var(--contrast-background-color-active);
 	color: var(--font-color-light);
 }
 
-.dropdown-menu > .item > label {
+.dropdown-menu .item > label {
 	padding: 0;
 }
 
-.dropdown-menu > .item:hover .icon {
+.dropdown-menu > .item:hover > a > .icon,
+.dropdown-menu .item.dropdown-section .item:hover .icon {
 	filter: grayscale(100%) brightness(2.5);
 }
 
@@ -479,14 +477,13 @@ a:hover .icon {
 }
 
 .item ~ .dropdown-header,
+.dropdown-section ~ .dropdown-section,
 .item.separator {
 	border-top-color: var(--border-color);
 }
 
 /*=== Alerts */
 .alert {
-	margin: 15px auto;
-	padding: 10px 15px;
 	background-color: var(--background-color-grey);
 	color: var(--font-color-grey);
 	font-size: 0.9em;
@@ -567,7 +564,7 @@ a:hover .icon {
 }
 
 .box .box-content .item {
-	padding: 0.5rem 0 0.25rem 0;
+	padding-bottom: 0.25rem;
 	font-size: 0.9rem;
 	line-height: 1.5;
 }
@@ -579,9 +576,9 @@ a:hover .icon {
 
 .tree-folder-title {
 	position: relative;
-	padding: 0 10px;
+	padding-right: 0.75rem;
+	padding-left: 0.75rem;
 	background-color: var(--background-color-light);
-	line-height: 2.5;
 	font-size: 1rem;
 }
 
@@ -615,7 +612,7 @@ a:hover .icon {
 
 .tree-folder-items > .item {
 	padding: 0 10px;
-	line-height: 3.125;
+	line-height: 1.7;
 	font-size: 0.8rem;
 }
 
@@ -643,35 +640,28 @@ a:hover .icon {
 /*===============*/
 /*=== Header */
 .header {
-	height: 4rem;
 	background-color: var(--background-color-grey);
 }
 
 .header > .item {
-	padding: 10px;
 	border-bottom: 1px solid var(--border-color);
 	vertical-align: middle;
 	text-align: center;
 }
 
 .header > .item.title {
-	padding: 10px 0;
 	width: 300px;
 }
 
-.header > .item.search input {
-	width: 230px;
+.header > .item.title a:hover .logo {
+	filter: brightness(1.4);
 }
 
-.header .item.search input:focus {
+.header > .item.search input {
 	width: 350px;
 }
 
 /*=== Body */
-#global {
-	height: calc(100vh - 4rem);
-}
-
 .aside {
 	background-color: var(--background-color-light);
 	border-left: 1px solid var(--border-color);
@@ -689,7 +679,8 @@ a:hover .icon {
 
 /*=== Aside main page (categories) */
 .aside.aside_feed .category .title:not([data-unread="0"])::after,
-.global .box.category .title:not([data-unread="0"])::after {
+.global .box.category .title:not([data-unread="0"])::after,
+.global .feed .item-title:not([data-unread="0"])::after {
 	background-color: var(--background-color-light-shadowed);
 	color: var(--font-color-grey);
 }
@@ -781,7 +772,6 @@ a:hover .icon {
 }
 
 #new-article > a {
-	padding: 1em;
 	color: var(--font-color-light);
 	font-weight: bold;
 }
@@ -820,10 +810,8 @@ a:hover .icon {
 
 /*=== Index menu */
 .nav_menu {
-	padding: 0.5rem 0;
 	background-color: var(--background-color-light-shadowed);
 	border-bottom: 1px solid var(--border-color);
-	text-align: center;
 }
 
 /*=== Feed articles */
@@ -832,39 +820,47 @@ a:hover .icon {
 	border-right: 2px solid transparent;
 }
 
-.flux:hover:not(.active) {
-	background-color: var(--background-color-hover) !important;
+.flux.current {
+	background-color: var(--background-color-light);
+	border-right: 2px solid var(--contrast-border-color-active);
 }
 
-.flux:not(.current):hover .item.title {
-	background: inherit;
+.flux .flux_header:hover,
+.flux .flux_header:hover .item {
+	background-color: var(--background-color-hover);
 }
 
-.flux.current {
-	background-color: var(--background-color-light);
-	border-right: 2px solid var(--contrast-border-color-active);
+.flux .flux_header:not(.current):hover .flux_header,
+.flux .flux_header:not(.current):hover .flux_header .item {
+	background-color: var(--background-color-hover);
 }
 
 .flux.not_read {
 	border-right: 2px solid var(--unread-article-border-color);
 }
 
-.flux.not_read:not(.current) {
+.flux.not_read .flux_header .item {
 	background-color: var(--unread-article-background-color);
 }
 
-.flux.not_read:not(.current):hover .item.title {
-	background: inherit;
+.flux.not_read:not(.current):hover .flux_header,
+.flux.not_read:not(.current):hover .flux_header .item {
+	background-color: var(--unread-article-background-color-hover);
 }
 
 .flux.favorite {
 	border-right: 2px solid var(--favorite-article-border-color);
 }
 
-.flux.favorite:not(.current) {
+.flux.favorite:not(.current) .flux_header .item {
 	background-color: var(--favorite-article-background-color);
 }
 
+.flux.favorite:not(.current):hover .flux_header,
+.flux.favorite:not(.current):hover .flux_header .item {
+	background-color: var(--favorite-article-background-color-hover);
+}
+
 .flux_header {
 	font-size: 0.9rem;
 	border-top: 1px solid var(--border-color);
@@ -882,10 +878,6 @@ a:hover .icon {
 }
 
 /*=== Content of feed articles */
-.content {
-	padding: 20px 10px;
-}
-
 .content h1.title > a {
 	color: var(--font-color);
 }
@@ -963,15 +955,6 @@ a:hover .icon {
 	border: 1px solid var(--notification-bad-border-color);
 }
 
-.notification a.close {
-	padding: 0 15px;
-	line-height: 3;
-}
-
-.notification a.close:hover .icon {
-	filter: brightness(0.5);
-}
-
 .notification.good a.close:hover {
 	background-color: var(--notification-close-background-color-hover);
 }
@@ -981,7 +964,7 @@ a:hover .icon {
 }
 
 .notification#actualizeProgress {
-	line-height: 2;
+	line-height: 2em;
 }
 
 /*=== "Load more" part */
@@ -1104,22 +1087,22 @@ a:hover .icon {
 /*===========*/
 
 @media (max-width: 840px) {
+	.header > .item {
+		padding: 0.5rem 1rem;
+	}
+
 	.header > .item.title {
-		padding: 10px 20px;
 		width: 75%;
 		text-align: right;
 	}
 
 	.header > .item.configure {
-		padding: 10px 20px;
 		width: 25%;
 		text-align: left;
 	}
 
 	.form-group .group-name {
 		padding-bottom: 0;
-
-		text-align: right;
 	}
 
 	.aside {
@@ -1143,8 +1126,8 @@ a:hover .icon {
 	}
 
 	.post {
-		padding-right: 15px;
-		padding-left: 15px;
+		padding-right: 1rem;
+		padding-left: 1rem;
 	}
 
 	.nav_menu .btn {
@@ -1161,28 +1144,16 @@ a:hover .icon {
 		margin: 5px 0;
 	}
 
-	.nav_menu .search {
-		display: inline-block;
-		max-width: 97%;
-	}
-
-	.nav_menu .search input {
-		padding: 3px 5px;
-		max-width: 97%;
-		width: 90px;
-		line-height: 2;
-	}
-
-	.nav_menu .search input:focus {
-		width: 400px;
-	}
-
 	.dropdown-target:target ~ .dropdown-toggle::after {
 		background-color: var(--background-color-light);
 		border-top: 1px solid var(--border-color);
 		border-right: 1px solid var(--border-color);
 	}
 
+	.dropdown-menu .dropdown-section:last-child {
+		margin-bottom: 3rem;
+	}
+
 	.form-group.form-actions {
 		margin-right: -15px;
 		margin-left: -15px;
@@ -1209,3 +1180,96 @@ a:hover .icon {
 		display: none;
 	}
 }
+
+@media screen and (prefers-color-scheme: dark) {
+	:root .darkMode_auto {
+		--frss-background-color: #000;
+		--frss-background-color-middle: #222;
+		--frss-border-color: #444;
+		--frss-font-color-grey-dark: #999;
+		--frss-font-color-dark: #ddd;
+		--frss-modal-background-color-transparent: #000000a3;
+		--frss-background-color-transparent: #000000a3;
+		--frss-scrollbar-handle: #fff1;
+		--frss-scrollbar-handle-hover: #fff4;
+
+		--background-color-light-gradient: #111;
+		--background-color-light: #111;
+		--background-color-light-shadowed: #191919;
+		--background-color-grey: #1f1f1f;
+		--background-color-hover: #09090977;
+
+		--unread-article-background-color: #201f1e;
+		--unread-article-background-color-hover: #1a1918;
+		--unread-article-border-color: #ff5300;
+		--favorite-article-background-color: #24221d;
+		--favorite-article-background-color-hover: #1d1b17;
+		--favorite-article-border-color: #ffc300;
+
+		--contrast-background-color: #0084cc;
+		--contrast-background-color-gradient: #0045cc;
+		--contrast-background-color-hover: #06c;
+		--contrast-background-color-active: #038;
+		--contrast-border-color: #0062b7;
+
+		--contrast-background-font-color: #eee;
+
+		--attention-background-color-gradient1: #ea4a46;
+		--attention-background-color-gradient2: #911811;
+
+		--attention-background-color-gradient1-hover: #d14641;
+		--attention-background-color-gradient2-hover: #bd362f;
+		--attention-background-color-active: #bd362f;
+		--attention-border-color: #c44742;
+
+		--empty-feed-color: #e67e22;
+		--error-feed-color: #bd362f;
+
+		--alert-warn-background-color: #ffffe022;
+		--alert-warn-font-color: #ccc;
+		--alert-warn-border-color: #eeb;
+		--alert-success-background-color: #e8ffe814;
+		--alert-success-font-color: #96c196;
+		--alert-success-border-color: #cec;
+		--alert-error-background-color: #fdda;
+		--alert-error-font-color: #693a3a;
+		--alert-error-boder-color: #ecc;
+
+		--notification-good-background-color: #ffe;
+		--notification-good-border-color: #eeb;
+		--notification-good-font-color: #916a37;
+		--notification-bad-background-color: #fdd;
+		--notification-bad-font-color: #643838;
+		--notification-bad-border-color: #ecc;
+		--notification-close-background-color-hover: #aaa2;
+
+		--font-color: #ccc;
+		--font-color-grey: #aaa;
+		--font-color-light-shadowed: #555;
+		--font-color-light: #ccc;
+
+		--text-shadow-color: #1c1c1c;
+		--text-shadow-color-dark: #666;
+		--box-shadow-color: #4446;
+		--box-shadow-color-inset: #1f1f1f;
+
+		--font-color-link: #467eb3;
+		--font-color-link-hover: #0062be;
+
+		--border-color: #222;
+		--border-color-shadow-side: #333;
+		--contrast-border-color-active: #0062be;
+
+		--form-element-font-color-focus: #879db1;
+		--form-element-border-color-focus: #0062be;
+		--form-element-focus-box-shadow-color-inset: #110;
+		--form-element-border-color-invalid: #f00;
+		--form-element-invalid-box-shadow-color-inset: #fdd;
+	}
+
+	.btn.active,
+	.btn:active,
+	.dropdown-target:target ~ .btn.dropdown-toggle {
+		background: var(--border-color);
+	}
+}
diff --git a/p/themes/Pafat/icons/all.svg b/p/themes/Pafat/icons/all.svg
index 14fa80366..1c7ba3ffe 100644
--- a/p/themes/Pafat/icons/all.svg
+++ b/p/themes/Pafat/icons/all.svg
@@ -1,7 +1,5 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16">
-<g transform="translate(-40.0002,-746)" fill="#FFF">
-<rect style="color:#FFF;" height="2.0002" width="9.9996" y="749" x="43"/>
-<rect style="color:#FFF;" height="2.0002" width="9.9996" y="753" x="43"/>
-<rect style="color:#FFF;" height="2.0002" width="9.9996" y="757" x="43"/>
-</g>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
+  <g style="fill:#666;fill-opacity:1">
+    <path d="M43 749h10v2H43zM43 753h10v2H43zM43 757h10v2H43z" style="fill:#666;fill-opacity:1" transform="translate(-40 -746)"/>
+  </g>
+</svg>
diff --git a/p/themes/Pafat/icons/bookmark.svg b/p/themes/Pafat/icons/bookmark.svg
deleted file mode 100644
index 70d0c81fb..000000000
--- a/p/themes/Pafat/icons/bookmark.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16">
-<g transform="translate(-41.000202,-397)">
-<path style="enable-background:accumulate;color:#000000;" d="m530.95,186.71c-0.77941,0.55189-3.1576-1.906-4.1125-1.9179-0.95532-0.0119-3.3949,2.3858-4.161,1.8149-0.76573-0.57072,0.83698-3.592,0.55319-4.5039-0.2839-0.91223-3.3182-2.4915-3.0119-3.3965,0.30617-0.90461,3.6749-0.31399,4.4544-0.86567,0.77986-0.5519,1.3442-3.9257,2.2995-3.914,0.95494,0.0116,1.4342,3.398,2.1998,3.9689,0.76588,0.57114,4.1489,0.0653,4.4331,0.97746,0.28402,0.9118-2.7885,2.414-3.0949,3.3186-0.30652,0.90489,1.22,3.966,0.44027,4.5182z" fill-rule="nonzero" transform="matrix(1.0472113,-0.00871584,0.00871584,1.0472113,-504.35434,220.15425)" fill="#FFF"/>
-</g>
-</svg>
\ No newline at end of file
diff --git a/p/themes/Pafat/pafat.css b/p/themes/Pafat/pafat.css
index b513ba7ea..4ff9d2812 100644
--- a/p/themes/Pafat/pafat.css
+++ b/p/themes/Pafat/pafat.css
@@ -2,15 +2,100 @@
 
 /*=== GENERAL */
 /*============*/
+:root {
+	--font-color-white: #fff;
+	--font-color-grey-light: #c5c6ca;
+	--font-color-grey: #666;
+	--font-color-hover: #000;
+	--font-color-link-title: #333;
+	--font-color-link-general: #2980b9;
+	--font-color-link-general-hover: #038;
+
+	--font-color-unread-articles: #428bca;
+
+	--font-color-article: #41444f;
+
+	--font-color-blockquote: #41444f;
+	--font-color-code: #d14;
+
+	--background-color-white: #fff;
+	--background-color-grey-light: #fafafa;
+	--background-color-grey: #f4f4f4;
+	--background-color-grey-hover: #f0f0f0;
+	--background-color-grey-button-active: #eee;
+
+	--background-color-dark: #41444f;
+
+	--background-color-navlist-active: #3498db;
+
+	--background-color-favorite: #fff6da;
+	--background-color-favorite-hover: #fff9e8;
+
+	--background-color-button-important: #5cb85c;
+	--background-color-button-important-hover: #47a447;
+
+	--background-color-button-attention: #d9534f;
+	--background-color-button-attention-hover: #d2322d;
+
+	--background-color-active-feed: #5cb85c;
+
+	--background-color-mainstream: #428bca;
+	--background-color-mainstream-active: #3276b1;
+	--background-color-favorites: #f0ad4e;
+	--background-color-favorites-active: #ed9c28;
+	--background-color-category: #5bc0de;
+	--background-color-category-active: #39b3d7;
+
+	--background-color-new-article: #428bca;
+	--background-color-new-article-hover: #3276b1;
+
+	--color-empty-feed: #f39c12;
+	--color-error-feed: #bd362f;
+
+	--color-warning-icon-folder: #f0ad4e;
+
+	--notification-good-background-color: #ffe;
+	--notification-good-border-color: #eeb;
+	--notification-good-font-color: #c95;
+	--notification-bad-background-color: #fdd;
+	--notification-bad-font-color: #844;
+	--notification-bad-border-color: #ecc;
+	--notification-box-shadow-color: #ddd;
+
+	--alert-warn-background-color: #ffe;
+	--alert-warn-border-color: #eeb;
+	--alert-warn-font-color: #c95;
+	--alert-success-background-color: #dfd;
+	--alert-success-border-color: #cec;
+	--alert-success-font-color: #484;
+	--alert-error-background-color: #fdd;
+	--alert-error-font-color: #844;
+	--alert-error-border-color: #ecc;
+
+	--invalid-box-border-color: #f00;
+	--invalid-box-shadow-color: #fdd;
+
+	--border-color-white: #fff;
+
+	--border-color-grey-dark: #aaa;
+	--border-color-grey-light: #ddd;
+
+	--border-left-article: #5cb85c;
+	--border-left-article-current: #39b3d7;
+	--border-left-article-unread: #d9534f;
+	--border-left-article-favorite: #428bca;
+}
+
+
 html, body {
-	background: #fafafa;
-	color: #666;
+	background-color: var(--background-color-grey-light);
+	color: var(--font-color-grey);
 	font-family: "OpenSans", "Cantarell", "Helvetica", "Arial", "PingFang SC", "Microsoft YaHei", sans-serif;
 }
 
 /*=== Links */
 a {
-	color: #2980b9;
+	color: var(--font-color-link-general);
 	outline: none;
 }
 
@@ -19,7 +104,7 @@ legend {
 	margin: 20px 0 5px;
 	padding: 5px 0;
 	font-size: 1.4em;
-	border-bottom: 1px solid #ddd;
+	border-bottom: 1px solid var(--border-color-grey-light);
 }
 
 label {
@@ -35,9 +120,9 @@ textarea {
 
 input, select, textarea {
 	padding: 7px;
-	background: #fdfdfd;
-	color: #666;
-	border: 1px solid #bbb;
+	background-color: var(--background-color-white);
+	color: var(--font-color-grey);
+	border: 1px solid var(--border-color-grey-dark);
 	border-radius: 3px;
 	vertical-align: middle;
 }
@@ -47,21 +132,12 @@ option {
 }
 
 input:focus, select:focus, textarea:focus {
-	outline-color: #aaa;
+	border-color: var(--border-color-grey-dark);
 }
 
 input:invalid, select:invalid {
-	border-color: #f00;
-	box-shadow: 0 0 2px 2px #fdd inset;
-	outline-color: #fdd;
-}
-
-input:disabled, select:disabled {
-	background: #eee;
-}
-
-input.extend {
-	transition: width 200ms linear;
+	border-color: var(--invalid-box-border-color);
+	box-shadow: 0 0 2px 2px var(--invalid-box-shadow-color) inset;
 }
 
 /*=== Tables */
@@ -69,13 +145,12 @@ table {
 	border-collapse: collapse;
 }
 
-tr, th, td {
-	padding: 0.5em;
-	border: 1px solid #ddd;
+th, td {
+	border: 1px solid var(--border-color-grey-light);
 }
 
 th {
-	background: #f6f6f6;
+	background-color: var(--background-color-grey);
 }
 
 form td,
@@ -89,8 +164,8 @@ form th {
 /*=== Forms */
 .form-group.form-actions {
 	padding: 5px 0;
-	background: #f4f4f4;
-	border-top: 1px solid #ddd;
+	background-color: var(--background-color-grey);
+	border-top: 1px solid var(--border-color-grey-light);
 }
 
 .form-group.form-actions .btn {
@@ -99,7 +174,6 @@ form th {
 
 .form-group .group-name {
 	padding: 10px 0;
-	text-align: right;
 }
 
 .form-group .group-controls {
@@ -150,11 +224,11 @@ form th {
 .btn {
 	margin: 0;
 	padding: 1px 5px;
-	background: #fff;
+	background-color: var(--background-color-white);
 	display: inline-block;
-	color: #666;
+	color: var(--font-color-grey);
 	font-size: 0.9rem;
-	border: 1px solid #aaa;
+	border: 1px solid var(--border-color-grey-dark);
 	border-radius: 3px;
 	min-height: 29px;
 	min-width: 15px;
@@ -174,27 +248,26 @@ a.btn {
 }
 
 .btn:hover {
-	background: #f0f0f0;
+	background-color: var(--background-color-grey-hover);
 	text-decoration: none;
 }
 
 .btn.active,
 .btn:active,
 .dropdown-target:target ~ .btn.dropdown-toggle {
-	background: #eee;
+	background-color: var(--background-color-grey-button-active);
 }
 
 .btn-important {
-	background: #5cb85c;
-	color: #fff;
-	border-color: #5cb85c;
+	background-color: var(--background-color-button-important);
+	color: var(--font-color-white);
+	border: none;
 	font-weight: normal;
 }
 
 .btn-important:hover, .btn-important:active {
-	background: #47a447;
-	border-color: #47a447;
-	box-shadow: none;
+	background-color: var(--background-color-button-important-hover);
+	border: none;
 }
 
 .btn-important .icon {
@@ -202,78 +275,59 @@ a.btn {
 }
 
 .btn-attention {
-	background: #d9534f;
-	color: #fff;
-	border: 1px solid #d9534f;
-	outline-color: #aaa;
+	background-color: var(--background-color-button-attention);
+	color: var(--font-color-white);
+	border: none;
 }
 
 .btn-attention:hover {
-	background: #d2322d;
-	border-color: #d2322d;
+	background-color: var(--background-color-button-attention-hover);
+	border: none;
 }
 
 .btn-attention:active {
-	background: #d2322d;
-	box-shadow: none;
+	background-color: var(--background-color-button-attention-hover);
 }
 
 /*=== Navigation */
-.nav-list .nav-header,
-.nav-list .item {
-	height: 2.5em;
-	line-height: 2.5;
+.nav-list {
 	font-size: 0.9rem;
 }
 
-.nav-list .item:hover {
-	background: #fafafa;
+.nav-list .item,
+.nav-list .item.nav-header {
+	min-height: 2.5em;
+	line-height: 2.5;
 }
 
-.nav-list .item:hover a {
-	color: #038;
+.nav-list .item a:hover {
+	color: var(--font-color-link-general-hover);
+	background-color: var(--background-color-grey-hover);
 }
 
-.nav-list .item.active {
-	background: #3498db;
-	color: #fff;
+.nav-list .item.active,
+.nav-list .item.active a:hover {
+	background-color: var(--background-color-navlist-active);
+	color: var(--font-color-white);
 }
 
 .nav-list .item.active a {
-	color: #fff;
+	color: var(--font-color-white);
 }
 
 .nav-list .item > a {
-	padding: 0 10px;
+	padding: 0 1rem;
 }
 
 .nav-list a:hover {
 	text-decoration: none;
 }
 
-.nav-list .item.empty a {
-	color: #f39c12;
-}
-
-.nav-list .item.active.empty a {
-	background: #f39c12;
-	color: #fff;
-}
-
-.nav-list .item.error a {
-	color: #bd362f;
-}
-
-.nav-list .item.active.error a {
-	background: #bd362f;
-	color: #fff;
-}
-
 .nav-list .nav-header {
-	padding: 0 10px;
-	background: #f4f4f4;
-	color: #888;
-	border-bottom: 1px solid #ddd;
+	padding: 0 1rem;
+	background-color: var(--background-color-grey);
+	color: var(--font-color-grey);
+	border-bottom: 1px solid var(--border-color-grey-light);
 	font-weight: bold;
 }
 
@@ -285,38 +339,50 @@ a.btn {
 /*=== Dropdown */
 .dropdown-menu {
 	margin: 5px 0 0;
-	padding: 5px 0;
+	padding: 0.5rem 0 0.25rem 0;
 	font-size: 0.8rem;
-	border: 1px solid #aaa;
+	border: 1px solid var(--border-color-grey-dark);
 	border-radius: 5px;
 	text-align: left;
 }
 
 .dropdown-menu::after {
-	border-color: #aaa;
+	border-color: var(--border-color-grey-dark);
 	right: 8px;
 }
 
-.dropdown-header {
+.dropdown-header,
+.dropdown-section .dropdown-section-title {
 	padding: 0 5px 5px;
-	color: #888;
+	color: var(--font-color-grey);
 	font-weight: bold;
 	text-align: left;
 }
 
-.dropdown-menu > .item > a,
-.dropdown-menu > .item > span,
-.dropdown-menu > .item > .as-link {
+.dropdown-menu .item > a,
+.dropdown-menu .item > span,
+.dropdown-menu .item > .as-link {
 	padding: 0 22px;
 	line-height: 2.5;
-	color: #666;
-	font-size: 0.8rem;
+	color: var(--font-color-grey);
+	font-size: inherit;
 }
 
-.dropdown-menu > .item > a:hover,
-.dropdown-menu > .item > button:hover {
-	background: #eee;
-	color: #666;
+.dropdown-menu .dropdown-section .item > a,
+.dropdown-menu .dropdown-section .item > span,
+.dropdown-menu .dropdown-section .item > .as-link {
+	padding-left: 2rem;
+}
+
+.dropdown-menu .dropdown-section .item:last-child {
+	margin-bottom: 0.5rem;
+}
+
+.dropdown-menu .item > a:hover,
+.dropdown-menu .item > button:hover:not([disabled]),
+.dropdown-menu .item > label:hover:not(.noHover) {
+	background-color: var(--background-color-grey-hover);
+	color: var(--font-color-grey);
 }
 
 .dropdown-menu > .item[aria-checked="true"] > a::before {
@@ -332,20 +398,19 @@ a.btn {
 }
 
 .item ~ .dropdown-header,
+.dropdown-section ~ .dropdown-section,
 .item.separator {
-	border-top-color: #ddd;
+	border-top-color: var(--border-color-grey-light);
 }
 
 /*=== Alerts */
 .alert {
-	margin: 15px auto;
-	padding: 10px 15px;
-	background: #f4f4f4;
-	color: #aaa;
+	background-color: var(--background-color-grey);
+	color: var(--font-color-grey);
 	font-size: 0.9em;
-	border: 1px solid #ccc;
-	border-right: 1px solid #aaa;
-	border-bottom: 1px solid #aaa;
+	border: 1px solid var(--border-color-grey-light);
+	border-right: 1px solid var(--border-color-grey-dark);
+	border-bottom: 1px solid var(--border-color-grey-dark);
 	border-radius: 5px;
 }
 
@@ -359,52 +424,43 @@ a.btn {
 }
 
 .alert-warn {
-	background: #ffe;
-	color: #c95;
-	border: 1px solid #eeb;
+	background: var(--alert-warn-background-color);
+	color: var(--alert-warn-font-color);
+	border: 1px solid var(--alert-warn-border-color);
 }
 
 .alert-success {
-	background: #dfd;
-	color: #484;
-	border: 1px solid #cec;
+	background-color: var(--alert-success-background-color);
+	color: var(--alert-success-font-color);
+	border: 1px solid var(--alert-success-border-color);
 }
 
 .alert-error {
-	background: #fdd;
-	color: #844;
-	border: 1px solid #ecc;
+	background: var(--alert-error-background-color);
+	color: var(--alert-error-font-color);
+	border: 1px solid var(--alert-error-border-color);
 }
 
 /*=== Pagination */
-.pagination {
-	background: #fff;
-	color: #41444f;
-}
-
-.pagination .item a {
-	color: #41444f;
-}
-
 .pagination:first-child .item {
-	border-bottom: 1px solid #aaa;
+	border-bottom: 1px solid var(--border-color-grey-dark);
 }
 
 .pagination:last-child .item {
-	border-top: 1px solid #aaa;
+	border-top: 1px solid var(--border-color-grey-dark);
 }
 
 /*=== Boxes */
 .box {
-	border: 1px solid #aaa;
+	border: 1px solid var(--border-color-grey-dark);
 	border-radius: 5px;
 }
 
 .box .box-title {
 	margin: 0;
 	padding: 5px 10px;
-	background: #f6f6f6;
-	border-bottom: 1px solid #aaa;
+	background-color: var(--background-color-grey);
+	border-bottom: 1px solid var(--border-color-grey-dark);
 	border-radius: 5px 5px 0 0;
 }
 
@@ -419,7 +475,6 @@ a.btn {
 
 .box .box-content .item {
 	font-size: 0.9rem;
-	line-height: 2.5;
 }
 
 /*=== Tree */
@@ -433,8 +488,8 @@ a.btn {
 
 .tree-folder-title {
 	padding: 0.125rem 0.5rem;
-	background: #5bc0de;
-	color: #fff;
+	background-color: var(--background-color-category);
+	color: var(--font-color-white);
 	font-size: 0.9rem;
 	border-top: 1px solid transparent;
 	border-bottom: 1px solid transparent;
@@ -443,9 +498,13 @@ a.btn {
 	line-height: 2.15;
 }
 
+.tree-folder-title:hover {
+	background-color: var(--background-color-category-active);
+}
+
 .tree-folder-title .title {
 	background: inherit;
-	color: #fff;
+	color: var(--font-color-white);
 }
 
 .tree-folder-title .title:hover {
@@ -459,21 +518,31 @@ a.btn {
 }
 
 .tree-folder-title .title.error::before {
-	color: #f0ad4e;
+	color: var(--color-warning-icon-folder);
 	font-size: 1.2rem;
 	font-weight: normal;
 	line-height: 1;
 }
 
+.tree-folder-title > .icon,
 .tree-folder-title .title .icon {
 	filter: brightness(2.5);
 }
 
 .tree-folder.active .tree-folder-title {
-	background: #39b3d7;
+	background-color: var(--background-color-category-active);
 	font-weight: bold;
-	border-top: 1px solid #666;
-	border-bottom: 1px solid #666;
+}
+
+.tree-folder.active .tree-folder-title::before {
+	background-color: var(--background-color-white);
+	width: 0.5rem;
+	height: 0.5rem;
+	position: absolute;
+	top: 1rem;
+	left: -0.25rem;
+	z-index: 10;
+	transform: rotate(45deg);
 }
 
 .aside_feed .configure-feeds .btn {
@@ -482,8 +551,6 @@ a.btn {
 
 
 .aside_feed .tree-folder-items > .item.feed {
-	padding: 0 0.5rem;
-	line-height: 3.1;
 	font-size: 0.8rem;
 }
 
@@ -492,7 +559,7 @@ a.btn {
 }
 
 .tree-folder-items > .item.active {
-	background: #5cb85c;
+	background-color: var(--background-color-active-feed);
 }
 
 .tree-folder-items > .item > a {
@@ -500,35 +567,33 @@ a.btn {
 }
 
 .tree-folder-items > .item.active > a {
-	color: #fff;
+	color: var(--font-color-white);
 }
 
 /*=== STRUCTURE */
 /*===============*/
 /*=== Header */
 .header {
-	background: #41444f;
+	background-color: var(--background-color-dark);
 }
 
 .header > .item {
-	padding: 10px;
-	border-bottom: 1px solid #aaa;
+	border-bottom: 1px solid var(--border-color-grey-dark);
 	vertical-align: middle;
 	text-align: center;
 }
 
-.header > .item.title {
-	width: 230px;
-}
-
 .header > .item.title .logo {
-	margin: 0.5em 0;
 	filter: grayscale(100%) brightness(2.5);
 }
 
+.header > .item.title a:hover .logo {
+	filter: grayscale(100%) brightness(4);
+}
+
 a.signin {
 	text-decoration: none;
-	color: #c5c6ca;
+	color: var(--font-color-grey-light);
 }
 
 .header > .item.search input {
@@ -542,14 +607,14 @@ a.signin {
 	height: 29px;
 }
 
-.header .item.search input:focus {
+.header .item.search input {
 	width: 350px;
 }
 
 /*=== Body */
 .aside {
-	background: #fff;
-	border-right: 1px solid #aaa;
+	background-color: var(--background-color-white);
+	border-right: 1px solid var(--border-color-grey-dark);
 }
 
 .aside.aside_feed {
@@ -565,17 +630,18 @@ a.signin {
 .aside_feed .tree-folder-title > .title:not([data-unread="0"])::after,
 .global .box.category .title:not([data-unread="0"])::after {
 	margin: 0.55em 0 0 0;
-	background-color: white;
-	color: #428bca;
+	background-color: var(--background-color-white);
+	color: var(--font-color-unread-articles);
 }
 
 .aside.aside_feed .feed .item-title:not([data-unread="0"])::after {
-	background-color: #5bc0de;
-	color: white;
+	background-color: var(--background-color-category);
+	color: var(--font-color-white);
 }
 
 .aside.aside_feed .tree-folder.category.active .feed .item-title:not([data-unread="0"])::after {
-	background-color: #39b3d7;
+	background-color: var(--background-color-category-active);
+	font-size: 0.7rem;
 }
 
 .aside.aside_feed .category .title:not([data-unread="0"])::after {
@@ -584,51 +650,53 @@ a.signin {
 
 .aside.aside_feed .feed.active .item-title:not([data-unread="0"])::after {
 	background-color: transparent;
-	color: white;
-	border: 1px solid #fff;
+	color: var(--font-color-white);
+	border: 1px solid var(--border-color-white);
 	font-weight: bold;
 }
 
 .aside_feed .tree-folder.all .tree-folder-title {
-	background: #428bca;
+	background-color: var(--background-color-mainstream);
 }
 
+.aside_feed .tree-folder.all:hover .tree-folder-title,
 .aside_feed .tree-folder.all.active .tree-folder-title {
-	background: #3276b1;
+	background-color: var(--background-color-mainstream-active);
 }
 
 .aside_feed .tree-folder.favorites .tree-folder-title {
-	background: #f0ad4e;
+	background-color: var(--background-color-favorites);
 }
 
+.aside_feed .tree-folder.favorites:hover .tree-folder-title,
 .aside_feed .tree-folder.favorites.active .tree-folder-title {
-	background: #ed9c28;
+	background-color: var(--background-color-favorites-active);
 }
 
 /*=== Aside main page (feeds) */
 .feed.item.empty.active {
-	background: #e67e22;
+	background: var(--color-empty-feed);
 }
 
 .feed.item.error.active {
-	background: #bd362f;
+	background: var(--color-empty-feed);
 }
 
 .feed.item.empty,
 .feed.item.empty > a {
-	color: #e67e22;
+	color: var(--color-empty-feed);
 }
 
 .feed.item.error,
 .feed.item.error > a {
-	color: #bd362f;
+	color: var(--color-error-feed);
 }
 
 .feed.item.empty.active,
 .feed.item.error.active,
 .feed.item.empty.active > a,
 .feed.item.error.active > a {
-	color: #fff;
+	color: var(--font-color-white);
 }
 
 .aside_feed .tree-folder-items .dropdown-menu::after {
@@ -639,7 +707,7 @@ a.signin {
 .aside_feed .tree-folder-items .item:hover .dropdown-toggle > .icon,
 .aside_feed .tree-folder-items .item.active .dropdown-toggle > .icon {
 	border-radius: 3px;
-	background-color: #fff;
+	background-color: var(--background-color-white);
 }
 
 .aside_feed .tree-folder-title .dropdown-toggle .icon {
@@ -684,29 +752,29 @@ a.signin {
 
 /*=== New article notification */
 #new-article {
-	background: #428bca;
+	background-color: var(--background-color-new-article);
 	text-align: center;
 	font-size: 0.9em;
 }
 
 #new-article > a {
 	padding: 0.75rem;
-	color: #fff;
+	color: var(--font-color-white);
 	font-weight: bold;
 }
 
 #new-article > a:hover {
 	text-decoration: none;
-	background: #3276b1;
+	background-color: var(--background-color-new-article-hover);
 }
 
 /*=== Day indication */
 .day {
 	padding: 0 10px;
-	background: #fff;
-	color: #666;
-	border-top: 1px solid #aaa;
-	border-bottom: 1px solid #aaa;
+	background-color: var(--background-color-white);
+	color: var(--font-color-grey);
+	border-top: 1px solid var(--border-color-grey-dark);
+	border-bottom: 1px solid var(--border-color-grey-dark);
 	font-weight: bold;
 	line-height: 3;
 }
@@ -721,7 +789,7 @@ a.signin {
 
 .day .name {
 	padding: 0 10px 0 0;
-	color: #666;
+	color: var(--font-color-grey);
 	font-size: 1.8em;
 	opacity: 0.3;
 	font-style: italic;
@@ -731,49 +799,53 @@ a.signin {
 /*=== Index menu */
 .nav_menu {
 	padding: 5px 0;
-	background: #fafafa;
-	border-bottom: 1px solid #aaa;
+	background-color: var(--background-color-grey-light);
+	border-bottom: 1px solid var(--border-color-grey-dark);
 	text-align: center;
 }
 
 /*=== Feed articles */
 .flux {
-	background: #fafafa;
-	border-left: 3px solid #5cb85c;
+	background-color: var(--background-color-grey-light);
+	border-left: 2px solid var(--border-left-article);
 }
 
-.flux:hover {
-	background: #fff;
+.flux .flux_header:hover {
+	background-color: var(--background-color-grey-hover);
+}
+
+.flux .flux_header:hover .title a {
+	color: var(--font-color-hover);
 }
 
 .flux.current {
-	background: #fff;
-	border-left: 3px solid #39b3d7;
+	background-color: var(--background-color-white);
+	border-left: 2px solid var(--border-left-article-current);
 }
 
 .flux.not_read {
-	border-left: 3px solid #d9534f;
+	border-left: 2px solid var(--border-left-article-unread);
 }
 
 .flux .item.title a, .flux.not_read:not(.current):hover .item.title {
-	color: #333;
+	color: var(--font-color-link-title);
 }
 
 .flux.favorite {
-	border-left: 2px solid #428bca;
+	border-left: 2px solid var(--border-left-article-favorite);
 }
 
 .flux.favorite:not(.current) {
-	background: #fff6da;
+	background-color: var(--background-color-favorite);
 }
 
-.flux.favorite:not(.current):hover .item.title {
-	background: #fff6da;
+.flux.favorite:not(.current) .flux_header:hover {
+	background-color: var(--background-color-favorite-hover);
 }
 
 .flux_header {
 	font-size: 0.8rem;
-	border-top: 1px solid #ddd;
+	border-top: 1px solid var(--border-color-grey-light);
 	cursor: pointer;
 }
 
@@ -786,7 +858,7 @@ a.signin {
 }
 
 .flux .item.date {
-	color: #666;
+	color: var(--font-color-grey);
 	font-size: 0.7rem;
 }
 
@@ -801,49 +873,48 @@ a.signin {
 }
 
 .content > h1.title > a {
-	color: #333;
+	color: var(--font-color-link-title);
 }
 
 .content hr {
 	margin: 30px 10px;
-	background: #ddd;
+	background-color: var(--background-color-grey);
 	height: 1px;
 	border: 0;
-	box-shadow: 0 2px 5px #ccc;
 }
 
 .content pre {
 	margin: 10px auto;
 	padding: 10px 20px;
 	overflow: auto;
-	background: #222;
-	color: #fff;
+	background-color: var(--background-color-dark);
+	color: var(--font-color-white);
 	font-size: 0.9rem;
 	border-radius: 3px;
 }
 
 .content code {
 	padding: 2px 5px;
-	background: #fafafa;
-	color: #d14;
-	border: 1px solid #eee;
+	background-color: var(--background-color-grey-light);
+	color: var(--font-color-code);
+	border: 1px solid var(--border-color-grey-light);
 	border-radius: 3px;
 }
 
 .content pre code {
 	background: transparent;
-	color: #fff;
+	color: var(--font-color-white);
 	border: none;
 }
 
 .content blockquote {
 	margin: 0;
 	padding: 5px 20px;
-	background: #fafafa;
+	background-color: var(--background-color-grey-light);
 	display: block;
-	color: #41444f;
-	border-top: 1px solid #ddd;
-	border-bottom: 1px solid #ddd;
+	color: var(--font-color-blockquote);
+	border-top: 1px solid var(--border-color-grey-light);
+	border-bottom: 1px solid var(--border-color-grey-light);
 }
 
 .content blockquote p {
@@ -853,89 +924,76 @@ a.signin {
 /*=== Notification and actualize notification */
 .notification {
 	font-size: 0.9em;
-	border: 1px solid #eeb;
+	border: 1px solid var(--notification-good-border-color);
 	border-radius: 3px;
-	box-shadow: 0 0 5px #ddd;
+	box-shadow: 0 0 5px var(--notification-box-shadow-color);
 	text-align: center;
 	font-weight: bold;
 	vertical-align: middle;
 }
 
 .notification.good {
-	background: #ffe;
-	color: #c95;
-	border: 1px solid #eeb;
+	background-color: var(--notification-good-background-color);
+	color: var(--notification-good-font-color);
+	border: 1px solid var(--notification-good-border-color);
 }
 
 .notification.bad {
-	background: #fdd;
-	color: #844;
-	border: 1px solid #ecc;
-}
-
-.notification a.close {
-	padding: 0 15px;
-	line-height: 3;
+	background-color: var(--notification-bad-background-color);
+	color: var(--notification-bad-font-color);
+	border: 1px solid var(--notification-bad-border-color);
 }
 
 .notification.good a.close:hover {
-	background: #eeb;
+	background-color: var(--notification-good-border-color);
 }
 
 .notification.bad a.close:hover {
-	background: #ecc;
-}
-
-.notification#actualizeProgress {
-	line-height: 2;
+	background-color: var(--notification-bad-border-color);
 }
 
 /*=== "Load more" part */
 #bigMarkAsRead {
-	background: #fafafa;
-	color: #666;
+	background-color: var(--background-color-grey-light);
+	color: var(--font-color-grey);
 	text-align: center;
 	text-decoration: none;
 }
 
 #bigMarkAsRead:hover {
-	background: #f0f0f0;
-	color: #000;
-}
-
-#bigMarkAsRead:hover .bigTick {
-	/*	text-shadow: 0 0 10px #666;*/
+	background-color: var(--background-color-grey-hover);
+	color: var(--font-color-hover);
 }
 
 /*=== Navigation menu (for articles) */
 #nav_entries {
 	margin: 0;
-	background: #fff;
-	border-top: 1px solid #ddd;
+	background-color: var(--background-color-white);
+	border-top: 1px solid var(--border-color-grey-light);
 	text-align: center;
 	line-height: 3;
 	table-layout: fixed;
 }
 
 #nav_entries .item:hover {
-	background: #eee	;
+	background-color: var(--background-color-grey-hover);
 }
 /*=== READER VIEW */
 /*================*/
 #stream.reader .flux {
-	background: #fafafa;
-	color: #41444f;
+	background-color: var(--background-color-grey-light);
+	color: var(--font-color-article);
 	border: none;
 }
 
 #stream.reader .flux .content {
-	background-color: #fff;
-	border-color: #ddd;
+	background-color: var(--background-color-white);
+	border-color: var(--border-color-grey-light);
 }
 
 #stream.reader .flux .author {
 	margin: 0 0 10px;
-	color: #666;
+	color: var(--font-color-grey);
 	font-size: 90%;
 }
 
@@ -948,19 +1006,22 @@ a.signin {
 }
 
 .box.category:not([data-unread="0"]) .box-title {
-	background: #5bc0de;
+	background-color: var(--background-color-category);
 }
 
 .box.category:not([data-unread="0"]) .box-title .title {
 	font-weight: bold;
-	color: #fff;
+	color: var(--font-color-white);
 }
 
 .box.category .title:not([data-unread="0"])::after {
 	background: none;
-	border: 0;
-	box-shadow: none;
-	text-shadow: none;
+	border: none;
+}
+
+#stream.global .feed .item-title:not([data-unread="0"])::after {
+	background-color: var(--background-color-category);
+	color: var(--font-color-white);
 }
 
 /*=== DIVERS */
@@ -992,7 +1053,7 @@ a.signin {
 
 .stat > table td,
 .stat > table th {
-	border-bottom: 1px solid #ddd;
+	border-bottom: 1px solid var(--border-color-grey-light);
 	text-align: center;
 }
 
@@ -1002,22 +1063,17 @@ a.signin {
 @media (max-width: 840px) {
 	.form-group .group-name {
 		padding-bottom: 0;
-		text-align: left;
 	}
 
 	.aside {
 		transition: width 200ms linear;
 	}
 
-	.aside:target {
-		box-shadow: 3px 0 3px #aaa;
-	}
-
 	.aside .toggle_aside,
 	#panel .close,
 	.dropdown-menu .toggle_aside {
-		background: #f6f6f6;
-		border-bottom: 1px solid #ddd;
+		background-color: var(--background-color-grey);
+		border-bottom: 1px solid var(--border-color-grey-light);
 	}
 
 	.aside.aside_feed {
@@ -1037,24 +1093,9 @@ a.signin {
 		margin: 5px 0;
 	}
 
-	.nav_menu .search {
-		display: inline-block;
-		max-width: 97%;
-	}
-
-	.nav_menu .search input {
-		max-width: 97%;
-		width: 90px;
-		line-height: 2;
-	}
-
-	.nav_menu .search input:focus {
-		width: 400px;
-	}
-
 	.dropdown-target:target ~ .dropdown-toggle::after {
-		border-top: 1px solid #aaa;
-		border-left: 1px solid #aaa;
+		border-top: 1px solid var(--border-color-grey-dark);
+		border-left: 1px solid var(--border-color-grey-dark);
 	}
 
 	.day .name {
diff --git a/p/themes/Pafat/pafat.rtl.css b/p/themes/Pafat/pafat.rtl.css
index 7d5ae91c7..8a71232bb 100644
--- a/p/themes/Pafat/pafat.rtl.css
+++ b/p/themes/Pafat/pafat.rtl.css
@@ -2,15 +2,100 @@
 
 /*=== GENERAL */
 /*============*/
+:root {
+	--font-color-white: #fff;
+	--font-color-grey-light: #c5c6ca;
+	--font-color-grey: #666;
+	--font-color-hover: #000;
+	--font-color-link-title: #333;
+	--font-color-link-general: #2980b9;
+	--font-color-link-general-hover: #038;
+
+	--font-color-unread-articles: #428bca;
+
+	--font-color-article: #41444f;
+
+	--font-color-blockquote: #41444f;
+	--font-color-code: #d14;
+
+	--background-color-white: #fff;
+	--background-color-grey-light: #fafafa;
+	--background-color-grey: #f4f4f4;
+	--background-color-grey-hover: #f0f0f0;
+	--background-color-grey-button-active: #eee;
+
+	--background-color-dark: #41444f;
+
+	--background-color-navlist-active: #3498db;
+
+	--background-color-favorite: #fff6da;
+	--background-color-favorite-hover: #fff9e8;
+
+	--background-color-button-important: #5cb85c;
+	--background-color-button-important-hover: #47a447;
+
+	--background-color-button-attention: #d9534f;
+	--background-color-button-attention-hover: #d2322d;
+
+	--background-color-active-feed: #5cb85c;
+
+	--background-color-mainstream: #428bca;
+	--background-color-mainstream-active: #3276b1;
+	--background-color-favorites: #f0ad4e;
+	--background-color-favorites-active: #ed9c28;
+	--background-color-category: #5bc0de;
+	--background-color-category-active: #39b3d7;
+
+	--background-color-new-article: #428bca;
+	--background-color-new-article-hover: #3276b1;
+
+	--color-empty-feed: #f39c12;
+	--color-error-feed: #bd362f;
+
+	--color-warning-icon-folder: #f0ad4e;
+
+	--notification-good-background-color: #ffe;
+	--notification-good-border-color: #eeb;
+	--notification-good-font-color: #c95;
+	--notification-bad-background-color: #fdd;
+	--notification-bad-font-color: #844;
+	--notification-bad-border-color: #ecc;
+	--notification-box-shadow-color: #ddd;
+
+	--alert-warn-background-color: #ffe;
+	--alert-warn-border-color: #eeb;
+	--alert-warn-font-color: #c95;
+	--alert-success-background-color: #dfd;
+	--alert-success-border-color: #cec;
+	--alert-success-font-color: #484;
+	--alert-error-background-color: #fdd;
+	--alert-error-font-color: #844;
+	--alert-error-border-color: #ecc;
+
+	--invalid-box-border-color: #f00;
+	--invalid-box-shadow-color: #fdd;
+
+	--border-color-white: #fff;
+
+	--border-color-grey-dark: #aaa;
+	--border-color-grey-light: #ddd;
+
+	--border-left-article: #5cb85c;
+	--border-left-article-current: #39b3d7;
+	--border-left-article-unread: #d9534f;
+	--border-left-article-favorite: #428bca;
+}
+
+
 html, body {
-	background: #fafafa;
-	color: #666;
+	background-color: var(--background-color-grey-light);
+	color: var(--font-color-grey);
 	font-family: "OpenSans", "Cantarell", "Helvetica", "Arial", "PingFang SC", "Microsoft YaHei", sans-serif;
 }
 
 /*=== Links */
 a {
-	color: #2980b9;
+	color: var(--font-color-link-general);
 	outline: none;
 }
 
@@ -19,7 +104,7 @@ legend {
 	margin: 20px 0 5px;
 	padding: 5px 0;
 	font-size: 1.4em;
-	border-bottom: 1px solid #ddd;
+	border-bottom: 1px solid var(--border-color-grey-light);
 }
 
 label {
@@ -35,9 +120,9 @@ textarea {
 
 input, select, textarea {
 	padding: 7px;
-	background: #fdfdfd;
-	color: #666;
-	border: 1px solid #bbb;
+	background-color: var(--background-color-white);
+	color: var(--font-color-grey);
+	border: 1px solid var(--border-color-grey-dark);
 	border-radius: 3px;
 	vertical-align: middle;
 }
@@ -47,21 +132,12 @@ option {
 }
 
 input:focus, select:focus, textarea:focus {
-	outline-color: #aaa;
+	border-color: var(--border-color-grey-dark);
 }
 
 input:invalid, select:invalid {
-	border-color: #f00;
-	box-shadow: 0 0 2px 2px #fdd inset;
-	outline-color: #fdd;
-}
-
-input:disabled, select:disabled {
-	background: #eee;
-}
-
-input.extend {
-	transition: width 200ms linear;
+	border-color: var(--invalid-box-border-color);
+	box-shadow: 0 0 2px 2px var(--invalid-box-shadow-color) inset;
 }
 
 /*=== Tables */
@@ -69,13 +145,12 @@ table {
 	border-collapse: collapse;
 }
 
-tr, th, td {
-	padding: 0.5em;
-	border: 1px solid #ddd;
+th, td {
+	border: 1px solid var(--border-color-grey-light);
 }
 
 th {
-	background: #f6f6f6;
+	background-color: var(--background-color-grey);
 }
 
 form td,
@@ -89,8 +164,8 @@ form th {
 /*=== Forms */
 .form-group.form-actions {
 	padding: 5px 0;
-	background: #f4f4f4;
-	border-top: 1px solid #ddd;
+	background-color: var(--background-color-grey);
+	border-top: 1px solid var(--border-color-grey-light);
 }
 
 .form-group.form-actions .btn {
@@ -99,7 +174,6 @@ form th {
 
 .form-group .group-name {
 	padding: 10px 0;
-	text-align: left;
 }
 
 .form-group .group-controls {
@@ -150,11 +224,11 @@ form th {
 .btn {
 	margin: 0;
 	padding: 1px 5px;
-	background: #fff;
+	background-color: var(--background-color-white);
 	display: inline-block;
-	color: #666;
+	color: var(--font-color-grey);
 	font-size: 0.9rem;
-	border: 1px solid #aaa;
+	border: 1px solid var(--border-color-grey-dark);
 	border-radius: 3px;
 	min-height: 29px;
 	min-width: 15px;
@@ -174,27 +248,26 @@ a.btn {
 }
 
 .btn:hover {
-	background: #f0f0f0;
+	background-color: var(--background-color-grey-hover);
 	text-decoration: none;
 }
 
 .btn.active,
 .btn:active,
 .dropdown-target:target ~ .btn.dropdown-toggle {
-	background: #eee;
+	background-color: var(--background-color-grey-button-active);
 }
 
 .btn-important {
-	background: #5cb85c;
-	color: #fff;
-	border-color: #5cb85c;
+	background-color: var(--background-color-button-important);
+	color: var(--font-color-white);
+	border: none;
 	font-weight: normal;
 }
 
 .btn-important:hover, .btn-important:active {
-	background: #47a447;
-	border-color: #47a447;
-	box-shadow: none;
+	background-color: var(--background-color-button-important-hover);
+	border: none;
 }
 
 .btn-important .icon {
@@ -202,78 +275,59 @@ a.btn {
 }
 
 .btn-attention {
-	background: #d9534f;
-	color: #fff;
-	border: 1px solid #d9534f;
-	outline-color: #aaa;
+	background-color: var(--background-color-button-attention);
+	color: var(--font-color-white);
+	border: none;
 }
 
 .btn-attention:hover {
-	background: #d2322d;
-	border-color: #d2322d;
+	background-color: var(--background-color-button-attention-hover);
+	border: none;
 }
 
 .btn-attention:active {
-	background: #d2322d;
-	box-shadow: none;
+	background-color: var(--background-color-button-attention-hover);
 }
 
 /*=== Navigation */
-.nav-list .nav-header,
-.nav-list .item {
-	height: 2.5em;
-	line-height: 2.5;
+.nav-list {
 	font-size: 0.9rem;
 }
 
-.nav-list .item:hover {
-	background: #fafafa;
+.nav-list .item,
+.nav-list .item.nav-header {
+	min-height: 2.5em;
+	line-height: 2.5;
 }
 
-.nav-list .item:hover a {
-	color: #038;
+.nav-list .item a:hover {
+	color: var(--font-color-link-general-hover);
+	background-color: var(--background-color-grey-hover);
 }
 
-.nav-list .item.active {
-	background: #3498db;
-	color: #fff;
+.nav-list .item.active,
+.nav-list .item.active a:hover {
+	background-color: var(--background-color-navlist-active);
+	color: var(--font-color-white);
 }
 
 .nav-list .item.active a {
-	color: #fff;
+	color: var(--font-color-white);
 }
 
 .nav-list .item > a {
-	padding: 0 10px;
+	padding: 0 1rem;
 }
 
 .nav-list a:hover {
 	text-decoration: none;
 }
 
-.nav-list .item.empty a {
-	color: #f39c12;
-}
-
-.nav-list .item.active.empty a {
-	background: #f39c12;
-	color: #fff;
-}
-
-.nav-list .item.error a {
-	color: #bd362f;
-}
-
-.nav-list .item.active.error a {
-	background: #bd362f;
-	color: #fff;
-}
-
 .nav-list .nav-header {
-	padding: 0 10px;
-	background: #f4f4f4;
-	color: #888;
-	border-bottom: 1px solid #ddd;
+	padding: 0 1rem;
+	background-color: var(--background-color-grey);
+	color: var(--font-color-grey);
+	border-bottom: 1px solid var(--border-color-grey-light);
 	font-weight: bold;
 }
 
@@ -285,38 +339,50 @@ a.btn {
 /*=== Dropdown */
 .dropdown-menu {
 	margin: 5px 0 0;
-	padding: 5px 0;
+	padding: 0.5rem 0 0.25rem 0;
 	font-size: 0.8rem;
-	border: 1px solid #aaa;
+	border: 1px solid var(--border-color-grey-dark);
 	border-radius: 5px;
 	text-align: right;
 }
 
 .dropdown-menu::after {
-	border-color: #aaa;
+	border-color: var(--border-color-grey-dark);
 	left: 8px;
 }
 
-.dropdown-header {
+.dropdown-header,
+.dropdown-section .dropdown-section-title {
 	padding: 0 5px 5px;
-	color: #888;
+	color: var(--font-color-grey);
 	font-weight: bold;
 	text-align: right;
 }
 
-.dropdown-menu > .item > a,
-.dropdown-menu > .item > span,
-.dropdown-menu > .item > .as-link {
+.dropdown-menu .item > a,
+.dropdown-menu .item > span,
+.dropdown-menu .item > .as-link {
 	padding: 0 22px;
 	line-height: 2.5;
-	color: #666;
-	font-size: 0.8rem;
+	color: var(--font-color-grey);
+	font-size: inherit;
 }
 
-.dropdown-menu > .item > a:hover,
-.dropdown-menu > .item > button:hover {
-	background: #eee;
-	color: #666;
+.dropdown-menu .dropdown-section .item > a,
+.dropdown-menu .dropdown-section .item > span,
+.dropdown-menu .dropdown-section .item > .as-link {
+	padding-right: 2rem;
+}
+
+.dropdown-menu .dropdown-section .item:last-child {
+	margin-bottom: 0.5rem;
+}
+
+.dropdown-menu .item > a:hover,
+.dropdown-menu .item > button:hover:not([disabled]),
+.dropdown-menu .item > label:hover:not(.noHover) {
+	background-color: var(--background-color-grey-hover);
+	color: var(--font-color-grey);
 }
 
 .dropdown-menu > .item[aria-checked="true"] > a::before {
@@ -332,20 +398,19 @@ a.btn {
 }
 
 .item ~ .dropdown-header,
+.dropdown-section ~ .dropdown-section,
 .item.separator {
-	border-top-color: #ddd;
+	border-top-color: var(--border-color-grey-light);
 }
 
 /*=== Alerts */
 .alert {
-	margin: 15px auto;
-	padding: 10px 15px;
-	background: #f4f4f4;
-	color: #aaa;
+	background-color: var(--background-color-grey);
+	color: var(--font-color-grey);
 	font-size: 0.9em;
-	border: 1px solid #ccc;
-	border-left: 1px solid #aaa;
-	border-bottom: 1px solid #aaa;
+	border: 1px solid var(--border-color-grey-light);
+	border-left: 1px solid var(--border-color-grey-dark);
+	border-bottom: 1px solid var(--border-color-grey-dark);
 	border-radius: 5px;
 }
 
@@ -359,52 +424,43 @@ a.btn {
 }
 
 .alert-warn {
-	background: #ffe;
-	color: #c95;
-	border: 1px solid #eeb;
+	background: var(--alert-warn-background-color);
+	color: var(--alert-warn-font-color);
+	border: 1px solid var(--alert-warn-border-color);
 }
 
 .alert-success {
-	background: #dfd;
-	color: #484;
-	border: 1px solid #cec;
+	background-color: var(--alert-success-background-color);
+	color: var(--alert-success-font-color);
+	border: 1px solid var(--alert-success-border-color);
 }
 
 .alert-error {
-	background: #fdd;
-	color: #844;
-	border: 1px solid #ecc;
+	background: var(--alert-error-background-color);
+	color: var(--alert-error-font-color);
+	border: 1px solid var(--alert-error-border-color);
 }
 
 /*=== Pagination */
-.pagination {
-	background: #fff;
-	color: #41444f;
-}
-
-.pagination .item a {
-	color: #41444f;
-}
-
 .pagination:first-child .item {
-	border-bottom: 1px solid #aaa;
+	border-bottom: 1px solid var(--border-color-grey-dark);
 }
 
 .pagination:last-child .item {
-	border-top: 1px solid #aaa;
+	border-top: 1px solid var(--border-color-grey-dark);
 }
 
 /*=== Boxes */
 .box {
-	border: 1px solid #aaa;
+	border: 1px solid var(--border-color-grey-dark);
 	border-radius: 5px;
 }
 
 .box .box-title {
 	margin: 0;
 	padding: 5px 10px;
-	background: #f6f6f6;
-	border-bottom: 1px solid #aaa;
+	background-color: var(--background-color-grey);
+	border-bottom: 1px solid var(--border-color-grey-dark);
 	border-radius: 5px 5px 0 0;
 }
 
@@ -419,7 +475,6 @@ a.btn {
 
 .box .box-content .item {
 	font-size: 0.9rem;
-	line-height: 2.5;
 }
 
 /*=== Tree */
@@ -433,8 +488,8 @@ a.btn {
 
 .tree-folder-title {
 	padding: 0.125rem 0.5rem;
-	background: #5bc0de;
-	color: #fff;
+	background-color: var(--background-color-category);
+	color: var(--font-color-white);
 	font-size: 0.9rem;
 	border-top: 1px solid transparent;
 	border-bottom: 1px solid transparent;
@@ -443,9 +498,13 @@ a.btn {
 	line-height: 2.15;
 }
 
+.tree-folder-title:hover {
+	background-color: var(--background-color-category-active);
+}
+
 .tree-folder-title .title {
 	background: inherit;
-	color: #fff;
+	color: var(--font-color-white);
 }
 
 .tree-folder-title .title:hover {
@@ -459,21 +518,31 @@ a.btn {
 }
 
 .tree-folder-title .title.error::before {
-	color: #f0ad4e;
+	color: var(--color-warning-icon-folder);
 	font-size: 1.2rem;
 	font-weight: normal;
 	line-height: 1;
 }
 
+.tree-folder-title > .icon,
 .tree-folder-title .title .icon {
 	filter: brightness(2.5);
 }
 
 .tree-folder.active .tree-folder-title {
-	background: #39b3d7;
+	background-color: var(--background-color-category-active);
 	font-weight: bold;
-	border-top: 1px solid #666;
-	border-bottom: 1px solid #666;
+}
+
+.tree-folder.active .tree-folder-title::before {
+	background-color: var(--background-color-white);
+	width: 0.5rem;
+	height: 0.5rem;
+	position: absolute;
+	top: 1rem;
+	right: -0.25rem;
+	z-index: 10;
+	transform: rotate(-45deg);
 }
 
 .aside_feed .configure-feeds .btn {
@@ -482,8 +551,6 @@ a.btn {
 
 
 .aside_feed .tree-folder-items > .item.feed {
-	padding: 0 0.5rem;
-	line-height: 3.1;
 	font-size: 0.8rem;
 }
 
@@ -492,7 +559,7 @@ a.btn {
 }
 
 .tree-folder-items > .item.active {
-	background: #5cb85c;
+	background-color: var(--background-color-active-feed);
 }
 
 .tree-folder-items > .item > a {
@@ -500,35 +567,33 @@ a.btn {
 }
 
 .tree-folder-items > .item.active > a {
-	color: #fff;
+	color: var(--font-color-white);
 }
 
 /*=== STRUCTURE */
 /*===============*/
 /*=== Header */
 .header {
-	background: #41444f;
+	background-color: var(--background-color-dark);
 }
 
 .header > .item {
-	padding: 10px;
-	border-bottom: 1px solid #aaa;
+	border-bottom: 1px solid var(--border-color-grey-dark);
 	vertical-align: middle;
 	text-align: center;
 }
 
-.header > .item.title {
-	width: 230px;
-}
-
 .header > .item.title .logo {
-	margin: 0.5em 0;
 	filter: grayscale(100%) brightness(2.5);
 }
 
+.header > .item.title a:hover .logo {
+	filter: grayscale(100%) brightness(4);
+}
+
 a.signin {
 	text-decoration: none;
-	color: #c5c6ca;
+	color: var(--font-color-grey-light);
 }
 
 .header > .item.search input {
@@ -542,14 +607,14 @@ a.signin {
 	height: 29px;
 }
 
-.header .item.search input:focus {
+.header .item.search input {
 	width: 350px;
 }
 
 /*=== Body */
 .aside {
-	background: #fff;
-	border-left: 1px solid #aaa;
+	background-color: var(--background-color-white);
+	border-left: 1px solid var(--border-color-grey-dark);
 }
 
 .aside.aside_feed {
@@ -565,17 +630,18 @@ a.signin {
 .aside_feed .tree-folder-title > .title:not([data-unread="0"])::after,
 .global .box.category .title:not([data-unread="0"])::after {
 	margin: 0.55em 0 0 0;
-	background-color: white;
-	color: #428bca;
+	background-color: var(--background-color-white);
+	color: var(--font-color-unread-articles);
 }
 
 .aside.aside_feed .feed .item-title:not([data-unread="0"])::after {
-	background-color: #5bc0de;
-	color: white;
+	background-color: var(--background-color-category);
+	color: var(--font-color-white);
 }
 
 .aside.aside_feed .tree-folder.category.active .feed .item-title:not([data-unread="0"])::after {
-	background-color: #39b3d7;
+	background-color: var(--background-color-category-active);
+	font-size: 0.7rem;
 }
 
 .aside.aside_feed .category .title:not([data-unread="0"])::after {
@@ -584,51 +650,53 @@ a.signin {
 
 .aside.aside_feed .feed.active .item-title:not([data-unread="0"])::after {
 	background-color: transparent;
-	color: white;
-	border: 1px solid #fff;
+	color: var(--font-color-white);
+	border: 1px solid var(--border-color-white);
 	font-weight: bold;
 }
 
 .aside_feed .tree-folder.all .tree-folder-title {
-	background: #428bca;
+	background-color: var(--background-color-mainstream);
 }
 
+.aside_feed .tree-folder.all:hover .tree-folder-title,
 .aside_feed .tree-folder.all.active .tree-folder-title {
-	background: #3276b1;
+	background-color: var(--background-color-mainstream-active);
 }
 
 .aside_feed .tree-folder.favorites .tree-folder-title {
-	background: #f0ad4e;
+	background-color: var(--background-color-favorites);
 }
 
+.aside_feed .tree-folder.favorites:hover .tree-folder-title,
 .aside_feed .tree-folder.favorites.active .tree-folder-title {
-	background: #ed9c28;
+	background-color: var(--background-color-favorites-active);
 }
 
 /*=== Aside main page (feeds) */
 .feed.item.empty.active {
-	background: #e67e22;
+	background: var(--color-empty-feed);
 }
 
 .feed.item.error.active {
-	background: #bd362f;
+	background: var(--color-empty-feed);
 }
 
 .feed.item.empty,
 .feed.item.empty > a {
-	color: #e67e22;
+	color: var(--color-empty-feed);
 }
 
 .feed.item.error,
 .feed.item.error > a {
-	color: #bd362f;
+	color: var(--color-error-feed);
 }
 
 .feed.item.empty.active,
 .feed.item.error.active,
 .feed.item.empty.active > a,
 .feed.item.error.active > a {
-	color: #fff;
+	color: var(--font-color-white);
 }
 
 .aside_feed .tree-folder-items .dropdown-menu::after {
@@ -639,7 +707,7 @@ a.signin {
 .aside_feed .tree-folder-items .item:hover .dropdown-toggle > .icon,
 .aside_feed .tree-folder-items .item.active .dropdown-toggle > .icon {
 	border-radius: 3px;
-	background-color: #fff;
+	background-color: var(--background-color-white);
 }
 
 .aside_feed .tree-folder-title .dropdown-toggle .icon {
@@ -684,29 +752,29 @@ a.signin {
 
 /*=== New article notification */
 #new-article {
-	background: #428bca;
+	background-color: var(--background-color-new-article);
 	text-align: center;
 	font-size: 0.9em;
 }
 
 #new-article > a {
 	padding: 0.75rem;
-	color: #fff;
+	color: var(--font-color-white);
 	font-weight: bold;
 }
 
 #new-article > a:hover {
 	text-decoration: none;
-	background: #3276b1;
+	background-color: var(--background-color-new-article-hover);
 }
 
 /*=== Day indication */
 .day {
 	padding: 0 10px;
-	background: #fff;
-	color: #666;
-	border-top: 1px solid #aaa;
-	border-bottom: 1px solid #aaa;
+	background-color: var(--background-color-white);
+	color: var(--font-color-grey);
+	border-top: 1px solid var(--border-color-grey-dark);
+	border-bottom: 1px solid var(--border-color-grey-dark);
 	font-weight: bold;
 	line-height: 3;
 }
@@ -721,7 +789,7 @@ a.signin {
 
 .day .name {
 	padding: 0 0 0 10px;
-	color: #666;
+	color: var(--font-color-grey);
 	font-size: 1.8em;
 	opacity: 0.3;
 	font-style: italic;
@@ -731,49 +799,53 @@ a.signin {
 /*=== Index menu */
 .nav_menu {
 	padding: 5px 0;
-	background: #fafafa;
-	border-bottom: 1px solid #aaa;
+	background-color: var(--background-color-grey-light);
+	border-bottom: 1px solid var(--border-color-grey-dark);
 	text-align: center;
 }
 
 /*=== Feed articles */
 .flux {
-	background: #fafafa;
-	border-right: 3px solid #5cb85c;
+	background-color: var(--background-color-grey-light);
+	border-right: 2px solid var(--border-left-article);
 }
 
-.flux:hover {
-	background: #fff;
+.flux .flux_header:hover {
+	background-color: var(--background-color-grey-hover);
+}
+
+.flux .flux_header:hover .title a {
+	color: var(--font-color-hover);
 }
 
 .flux.current {
-	background: #fff;
-	border-right: 3px solid #39b3d7;
+	background-color: var(--background-color-white);
+	border-right: 2px solid var(--border-left-article-current);
 }
 
 .flux.not_read {
-	border-right: 3px solid #d9534f;
+	border-right: 2px solid var(--border-left-article-unread);
 }
 
 .flux .item.title a, .flux.not_read:not(.current):hover .item.title {
-	color: #333;
+	color: var(--font-color-link-title);
 }
 
 .flux.favorite {
-	border-right: 2px solid #428bca;
+	border-right: 2px solid var(--border-left-article-favorite);
 }
 
 .flux.favorite:not(.current) {
-	background: #fff6da;
+	background-color: var(--background-color-favorite);
 }
 
-.flux.favorite:not(.current):hover .item.title {
-	background: #fff6da;
+.flux.favorite:not(.current) .flux_header:hover {
+	background-color: var(--background-color-favorite-hover);
 }
 
 .flux_header {
 	font-size: 0.8rem;
-	border-top: 1px solid #ddd;
+	border-top: 1px solid var(--border-color-grey-light);
 	cursor: pointer;
 }
 
@@ -786,7 +858,7 @@ a.signin {
 }
 
 .flux .item.date {
-	color: #666;
+	color: var(--font-color-grey);
 	font-size: 0.7rem;
 }
 
@@ -801,49 +873,48 @@ a.signin {
 }
 
 .content > h1.title > a {
-	color: #333;
+	color: var(--font-color-link-title);
 }
 
 .content hr {
 	margin: 30px 10px;
-	background: #ddd;
+	background-color: var(--background-color-grey);
 	height: 1px;
 	border: 0;
-	box-shadow: 0 2px 5px #ccc;
 }
 
 .content pre {
 	margin: 10px auto;
 	padding: 10px 20px;
 	overflow: auto;
-	background: #222;
-	color: #fff;
+	background-color: var(--background-color-dark);
+	color: var(--font-color-white);
 	font-size: 0.9rem;
 	border-radius: 3px;
 }
 
 .content code {
 	padding: 2px 5px;
-	background: #fafafa;
-	color: #d14;
-	border: 1px solid #eee;
+	background-color: var(--background-color-grey-light);
+	color: var(--font-color-code);
+	border: 1px solid var(--border-color-grey-light);
 	border-radius: 3px;
 }
 
 .content pre code {
 	background: transparent;
-	color: #fff;
+	color: var(--font-color-white);
 	border: none;
 }
 
 .content blockquote {
 	margin: 0;
 	padding: 5px 20px;
-	background: #fafafa;
+	background-color: var(--background-color-grey-light);
 	display: block;
-	color: #41444f;
-	border-top: 1px solid #ddd;
-	border-bottom: 1px solid #ddd;
+	color: var(--font-color-blockquote);
+	border-top: 1px solid var(--border-color-grey-light);
+	border-bottom: 1px solid var(--border-color-grey-light);
 }
 
 .content blockquote p {
@@ -853,89 +924,76 @@ a.signin {
 /*=== Notification and actualize notification */
 .notification {
 	font-size: 0.9em;
-	border: 1px solid #eeb;
+	border: 1px solid var(--notification-good-border-color);
 	border-radius: 3px;
-	box-shadow: 0 0 5px #ddd;
+	box-shadow: 0 0 5px var(--notification-box-shadow-color);
 	text-align: center;
 	font-weight: bold;
 	vertical-align: middle;
 }
 
 .notification.good {
-	background: #ffe;
-	color: #c95;
-	border: 1px solid #eeb;
+	background-color: var(--notification-good-background-color);
+	color: var(--notification-good-font-color);
+	border: 1px solid var(--notification-good-border-color);
 }
 
 .notification.bad {
-	background: #fdd;
-	color: #844;
-	border: 1px solid #ecc;
-}
-
-.notification a.close {
-	padding: 0 15px;
-	line-height: 3;
+	background-color: var(--notification-bad-background-color);
+	color: var(--notification-bad-font-color);
+	border: 1px solid var(--notification-bad-border-color);
 }
 
 .notification.good a.close:hover {
-	background: #eeb;
+	background-color: var(--notification-good-border-color);
 }
 
 .notification.bad a.close:hover {
-	background: #ecc;
-}
-
-.notification#actualizeProgress {
-	line-height: 2;
+	background-color: var(--notification-bad-border-color);
 }
 
 /*=== "Load more" part */
 #bigMarkAsRead {
-	background: #fafafa;
-	color: #666;
+	background-color: var(--background-color-grey-light);
+	color: var(--font-color-grey);
 	text-align: center;
 	text-decoration: none;
 }
 
 #bigMarkAsRead:hover {
-	background: #f0f0f0;
-	color: #000;
-}
-
-#bigMarkAsRead:hover .bigTick {
-	/*	text-shadow: 0 0 10px #666;*/
+	background-color: var(--background-color-grey-hover);
+	color: var(--font-color-hover);
 }
 
 /*=== Navigation menu (for articles) */
 #nav_entries {
 	margin: 0;
-	background: #fff;
-	border-top: 1px solid #ddd;
+	background-color: var(--background-color-white);
+	border-top: 1px solid var(--border-color-grey-light);
 	text-align: center;
 	line-height: 3;
 	table-layout: fixed;
 }
 
 #nav_entries .item:hover {
-	background: #eee	;
+	background-color: var(--background-color-grey-hover);
 }
 /*=== READER VIEW */
 /*================*/
 #stream.reader .flux {
-	background: #fafafa;
-	color: #41444f;
+	background-color: var(--background-color-grey-light);
+	color: var(--font-color-article);
 	border: none;
 }
 
 #stream.reader .flux .content {
-	background-color: #fff;
-	border-color: #ddd;
+	background-color: var(--background-color-white);
+	border-color: var(--border-color-grey-light);
 }
 
 #stream.reader .flux .author {
 	margin: 0 0 10px;
-	color: #666;
+	color: var(--font-color-grey);
 	font-size: 90%;
 }
 
@@ -948,19 +1006,22 @@ a.signin {
 }
 
 .box.category:not([data-unread="0"]) .box-title {
-	background: #5bc0de;
+	background-color: var(--background-color-category);
 }
 
 .box.category:not([data-unread="0"]) .box-title .title {
 	font-weight: bold;
-	color: #fff;
+	color: var(--font-color-white);
 }
 
 .box.category .title:not([data-unread="0"])::after {
 	background: none;
-	border: 0;
-	box-shadow: none;
-	text-shadow: none;
+	border: none;
+}
+
+#stream.global .feed .item-title:not([data-unread="0"])::after {
+	background-color: var(--background-color-category);
+	color: var(--font-color-white);
 }
 
 /*=== DIVERS */
@@ -992,7 +1053,7 @@ a.signin {
 
 .stat > table td,
 .stat > table th {
-	border-bottom: 1px solid #ddd;
+	border-bottom: 1px solid var(--border-color-grey-light);
 	text-align: center;
 }
 
@@ -1002,22 +1063,17 @@ a.signin {
 @media (max-width: 840px) {
 	.form-group .group-name {
 		padding-bottom: 0;
-		text-align: right;
 	}
 
 	.aside {
 		transition: width 200ms linear;
 	}
 
-	.aside:target {
-		box-shadow: -3px 0 3px #aaa;
-	}
-
 	.aside .toggle_aside,
 	#panel .close,
 	.dropdown-menu .toggle_aside {
-		background: #f6f6f6;
-		border-bottom: 1px solid #ddd;
+		background-color: var(--background-color-grey);
+		border-bottom: 1px solid var(--border-color-grey-light);
 	}
 
 	.aside.aside_feed {
@@ -1037,24 +1093,9 @@ a.signin {
 		margin: 5px 0;
 	}
 
-	.nav_menu .search {
-		display: inline-block;
-		max-width: 97%;
-	}
-
-	.nav_menu .search input {
-		max-width: 97%;
-		width: 90px;
-		line-height: 2;
-	}
-
-	.nav_menu .search input:focus {
-		width: 400px;
-	}
-
 	.dropdown-target:target ~ .dropdown-toggle::after {
-		border-top: 1px solid #aaa;
-		border-right: 1px solid #aaa;
+		border-top: 1px solid var(--border-color-grey-dark);
+		border-right: 1px solid var(--border-color-grey-dark);
 	}
 
 	.day .name {
diff --git a/p/themes/Screwdriver/icons/bookmark.svg b/p/themes/Screwdriver/icons/bookmark.svg
deleted file mode 100644
index edf5a02db..000000000
--- a/p/themes/Screwdriver/icons/bookmark.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16">
-<g transform="translate(-41.000202,-397)">
-<path style="color:#000000;enable-background:accumulate;" d="m530.95,186.71c-0.77941,0.55189-3.1576-1.906-4.1125-1.9179-0.95532-0.0119-3.3949,2.3858-4.161,1.8149-0.76573-0.57072,0.83698-3.592,0.55319-4.5039-0.2839-0.91223-3.3182-2.4915-3.0119-3.3965,0.30617-0.90461,3.6749-0.31399,4.4544-0.86567,0.77986-0.5519,1.3442-3.9257,2.2995-3.914,0.95494,0.0116,1.4342,3.398,2.1998,3.9689,0.76588,0.57114,4.1489,0.0653,4.4331,0.97746,0.28402,0.9118-2.7885,2.414-3.0949,3.3186-0.30652,0.90489,1.22,3.966,0.44027,4.5182z" fill-rule="nonzero" transform="matrix(1.0472113,-0.00871584,0.00871584,1.0472113,-504.35434,220.15425)" fill="#d18104"/>
-</g>
-</svg>
\ No newline at end of file
diff --git a/p/themes/Screwdriver/metadata.json b/p/themes/Screwdriver/metadata.json
index 08654e51d..8da73f80c 100644
--- a/p/themes/Screwdriver/metadata.json
+++ b/p/themes/Screwdriver/metadata.json
@@ -3,5 +3,6 @@
   "author": "Mister aiR",
   "description": "C’est un cocktail ! C’est chaud mais « fresh » à la fois. Ce thème tue du chaton.",
   "version": 1.1,
-  "files": ["_frss.css","screwdriver.css"]
+  "files": ["_frss.css","screwdriver.css"],
+  "deprecated" : true
 }
diff --git a/p/themes/Screwdriver/screwdriver.css b/p/themes/Screwdriver/screwdriver.css
index 3829c787b..859e34f35 100644
--- a/p/themes/Screwdriver/screwdriver.css
+++ b/p/themes/Screwdriver/screwdriver.css
@@ -64,17 +64,12 @@ input:disabled, select:disabled {
 	background: #eee;
 }
 
-input.extend {
-	transition: width 200ms linear;
-}
-
 /*=== Tables */
 table {
 	border-collapse: collapse;
 }
 
-tr, th, td {
-	padding: 0.5em;
+th, td {
 	border: 1px solid #ddd;
 }
 
@@ -105,7 +100,6 @@ form th {
 
 .form-group .group-name {
 	padding: 10px 0;
-	text-align: right;
 }
 
 .form-group .group-controls {
@@ -265,13 +259,16 @@ a.btn {
 	box-shadow: 0 -1px rgba(255,255,255,0.08) inset;
 }
 /*=== Navigation */
-.nav-list .nav-header,
-.nav-list .item {
-	height: 2.5em;
-	line-height: 2.5em;
+.nav-list {
 	font-size: 0.9rem;
 }
 
+.nav-list .item,
+.nav-list .item.nav-header {
+	min-height: 2.5em;
+	line-height: 2.5;
+}
+
 .nav-list .item a:hover {
 	text-shadow: 0 0 2px rgba(255,255,255,0.28);
 	color: #fff;
@@ -292,7 +289,7 @@ a.btn {
 }
 
 .nav-list .item > a {
-	padding: 0 10px;
+	padding: 0 1rem;
 	color: #ccc;
 }
 
@@ -300,27 +297,8 @@ a.btn {
 	text-decoration: none;
 }
 
-.nav-list .item.empty a {
-	color: #f39c12;
-}
-
-.nav-list .item.active.empty a {
-	background: linear-gradient(180deg, #e4992c 0%, #d18114 100%) #e4992c;
-	background: -webkit-linear-gradient(180deg, #e4992c 0%, #d18114 100%);
-	color: #fff;
-}
-
-.nav-list .item.error a {
-	color: #bd362f;
-}
-
-.nav-list .item.active.error a {
-	background: #bd362f;
-	color: #fff;
-}
-
 .nav-list .nav-header {
-	padding: 0 10px;
+	padding: 0 1rem;
 	background: transparent;
 	color: #222;
 }
@@ -333,7 +311,7 @@ a.btn {
 /*=== Dropdown */
 .dropdown-menu {
 	margin: 5px 0 0;
-	padding: 5px 0;
+	padding: 0.5rem 0 0.25rem 0;
 	background: #222;
 	font-size: 0.8rem;
 	border: 1px solid #171717;
@@ -346,30 +324,43 @@ a.btn {
 	border-color: #171717;
 }
 
-.dropdown-header {
+.dropdown-header,
+.dropdown-section .dropdown-section-title {
 	padding: 0 5px 5px;
 	color: #ccc;
 	font-weight: bold;
 }
 
-.dropdown-menu > .item > a,
-.dropdown-menu > .item > span,
-.dropdown-menu > .item > .as-link {
+.dropdown-menu .item > a,
+.dropdown-menu .item > span,
+.dropdown-menu .item > .as-link {
 	padding: 0 22px;
 	line-height: 2.5em;
 	color: #ccc;
 	font-size: 0.8rem;
 }
 
-.dropdown-menu > .item > label {
-	color: #ccc;
+.dropdown-menu .dropdown-section .item > a,
+.dropdown-menu .dropdown-section .item > span,
+.dropdown-menu .dropdown-section .item > .as-link {
+	padding-left: 2rem;
+}
+
+.dropdown-menu .dropdown-section .item:last-child {
+	margin-bottom: 0.5rem;
 }
 
-.dropdown-menu > .item:hover {
+.dropdown-menu .item > a:hover,
+.dropdown-menu .item > button:hover:not([disabled]),
+.dropdown-menu .item > label:hover:not(.noHover) {
 	background: #171717;
 	color: #fff;
 }
 
+.dropdown-menu > .item > label {
+	color: #ccc;
+}
+
 .dropdown-menu > .item[aria-checked="true"] > a::before {
 	font-weight: bold;
 	margin: 0 0 0 -14px;
@@ -381,14 +372,13 @@ a.btn {
 }
 
 .item ~ .dropdown-header,
+.dropdown-section ~ .dropdown-section,
 .item.separator {
 	border-top-color: rgba(255,255,255,0.08);
 }
 
 /*=== Alerts */
 .alert {
-	margin: 15px auto;
-	padding: 10px 15px;
 	background: #f4f4f4;
 	color: #aaa;
 	font-size: 0.9em;
@@ -480,7 +470,6 @@ a.btn {
 
 .box .box-content .item {
 	font-size: 0.9rem;
-	line-height: 2.5em;
 }
 
 /*=== Tree */
@@ -519,8 +508,6 @@ a.btn {
 }
 
 .tree-folder-items > .item {
-	padding: 0 10px;
-	line-height: 2.5rem;
 	font-size: 0.8rem;
 }
 
@@ -586,10 +573,6 @@ a.btn {
 }
 
 .header > .item.search input {
-	width: 230px;
-}
-
-.header .item.search input:focus {
 	width: 350px;
 }
 
@@ -780,7 +763,7 @@ a.btn {
 	background: #ede7de;
 }
 
-.flux:hover {
+.flux .flux_header:hover {
 	background: #f9f7f4;
 }
 
@@ -929,15 +912,6 @@ a.btn {
 	color: #844;
 }
 
-.notification a.close {
-	padding: 0 15px;
-	line-height: 3em;
-}
-
-.notification#actualizeProgress {
-	line-height: 2em;
-}
-
 /*=== "Load more" part */
 #bigMarkAsRead {
 	background: #ede7de;
@@ -1096,7 +1070,6 @@ a.btn {
 @media screen and (max-width: 840px) {
 	.form-group .group-name {
 		padding-bottom: 0;
-		text-align: left;
 	}
 
 	.header {
@@ -1144,10 +1117,6 @@ a.btn {
 		margin: 5px 0;
 	}
 
-	.nav_menu .search {
-		display: none;
-	}
-
 	.nav_menu .search input {
 		padding: 3px 5px;
 		max-width: 97%;
diff --git a/p/themes/Screwdriver/screwdriver.rtl.css b/p/themes/Screwdriver/screwdriver.rtl.css
index 7d745560d..216c84262 100644
--- a/p/themes/Screwdriver/screwdriver.rtl.css
+++ b/p/themes/Screwdriver/screwdriver.rtl.css
@@ -64,17 +64,12 @@ input:disabled, select:disabled {
 	background: #eee;
 }
 
-input.extend {
-	transition: width 200ms linear;
-}
-
 /*=== Tables */
 table {
 	border-collapse: collapse;
 }
 
-tr, th, td {
-	padding: 0.5em;
+th, td {
 	border: 1px solid #ddd;
 }
 
@@ -105,7 +100,6 @@ form th {
 
 .form-group .group-name {
 	padding: 10px 0;
-	text-align: left;
 }
 
 .form-group .group-controls {
@@ -265,13 +259,16 @@ a.btn {
 	box-shadow: 0 -1px rgba(255,255,255,0.08) inset;
 }
 /*=== Navigation */
-.nav-list .nav-header,
-.nav-list .item {
-	height: 2.5em;
-	line-height: 2.5em;
+.nav-list {
 	font-size: 0.9rem;
 }
 
+.nav-list .item,
+.nav-list .item.nav-header {
+	min-height: 2.5em;
+	line-height: 2.5;
+}
+
 .nav-list .item a:hover {
 	text-shadow: 0 0 2px rgba(255,255,255,0.28);
 	color: #fff;
@@ -292,7 +289,7 @@ a.btn {
 }
 
 .nav-list .item > a {
-	padding: 0 10px;
+	padding: 0 1rem;
 	color: #ccc;
 }
 
@@ -300,27 +297,8 @@ a.btn {
 	text-decoration: none;
 }
 
-.nav-list .item.empty a {
-	color: #f39c12;
-}
-
-.nav-list .item.active.empty a {
-	background: linear-gradient(-180deg, #e4992c 0%, #d18114 100%) #e4992c;
-	background: -webkit-linear-gradient(-180deg, #e4992c 0%, #d18114 100%);
-	color: #fff;
-}
-
-.nav-list .item.error a {
-	color: #bd362f;
-}
-
-.nav-list .item.active.error a {
-	background: #bd362f;
-	color: #fff;
-}
-
 .nav-list .nav-header {
-	padding: 0 10px;
+	padding: 0 1rem;
 	background: transparent;
 	color: #222;
 }
@@ -333,7 +311,7 @@ a.btn {
 /*=== Dropdown */
 .dropdown-menu {
 	margin: 5px 0 0;
-	padding: 5px 0;
+	padding: 0.5rem 0 0.25rem 0;
 	background: #222;
 	font-size: 0.8rem;
 	border: 1px solid #171717;
@@ -346,30 +324,43 @@ a.btn {
 	border-color: #171717;
 }
 
-.dropdown-header {
+.dropdown-header,
+.dropdown-section .dropdown-section-title {
 	padding: 0 5px 5px;
 	color: #ccc;
 	font-weight: bold;
 }
 
-.dropdown-menu > .item > a,
-.dropdown-menu > .item > span,
-.dropdown-menu > .item > .as-link {
+.dropdown-menu .item > a,
+.dropdown-menu .item > span,
+.dropdown-menu .item > .as-link {
 	padding: 0 22px;
 	line-height: 2.5em;
 	color: #ccc;
 	font-size: 0.8rem;
 }
 
-.dropdown-menu > .item > label {
-	color: #ccc;
+.dropdown-menu .dropdown-section .item > a,
+.dropdown-menu .dropdown-section .item > span,
+.dropdown-menu .dropdown-section .item > .as-link {
+	padding-right: 2rem;
+}
+
+.dropdown-menu .dropdown-section .item:last-child {
+	margin-bottom: 0.5rem;
 }
 
-.dropdown-menu > .item:hover {
+.dropdown-menu .item > a:hover,
+.dropdown-menu .item > button:hover:not([disabled]),
+.dropdown-menu .item > label:hover:not(.noHover) {
 	background: #171717;
 	color: #fff;
 }
 
+.dropdown-menu > .item > label {
+	color: #ccc;
+}
+
 .dropdown-menu > .item[aria-checked="true"] > a::before {
 	font-weight: bold;
 	margin: 0 -14px 0 0;
@@ -381,14 +372,13 @@ a.btn {
 }
 
 .item ~ .dropdown-header,
+.dropdown-section ~ .dropdown-section,
 .item.separator {
 	border-top-color: rgba(255,255,255,0.08);
 }
 
 /*=== Alerts */
 .alert {
-	margin: 15px auto;
-	padding: 10px 15px;
 	background: #f4f4f4;
 	color: #aaa;
 	font-size: 0.9em;
@@ -480,7 +470,6 @@ a.btn {
 
 .box .box-content .item {
 	font-size: 0.9rem;
-	line-height: 2.5em;
 }
 
 /*=== Tree */
@@ -519,8 +508,6 @@ a.btn {
 }
 
 .tree-folder-items > .item {
-	padding: 0 10px;
-	line-height: 2.5rem;
 	font-size: 0.8rem;
 }
 
@@ -586,10 +573,6 @@ a.btn {
 }
 
 .header > .item.search input {
-	width: 230px;
-}
-
-.header .item.search input:focus {
 	width: 350px;
 }
 
@@ -780,7 +763,7 @@ a.btn {
 	background: #ede7de;
 }
 
-.flux:hover {
+.flux .flux_header:hover {
 	background: #f9f7f4;
 }
 
@@ -929,15 +912,6 @@ a.btn {
 	color: #844;
 }
 
-.notification a.close {
-	padding: 0 15px;
-	line-height: 3em;
-}
-
-.notification#actualizeProgress {
-	line-height: 2em;
-}
-
 /*=== "Load more" part */
 #bigMarkAsRead {
 	background: #ede7de;
@@ -1096,7 +1070,6 @@ a.btn {
 @media screen and (max-width: 840px) {
 	.form-group .group-name {
 		padding-bottom: 0;
-		text-align: right;
 	}
 
 	.header {
@@ -1144,10 +1117,6 @@ a.btn {
 		margin: 5px 0;
 	}
 
-	.nav_menu .search {
-		display: none;
-	}
-
 	.nav_menu .search input {
 		padding: 3px 5px;
 		max-width: 97%;
diff --git a/p/themes/Swage/icons/bookmark.svg b/p/themes/Swage/icons/bookmark.svg
deleted file mode 100644
index 09bf263fd..000000000
--- a/p/themes/Swage/icons/bookmark.svg
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg enable-background="new 0 0 16 16" version="1.1" viewBox="0 0 16 16" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
-<style type="text/css">.st0{fill:#FFD255;}</style>
-<path class="st0" d="M8,12.6l4.9,3L11.6,10L16,6.2l-5.7-0.5L8,0.4L5.8,5.7L0,6.2L4.4,10l-1.3,5.6L8,12.6z"/>
-</svg>
-
diff --git a/p/themes/Swage/swage.css b/p/themes/Swage/swage.css
index 1c438f4a1..6478c0581 100644
--- a/p/themes/Swage/swage.css
+++ b/p/themes/Swage/swage.css
@@ -54,13 +54,12 @@ select:invalid {
 	box-shadow: none;
 }
 
-.nav-list .item, .nav-list .nav-header {
-	height: 2.5em;
+.nav-list .item .nav-header, .nav-list .item {
+	min-height: 2.5em;
 	line-height: 2.5;
-	font-size: 0.9rem;
 }
 
-.dropdown-menu > .item > a,
+.dropdown-menu > .item a,
 .dropdown-menu > .item > span,
 .dropdown-menu > .item > .as-link,
 .dropdown-menu > .item button, .dropdown-menu > .item {
@@ -71,7 +70,6 @@ select:invalid {
 }
 
 .flux::after, .form-group::after {
-	content: "";
 	display: block;
 	clear: both;
 }
@@ -87,7 +85,7 @@ body {
 }
 
 a {
-	color: var(--color-nav-lighter);
+	color: var(--color-text-nav);
 	outline: none;
 }
 a.btn {
@@ -150,10 +148,6 @@ select {
 	padding-bottom: 8px;
 }
 
-input.extend {
-	transition: width 200ms linear;
-}
-
 option {
 	padding: 0 0.5em;
 }
@@ -162,10 +156,8 @@ table {
 	border-collapse: collapse;
 }
 
-tr,
 td,
 th {
-	padding: 0.5em;
 	border: 1px solid var(--color-border-light-darker);
 }
 
@@ -266,7 +258,10 @@ form th {
 	background-image: url("./icons/disabled-light.svg");
 }
 
-.nav-list .nav-header {
+.nav-list {
+	font-size: 0.9rem;
+}
+.nav-list .item .nav-header {
 	padding: 0 1rem;
 	font-weight: bold;
 	background-color: var(--color-background-aside);
@@ -284,25 +279,9 @@ form th {
 .nav-list .item.active a {
 	color: var(--color-text-light);
 }
-.nav-list .item.active.empty a,
-.nav-list .item.active .error a {
-	color: var(--color-text-light);
-}
-.nav-list .item.active.empty a {
-	background-color: var(--color-background-alert);
-}
-.nav-list .item.active.error a {
-	background-color: var(--color-background-bad);
-}
 .nav-list .item > a {
 	padding: 0 1.5rem;
 }
-.nav-list .item.empty a {
-	color: var(--color-text-alert);
-}
-.nav-list .item.error a {
-	color: var(--color-text-bad-lighter);
-}
 .nav-list .item .icon {
 	filter: brightness(3);
 }
@@ -335,12 +314,20 @@ form th {
 .dropdown-menu .dropdown-header a:hover {
 	background-color: var(--color-background-nav);
 }
-.dropdown-menu::after {
-	content: none;
+.dropdown-menu .dropdown-section .dropdown-section-title {
+	cursor: default;
+	padding: 0.25rem 0.5rem 0.125rem 0.25rem;
+	font-weight: bold;
+	color: var(--color-text-light);
+}
+.dropdown-menu .dropdown-section .item a {
+	padding: 0 22px;
+}
+.dropdown-menu .dropdown-section .item a:hover {
+	background-color: var(--color-background-nav);
 }
 .dropdown-menu > .item {
-	padding: 0;
-	margin-left: 10px;
+	padding: 0 0 0 0.5rem;
 }
 .dropdown-menu > .item > a {
 	min-width: initial;
@@ -355,12 +342,32 @@ form th {
 	font-weight: bold;
 	margin: 0 0 0 -14px;
 }
+.dropdown-menu .help a {
+	color: var(--color-text-light);
+	text-decoration: underline;
+	text-decoration-style: dotted;
+}
+.dropdown-menu .help a:hover {
+	text-decoration-style: solid;
+}
 .dropdown-menu .input select,
 .dropdown-menu .input input {
 	margin: 0 auto 5px;
 	padding: 2px 5px;
 }
 
+#dropdown-search-wrapper .dropdown-menu {
+	padding-top: 1rem;
+	padding-bottom: 0.25rem;
+}
+#dropdown-search-wrapper .dropdown-menu .stick.search {
+	width: 100%;
+}
+#dropdown-search-wrapper .dropdown-menu .stick.search input[type=search] {
+	width: 100%;
+	border: 0;
+}
+
 .labels .dropdown-menu,
 .tags .dropdown-menu,
 .share .dropdown-menu {
@@ -374,8 +381,7 @@ form th {
 }
 
 .alert {
-	margin: 5px auto;
-	padding: 10px 15px;
+	margin: 0.25rem auto;
 	background-color: var(--color-background-light);
 	color: var(--color-text-light-darker);
 	font-size: 0.9em;
@@ -496,7 +502,6 @@ form th {
 .box .box-content .item {
 	padding: 0 10px;
 	font-size: 0.9rem;
-	line-height: 2.5;
 }
 .box .box-content .item .configure .icon {
 	vertical-align: middle;
@@ -556,8 +561,6 @@ form th {
 	background-color: var(--color-background-aside);
 }
 .tree-folder-items > .item {
-	padding: 0 10px;
-	line-height: 3;
 	font-size: 0.8rem;
 }
 .tree-folder-items > .item.active {
@@ -572,12 +575,19 @@ form th {
 	height: auto;
 }
 .header > .item {
+	padding: 0;
 	vertical-align: middle;
 }
 .header > .item.title {
 	position: absolute;
 	text-align: center;
 }
+.header > .item.title a {
+	padding: 0 1rem;
+}
+.header > .item.title a:hover .logo {
+	filter: grayscale(100%) brightness(100) opacity(90%);
+}
 .header > .item.title .logo {
 	display: inline-block;
 	height: 26px;
@@ -586,9 +596,6 @@ form th {
 	top: 5px;
 	filter: grayscale(100%) brightness(100);
 }
-.header .item.search input:focus {
-	width: 350px;
-}
 .header .item.search {
 	display: none;
 }
@@ -724,9 +731,11 @@ form th {
 }
 
 .nav_menu {
+	padding: 0;
 	width: 100%;
 	font-size: 0;
 	background-color: var(--color-background-nav);
+	text-align: left;
 	position: sticky;
 	top: 0;
 	z-index: 90;
@@ -754,11 +763,11 @@ form th {
 	width: 90%;
 	border-top: 1px solid var(--color-border-light-darker);
 }
-.flux:hover,
+.flux .flux_header:hover,
 .flux .current {
 	background-color: var(--color-background-hover);
 }
-.flux:hover:not(.current):hover .item.title,
+.flux .flux_header:hover:not(.current):hover .item.title,
 .flux .current:not(.current):hover .item.title {
 	background-color: var(--color-background-hover);
 }
@@ -825,9 +834,6 @@ form th {
 .notification.bad a.close:hover {
 	background-color: var(--color-background-bad);
 }
-.notification#actualizeProgress {
-	line-height: 2;
-}
 .notification a.close {
 	display: none;
 }
@@ -926,6 +932,9 @@ a.signin {
 	.dropdown {
 		position: relative;
 	}
+	.dropdown .dropdown-menu {
+		width: auto;
+	}
 	#new-article {
 		margin-top: 2rem;
 		width: 100%;
@@ -1166,10 +1175,21 @@ button.as-link {
 	right: auto;
 }
 
+#nav_menu_actions ul.dropdown-menu::after {
+	display: none;
+}
+
+#nav_menu_actions .dropdown.only-mobile {
+	display: initial !important;
+}
+
 #nav_menu_read_all ul.dropdown-menu {
 	right: 0;
 	left: auto;
 }
+#nav_menu_read_all ul.dropdown-menu::after {
+	display: none;
+}
 
 #slider label {
 	min-height: initial;
diff --git a/p/themes/Swage/swage.rtl.css b/p/themes/Swage/swage.rtl.css
index 0c3e52d20..a4ba4f159 100644
--- a/p/themes/Swage/swage.rtl.css
+++ b/p/themes/Swage/swage.rtl.css
@@ -54,13 +54,12 @@ select:invalid {
 	box-shadow: none;
 }
 
-.nav-list .item, .nav-list .nav-header {
-	height: 2.5em;
+.nav-list .item .nav-header, .nav-list .item {
+	min-height: 2.5em;
 	line-height: 2.5;
-	font-size: 0.9rem;
 }
 
-.dropdown-menu > .item > a,
+.dropdown-menu > .item a,
 .dropdown-menu > .item > span,
 .dropdown-menu > .item > .as-link,
 .dropdown-menu > .item button, .dropdown-menu > .item {
@@ -71,7 +70,6 @@ select:invalid {
 }
 
 .flux::after, .form-group::after {
-	content: "";
 	display: block;
 	clear: both;
 }
@@ -87,7 +85,7 @@ body {
 }
 
 a {
-	color: var(--color-nav-lighter);
+	color: var(--color-text-nav);
 	outline: none;
 }
 a.btn {
@@ -150,10 +148,6 @@ select {
 	padding-bottom: 8px;
 }
 
-input.extend {
-	transition: width 200ms linear;
-}
-
 option {
 	padding: 0 0.5em;
 }
@@ -162,10 +156,8 @@ table {
 	border-collapse: collapse;
 }
 
-tr,
 td,
 th {
-	padding: 0.5em;
 	border: 1px solid var(--color-border-light-darker);
 }
 
@@ -266,7 +258,10 @@ form th {
 	background-image: url("./icons/disabled-light.svg");
 }
 
-.nav-list .nav-header {
+.nav-list {
+	font-size: 0.9rem;
+}
+.nav-list .item .nav-header {
 	padding: 0 1rem;
 	font-weight: bold;
 	background-color: var(--color-background-aside);
@@ -284,25 +279,9 @@ form th {
 .nav-list .item.active a {
 	color: var(--color-text-light);
 }
-.nav-list .item.active.empty a,
-.nav-list .item.active .error a {
-	color: var(--color-text-light);
-}
-.nav-list .item.active.empty a {
-	background-color: var(--color-background-alert);
-}
-.nav-list .item.active.error a {
-	background-color: var(--color-background-bad);
-}
 .nav-list .item > a {
 	padding: 0 1.5rem;
 }
-.nav-list .item.empty a {
-	color: var(--color-text-alert);
-}
-.nav-list .item.error a {
-	color: var(--color-text-bad-lighter);
-}
 .nav-list .item .icon {
 	filter: brightness(3);
 }
@@ -335,12 +314,20 @@ form th {
 .dropdown-menu .dropdown-header a:hover {
 	background-color: var(--color-background-nav);
 }
-.dropdown-menu::after {
-	content: none;
+.dropdown-menu .dropdown-section .dropdown-section-title {
+	cursor: default;
+	padding: 0.25rem 0.25rem 0.125rem 0.5rem;
+	font-weight: bold;
+	color: var(--color-text-light);
+}
+.dropdown-menu .dropdown-section .item a {
+	padding: 0 22px;
+}
+.dropdown-menu .dropdown-section .item a:hover {
+	background-color: var(--color-background-nav);
 }
 .dropdown-menu > .item {
-	padding: 0;
-	margin-right: 10px;
+	padding: 0 0.5rem 0 0;
 }
 .dropdown-menu > .item > a {
 	min-width: initial;
@@ -355,12 +342,32 @@ form th {
 	font-weight: bold;
 	margin: 0 -14px 0 0;
 }
+.dropdown-menu .help a {
+	color: var(--color-text-light);
+	text-decoration: underline;
+	text-decoration-style: dotted;
+}
+.dropdown-menu .help a:hover {
+	text-decoration-style: solid;
+}
 .dropdown-menu .input select,
 .dropdown-menu .input input {
 	margin: 0 auto 5px;
 	padding: 2px 5px;
 }
 
+#dropdown-search-wrapper .dropdown-menu {
+	padding-top: 1rem;
+	padding-bottom: 0.25rem;
+}
+#dropdown-search-wrapper .dropdown-menu .stick.search {
+	width: 100%;
+}
+#dropdown-search-wrapper .dropdown-menu .stick.search input[type=search] {
+	width: 100%;
+	border: 0;
+}
+
 .labels .dropdown-menu,
 .tags .dropdown-menu,
 .share .dropdown-menu {
@@ -374,8 +381,7 @@ form th {
 }
 
 .alert {
-	margin: 5px auto;
-	padding: 10px 15px;
+	margin: 0.25rem auto;
 	background-color: var(--color-background-light);
 	color: var(--color-text-light-darker);
 	font-size: 0.9em;
@@ -496,7 +502,6 @@ form th {
 .box .box-content .item {
 	padding: 0 10px;
 	font-size: 0.9rem;
-	line-height: 2.5;
 }
 .box .box-content .item .configure .icon {
 	vertical-align: middle;
@@ -556,8 +561,6 @@ form th {
 	background-color: var(--color-background-aside);
 }
 .tree-folder-items > .item {
-	padding: 0 10px;
-	line-height: 3;
 	font-size: 0.8rem;
 }
 .tree-folder-items > .item.active {
@@ -572,12 +575,19 @@ form th {
 	height: auto;
 }
 .header > .item {
+	padding: 0;
 	vertical-align: middle;
 }
 .header > .item.title {
 	position: absolute;
 	text-align: center;
 }
+.header > .item.title a {
+	padding: 0 1rem;
+}
+.header > .item.title a:hover .logo {
+	filter: grayscale(100%) brightness(100) opacity(90%);
+}
 .header > .item.title .logo {
 	display: inline-block;
 	height: 26px;
@@ -586,9 +596,6 @@ form th {
 	top: 5px;
 	filter: grayscale(100%) brightness(100);
 }
-.header .item.search input:focus {
-	width: 350px;
-}
 .header .item.search {
 	display: none;
 }
@@ -724,9 +731,11 @@ form th {
 }
 
 .nav_menu {
+	padding: 0;
 	width: 100%;
 	font-size: 0;
 	background-color: var(--color-background-nav);
+	text-align: right;
 	position: sticky;
 	top: 0;
 	z-index: 90;
@@ -754,11 +763,11 @@ form th {
 	width: 90%;
 	border-top: 1px solid var(--color-border-light-darker);
 }
-.flux:hover,
+.flux .flux_header:hover,
 .flux .current {
 	background-color: var(--color-background-hover);
 }
-.flux:hover:not(.current):hover .item.title,
+.flux .flux_header:hover:not(.current):hover .item.title,
 .flux .current:not(.current):hover .item.title {
 	background-color: var(--color-background-hover);
 }
@@ -825,9 +834,6 @@ form th {
 .notification.bad a.close:hover {
 	background-color: var(--color-background-bad);
 }
-.notification#actualizeProgress {
-	line-height: 2;
-}
 .notification a.close {
 	display: none;
 }
@@ -926,6 +932,9 @@ a.signin {
 	.dropdown {
 		position: relative;
 	}
+	.dropdown .dropdown-menu {
+		width: auto;
+	}
 	#new-article {
 		margin-top: 2rem;
 		width: 100%;
@@ -1166,10 +1175,21 @@ button.as-link {
 	left: auto;
 }
 
+#nav_menu_actions ul.dropdown-menu::after {
+	display: none;
+}
+
+#nav_menu_actions .dropdown.only-mobile {
+	display: initial !important;
+}
+
 #nav_menu_read_all ul.dropdown-menu {
 	left: 0;
 	right: auto;
 }
+#nav_menu_read_all ul.dropdown-menu::after {
+	display: none;
+}
 
 #slider label {
 	min-height: initial;
diff --git a/p/themes/Swage/swage.scss b/p/themes/Swage/swage.scss
index 8f61015c5..cc7aed10e 100644
--- a/p/themes/Swage/swage.scss
+++ b/p/themes/Swage/swage.scss
@@ -76,9 +76,8 @@ $color_hover:	#fff;
 }
 
 %nav-list {
-	height: 2.5em;
+	min-height: 2.5em;
 	line-height: 2.5;
-	font-size: 0.9rem;
 }
 
 %dropdown {
@@ -89,7 +88,6 @@ $color_hover:	#fff;
 }
 
 %after {
-	content: "";
 	display: block;
 	clear: both;
 }
@@ -106,7 +104,7 @@ body {
 }
 
 a {
-	color: var(--color-nav-lighter);
+	color: var(--color-text-nav);
 	outline: none;
 
 	&.btn {
@@ -188,12 +186,6 @@ select {
 	padding-bottom: 8px;
 }
 
-input {
-	&.extend {
-		transition: width 200ms linear;
-	}
-}
-
 option {
 	padding: 0 .5em;
 }
@@ -202,10 +194,8 @@ table {
 	border-collapse: collapse;
 }
 
-tr,
 td,
 th {
-	padding: 0.5em;
 	border: 1px solid var(--color-border-light-darker);
 }
 
@@ -341,20 +331,22 @@ form {
 }
 
 .nav-list {
-	.nav-header {
-
-		@extend %nav-list;
-		padding: 0 1rem;
-		font-weight: bold;
-		background-color: var(--color-background-aside);
-		color: var(--color-text-light);
-		cursor: default;
-	}
+	font-size: 0.9rem;
 
 	.item {
 
 		@extend %nav-list;
 
+		.nav-header {
+
+			@extend %nav-list;
+			padding: 0 1rem;
+			font-weight: bold;
+			background-color: var(--color-background-aside);
+			color: var(--color-text-light);
+			cursor: default;
+		}
+
 		a:hover {
 			background-color: var(--color-background-nav-darker);
 			color: var(--color-text-light);
@@ -367,33 +359,12 @@ form {
 			a {
 				color: var(--color-text-light);
 			}
-
-			&.empty a,
-			.error a {
-				color: var(--color-text-light);
-			}
-
-			&.empty a {
-				background-color: var(--color-background-alert);
-			}
-
-			&.error a {
-				background-color: var(--color-background-bad);
-			}
 		}
 
 		> a {
 			padding: 0 1.5rem;
 		}
 
-		&.empty a {
-			color: var(--color-text-alert);
-		}
-
-		&.error a {
-			color: var(--color-text-bad-lighter);
-		}
-
 		.icon {
 			filter: brightness(3);
 		}
@@ -433,18 +404,32 @@ form {
 		}
 	}
 
-	&::after {
-		content: none;
+	.dropdown-section {
+		.dropdown-section-title {
+			cursor: default;
+			padding: 0.25rem 0.5rem 0.125rem 0.25rem;
+			font-weight: bold;
+			color: var(--color-text-light);
+		}
+
+		.item {
+			a {
+				padding: 0 22px;
+
+				&:hover {
+					background-color: var(--color-background-nav);
+				}
+			}
+		}
 	}
 
 	> {
 		.item {
 
 			@extend %dropdown;
-			padding: 0;
-			margin-left: 10px;
+			padding: 0 0 0 0.5rem;
 
-			> a,
+			a,
 			> span,
 			> .as-link,
 			button {
@@ -470,6 +455,16 @@ form {
 		}
 	}
 
+	.help a {
+		color: var(--color-text-light);
+		text-decoration: underline;
+		text-decoration-style: dotted;
+
+		&:hover {
+			text-decoration-style: solid;
+		}
+	}
+
 	.input {
 		select,
 		input {
@@ -479,6 +474,20 @@ form {
 	}
 }
 
+#dropdown-search-wrapper .dropdown-menu {
+	padding-top: 1rem;
+	padding-bottom: 0.25rem;
+
+	.stick.search {
+		width: 100%;
+
+		input[type="search"] {
+			width: 100%;
+			border: 0;
+		}
+	}
+}
+
 .labels,
 .tags,
 .share {
@@ -494,8 +503,7 @@ form {
 }
 
 .alert {
-	margin: 5px auto;
-	padding: 10px 15px;
+	margin: 0.25rem auto;
 	background-color: var(--color-background-light);
 	color: var(--color-text-light-darker);
 	font-size: 0.9em;
@@ -632,7 +640,6 @@ form {
 		.item {
 			padding: 0 10px;
 			font-size: 0.9rem;
-			line-height: 2.5;
 
 			.configure {
 				.icon {
@@ -708,8 +715,6 @@ form {
 	background-color: var(--color-background-aside);
 
 	> .item {
-		padding: 0 10px;
-		line-height: 3;
 		font-size: 0.8rem;
 
 		&.active {
@@ -727,6 +732,7 @@ form {
 	height: auto;
 
 	> .item {
+		padding: 0;
 		vertical-align: middle;
 
 		&.title {
@@ -735,6 +741,16 @@ form {
 			position: absolute;
 			text-align: center;
 
+			a {
+				padding: 0 1rem;
+
+				&:hover {
+					.logo {
+						filter: grayscale(100%) brightness(100) opacity(90%);
+					}
+				}
+			}
+
 			.logo {
 				display: inline-block;
 				height: 26px;
@@ -746,10 +762,6 @@ form {
 		}
 	}
 
-	.item.search input:focus {
-		width: 350px;
-	}
-
 	.item.search {
 		display: none;
 	}
@@ -933,9 +945,11 @@ form {
 
 
 .nav_menu {
+	padding: 0;
 	width: 100%;
 	font-size: 0;
 	background-color: var(--color-background-nav);
+	text-align: left;
 	position: sticky;
 	top: 0;
 	z-index: 90;
@@ -971,7 +985,7 @@ form {
 		border-top: 1px solid var(--color-border-light-darker);
 	}
 
-	&:hover,
+	.flux_header:hover,
 	.current {
 		background-color: var(--color-background-hover);
 
@@ -1061,10 +1075,6 @@ form {
 		}
 	}
 
-	&#actualizeProgress {
-		line-height: 2;
-	}
-
 	a.close {
 		display: none;
 	}
@@ -1185,6 +1195,10 @@ a.signin {
 
 	.dropdown {
 		position: relative;
+
+		.dropdown-menu {
+			width: auto;
+		}
 	}
 
 	#new-article {
@@ -1485,6 +1499,14 @@ button.as-link {
 	ul.dropdown-menu {
 		left: 0;
 		right: auto;
+
+		&::after {
+			display: none;
+		}
+	}
+
+	.dropdown.only-mobile {
+		display: initial !important;
 	}
 }
 
@@ -1492,6 +1514,10 @@ button.as-link {
 	ul.dropdown-menu {
 		right: 0;
 		left: auto;
+
+		&::after {
+			display: none;
+		}
 	}
 }
 
diff --git a/p/themes/base-theme/base.css b/p/themes/base-theme/base.css
index 22bc5a5e7..095ef49c0 100644
--- a/p/themes/base-theme/base.css
+++ b/p/themes/base-theme/base.css
@@ -52,17 +52,12 @@ input:invalid, select:invalid {
 input:disabled, select:disabled {
 }
 
-input.extend {
-	transition: width 200ms linear;
-}
-
 /*=== Tables */
 table {
 	border-collapse: collapse;
 }
 
-tr, th, td {
-	padding: 0.5em;
+th, td {
 }
 
 th {
@@ -200,18 +195,6 @@ a.btn {
 	text-decoration: none;
 }
 
-.nav-list .item.empty a {
-}
-
-.nav-list .item.active.empty a {
-}
-
-.nav-list .item.error a {
-}
-
-.nav-list .item.active.error a {
-}
-
 .nav-list .nav-header {
 	padding: 0 10px;
 	font-weight: bold;
@@ -231,7 +214,6 @@ a.btn {
 }
 
 .dropdown-menu::after {
-	content: "";
 	position: absolute;
 	top: -6px;
 	right: 13px;
@@ -277,8 +259,6 @@ a.btn {
 
 /*=== Alerts */
 .alert {
-	margin: 15px auto;
-	padding: 10px 15px;
 	font-size: 0.9em;
 }
 
@@ -386,8 +366,6 @@ a.btn {
 }
 
 .tree-folder-items > .item {
-	padding: 0 10px;
-	line-height: 3.1;
 	font-size: 0.8rem;
 }
 
@@ -409,15 +387,10 @@ a.btn {
 }
 
 .header > .item {
-	padding: 10px;
 	vertical-align: middle;
 	text-align: center;
 }
 
-.header > .item.title {
-	width: 230px;
-}
-
 .header > .item.title h1 {
 	margin: 0.5em 0;
 }
@@ -427,10 +400,6 @@ a.btn {
 }
 
 .header > .item.search input {
-	width: 230px;
-}
-
-.header .item.search input:focus {
 	width: 350px;
 }
 
@@ -658,13 +627,6 @@ a.btn {
 
 /*=== Notification and actualize notification */
 .notification {
-	padding: 0 0 0 5px;
-	text-align: center;
-	font-weight: bold;
-	font-size: 0.9em;
-	line-height: 3;
-	z-index: 10;
-	vertical-align: middle;
 }
 
 .notification.good {
@@ -673,21 +635,12 @@ a.btn {
 .notification.bad {
 }
 
-.notification a.close {
-	padding: 0 15px;
-	line-height: 3;
-}
-
 .notification.good a.close:hover {
 }
 
 .notification.bad a.close:hover {
 }
 
-.notification#actualizeProgress {
-	line-height: 2;
-}
-
 /*=== "Load more" part */
 #bigMarkAsRead {
 	text-align: center;
diff --git a/p/themes/base-theme/base.rtl.css b/p/themes/base-theme/base.rtl.css
index d03906a90..a97d4876c 100644
--- a/p/themes/base-theme/base.rtl.css
+++ b/p/themes/base-theme/base.rtl.css
@@ -52,17 +52,12 @@ input:invalid, select:invalid {
 input:disabled, select:disabled {
 }
 
-input.extend {
-	transition: width 200ms linear;
-}
-
 /*=== Tables */
 table {
 	border-collapse: collapse;
 }
 
-tr, th, td {
-	padding: 0.5em;
+th, td {
 }
 
 th {
@@ -200,18 +195,6 @@ a.btn {
 	text-decoration: none;
 }
 
-.nav-list .item.empty a {
-}
-
-.nav-list .item.active.empty a {
-}
-
-.nav-list .item.error a {
-}
-
-.nav-list .item.active.error a {
-}
-
 .nav-list .nav-header {
 	padding: 0 10px;
 	font-weight: bold;
@@ -231,7 +214,6 @@ a.btn {
 }
 
 .dropdown-menu::after {
-	content: "";
 	position: absolute;
 	top: -6px;
 	left: 13px;
@@ -277,8 +259,6 @@ a.btn {
 
 /*=== Alerts */
 .alert {
-	margin: 15px auto;
-	padding: 10px 15px;
 	font-size: 0.9em;
 }
 
@@ -386,8 +366,6 @@ a.btn {
 }
 
 .tree-folder-items > .item {
-	padding: 0 10px;
-	line-height: 3.1;
 	font-size: 0.8rem;
 }
 
@@ -409,15 +387,10 @@ a.btn {
 }
 
 .header > .item {
-	padding: 10px;
 	vertical-align: middle;
 	text-align: center;
 }
 
-.header > .item.title {
-	width: 230px;
-}
-
 .header > .item.title h1 {
 	margin: 0.5em 0;
 }
@@ -427,10 +400,6 @@ a.btn {
 }
 
 .header > .item.search input {
-	width: 230px;
-}
-
-.header .item.search input:focus {
 	width: 350px;
 }
 
@@ -658,13 +627,6 @@ a.btn {
 
 /*=== Notification and actualize notification */
 .notification {
-	padding: 0 5px 0 0;
-	text-align: center;
-	font-weight: bold;
-	font-size: 0.9em;
-	line-height: 3;
-	z-index: 10;
-	vertical-align: middle;
 }
 
 .notification.good {
@@ -673,21 +635,12 @@ a.btn {
 .notification.bad {
 }
 
-.notification a.close {
-	padding: 0 15px;
-	line-height: 3;
-}
-
 .notification.good a.close:hover {
 }
 
 .notification.bad a.close:hover {
 }
 
-.notification#actualizeProgress {
-	line-height: 2;
-}
-
 /*=== "Load more" part */
 #bigMarkAsRead {
 	text-align: center;
diff --git a/p/themes/base-theme/frss.css b/p/themes/base-theme/frss.css
index e0ef320e1..6a5ef8b87 100644
--- a/p/themes/base-theme/frss.css
+++ b/p/themes/base-theme/frss.css
@@ -39,6 +39,7 @@
 	--frss-loading-image: url("loader.gif");
 
 	--frss-padding-flux-items: 0.75rem;
+	--frss-padding-top-bottom: 0.5rem;
 
 	line-height: 1.5;
 }
@@ -114,10 +115,13 @@ h3 {
 	display: none;
 }
 
+.only-mobile {
+	display: none !important;
+}
+
 /*=== Paragraphs */
 p {
 	margin: 1rem 0 0.5rem;
-	font-size: 1rem;
 }
 
 p.help, .prompt p.help {
@@ -194,7 +198,8 @@ label {
 }
 
 input {
-	width: 180px;
+	max-width: 90%;
+	width: 300px;
 }
 
 input[type=number] {
@@ -203,8 +208,7 @@ input[type=number] {
 
 textarea,
 input[type="file"],
-input.long,
-input.extend:focus {
+input.long {
 	width: 300px;
 }
 
@@ -212,6 +216,11 @@ input, select, textarea {
 	display: inline-block;
 	max-width: 100%;
 	font-size: 0.8rem;
+	box-sizing: border-box;
+}
+
+select {
+	min-width: 6em;
 }
 
 input.w50,
@@ -286,8 +295,8 @@ input[type="checkbox"] {
 	width: calc(99% - 5em);
 }
 
-.dropdown-menu > .item > a:hover,
-.dropdown-menu > .item > button:hover {
+.dropdown-menu .item > a:hover,
+.dropdown-menu .item > button:hover {
 	text-decoration: none;
 }
 
@@ -317,7 +326,6 @@ button.as-link:hover,
 button.as-link:active {
 	background: transparent;
 	color: inherit;
-	font-size: 1.1rem;
 	border: none;
 	cursor: pointer;
 	text-align: left;
@@ -333,9 +341,14 @@ button.as-link[disabled] {
 }
 
 table {
+	margin: 0.5rem 0;
 	max-width: 100%;
 }
 
+th, td {
+	padding: 0.5rem;
+}
+
 th.numeric,
 td.numeric {
 	text-align: center;
@@ -389,10 +402,11 @@ td.numeric {
 	display: block;
 	float: left;
 	width: 200px;
+	text-align: right;
 }
 
 .form-group .group-controls {
-	min-width: 250px;
+	min-width: 200px;
 	margin: 0 0 0 220px;
 	overflow-x: auto;
 }
@@ -437,7 +451,7 @@ td.numeric {
 	flex-shrink: 0;
 }
 
-.stick form {
+#nav_menu_read_all form {
 	display: inline-flex;
 }
 
@@ -554,6 +568,10 @@ input[type="checkbox"]:focus-visible {
 }
 
 /*=== Navigation */
+.nav-list {
+	padding-bottom: 3rem;
+}
+
 .nav-list .nav-header,
 .nav-list .item {
 	display: block;
@@ -583,7 +601,7 @@ input[type="checkbox"]:focus-visible {
 }
 
 .horizontal-list .item .item-element {
-	padding: 0.5rem 0;
+	padding: var(--frss-padding-top-bottom) 0;
 }
 
 /*=== manage-list */
@@ -649,13 +667,13 @@ input[type="checkbox"]:focus-visible {
 	display: block;
 }
 
-.dropdown-menu > .item {
+.dropdown-menu .item {
 	display: block;
 }
 
-.dropdown-menu > .item > a,
-.dropdown-menu > .item > .as-link,
-.dropdown-menu > .item > span {
+.dropdown-menu .item > a,
+.dropdown-menu .item > .as-link,
+.dropdown-menu .item > span {
 	display: block;
 	width: 100%;
 	white-space: nowrap;
@@ -696,6 +714,7 @@ input[type="checkbox"]:focus-visible {
 }
 
 .item ~ .dropdown-header,
+.dropdown-section ~ .dropdown-section,
 .item.separator {
 	margin-top: 5px;
 	padding-top: 5px;
@@ -705,6 +724,8 @@ input[type="checkbox"]:focus-visible {
 
 /*=== Alerts */
 .alert {
+	margin: 1rem auto;
+	padding: 0.75rem 1rem;
 	display: block;
 	width: 90%;
 }
@@ -826,6 +847,7 @@ input[type="checkbox"]:focus-visible {
 
 .box .box-content .item.feed {
 	display: block;
+	padding-top: var(--frss-padding-top-bottom);
 }
 
 .box .box-content .item.feed.moved {
@@ -955,6 +977,11 @@ li.drag-hover {
 	transition: max-height .3s linear;
 }
 
+.tree-folder-title {
+	padding-top: var(--frss-padding-top-bottom);
+	padding-bottom: var(--frss-padding-top-bottom);
+}
+
 .tree-folder-title .title {
 	display: inline-block;
 	width: 100%;
@@ -993,16 +1020,19 @@ li.drag-hover {
 .header {
 	display: table;
 	width: 100%;
-	height: 85px;
+	height: calc(2.5rem + 2 * var(--frss-padding-top-bottom));
 	table-layout: fixed;
 }
 
 .header > .item {
+	padding-top: var(--frss-padding-top-bottom);
+	padding-bottom: var(--frss-padding-top-bottom);
 	display: table-cell;
 }
 
 .header > .item.title {
-	width: 250px;
+	width: 300px;
+	text-align: center;
 	white-space: nowrap;
 }
 
@@ -1010,12 +1040,22 @@ li.drag-hover {
 	display: inline-block;
 }
 
+.header > .item.title a {
+	padding: 0.25rem 1rem;
+	display: inline-block;
+}
+
 .header > .item.title .logo {
 	display: inline-block;
-	height: 32px;
+	height: 2rem;
 	vertical-align: middle;
 }
 
+.header > .item.title a:hover .logo {
+	filter: brightness(1.4);
+	transition: filter 0.1s linear;
+}
+
 .header > .item.configure {
 	width: 100px;
 }
@@ -1029,7 +1069,7 @@ input[type="search"] {
 	background: inherit;
 	display: table;
 	width: 100%;
-	height: calc(100vh - 85px);
+	height: calc(100vh - (calc(2.5rem + 2 * var(--frss-padding-top-bottom) + 1px)));
 	table-layout: fixed;
 }
 
@@ -1061,7 +1101,7 @@ input[type="search"] {
 }
 
 .aside_feed .tree-folder-items .item.feed {
-	padding: 0 0.75rem;
+	padding: var(--frss-padding-top-bottom) 0.75rem;
 }
 
 .aside_feed .tree-folder-items:not(.active) {
@@ -1104,6 +1144,7 @@ input[type="search"] {
 }
 
 #new-article > a {
+	padding: calc(0.25rem + var(--frss-padding-top-bottom)) 1rem;
 	display: block;
 }
 
@@ -1132,7 +1173,7 @@ input[type="search"] {
 }
 
 .flux .flux_header .item .item-element {
-	padding: 0.5rem 0;
+	padding: var(--frss-padding-top-bottom) 0;
 	line-height: 1.5rem;
 }
 
@@ -1163,7 +1204,7 @@ a.website:hover .favicon {
 }
 
 .flux:not(.current):hover .item.title {
-	background-color: var(--frss-background-color);
+	background-color: inherit;
 	max-width: calc(100% - 320px);
 	position: absolute;
 }
@@ -1179,10 +1220,14 @@ a.website:hover .favicon {
 
 .flux .item.thumbnail {
 	line-height: 0;
-	padding: 0.75rem;
+	padding: var(--frss-padding-top-bottom) var(--frss-padding-flux-items);
 	height: 80px;
 }
 
+.flux .item.thumbnail .item-element {
+	padding: 0;
+}
+
 .flux .item.thumbnail.small {
 	height: 40px;
 }
@@ -1225,6 +1270,7 @@ a.website:hover .favicon {
 	color: var(--frss-font-color-grey-dark);
 	font-size: 0.9rem;
 	font-weight: normal;
+	overflow: hidden;
 	text-overflow: ellipsis;
 	-webkit-line-clamp: 2;
 	-webkit-box-orient: vertical;
@@ -1272,16 +1318,38 @@ a.website:hover .favicon {
 	word-wrap: break-word;
 }
 
+.content .text {
+	overflow-x: auto;
+}
+
+.content .text div {
+	overflow-x: auto;
+}
+
+.content header,
+.content .text,
+.content footer {
+	padding: 0 3rem;
+}
+
+.content header {
+	padding-top: calc(2 * var(--frss-padding-top-bottom));
+}
+
+.content footer {
+	padding-bottom: calc(2 * var(--frss-padding-top-bottom));
+}
+
 .content.large {
-	max-width: 1000px;
+	max-width: 1100px;
 }
 
 .content.medium {
-	max-width: 800px;
+	max-width: 900px;
 }
 
 .content.thin {
-	max-width: 550px;
+	max-width: 650px;
 }
 
 .content .article-header-topline {
@@ -1295,14 +1363,13 @@ a.website:hover .favicon {
 }
 
 .content > footer {
-	margin: 2rem 0 2rem;
 	padding-top: 1rem;
-	border-top: 2px solid var(--frss-border-color);
 	clear: both;
 }
 
 .content > footer .subtitle {
-	padding-bottom: 1rem;
+	padding: 2rem 0 1rem;
+	border-top: 2px solid var(--frss-border-color);
 }
 
 .content > header .tags,
@@ -1312,8 +1379,9 @@ a.website:hover .favicon {
 }
 
 .content > header .tags .icon,
+.content > header .website .favicon,
 .content > footer .tags .icon {
-	padding: 0 1rem 0 0;
+	margin: 0 0.5rem 0 0;
 	line-height: 1.5;
 }
 
@@ -1362,15 +1430,19 @@ a.website:hover .favicon {
 
 /*=== Notification and actualize notification */
 .notification {
-	padding: 10px 50px 10px 10px;
+	padding: 0.75rem 3.5rem 0.75rem 0.75rem;
 	position: absolute;
-	top: 1em;
+	top: 1rem;
 	left: 25%; right: 25%;
 	z-index: 9999;
 	background-color: var(--frss-background-color);
+	font-weight: bold;
+	font-size: 0.9rem;
 	border: 1px solid var(--frss-border-color);
 	opacity: 1;
+	text-align: center;
 	line-height: 2;
+	vertical-align: middle;
 	visibility: visible;
 	transition: visibility 0s, opacity .3s linear;
 }
@@ -1381,10 +1453,12 @@ a.website:hover .favicon {
 }
 
 .notification a.close {
+	padding: 0 1rem;
 	position: absolute;
 	top: 0; bottom: 0;
 	right: 0;
 	display: inline-block;
+	line-height: 3;
 }
 
 .notification a.close:hover {
@@ -1771,18 +1845,23 @@ input:checked + .slide-container .properties {
 
 .item.share.error a::after,
 .category .title.error::before,
-.item.feed.error .item-title::before {
+.item.feed.error .item-title::before,
+.properties .error::before {
 	content: " ⚠ ";
 	color: var(--frss-font-color-error);
 }
 
+.deprecated {
+	font-weight: bold;
+}
+
 .feed.item.error.active .item-title::before {
 	color: var(--frss-font-color-light);
 }
 
 .aside .category .title:not([data-unread="0"])::after,
 .aside .feed .item-title:not([data-unread="0"])::after {
-	margin: 0.6rem 0 0 0;
+	margin: calc(0.125rem + var(--frss-padding-top-bottom)) 0 0 0;
 	padding: 0.25rem 0.5rem;
 	min-width: 2rem;
 	display: block;
@@ -1833,6 +1912,26 @@ input:checked + .slide-container .properties {
 	margin: 1em 0 0 0;
 }
 
+#stream.global .feed {
+	position: relative;
+}
+
+#stream.global .feed .item-title:not([data-unread="0"])::after {
+	margin: 0.5rem 0px 0px;
+	padding: 5px 10px;
+	min-width: 20px;
+	display: block;
+	content: attr(data-unread);
+	position: absolute;
+	top: 0px;
+	right: 0px;
+	text-align: center;
+	font-size: 0.75rem;
+	border-radius: 12px;
+	line-height: 1;
+	font-weight: initial;
+}
+
 .feed.active .item-title:not([data-unread="0"])::after {
 	color: var(--frss-font-color-light);
 	border: 1px solid var(--frss-border-color);
@@ -1850,7 +1949,10 @@ input:checked + .slide-container .properties {
 }
 
 .nav_menu {
+	padding-top: var(--frss-padding-top-bottom);
+	padding-bottom: var(--frss-padding-top-bottom);
 	background: inherit;
+	text-align: center;
 }
 
 .nav_mobile {
@@ -1858,7 +1960,6 @@ input:checked + .slide-container .properties {
 }
 
 .nav-login,
-.nav_menu .search,
 .aside .toggle_aside,
 #slider .toggle_aside,
 .nav_menu .toggle_aside,
@@ -1909,7 +2010,7 @@ input:checked + .slide-container .properties {
 }
 
 .reader .flux .content {
-	padding: 3rem;
+	padding: 3rem 0;
 	background-color: var(--frss-background-color);
 	border: 1px solid var(--frss-border-color);
 }
@@ -1933,10 +2034,19 @@ input:checked + .slide-container .properties {
 		display: none;
 	}
 
+	.only-mobile {
+		display: unset !important;
+	}
+
 	.header > .item {
 		padding: 5px;
 	}
 
+	.header > .item.title {
+		width: 75%;
+		text-align: left;
+	}
+
 	.header > .item.title .logo {
 		height: 24px;
 	}
@@ -1954,7 +2064,7 @@ input:checked + .slide-container .properties {
 	#panel .close,
 	.dropdown-menu .toggle_aside,
 	#slider .toggle_aside {
-		padding: 1rem;
+		padding: 1rem 0;
 		display: block;
 		width: 100%;
 		border-bottom: 1px solid var(--frss-border-color);
@@ -1968,6 +2078,7 @@ input:checked + .slide-container .properties {
 	.form-group .group-name {
 		float: none;
 		width: auto;
+		text-align: left;
 	}
 
 	.form-group .group-controls {
@@ -1978,7 +2089,8 @@ input:checked + .slide-container .properties {
 		position: inherit;
 	}
 
-	.dropdown .dropdown-header {
+	.dropdown .dropdown-header,
+	.dropdown .dropdown-section {
 		line-height: 2;
 	}
 
@@ -1994,6 +2106,23 @@ input:checked + .slide-container .properties {
 		margin: 2px 0;
 	}
 
+	.dropdown .dropdown-menu .item .stick .btn {
+		margin: 0;
+	}
+
+	.dropdown .dropdown-menu .item form {
+		display: block;
+		text-align: center;
+	}
+
+	.dropdown .dropdown-menu .item .stick.search {
+		width: calc(100% - 20px);
+	}
+
+	.dropdown .dropdown-menu .item .stick.search input {
+		width: 95%;
+	}
+
 	.dropdown .dropdown-menu .item button.as-link,
 	.dropdown .dropdown-menu .item button.as-link:hover, button.as-link:active {
 		width: 100%;
@@ -2018,7 +2147,7 @@ input:checked + .slide-container .properties {
 	}
 
 	.dropdown-target:target ~ .dropdown-toggle:not(.btn) ~ .dropdown-menu {
-		margin-top: 0;
+		margin-top: 10px;
 	}
 
 	.configure .dropdown .dropdown-menu {
@@ -2056,7 +2185,6 @@ input:checked + .slide-container .properties {
 	}
 
 	.nav_menu .toggle_aside,
-	.nav_menu .search,
 	#panel .close img {
 		display: inline-block;
 	}
@@ -2109,7 +2237,22 @@ input:checked + .slide-container .properties {
 		top: 0;
 	}
 
+	.content header,
+	.content .text,
+	.content footer {
+		padding: 1rem;
+	}
+
+	table {
+		font-size: 0.9rem;
+	}
+
+	th, td {
+		padding: 0.25rem;
+	}
+
 	.notification {
+		padding: 0.75rem;
 		top: 0;
 		left: 0;
 		right: 0;
diff --git a/p/themes/base-theme/frss.rtl.css b/p/themes/base-theme/frss.rtl.css
index 1755291bd..1d818cf1a 100644
--- a/p/themes/base-theme/frss.rtl.css
+++ b/p/themes/base-theme/frss.rtl.css
@@ -39,6 +39,7 @@
 	--frss-loading-image: url("loader.gif");
 
 	--frss-padding-flux-items: 0.75rem;
+	--frss-padding-top-bottom: 0.5rem;
 
 	line-height: 1.5;
 }
@@ -114,10 +115,13 @@ h3 {
 	display: none;
 }
 
+.only-mobile {
+	display: none !important;
+}
+
 /*=== Paragraphs */
 p {
 	margin: 1rem 0 0.5rem;
-	font-size: 1rem;
 }
 
 p.help, .prompt p.help {
@@ -194,7 +198,8 @@ label {
 }
 
 input {
-	width: 180px;
+	max-width: 90%;
+	width: 300px;
 }
 
 input[type=number] {
@@ -203,8 +208,7 @@ input[type=number] {
 
 textarea,
 input[type="file"],
-input.long,
-input.extend:focus {
+input.long {
 	width: 300px;
 }
 
@@ -212,6 +216,11 @@ input, select, textarea {
 	display: inline-block;
 	max-width: 100%;
 	font-size: 0.8rem;
+	box-sizing: border-box;
+}
+
+select {
+	min-width: 6em;
 }
 
 input.w50,
@@ -286,8 +295,8 @@ input[type="checkbox"] {
 	width: calc(99% - 5em);
 }
 
-.dropdown-menu > .item > a:hover,
-.dropdown-menu > .item > button:hover {
+.dropdown-menu .item > a:hover,
+.dropdown-menu .item > button:hover {
 	text-decoration: none;
 }
 
@@ -317,7 +326,6 @@ button.as-link:hover,
 button.as-link:active {
 	background: transparent;
 	color: inherit;
-	font-size: 1.1rem;
 	border: none;
 	cursor: pointer;
 	text-align: right;
@@ -333,9 +341,14 @@ button.as-link[disabled] {
 }
 
 table {
+	margin: 0.5rem 0;
 	max-width: 100%;
 }
 
+th, td {
+	padding: 0.5rem;
+}
+
 th.numeric,
 td.numeric {
 	text-align: center;
@@ -389,10 +402,11 @@ td.numeric {
 	display: block;
 	float: right;
 	width: 200px;
+	text-align: left;
 }
 
 .form-group .group-controls {
-	min-width: 250px;
+	min-width: 200px;
 	margin: 0 220px 0 0;
 	overflow-x: auto;
 }
@@ -437,7 +451,7 @@ td.numeric {
 	flex-shrink: 0;
 }
 
-.stick form {
+#nav_menu_read_all form {
 	display: inline-flex;
 }
 
@@ -554,6 +568,10 @@ input[type="checkbox"]:focus-visible {
 }
 
 /*=== Navigation */
+.nav-list {
+	padding-bottom: 3rem;
+}
+
 .nav-list .nav-header,
 .nav-list .item {
 	display: block;
@@ -583,7 +601,7 @@ input[type="checkbox"]:focus-visible {
 }
 
 .horizontal-list .item .item-element {
-	padding: 0.5rem 0;
+	padding: var(--frss-padding-top-bottom) 0;
 }
 
 /*=== manage-list */
@@ -649,13 +667,13 @@ input[type="checkbox"]:focus-visible {
 	display: block;
 }
 
-.dropdown-menu > .item {
+.dropdown-menu .item {
 	display: block;
 }
 
-.dropdown-menu > .item > a,
-.dropdown-menu > .item > .as-link,
-.dropdown-menu > .item > span {
+.dropdown-menu .item > a,
+.dropdown-menu .item > .as-link,
+.dropdown-menu .item > span {
 	display: block;
 	width: 100%;
 	white-space: nowrap;
@@ -696,6 +714,7 @@ input[type="checkbox"]:focus-visible {
 }
 
 .item ~ .dropdown-header,
+.dropdown-section ~ .dropdown-section,
 .item.separator {
 	margin-top: 5px;
 	padding-top: 5px;
@@ -705,6 +724,8 @@ input[type="checkbox"]:focus-visible {
 
 /*=== Alerts */
 .alert {
+	margin: 1rem auto;
+	padding: 0.75rem 1rem;
 	display: block;
 	width: 90%;
 }
@@ -826,6 +847,7 @@ input[type="checkbox"]:focus-visible {
 
 .box .box-content .item.feed {
 	display: block;
+	padding-top: var(--frss-padding-top-bottom);
 }
 
 .box .box-content .item.feed.moved {
@@ -955,6 +977,11 @@ li.drag-hover {
 	transition: max-height .3s linear;
 }
 
+.tree-folder-title {
+	padding-top: var(--frss-padding-top-bottom);
+	padding-bottom: var(--frss-padding-top-bottom);
+}
+
 .tree-folder-title .title {
 	display: inline-block;
 	width: 100%;
@@ -993,16 +1020,19 @@ li.drag-hover {
 .header {
 	display: table;
 	width: 100%;
-	height: 85px;
+	height: calc(2.5rem + 2 * var(--frss-padding-top-bottom));
 	table-layout: fixed;
 }
 
 .header > .item {
+	padding-top: var(--frss-padding-top-bottom);
+	padding-bottom: var(--frss-padding-top-bottom);
 	display: table-cell;
 }
 
 .header > .item.title {
-	width: 250px;
+	width: 300px;
+	text-align: center;
 	white-space: nowrap;
 }
 
@@ -1010,12 +1040,22 @@ li.drag-hover {
 	display: inline-block;
 }
 
+.header > .item.title a {
+	padding: 0.25rem 1rem;
+	display: inline-block;
+}
+
 .header > .item.title .logo {
 	display: inline-block;
-	height: 32px;
+	height: 2rem;
 	vertical-align: middle;
 }
 
+.header > .item.title a:hover .logo {
+	filter: brightness(1.4);
+	transition: filter 0.1s linear;
+}
+
 .header > .item.configure {
 	width: 100px;
 }
@@ -1029,7 +1069,7 @@ input[type="search"] {
 	background: inherit;
 	display: table;
 	width: 100%;
-	height: calc(100vh - 85px);
+	height: calc(100vh - (calc(2.5rem + 2 * var(--frss-padding-top-bottom) + 1px)));
 	table-layout: fixed;
 }
 
@@ -1061,7 +1101,7 @@ input[type="search"] {
 }
 
 .aside_feed .tree-folder-items .item.feed {
-	padding: 0 0.75rem;
+	padding: var(--frss-padding-top-bottom) 0.75rem;
 }
 
 .aside_feed .tree-folder-items:not(.active) {
@@ -1104,6 +1144,7 @@ input[type="search"] {
 }
 
 #new-article > a {
+	padding: calc(0.25rem + var(--frss-padding-top-bottom)) 1rem;
 	display: block;
 }
 
@@ -1132,7 +1173,7 @@ input[type="search"] {
 }
 
 .flux .flux_header .item .item-element {
-	padding: 0.5rem 0;
+	padding: var(--frss-padding-top-bottom) 0;
 	line-height: 1.5rem;
 }
 
@@ -1163,7 +1204,7 @@ a.website:hover .favicon {
 }
 
 .flux:not(.current):hover .item.title {
-	background-color: var(--frss-background-color);
+	background-color: inherit;
 	max-width: calc(100% - 320px);
 	position: absolute;
 }
@@ -1179,10 +1220,14 @@ a.website:hover .favicon {
 
 .flux .item.thumbnail {
 	line-height: 0;
-	padding: 0.75rem;
+	padding: var(--frss-padding-top-bottom) var(--frss-padding-flux-items);
 	height: 80px;
 }
 
+.flux .item.thumbnail .item-element {
+	padding: 0;
+}
+
 .flux .item.thumbnail.small {
 	height: 40px;
 }
@@ -1225,6 +1270,7 @@ a.website:hover .favicon {
 	color: var(--frss-font-color-grey-dark);
 	font-size: 0.9rem;
 	font-weight: normal;
+	overflow: hidden;
 	text-overflow: ellipsis;
 	-webkit-line-clamp: 2;
 	-webkit-box-orient: vertical;
@@ -1272,16 +1318,38 @@ a.website:hover .favicon {
 	word-wrap: break-word;
 }
 
+.content .text {
+	overflow-x: auto;
+}
+
+.content .text div {
+	overflow-x: auto;
+}
+
+.content header,
+.content .text,
+.content footer {
+	padding: 0 3rem;
+}
+
+.content header {
+	padding-top: calc(2 * var(--frss-padding-top-bottom));
+}
+
+.content footer {
+	padding-bottom: calc(2 * var(--frss-padding-top-bottom));
+}
+
 .content.large {
-	max-width: 1000px;
+	max-width: 1100px;
 }
 
 .content.medium {
-	max-width: 800px;
+	max-width: 900px;
 }
 
 .content.thin {
-	max-width: 550px;
+	max-width: 650px;
 }
 
 .content .article-header-topline {
@@ -1295,14 +1363,13 @@ a.website:hover .favicon {
 }
 
 .content > footer {
-	margin: 2rem 0 2rem;
 	padding-top: 1rem;
-	border-top: 2px solid var(--frss-border-color);
 	clear: both;
 }
 
 .content > footer .subtitle {
-	padding-bottom: 1rem;
+	padding: 2rem 0 1rem;
+	border-top: 2px solid var(--frss-border-color);
 }
 
 .content > header .tags,
@@ -1312,8 +1379,9 @@ a.website:hover .favicon {
 }
 
 .content > header .tags .icon,
+.content > header .website .favicon,
 .content > footer .tags .icon {
-	padding: 0 0 0 1rem;
+	margin: 0 0 0 0.5rem;
 	line-height: 1.5;
 }
 
@@ -1362,15 +1430,19 @@ a.website:hover .favicon {
 
 /*=== Notification and actualize notification */
 .notification {
-	padding: 10px 10px 10px 50px;
+	padding: 0.75rem 0.75rem 0.75rem 3.5rem;
 	position: absolute;
-	top: 1em;
+	top: 1rem;
 	right: 25%; left: 25%;
 	z-index: 9999;
 	background-color: var(--frss-background-color);
+	font-weight: bold;
+	font-size: 0.9rem;
 	border: 1px solid var(--frss-border-color);
 	opacity: 1;
+	text-align: center;
 	line-height: 2;
+	vertical-align: middle;
 	visibility: visible;
 	transition: visibility 0s, opacity .3s linear;
 }
@@ -1381,10 +1453,12 @@ a.website:hover .favicon {
 }
 
 .notification a.close {
+	padding: 0 1rem;
 	position: absolute;
 	top: 0; bottom: 0;
 	left: 0;
 	display: inline-block;
+	line-height: 3;
 }
 
 .notification a.close:hover {
@@ -1771,18 +1845,23 @@ input:checked + .slide-container .properties {
 
 .item.share.error a::after,
 .category .title.error::before,
-.item.feed.error .item-title::before {
+.item.feed.error .item-title::before,
+.properties .error::before {
 	content: " ⚠ ";
 	color: var(--frss-font-color-error);
 }
 
+.deprecated {
+	font-weight: bold;
+}
+
 .feed.item.error.active .item-title::before {
 	color: var(--frss-font-color-light);
 }
 
 .aside .category .title:not([data-unread="0"])::after,
 .aside .feed .item-title:not([data-unread="0"])::after {
-	margin: 0.6rem 0 0 0;
+	margin: calc(0.125rem + var(--frss-padding-top-bottom)) 0 0 0;
 	padding: 0.25rem 0.5rem;
 	min-width: 2rem;
 	display: block;
@@ -1833,6 +1912,26 @@ input:checked + .slide-container .properties {
 	margin: 1em 0 0 0;
 }
 
+#stream.global .feed {
+	position: relative;
+}
+
+#stream.global .feed .item-title:not([data-unread="0"])::after {
+	margin: 0.5rem 0px 0px;
+	padding: 5px 10px;
+	min-width: 20px;
+	display: block;
+	content: attr(data-unread);
+	position: absolute;
+	top: 0px;
+	left: 0px;
+	text-align: center;
+	font-size: 0.75rem;
+	border-radius: 12px;
+	line-height: 1;
+	font-weight: initial;
+}
+
 .feed.active .item-title:not([data-unread="0"])::after {
 	color: var(--frss-font-color-light);
 	border: 1px solid var(--frss-border-color);
@@ -1850,7 +1949,10 @@ input:checked + .slide-container .properties {
 }
 
 .nav_menu {
+	padding-top: var(--frss-padding-top-bottom);
+	padding-bottom: var(--frss-padding-top-bottom);
 	background: inherit;
+	text-align: center;
 }
 
 .nav_mobile {
@@ -1858,7 +1960,6 @@ input:checked + .slide-container .properties {
 }
 
 .nav-login,
-.nav_menu .search,
 .aside .toggle_aside,
 #slider .toggle_aside,
 .nav_menu .toggle_aside,
@@ -1909,7 +2010,7 @@ input:checked + .slide-container .properties {
 }
 
 .reader .flux .content {
-	padding: 3rem;
+	padding: 3rem 0;
 	background-color: var(--frss-background-color);
 	border: 1px solid var(--frss-border-color);
 }
@@ -1933,10 +2034,19 @@ input:checked + .slide-container .properties {
 		display: none;
 	}
 
+	.only-mobile {
+		display: unset !important;
+	}
+
 	.header > .item {
 		padding: 5px;
 	}
 
+	.header > .item.title {
+		width: 75%;
+		text-align: right;
+	}
+
 	.header > .item.title .logo {
 		height: 24px;
 	}
@@ -1954,7 +2064,7 @@ input:checked + .slide-container .properties {
 	#panel .close,
 	.dropdown-menu .toggle_aside,
 	#slider .toggle_aside {
-		padding: 1rem;
+		padding: 1rem 0;
 		display: block;
 		width: 100%;
 		border-bottom: 1px solid var(--frss-border-color);
@@ -1968,6 +2078,7 @@ input:checked + .slide-container .properties {
 	.form-group .group-name {
 		float: none;
 		width: auto;
+		text-align: right;
 	}
 
 	.form-group .group-controls {
@@ -1978,7 +2089,8 @@ input:checked + .slide-container .properties {
 		position: inherit;
 	}
 
-	.dropdown .dropdown-header {
+	.dropdown .dropdown-header,
+	.dropdown .dropdown-section {
 		line-height: 2;
 	}
 
@@ -1994,6 +2106,23 @@ input:checked + .slide-container .properties {
 		margin: 2px 0;
 	}
 
+	.dropdown .dropdown-menu .item .stick .btn {
+		margin: 0;
+	}
+
+	.dropdown .dropdown-menu .item form {
+		display: block;
+		text-align: center;
+	}
+
+	.dropdown .dropdown-menu .item .stick.search {
+		width: calc(100% - 20px);
+	}
+
+	.dropdown .dropdown-menu .item .stick.search input {
+		width: 95%;
+	}
+
 	.dropdown .dropdown-menu .item button.as-link,
 	.dropdown .dropdown-menu .item button.as-link:hover, button.as-link:active {
 		width: 100%;
@@ -2018,7 +2147,7 @@ input:checked + .slide-container .properties {
 	}
 
 	.dropdown-target:target ~ .dropdown-toggle:not(.btn) ~ .dropdown-menu {
-		margin-top: 0;
+		margin-top: 10px;
 	}
 
 	.configure .dropdown .dropdown-menu {
@@ -2056,7 +2185,6 @@ input:checked + .slide-container .properties {
 	}
 
 	.nav_menu .toggle_aside,
-	.nav_menu .search,
 	#panel .close img {
 		display: inline-block;
 	}
@@ -2109,7 +2237,22 @@ input:checked + .slide-container .properties {
 		top: 0;
 	}
 
+	.content header,
+	.content .text,
+	.content footer {
+		padding: 1rem;
+	}
+
+	table {
+		font-size: 0.9rem;
+	}
+
+	th, td {
+		padding: 0.25rem;
+	}
+
 	.notification {
+		padding: 0.75rem;
 		top: 0;
 		right: 0;
 		left: 0;
diff --git a/p/themes/icons/bookmark.svg b/p/themes/icons/bookmark.svg
deleted file mode 100644
index 63a44908f..000000000
--- a/p/themes/icons/bookmark.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16">
-<g transform="translate(-41.000202,-397)">
-<path style="enable-background:accumulate;color:#000000;" d="m530.95,186.71c-0.77941,0.55189-3.1576-1.906-4.1125-1.9179-0.95532-0.0119-3.3949,2.3858-4.161,1.8149-0.76573-0.57072,0.83698-3.592,0.55319-4.5039-0.2839-0.91223-3.3182-2.4915-3.0119-3.3965,0.30617-0.90461,3.6749-0.31399,4.4544-0.86567,0.77986-0.5519,1.3442-3.9257,2.2995-3.914,0.95494,0.0116,1.4342,3.398,2.1998,3.9689,0.76588,0.57114,4.1489,0.0653,4.4331,0.97746,0.28402,0.9118-2.7885,2.414-3.0949,3.3186-0.30652,0.90489,1.22,3.966,0.44027,4.5182z" fill-rule="nonzero" transform="matrix(1.0472113,-0.00871584,0.00871584,1.0472113,-504.35434,220.15425)" fill="#f1c40f"/>
-</g>
-</svg>
\ No newline at end of file
diff --git a/p/themes/icons/look.svg b/p/themes/icons/look.svg
index 79464d3ab..79464d3ab 100755..100644
--- a/p/themes/icons/look.svg
+++ b/p/themes/icons/look.svg