Update theme, fix buttons