Fix theme and javascript to make tableless themes easier