Added theme colors and other stuff