Dict --> To list
Merge remote-tracking branch 'origin/master'

Conflicts:
	datas/themes.csv