custom: Revamp cec theme and refactor