Refactor element declarations.#39

Closed

bulletmark wants to merge 1 commit intopelme:mainfrom bulletmark:refactor_elements

+134-137