Fix #1244 and fix #1245, move default theme and login background under themes