Align buttons and change theme colors again