Updated theme customisation and row handeling