Updated theme with js, buttons and components fixes