[1599] Auto-theme in package form - More testing. Fix theming by function.