System update for theme custom
Merge pull request #988 from sexnothing/develop

System update for theme custom