Update theme. Minor fixes