Changes to theme
Merging
Merging
Editing os-mousetracking