Theme revamp, cleaned up index a bit