Fix pagination
Update themes