fixed bug

Signed-off-by: Raf <7909000@gmail.com>
Merge branch 'refs/heads/lastworked'

Signed-off-by: Raf <7909000@gmail.com>

Conflicts:
	theme.php