Updated feature intertwine_layout_2012
Moved theme common files