Membetulkan-warna-default
Merge branch 'membetulkan-warna-dan-lebar' into develop