Improve functionnality + fix partially wuala theme