Added theme and cleaned up styles