using theme konoha and update to latest upstream