Merge "fix links to style and themes source files" into jb-dev