Feature/sugar theme rebase