rebuild

rebuild the changes with cleanup based on dany547's theme.