decent decoration gem
fixed conflicts, decent_decoration