Theme update

Some controls fixed