Merge my-theme

various fixes