Sync aalborg theme - PR #6138