Theme stuff removed
New files and packages added
Merge remote-tracking branch 'origin/master'