Flat Theme update & code cleaning