Style and Theme changings

Additional style changes