Improved look (based from Pakagist)