         let cell = tableView.dequeueReusableCell(withIdentifier: "cell", for: indexPath)
         let sortChoice = kPiwigoSort(rawValue: Int16(indexPath.row))
 
-        cell.backgroundColor = UIColor.piwigoColorCellBackground()
-        cell.tintColor = UIColor.piwigoColorOrange()
+        cell.backgroundColor = .piwigoColorCellBackground()
+        cell.tintColor = .piwigoColorOrange()
         cell.textLabel?.font = UIFont.piwigoFontNormal()
-        cell.textLabel?.textColor = UIColor.piwigoColorLeftLabel()
+        cell.textLabel?.textColor = .piwigoColorLeftLabel()
         cell.textLabel?.text = CategorySortViewController.getNameForCategorySortType(sortChoice!)
         cell.textLabel?.minimumScaleFactor = 0.5
         cell.textLabel?.adjustsFontSizeToFitWidth = true

        // Header label
        let headerLabel = UILabel()
        headerLabel.translatesAutoresizingMaskIntoConstraints = false
        headerLabel.textColor = UIColor.piwigoColorHeader()
        headerLabel.numberOfLines = 0
        headerLabel.adjustsFontSizeToFitWidth = false
        headerLabel.lineBreakMode = .byWordWrapping

    @objc
    func applyColorPalette() {
        // Background color of the view
        view.backgroundColor = .piwigoColorBackground()

        // Navigation bar
        let attributes = [
