CSS + JS files unified, category regression fixed