Merge branch 'themes2' into debian