fixed: some Theme/Trailer issues