From 6f9b4379c8597de0cc6c924a336d16f8ca7bfdf9 Mon Sep 17 00:00:00 2001
From: Mark Backer <mark.backer@vng.nl>
Date: Tue, 5 Mar 2024 17:20:40 +0100
Subject: [PATCH] Update: metadata views voor filteren in tabel

---
 ...del_id-1c197dc3-71e5-40dc-8f5d-a96e983b41af.xml |  3 ---
 ...del_id-351495a9-8501-4a7e-8618-7285790e256b.xml |  3 ---
 ...del_id-3a3f8ffc-4d93-4394-a8c9-da4ff61fac59.xml |  3 ---
 ...del_id-44b0aa89-bd14-4199-90f5-b0851a7b936b.xml |  6 +++---
 ...del_id-484b13ad-1180-4af1-a573-5d82b346dc6b.xml |  3 ---
 ...del_id-4b9a3882-5da3-4b3f-8d4b-380efbdd3777.xml |  3 ---
 ...del_id-64b917f6-0728-41c9-b132-4f2c969c929c.xml |  3 ---
 ...del_id-65d45728-8b54-4564-8947-46ade42f3a8b.xml |  3 ---
 ...amModel_id-a1b845bb16814e9e84d80581a36b9d03.xml |  3 +++
 ...del_id-a2dd3b18-6524-415b-9ea2-d799b7df2a9f.xml |  3 ---
 ...del_id-c37babd5-2c91-4496-ba99-a04ef0d3d961.xml |  3 ---
 ...del_id-c6a71ebe-ebe2-4dd3-a835-7d68169f17bc.xml |  3 ---
 ...del_id-c957ecc9-2c68-40e1-a6ed-d5596417414f.xml |  6 +++---
 ...del_id-d47f9bee-fde5-4276-a1bd-102008f8cd0e.xml |  3 ---
 ...del_id-5b07c9f8-a9ea-4acb-b608-252ea079ee5a.xml |  3 ---
 ...del_id-6743514a-be45-4263-b3e6-c306e329cef6.xml |  3 ---
 ...del_id-74c97cf2-9017-4550-b319-7d246dc6f183.xml |  6 +++---
 ...del_id-e2c72ec9-84e9-4153-90fd-ef5b1971687e.xml |  3 ---
 ...del_id-e6f33a93-2a76-4d2f-8a7a-25bf4a8e6f77.xml |  3 ---
 ...del_id-ff418bf4-dcf6-4e63-9ae2-6b7806359f4d.xml |  3 ---
 ...del_id-0428f579-a27d-4aff-b861-9958b6e28a8c.xml |  3 ---
 ...del_id-816ced7a-3485-434d-9edd-c8231911ac0b.xml |  6 +++---
 ...del_id-f2eaa327-12a6-4b4c-9951-f876c4f33233.xml |  3 ---
 ...del_id-f8e6b28c-c959-452f-9d24-c772f008c205.xml |  3 ---
 ...del_id-f9b17b56-63be-42ed-918a-d7245e60f0f9.xml |  3 ---
 ...del_id-94183db1-167b-4615-8bc6-27edee46c7ed.xml |  3 ---
 ...del_id-b352183a-90cc-44fc-81c0-c322ed7fe1e7.xml |  3 ---
 ...del_id-b6b39994-05ca-4a34-be74-26e363243305.xml |  3 ---
 ...amModel_id-10dd3ec86a564a748c539b29cd72da61.xml | 12 ++++++++++++
 ...del_id-56e87e1e-dc86-437e-87e6-728ee3f40fd9.xml |  3 ---
 ...amModel_id-7f0fb023ff0d421d874a08a13195b184.xml |  6 +++---
 ...amModel_id-8533a6e64f684d4eaa86498ec41289b8.xml |  3 +++
 ...del_id-b111714c-ed25-4f36-9804-4b1322ba7d07.xml |  3 ---
 ...del_id-4b69fd87-0204-4e8a-8084-7b10624d926c.xml |  3 ---
 ...del_id-93b25f8f-1b59-4bf7-96eb-e6eef4b6196b.xml |  5 +----
 ...del_id-b7d2b10c-a87b-4204-8709-97b3fe3ec13a.xml |  3 ---
 ...del_id-d652a913-3f3b-4d31-97d6-ac40ec12f78b.xml |  5 +----
 ...del_id-06c7b2d4-cfdf-4444-a24e-a0155599cb42.xml |  3 ---
 ...amModel_id-323bb8e8f0564f2981f4233d97685cf0.xml |  3 ---
 ...amModel_id-3e6194fe3c104a35829d5c5f5ac2ce40.xml |  3 ---
 ...del_id-5539b20e-b110-4b6a-955c-0cec42c5e0ab.xml |  3 ---
 ...amModel_id-5576a0b2e5574820aa71ba5eccbf025e.xml |  3 ---
 ...amModel_id-5f327e6fef294602b7dbfc05e5549cb2.xml |  3 ---
 ...amModel_id-7353f1b306c7443883cd23bb266dfbb1.xml |  3 ---
 ...amModel_id-73a45a0f2b2742a19d1a3bb4e7ec4fc3.xml |  6 ++++++
 ...amModel_id-7d8c87b52d4d4058832ffe44fd30aa21.xml |  3 ---
 ...amModel_id-96d204f093424635a6b87da8a63e32d4.xml |  3 ---
 ...amModel_id-984e274825c74338b6b3d500d69ac14f.xml |  3 ---
 ...amModel_id-ba6be94e81ce4705a73e835e7417a97f.xml |  3 ---
 ...amModel_id-cabd94a8568f44d4aa07a49cacb7da5c.xml |  3 ---
 ...amModel_id-e7febb51391f424b85fdfd6a06578172.xml |  3 ---
 ...del_id-0c0cc578-6cad-4222-beff-dcdda4d094a4.xml |  6 +++---
 ...del_id-723a109e-83de-4825-9fac-0c9e2002934e.xml |  6 +++---
 ...del_id-9865115e-61a6-4952-95b7-c0c759dd6b81.xml |  3 ---
 ...del_id-9fb84442-5d4c-46de-a106-764e3b3cf40e.xml |  3 ---
 ...del_id-a8472423-fcb4-4e29-93d0-032f91e8add6.xml |  2 +-
 ...del_id-c512705a-8cd9-46ac-922d-35966bc6961e.xml |  3 ---
 ...del_id-e0f57689-624e-4079-b7f9-79d14bac22f4.xml |  3 ---
 ...amModel_id-fb0afc5e95bd410dba2c8abf8b5f9c8b.xml |  3 ---
 ...amModel_id-26b14c465324494bbde9718019016b05.xml |  3 +++
 ...amModel_id-3bf18225fc0840709f681b7d9e69381f.xml |  9 +++++++++
 ...amModel_id-f3307f7a34e443d591156edcf3997ec0.xml |  9 +++++++++
 ...del_id-34a2f174-39cf-4b55-b4e1-72688f868176.xml |  2 +-
 ...del_id-63aa8230-d562-4950-a147-8dfb99cd0259.xml |  2 +-
 ...del_id-7616860b-bf2e-47af-9407-e4c2c81f13aa.xml |  2 +-
 ...del_id-7bf4ca5c-dd30-4692-a98b-4cd357d1defc.xml |  2 +-
 ...del_id-80476acb-0dc1-444c-aec3-b58784eabb5b.xml |  2 +-
 ...del_id-88756d7c-1abb-443f-a7fa-097b6d207f11.xml |  2 +-
 ...del_id-92c6ec08-5616-49a8-9bc9-cbd2147fee28.xml |  2 +-
 ...del_id-a5c77ef3-dcf5-4f9d-a75b-a34cb558aed4.xml |  2 +-
 ...del_id-b08aee72-cdf2-4a31-a4d3-1d5c7c9d0a4d.xml |  2 +-
 ...del_id-c7140b9c-a399-483c-a3ee-c2a8c354a084.xml |  5 ++++-
 ...del_id-f9d8a7a4-f949-4947-b614-be9173740950.xml |  2 +-
 ...del_id-8814ea0e-ed5c-40c5-8334-26da6bf6a6a0.xml |  5 ++++-
 ...del_id-b8b4011e-0800-4cab-a120-6751c7f0e9aa.xml |  2 +-
 ...del_id-bc3122b3-c6ee-40d0-b9c8-7ac80a83c418.xml |  2 +-
 ...del_id-26d64384-72b3-4001-8c12-f13aa0b9204e.xml |  2 +-
 ...del_id-30ce8fd7-e9af-4da5-b535-3092eed3c645.xml |  2 +-
 ...del_id-73afe1ab-bb6e-41a7-9de8-6caf25b57167.xml |  2 +-
 ...del_id-749ce7f1-6fd0-475c-8e13-64151cb4b589.xml |  2 +-
 ...del_id-87ae5612-95c5-43bb-a9e8-50af266a5bad.xml |  2 +-
 ...del_id-a984c5aa-1ffd-4a3d-8d2e-3f04ff90bd4d.xml |  2 +-
 ...del_id-ab08b4ae-d7b8-41b6-bbd8-e2b8e0f485bc.xml |  2 +-
 ...del_id-b400b22a-83e6-4f37-8ae4-4bea42f4e657.xml |  2 +-
 ...del_id-b6ca237c-d213-44c1-a2d9-e6d5977f0d6f.xml |  2 +-
 ...del_id-b886e5e5-79d3-4371-8817-a170cb6c7194.xml |  2 +-
 ...del_id-bfcab90b-e8bf-4ea7-9e64-3873846a4122.xml |  2 +-
 ...del_id-f80f804c-c5e8-44a2-99ed-16d27a386c68.xml |  2 +-
 ...del_id-031cf6e0-071c-4346-b324-43aea1c246f1.xml |  3 ---
 ...amModel_id-08d7b01246ce4c5e9070ad0adee34648.xml |  3 ---
 ...amModel_id-555506fff5974e9f80cd2066982a1c48.xml |  3 ---
 ...amModel_id-69d2d2936f7d46d0abd8e7b761e87206.xml |  3 ---
 ...amModel_id-b477e04a9dac4760a5aabbc4ffdfdfb3.xml |  3 ---
 ...amModel_id-db606bbb4ff34d079f0066c01fd099bb.xml | 14 +++++++++++++-
 ...amModel_id-142ca881a9724242ba99c8401d4b9d06.xml |  3 +++
 ...del_id-2b070c9b-e231-45b4-a822-ce30c1862ee4.xml |  3 ---
 ...amModel_id-2b15f5130b1441c8ba7e887379477de1.xml |  3 +++
 ...amModel_id-84d1e4214d0e4a9d98ae40f506723eb6.xml |  3 +++
 ...amModel_id-9d73f4963e8a42ae8d40de3102239833.xml |  3 +++
 ...del_id-0cf4b8a4-7f9a-488a-8596-ced8d43a08c3.xml |  3 ---
 ...del_id-500c56ab-006a-4c98-94fd-219b0f6e77b7.xml |  3 ---
 ...del_id-dcc17a74-48e0-4c86-a2ba-86e741e6578e.xml |  3 ---
 ...amModel_id-0ef493cdd6c5465a834b881c824a7fdb.xml |  3 ---
 ...amModel_id-140019de7ec9424dafe38ada26c1953e.xml |  3 ---
 ...del_id-05c9dfb6-7c27-40e3-9c50-8f7db43937b5.xml |  3 ---
 ...del_id-1197807a-eada-4aab-b864-01536a1dbcff.xml |  3 ---
 ...del_id-1499ac03-3d4e-4eab-8d70-41622e70ee14.xml |  3 ---
 ...amModel_id-1d4f6903b57146b48fdf36a4083396e2.xml |  3 ---
 ...del_id-4f80184d-df0c-4c8f-bd76-af5d2e2c54d2.xml |  3 ---
 ...del_id-565804bd-4769-4ca5-b406-377b2a02eb56.xml |  3 ---
 ...del_id-e14781f7-4f10-4ff8-8a10-3d4fb221cdc8.xml |  3 ---
 ...del_id-89ed57f3-56a2-4e58-9a1a-ae65ce0cbfa7.xml |  6 ++++++
 ...amModel_id-b3df887e9ef64947ab24431b13aa430d.xml |  2 +-
 ...del_id-ceebc28c-5439-4ba6-b994-9c597f0eabfc.xml |  6 ++++++
 ...del_id-17ef38c4-147f-4158-9c88-ab851ff6d02d.xml |  8 ++++----
 ...amModel_id-6770f081f59a4802ac6d396d99e3d1bf.xml |  3 +++
 ...amModel_id-76c8367a65fc4d06ab9e2662488f879b.xml |  3 +++
 ...del_id-92d6ad7b-4420-4c56-95eb-7598a3e33021.xml |  9 +++------
 ...del_id-c9adf6de-4878-4268-b5f8-fa0f1b566900.xml |  9 +++------
 ...del_id-d7f600b1-63dc-494a-9a25-976223aa38c7.xml |  5 +----
 ...amModel_id-1b9953862313462b8f33a41a0be02bb0.xml |  3 +++
 ...amModel_id-4702c9483c234e9eb25cdf9426254e8b.xml |  3 +++
 ...amModel_id-7ca04460a0c94974bac349d980dd1591.xml |  3 +++
 ...amModel_id-8584d546d04c473fa08f7c7160e4f2f5.xml |  3 +++
 ...amModel_id-870148a2c0874e87a8a0c5330c5a3687.xml |  3 +++
 ...amModel_id-c9fc41241be7497e97bc85d04525ea53.xml |  3 +++
 ...amModel_id-e10f83a8576a4591995c19d09cc48318.xml |  3 +++
 ...amModel_id-e500da96a4f84282ae9799d77c6d6eee.xml |  3 +++
 ...amModel_id-fb6f2f2960524406952495cd45d56dd4.xml |  3 +++
 ...amModel_id-22eb9d08e1b143db95a5d7fad0fa2119.xml |  3 ---
 ...amModel_id-3245e1d0e0f0422cb0abf3f376d3a31a.xml |  3 ---
 ...amModel_id-7f809c2fef5e4580a1f42da0ae230689.xml |  3 ---
 ...amModel_id-ee334fb114914c49981f59cecab5616c.xml |  3 ---
 ...amModel_id-0f277c6f9ba742fcb2f2ba00f708b8d9.xml |  8 +++++++-
 ...amModel_id-1680d39a34bf41f183a42d19f6dac876.xml |  9 ++++++---
 ...amModel_id-50b26901185d4af48c2add94cc22ffae.xml |  3 +++
 ...del_id-93cb650b-657a-4b5b-a49d-07f2b79eb244.xml |  4 ++--
 ...amModel_id-2c823dc8ffe34f6182520cc9f3dd5d27.xml |  3 +++
 ...amModel_id-40177da43104430ca1be8327a178e50b.xml |  3 +++
 ...amModel_id-a46797d70a2c48988e8ff646482e5718.xml |  3 +++
 ...amModel_id-037b04ee196a4f889566c85d6d10b2eb.xml |  3 ---
 ...amModel_id-2c82a78de57147dd97358d1ed0a8790d.xml |  3 ---
 ...amModel_id-348f8f74af1d44cba04b4df61407b748.xml |  3 ---
 ...amModel_id-575f5dfa67d140d1b5ccc6eea4a43111.xml |  3 ---
 ...amModel_id-5f2c0eebcec14d01b43555565c74bffc.xml |  3 ---
 ...amModel_id-aa19d9120e1048be95e91a09940d02a1.xml |  3 ---
 ...amModel_id-bff144a38d45416194de5585c73c9eb2.xml |  3 ---
 ...amModel_id-ddd59bdb420d4f67af6c3a1719e74519.xml |  3 ---
 ...amModel_id-fefe299f0eae4a10878b4a4e4507fee5.xml |  3 ---
 ...amModel_id-068756fa5b7f40d29c1d14d951d21ad8.xml |  3 +++
 ...amModel_id-0dc88aabc4284d359a404526132e8634.xml |  7 +++++--
 ...amModel_id-0f528f66cad44ec5bb707b1ae151ed23.xml |  3 +++
 ...amModel_id-0fbd92181f37409b9932a15fb579ff98.xml |  3 +++
 ...amModel_id-0fdacbbb8c124f73a9eb77bf474f15f6.xml |  3 +++
 ...amModel_id-137963a0f207462e968f03569c64b22f.xml |  3 +++
 ...amModel_id-1384469dc9a749fe9ca422d6776549fa.xml |  3 +++
 ...amModel_id-1ccbea336c194915bbff5ad04d6c6e31.xml |  3 +++
 ...amModel_id-25c7445f0e464a03a62f1714db96bb02.xml |  3 +++
 ...amModel_id-2a635d20c42140e7a8314e1bb94a677d.xml |  3 +++
 ...amModel_id-2d44f5f036554541baa6867f6d9ded98.xml |  3 +++
 ...amModel_id-2f9ad658eda5450fb6b5d246c43ac6ad.xml |  3 +++
 ...amModel_id-32e94bfb32c945d19e3fa87c26c07e93.xml |  3 +++
 ...amModel_id-3d13e84628a04eefa40e0d1c87d1d36c.xml |  3 +++
 ...amModel_id-45444c62c0574438938718aef9ca1657.xml |  3 +++
 ...amModel_id-4ecdc8203c9a4fd3a3cace06300d1789.xml |  3 +++
 ...amModel_id-5ee08a61d40d4818a566076e12dc31fe.xml |  3 +++
 ...amModel_id-66d5b8a45c754817890fac56f744a9e6.xml |  3 +++
 ...amModel_id-6988c5ed9dc64d85a14b43ed0685c1dd.xml |  3 +++
 ...amModel_id-6cdf3c3f93444a83a3720ec9a97e6a3f.xml |  3 +++
 ...amModel_id-70fb1f755932481d968da29df9c9c13a.xml |  3 +++
 ...amModel_id-71b1319db60448dbbcb6205270daa6ce.xml |  3 +++
 ...amModel_id-72e23e4efb814ba58e02a203a3a4bbeb.xml |  3 +++
 ...amModel_id-73543aa43f99474c8ea5d1ea32feebe6.xml |  3 +++
 ...amModel_id-77fd2699acf44f35a239d4bcd9638861.xml |  3 +++
 ...amModel_id-7bed86a350aa45d6ad94638c67054f68.xml |  3 +++
 ...amModel_id-7fd7c6b6954a432ab7e651df7a583d4f.xml |  3 +++
 ...amModel_id-840b41e81180418e8225fb26f9393290.xml |  3 +++
 ...amModel_id-8a53dd54ef1143a086b5ff67e7fcdacf.xml |  3 +++
 ...amModel_id-8bb153f0552f4df79860476364137a17.xml |  3 +++
 ...amModel_id-8faa89f95bf64b4ca6407782b09b9340.xml |  3 +++
 ...amModel_id-9aa0c1bb5d9b470581264a8168441c31.xml |  3 +++
 ...amModel_id-9d0c11adbc8344cbabf1bf8c88a9d6af.xml |  3 +++
 ...amModel_id-ba7bd47096ca4e6e82a924cf17527691.xml |  3 +++
 ...amModel_id-bd8f0e391ef74387b3c60b46c1906ae2.xml |  3 +++
 ...amModel_id-be00b60fec56464f86fac900c2ee9ec8.xml |  3 +++
 ...amModel_id-c80784a6f3d64666b6f6eebed9fb1cdc.xml |  3 +++
 ...amModel_id-d46d589e8bc64d6992f917e0c5baadfb.xml |  3 +++
 ...amModel_id-d6635d6bd32f4b56afe4995171c554b4.xml |  3 +++
 ...amModel_id-dd21a8725cce45a7b97849d8163392ae.xml |  3 +++
 ...amModel_id-e2ae1ae3e61d4191abbdbeee62e57d4e.xml |  3 +++
 ...amModel_id-e5d559a5ec4f4d1fb4e98f36958320a5.xml |  3 +++
 ...amModel_id-ee2356a2eef043b584de841bae101bb2.xml |  3 +++
 ...amModel_id-f37d08ece4e3413aa87cd65d457b888e.xml |  3 +++
 ...amModel_id-fda4eaa478754948b93e5bf60f1d8ece.xml |  3 +++
 ...amModel_id-113b4d008f254b37a38a29f705cc4930.xml |  3 +++
 ...amModel_id-633a218f8b84425ea0f208aa391b439f.xml |  3 +++
 ...amModel_id-093994459efe43f3ae30b4b9a56e0a54.xml |  3 +++
 ...amModel_id-7e2162c221344bbeb74c049beb457f0d.xml |  3 ---
 ...amModel_id-80c363bf417a40e6b5def81ef3dd0488.xml |  3 ---
 ...amModel_id-9860ba311fac4c9eb83f446d289e4a44.xml |  3 ---
 ...amModel_id-9bf5bad7b90040fc837d9e3dc0eeae78.xml |  3 ---
 ...amModel_id-aa75a91838a04fdc9aa7c32731c33c65.xml |  3 ---
 ...amModel_id-c8f105da50be4636a7db1e2c20a76555.xml |  3 ---
 ...amModel_id-d68cec1868a2411f96298a52f613433b.xml |  3 ---
 ...amModel_id-dbabaffe8b3742dba3d957edd6804a26.xml |  3 ---
 ...amModel_id-1709da0574de4b1c93c39fcebfb9cb26.xml |  6 ++++++
 ...del_id-1bfeca5d-2f1f-4aaa-bacb-f427876dd45e.xml |  6 ++++++
 ...del_id-8786201d-a2f5-40be-8177-a509c4ecc97d.xml |  6 ++++++
 ...del_id-8f7ec837-3ed0-4b40-ac97-4e5a07cae322.xml |  6 ++++++
 ...del_id-03eda439-fb3c-4236-b910-c284a3ea531e.xml |  8 +++++++-
 ...amModel_id-50cdeb390d334a258d0315f60fc80af4.xml |  8 +++++++-
 ...del_id-3dcb0215-7c8a-4aef-80a2-271a20739de1.xml |  7 +++++--
 ...del_id-9943399c-eb50-488e-8114-5742de38b798.xml |  7 +++++--
 ...del_id-fbc8bda0-5b31-4a3b-bb13-7a1e4143b02c.xml |  7 +++++--
 ...del_id-229d4f85-0b5f-4e6e-8410-853fc8e11c56.xml |  2 +-
 ...del_id-f633f850-9745-4a54-a0af-4b1c038d4627.xml |  5 ++++-
 ...del_id-8d2bb3ad-f256-4dca-9c2c-3ac85d567d08.xml |  2 +-
 ...del_id-90483141-8b35-491d-87e8-6ec1590fc89b.xml |  2 +-
 ...del_id-9ee3cc06-3cf8-4e54-8929-b3206dd53588.xml |  5 ++++-
 ...del_id-ad2473c1-86e5-4347-81ec-326a6a93b0f2.xml |  2 +-
 ...del_id-b6a9171f-9b5a-4f00-a02d-f64dd8af0f68.xml |  2 +-
 ...del_id-26da27c1-2a53-46a5-abdd-3bf4243df813.xml |  9 +++++++++
 ...del_id-b3523f5b-b33b-43b4-beb5-885506f60690.xml |  6 ++++++
 ...del_id-0a0a0012-a46e-457c-8074-c25678a555b0.xml |  2 +-
 ...del_id-0a7538a6-cfcb-450e-9973-2bce5e656325.xml |  2 +-
 ...del_id-0cb76607-6018-495f-a646-204ce453a190.xml |  4 ++--
 ...del_id-414f0a71-1d41-4b10-94d2-074f0f03db7d.xml |  2 +-
 ...del_id-a0a7f622-9630-43a8-80c0-38c5d4c427da.xml |  4 ++--
 ...del_id-cd0b8ee6-2266-4d2a-9a35-292f50982d0c.xml |  8 +++++++-
 ...amModel_id-1a579ffe066e47b28760fc66f4f385cd.xml |  6 ++++++
 ...amModel_id-1d07989394264ace8fe75285d1b98107.xml |  6 ++++++
 ...amModel_id-2eed0047177e48ca860b18384ea83265.xml |  8 +++++++-
 ...amModel_id-5b3478c902364cbc8aecf8de07e72781.xml |  2 +-
 ...amModel_id-63409225ff6842adbf145abedcc57577.xml |  6 ++++++
 ...amModel_id-9b03b18f18ed41d599e0485ac09f6188.xml |  2 +-
 ...amModel_id-a1e2c81e48864ab8b3445eefea1ffb6d.xml |  2 +-
 ...amModel_id-d38cbf6b0233497eace1e40837fec453.xml |  6 ++++++
 ...amModel_id-ea767038c51d4cb0ab23252a2c9e3094.xml |  6 ++++++
 ...amModel_id-ffb4684a5e034d7481158ac2318f5628.xml |  6 ++++++
 ...del_id-4e35b9ae-e969-4a40-8573-31f566c553c6.xml |  8 +++++++-
 ...del_id-6d6006a5-dec6-4598-b75a-bc1de967aa17.xml |  8 +++++++-
 ...del_id-a5f05be0-1578-434e-a844-c79316c50350.xml |  6 +++---
 ...del_id-c2fdd145-effe-470f-bba3-7891cc6cc3f4.xml |  8 +++++++-
 ...del_id-e31983fd-2ca7-4134-9fda-0a11457c7167.xml |  9 +++++++++
 ...del_id-27ff5502-aa02-4c34-b6e8-c79396ba6ecb.xml |  8 +++++++-
 ...del_id-7e39d8ea-686b-4957-aa6b-c21bbb14d2b3.xml |  8 +++++++-
 ...del_id-9281f5c3-2997-4f2b-a157-72caf5a0e7eb.xml |  8 +++++++-
 ...del_id-9dcd76c9-8a18-4ea3-b273-ab1fd08f1244.xml |  8 +++++++-
 ...del_id-b90836bb-347f-4243-a214-74cb76bd1fce.xml |  8 +++++++-
 ...del_id-cd129987-b670-420a-905d-10c8d27373e6.xml |  8 +++++++-
 ...del_id-5bea871c-140c-42f7-839d-ce0c30a4e317.xml |  2 +-
 ...del_id-5d2e69e3-5da4-4ede-ac03-164c4a2a11bb.xml |  2 +-
 ...del_id-6c514805-d5f9-4504-bc9e-deace02cd93e.xml |  2 +-
 ...del_id-f0be3f48-e3b2-4ad8-9728-ef83d1ea12a3.xml |  2 +-
 ...del_id-085fd8d8-f212-477f-bf80-daa377214477.xml |  8 +++++++-
 ...del_id-12e4a7ef-44e4-4995-96fc-4eadef8e986c.xml |  8 +++++++-
 ...del_id-30b9db52-e68b-4d36-b2e2-738ebdd8c1d9.xml |  8 +++++++-
 ...del_id-36304e01-624a-4cee-8134-93bddf695690.xml |  8 +++++++-
 ...del_id-51b8a36c-fc15-422b-ad5f-ad63d1874e59.xml |  8 +++++++-
 ...del_id-62ded185-6492-4a08-b365-73def7acc562.xml |  8 +++++++-
 ...del_id-64fcec62-9e82-4646-a73b-cefda87ebbd0.xml |  8 +++++++-
 ...del_id-af2f4c8b-9c6c-4821-bd5a-f49a89df6697.xml |  8 +++++++-
 ...del_id-b224b052-07d5-4928-9681-ec72fecad3fe.xml |  8 +++++++-
 ...del_id-c1c05cf4-3ca4-48b9-85c5-6b9a3f0a197d.xml |  8 +++++++-
 ...del_id-6d70a06b-4674-48d0-8ec0-fa51ffc24f80.xml |  3 ---
 ...del_id-e48e3546-de43-47a1-8182-8ad9ef744a2b.xml |  3 ---
 ...del_id-613a19c6-4506-4167-b66b-d71c08b3e317.xml |  3 ---
 ...amModel_id-0a7d94cc71184c81853049a5c2a519aa.xml |  7 +++++--
 ...amModel_id-381fcef3f4064c1789e0f2e0fb7d25f4.xml |  7 +++++--
 ...chModel_id-5295b11c69bd4e7fb7f10a8c0d915513.xml |  7 +++++--
 ...mModel_0ddaf91b-0656-449a-b407-0d34704feb34.xml |  6 ++++++
 ...mModel_45ceff4d-4098-4678-99c0-c6e958eb26ce.xml |  6 ++++++
 ...mModel_a2e0595c-0451-4d25-9354-817ecb7a2cc3.xml |  6 ++++++
 ...mModel_ad6200c2-3fc2-459a-be69-e9ca4d07b2b9.xml |  6 ++++++
 ...mModel_c9d539a8-29c4-4b73-90ef-f2e68baadb6a.xml |  6 ++++++
 ...mModel_cf8afc1e-1846-417b-bf7e-3d74c971f199.xml |  6 ++++++
 ...mModel_e11891b7-c927-4390-a11c-443b8d631518.xml |  6 ++++++
 ...del_id-034eee64-db8b-4af0-9df8-b848509c0059.xml |  3 ---
 ...del_id-4015732b-ea78-42f3-a045-67c0a40c9721.xml |  3 ---
 ...del_id-406de6a6-75db-42b5-85df-cc353d7f71ff.xml |  3 ---
 ...del_id-7792d23d-1aa1-4c29-9388-5353eb66e030.xml |  3 ---
 ...del_id-7b5e3026-f98a-44dc-af65-22ab4aea2f90.xml |  5 +----
 ...del_id-839462cd-ec6a-42b5-ae4b-5d1e863292c2.xml |  3 ---
 ...del_id-94a8d536-04bb-4db3-b8ff-504724983a53.xml |  3 ---
 ...del_id-a627b161-0c94-4d51-bbaa-de49ac27f9c3.xml |  3 ---
 ...del_id-bae3f862-4ce4-4cb3-ab8c-241e82ac3b85.xml |  3 ---
 ...del_id-edbfe2a7-b747-48b1-8a9b-7d0aef159ea3.xml |  3 ---
 ...del_id-0605d00c-6c31-40d2-8a38-7db887ab8bbc.xml |  4 ++--
 ...del_id-0b159157-231b-4a75-8d1a-534ff3836dcc.xml |  6 +++---
 ...del_id-1e80b7d3-7b01-42df-b72a-e1192ac11816.xml |  4 ++--
 ...del_id-2a6ca932-1a9f-42cf-aca8-85a27d06a350.xml |  4 ++--
 ...del_id-3c35bb71-1e6d-49c4-bbcb-c7d124c60e09.xml |  4 ++--
 ...del_id-3ce19af9-75b3-4474-b106-d6b69363012e.xml |  4 ++--
 ...del_id-3f08464a-7948-4953-8988-ed281aa672ea.xml |  4 ++--
 ...del_id-3f4698d8-add5-4eb8-bd53-8ebc54753600.xml |  4 ++--
 ...del_id-5a84ed73-6886-40ec-967c-83598b4bd84b.xml |  4 ++--
 ...del_id-5f9faf69-d46d-437e-ad98-17e89309fe1f.xml |  4 ++--
 ...del_id-757967e4-893e-4ada-b42f-0612ca18744c.xml |  2 +-
 ...del_id-7657d2ac-4620-4bed-b070-301bbb44b449.xml |  4 ++--
 ...del_id-81965f0c-29a3-4b8a-936e-df07b37f151b.xml |  4 ++--
 ...del_id-8b3ec9af-b52b-473d-99f4-4b3ff8cfc6a1.xml |  4 ++--
 ...del_id-9b5ab84d-ef96-4c90-88c8-554fbd9be80e.xml |  4 ++--
 ...del_id-a86b35ea-4989-44ab-b838-3a419038d10e.xml |  4 ++--
 ...del_id-bb1a0900-7792-4573-bacf-8717b8b55e03.xml |  4 ++--
 ...del_id-ca942ad2-5442-48b7-b8f3-ef0e7ce407c2.xml |  2 +-
 ...del_id-d01acfb3-4bbd-4c20-b4e1-6709349e2591.xml |  2 +-
 ...del_id-db412833-092a-4fd3-8e68-fb9c0394e712.xml |  4 ++--
 ...del_id-de02bb2e-c13e-4eab-9a17-bbbb8123f499.xml |  4 ++--
 ...del_id-dfde244c-cf56-40a1-bfdf-1802d5f76a8e.xml |  2 +-
 ...del_id-ff99ee32-2e14-4ff0-b9c6-8a89de190322.xml |  2 +-
 ...del_id-23b7aa0a-d552-4100-b835-97229f47bb22.xml |  3 ---
 ...del_id-6d21b2b5-b7a0-48d1-86d9-92a3433380cc.xml |  3 ---
 ...del_id-7aff16a1-8037-48cb-8747-2b8f8fa42333.xml |  3 ---
 ...del_id-c1aca141-4f84-4181-bb93-d8490656bdcc.xml |  3 ---
 314 files changed, 746 insertions(+), 491 deletions(-)

diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/51d93764-99a9-4284-b972-9a3bedc10e35/ArchimateDiagramModel_id-1c197dc3-71e5-40dc-8f5d-a96e983b41af.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/51d93764-99a9-4284-b972-9a3bedc10e35/ArchimateDiagramModel_id-1c197dc3-71e5-40dc-8f5d-a96e983b41af.xml
index 8cbc56b02..2473bb55b 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/51d93764-99a9-4284-b972-9a3bedc10e35/ArchimateDiagramModel_id-1c197dc3-71e5-40dc-8f5d-a96e983b41af.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/51d93764-99a9-4284-b972-9a3bedc10e35/ArchimateDiagramModel_id-1c197dc3-71e5-40dc-8f5d-a96e983b41af.xml
@@ -400,7 +400,4 @@
   <properties
       key="Viewtype"
       value="Context"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/51d93764-99a9-4284-b972-9a3bedc10e35/ArchimateDiagramModel_id-351495a9-8501-4a7e-8618-7285790e256b.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/51d93764-99a9-4284-b972-9a3bedc10e35/ArchimateDiagramModel_id-351495a9-8501-4a7e-8618-7285790e256b.xml
index a54883fae..e98af7e69 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/51d93764-99a9-4284-b972-9a3bedc10e35/ArchimateDiagramModel_id-351495a9-8501-4a7e-8618-7285790e256b.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/51d93764-99a9-4284-b972-9a3bedc10e35/ArchimateDiagramModel_id-351495a9-8501-4a7e-8618-7285790e256b.xml
@@ -349,7 +349,4 @@
   <properties
       key="Viewtype"
       value="Context"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/51d93764-99a9-4284-b972-9a3bedc10e35/ArchimateDiagramModel_id-3a3f8ffc-4d93-4394-a8c9-da4ff61fac59.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/51d93764-99a9-4284-b972-9a3bedc10e35/ArchimateDiagramModel_id-3a3f8ffc-4d93-4394-a8c9-da4ff61fac59.xml
index 908ad591b..681182f7a 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/51d93764-99a9-4284-b972-9a3bedc10e35/ArchimateDiagramModel_id-3a3f8ffc-4d93-4394-a8c9-da4ff61fac59.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/51d93764-99a9-4284-b972-9a3bedc10e35/ArchimateDiagramModel_id-3a3f8ffc-4d93-4394-a8c9-da4ff61fac59.xml
@@ -254,7 +254,4 @@
   <properties
       key="Viewtype"
       value="Context"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/51d93764-99a9-4284-b972-9a3bedc10e35/ArchimateDiagramModel_id-44b0aa89-bd14-4199-90f5-b0851a7b936b.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/51d93764-99a9-4284-b972-9a3bedc10e35/ArchimateDiagramModel_id-44b0aa89-bd14-4199-90f5-b0851a7b936b.xml
index a87f2aa4c..38879e575 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/51d93764-99a9-4284-b972-9a3bedc10e35/ArchimateDiagramModel_id-44b0aa89-bd14-4199-90f5-b0851a7b936b.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/51d93764-99a9-4284-b972-9a3bedc10e35/ArchimateDiagramModel_id-44b0aa89-bd14-4199-90f5-b0851a7b936b.xml
@@ -271,9 +271,6 @@
   <properties
       key="Publiceren"
       value="Niet"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Architectuurlaag"
       value="Applicatiearchitectuur"/>
@@ -283,4 +280,7 @@
   <properties
       key="Viewtype"
       value="Context"/>
+  <properties
+      key="Detailniveau"
+      value="Detail"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/51d93764-99a9-4284-b972-9a3bedc10e35/ArchimateDiagramModel_id-484b13ad-1180-4af1-a573-5d82b346dc6b.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/51d93764-99a9-4284-b972-9a3bedc10e35/ArchimateDiagramModel_id-484b13ad-1180-4af1-a573-5d82b346dc6b.xml
index 40ba5014b..434b505a6 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/51d93764-99a9-4284-b972-9a3bedc10e35/ArchimateDiagramModel_id-484b13ad-1180-4af1-a573-5d82b346dc6b.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/51d93764-99a9-4284-b972-9a3bedc10e35/ArchimateDiagramModel_id-484b13ad-1180-4af1-a573-5d82b346dc6b.xml
@@ -158,7 +158,4 @@
   <properties
       key="Viewtype"
       value="Context"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/51d93764-99a9-4284-b972-9a3bedc10e35/ArchimateDiagramModel_id-4b9a3882-5da3-4b3f-8d4b-380efbdd3777.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/51d93764-99a9-4284-b972-9a3bedc10e35/ArchimateDiagramModel_id-4b9a3882-5da3-4b3f-8d4b-380efbdd3777.xml
index 7d2e2b6ec..102c2f5bf 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/51d93764-99a9-4284-b972-9a3bedc10e35/ArchimateDiagramModel_id-4b9a3882-5da3-4b3f-8d4b-380efbdd3777.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/51d93764-99a9-4284-b972-9a3bedc10e35/ArchimateDiagramModel_id-4b9a3882-5da3-4b3f-8d4b-380efbdd3777.xml
@@ -352,7 +352,4 @@
   <properties
       key="Viewtype"
       value="Context"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/51d93764-99a9-4284-b972-9a3bedc10e35/ArchimateDiagramModel_id-64b917f6-0728-41c9-b132-4f2c969c929c.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/51d93764-99a9-4284-b972-9a3bedc10e35/ArchimateDiagramModel_id-64b917f6-0728-41c9-b132-4f2c969c929c.xml
index 366daabd2..0a8e77476 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/51d93764-99a9-4284-b972-9a3bedc10e35/ArchimateDiagramModel_id-64b917f6-0728-41c9-b132-4f2c969c929c.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/51d93764-99a9-4284-b972-9a3bedc10e35/ArchimateDiagramModel_id-64b917f6-0728-41c9-b132-4f2c969c929c.xml
@@ -468,9 +468,6 @@
   <properties
       key="Scope"
       value="Keten"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Viewtype"
       value="Context"/>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/51d93764-99a9-4284-b972-9a3bedc10e35/ArchimateDiagramModel_id-65d45728-8b54-4564-8947-46ade42f3a8b.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/51d93764-99a9-4284-b972-9a3bedc10e35/ArchimateDiagramModel_id-65d45728-8b54-4564-8947-46ade42f3a8b.xml
index 795266280..172659f30 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/51d93764-99a9-4284-b972-9a3bedc10e35/ArchimateDiagramModel_id-65d45728-8b54-4564-8947-46ade42f3a8b.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/51d93764-99a9-4284-b972-9a3bedc10e35/ArchimateDiagramModel_id-65d45728-8b54-4564-8947-46ade42f3a8b.xml
@@ -369,7 +369,4 @@
   <properties
       key="Viewtype"
       value="Context"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/51d93764-99a9-4284-b972-9a3bedc10e35/ArchimateDiagramModel_id-a1b845bb16814e9e84d80581a36b9d03.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/51d93764-99a9-4284-b972-9a3bedc10e35/ArchimateDiagramModel_id-a1b845bb16814e9e84d80581a36b9d03.xml
index 7cca84663..45565ee6a 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/51d93764-99a9-4284-b972-9a3bedc10e35/ArchimateDiagramModel_id-a1b845bb16814e9e84d80581a36b9d03.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/51d93764-99a9-4284-b972-9a3bedc10e35/ArchimateDiagramModel_id-a1b845bb16814e9e84d80581a36b9d03.xml
@@ -5747,4 +5747,7 @@
   <properties
       key="Object ID"
       value="5f58b17e-89b6-499e-87c5-e0c9938a9aa1"/>
+  <properties
+      key="Publiceren"
+      value="Niet"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/51d93764-99a9-4284-b972-9a3bedc10e35/ArchimateDiagramModel_id-a2dd3b18-6524-415b-9ea2-d799b7df2a9f.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/51d93764-99a9-4284-b972-9a3bedc10e35/ArchimateDiagramModel_id-a2dd3b18-6524-415b-9ea2-d799b7df2a9f.xml
index 8b9b75261..2f575f8e6 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/51d93764-99a9-4284-b972-9a3bedc10e35/ArchimateDiagramModel_id-a2dd3b18-6524-415b-9ea2-d799b7df2a9f.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/51d93764-99a9-4284-b972-9a3bedc10e35/ArchimateDiagramModel_id-a2dd3b18-6524-415b-9ea2-d799b7df2a9f.xml
@@ -583,7 +583,4 @@
   <properties
       key="Viewtype"
       value="Context"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/51d93764-99a9-4284-b972-9a3bedc10e35/ArchimateDiagramModel_id-c37babd5-2c91-4496-ba99-a04ef0d3d961.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/51d93764-99a9-4284-b972-9a3bedc10e35/ArchimateDiagramModel_id-c37babd5-2c91-4496-ba99-a04ef0d3d961.xml
index bfb3fb51c..bcd0d9585 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/51d93764-99a9-4284-b972-9a3bedc10e35/ArchimateDiagramModel_id-c37babd5-2c91-4496-ba99-a04ef0d3d961.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/51d93764-99a9-4284-b972-9a3bedc10e35/ArchimateDiagramModel_id-c37babd5-2c91-4496-ba99-a04ef0d3d961.xml
@@ -584,7 +584,4 @@
   <properties
       key="Viewtype"
       value="Context"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/51d93764-99a9-4284-b972-9a3bedc10e35/ArchimateDiagramModel_id-c6a71ebe-ebe2-4dd3-a835-7d68169f17bc.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/51d93764-99a9-4284-b972-9a3bedc10e35/ArchimateDiagramModel_id-c6a71ebe-ebe2-4dd3-a835-7d68169f17bc.xml
index 9c2692d26..bad02b37f 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/51d93764-99a9-4284-b972-9a3bedc10e35/ArchimateDiagramModel_id-c6a71ebe-ebe2-4dd3-a835-7d68169f17bc.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/51d93764-99a9-4284-b972-9a3bedc10e35/ArchimateDiagramModel_id-c6a71ebe-ebe2-4dd3-a835-7d68169f17bc.xml
@@ -644,7 +644,4 @@
   <properties
       key="Viewtype"
       value="Context"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/51d93764-99a9-4284-b972-9a3bedc10e35/ArchimateDiagramModel_id-c957ecc9-2c68-40e1-a6ed-d5596417414f.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/51d93764-99a9-4284-b972-9a3bedc10e35/ArchimateDiagramModel_id-c957ecc9-2c68-40e1-a6ed-d5596417414f.xml
index 39d42e1f0..5691ae026 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/51d93764-99a9-4284-b972-9a3bedc10e35/ArchimateDiagramModel_id-c957ecc9-2c68-40e1-a6ed-d5596417414f.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/51d93764-99a9-4284-b972-9a3bedc10e35/ArchimateDiagramModel_id-c957ecc9-2c68-40e1-a6ed-d5596417414f.xml
@@ -241,9 +241,6 @@
   <properties
       key="Object ID"
       value="c957ecc9-2c68-40e1-a6ed-d5596417414f"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Viewtype"
       value="Toelichting"/>
@@ -256,4 +253,7 @@
   <properties
       key="Domein"
       value="Niet domeingebonden"/>
+  <properties
+      key="Detailniveau"
+      value="Detail"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/51d93764-99a9-4284-b972-9a3bedc10e35/ArchimateDiagramModel_id-d47f9bee-fde5-4276-a1bd-102008f8cd0e.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/51d93764-99a9-4284-b972-9a3bedc10e35/ArchimateDiagramModel_id-d47f9bee-fde5-4276-a1bd-102008f8cd0e.xml
index b8cd7b481..f4110e53f 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/51d93764-99a9-4284-b972-9a3bedc10e35/ArchimateDiagramModel_id-d47f9bee-fde5-4276-a1bd-102008f8cd0e.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/51d93764-99a9-4284-b972-9a3bedc10e35/ArchimateDiagramModel_id-d47f9bee-fde5-4276-a1bd-102008f8cd0e.xml
@@ -1121,9 +1121,6 @@
   <properties
       key="Scope"
       value="Keten"/>
-  <properties
-      key="GEMMA thema"
-      value="Gegevensmanagement"/>
   <properties
       key="Viewtype"
       value="Toelichting"/>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/40315485-0835-411f-aab0-a2cf6108a565/ArchimateDiagramModel_id-5b07c9f8-a9ea-4acb-b608-252ea079ee5a.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/40315485-0835-411f-aab0-a2cf6108a565/ArchimateDiagramModel_id-5b07c9f8-a9ea-4acb-b608-252ea079ee5a.xml
index 0502b5dfe..31ef612d5 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/40315485-0835-411f-aab0-a2cf6108a565/ArchimateDiagramModel_id-5b07c9f8-a9ea-4acb-b608-252ea079ee5a.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/40315485-0835-411f-aab0-a2cf6108a565/ArchimateDiagramModel_id-5b07c9f8-a9ea-4acb-b608-252ea079ee5a.xml
@@ -2935,7 +2935,4 @@
   <properties
       key="Viewtype"
       value="Context"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/40315485-0835-411f-aab0-a2cf6108a565/ArchimateDiagramModel_id-6743514a-be45-4263-b3e6-c306e329cef6.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/40315485-0835-411f-aab0-a2cf6108a565/ArchimateDiagramModel_id-6743514a-be45-4263-b3e6-c306e329cef6.xml
index f8cad3d0d..aee141f2a 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/40315485-0835-411f-aab0-a2cf6108a565/ArchimateDiagramModel_id-6743514a-be45-4263-b3e6-c306e329cef6.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/40315485-0835-411f-aab0-a2cf6108a565/ArchimateDiagramModel_id-6743514a-be45-4263-b3e6-c306e329cef6.xml
@@ -5509,7 +5509,4 @@
   <properties
       key="Viewtype"
       value="Basis"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/40315485-0835-411f-aab0-a2cf6108a565/ArchimateDiagramModel_id-74c97cf2-9017-4550-b319-7d246dc6f183.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/40315485-0835-411f-aab0-a2cf6108a565/ArchimateDiagramModel_id-74c97cf2-9017-4550-b319-7d246dc6f183.xml
index 501ec5ab9..1d470b032 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/40315485-0835-411f-aab0-a2cf6108a565/ArchimateDiagramModel_id-74c97cf2-9017-4550-b319-7d246dc6f183.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/40315485-0835-411f-aab0-a2cf6108a565/ArchimateDiagramModel_id-74c97cf2-9017-4550-b319-7d246dc6f183.xml
@@ -418,9 +418,6 @@
   <properties
       key="Object ID"
       value="74c97cf2-9017-4550-b319-7d246dc6f183"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Viewtype"
       value="Toelichting"/>
@@ -433,4 +430,7 @@
   <properties
       key="Domein"
       value="Niet domeingebonden"/>
+  <properties
+      key="Detailniveau"
+      value="Detail"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/40315485-0835-411f-aab0-a2cf6108a565/ArchimateDiagramModel_id-e2c72ec9-84e9-4153-90fd-ef5b1971687e.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/40315485-0835-411f-aab0-a2cf6108a565/ArchimateDiagramModel_id-e2c72ec9-84e9-4153-90fd-ef5b1971687e.xml
index e086c2ed1..740add975 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/40315485-0835-411f-aab0-a2cf6108a565/ArchimateDiagramModel_id-e2c72ec9-84e9-4153-90fd-ef5b1971687e.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/40315485-0835-411f-aab0-a2cf6108a565/ArchimateDiagramModel_id-e2c72ec9-84e9-4153-90fd-ef5b1971687e.xml
@@ -419,7 +419,4 @@
   <properties
       key="Viewtype"
       value="Toelichting"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/40315485-0835-411f-aab0-a2cf6108a565/ArchimateDiagramModel_id-e6f33a93-2a76-4d2f-8a7a-25bf4a8e6f77.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/40315485-0835-411f-aab0-a2cf6108a565/ArchimateDiagramModel_id-e6f33a93-2a76-4d2f-8a7a-25bf4a8e6f77.xml
index 22cfddbac..cce33313c 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/40315485-0835-411f-aab0-a2cf6108a565/ArchimateDiagramModel_id-e6f33a93-2a76-4d2f-8a7a-25bf4a8e6f77.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/40315485-0835-411f-aab0-a2cf6108a565/ArchimateDiagramModel_id-e6f33a93-2a76-4d2f-8a7a-25bf4a8e6f77.xml
@@ -2841,7 +2841,4 @@
   <properties
       key="Viewtype"
       value="Basis"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/40315485-0835-411f-aab0-a2cf6108a565/ArchimateDiagramModel_id-ff418bf4-dcf6-4e63-9ae2-6b7806359f4d.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/40315485-0835-411f-aab0-a2cf6108a565/ArchimateDiagramModel_id-ff418bf4-dcf6-4e63-9ae2-6b7806359f4d.xml
index 4fdd439d3..0b281e78f 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/40315485-0835-411f-aab0-a2cf6108a565/ArchimateDiagramModel_id-ff418bf4-dcf6-4e63-9ae2-6b7806359f4d.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/40315485-0835-411f-aab0-a2cf6108a565/ArchimateDiagramModel_id-ff418bf4-dcf6-4e63-9ae2-6b7806359f4d.xml
@@ -449,7 +449,4 @@
   <properties
       key="Viewtype"
       value="Toelichting"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/96264b96-9e68-4147-b4e9-f0aa0eb928ef/ArchimateDiagramModel_id-0428f579-a27d-4aff-b861-9958b6e28a8c.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/96264b96-9e68-4147-b4e9-f0aa0eb928ef/ArchimateDiagramModel_id-0428f579-a27d-4aff-b861-9958b6e28a8c.xml
index 53cd3cb50..b07a0b8b0 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/96264b96-9e68-4147-b4e9-f0aa0eb928ef/ArchimateDiagramModel_id-0428f579-a27d-4aff-b861-9958b6e28a8c.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/96264b96-9e68-4147-b4e9-f0aa0eb928ef/ArchimateDiagramModel_id-0428f579-a27d-4aff-b861-9958b6e28a8c.xml
@@ -4373,7 +4373,4 @@
   <properties
       key="Viewtype"
       value="Basis"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/96264b96-9e68-4147-b4e9-f0aa0eb928ef/ArchimateDiagramModel_id-816ced7a-3485-434d-9edd-c8231911ac0b.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/96264b96-9e68-4147-b4e9-f0aa0eb928ef/ArchimateDiagramModel_id-816ced7a-3485-434d-9edd-c8231911ac0b.xml
index 29fc76e6e..230904016 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/96264b96-9e68-4147-b4e9-f0aa0eb928ef/ArchimateDiagramModel_id-816ced7a-3485-434d-9edd-c8231911ac0b.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/96264b96-9e68-4147-b4e9-f0aa0eb928ef/ArchimateDiagramModel_id-816ced7a-3485-434d-9edd-c8231911ac0b.xml
@@ -488,9 +488,6 @@
   <properties
       key="Object ID"
       value="816ced7a-3485-434d-9edd-c8231911ac0b"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Viewtype"
       value="Toelichting"/>
@@ -503,4 +500,7 @@
   <properties
       key="Domein"
       value="Niet domeingebonden"/>
+  <properties
+      key="Detailniveau"
+      value="Detail"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/96264b96-9e68-4147-b4e9-f0aa0eb928ef/ArchimateDiagramModel_id-f2eaa327-12a6-4b4c-9951-f876c4f33233.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/96264b96-9e68-4147-b4e9-f0aa0eb928ef/ArchimateDiagramModel_id-f2eaa327-12a6-4b4c-9951-f876c4f33233.xml
index 7a720b62e..0c117ffa5 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/96264b96-9e68-4147-b4e9-f0aa0eb928ef/ArchimateDiagramModel_id-f2eaa327-12a6-4b4c-9951-f876c4f33233.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/96264b96-9e68-4147-b4e9-f0aa0eb928ef/ArchimateDiagramModel_id-f2eaa327-12a6-4b4c-9951-f876c4f33233.xml
@@ -895,9 +895,6 @@
   <properties
       key="Scope"
       value="Gemeente"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Viewtype"
       value="Toelichting"/>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/96264b96-9e68-4147-b4e9-f0aa0eb928ef/ArchimateDiagramModel_id-f8e6b28c-c959-452f-9d24-c772f008c205.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/96264b96-9e68-4147-b4e9-f0aa0eb928ef/ArchimateDiagramModel_id-f8e6b28c-c959-452f-9d24-c772f008c205.xml
index 1d1b8ad57..5273454c8 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/96264b96-9e68-4147-b4e9-f0aa0eb928ef/ArchimateDiagramModel_id-f8e6b28c-c959-452f-9d24-c772f008c205.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/96264b96-9e68-4147-b4e9-f0aa0eb928ef/ArchimateDiagramModel_id-f8e6b28c-c959-452f-9d24-c772f008c205.xml
@@ -1590,7 +1590,4 @@
   <properties
       key="Viewtype"
       value="Basis"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/ArchimateDiagramModel_id-f9b17b56-63be-42ed-918a-d7245e60f0f9.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/ArchimateDiagramModel_id-f9b17b56-63be-42ed-918a-d7245e60f0f9.xml
index 629f21f5c..a3c6163ad 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/ArchimateDiagramModel_id-f9b17b56-63be-42ed-918a-d7245e60f0f9.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/ArchimateDiagramModel_id-f9b17b56-63be-42ed-918a-d7245e60f0f9.xml
@@ -1103,9 +1103,6 @@
   <properties
       key="Viewtype"
       value="Toelichting"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Domein"
       value="Niet domeingebonden"/>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/a77a8860-b17b-42d1-b720-29a1eab866a5/ArchimateDiagramModel_id-94183db1-167b-4615-8bc6-27edee46c7ed.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/a77a8860-b17b-42d1-b720-29a1eab866a5/ArchimateDiagramModel_id-94183db1-167b-4615-8bc6-27edee46c7ed.xml
index dcb834cd2..2ca4ae342 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/a77a8860-b17b-42d1-b720-29a1eab866a5/ArchimateDiagramModel_id-94183db1-167b-4615-8bc6-27edee46c7ed.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/a77a8860-b17b-42d1-b720-29a1eab866a5/ArchimateDiagramModel_id-94183db1-167b-4615-8bc6-27edee46c7ed.xml
@@ -718,7 +718,4 @@
   <properties
       key="Viewtype"
       value="Toelichting"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/a77a8860-b17b-42d1-b720-29a1eab866a5/ArchimateDiagramModel_id-b352183a-90cc-44fc-81c0-c322ed7fe1e7.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/a77a8860-b17b-42d1-b720-29a1eab866a5/ArchimateDiagramModel_id-b352183a-90cc-44fc-81c0-c322ed7fe1e7.xml
index b372d8294..c8f1ffbfc 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/a77a8860-b17b-42d1-b720-29a1eab866a5/ArchimateDiagramModel_id-b352183a-90cc-44fc-81c0-c322ed7fe1e7.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/a77a8860-b17b-42d1-b720-29a1eab866a5/ArchimateDiagramModel_id-b352183a-90cc-44fc-81c0-c322ed7fe1e7.xml
@@ -4749,7 +4749,4 @@
   <properties
       key="Viewtype"
       value="Basis"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/a77a8860-b17b-42d1-b720-29a1eab866a5/ArchimateDiagramModel_id-b6b39994-05ca-4a34-be74-26e363243305.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/a77a8860-b17b-42d1-b720-29a1eab866a5/ArchimateDiagramModel_id-b6b39994-05ca-4a34-be74-26e363243305.xml
index 45edf0b29..595d8e48b 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/a77a8860-b17b-42d1-b720-29a1eab866a5/ArchimateDiagramModel_id-b6b39994-05ca-4a34-be74-26e363243305.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/a77a8860-b17b-42d1-b720-29a1eab866a5/ArchimateDiagramModel_id-b6b39994-05ca-4a34-be74-26e363243305.xml
@@ -2351,7 +2351,4 @@
   <properties
       key="Viewtype"
       value="Basis"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/a7a2c3c2-db07-43e2-b304-597b7698f8a7/ArchimateDiagramModel_id-10dd3ec86a564a748c539b29cd72da61.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/a7a2c3c2-db07-43e2-b304-597b7698f8a7/ArchimateDiagramModel_id-10dd3ec86a564a748c539b29cd72da61.xml
index 3ffec8819..27aa1ec1a 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/a7a2c3c2-db07-43e2-b304-597b7698f8a7/ArchimateDiagramModel_id-10dd3ec86a564a748c539b29cd72da61.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/a7a2c3c2-db07-43e2-b304-597b7698f8a7/ArchimateDiagramModel_id-10dd3ec86a564a748c539b29cd72da61.xml
@@ -248,4 +248,16 @@
   <properties
       key="Publiceren"
       value="GEMMA Online en redactie"/>
+  <properties
+      key="Domein"
+      value="Sociaal domein"/>
+  <properties
+      key="Detailniveau"
+      value="Samenhang"/>
+  <properties
+      key="Scope"
+      value="Keten"/>
+  <properties
+      key="Viewtype"
+      value="Toelichting"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/a7a2c3c2-db07-43e2-b304-597b7698f8a7/ArchimateDiagramModel_id-56e87e1e-dc86-437e-87e6-728ee3f40fd9.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/a7a2c3c2-db07-43e2-b304-597b7698f8a7/ArchimateDiagramModel_id-56e87e1e-dc86-437e-87e6-728ee3f40fd9.xml
index 346f187dc..be4f542ae 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/a7a2c3c2-db07-43e2-b304-597b7698f8a7/ArchimateDiagramModel_id-56e87e1e-dc86-437e-87e6-728ee3f40fd9.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/a7a2c3c2-db07-43e2-b304-597b7698f8a7/ArchimateDiagramModel_id-56e87e1e-dc86-437e-87e6-728ee3f40fd9.xml
@@ -2473,7 +2473,4 @@
   <properties
       key="Viewtype"
       value="Basis"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/a7a2c3c2-db07-43e2-b304-597b7698f8a7/ArchimateDiagramModel_id-7f0fb023ff0d421d874a08a13195b184.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/a7a2c3c2-db07-43e2-b304-597b7698f8a7/ArchimateDiagramModel_id-7f0fb023ff0d421d874a08a13195b184.xml
index a162b9051..3169dea47 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/a7a2c3c2-db07-43e2-b304-597b7698f8a7/ArchimateDiagramModel_id-7f0fb023ff0d421d874a08a13195b184.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/a7a2c3c2-db07-43e2-b304-597b7698f8a7/ArchimateDiagramModel_id-7f0fb023ff0d421d874a08a13195b184.xml
@@ -369,9 +369,6 @@
   <properties
       key="Viewtype"
       value="Toelichting"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Architectuurlaag"
       value="Motivatie"/>
@@ -381,4 +378,7 @@
   <properties
       key="Detailniveau"
       value="Detail"/>
+  <properties
+      key="Scope"
+      value="Gemeente"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/a7a2c3c2-db07-43e2-b304-597b7698f8a7/ArchimateDiagramModel_id-8533a6e64f684d4eaa86498ec41289b8.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/a7a2c3c2-db07-43e2-b304-597b7698f8a7/ArchimateDiagramModel_id-8533a6e64f684d4eaa86498ec41289b8.xml
index eb9cc4592..ba8384118 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/a7a2c3c2-db07-43e2-b304-597b7698f8a7/ArchimateDiagramModel_id-8533a6e64f684d4eaa86498ec41289b8.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/a7a2c3c2-db07-43e2-b304-597b7698f8a7/ArchimateDiagramModel_id-8533a6e64f684d4eaa86498ec41289b8.xml
@@ -385,4 +385,7 @@
   <properties
       key="Object ID"
       value="388fddfc-a82b-43cf-8b4d-97682fca5a58"/>
+  <properties
+      key="Publiceren"
+      value="Niet"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/a7a2c3c2-db07-43e2-b304-597b7698f8a7/ArchimateDiagramModel_id-b111714c-ed25-4f36-9804-4b1322ba7d07.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/a7a2c3c2-db07-43e2-b304-597b7698f8a7/ArchimateDiagramModel_id-b111714c-ed25-4f36-9804-4b1322ba7d07.xml
index afc9e075d..7bc19b784 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/a7a2c3c2-db07-43e2-b304-597b7698f8a7/ArchimateDiagramModel_id-b111714c-ed25-4f36-9804-4b1322ba7d07.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/a7a2c3c2-db07-43e2-b304-597b7698f8a7/ArchimateDiagramModel_id-b111714c-ed25-4f36-9804-4b1322ba7d07.xml
@@ -5488,7 +5488,4 @@
   <properties
       key="Viewtype"
       value="Basis"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/fd7c4cbd-71c1-4188-9959-f7774dbab32a/ArchimateDiagramModel_id-4b69fd87-0204-4e8a-8084-7b10624d926c.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/fd7c4cbd-71c1-4188-9959-f7774dbab32a/ArchimateDiagramModel_id-4b69fd87-0204-4e8a-8084-7b10624d926c.xml
index 27f119e1c..09b7a0533 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/fd7c4cbd-71c1-4188-9959-f7774dbab32a/ArchimateDiagramModel_id-4b69fd87-0204-4e8a-8084-7b10624d926c.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/fd7c4cbd-71c1-4188-9959-f7774dbab32a/ArchimateDiagramModel_id-4b69fd87-0204-4e8a-8084-7b10624d926c.xml
@@ -3233,7 +3233,4 @@
   <properties
       key="Viewtype"
       value="Basis"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/fd7c4cbd-71c1-4188-9959-f7774dbab32a/ArchimateDiagramModel_id-93b25f8f-1b59-4bf7-96eb-e6eef4b6196b.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/fd7c4cbd-71c1-4188-9959-f7774dbab32a/ArchimateDiagramModel_id-93b25f8f-1b59-4bf7-96eb-e6eef4b6196b.xml
index 72d541216..a88f4a1cb 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/fd7c4cbd-71c1-4188-9959-f7774dbab32a/ArchimateDiagramModel_id-93b25f8f-1b59-4bf7-96eb-e6eef4b6196b.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/fd7c4cbd-71c1-4188-9959-f7774dbab32a/ArchimateDiagramModel_id-93b25f8f-1b59-4bf7-96eb-e6eef4b6196b.xml
@@ -2870,7 +2870,7 @@
   </children>
   <properties
       key="Architectuurlaag"
-      value="Geen"/>
+      value="Totaal (meerlaags)"/>
   <properties
       key="Domein"
       value="Ondersteuning"/>
@@ -2886,7 +2886,4 @@
   <properties
       key="Viewtype"
       value="Toelichting"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/fd7c4cbd-71c1-4188-9959-f7774dbab32a/ArchimateDiagramModel_id-b7d2b10c-a87b-4204-8709-97b3fe3ec13a.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/fd7c4cbd-71c1-4188-9959-f7774dbab32a/ArchimateDiagramModel_id-b7d2b10c-a87b-4204-8709-97b3fe3ec13a.xml
index fcb3ff1cb..53d68ec48 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/fd7c4cbd-71c1-4188-9959-f7774dbab32a/ArchimateDiagramModel_id-b7d2b10c-a87b-4204-8709-97b3fe3ec13a.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/fd7c4cbd-71c1-4188-9959-f7774dbab32a/ArchimateDiagramModel_id-b7d2b10c-a87b-4204-8709-97b3fe3ec13a.xml
@@ -5343,7 +5343,4 @@
   <properties
       key="Viewtype"
       value="Basis"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/fd7c4cbd-71c1-4188-9959-f7774dbab32a/ArchimateDiagramModel_id-d652a913-3f3b-4d31-97d6-ac40ec12f78b.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/fd7c4cbd-71c1-4188-9959-f7774dbab32a/ArchimateDiagramModel_id-d652a913-3f3b-4d31-97d6-ac40ec12f78b.xml
index 96caa2192..8e7864627 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/fd7c4cbd-71c1-4188-9959-f7774dbab32a/ArchimateDiagramModel_id-d652a913-3f3b-4d31-97d6-ac40ec12f78b.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/fd7c4cbd-71c1-4188-9959-f7774dbab32a/ArchimateDiagramModel_id-d652a913-3f3b-4d31-97d6-ac40ec12f78b.xml
@@ -335,7 +335,7 @@
   </children>
   <properties
       key="Architectuurlaag"
-      value="Standaard"/>
+      value="Totaal (meerlaags)"/>
   <properties
       key="Domein"
       value="Ondersteuning"/>
@@ -348,9 +348,6 @@
   <properties
       key="Scope"
       value="Keten"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Viewtype"
       value="Toelichting"/>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/id-34a9d78bddae41508b5c2d49a9c92ecb/ArchimateDiagramModel_id-06c7b2d4-cfdf-4444-a24e-a0155599cb42.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/id-34a9d78bddae41508b5c2d49a9c92ecb/ArchimateDiagramModel_id-06c7b2d4-cfdf-4444-a24e-a0155599cb42.xml
index 29db8f8b2..a5ebd0452 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/id-34a9d78bddae41508b5c2d49a9c92ecb/ArchimateDiagramModel_id-06c7b2d4-cfdf-4444-a24e-a0155599cb42.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/id-34a9d78bddae41508b5c2d49a9c92ecb/ArchimateDiagramModel_id-06c7b2d4-cfdf-4444-a24e-a0155599cb42.xml
@@ -3172,7 +3172,4 @@
   <properties
       key="Viewtype"
       value="Basis"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/id-34a9d78bddae41508b5c2d49a9c92ecb/ArchimateDiagramModel_id-323bb8e8f0564f2981f4233d97685cf0.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/id-34a9d78bddae41508b5c2d49a9c92ecb/ArchimateDiagramModel_id-323bb8e8f0564f2981f4233d97685cf0.xml
index 38efd961b..35746ca32 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/id-34a9d78bddae41508b5c2d49a9c92ecb/ArchimateDiagramModel_id-323bb8e8f0564f2981f4233d97685cf0.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/id-34a9d78bddae41508b5c2d49a9c92ecb/ArchimateDiagramModel_id-323bb8e8f0564f2981f4233d97685cf0.xml
@@ -216,9 +216,6 @@
   <properties
       key="Viewtype"
       value="Toelichting"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Object ID"
       value="ace9294d-f0ea-4093-addd-43ff765f3bc8"/>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/id-34a9d78bddae41508b5c2d49a9c92ecb/ArchimateDiagramModel_id-3e6194fe3c104a35829d5c5f5ac2ce40.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/id-34a9d78bddae41508b5c2d49a9c92ecb/ArchimateDiagramModel_id-3e6194fe3c104a35829d5c5f5ac2ce40.xml
index e5dd53253..2efa36721 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/id-34a9d78bddae41508b5c2d49a9c92ecb/ArchimateDiagramModel_id-3e6194fe3c104a35829d5c5f5ac2ce40.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/id-34a9d78bddae41508b5c2d49a9c92ecb/ArchimateDiagramModel_id-3e6194fe3c104a35829d5c5f5ac2ce40.xml
@@ -575,9 +575,6 @@
   <properties
       key="Viewtype"
       value="Toelichting"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Object ID"
       value="11be8bf2-57c7-4b84-b9c4-dc8e99498321"/>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/id-34a9d78bddae41508b5c2d49a9c92ecb/ArchimateDiagramModel_id-5539b20e-b110-4b6a-955c-0cec42c5e0ab.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/id-34a9d78bddae41508b5c2d49a9c92ecb/ArchimateDiagramModel_id-5539b20e-b110-4b6a-955c-0cec42c5e0ab.xml
index 990bff4a3..c01b19b77 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/id-34a9d78bddae41508b5c2d49a9c92ecb/ArchimateDiagramModel_id-5539b20e-b110-4b6a-955c-0cec42c5e0ab.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/id-34a9d78bddae41508b5c2d49a9c92ecb/ArchimateDiagramModel_id-5539b20e-b110-4b6a-955c-0cec42c5e0ab.xml
@@ -5956,7 +5956,4 @@
   <properties
       key="Viewtype"
       value="Basis"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/id-34a9d78bddae41508b5c2d49a9c92ecb/ArchimateDiagramModel_id-5576a0b2e5574820aa71ba5eccbf025e.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/id-34a9d78bddae41508b5c2d49a9c92ecb/ArchimateDiagramModel_id-5576a0b2e5574820aa71ba5eccbf025e.xml
index c36ff8744..1231e3bb5 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/id-34a9d78bddae41508b5c2d49a9c92ecb/ArchimateDiagramModel_id-5576a0b2e5574820aa71ba5eccbf025e.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/id-34a9d78bddae41508b5c2d49a9c92ecb/ArchimateDiagramModel_id-5576a0b2e5574820aa71ba5eccbf025e.xml
@@ -227,9 +227,6 @@
   <properties
       key="Domein"
       value="Fysieke leefomgeving"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Publiceren"
       value="Niet"/>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/id-34a9d78bddae41508b5c2d49a9c92ecb/ArchimateDiagramModel_id-5f327e6fef294602b7dbfc05e5549cb2.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/id-34a9d78bddae41508b5c2d49a9c92ecb/ArchimateDiagramModel_id-5f327e6fef294602b7dbfc05e5549cb2.xml
index e9f33b7f1..419a7514a 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/id-34a9d78bddae41508b5c2d49a9c92ecb/ArchimateDiagramModel_id-5f327e6fef294602b7dbfc05e5549cb2.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/id-34a9d78bddae41508b5c2d49a9c92ecb/ArchimateDiagramModel_id-5f327e6fef294602b7dbfc05e5549cb2.xml
@@ -207,9 +207,6 @@
   <properties
       key="Domein"
       value="Fysieke leefomgeving"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Publiceren"
       value="Niet"/>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/id-34a9d78bddae41508b5c2d49a9c92ecb/ArchimateDiagramModel_id-7353f1b306c7443883cd23bb266dfbb1.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/id-34a9d78bddae41508b5c2d49a9c92ecb/ArchimateDiagramModel_id-7353f1b306c7443883cd23bb266dfbb1.xml
index 08e2e5758..08d3ccc38 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/id-34a9d78bddae41508b5c2d49a9c92ecb/ArchimateDiagramModel_id-7353f1b306c7443883cd23bb266dfbb1.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/id-34a9d78bddae41508b5c2d49a9c92ecb/ArchimateDiagramModel_id-7353f1b306c7443883cd23bb266dfbb1.xml
@@ -258,9 +258,6 @@
   <properties
       key="Detailniveau"
       value="Samenhang"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Publiceren"
       value="Niet"/>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/id-34a9d78bddae41508b5c2d49a9c92ecb/ArchimateDiagramModel_id-73a45a0f2b2742a19d1a3bb4e7ec4fc3.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/id-34a9d78bddae41508b5c2d49a9c92ecb/ArchimateDiagramModel_id-73a45a0f2b2742a19d1a3bb4e7ec4fc3.xml
index 319bf5803..28389dc46 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/id-34a9d78bddae41508b5c2d49a9c92ecb/ArchimateDiagramModel_id-73a45a0f2b2742a19d1a3bb4e7ec4fc3.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/id-34a9d78bddae41508b5c2d49a9c92ecb/ArchimateDiagramModel_id-73a45a0f2b2742a19d1a3bb4e7ec4fc3.xml
@@ -1642,4 +1642,10 @@
   <properties
       key="Object ID"
       value="96a2e54d-cf2c-4cce-b295-8c9e05a8d042"/>
+  <properties
+      key="Domein"
+      value="Fysieke leefomgeving"/>
+  <properties
+      key="Publiceren"
+      value="Niet"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/id-34a9d78bddae41508b5c2d49a9c92ecb/ArchimateDiagramModel_id-7d8c87b52d4d4058832ffe44fd30aa21.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/id-34a9d78bddae41508b5c2d49a9c92ecb/ArchimateDiagramModel_id-7d8c87b52d4d4058832ffe44fd30aa21.xml
index 5c6f35f81..225399f36 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/id-34a9d78bddae41508b5c2d49a9c92ecb/ArchimateDiagramModel_id-7d8c87b52d4d4058832ffe44fd30aa21.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/id-34a9d78bddae41508b5c2d49a9c92ecb/ArchimateDiagramModel_id-7d8c87b52d4d4058832ffe44fd30aa21.xml
@@ -157,9 +157,6 @@
   <properties
       key="Domein"
       value="Fysieke leefomgeving"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Publiceren"
       value="Niet"/>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/id-34a9d78bddae41508b5c2d49a9c92ecb/ArchimateDiagramModel_id-96d204f093424635a6b87da8a63e32d4.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/id-34a9d78bddae41508b5c2d49a9c92ecb/ArchimateDiagramModel_id-96d204f093424635a6b87da8a63e32d4.xml
index ce49a9dbf..e9ba9a1ff 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/id-34a9d78bddae41508b5c2d49a9c92ecb/ArchimateDiagramModel_id-96d204f093424635a6b87da8a63e32d4.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/id-34a9d78bddae41508b5c2d49a9c92ecb/ArchimateDiagramModel_id-96d204f093424635a6b87da8a63e32d4.xml
@@ -183,9 +183,6 @@
   <properties
       key="Domein"
       value="Fysieke leefomgeving"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Publiceren"
       value="Niet"/>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/id-34a9d78bddae41508b5c2d49a9c92ecb/ArchimateDiagramModel_id-984e274825c74338b6b3d500d69ac14f.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/id-34a9d78bddae41508b5c2d49a9c92ecb/ArchimateDiagramModel_id-984e274825c74338b6b3d500d69ac14f.xml
index 654e3cc55..f392cfd53 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/id-34a9d78bddae41508b5c2d49a9c92ecb/ArchimateDiagramModel_id-984e274825c74338b6b3d500d69ac14f.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/id-34a9d78bddae41508b5c2d49a9c92ecb/ArchimateDiagramModel_id-984e274825c74338b6b3d500d69ac14f.xml
@@ -413,9 +413,6 @@
   <properties
       key="Domein"
       value="Fysieke leefomgeving"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Publiceren"
       value="Niet"/>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/id-34a9d78bddae41508b5c2d49a9c92ecb/ArchimateDiagramModel_id-ba6be94e81ce4705a73e835e7417a97f.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/id-34a9d78bddae41508b5c2d49a9c92ecb/ArchimateDiagramModel_id-ba6be94e81ce4705a73e835e7417a97f.xml
index 6330c0bba..2d32b47a8 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/id-34a9d78bddae41508b5c2d49a9c92ecb/ArchimateDiagramModel_id-ba6be94e81ce4705a73e835e7417a97f.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/id-34a9d78bddae41508b5c2d49a9c92ecb/ArchimateDiagramModel_id-ba6be94e81ce4705a73e835e7417a97f.xml
@@ -1352,9 +1352,6 @@
   <properties
       key="Viewtype"
       value="Toelichting"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Object ID"
       value="4d83cbd9-63c9-4925-b8ef-c353a79cdb43"/>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/id-34a9d78bddae41508b5c2d49a9c92ecb/ArchimateDiagramModel_id-cabd94a8568f44d4aa07a49cacb7da5c.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/id-34a9d78bddae41508b5c2d49a9c92ecb/ArchimateDiagramModel_id-cabd94a8568f44d4aa07a49cacb7da5c.xml
index f27a7bf94..39dce4153 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/id-34a9d78bddae41508b5c2d49a9c92ecb/ArchimateDiagramModel_id-cabd94a8568f44d4aa07a49cacb7da5c.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/id-34a9d78bddae41508b5c2d49a9c92ecb/ArchimateDiagramModel_id-cabd94a8568f44d4aa07a49cacb7da5c.xml
@@ -113,9 +113,6 @@
   <properties
       key="Viewtype"
       value="Toelichting"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Object ID"
       value="0046cacd-73c5-4580-9527-7b981b02c281"/>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/id-34a9d78bddae41508b5c2d49a9c92ecb/ArchimateDiagramModel_id-e7febb51391f424b85fdfd6a06578172.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/id-34a9d78bddae41508b5c2d49a9c92ecb/ArchimateDiagramModel_id-e7febb51391f424b85fdfd6a06578172.xml
index 4f71d055f..abc304caa 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/id-34a9d78bddae41508b5c2d49a9c92ecb/ArchimateDiagramModel_id-e7febb51391f424b85fdfd6a06578172.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/6b70f179-a456-4f17-a120-55056e4b3e26/id-34a9d78bddae41508b5c2d49a9c92ecb/ArchimateDiagramModel_id-e7febb51391f424b85fdfd6a06578172.xml
@@ -104,9 +104,6 @@
   <properties
       key="Domein"
       value="Fysieke leefomgeving"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Publiceren"
       value="Niet"/>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/ArchimateDiagramModel_id-0c0cc578-6cad-4222-beff-dcdda4d094a4.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/ArchimateDiagramModel_id-0c0cc578-6cad-4222-beff-dcdda4d094a4.xml
index f985fa94d..670ef3ff6 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/ArchimateDiagramModel_id-0c0cc578-6cad-4222-beff-dcdda4d094a4.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/ArchimateDiagramModel_id-0c0cc578-6cad-4222-beff-dcdda4d094a4.xml
@@ -719,9 +719,6 @@
   <properties
       key="Viewtype"
       value="Toelichting"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Viewtype"
       value="Toelichting"/>
@@ -734,4 +731,7 @@
   <properties
       key="Domein"
       value="Niet domeingebonden"/>
+  <properties
+      key="Detailniveau"
+      value="Detail"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/ArchimateDiagramModel_id-723a109e-83de-4825-9fac-0c9e2002934e.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/ArchimateDiagramModel_id-723a109e-83de-4825-9fac-0c9e2002934e.xml
index 353a000dd..f6970fa24 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/ArchimateDiagramModel_id-723a109e-83de-4825-9fac-0c9e2002934e.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/ArchimateDiagramModel_id-723a109e-83de-4825-9fac-0c9e2002934e.xml
@@ -449,9 +449,6 @@
   <properties
       key="Object ID"
       value="723a109e-83de-4825-9fac-0c9e2002934e"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Viewtype"
       value="Toelichting"/>
@@ -464,4 +461,7 @@
   <properties
       key="Domein"
       value="Niet domeingebonden"/>
+  <properties
+      key="Detailniveau"
+      value="Detail"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/ArchimateDiagramModel_id-9865115e-61a6-4952-95b7-c0c759dd6b81.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/ArchimateDiagramModel_id-9865115e-61a6-4952-95b7-c0c759dd6b81.xml
index 2c88a3156..0e4298f2b 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/ArchimateDiagramModel_id-9865115e-61a6-4952-95b7-c0c759dd6b81.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/ArchimateDiagramModel_id-9865115e-61a6-4952-95b7-c0c759dd6b81.xml
@@ -3137,7 +3137,4 @@
   <properties
       key="Viewtype"
       value="Basis"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/ArchimateDiagramModel_id-9fb84442-5d4c-46de-a106-764e3b3cf40e.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/ArchimateDiagramModel_id-9fb84442-5d4c-46de-a106-764e3b3cf40e.xml
index 9557e5905..022712431 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/ArchimateDiagramModel_id-9fb84442-5d4c-46de-a106-764e3b3cf40e.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/ArchimateDiagramModel_id-9fb84442-5d4c-46de-a106-764e3b3cf40e.xml
@@ -3528,7 +3528,4 @@
   <properties
       key="Viewtype"
       value="Basis"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/ArchimateDiagramModel_id-a8472423-fcb4-4e29-93d0-032f91e8add6.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/ArchimateDiagramModel_id-a8472423-fcb4-4e29-93d0-032f91e8add6.xml
index 68adda378..8b188b663 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/ArchimateDiagramModel_id-a8472423-fcb4-4e29-93d0-032f91e8add6.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/ArchimateDiagramModel_id-a8472423-fcb4-4e29-93d0-032f91e8add6.xml
@@ -490,7 +490,7 @@
       value="Toelichting"/>
   <properties
       key="GEMMA thema"
-      value="Informatiebeveiliging"/>
+      value="Privacy en informatiebeveiliging"/>
   <properties
       key="Architectuurlaag"
       value="Applicatiearchitectuur"/>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/ArchimateDiagramModel_id-c512705a-8cd9-46ac-922d-35966bc6961e.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/ArchimateDiagramModel_id-c512705a-8cd9-46ac-922d-35966bc6961e.xml
index f30f923b6..b087abe8c 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/ArchimateDiagramModel_id-c512705a-8cd9-46ac-922d-35966bc6961e.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/ArchimateDiagramModel_id-c512705a-8cd9-46ac-922d-35966bc6961e.xml
@@ -1908,7 +1908,4 @@
   <properties
       key="Viewtype"
       value="Basis"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/ArchimateDiagramModel_id-e0f57689-624e-4079-b7f9-79d14bac22f4.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/ArchimateDiagramModel_id-e0f57689-624e-4079-b7f9-79d14bac22f4.xml
index 88742549c..154d340ea 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/ArchimateDiagramModel_id-e0f57689-624e-4079-b7f9-79d14bac22f4.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/ArchimateDiagramModel_id-e0f57689-624e-4079-b7f9-79d14bac22f4.xml
@@ -4346,7 +4346,4 @@
   <properties
       key="Viewtype"
       value="Basis"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/ArchimateDiagramModel_id-fb0afc5e95bd410dba2c8abf8b5f9c8b.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/ArchimateDiagramModel_id-fb0afc5e95bd410dba2c8abf8b5f9c8b.xml
index c1f3dd6d2..a7b4d7c5b 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/ArchimateDiagramModel_id-fb0afc5e95bd410dba2c8abf8b5f9c8b.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/ArchimateDiagramModel_id-fb0afc5e95bd410dba2c8abf8b5f9c8b.xml
@@ -8028,7 +8028,4 @@
   <properties
       key="Viewtype"
       value="Basis"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-01c30ed1119e4d2e9ab1a5b78ffd6d5b/ArchimateDiagramModel_id-26b14c465324494bbde9718019016b05.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-01c30ed1119e4d2e9ab1a5b78ffd6d5b/ArchimateDiagramModel_id-26b14c465324494bbde9718019016b05.xml
index f891ddfda..1e12c369e 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-01c30ed1119e4d2e9ab1a5b78ffd6d5b/ArchimateDiagramModel_id-26b14c465324494bbde9718019016b05.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-01c30ed1119e4d2e9ab1a5b78ffd6d5b/ArchimateDiagramModel_id-26b14c465324494bbde9718019016b05.xml
@@ -1391,4 +1391,7 @@
   <properties
       key="Object ID"
       value="94fdf2b4-25dd-4aba-8dbe-a4f3847a47bc"/>
+  <properties
+      key="Publiceren"
+      value="Niet"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-01c30ed1119e4d2e9ab1a5b78ffd6d5b/ArchimateDiagramModel_id-3bf18225fc0840709f681b7d9e69381f.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-01c30ed1119e4d2e9ab1a5b78ffd6d5b/ArchimateDiagramModel_id-3bf18225fc0840709f681b7d9e69381f.xml
index 0b56c7e0e..c063f9657 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-01c30ed1119e4d2e9ab1a5b78ffd6d5b/ArchimateDiagramModel_id-3bf18225fc0840709f681b7d9e69381f.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-01c30ed1119e4d2e9ab1a5b78ffd6d5b/ArchimateDiagramModel_id-3bf18225fc0840709f681b7d9e69381f.xml
@@ -1043,4 +1043,13 @@
   <properties
       key="Publiceren"
       value="GEMMA Online en redactie"/>
+  <properties
+      key="Detailniveau"
+      value="Detail"/>
+  <properties
+      key="Scope"
+      value="Keten"/>
+  <properties
+      key="Viewtype"
+      value="Toelichting"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-01c30ed1119e4d2e9ab1a5b78ffd6d5b/ArchimateDiagramModel_id-f3307f7a34e443d591156edcf3997ec0.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-01c30ed1119e4d2e9ab1a5b78ffd6d5b/ArchimateDiagramModel_id-f3307f7a34e443d591156edcf3997ec0.xml
index 1c0a1be70..fc9fffac9 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-01c30ed1119e4d2e9ab1a5b78ffd6d5b/ArchimateDiagramModel_id-f3307f7a34e443d591156edcf3997ec0.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-01c30ed1119e4d2e9ab1a5b78ffd6d5b/ArchimateDiagramModel_id-f3307f7a34e443d591156edcf3997ec0.xml
@@ -753,4 +753,13 @@
   <properties
       key="Publiceren"
       value="GEMMA Online en redactie"/>
+  <properties
+      key="Detailniveau"
+      value="Detail"/>
+  <properties
+      key="Scope"
+      value="Keten"/>
+  <properties
+      key="Viewtype"
+      value="Toelichting"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/39b67e0d-9a0d-4a35-9c81-5cdf7c73c19e/ArchimateDiagramModel_id-34a2f174-39cf-4b55-b4e1-72688f868176.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/39b67e0d-9a0d-4a35-9c81-5cdf7c73c19e/ArchimateDiagramModel_id-34a2f174-39cf-4b55-b4e1-72688f868176.xml
index 14c80e329..742a394a9 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/39b67e0d-9a0d-4a35-9c81-5cdf7c73c19e/ArchimateDiagramModel_id-34a2f174-39cf-4b55-b4e1-72688f868176.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/39b67e0d-9a0d-4a35-9c81-5cdf7c73c19e/ArchimateDiagramModel_id-34a2f174-39cf-4b55-b4e1-72688f868176.xml
@@ -53,7 +53,7 @@
       value="Toelichting"/>
   <properties
       key="Detailniveau"
-      value="Detailview"/>
+      value="Detail"/>
   <properties
       key="Scope"
       value="Gemeente"/>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/39b67e0d-9a0d-4a35-9c81-5cdf7c73c19e/ArchimateDiagramModel_id-63aa8230-d562-4950-a147-8dfb99cd0259.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/39b67e0d-9a0d-4a35-9c81-5cdf7c73c19e/ArchimateDiagramModel_id-63aa8230-d562-4950-a147-8dfb99cd0259.xml
index 8cf38610c..3f62a766a 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/39b67e0d-9a0d-4a35-9c81-5cdf7c73c19e/ArchimateDiagramModel_id-63aa8230-d562-4950-a147-8dfb99cd0259.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/39b67e0d-9a0d-4a35-9c81-5cdf7c73c19e/ArchimateDiagramModel_id-63aa8230-d562-4950-a147-8dfb99cd0259.xml
@@ -230,7 +230,7 @@
       value="Toelichting"/>
   <properties
       key="Detailniveau"
-      value="Detailview"/>
+      value="Detail"/>
   <properties
       key="Scope"
       value="Gemeente"/>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/39b67e0d-9a0d-4a35-9c81-5cdf7c73c19e/ArchimateDiagramModel_id-7616860b-bf2e-47af-9407-e4c2c81f13aa.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/39b67e0d-9a0d-4a35-9c81-5cdf7c73c19e/ArchimateDiagramModel_id-7616860b-bf2e-47af-9407-e4c2c81f13aa.xml
index b89710c44..2518d5478 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/39b67e0d-9a0d-4a35-9c81-5cdf7c73c19e/ArchimateDiagramModel_id-7616860b-bf2e-47af-9407-e4c2c81f13aa.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/39b67e0d-9a0d-4a35-9c81-5cdf7c73c19e/ArchimateDiagramModel_id-7616860b-bf2e-47af-9407-e4c2c81f13aa.xml
@@ -53,7 +53,7 @@
       value="Toelichting"/>
   <properties
       key="Detailniveau"
-      value="Detailview"/>
+      value="Detail"/>
   <properties
       key="Scope"
       value="Gemeente"/>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/39b67e0d-9a0d-4a35-9c81-5cdf7c73c19e/ArchimateDiagramModel_id-7bf4ca5c-dd30-4692-a98b-4cd357d1defc.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/39b67e0d-9a0d-4a35-9c81-5cdf7c73c19e/ArchimateDiagramModel_id-7bf4ca5c-dd30-4692-a98b-4cd357d1defc.xml
index 320a8b748..9eb554103 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/39b67e0d-9a0d-4a35-9c81-5cdf7c73c19e/ArchimateDiagramModel_id-7bf4ca5c-dd30-4692-a98b-4cd357d1defc.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/39b67e0d-9a0d-4a35-9c81-5cdf7c73c19e/ArchimateDiagramModel_id-7bf4ca5c-dd30-4692-a98b-4cd357d1defc.xml
@@ -238,7 +238,7 @@
       value="Toelichting"/>
   <properties
       key="Detailniveau"
-      value="Detailview"/>
+      value="Detail"/>
   <properties
       key="Scope"
       value="Gemeente"/>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/39b67e0d-9a0d-4a35-9c81-5cdf7c73c19e/ArchimateDiagramModel_id-80476acb-0dc1-444c-aec3-b58784eabb5b.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/39b67e0d-9a0d-4a35-9c81-5cdf7c73c19e/ArchimateDiagramModel_id-80476acb-0dc1-444c-aec3-b58784eabb5b.xml
index baa2a7961..44888a963 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/39b67e0d-9a0d-4a35-9c81-5cdf7c73c19e/ArchimateDiagramModel_id-80476acb-0dc1-444c-aec3-b58784eabb5b.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/39b67e0d-9a0d-4a35-9c81-5cdf7c73c19e/ArchimateDiagramModel_id-80476acb-0dc1-444c-aec3-b58784eabb5b.xml
@@ -53,7 +53,7 @@
       value="Toelichting"/>
   <properties
       key="Detailniveau"
-      value="Detailview"/>
+      value="Detail"/>
   <properties
       key="Scope"
       value="Gemeente"/>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/39b67e0d-9a0d-4a35-9c81-5cdf7c73c19e/ArchimateDiagramModel_id-88756d7c-1abb-443f-a7fa-097b6d207f11.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/39b67e0d-9a0d-4a35-9c81-5cdf7c73c19e/ArchimateDiagramModel_id-88756d7c-1abb-443f-a7fa-097b6d207f11.xml
index deb67ecec..92eed0578 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/39b67e0d-9a0d-4a35-9c81-5cdf7c73c19e/ArchimateDiagramModel_id-88756d7c-1abb-443f-a7fa-097b6d207f11.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/39b67e0d-9a0d-4a35-9c81-5cdf7c73c19e/ArchimateDiagramModel_id-88756d7c-1abb-443f-a7fa-097b6d207f11.xml
@@ -398,7 +398,7 @@
       value="Toelichting"/>
   <properties
       key="Detailniveau"
-      value="Detailview"/>
+      value="Detail"/>
   <properties
       key="Scope"
       value="Gemeente"/>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/39b67e0d-9a0d-4a35-9c81-5cdf7c73c19e/ArchimateDiagramModel_id-92c6ec08-5616-49a8-9bc9-cbd2147fee28.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/39b67e0d-9a0d-4a35-9c81-5cdf7c73c19e/ArchimateDiagramModel_id-92c6ec08-5616-49a8-9bc9-cbd2147fee28.xml
index 40d6a0642..4b46d906b 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/39b67e0d-9a0d-4a35-9c81-5cdf7c73c19e/ArchimateDiagramModel_id-92c6ec08-5616-49a8-9bc9-cbd2147fee28.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/39b67e0d-9a0d-4a35-9c81-5cdf7c73c19e/ArchimateDiagramModel_id-92c6ec08-5616-49a8-9bc9-cbd2147fee28.xml
@@ -189,7 +189,7 @@
       value="Zaakgericht werken"/>
   <properties
       key="Detailniveau"
-      value="Detailview"/>
+      value="Detail"/>
   <properties
       key="Scope"
       value="Gemeente"/>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/39b67e0d-9a0d-4a35-9c81-5cdf7c73c19e/ArchimateDiagramModel_id-a5c77ef3-dcf5-4f9d-a75b-a34cb558aed4.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/39b67e0d-9a0d-4a35-9c81-5cdf7c73c19e/ArchimateDiagramModel_id-a5c77ef3-dcf5-4f9d-a75b-a34cb558aed4.xml
index 58d3c873f..2a3ab3c94 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/39b67e0d-9a0d-4a35-9c81-5cdf7c73c19e/ArchimateDiagramModel_id-a5c77ef3-dcf5-4f9d-a75b-a34cb558aed4.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/39b67e0d-9a0d-4a35-9c81-5cdf7c73c19e/ArchimateDiagramModel_id-a5c77ef3-dcf5-4f9d-a75b-a34cb558aed4.xml
@@ -189,7 +189,7 @@
       value="Zaakgericht werken"/>
   <properties
       key="Detailniveau"
-      value="Detailview"/>
+      value="Detail"/>
   <properties
       key="Scope"
       value="Gemeente"/>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/39b67e0d-9a0d-4a35-9c81-5cdf7c73c19e/ArchimateDiagramModel_id-b08aee72-cdf2-4a31-a4d3-1d5c7c9d0a4d.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/39b67e0d-9a0d-4a35-9c81-5cdf7c73c19e/ArchimateDiagramModel_id-b08aee72-cdf2-4a31-a4d3-1d5c7c9d0a4d.xml
index a07675b51..e72d151a2 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/39b67e0d-9a0d-4a35-9c81-5cdf7c73c19e/ArchimateDiagramModel_id-b08aee72-cdf2-4a31-a4d3-1d5c7c9d0a4d.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/39b67e0d-9a0d-4a35-9c81-5cdf7c73c19e/ArchimateDiagramModel_id-b08aee72-cdf2-4a31-a4d3-1d5c7c9d0a4d.xml
@@ -357,7 +357,7 @@
       value="Zaakgericht werken"/>
   <properties
       key="Detailniveau"
-      value="Detailview"/>
+      value="Detail"/>
   <properties
       key="Scope"
       value="Gemeente"/>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/39b67e0d-9a0d-4a35-9c81-5cdf7c73c19e/ArchimateDiagramModel_id-c7140b9c-a399-483c-a3ee-c2a8c354a084.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/39b67e0d-9a0d-4a35-9c81-5cdf7c73c19e/ArchimateDiagramModel_id-c7140b9c-a399-483c-a3ee-c2a8c354a084.xml
index 1b715028e..ee1aaf5dd 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/39b67e0d-9a0d-4a35-9c81-5cdf7c73c19e/ArchimateDiagramModel_id-c7140b9c-a399-483c-a3ee-c2a8c354a084.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/39b67e0d-9a0d-4a35-9c81-5cdf7c73c19e/ArchimateDiagramModel_id-c7140b9c-a399-483c-a3ee-c2a8c354a084.xml
@@ -108,7 +108,7 @@
       value="Toelichting"/>
   <properties
       key="Detailniveau"
-      value="Detailview"/>
+      value="Detail"/>
   <properties
       key="Scope"
       value="Gemeente"/>
@@ -118,4 +118,7 @@
   <properties
       key="Domein"
       value="Niet domeingebonden"/>
+  <properties
+      key="GEMMA thema"
+      value="Zaakgericht werken"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/39b67e0d-9a0d-4a35-9c81-5cdf7c73c19e/ArchimateDiagramModel_id-f9d8a7a4-f949-4947-b614-be9173740950.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/39b67e0d-9a0d-4a35-9c81-5cdf7c73c19e/ArchimateDiagramModel_id-f9d8a7a4-f949-4947-b614-be9173740950.xml
index c4cc066e6..876bcb1fa 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/39b67e0d-9a0d-4a35-9c81-5cdf7c73c19e/ArchimateDiagramModel_id-f9d8a7a4-f949-4947-b614-be9173740950.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/39b67e0d-9a0d-4a35-9c81-5cdf7c73c19e/ArchimateDiagramModel_id-f9d8a7a4-f949-4947-b614-be9173740950.xml
@@ -56,7 +56,7 @@
       value="Zaakgericht werken"/>
   <properties
       key="Detailniveau"
-      value="Detailview"/>
+      value="Detail"/>
   <properties
       key="Scope"
       value="Gemeente"/>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/ArchimateDiagramModel_id-8814ea0e-ed5c-40c5-8334-26da6bf6a6a0.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/ArchimateDiagramModel_id-8814ea0e-ed5c-40c5-8334-26da6bf6a6a0.xml
index bc0efd7e5..36c920884 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/ArchimateDiagramModel_id-8814ea0e-ed5c-40c5-8334-26da6bf6a6a0.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/ArchimateDiagramModel_id-8814ea0e-ed5c-40c5-8334-26da6bf6a6a0.xml
@@ -322,8 +322,11 @@
       value="Niet domeingebonden"/>
   <properties
       key="Detailniveau"
-      value="Detailview"/>
+      value="Detail"/>
   <properties
       key="Scope"
       value="Gemeente"/>
+  <properties
+      key="Publiceren"
+      value="Niet"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/ArchimateDiagramModel_id-b8b4011e-0800-4cab-a120-6751c7f0e9aa.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/ArchimateDiagramModel_id-b8b4011e-0800-4cab-a120-6751c7f0e9aa.xml
index c4b52d263..231f6127a 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/ArchimateDiagramModel_id-b8b4011e-0800-4cab-a120-6751c7f0e9aa.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/ArchimateDiagramModel_id-b8b4011e-0800-4cab-a120-6751c7f0e9aa.xml
@@ -303,7 +303,7 @@
       value="Toelichting"/>
   <properties
       key="Detailniveau"
-      value="Detailview"/>
+      value="Detail"/>
   <properties
       key="Scope"
       value="Gemeente"/>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/ArchimateDiagramModel_id-bc3122b3-c6ee-40d0-b9c8-7ac80a83c418.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/ArchimateDiagramModel_id-bc3122b3-c6ee-40d0-b9c8-7ac80a83c418.xml
index c36d0dddc..51e24df77 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/ArchimateDiagramModel_id-bc3122b3-c6ee-40d0-b9c8-7ac80a83c418.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/ArchimateDiagramModel_id-bc3122b3-c6ee-40d0-b9c8-7ac80a83c418.xml
@@ -332,7 +332,7 @@
       value="Zaakgericht werken"/>
   <properties
       key="Detailniveau"
-      value="Detailview"/>
+      value="Detail"/>
   <properties
       key="Scope"
       value="Gemeente"/>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/id-fc8655e38ee3445fb0bd0302e3a9b965/ArchimateDiagramModel_id-26d64384-72b3-4001-8c12-f13aa0b9204e.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/id-fc8655e38ee3445fb0bd0302e3a9b965/ArchimateDiagramModel_id-26d64384-72b3-4001-8c12-f13aa0b9204e.xml
index 3dccadf92..369de8bb0 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/id-fc8655e38ee3445fb0bd0302e3a9b965/ArchimateDiagramModel_id-26d64384-72b3-4001-8c12-f13aa0b9204e.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/id-fc8655e38ee3445fb0bd0302e3a9b965/ArchimateDiagramModel_id-26d64384-72b3-4001-8c12-f13aa0b9204e.xml
@@ -338,7 +338,7 @@
       value="Zaakgericht werken"/>
   <properties
       key="Detailniveau"
-      value="Detailview"/>
+      value="Detail"/>
   <properties
       key="Scope"
       value="Gemeente"/>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/id-fc8655e38ee3445fb0bd0302e3a9b965/ArchimateDiagramModel_id-30ce8fd7-e9af-4da5-b535-3092eed3c645.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/id-fc8655e38ee3445fb0bd0302e3a9b965/ArchimateDiagramModel_id-30ce8fd7-e9af-4da5-b535-3092eed3c645.xml
index 3ea95ab48..24855ad77 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/id-fc8655e38ee3445fb0bd0302e3a9b965/ArchimateDiagramModel_id-30ce8fd7-e9af-4da5-b535-3092eed3c645.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/id-fc8655e38ee3445fb0bd0302e3a9b965/ArchimateDiagramModel_id-30ce8fd7-e9af-4da5-b535-3092eed3c645.xml
@@ -241,7 +241,7 @@
       value="Zaakgericht werken"/>
   <properties
       key="Detailniveau"
-      value="Detailview"/>
+      value="Detail"/>
   <properties
       key="Scope"
       value="Gemeente"/>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/id-fc8655e38ee3445fb0bd0302e3a9b965/ArchimateDiagramModel_id-73afe1ab-bb6e-41a7-9de8-6caf25b57167.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/id-fc8655e38ee3445fb0bd0302e3a9b965/ArchimateDiagramModel_id-73afe1ab-bb6e-41a7-9de8-6caf25b57167.xml
index fdc495eef..2865ceb67 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/id-fc8655e38ee3445fb0bd0302e3a9b965/ArchimateDiagramModel_id-73afe1ab-bb6e-41a7-9de8-6caf25b57167.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/id-fc8655e38ee3445fb0bd0302e3a9b965/ArchimateDiagramModel_id-73afe1ab-bb6e-41a7-9de8-6caf25b57167.xml
@@ -290,7 +290,7 @@
       value="Zaakgericht werken"/>
   <properties
       key="Detailniveau"
-      value="Detailview"/>
+      value="Detail"/>
   <properties
       key="Scope"
       value="Gemeente"/>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/id-fc8655e38ee3445fb0bd0302e3a9b965/ArchimateDiagramModel_id-749ce7f1-6fd0-475c-8e13-64151cb4b589.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/id-fc8655e38ee3445fb0bd0302e3a9b965/ArchimateDiagramModel_id-749ce7f1-6fd0-475c-8e13-64151cb4b589.xml
index b9372bb47..9d2fa0171 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/id-fc8655e38ee3445fb0bd0302e3a9b965/ArchimateDiagramModel_id-749ce7f1-6fd0-475c-8e13-64151cb4b589.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/id-fc8655e38ee3445fb0bd0302e3a9b965/ArchimateDiagramModel_id-749ce7f1-6fd0-475c-8e13-64151cb4b589.xml
@@ -241,7 +241,7 @@
       value="Zaakgericht werken"/>
   <properties
       key="Detailniveau"
-      value="Detailview"/>
+      value="Detail"/>
   <properties
       key="Scope"
       value="Gemeente"/>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/id-fc8655e38ee3445fb0bd0302e3a9b965/ArchimateDiagramModel_id-87ae5612-95c5-43bb-a9e8-50af266a5bad.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/id-fc8655e38ee3445fb0bd0302e3a9b965/ArchimateDiagramModel_id-87ae5612-95c5-43bb-a9e8-50af266a5bad.xml
index 565ca0fb5..7a5c9ffa8 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/id-fc8655e38ee3445fb0bd0302e3a9b965/ArchimateDiagramModel_id-87ae5612-95c5-43bb-a9e8-50af266a5bad.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/id-fc8655e38ee3445fb0bd0302e3a9b965/ArchimateDiagramModel_id-87ae5612-95c5-43bb-a9e8-50af266a5bad.xml
@@ -192,7 +192,7 @@
       value="Zaakgericht werken"/>
   <properties
       key="Detailniveau"
-      value="Detailview"/>
+      value="Detail"/>
   <properties
       key="Scope"
       value="Gemeente"/>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/id-fc8655e38ee3445fb0bd0302e3a9b965/ArchimateDiagramModel_id-a984c5aa-1ffd-4a3d-8d2e-3f04ff90bd4d.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/id-fc8655e38ee3445fb0bd0302e3a9b965/ArchimateDiagramModel_id-a984c5aa-1ffd-4a3d-8d2e-3f04ff90bd4d.xml
index 91b8ca792..136ec61e7 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/id-fc8655e38ee3445fb0bd0302e3a9b965/ArchimateDiagramModel_id-a984c5aa-1ffd-4a3d-8d2e-3f04ff90bd4d.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/id-fc8655e38ee3445fb0bd0302e3a9b965/ArchimateDiagramModel_id-a984c5aa-1ffd-4a3d-8d2e-3f04ff90bd4d.xml
@@ -327,7 +327,7 @@
       value="Zaakgericht werken"/>
   <properties
       key="Detailniveau"
-      value="Detailview"/>
+      value="Detail"/>
   <properties
       key="Scope"
       value="Gemeente"/>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/id-fc8655e38ee3445fb0bd0302e3a9b965/ArchimateDiagramModel_id-ab08b4ae-d7b8-41b6-bbd8-e2b8e0f485bc.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/id-fc8655e38ee3445fb0bd0302e3a9b965/ArchimateDiagramModel_id-ab08b4ae-d7b8-41b6-bbd8-e2b8e0f485bc.xml
index 6c798dc2b..20f647022 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/id-fc8655e38ee3445fb0bd0302e3a9b965/ArchimateDiagramModel_id-ab08b4ae-d7b8-41b6-bbd8-e2b8e0f485bc.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/id-fc8655e38ee3445fb0bd0302e3a9b965/ArchimateDiagramModel_id-ab08b4ae-d7b8-41b6-bbd8-e2b8e0f485bc.xml
@@ -193,7 +193,7 @@
       value="Zaakgericht werken"/>
   <properties
       key="Detailniveau"
-      value="Detailview"/>
+      value="Detail"/>
   <properties
       key="Scope"
       value="Gemeente"/>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/id-fc8655e38ee3445fb0bd0302e3a9b965/ArchimateDiagramModel_id-b400b22a-83e6-4f37-8ae4-4bea42f4e657.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/id-fc8655e38ee3445fb0bd0302e3a9b965/ArchimateDiagramModel_id-b400b22a-83e6-4f37-8ae4-4bea42f4e657.xml
index f7115209c..7c28c88b3 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/id-fc8655e38ee3445fb0bd0302e3a9b965/ArchimateDiagramModel_id-b400b22a-83e6-4f37-8ae4-4bea42f4e657.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/id-fc8655e38ee3445fb0bd0302e3a9b965/ArchimateDiagramModel_id-b400b22a-83e6-4f37-8ae4-4bea42f4e657.xml
@@ -179,7 +179,7 @@
       value="Zaakgericht werken"/>
   <properties
       key="Detailniveau"
-      value="Detailview"/>
+      value="Detail"/>
   <properties
       key="Scope"
       value="Gemeente"/>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/id-fc8655e38ee3445fb0bd0302e3a9b965/ArchimateDiagramModel_id-b6ca237c-d213-44c1-a2d9-e6d5977f0d6f.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/id-fc8655e38ee3445fb0bd0302e3a9b965/ArchimateDiagramModel_id-b6ca237c-d213-44c1-a2d9-e6d5977f0d6f.xml
index 1c376db03..288d2c30a 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/id-fc8655e38ee3445fb0bd0302e3a9b965/ArchimateDiagramModel_id-b6ca237c-d213-44c1-a2d9-e6d5977f0d6f.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/id-fc8655e38ee3445fb0bd0302e3a9b965/ArchimateDiagramModel_id-b6ca237c-d213-44c1-a2d9-e6d5977f0d6f.xml
@@ -390,7 +390,7 @@
       value="Zaakgericht werken"/>
   <properties
       key="Detailniveau"
-      value="Detailview"/>
+      value="Detail"/>
   <properties
       key="Scope"
       value="Gemeente"/>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/id-fc8655e38ee3445fb0bd0302e3a9b965/ArchimateDiagramModel_id-b886e5e5-79d3-4371-8817-a170cb6c7194.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/id-fc8655e38ee3445fb0bd0302e3a9b965/ArchimateDiagramModel_id-b886e5e5-79d3-4371-8817-a170cb6c7194.xml
index 03b903f36..e21fa2138 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/id-fc8655e38ee3445fb0bd0302e3a9b965/ArchimateDiagramModel_id-b886e5e5-79d3-4371-8817-a170cb6c7194.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/id-fc8655e38ee3445fb0bd0302e3a9b965/ArchimateDiagramModel_id-b886e5e5-79d3-4371-8817-a170cb6c7194.xml
@@ -292,7 +292,7 @@
       value="Zaakgericht werken"/>
   <properties
       key="Detailniveau"
-      value="Detailview"/>
+      value="Detail"/>
   <properties
       key="Scope"
       value="Gemeente"/>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/id-fc8655e38ee3445fb0bd0302e3a9b965/ArchimateDiagramModel_id-bfcab90b-e8bf-4ea7-9e64-3873846a4122.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/id-fc8655e38ee3445fb0bd0302e3a9b965/ArchimateDiagramModel_id-bfcab90b-e8bf-4ea7-9e64-3873846a4122.xml
index a586e455e..2b1df6277 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/id-fc8655e38ee3445fb0bd0302e3a9b965/ArchimateDiagramModel_id-bfcab90b-e8bf-4ea7-9e64-3873846a4122.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/id-fc8655e38ee3445fb0bd0302e3a9b965/ArchimateDiagramModel_id-bfcab90b-e8bf-4ea7-9e64-3873846a4122.xml
@@ -290,7 +290,7 @@
       value="Zaakgericht werken"/>
   <properties
       key="Detailniveau"
-      value="Detailview"/>
+      value="Detail"/>
   <properties
       key="Scope"
       value="Gemeente"/>
diff --git a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/id-fc8655e38ee3445fb0bd0302e3a9b965/ArchimateDiagramModel_id-f80f804c-c5e8-44a2-99ed-16d27a386c68.xml b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/id-fc8655e38ee3445fb0bd0302e3a9b965/ArchimateDiagramModel_id-f80f804c-c5e8-44a2-99ed-16d27a386c68.xml
index 2ea8d5fea..ddc52783f 100644
--- a/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/id-fc8655e38ee3445fb0bd0302e3a9b965/ArchimateDiagramModel_id-f80f804c-c5e8-44a2-99ed-16d27a386c68.xml
+++ b/model/diagrams/79c20741-b836-4792-9222-6e3b143bee3f/id-7c8de1374fc344d691342b65ee6bc96d/id-e36ab1b4f7a9459b914b46f57c00a234/a9ee85ba-500f-46ea-a43f-7969198333e5/id-fc8655e38ee3445fb0bd0302e3a9b965/ArchimateDiagramModel_id-f80f804c-c5e8-44a2-99ed-16d27a386c68.xml
@@ -194,7 +194,7 @@
       value="Zaakgericht werken"/>
   <properties
       key="Detailniveau"
-      value="Detailview"/>
+      value="Detail"/>
   <properties
       key="Scope"
       value="Gemeente"/>
diff --git a/model/diagrams/81f955b9-d831-4cfb-9811-ae890b675f06/id-41efc9cbd0a94411b5777140091d8a49/ArchimateDiagramModel_id-031cf6e0-071c-4346-b324-43aea1c246f1.xml b/model/diagrams/81f955b9-d831-4cfb-9811-ae890b675f06/id-41efc9cbd0a94411b5777140091d8a49/ArchimateDiagramModel_id-031cf6e0-071c-4346-b324-43aea1c246f1.xml
index 3a3ed8545..96d1f6b1f 100644
--- a/model/diagrams/81f955b9-d831-4cfb-9811-ae890b675f06/id-41efc9cbd0a94411b5777140091d8a49/ArchimateDiagramModel_id-031cf6e0-071c-4346-b324-43aea1c246f1.xml
+++ b/model/diagrams/81f955b9-d831-4cfb-9811-ae890b675f06/id-41efc9cbd0a94411b5777140091d8a49/ArchimateDiagramModel_id-031cf6e0-071c-4346-b324-43aea1c246f1.xml
@@ -152,7 +152,4 @@
   <properties
       key="Viewtype"
       value="Basis"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/81f955b9-d831-4cfb-9811-ae890b675f06/id-7cb7788967f842bb9650a96ef3f35dec/ArchimateDiagramModel_id-08d7b01246ce4c5e9070ad0adee34648.xml b/model/diagrams/81f955b9-d831-4cfb-9811-ae890b675f06/id-7cb7788967f842bb9650a96ef3f35dec/ArchimateDiagramModel_id-08d7b01246ce4c5e9070ad0adee34648.xml
index e23d24543..c4ccf8d1e 100644
--- a/model/diagrams/81f955b9-d831-4cfb-9811-ae890b675f06/id-7cb7788967f842bb9650a96ef3f35dec/ArchimateDiagramModel_id-08d7b01246ce4c5e9070ad0adee34648.xml
+++ b/model/diagrams/81f955b9-d831-4cfb-9811-ae890b675f06/id-7cb7788967f842bb9650a96ef3f35dec/ArchimateDiagramModel_id-08d7b01246ce4c5e9070ad0adee34648.xml
@@ -614,9 +614,6 @@
   <properties
       key="Viewtype"
       value="Basis"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Architectuurlaag"
       value="Motivatie"/>
diff --git a/model/diagrams/81f955b9-d831-4cfb-9811-ae890b675f06/id-7cb7788967f842bb9650a96ef3f35dec/ArchimateDiagramModel_id-555506fff5974e9f80cd2066982a1c48.xml b/model/diagrams/81f955b9-d831-4cfb-9811-ae890b675f06/id-7cb7788967f842bb9650a96ef3f35dec/ArchimateDiagramModel_id-555506fff5974e9f80cd2066982a1c48.xml
index 210b653ef..e49b04083 100644
--- a/model/diagrams/81f955b9-d831-4cfb-9811-ae890b675f06/id-7cb7788967f842bb9650a96ef3f35dec/ArchimateDiagramModel_id-555506fff5974e9f80cd2066982a1c48.xml
+++ b/model/diagrams/81f955b9-d831-4cfb-9811-ae890b675f06/id-7cb7788967f842bb9650a96ef3f35dec/ArchimateDiagramModel_id-555506fff5974e9f80cd2066982a1c48.xml
@@ -647,9 +647,6 @@
   <properties
       key="Viewtype"
       value="Basis"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Architectuurlaag"
       value="Motivatie"/>
diff --git a/model/diagrams/81f955b9-d831-4cfb-9811-ae890b675f06/id-7cb7788967f842bb9650a96ef3f35dec/ArchimateDiagramModel_id-69d2d2936f7d46d0abd8e7b761e87206.xml b/model/diagrams/81f955b9-d831-4cfb-9811-ae890b675f06/id-7cb7788967f842bb9650a96ef3f35dec/ArchimateDiagramModel_id-69d2d2936f7d46d0abd8e7b761e87206.xml
index 6feb766da..6f3429264 100644
--- a/model/diagrams/81f955b9-d831-4cfb-9811-ae890b675f06/id-7cb7788967f842bb9650a96ef3f35dec/ArchimateDiagramModel_id-69d2d2936f7d46d0abd8e7b761e87206.xml
+++ b/model/diagrams/81f955b9-d831-4cfb-9811-ae890b675f06/id-7cb7788967f842bb9650a96ef3f35dec/ArchimateDiagramModel_id-69d2d2936f7d46d0abd8e7b761e87206.xml
@@ -1089,9 +1089,6 @@
   <properties
       key="Viewtype"
       value="Basis"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Architectuurlaag"
       value="Motivatie"/>
diff --git a/model/diagrams/81f955b9-d831-4cfb-9811-ae890b675f06/id-7cb7788967f842bb9650a96ef3f35dec/ArchimateDiagramModel_id-b477e04a9dac4760a5aabbc4ffdfdfb3.xml b/model/diagrams/81f955b9-d831-4cfb-9811-ae890b675f06/id-7cb7788967f842bb9650a96ef3f35dec/ArchimateDiagramModel_id-b477e04a9dac4760a5aabbc4ffdfdfb3.xml
index 744e664a2..9cce1ad55 100644
--- a/model/diagrams/81f955b9-d831-4cfb-9811-ae890b675f06/id-7cb7788967f842bb9650a96ef3f35dec/ArchimateDiagramModel_id-b477e04a9dac4760a5aabbc4ffdfdfb3.xml
+++ b/model/diagrams/81f955b9-d831-4cfb-9811-ae890b675f06/id-7cb7788967f842bb9650a96ef3f35dec/ArchimateDiagramModel_id-b477e04a9dac4760a5aabbc4ffdfdfb3.xml
@@ -202,9 +202,6 @@
   <properties
       key="Viewtype"
       value="Basis"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Architectuurlaag"
       value="Motivatie"/>
diff --git a/model/diagrams/81f955b9-d831-4cfb-9811-ae890b675f06/id-7cb7788967f842bb9650a96ef3f35dec/ArchimateDiagramModel_id-db606bbb4ff34d079f0066c01fd099bb.xml b/model/diagrams/81f955b9-d831-4cfb-9811-ae890b675f06/id-7cb7788967f842bb9650a96ef3f35dec/ArchimateDiagramModel_id-db606bbb4ff34d079f0066c01fd099bb.xml
index 3256534df..a3a2266aa 100644
--- a/model/diagrams/81f955b9-d831-4cfb-9811-ae890b675f06/id-7cb7788967f842bb9650a96ef3f35dec/ArchimateDiagramModel_id-db606bbb4ff34d079f0066c01fd099bb.xml
+++ b/model/diagrams/81f955b9-d831-4cfb-9811-ae890b675f06/id-7cb7788967f842bb9650a96ef3f35dec/ArchimateDiagramModel_id-db606bbb4ff34d079f0066c01fd099bb.xml
@@ -1,7 +1,7 @@
 <archimate:ArchimateDiagramModel
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:archimate="http://www.archimatetool.com/archimate"
-    name="VNG-Realisatie Doelstellingen "
+    name="VNG-Realisatie Doelstellingen"
     id="id-db606bbb4ff34d079f0066c01fd099bb"
     viewpoint="layered">
   <children
@@ -487,4 +487,16 @@
   <properties
       key="Object ID"
       value="69114bd8-81df-424a-9a19-20f094f0fd9a"/>
+  <properties
+      key="Architectuurlaag"
+      value="Motivatie"/>
+  <properties
+      key="Detailniveau"
+      value="Detail"/>
+  <properties
+      key="Scope"
+      value="Gemeente"/>
+  <properties
+      key="Viewtype"
+      value="Basis"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/ArchimateDiagramModel_id-142ca881a9724242ba99c8401d4b9d06.xml b/model/diagrams/ArchimateDiagramModel_id-142ca881a9724242ba99c8401d4b9d06.xml
index 96da6912f..57c55f639 100644
--- a/model/diagrams/ArchimateDiagramModel_id-142ca881a9724242ba99c8401d4b9d06.xml
+++ b/model/diagrams/ArchimateDiagramModel_id-142ca881a9724242ba99c8401d4b9d06.xml
@@ -83,4 +83,7 @@
   <properties
       key="Object ID"
       value="24ef3b7c-80ce-4245-944f-3f1090971269"/>
+  <properties
+      key="Publiceren"
+      value="Niet"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/ArchimateDiagramModel_id-2b070c9b-e231-45b4-a822-ce30c1862ee4.xml b/model/diagrams/ArchimateDiagramModel_id-2b070c9b-e231-45b4-a822-ce30c1862ee4.xml
index 053f3f5a4..b1c3e1050 100644
--- a/model/diagrams/ArchimateDiagramModel_id-2b070c9b-e231-45b4-a822-ce30c1862ee4.xml
+++ b/model/diagrams/ArchimateDiagramModel_id-2b070c9b-e231-45b4-a822-ce30c1862ee4.xml
@@ -547,9 +547,6 @@
   <properties
       key="Domein"
       value="Niet domeingebonden"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Architectuurlaag"
       value="Applicatiearchitectuur"/>
diff --git a/model/diagrams/ArchimateDiagramModel_id-2b15f5130b1441c8ba7e887379477de1.xml b/model/diagrams/ArchimateDiagramModel_id-2b15f5130b1441c8ba7e887379477de1.xml
index f720352e9..d7e759bfe 100644
--- a/model/diagrams/ArchimateDiagramModel_id-2b15f5130b1441c8ba7e887379477de1.xml
+++ b/model/diagrams/ArchimateDiagramModel_id-2b15f5130b1441c8ba7e887379477de1.xml
@@ -70,4 +70,7 @@
   <properties
       key="Object ID"
       value="d9ff3080-1aaa-4914-9113-211d0f25a973"/>
+  <properties
+      key="Publiceren"
+      value="Niet"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/ArchimateDiagramModel_id-84d1e4214d0e4a9d98ae40f506723eb6.xml b/model/diagrams/ArchimateDiagramModel_id-84d1e4214d0e4a9d98ae40f506723eb6.xml
index 853d9fb72..6f7b135dc 100644
--- a/model/diagrams/ArchimateDiagramModel_id-84d1e4214d0e4a9d98ae40f506723eb6.xml
+++ b/model/diagrams/ArchimateDiagramModel_id-84d1e4214d0e4a9d98ae40f506723eb6.xml
@@ -155,4 +155,7 @@
   <properties
       key="Object ID"
       value="108951a5-70c0-4e23-a6d6-cbe90af254e2"/>
+  <properties
+      key="Publiceren"
+      value="Niet"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/ArchimateDiagramModel_id-9d73f4963e8a42ae8d40de3102239833.xml b/model/diagrams/ArchimateDiagramModel_id-9d73f4963e8a42ae8d40de3102239833.xml
index 5fc7ba6db..dba56f44a 100644
--- a/model/diagrams/ArchimateDiagramModel_id-9d73f4963e8a42ae8d40de3102239833.xml
+++ b/model/diagrams/ArchimateDiagramModel_id-9d73f4963e8a42ae8d40de3102239833.xml
@@ -151,4 +151,7 @@
   <properties
       key="Object ID"
       value="680317d4-9ad7-4d84-aafa-0b38975fb1fb"/>
+  <properties
+      key="Publiceren"
+      value="Niet"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/36ccb928-9f64-4f4c-a640-7eaa36027144/ArchimateDiagramModel_id-0cf4b8a4-7f9a-488a-8596-ced8d43a08c3.xml b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/36ccb928-9f64-4f4c-a640-7eaa36027144/ArchimateDiagramModel_id-0cf4b8a4-7f9a-488a-8596-ced8d43a08c3.xml
index 64466b4fd..80cbba8f4 100644
--- a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/36ccb928-9f64-4f4c-a640-7eaa36027144/ArchimateDiagramModel_id-0cf4b8a4-7f9a-488a-8596-ced8d43a08c3.xml
+++ b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/36ccb928-9f64-4f4c-a640-7eaa36027144/ArchimateDiagramModel_id-0cf4b8a4-7f9a-488a-8596-ced8d43a08c3.xml
@@ -1871,7 +1871,4 @@
   <properties
       key="Viewtype"
       value="Beheer"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/36ccb928-9f64-4f4c-a640-7eaa36027144/ArchimateDiagramModel_id-500c56ab-006a-4c98-94fd-219b0f6e77b7.xml b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/36ccb928-9f64-4f4c-a640-7eaa36027144/ArchimateDiagramModel_id-500c56ab-006a-4c98-94fd-219b0f6e77b7.xml
index c1302fc3d..382758840 100644
--- a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/36ccb928-9f64-4f4c-a640-7eaa36027144/ArchimateDiagramModel_id-500c56ab-006a-4c98-94fd-219b0f6e77b7.xml
+++ b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/36ccb928-9f64-4f4c-a640-7eaa36027144/ArchimateDiagramModel_id-500c56ab-006a-4c98-94fd-219b0f6e77b7.xml
@@ -1296,9 +1296,6 @@
   <properties
       key="Publiceren"
       value="Niet"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Viewtype"
       value="Beheer"/>
diff --git a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/36ccb928-9f64-4f4c-a640-7eaa36027144/ArchimateDiagramModel_id-dcc17a74-48e0-4c86-a2ba-86e741e6578e.xml b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/36ccb928-9f64-4f4c-a640-7eaa36027144/ArchimateDiagramModel_id-dcc17a74-48e0-4c86-a2ba-86e741e6578e.xml
index 252e2d956..cc4b115ee 100644
--- a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/36ccb928-9f64-4f4c-a640-7eaa36027144/ArchimateDiagramModel_id-dcc17a74-48e0-4c86-a2ba-86e741e6578e.xml
+++ b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/36ccb928-9f64-4f4c-a640-7eaa36027144/ArchimateDiagramModel_id-dcc17a74-48e0-4c86-a2ba-86e741e6578e.xml
@@ -2123,9 +2123,6 @@
   <properties
       key="Publiceren"
       value="Niet"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Viewtype"
       value="Beheer"/>
diff --git a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/36ccb928-9f64-4f4c-a640-7eaa36027144/id-e3515fd6f71a4fc4a1134aec183f9811/ArchimateDiagramModel_id-0ef493cdd6c5465a834b881c824a7fdb.xml b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/36ccb928-9f64-4f4c-a640-7eaa36027144/id-e3515fd6f71a4fc4a1134aec183f9811/ArchimateDiagramModel_id-0ef493cdd6c5465a834b881c824a7fdb.xml
index 852964c6a..92ee516fd 100644
--- a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/36ccb928-9f64-4f4c-a640-7eaa36027144/id-e3515fd6f71a4fc4a1134aec183f9811/ArchimateDiagramModel_id-0ef493cdd6c5465a834b881c824a7fdb.xml
+++ b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/36ccb928-9f64-4f4c-a640-7eaa36027144/id-e3515fd6f71a4fc4a1134aec183f9811/ArchimateDiagramModel_id-0ef493cdd6c5465a834b881c824a7fdb.xml
@@ -2388,9 +2388,6 @@
   <properties
       key="Viewtype"
       value="Beheer"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Architectuurlaag"
       value="Motivatie"/>
diff --git a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/36ccb928-9f64-4f4c-a640-7eaa36027144/id-e3515fd6f71a4fc4a1134aec183f9811/ArchimateDiagramModel_id-140019de7ec9424dafe38ada26c1953e.xml b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/36ccb928-9f64-4f4c-a640-7eaa36027144/id-e3515fd6f71a4fc4a1134aec183f9811/ArchimateDiagramModel_id-140019de7ec9424dafe38ada26c1953e.xml
index a652a3736..f134ed602 100644
--- a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/36ccb928-9f64-4f4c-a640-7eaa36027144/id-e3515fd6f71a4fc4a1134aec183f9811/ArchimateDiagramModel_id-140019de7ec9424dafe38ada26c1953e.xml
+++ b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/36ccb928-9f64-4f4c-a640-7eaa36027144/id-e3515fd6f71a4fc4a1134aec183f9811/ArchimateDiagramModel_id-140019de7ec9424dafe38ada26c1953e.xml
@@ -3434,9 +3434,6 @@
   <properties
       key="Viewtype"
       value="Contentfilter"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Architectuurlaag"
       value="Motivatie"/>
diff --git a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/52672a20-9082-4b3c-b079-85ac7201a81c/ArchimateDiagramModel_id-05c9dfb6-7c27-40e3-9c50-8f7db43937b5.xml b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/52672a20-9082-4b3c-b079-85ac7201a81c/ArchimateDiagramModel_id-05c9dfb6-7c27-40e3-9c50-8f7db43937b5.xml
index b8db4491d..338a54b4d 100644
--- a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/52672a20-9082-4b3c-b079-85ac7201a81c/ArchimateDiagramModel_id-05c9dfb6-7c27-40e3-9c50-8f7db43937b5.xml
+++ b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/52672a20-9082-4b3c-b079-85ac7201a81c/ArchimateDiagramModel_id-05c9dfb6-7c27-40e3-9c50-8f7db43937b5.xml
@@ -635,9 +635,6 @@
   <properties
       key="Object ID"
       value="05c9dfb6-7c27-40e3-9c50-8f7db43937b5"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Publiceren"
       value="Niet"/>
diff --git a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/52672a20-9082-4b3c-b079-85ac7201a81c/ArchimateDiagramModel_id-1197807a-eada-4aab-b864-01536a1dbcff.xml b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/52672a20-9082-4b3c-b079-85ac7201a81c/ArchimateDiagramModel_id-1197807a-eada-4aab-b864-01536a1dbcff.xml
index 88ffca8e7..3593b72ac 100644
--- a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/52672a20-9082-4b3c-b079-85ac7201a81c/ArchimateDiagramModel_id-1197807a-eada-4aab-b864-01536a1dbcff.xml
+++ b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/52672a20-9082-4b3c-b079-85ac7201a81c/ArchimateDiagramModel_id-1197807a-eada-4aab-b864-01536a1dbcff.xml
@@ -757,7 +757,4 @@
   <properties
       key="Viewtype"
       value="Toelichting"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/52672a20-9082-4b3c-b079-85ac7201a81c/ArchimateDiagramModel_id-1499ac03-3d4e-4eab-8d70-41622e70ee14.xml b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/52672a20-9082-4b3c-b079-85ac7201a81c/ArchimateDiagramModel_id-1499ac03-3d4e-4eab-8d70-41622e70ee14.xml
index 9af3baba3..fa2abc1f8 100644
--- a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/52672a20-9082-4b3c-b079-85ac7201a81c/ArchimateDiagramModel_id-1499ac03-3d4e-4eab-8d70-41622e70ee14.xml
+++ b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/52672a20-9082-4b3c-b079-85ac7201a81c/ArchimateDiagramModel_id-1499ac03-3d4e-4eab-8d70-41622e70ee14.xml
@@ -38,9 +38,6 @@
   <properties
       key="Object ID"
       value="1499ac03-3d4e-4eab-8d70-41622e70ee14"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Publiceren"
       value="Niet"/>
diff --git a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/52672a20-9082-4b3c-b079-85ac7201a81c/ArchimateDiagramModel_id-1d4f6903b57146b48fdf36a4083396e2.xml b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/52672a20-9082-4b3c-b079-85ac7201a81c/ArchimateDiagramModel_id-1d4f6903b57146b48fdf36a4083396e2.xml
index b5c2a7af6..cbc1758e2 100644
--- a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/52672a20-9082-4b3c-b079-85ac7201a81c/ArchimateDiagramModel_id-1d4f6903b57146b48fdf36a4083396e2.xml
+++ b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/52672a20-9082-4b3c-b079-85ac7201a81c/ArchimateDiagramModel_id-1d4f6903b57146b48fdf36a4083396e2.xml
@@ -343,7 +343,4 @@
   <properties
       key="Viewtype"
       value="Beheer"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/52672a20-9082-4b3c-b079-85ac7201a81c/ArchimateDiagramModel_id-4f80184d-df0c-4c8f-bd76-af5d2e2c54d2.xml b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/52672a20-9082-4b3c-b079-85ac7201a81c/ArchimateDiagramModel_id-4f80184d-df0c-4c8f-bd76-af5d2e2c54d2.xml
index 0d36c4d58..0f0d0b5a6 100644
--- a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/52672a20-9082-4b3c-b079-85ac7201a81c/ArchimateDiagramModel_id-4f80184d-df0c-4c8f-bd76-af5d2e2c54d2.xml
+++ b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/52672a20-9082-4b3c-b079-85ac7201a81c/ArchimateDiagramModel_id-4f80184d-df0c-4c8f-bd76-af5d2e2c54d2.xml
@@ -1570,7 +1570,4 @@
   <properties
       key="Viewtype"
       value="Toelichting"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/52672a20-9082-4b3c-b079-85ac7201a81c/ArchimateDiagramModel_id-565804bd-4769-4ca5-b406-377b2a02eb56.xml b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/52672a20-9082-4b3c-b079-85ac7201a81c/ArchimateDiagramModel_id-565804bd-4769-4ca5-b406-377b2a02eb56.xml
index c824fe230..9ac78eaf5 100644
--- a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/52672a20-9082-4b3c-b079-85ac7201a81c/ArchimateDiagramModel_id-565804bd-4769-4ca5-b406-377b2a02eb56.xml
+++ b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/52672a20-9082-4b3c-b079-85ac7201a81c/ArchimateDiagramModel_id-565804bd-4769-4ca5-b406-377b2a02eb56.xml
@@ -854,9 +854,6 @@
   <properties
       key="Object ID"
       value="565804bd-4769-4ca5-b406-377b2a02eb56"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Publiceren"
       value="Niet"/>
diff --git a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/52672a20-9082-4b3c-b079-85ac7201a81c/ArchimateDiagramModel_id-e14781f7-4f10-4ff8-8a10-3d4fb221cdc8.xml b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/52672a20-9082-4b3c-b079-85ac7201a81c/ArchimateDiagramModel_id-e14781f7-4f10-4ff8-8a10-3d4fb221cdc8.xml
index bbe9c6d8e..4b87ddee5 100644
--- a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/52672a20-9082-4b3c-b079-85ac7201a81c/ArchimateDiagramModel_id-e14781f7-4f10-4ff8-8a10-3d4fb221cdc8.xml
+++ b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/52672a20-9082-4b3c-b079-85ac7201a81c/ArchimateDiagramModel_id-e14781f7-4f10-4ff8-8a10-3d4fb221cdc8.xml
@@ -928,9 +928,6 @@
   <properties
       key="Object ID"
       value="e14781f7-4f10-4ff8-8a10-3d4fb221cdc8"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Publiceren"
       value="Niet"/>
diff --git a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/6bb3a863-9db7-49bc-9650-0076c2786594/ArchimateDiagramModel_id-89ed57f3-56a2-4e58-9a1a-ae65ce0cbfa7.xml b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/6bb3a863-9db7-49bc-9650-0076c2786594/ArchimateDiagramModel_id-89ed57f3-56a2-4e58-9a1a-ae65ce0cbfa7.xml
index 2c11a7a2f..49ef98446 100644
--- a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/6bb3a863-9db7-49bc-9650-0076c2786594/ArchimateDiagramModel_id-89ed57f3-56a2-4e58-9a1a-ae65ce0cbfa7.xml
+++ b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/6bb3a863-9db7-49bc-9650-0076c2786594/ArchimateDiagramModel_id-89ed57f3-56a2-4e58-9a1a-ae65ce0cbfa7.xml
@@ -517,4 +517,10 @@
   <properties
       key="Object ID"
       value="89ed57f3-56a2-4e58-9a1a-ae65ce0cbfa7"/>
+  <properties
+      key="Detailniveau"
+      value="Detail"/>
+  <properties
+      key="Scope"
+      value="Gemeente"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/6bb3a863-9db7-49bc-9650-0076c2786594/ArchimateDiagramModel_id-b3df887e9ef64947ab24431b13aa430d.xml b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/6bb3a863-9db7-49bc-9650-0076c2786594/ArchimateDiagramModel_id-b3df887e9ef64947ab24431b13aa430d.xml
index 9550cdd8d..c9415af72 100644
--- a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/6bb3a863-9db7-49bc-9650-0076c2786594/ArchimateDiagramModel_id-b3df887e9ef64947ab24431b13aa430d.xml
+++ b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/6bb3a863-9db7-49bc-9650-0076c2786594/ArchimateDiagramModel_id-b3df887e9ef64947ab24431b13aa430d.xml
@@ -309,5 +309,5 @@
       value="Overerving"/>
   <properties
       key="GEMMA thema"
-      value="Informatiebeveiliging"/>
+      value="Privacy en informatiebeveiliging"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/6bb3a863-9db7-49bc-9650-0076c2786594/ArchimateDiagramModel_id-ceebc28c-5439-4ba6-b994-9c597f0eabfc.xml b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/6bb3a863-9db7-49bc-9650-0076c2786594/ArchimateDiagramModel_id-ceebc28c-5439-4ba6-b994-9c597f0eabfc.xml
index 15f62b03a..e96cedcbb 100644
--- a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/6bb3a863-9db7-49bc-9650-0076c2786594/ArchimateDiagramModel_id-ceebc28c-5439-4ba6-b994-9c597f0eabfc.xml
+++ b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/6bb3a863-9db7-49bc-9650-0076c2786594/ArchimateDiagramModel_id-ceebc28c-5439-4ba6-b994-9c597f0eabfc.xml
@@ -264,4 +264,10 @@
   <properties
       key="Viewtype"
       value="Overerving"/>
+  <properties
+      key="Detailniveau"
+      value="Detail"/>
+  <properties
+      key="Scope"
+      value="Keten"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/803afea7-0fc3-447d-9ce6-68548013ed52/ArchimateDiagramModel_id-17ef38c4-147f-4158-9c88-ab851ff6d02d.xml b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/803afea7-0fc3-447d-9ce6-68548013ed52/ArchimateDiagramModel_id-17ef38c4-147f-4158-9c88-ab851ff6d02d.xml
index 49676aec8..1c8eabc48 100644
--- a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/803afea7-0fc3-447d-9ce6-68548013ed52/ArchimateDiagramModel_id-17ef38c4-147f-4158-9c88-ab851ff6d02d.xml
+++ b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/803afea7-0fc3-447d-9ce6-68548013ed52/ArchimateDiagramModel_id-17ef38c4-147f-4158-9c88-ab851ff6d02d.xml
@@ -11998,7 +11998,7 @@
   </children>
   <properties
       key="Architectuurlaag"
-      value="Geen"/>
+      value="Applicatiearchitectuur"/>
   <properties
       key="Domein"
       value="Geen"/>
@@ -12007,7 +12007,7 @@
       value="17ef38c4-147f-4158-9c88-ab851ff6d02d"/>
   <properties
       key="Detailniveau"
-      value="Detailview"/>
+      value="Detail"/>
   <properties
       key="Publiceren"
       value="GEMMA Online en redactie"/>
@@ -12015,6 +12015,6 @@
       key="Viewtype"
       value="Contentfilter"/>
   <properties
-      key="GEMMA thema"
-      value="Geen"/>
+      key="Scope"
+      value="Gemeente"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/803afea7-0fc3-447d-9ce6-68548013ed52/ArchimateDiagramModel_id-6770f081f59a4802ac6d396d99e3d1bf.xml b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/803afea7-0fc3-447d-9ce6-68548013ed52/ArchimateDiagramModel_id-6770f081f59a4802ac6d396d99e3d1bf.xml
index 4333cfdfb..c5756a12d 100644
--- a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/803afea7-0fc3-447d-9ce6-68548013ed52/ArchimateDiagramModel_id-6770f081f59a4802ac6d396d99e3d1bf.xml
+++ b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/803afea7-0fc3-447d-9ce6-68548013ed52/ArchimateDiagramModel_id-6770f081f59a4802ac6d396d99e3d1bf.xml
@@ -9048,4 +9048,7 @@
   <properties
       key="Object ID"
       value="24fa547f-dd0f-4fc3-8522-c9dae465adfc"/>
+  <properties
+      key="Publiceren"
+      value="Niet"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/803afea7-0fc3-447d-9ce6-68548013ed52/ArchimateDiagramModel_id-76c8367a65fc4d06ab9e2662488f879b.xml b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/803afea7-0fc3-447d-9ce6-68548013ed52/ArchimateDiagramModel_id-76c8367a65fc4d06ab9e2662488f879b.xml
index 009bf4866..007e1c550 100644
--- a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/803afea7-0fc3-447d-9ce6-68548013ed52/ArchimateDiagramModel_id-76c8367a65fc4d06ab9e2662488f879b.xml
+++ b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/803afea7-0fc3-447d-9ce6-68548013ed52/ArchimateDiagramModel_id-76c8367a65fc4d06ab9e2662488f879b.xml
@@ -1464,4 +1464,7 @@
   <properties
       key="Object ID"
       value="a2eca111-e150-4286-a8d0-88ddd91f031a"/>
+  <properties
+      key="Publiceren"
+      value="Niet"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/803afea7-0fc3-447d-9ce6-68548013ed52/ArchimateDiagramModel_id-92d6ad7b-4420-4c56-95eb-7598a3e33021.xml b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/803afea7-0fc3-447d-9ce6-68548013ed52/ArchimateDiagramModel_id-92d6ad7b-4420-4c56-95eb-7598a3e33021.xml
index 23d43003f..02daedbb6 100644
--- a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/803afea7-0fc3-447d-9ce6-68548013ed52/ArchimateDiagramModel_id-92d6ad7b-4420-4c56-95eb-7598a3e33021.xml
+++ b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/803afea7-0fc3-447d-9ce6-68548013ed52/ArchimateDiagramModel_id-92d6ad7b-4420-4c56-95eb-7598a3e33021.xml
@@ -712,9 +712,6 @@
         xsi:type="archimate:Grouping"
         href="Grouping_id-a839b11313a848b2aafbd42cc23b2ab0.xml#id-a839b11313a848b2aafbd42cc23b2ab0"/>
   </children>
-  <properties
-      key="Architectuurlaag"
-      value="Geen"/>
   <properties
       key="Domein"
       value="Geen"/>
@@ -723,7 +720,7 @@
       value="92d6ad7b-4420-4c56-95eb-7598a3e33021"/>
   <properties
       key="Detailniveau"
-      value="Detailview"/>
+      value="Detail"/>
   <properties
       key="Publiceren"
       value="GEMMA Online en redactie"/>
@@ -731,6 +728,6 @@
       key="Viewtype"
       value="Contentfilter"/>
   <properties
-      key="GEMMA thema"
-      value="Geen"/>
+      key="Scope"
+      value="Gemeente"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/803afea7-0fc3-447d-9ce6-68548013ed52/ArchimateDiagramModel_id-c9adf6de-4878-4268-b5f8-fa0f1b566900.xml b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/803afea7-0fc3-447d-9ce6-68548013ed52/ArchimateDiagramModel_id-c9adf6de-4878-4268-b5f8-fa0f1b566900.xml
index e1892d142..57a65c688 100644
--- a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/803afea7-0fc3-447d-9ce6-68548013ed52/ArchimateDiagramModel_id-c9adf6de-4878-4268-b5f8-fa0f1b566900.xml
+++ b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/803afea7-0fc3-447d-9ce6-68548013ed52/ArchimateDiagramModel_id-c9adf6de-4878-4268-b5f8-fa0f1b566900.xml
@@ -9800,9 +9800,6 @@
         xsi:type="archimate:Constraint"
         href="Constraint_id-d1507c33b5fc447085e9a6e560048796.xml#id-d1507c33b5fc447085e9a6e560048796"/>
   </children>
-  <properties
-      key="Architectuurlaag"
-      value="Geen"/>
   <properties
       key="Domein"
       value="Geen"/>
@@ -9811,7 +9808,7 @@
       value="c9adf6de-4878-4268-b5f8-fa0f1b566900"/>
   <properties
       key="Detailniveau"
-      value="Detailview"/>
+      value="Detail"/>
   <properties
       key="Publiceren"
       value="GEMMA Online en redactie"/>
@@ -9819,6 +9816,6 @@
       key="Viewtype"
       value="Contentfilter"/>
   <properties
-      key="GEMMA thema"
-      value="Geen"/>
+      key="Scope"
+      value="Gemeente"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/803afea7-0fc3-447d-9ce6-68548013ed52/ArchimateDiagramModel_id-d7f600b1-63dc-494a-9a25-976223aa38c7.xml b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/803afea7-0fc3-447d-9ce6-68548013ed52/ArchimateDiagramModel_id-d7f600b1-63dc-494a-9a25-976223aa38c7.xml
index 45108457f..66e74231f 100644
--- a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/803afea7-0fc3-447d-9ce6-68548013ed52/ArchimateDiagramModel_id-d7f600b1-63dc-494a-9a25-976223aa38c7.xml
+++ b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/803afea7-0fc3-447d-9ce6-68548013ed52/ArchimateDiagramModel_id-d7f600b1-63dc-494a-9a25-976223aa38c7.xml
@@ -4425,7 +4425,7 @@
       value="d7f600b1-63dc-494a-9a25-976223aa38c7"/>
   <properties
       key="Detailniveau"
-      value="Detailview"/>
+      value="Detail"/>
   <properties
       key="Publiceren"
       value="GEMMA Online en redactie"/>
@@ -4435,7 +4435,4 @@
   <properties
       key="Viewtype"
       value="Contentfilter"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/id-dc44612a27534ac88c43d5ce3e71f41e/id-ac96946c5c634bad8eb02b84bdf9b5dd/ArchimateDiagramModel_id-1b9953862313462b8f33a41a0be02bb0.xml b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/id-dc44612a27534ac88c43d5ce3e71f41e/id-ac96946c5c634bad8eb02b84bdf9b5dd/ArchimateDiagramModel_id-1b9953862313462b8f33a41a0be02bb0.xml
index e6d6c58dc..e6d2574d6 100644
--- a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/id-dc44612a27534ac88c43d5ce3e71f41e/id-ac96946c5c634bad8eb02b84bdf9b5dd/ArchimateDiagramModel_id-1b9953862313462b8f33a41a0be02bb0.xml
+++ b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/id-dc44612a27534ac88c43d5ce3e71f41e/id-ac96946c5c634bad8eb02b84bdf9b5dd/ArchimateDiagramModel_id-1b9953862313462b8f33a41a0be02bb0.xml
@@ -347,4 +347,7 @@
   <properties
       key="Detailniveau"
       value="Detail"/>
+  <properties
+      key="Scope"
+      value="Gemeente"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/id-dc44612a27534ac88c43d5ce3e71f41e/id-ac96946c5c634bad8eb02b84bdf9b5dd/ArchimateDiagramModel_id-4702c9483c234e9eb25cdf9426254e8b.xml b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/id-dc44612a27534ac88c43d5ce3e71f41e/id-ac96946c5c634bad8eb02b84bdf9b5dd/ArchimateDiagramModel_id-4702c9483c234e9eb25cdf9426254e8b.xml
index f17dddb03..de22c85bb 100644
--- a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/id-dc44612a27534ac88c43d5ce3e71f41e/id-ac96946c5c634bad8eb02b84bdf9b5dd/ArchimateDiagramModel_id-4702c9483c234e9eb25cdf9426254e8b.xml
+++ b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/id-dc44612a27534ac88c43d5ce3e71f41e/id-ac96946c5c634bad8eb02b84bdf9b5dd/ArchimateDiagramModel_id-4702c9483c234e9eb25cdf9426254e8b.xml
@@ -118,4 +118,7 @@
   <properties
       key="Detailniveau"
       value="Detail"/>
+  <properties
+      key="Scope"
+      value="Gemeente"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/id-dc44612a27534ac88c43d5ce3e71f41e/id-ac96946c5c634bad8eb02b84bdf9b5dd/ArchimateDiagramModel_id-7ca04460a0c94974bac349d980dd1591.xml b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/id-dc44612a27534ac88c43d5ce3e71f41e/id-ac96946c5c634bad8eb02b84bdf9b5dd/ArchimateDiagramModel_id-7ca04460a0c94974bac349d980dd1591.xml
index 28d321511..2ab7ed739 100644
--- a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/id-dc44612a27534ac88c43d5ce3e71f41e/id-ac96946c5c634bad8eb02b84bdf9b5dd/ArchimateDiagramModel_id-7ca04460a0c94974bac349d980dd1591.xml
+++ b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/id-dc44612a27534ac88c43d5ce3e71f41e/id-ac96946c5c634bad8eb02b84bdf9b5dd/ArchimateDiagramModel_id-7ca04460a0c94974bac349d980dd1591.xml
@@ -689,4 +689,7 @@
   <properties
       key="Detailniveau"
       value="Detail"/>
+  <properties
+      key="Scope"
+      value="Gemeente"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/id-dc44612a27534ac88c43d5ce3e71f41e/id-ac96946c5c634bad8eb02b84bdf9b5dd/ArchimateDiagramModel_id-8584d546d04c473fa08f7c7160e4f2f5.xml b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/id-dc44612a27534ac88c43d5ce3e71f41e/id-ac96946c5c634bad8eb02b84bdf9b5dd/ArchimateDiagramModel_id-8584d546d04c473fa08f7c7160e4f2f5.xml
index 5e8b8d36d..8ed6cbba1 100644
--- a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/id-dc44612a27534ac88c43d5ce3e71f41e/id-ac96946c5c634bad8eb02b84bdf9b5dd/ArchimateDiagramModel_id-8584d546d04c473fa08f7c7160e4f2f5.xml
+++ b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/id-dc44612a27534ac88c43d5ce3e71f41e/id-ac96946c5c634bad8eb02b84bdf9b5dd/ArchimateDiagramModel_id-8584d546d04c473fa08f7c7160e4f2f5.xml
@@ -161,4 +161,7 @@
   <properties
       key="Detailniveau"
       value="Detail"/>
+  <properties
+      key="Scope"
+      value="Gemeente"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/id-dc44612a27534ac88c43d5ce3e71f41e/id-ac96946c5c634bad8eb02b84bdf9b5dd/ArchimateDiagramModel_id-870148a2c0874e87a8a0c5330c5a3687.xml b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/id-dc44612a27534ac88c43d5ce3e71f41e/id-ac96946c5c634bad8eb02b84bdf9b5dd/ArchimateDiagramModel_id-870148a2c0874e87a8a0c5330c5a3687.xml
index bee3c5e2f..7c106d9e1 100644
--- a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/id-dc44612a27534ac88c43d5ce3e71f41e/id-ac96946c5c634bad8eb02b84bdf9b5dd/ArchimateDiagramModel_id-870148a2c0874e87a8a0c5330c5a3687.xml
+++ b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/id-dc44612a27534ac88c43d5ce3e71f41e/id-ac96946c5c634bad8eb02b84bdf9b5dd/ArchimateDiagramModel_id-870148a2c0874e87a8a0c5330c5a3687.xml
@@ -161,4 +161,7 @@
   <properties
       key="Detailniveau"
       value="Detail"/>
+  <properties
+      key="Scope"
+      value="Gemeente"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/id-dc44612a27534ac88c43d5ce3e71f41e/id-ac96946c5c634bad8eb02b84bdf9b5dd/ArchimateDiagramModel_id-c9fc41241be7497e97bc85d04525ea53.xml b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/id-dc44612a27534ac88c43d5ce3e71f41e/id-ac96946c5c634bad8eb02b84bdf9b5dd/ArchimateDiagramModel_id-c9fc41241be7497e97bc85d04525ea53.xml
index fcdfa586e..ce3a367b1 100644
--- a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/id-dc44612a27534ac88c43d5ce3e71f41e/id-ac96946c5c634bad8eb02b84bdf9b5dd/ArchimateDiagramModel_id-c9fc41241be7497e97bc85d04525ea53.xml
+++ b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/id-dc44612a27534ac88c43d5ce3e71f41e/id-ac96946c5c634bad8eb02b84bdf9b5dd/ArchimateDiagramModel_id-c9fc41241be7497e97bc85d04525ea53.xml
@@ -116,4 +116,7 @@
   <properties
       key="Detailniveau"
       value="Detail"/>
+  <properties
+      key="Scope"
+      value="Gemeente"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/id-dc44612a27534ac88c43d5ce3e71f41e/id-ac96946c5c634bad8eb02b84bdf9b5dd/ArchimateDiagramModel_id-e10f83a8576a4591995c19d09cc48318.xml b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/id-dc44612a27534ac88c43d5ce3e71f41e/id-ac96946c5c634bad8eb02b84bdf9b5dd/ArchimateDiagramModel_id-e10f83a8576a4591995c19d09cc48318.xml
index 859c9387b..0306b8290 100644
--- a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/id-dc44612a27534ac88c43d5ce3e71f41e/id-ac96946c5c634bad8eb02b84bdf9b5dd/ArchimateDiagramModel_id-e10f83a8576a4591995c19d09cc48318.xml
+++ b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/id-dc44612a27534ac88c43d5ce3e71f41e/id-ac96946c5c634bad8eb02b84bdf9b5dd/ArchimateDiagramModel_id-e10f83a8576a4591995c19d09cc48318.xml
@@ -97,4 +97,7 @@
   <properties
       key="Detailniveau"
       value="Detail"/>
+  <properties
+      key="Scope"
+      value="Gemeente"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/id-dc44612a27534ac88c43d5ce3e71f41e/id-ac96946c5c634bad8eb02b84bdf9b5dd/ArchimateDiagramModel_id-e500da96a4f84282ae9799d77c6d6eee.xml b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/id-dc44612a27534ac88c43d5ce3e71f41e/id-ac96946c5c634bad8eb02b84bdf9b5dd/ArchimateDiagramModel_id-e500da96a4f84282ae9799d77c6d6eee.xml
index ef6ed077a..8b3ce6cba 100644
--- a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/id-dc44612a27534ac88c43d5ce3e71f41e/id-ac96946c5c634bad8eb02b84bdf9b5dd/ArchimateDiagramModel_id-e500da96a4f84282ae9799d77c6d6eee.xml
+++ b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/id-dc44612a27534ac88c43d5ce3e71f41e/id-ac96946c5c634bad8eb02b84bdf9b5dd/ArchimateDiagramModel_id-e500da96a4f84282ae9799d77c6d6eee.xml
@@ -343,4 +343,7 @@
   <properties
       key="Detailniveau"
       value="Detail"/>
+  <properties
+      key="Scope"
+      value="Gemeente"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/id-dc44612a27534ac88c43d5ce3e71f41e/id-ac96946c5c634bad8eb02b84bdf9b5dd/ArchimateDiagramModel_id-fb6f2f2960524406952495cd45d56dd4.xml b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/id-dc44612a27534ac88c43d5ce3e71f41e/id-ac96946c5c634bad8eb02b84bdf9b5dd/ArchimateDiagramModel_id-fb6f2f2960524406952495cd45d56dd4.xml
index 105618c44..741d962f1 100644
--- a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/id-dc44612a27534ac88c43d5ce3e71f41e/id-ac96946c5c634bad8eb02b84bdf9b5dd/ArchimateDiagramModel_id-fb6f2f2960524406952495cd45d56dd4.xml
+++ b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/id-dc44612a27534ac88c43d5ce3e71f41e/id-ac96946c5c634bad8eb02b84bdf9b5dd/ArchimateDiagramModel_id-fb6f2f2960524406952495cd45d56dd4.xml
@@ -310,4 +310,7 @@
   <properties
       key="Detailniveau"
       value="Detail"/>
+  <properties
+      key="Scope"
+      value="Gemeente"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/id-dc44612a27534ac88c43d5ce3e71f41e/id-e8370df0c35d485881ffa0cee2f0a9a3/ArchimateDiagramModel_id-22eb9d08e1b143db95a5d7fad0fa2119.xml b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/id-dc44612a27534ac88c43d5ce3e71f41e/id-e8370df0c35d485881ffa0cee2f0a9a3/ArchimateDiagramModel_id-22eb9d08e1b143db95a5d7fad0fa2119.xml
index b5b1585ed..107aed39b 100644
--- a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/id-dc44612a27534ac88c43d5ce3e71f41e/id-e8370df0c35d485881ffa0cee2f0a9a3/ArchimateDiagramModel_id-22eb9d08e1b143db95a5d7fad0fa2119.xml
+++ b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/id-dc44612a27534ac88c43d5ce3e71f41e/id-e8370df0c35d485881ffa0cee2f0a9a3/ArchimateDiagramModel_id-22eb9d08e1b143db95a5d7fad0fa2119.xml
@@ -390,9 +390,6 @@
   <properties
       key="Viewtype"
       value="Template"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Architectuurlaag"
       value="Bedrijfsarchitectuur"/>
diff --git a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/id-dc44612a27534ac88c43d5ce3e71f41e/id-e8370df0c35d485881ffa0cee2f0a9a3/ArchimateDiagramModel_id-3245e1d0e0f0422cb0abf3f376d3a31a.xml b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/id-dc44612a27534ac88c43d5ce3e71f41e/id-e8370df0c35d485881ffa0cee2f0a9a3/ArchimateDiagramModel_id-3245e1d0e0f0422cb0abf3f376d3a31a.xml
index 9c8de1e45..c9e8745d1 100644
--- a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/id-dc44612a27534ac88c43d5ce3e71f41e/id-e8370df0c35d485881ffa0cee2f0a9a3/ArchimateDiagramModel_id-3245e1d0e0f0422cb0abf3f376d3a31a.xml
+++ b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/id-dc44612a27534ac88c43d5ce3e71f41e/id-e8370df0c35d485881ffa0cee2f0a9a3/ArchimateDiagramModel_id-3245e1d0e0f0422cb0abf3f376d3a31a.xml
@@ -353,9 +353,6 @@
   <properties
       key="Viewtype"
       value="Template"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Detailniveau"
       value="Overzicht"/>
diff --git a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/id-dc44612a27534ac88c43d5ce3e71f41e/id-e8370df0c35d485881ffa0cee2f0a9a3/ArchimateDiagramModel_id-7f809c2fef5e4580a1f42da0ae230689.xml b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/id-dc44612a27534ac88c43d5ce3e71f41e/id-e8370df0c35d485881ffa0cee2f0a9a3/ArchimateDiagramModel_id-7f809c2fef5e4580a1f42da0ae230689.xml
index e6a74bd65..63ae9387d 100644
--- a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/id-dc44612a27534ac88c43d5ce3e71f41e/id-e8370df0c35d485881ffa0cee2f0a9a3/ArchimateDiagramModel_id-7f809c2fef5e4580a1f42da0ae230689.xml
+++ b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/id-dc44612a27534ac88c43d5ce3e71f41e/id-e8370df0c35d485881ffa0cee2f0a9a3/ArchimateDiagramModel_id-7f809c2fef5e4580a1f42da0ae230689.xml
@@ -238,9 +238,6 @@
   <properties
       key="Viewtype"
       value="Template"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Architectuurlaag"
       value="Bedrijfsarchitectuur"/>
diff --git a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/id-dc44612a27534ac88c43d5ce3e71f41e/id-e8370df0c35d485881ffa0cee2f0a9a3/ArchimateDiagramModel_id-ee334fb114914c49981f59cecab5616c.xml b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/id-dc44612a27534ac88c43d5ce3e71f41e/id-e8370df0c35d485881ffa0cee2f0a9a3/ArchimateDiagramModel_id-ee334fb114914c49981f59cecab5616c.xml
index fa52a2c71..240748d4e 100644
--- a/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/id-dc44612a27534ac88c43d5ce3e71f41e/id-e8370df0c35d485881ffa0cee2f0a9a3/ArchimateDiagramModel_id-ee334fb114914c49981f59cecab5616c.xml
+++ b/model/diagrams/_b7308cb7-8a50-4309-8035-702fa7dbb487/id-dc44612a27534ac88c43d5ce3e71f41e/id-e8370df0c35d485881ffa0cee2f0a9a3/ArchimateDiagramModel_id-ee334fb114914c49981f59cecab5616c.xml
@@ -1403,9 +1403,6 @@
   <properties
       key="Viewtype"
       value="Template"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Architectuurlaag"
       value="Totaal (meerlaags)"/>
diff --git a/model/diagrams/a7413522-3948-4c24-8736-da7d4429284b/ArchimateDiagramModel_id-0f277c6f9ba742fcb2f2ba00f708b8d9.xml b/model/diagrams/a7413522-3948-4c24-8736-da7d4429284b/ArchimateDiagramModel_id-0f277c6f9ba742fcb2f2ba00f708b8d9.xml
index 441c5871e..9ac8731b0 100644
--- a/model/diagrams/a7413522-3948-4c24-8736-da7d4429284b/ArchimateDiagramModel_id-0f277c6f9ba742fcb2f2ba00f708b8d9.xml
+++ b/model/diagrams/a7413522-3948-4c24-8736-da7d4429284b/ArchimateDiagramModel_id-0f277c6f9ba742fcb2f2ba00f708b8d9.xml
@@ -307,11 +307,17 @@
       value="Toelichting"/>
   <properties
       key="GEMMA thema"
-      value="Geen"/>
+      value="Standaarden"/>
   <properties
       key="Architectuurlaag"
       value="Motivatie"/>
   <properties
       key="Domein"
       value="Fysieke leefomgeving"/>
+  <properties
+      key="Detailniveau"
+      value="Detail"/>
+  <properties
+      key="Scope"
+      value="Gemeente"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/a7413522-3948-4c24-8736-da7d4429284b/ArchimateDiagramModel_id-1680d39a34bf41f183a42d19f6dac876.xml b/model/diagrams/a7413522-3948-4c24-8736-da7d4429284b/ArchimateDiagramModel_id-1680d39a34bf41f183a42d19f6dac876.xml
index a70d3ac65..b2d3b7906 100644
--- a/model/diagrams/a7413522-3948-4c24-8736-da7d4429284b/ArchimateDiagramModel_id-1680d39a34bf41f183a42d19f6dac876.xml
+++ b/model/diagrams/a7413522-3948-4c24-8736-da7d4429284b/ArchimateDiagramModel_id-1680d39a34bf41f183a42d19f6dac876.xml
@@ -682,13 +682,16 @@
   <properties
       key="Viewtype"
       value="Toelichting"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Architectuurlaag"
       value="Motivatie"/>
   <properties
       key="Domein"
       value="Geen"/>
+  <properties
+      key="Detailniveau"
+      value="Detail"/>
+  <properties
+      key="Scope"
+      value="Gemeente"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/a7413522-3948-4c24-8736-da7d4429284b/ArchimateDiagramModel_id-50b26901185d4af48c2add94cc22ffae.xml b/model/diagrams/a7413522-3948-4c24-8736-da7d4429284b/ArchimateDiagramModel_id-50b26901185d4af48c2add94cc22ffae.xml
index cb1b9cd6c..718b0e148 100644
--- a/model/diagrams/a7413522-3948-4c24-8736-da7d4429284b/ArchimateDiagramModel_id-50b26901185d4af48c2add94cc22ffae.xml
+++ b/model/diagrams/a7413522-3948-4c24-8736-da7d4429284b/ArchimateDiagramModel_id-50b26901185d4af48c2add94cc22ffae.xml
@@ -399,4 +399,7 @@
   <properties
       key="Object ID"
       value="2efe741b-a134-4fd5-b42a-2f49a48c8b30"/>
+  <properties
+      key="Publiceren"
+      value="Niet"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/a7413522-3948-4c24-8736-da7d4429284b/ArchimateDiagramModel_id-93cb650b-657a-4b5b-a49d-07f2b79eb244.xml b/model/diagrams/a7413522-3948-4c24-8736-da7d4429284b/ArchimateDiagramModel_id-93cb650b-657a-4b5b-a49d-07f2b79eb244.xml
index cedba918d..99190adff 100644
--- a/model/diagrams/a7413522-3948-4c24-8736-da7d4429284b/ArchimateDiagramModel_id-93cb650b-657a-4b5b-a49d-07f2b79eb244.xml
+++ b/model/diagrams/a7413522-3948-4c24-8736-da7d4429284b/ArchimateDiagramModel_id-93cb650b-657a-4b5b-a49d-07f2b79eb244.xml
@@ -1188,7 +1188,7 @@
   </children>
   <properties
       key="Architectuurlaag"
-      value="Standaard"/>
+      value="Motivatie"/>
   <properties
       key="Domein"
       value="Niet domeingebonden"/>
@@ -1206,7 +1206,7 @@
       value="Keten"/>
   <properties
       key="GEMMA thema"
-      value="Geen"/>
+      value="Standaarden"/>
   <properties
       key="Viewtype"
       value="Basis"/>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-587610a1b91043c6b4934832c9ff06f5/id-e13482acd4d944118af602c6896d7b87/ArchimateDiagramModel_id-2c823dc8ffe34f6182520cc9f3dd5d27.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-587610a1b91043c6b4934832c9ff06f5/id-e13482acd4d944118af602c6896d7b87/ArchimateDiagramModel_id-2c823dc8ffe34f6182520cc9f3dd5d27.xml
index 701b01cf5..7249b5c1d 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-587610a1b91043c6b4934832c9ff06f5/id-e13482acd4d944118af602c6896d7b87/ArchimateDiagramModel_id-2c823dc8ffe34f6182520cc9f3dd5d27.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-587610a1b91043c6b4934832c9ff06f5/id-e13482acd4d944118af602c6896d7b87/ArchimateDiagramModel_id-2c823dc8ffe34f6182520cc9f3dd5d27.xml
@@ -45,4 +45,7 @@
   <properties
       key="Object ID"
       value="f089e915-6bbc-41c9-99fa-3a2d07871aec"/>
+  <properties
+      key="Publiceren"
+      value="Niet"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-587610a1b91043c6b4934832c9ff06f5/id-e13482acd4d944118af602c6896d7b87/ArchimateDiagramModel_id-40177da43104430ca1be8327a178e50b.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-587610a1b91043c6b4934832c9ff06f5/id-e13482acd4d944118af602c6896d7b87/ArchimateDiagramModel_id-40177da43104430ca1be8327a178e50b.xml
index eca82ba3f..67c4480d5 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-587610a1b91043c6b4934832c9ff06f5/id-e13482acd4d944118af602c6896d7b87/ArchimateDiagramModel_id-40177da43104430ca1be8327a178e50b.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-587610a1b91043c6b4934832c9ff06f5/id-e13482acd4d944118af602c6896d7b87/ArchimateDiagramModel_id-40177da43104430ca1be8327a178e50b.xml
@@ -1252,4 +1252,7 @@
   <properties
       key="Object ID"
       value="962fe21d-c991-4fb5-937d-b4ce7ba2b00c"/>
+  <properties
+      key="Publiceren"
+      value="Niet"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-587610a1b91043c6b4934832c9ff06f5/id-e13482acd4d944118af602c6896d7b87/ArchimateDiagramModel_id-a46797d70a2c48988e8ff646482e5718.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-587610a1b91043c6b4934832c9ff06f5/id-e13482acd4d944118af602c6896d7b87/ArchimateDiagramModel_id-a46797d70a2c48988e8ff646482e5718.xml
index 6857b69b4..6fe930924 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-587610a1b91043c6b4934832c9ff06f5/id-e13482acd4d944118af602c6896d7b87/ArchimateDiagramModel_id-a46797d70a2c48988e8ff646482e5718.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-587610a1b91043c6b4934832c9ff06f5/id-e13482acd4d944118af602c6896d7b87/ArchimateDiagramModel_id-a46797d70a2c48988e8ff646482e5718.xml
@@ -45,4 +45,7 @@
   <properties
       key="Object ID"
       value="f3c50a24-ebf2-4589-b674-32b696e4c892"/>
+  <properties
+      key="Publiceren"
+      value="Niet"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-741ffcc5cdb44ebfb774115ea90dc56e/id-02d82572bd8f4e3e89f5d8de4a82e45e/ArchimateDiagramModel_id-037b04ee196a4f889566c85d6d10b2eb.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-741ffcc5cdb44ebfb774115ea90dc56e/id-02d82572bd8f4e3e89f5d8de4a82e45e/ArchimateDiagramModel_id-037b04ee196a4f889566c85d6d10b2eb.xml
index 8627b1b29..41a5c901a 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-741ffcc5cdb44ebfb774115ea90dc56e/id-02d82572bd8f4e3e89f5d8de4a82e45e/ArchimateDiagramModel_id-037b04ee196a4f889566c85d6d10b2eb.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-741ffcc5cdb44ebfb774115ea90dc56e/id-02d82572bd8f4e3e89f5d8de4a82e45e/ArchimateDiagramModel_id-037b04ee196a4f889566c85d6d10b2eb.xml
@@ -1086,9 +1086,6 @@
   <properties
       key="Viewtype"
       value="Basis"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Architectuurlaag"
       value="Motivatie"/>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-741ffcc5cdb44ebfb774115ea90dc56e/id-02d82572bd8f4e3e89f5d8de4a82e45e/ArchimateDiagramModel_id-2c82a78de57147dd97358d1ed0a8790d.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-741ffcc5cdb44ebfb774115ea90dc56e/id-02d82572bd8f4e3e89f5d8de4a82e45e/ArchimateDiagramModel_id-2c82a78de57147dd97358d1ed0a8790d.xml
index 5f005d250..f69c36da2 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-741ffcc5cdb44ebfb774115ea90dc56e/id-02d82572bd8f4e3e89f5d8de4a82e45e/ArchimateDiagramModel_id-2c82a78de57147dd97358d1ed0a8790d.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-741ffcc5cdb44ebfb774115ea90dc56e/id-02d82572bd8f4e3e89f5d8de4a82e45e/ArchimateDiagramModel_id-2c82a78de57147dd97358d1ed0a8790d.xml
@@ -199,9 +199,6 @@
   <properties
       key="Viewtype"
       value="Basis"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Architectuurlaag"
       value="Motivatie"/>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-741ffcc5cdb44ebfb774115ea90dc56e/id-02d82572bd8f4e3e89f5d8de4a82e45e/ArchimateDiagramModel_id-348f8f74af1d44cba04b4df61407b748.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-741ffcc5cdb44ebfb774115ea90dc56e/id-02d82572bd8f4e3e89f5d8de4a82e45e/ArchimateDiagramModel_id-348f8f74af1d44cba04b4df61407b748.xml
index 0aef63904..2c0d27ab5 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-741ffcc5cdb44ebfb774115ea90dc56e/id-02d82572bd8f4e3e89f5d8de4a82e45e/ArchimateDiagramModel_id-348f8f74af1d44cba04b4df61407b748.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-741ffcc5cdb44ebfb774115ea90dc56e/id-02d82572bd8f4e3e89f5d8de4a82e45e/ArchimateDiagramModel_id-348f8f74af1d44cba04b4df61407b748.xml
@@ -2470,9 +2470,6 @@
   <properties
       key="Viewtype"
       value="Basis"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Object ID"
       value="8bd71898-8c33-44a1-b52b-5dfe2efec445"/>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-741ffcc5cdb44ebfb774115ea90dc56e/id-02d82572bd8f4e3e89f5d8de4a82e45e/ArchimateDiagramModel_id-575f5dfa67d140d1b5ccc6eea4a43111.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-741ffcc5cdb44ebfb774115ea90dc56e/id-02d82572bd8f4e3e89f5d8de4a82e45e/ArchimateDiagramModel_id-575f5dfa67d140d1b5ccc6eea4a43111.xml
index eae3cc672..78820f323 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-741ffcc5cdb44ebfb774115ea90dc56e/id-02d82572bd8f4e3e89f5d8de4a82e45e/ArchimateDiagramModel_id-575f5dfa67d140d1b5ccc6eea4a43111.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-741ffcc5cdb44ebfb774115ea90dc56e/id-02d82572bd8f4e3e89f5d8de4a82e45e/ArchimateDiagramModel_id-575f5dfa67d140d1b5ccc6eea4a43111.xml
@@ -149,9 +149,6 @@
   <properties
       key="Viewtype"
       value="Basis"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Object ID"
       value="0b660577-890d-4d5d-8b41-b82facf2795c"/>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-741ffcc5cdb44ebfb774115ea90dc56e/id-02d82572bd8f4e3e89f5d8de4a82e45e/ArchimateDiagramModel_id-5f2c0eebcec14d01b43555565c74bffc.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-741ffcc5cdb44ebfb774115ea90dc56e/id-02d82572bd8f4e3e89f5d8de4a82e45e/ArchimateDiagramModel_id-5f2c0eebcec14d01b43555565c74bffc.xml
index dcfd2abda..846210e37 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-741ffcc5cdb44ebfb774115ea90dc56e/id-02d82572bd8f4e3e89f5d8de4a82e45e/ArchimateDiagramModel_id-5f2c0eebcec14d01b43555565c74bffc.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-741ffcc5cdb44ebfb774115ea90dc56e/id-02d82572bd8f4e3e89f5d8de4a82e45e/ArchimateDiagramModel_id-5f2c0eebcec14d01b43555565c74bffc.xml
@@ -611,9 +611,6 @@
   <properties
       key="Viewtype"
       value="Basis"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Architectuurlaag"
       value="Motivatie"/>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-741ffcc5cdb44ebfb774115ea90dc56e/id-02d82572bd8f4e3e89f5d8de4a82e45e/ArchimateDiagramModel_id-aa19d9120e1048be95e91a09940d02a1.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-741ffcc5cdb44ebfb774115ea90dc56e/id-02d82572bd8f4e3e89f5d8de4a82e45e/ArchimateDiagramModel_id-aa19d9120e1048be95e91a09940d02a1.xml
index c2ac01c67..102fc489f 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-741ffcc5cdb44ebfb774115ea90dc56e/id-02d82572bd8f4e3e89f5d8de4a82e45e/ArchimateDiagramModel_id-aa19d9120e1048be95e91a09940d02a1.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-741ffcc5cdb44ebfb774115ea90dc56e/id-02d82572bd8f4e3e89f5d8de4a82e45e/ArchimateDiagramModel_id-aa19d9120e1048be95e91a09940d02a1.xml
@@ -366,9 +366,6 @@
   <properties
       key="Viewtype"
       value="Toelichting"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Architectuurlaag"
       value="Motivatie"/>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-741ffcc5cdb44ebfb774115ea90dc56e/id-02d82572bd8f4e3e89f5d8de4a82e45e/ArchimateDiagramModel_id-bff144a38d45416194de5585c73c9eb2.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-741ffcc5cdb44ebfb774115ea90dc56e/id-02d82572bd8f4e3e89f5d8de4a82e45e/ArchimateDiagramModel_id-bff144a38d45416194de5585c73c9eb2.xml
index 3e7ffbe2b..da2ce8174 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-741ffcc5cdb44ebfb774115ea90dc56e/id-02d82572bd8f4e3e89f5d8de4a82e45e/ArchimateDiagramModel_id-bff144a38d45416194de5585c73c9eb2.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-741ffcc5cdb44ebfb774115ea90dc56e/id-02d82572bd8f4e3e89f5d8de4a82e45e/ArchimateDiagramModel_id-bff144a38d45416194de5585c73c9eb2.xml
@@ -2120,9 +2120,6 @@
   <properties
       key="Viewtype"
       value="Basis"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Object ID"
       value="338fcf84-23aa-4407-8ba3-fdafd893a125"/>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-741ffcc5cdb44ebfb774115ea90dc56e/id-02d82572bd8f4e3e89f5d8de4a82e45e/ArchimateDiagramModel_id-ddd59bdb420d4f67af6c3a1719e74519.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-741ffcc5cdb44ebfb774115ea90dc56e/id-02d82572bd8f4e3e89f5d8de4a82e45e/ArchimateDiagramModel_id-ddd59bdb420d4f67af6c3a1719e74519.xml
index 1a00a7c7e..5cf356abb 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-741ffcc5cdb44ebfb774115ea90dc56e/id-02d82572bd8f4e3e89f5d8de4a82e45e/ArchimateDiagramModel_id-ddd59bdb420d4f67af6c3a1719e74519.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-741ffcc5cdb44ebfb774115ea90dc56e/id-02d82572bd8f4e3e89f5d8de4a82e45e/ArchimateDiagramModel_id-ddd59bdb420d4f67af6c3a1719e74519.xml
@@ -5511,9 +5511,6 @@
   <properties
       key="Viewtype"
       value="Basis"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Object ID"
       value="c1f19312-faff-4f93-91ff-f2331794ffdf"/>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-741ffcc5cdb44ebfb774115ea90dc56e/id-02d82572bd8f4e3e89f5d8de4a82e45e/ArchimateDiagramModel_id-fefe299f0eae4a10878b4a4e4507fee5.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-741ffcc5cdb44ebfb774115ea90dc56e/id-02d82572bd8f4e3e89f5d8de4a82e45e/ArchimateDiagramModel_id-fefe299f0eae4a10878b4a4e4507fee5.xml
index b9a10d54a..ebf7d5c4e 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-741ffcc5cdb44ebfb774115ea90dc56e/id-02d82572bd8f4e3e89f5d8de4a82e45e/ArchimateDiagramModel_id-fefe299f0eae4a10878b4a4e4507fee5.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-741ffcc5cdb44ebfb774115ea90dc56e/id-02d82572bd8f4e3e89f5d8de4a82e45e/ArchimateDiagramModel_id-fefe299f0eae4a10878b4a4e4507fee5.xml
@@ -644,9 +644,6 @@
   <properties
       key="Viewtype"
       value="Basis"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Architectuurlaag"
       value="Motivatie"/>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-068756fa5b7f40d29c1d14d951d21ad8.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-068756fa5b7f40d29c1d14d951d21ad8.xml
index 9dc60510d..d8caa9c7d 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-068756fa5b7f40d29c1d14d951d21ad8.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-068756fa5b7f40d29c1d14d951d21ad8.xml
@@ -1254,4 +1254,7 @@
   <properties
       key="GEMMA URL"
       value="https://gemmaonline.nl/index.php/GEMMA2/0.9/id-f57bcd96-e19c-4a71-98f4-af05909ab5d0"/>
+  <properties
+      key="GEMMA thema"
+      value="Data"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-0dc88aabc4284d359a404526132e8634.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-0dc88aabc4284d359a404526132e8634.xml
index b828e04f9..086b23cb6 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-0dc88aabc4284d359a404526132e8634.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-0dc88aabc4284d359a404526132e8634.xml
@@ -1,7 +1,7 @@
 <archimate:ArchimateDiagramModel
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:archimate="http://www.archimatetool.com/archimate"
-    name="Monumenten "
+    name="Monumenten"
     id="id-0dc88aabc4284d359a404526132e8634">
   <children
       xsi:type="archimate:DiagramModelArchimateObject"
@@ -455,11 +455,14 @@
       value="Bedrijfsarchitectuur"/>
   <properties
       key="domein-iv3"
-      value="Monumenten "/>
+      value="Monumenten"/>
   <properties
       key="Object ID"
       value="c222e894-a6b1-4308-b116-6ba3d1c1b3ab"/>
   <properties
       key="GEMMA URL"
       value="https://gemmaonline.nl/index.php/GEMMA2/0.9/id-c222e894-a6b1-4308-b116-6ba3d1c1b3ab"/>
+  <properties
+      key="GEMMA thema"
+      value="Data"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-0f528f66cad44ec5bb707b1ae151ed23.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-0f528f66cad44ec5bb707b1ae151ed23.xml
index 8d4574fb8..3f422a144 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-0f528f66cad44ec5bb707b1ae151ed23.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-0f528f66cad44ec5bb707b1ae151ed23.xml
@@ -48,4 +48,7 @@
   <properties
       key="GEMMA URL"
       value="https://gemmaonline.nl/index.php/GEMMA2/0.9/id-ba3b0491-1af3-4f57-b53a-fb4cb7fc5995"/>
+  <properties
+      key="GEMMA thema"
+      value="Data"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-0fbd92181f37409b9932a15fb579ff98.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-0fbd92181f37409b9932a15fb579ff98.xml
index 963304872..a9381ec01 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-0fbd92181f37409b9932a15fb579ff98.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-0fbd92181f37409b9932a15fb579ff98.xml
@@ -804,4 +804,7 @@
   <properties
       key="GEMMA URL"
       value="https://gemmaonline.nl/index.php/GEMMA2/0.9/id-fb819f77-cc84-4d08-ab7c-cd1d4b2c2d11"/>
+  <properties
+      key="GEMMA thema"
+      value="Data"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-0fdacbbb8c124f73a9eb77bf474f15f6.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-0fdacbbb8c124f73a9eb77bf474f15f6.xml
index cdb3c04b1..61ee84c17 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-0fdacbbb8c124f73a9eb77bf474f15f6.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-0fdacbbb8c124f73a9eb77bf474f15f6.xml
@@ -415,4 +415,7 @@
   <properties
       key="GEMMA URL"
       value="https://gemmaonline.nl/index.php/GEMMA2/0.9/id-54936fa0-9e20-4976-bcad-7dff3ce5243f"/>
+  <properties
+      key="GEMMA thema"
+      value="Data"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-137963a0f207462e968f03569c64b22f.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-137963a0f207462e968f03569c64b22f.xml
index e70b4222c..fa8a55849 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-137963a0f207462e968f03569c64b22f.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-137963a0f207462e968f03569c64b22f.xml
@@ -402,4 +402,7 @@
   <properties
       key="GEMMA URL"
       value="https://gemmaonline.nl/index.php/GEMMA2/0.9/id-1e2f428b-9f47-4037-bbe2-962ced72bf97"/>
+  <properties
+      key="GEMMA thema"
+      value="Data"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-1384469dc9a749fe9ca422d6776549fa.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-1384469dc9a749fe9ca422d6776549fa.xml
index 02dc1b6bb..46eaf687f 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-1384469dc9a749fe9ca422d6776549fa.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-1384469dc9a749fe9ca422d6776549fa.xml
@@ -1489,4 +1489,7 @@
   <properties
       key="GEMMA URL"
       value="https://gemmaonline.nl/index.php/GEMMA2/0.9/id-601feab7-cdc2-4b9e-95ee-6d4862fc7b35"/>
+  <properties
+      key="GEMMA thema"
+      value="Data"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-1ccbea336c194915bbff5ad04d6c6e31.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-1ccbea336c194915bbff5ad04d6c6e31.xml
index 6b67a9efe..5beff83d0 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-1ccbea336c194915bbff5ad04d6c6e31.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-1ccbea336c194915bbff5ad04d6c6e31.xml
@@ -48,4 +48,7 @@
   <properties
       key="GEMMA URL"
       value="https://gemmaonline.nl/index.php/GEMMA2/0.9/id-397d9c49-ae6a-4487-88ef-f731d7736808"/>
+  <properties
+      key="GEMMA thema"
+      value="Data"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-25c7445f0e464a03a62f1714db96bb02.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-25c7445f0e464a03a62f1714db96bb02.xml
index 1b70d7a6d..b243b5ae9 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-25c7445f0e464a03a62f1714db96bb02.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-25c7445f0e464a03a62f1714db96bb02.xml
@@ -1582,4 +1582,7 @@
   <properties
       key="GEMMA URL"
       value="https://gemmaonline.nl/index.php/GEMMA2/0.9/id-c9dcd18c-8349-4242-9497-5eac8235fd40"/>
+  <properties
+      key="GEMMA thema"
+      value="Data"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-2a635d20c42140e7a8314e1bb94a677d.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-2a635d20c42140e7a8314e1bb94a677d.xml
index b9b8866fa..1dd4d1a81 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-2a635d20c42140e7a8314e1bb94a677d.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-2a635d20c42140e7a8314e1bb94a677d.xml
@@ -1603,4 +1603,7 @@
   <properties
       key="GEMMA URL"
       value="https://gemmaonline.nl/index.php/GEMMA2/0.9/id-d54c7325-9a04-4256-b95c-99b8135be091"/>
+  <properties
+      key="GEMMA thema"
+      value="Data"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-2d44f5f036554541baa6867f6d9ded98.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-2d44f5f036554541baa6867f6d9ded98.xml
index 386fb9ba3..1c04d111a 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-2d44f5f036554541baa6867f6d9ded98.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-2d44f5f036554541baa6867f6d9ded98.xml
@@ -1067,4 +1067,7 @@
   <properties
       key="GEMMA URL"
       value="https://gemmaonline.nl/index.php/GEMMA2/0.9/id-a2427e76-7cb6-4bad-b44c-c4ab3a86f487"/>
+  <properties
+      key="GEMMA thema"
+      value="Data"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-2f9ad658eda5450fb6b5d246c43ac6ad.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-2f9ad658eda5450fb6b5d246c43ac6ad.xml
index 2488203aa..13e1aa7b9 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-2f9ad658eda5450fb6b5d246c43ac6ad.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-2f9ad658eda5450fb6b5d246c43ac6ad.xml
@@ -1859,4 +1859,7 @@
   <properties
       key="GEMMA URL"
       value="https://gemmaonline.nl/index.php/GEMMA2/0.9/id-7407747c-aba1-4298-aadd-d40f86557dd2"/>
+  <properties
+      key="GEMMA thema"
+      value="Data"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-32e94bfb32c945d19e3fa87c26c07e93.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-32e94bfb32c945d19e3fa87c26c07e93.xml
index 223c3abce..f9d8d9cd5 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-32e94bfb32c945d19e3fa87c26c07e93.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-32e94bfb32c945d19e3fa87c26c07e93.xml
@@ -456,4 +456,7 @@
   <properties
       key="GEMMA URL"
       value="https://gemmaonline.nl/index.php/GEMMA2/0.9/id-11a99f32-9a73-4bef-a038-898a7f7883ad"/>
+  <properties
+      key="GEMMA thema"
+      value="Data"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-3d13e84628a04eefa40e0d1c87d1d36c.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-3d13e84628a04eefa40e0d1c87d1d36c.xml
index 23bac007a..6f7df1b8a 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-3d13e84628a04eefa40e0d1c87d1d36c.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-3d13e84628a04eefa40e0d1c87d1d36c.xml
@@ -988,4 +988,7 @@
   <properties
       key="GEMMA URL"
       value="https://gemmaonline.nl/index.php/GEMMA2/0.9/id-e7a39b03-aa3a-46f3-82b1-9444e7e32177"/>
+  <properties
+      key="GEMMA thema"
+      value="Data"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-45444c62c0574438938718aef9ca1657.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-45444c62c0574438938718aef9ca1657.xml
index f9416bdc5..53af099d6 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-45444c62c0574438938718aef9ca1657.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-45444c62c0574438938718aef9ca1657.xml
@@ -568,4 +568,7 @@
   <properties
       key="GEMMA URL"
       value="https://gemmaonline.nl/index.php/GEMMA2/0.9/id-9db3790a-884d-4135-a8cf-a6f62e680d03"/>
+  <properties
+      key="GEMMA thema"
+      value="Data"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-4ecdc8203c9a4fd3a3cace06300d1789.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-4ecdc8203c9a4fd3a3cace06300d1789.xml
index 4b6a2fb53..2108f6473 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-4ecdc8203c9a4fd3a3cace06300d1789.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-4ecdc8203c9a4fd3a3cace06300d1789.xml
@@ -261,4 +261,7 @@
   <properties
       key="GEMMA URL"
       value="https://gemmaonline.nl/index.php/GEMMA2/0.9/id-8734b1b2-9aa0-4787-8ff9-eabf4ecb42e1"/>
+  <properties
+      key="GEMMA thema"
+      value="Data"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-5ee08a61d40d4818a566076e12dc31fe.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-5ee08a61d40d4818a566076e12dc31fe.xml
index 15f02b675..7608e58ec 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-5ee08a61d40d4818a566076e12dc31fe.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-5ee08a61d40d4818a566076e12dc31fe.xml
@@ -290,4 +290,7 @@
   <properties
       key="GEMMA URL"
       value="https://gemmaonline.nl/index.php/GEMMA2/0.9/id-9c7090ec-8203-4efd-ba4a-439e427330aa"/>
+  <properties
+      key="GEMMA thema"
+      value="Data"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-66d5b8a45c754817890fac56f744a9e6.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-66d5b8a45c754817890fac56f744a9e6.xml
index 42c06e42a..59338fceb 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-66d5b8a45c754817890fac56f744a9e6.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-66d5b8a45c754817890fac56f744a9e6.xml
@@ -807,4 +807,7 @@
   <properties
       key="GEMMA URL"
       value="https://gemmaonline.nl/index.php/GEMMA2/0.9/id-a14dc83c-369e-4a3d-9946-92fbc314db3a"/>
+  <properties
+      key="GEMMA thema"
+      value="Data"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-6988c5ed9dc64d85a14b43ed0685c1dd.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-6988c5ed9dc64d85a14b43ed0685c1dd.xml
index 071a68e44..d423d4ec1 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-6988c5ed9dc64d85a14b43ed0685c1dd.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-6988c5ed9dc64d85a14b43ed0685c1dd.xml
@@ -48,4 +48,7 @@
   <properties
       key="GEMMA URL"
       value="https://gemmaonline.nl/index.php/GEMMA2/0.9/id-39543341-ab36-40d3-bdef-459fd8c6bd01"/>
+  <properties
+      key="GEMMA thema"
+      value="Data"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-6cdf3c3f93444a83a3720ec9a97e6a3f.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-6cdf3c3f93444a83a3720ec9a97e6a3f.xml
index f42122a8a..34ab9ef2f 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-6cdf3c3f93444a83a3720ec9a97e6a3f.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-6cdf3c3f93444a83a3720ec9a97e6a3f.xml
@@ -977,4 +977,7 @@
   <properties
       key="GEMMA URL"
       value="https://gemmaonline.nl/index.php/GEMMA2/0.9/id-4e504ba3-14c8-457e-85e1-6f8c87b3043a"/>
+  <properties
+      key="GEMMA thema"
+      value="Data"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-70fb1f755932481d968da29df9c9c13a.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-70fb1f755932481d968da29df9c9c13a.xml
index 7ac866b28..94c8e0d50 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-70fb1f755932481d968da29df9c9c13a.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-70fb1f755932481d968da29df9c9c13a.xml
@@ -48,4 +48,7 @@
   <properties
       key="GEMMA URL"
       value="https://gemmaonline.nl/index.php/GEMMA2/0.9/id-dd69eb51-0e7a-436e-bc07-3c2a068a7d0c"/>
+  <properties
+      key="GEMMA thema"
+      value="Data"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-71b1319db60448dbbcb6205270daa6ce.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-71b1319db60448dbbcb6205270daa6ce.xml
index b055f239f..880f4a100 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-71b1319db60448dbbcb6205270daa6ce.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-71b1319db60448dbbcb6205270daa6ce.xml
@@ -3135,4 +3135,7 @@
   <properties
       key="GEMMA URL"
       value="https://gemmaonline.nl/index.php/GEMMA2/0.9/id-7a5f5920-bed3-4a20-807b-f71eeaf306ba"/>
+  <properties
+      key="GEMMA thema"
+      value="Data"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-72e23e4efb814ba58e02a203a3a4bbeb.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-72e23e4efb814ba58e02a203a3a4bbeb.xml
index 9a0cbb26e..723583602 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-72e23e4efb814ba58e02a203a3a4bbeb.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-72e23e4efb814ba58e02a203a3a4bbeb.xml
@@ -3885,4 +3885,7 @@
   <properties
       key="GEMMA URL"
       value="https://gemmaonline.nl/index.php/GEMMA2/0.9/id-3efd3b4a-9798-4a04-a0d5-0eeb6c93109c"/>
+  <properties
+      key="GEMMA thema"
+      value="Data"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-73543aa43f99474c8ea5d1ea32feebe6.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-73543aa43f99474c8ea5d1ea32feebe6.xml
index 854d4b93d..edf01bcb9 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-73543aa43f99474c8ea5d1ea32feebe6.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-73543aa43f99474c8ea5d1ea32feebe6.xml
@@ -132,4 +132,7 @@
   <properties
       key="GEMMA URL"
       value="https://gemmaonline.nl/index.php/GEMMA2/0.9/id-52e4bf9f-4e34-4d4c-8679-81d6bb0670d4"/>
+  <properties
+      key="GEMMA thema"
+      value="Data"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-77fd2699acf44f35a239d4bcd9638861.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-77fd2699acf44f35a239d4bcd9638861.xml
index 33ee7e614..80157a347 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-77fd2699acf44f35a239d4bcd9638861.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-77fd2699acf44f35a239d4bcd9638861.xml
@@ -48,4 +48,7 @@
   <properties
       key="GEMMA URL"
       value="https://gemmaonline.nl/index.php/GEMMA2/0.9/id-036628cf-acef-45a7-a6e8-0064d581c1a8"/>
+  <properties
+      key="GEMMA thema"
+      value="Data"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-7bed86a350aa45d6ad94638c67054f68.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-7bed86a350aa45d6ad94638c67054f68.xml
index f748c440c..7c66c3fdd 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-7bed86a350aa45d6ad94638c67054f68.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-7bed86a350aa45d6ad94638c67054f68.xml
@@ -373,4 +373,7 @@
   <properties
       key="GEMMA URL"
       value="https://gemmaonline.nl/index.php/GEMMA2/0.9/id-691a0b6a-149f-48f0-87d5-3f65d4d29920"/>
+  <properties
+      key="GEMMA thema"
+      value="Data"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-7fd7c6b6954a432ab7e651df7a583d4f.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-7fd7c6b6954a432ab7e651df7a583d4f.xml
index 810b7c2b3..20c2aef35 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-7fd7c6b6954a432ab7e651df7a583d4f.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-7fd7c6b6954a432ab7e651df7a583d4f.xml
@@ -900,4 +900,7 @@
   <properties
       key="GEMMA URL"
       value="https://gemmaonline.nl/index.php/GEMMA2/0.9/id-ae742034-9913-4b2c-835a-0448f9c79a2e"/>
+  <properties
+      key="GEMMA thema"
+      value="Data"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-840b41e81180418e8225fb26f9393290.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-840b41e81180418e8225fb26f9393290.xml
index e701277ba..83504c7d3 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-840b41e81180418e8225fb26f9393290.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-840b41e81180418e8225fb26f9393290.xml
@@ -2595,4 +2595,7 @@
   <properties
       key="GEMMA URL"
       value="https://gemmaonline.nl/index.php/GEMMA2/0.9/id-01ff625a-21cf-44cf-97f0-41c99a04d2b0"/>
+  <properties
+      key="GEMMA thema"
+      value="Data"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-8a53dd54ef1143a086b5ff67e7fcdacf.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-8a53dd54ef1143a086b5ff67e7fcdacf.xml
index 7734a7a09..67894d70e 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-8a53dd54ef1143a086b5ff67e7fcdacf.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-8a53dd54ef1143a086b5ff67e7fcdacf.xml
@@ -48,4 +48,7 @@
   <properties
       key="GEMMA URL"
       value="https://gemmaonline.nl/index.php/GEMMA2/0.9/id-f02cd41f-c1ca-4993-b36c-bc28dcb340b7"/>
+  <properties
+      key="GEMMA thema"
+      value="Data"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-8bb153f0552f4df79860476364137a17.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-8bb153f0552f4df79860476364137a17.xml
index bb0c66cd2..69c67d56e 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-8bb153f0552f4df79860476364137a17.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-8bb153f0552f4df79860476364137a17.xml
@@ -8639,4 +8639,7 @@
   <properties
       key="GEMMA URL"
       value="https://gemmaonline.nl/index.php/GEMMA2/0.9/id-3e112fe1-002a-4c47-990b-ba6e018c6ccd"/>
+  <properties
+      key="GEMMA thema"
+      value="Data"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-8faa89f95bf64b4ca6407782b09b9340.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-8faa89f95bf64b4ca6407782b09b9340.xml
index 18f043e68..408cabe03 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-8faa89f95bf64b4ca6407782b09b9340.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-8faa89f95bf64b4ca6407782b09b9340.xml
@@ -302,4 +302,7 @@
   <properties
       key="GEMMA URL"
       value="https://gemmaonline.nl/index.php/GEMMA2/0.9/id-baa2ca7e-d2cb-401d-98e2-7fc43024b325"/>
+  <properties
+      key="GEMMA thema"
+      value="Data"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-9aa0c1bb5d9b470581264a8168441c31.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-9aa0c1bb5d9b470581264a8168441c31.xml
index 354139aa9..f329ec139 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-9aa0c1bb5d9b470581264a8168441c31.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-9aa0c1bb5d9b470581264a8168441c31.xml
@@ -649,4 +649,7 @@
   <properties
       key="GEMMA URL"
       value="https://gemmaonline.nl/index.php/GEMMA2/0.9/id-ed9bc2b7-7555-4b77-9606-bfdda2471b80"/>
+  <properties
+      key="GEMMA thema"
+      value="Data"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-9d0c11adbc8344cbabf1bf8c88a9d6af.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-9d0c11adbc8344cbabf1bf8c88a9d6af.xml
index e06ce1ff6..ac7b292c8 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-9d0c11adbc8344cbabf1bf8c88a9d6af.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-9d0c11adbc8344cbabf1bf8c88a9d6af.xml
@@ -728,4 +728,7 @@
   <properties
       key="GEMMA URL"
       value="https://gemmaonline.nl/index.php/GEMMA2/0.9/id-7f3434ef-ef7f-43b2-9aff-0e018b9ba04d"/>
+  <properties
+      key="GEMMA thema"
+      value="Data"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-ba7bd47096ca4e6e82a924cf17527691.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-ba7bd47096ca4e6e82a924cf17527691.xml
index 1177701e4..dc4b8dbf1 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-ba7bd47096ca4e6e82a924cf17527691.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-ba7bd47096ca4e6e82a924cf17527691.xml
@@ -4102,4 +4102,7 @@
   <properties
       key="GEMMA URL"
       value="https://gemmaonline.nl/index.php/GEMMA2/0.9/id-13a5a839-a68e-453c-8258-4966958ae51b"/>
+  <properties
+      key="GEMMA thema"
+      value="Data"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-bd8f0e391ef74387b3c60b46c1906ae2.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-bd8f0e391ef74387b3c60b46c1906ae2.xml
index 25514194a..426921a59 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-bd8f0e391ef74387b3c60b46c1906ae2.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-bd8f0e391ef74387b3c60b46c1906ae2.xml
@@ -48,4 +48,7 @@
   <properties
       key="GEMMA URL"
       value="https://gemmaonline.nl/index.php/GEMMA2/0.9/id-c57f66c9-35e5-46d9-bc35-3736f4a5657e"/>
+  <properties
+      key="GEMMA thema"
+      value="Data"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-be00b60fec56464f86fac900c2ee9ec8.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-be00b60fec56464f86fac900c2ee9ec8.xml
index 36157d6ca..729b70bcc 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-be00b60fec56464f86fac900c2ee9ec8.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-be00b60fec56464f86fac900c2ee9ec8.xml
@@ -1523,4 +1523,7 @@
   <properties
       key="GEMMA URL"
       value="https://gemmaonline.nl/index.php/GEMMA2/0.9/id-9a1db8d9-37dd-40ac-b2ee-7692ffd01edc"/>
+  <properties
+      key="GEMMA thema"
+      value="Data"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-c80784a6f3d64666b6f6eebed9fb1cdc.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-c80784a6f3d64666b6f6eebed9fb1cdc.xml
index a740f993b..7ffea5b93 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-c80784a6f3d64666b6f6eebed9fb1cdc.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-c80784a6f3d64666b6f6eebed9fb1cdc.xml
@@ -854,4 +854,7 @@
   <properties
       key="GEMMA URL"
       value="https://gemmaonline.nl/index.php/GEMMA2/0.9/id-d7056692-604b-4314-bd85-1795c0447eaf"/>
+  <properties
+      key="GEMMA thema"
+      value="Data"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-d46d589e8bc64d6992f917e0c5baadfb.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-d46d589e8bc64d6992f917e0c5baadfb.xml
index a2dcb1b03..e15ddff6a 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-d46d589e8bc64d6992f917e0c5baadfb.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-d46d589e8bc64d6992f917e0c5baadfb.xml
@@ -48,4 +48,7 @@
   <properties
       key="GEMMA URL"
       value="https://gemmaonline.nl/index.php/GEMMA2/0.9/id-a1035068-8214-48e9-9119-36c9abbf913a"/>
+  <properties
+      key="GEMMA thema"
+      value="Data"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-d6635d6bd32f4b56afe4995171c554b4.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-d6635d6bd32f4b56afe4995171c554b4.xml
index 8a343e3f5..bb676fdef 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-d6635d6bd32f4b56afe4995171c554b4.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-d6635d6bd32f4b56afe4995171c554b4.xml
@@ -2599,4 +2599,7 @@
   <properties
       key="GEMMA URL"
       value="https://gemmaonline.nl/index.php/GEMMA2/0.9/id-a9ea2ebd-64de-4636-b9eb-e5b612425b63"/>
+  <properties
+      key="GEMMA thema"
+      value="Data"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-dd21a8725cce45a7b97849d8163392ae.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-dd21a8725cce45a7b97849d8163392ae.xml
index 3e52521f7..53544d622 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-dd21a8725cce45a7b97849d8163392ae.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-dd21a8725cce45a7b97849d8163392ae.xml
@@ -1237,4 +1237,7 @@
   <properties
       key="GEMMA URL"
       value="https://gemmaonline.nl/index.php/GEMMA2/0.9/id-86171cd6-0049-4fc4-b220-cbab9e8d4d07"/>
+  <properties
+      key="GEMMA thema"
+      value="Data"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-e2ae1ae3e61d4191abbdbeee62e57d4e.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-e2ae1ae3e61d4191abbdbeee62e57d4e.xml
index 4cd973225..c984c49b7 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-e2ae1ae3e61d4191abbdbeee62e57d4e.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-e2ae1ae3e61d4191abbdbeee62e57d4e.xml
@@ -510,4 +510,7 @@
   <properties
       key="GEMMA URL"
       value="https://gemmaonline.nl/index.php/GEMMA2/0.9/id-fc868f32-ca6c-43ef-b3d5-a32ac94750f0"/>
+  <properties
+      key="GEMMA thema"
+      value="Data"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-e5d559a5ec4f4d1fb4e98f36958320a5.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-e5d559a5ec4f4d1fb4e98f36958320a5.xml
index 57690004c..1773f775d 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-e5d559a5ec4f4d1fb4e98f36958320a5.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-e5d559a5ec4f4d1fb4e98f36958320a5.xml
@@ -121,4 +121,7 @@
   <properties
       key="GEMMA URL"
       value="https://gemmaonline.nl/index.php/GEMMA2/0.9/id-0fc76a64-de2c-49d1-a33b-fe7e76149dc8"/>
+  <properties
+      key="GEMMA thema"
+      value="Data"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-ee2356a2eef043b584de841bae101bb2.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-ee2356a2eef043b584de841bae101bb2.xml
index 65268c9ae..673821859 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-ee2356a2eef043b584de841bae101bb2.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-ee2356a2eef043b584de841bae101bb2.xml
@@ -5689,4 +5689,7 @@
   <properties
       key="GEMMA URL"
       value="https://gemmaonline.nl/index.php/GEMMA2/0.9/id-5438b35e-cab7-491c-b35e-a386816d3512"/>
+  <properties
+      key="GEMMA thema"
+      value="Data"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-f37d08ece4e3413aa87cd65d457b888e.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-f37d08ece4e3413aa87cd65d457b888e.xml
index b223b93b3..4be15ac23 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-f37d08ece4e3413aa87cd65d457b888e.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-f37d08ece4e3413aa87cd65d457b888e.xml
@@ -1453,4 +1453,7 @@
   <properties
       key="GEMMA URL"
       value="https://gemmaonline.nl/index.php/GEMMA2/0.9/id-2aee724f-6d5f-40be-870a-13308c60f97a"/>
+  <properties
+      key="GEMMA thema"
+      value="Data"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-fda4eaa478754948b93e5bf60f1d8ece.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-fda4eaa478754948b93e5bf60f1d8ece.xml
index 21af61bf6..eb8a13600 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-fda4eaa478754948b93e5bf60f1d8ece.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-65af034b0eda46c9848287f105f07e84/ArchimateDiagramModel_id-fda4eaa478754948b93e5bf60f1d8ece.xml
@@ -1723,4 +1723,7 @@
   <properties
       key="GEMMA URL"
       value="https://gemmaonline.nl/index.php/GEMMA2/0.9/id-a56a5a46-adb3-40fe-b1dc-c1f5e9e4bac6"/>
+  <properties
+      key="GEMMA thema"
+      value="Data"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-a2afc2bca820402c93a3edb1bbc5ecb9/ArchimateDiagramModel_id-113b4d008f254b37a38a29f705cc4930.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-a2afc2bca820402c93a3edb1bbc5ecb9/ArchimateDiagramModel_id-113b4d008f254b37a38a29f705cc4930.xml
index f8eabab71..40fdf24c5 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-a2afc2bca820402c93a3edb1bbc5ecb9/ArchimateDiagramModel_id-113b4d008f254b37a38a29f705cc4930.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-a2afc2bca820402c93a3edb1bbc5ecb9/ArchimateDiagramModel_id-113b4d008f254b37a38a29f705cc4930.xml
@@ -1798,4 +1798,7 @@
   <properties
       key="GEMMA URL"
       value="https://gemmaonline.nl/index.php/GEMMA2/0.9/id-53580730-c0b4-4331-aa22-94887b92036a"/>
+  <properties
+      key="GEMMA thema"
+      value="Data"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-a2afc2bca820402c93a3edb1bbc5ecb9/ArchimateDiagramModel_id-633a218f8b84425ea0f208aa391b439f.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-a2afc2bca820402c93a3edb1bbc5ecb9/ArchimateDiagramModel_id-633a218f8b84425ea0f208aa391b439f.xml
index 44069534f..1eaf2affb 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-a2afc2bca820402c93a3edb1bbc5ecb9/ArchimateDiagramModel_id-633a218f8b84425ea0f208aa391b439f.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-0b54e04f94e142f39cae9f23ea5a4e49/id-a2afc2bca820402c93a3edb1bbc5ecb9/ArchimateDiagramModel_id-633a218f8b84425ea0f208aa391b439f.xml
@@ -258,4 +258,7 @@
   <properties
       key="GEMMA URL"
       value="https://gemmaonline.nl/index.php/GEMMA2/0.9/id-549ce1fa-90bf-448c-93e4-29b1041d4a78"/>
+  <properties
+      key="GEMMA thema"
+      value="Data"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-bcde077e865a45f19c607b36578d6866/ArchimateDiagramModel_id-093994459efe43f3ae30b4b9a56e0a54.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-bcde077e865a45f19c607b36578d6866/ArchimateDiagramModel_id-093994459efe43f3ae30b4b9a56e0a54.xml
index c85e05849..ef7c4f230 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-bcde077e865a45f19c607b36578d6866/ArchimateDiagramModel_id-093994459efe43f3ae30b4b9a56e0a54.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-ba678d498df943f7a51ba92eec619185/id-bcde077e865a45f19c607b36578d6866/ArchimateDiagramModel_id-093994459efe43f3ae30b4b9a56e0a54.xml
@@ -210,4 +210,7 @@
   <properties
       key="GEMMA URL"
       value="https://gemmaonline.nl/index.php/GEMMA2/0.9/id-99add780-044f-4dfd-9237-8bc30b7649cf"/>
+  <properties
+      key="Publiceren"
+      value="Niet"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-c813685a8606462cb6560fa4b0d0bb3a/ArchimateDiagramModel_id-7e2162c221344bbeb74c049beb457f0d.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-c813685a8606462cb6560fa4b0d0bb3a/ArchimateDiagramModel_id-7e2162c221344bbeb74c049beb457f0d.xml
index 5d299bbb7..cd5653396 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-c813685a8606462cb6560fa4b0d0bb3a/ArchimateDiagramModel_id-7e2162c221344bbeb74c049beb457f0d.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-c813685a8606462cb6560fa4b0d0bb3a/ArchimateDiagramModel_id-7e2162c221344bbeb74c049beb457f0d.xml
@@ -522,7 +522,4 @@
   <properties
       key="Viewtype"
       value="Synchronisatie"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-c813685a8606462cb6560fa4b0d0bb3a/ArchimateDiagramModel_id-80c363bf417a40e6b5def81ef3dd0488.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-c813685a8606462cb6560fa4b0d0bb3a/ArchimateDiagramModel_id-80c363bf417a40e6b5def81ef3dd0488.xml
index 8dff54762..8f67e2784 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-c813685a8606462cb6560fa4b0d0bb3a/ArchimateDiagramModel_id-80c363bf417a40e6b5def81ef3dd0488.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-c813685a8606462cb6560fa4b0d0bb3a/ArchimateDiagramModel_id-80c363bf417a40e6b5def81ef3dd0488.xml
@@ -520,7 +520,4 @@
   <properties
       key="Viewtype"
       value="Synchronisatie"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-c813685a8606462cb6560fa4b0d0bb3a/ArchimateDiagramModel_id-9860ba311fac4c9eb83f446d289e4a44.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-c813685a8606462cb6560fa4b0d0bb3a/ArchimateDiagramModel_id-9860ba311fac4c9eb83f446d289e4a44.xml
index e45e293f5..ee866d67e 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-c813685a8606462cb6560fa4b0d0bb3a/ArchimateDiagramModel_id-9860ba311fac4c9eb83f446d289e4a44.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-c813685a8606462cb6560fa4b0d0bb3a/ArchimateDiagramModel_id-9860ba311fac4c9eb83f446d289e4a44.xml
@@ -2670,7 +2670,4 @@
   <properties
       key="Viewtype"
       value="Synchronisatie"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-c813685a8606462cb6560fa4b0d0bb3a/ArchimateDiagramModel_id-9bf5bad7b90040fc837d9e3dc0eeae78.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-c813685a8606462cb6560fa4b0d0bb3a/ArchimateDiagramModel_id-9bf5bad7b90040fc837d9e3dc0eeae78.xml
index 9055ed46d..9c7f12711 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-c813685a8606462cb6560fa4b0d0bb3a/ArchimateDiagramModel_id-9bf5bad7b90040fc837d9e3dc0eeae78.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-c813685a8606462cb6560fa4b0d0bb3a/ArchimateDiagramModel_id-9bf5bad7b90040fc837d9e3dc0eeae78.xml
@@ -777,7 +777,4 @@
   <properties
       key="Viewtype"
       value="Synchronisatie"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-c813685a8606462cb6560fa4b0d0bb3a/ArchimateDiagramModel_id-aa75a91838a04fdc9aa7c32731c33c65.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-c813685a8606462cb6560fa4b0d0bb3a/ArchimateDiagramModel_id-aa75a91838a04fdc9aa7c32731c33c65.xml
index 0d3a1c6d6..311928b4b 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-c813685a8606462cb6560fa4b0d0bb3a/ArchimateDiagramModel_id-aa75a91838a04fdc9aa7c32731c33c65.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-c813685a8606462cb6560fa4b0d0bb3a/ArchimateDiagramModel_id-aa75a91838a04fdc9aa7c32731c33c65.xml
@@ -865,7 +865,4 @@
   <properties
       key="Viewtype"
       value="Synchronisatie"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-c813685a8606462cb6560fa4b0d0bb3a/ArchimateDiagramModel_id-c8f105da50be4636a7db1e2c20a76555.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-c813685a8606462cb6560fa4b0d0bb3a/ArchimateDiagramModel_id-c8f105da50be4636a7db1e2c20a76555.xml
index 6421f06ab..383fc5154 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-c813685a8606462cb6560fa4b0d0bb3a/ArchimateDiagramModel_id-c8f105da50be4636a7db1e2c20a76555.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-c813685a8606462cb6560fa4b0d0bb3a/ArchimateDiagramModel_id-c8f105da50be4636a7db1e2c20a76555.xml
@@ -443,7 +443,4 @@
   <properties
       key="Viewtype"
       value="Synchronisatie"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-c813685a8606462cb6560fa4b0d0bb3a/ArchimateDiagramModel_id-d68cec1868a2411f96298a52f613433b.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-c813685a8606462cb6560fa4b0d0bb3a/ArchimateDiagramModel_id-d68cec1868a2411f96298a52f613433b.xml
index 066bd93f3..ea668a205 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-c813685a8606462cb6560fa4b0d0bb3a/ArchimateDiagramModel_id-d68cec1868a2411f96298a52f613433b.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-c813685a8606462cb6560fa4b0d0bb3a/ArchimateDiagramModel_id-d68cec1868a2411f96298a52f613433b.xml
@@ -907,7 +907,4 @@
   <properties
       key="Viewtype"
       value="Synchronisatie"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-c813685a8606462cb6560fa4b0d0bb3a/ArchimateDiagramModel_id-dbabaffe8b3742dba3d957edd6804a26.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-c813685a8606462cb6560fa4b0d0bb3a/ArchimateDiagramModel_id-dbabaffe8b3742dba3d957edd6804a26.xml
index c198a6165..94c6ca61c 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-c813685a8606462cb6560fa4b0d0bb3a/ArchimateDiagramModel_id-dbabaffe8b3742dba3d957edd6804a26.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-c813685a8606462cb6560fa4b0d0bb3a/ArchimateDiagramModel_id-dbabaffe8b3742dba3d957edd6804a26.xml
@@ -1347,7 +1347,4 @@
   <properties
       key="Viewtype"
       value="Synchronisatie"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-d5e65c795a5143249d3ed5f0f03438ce/id-799f001c96284f65ac9c37dc5bb1f287/ArchimateDiagramModel_id-1709da0574de4b1c93c39fcebfb9cb26.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-d5e65c795a5143249d3ed5f0f03438ce/id-799f001c96284f65ac9c37dc5bb1f287/ArchimateDiagramModel_id-1709da0574de4b1c93c39fcebfb9cb26.xml
index f97d6896a..79d02cd1b 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-d5e65c795a5143249d3ed5f0f03438ce/id-799f001c96284f65ac9c37dc5bb1f287/ArchimateDiagramModel_id-1709da0574de4b1c93c39fcebfb9cb26.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-d5e65c795a5143249d3ed5f0f03438ce/id-799f001c96284f65ac9c37dc5bb1f287/ArchimateDiagramModel_id-1709da0574de4b1c93c39fcebfb9cb26.xml
@@ -1362,4 +1362,10 @@
   <properties
       key="Viewtype"
       value="Contentfilter"/>
+  <properties
+      key="Detailniveau"
+      value="Detail"/>
+  <properties
+      key="Scope"
+      value="Keten"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-d5e65c795a5143249d3ed5f0f03438ce/id-799f001c96284f65ac9c37dc5bb1f287/ArchimateDiagramModel_id-1bfeca5d-2f1f-4aaa-bacb-f427876dd45e.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-d5e65c795a5143249d3ed5f0f03438ce/id-799f001c96284f65ac9c37dc5bb1f287/ArchimateDiagramModel_id-1bfeca5d-2f1f-4aaa-bacb-f427876dd45e.xml
index e917672e4..8999cb2bb 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-d5e65c795a5143249d3ed5f0f03438ce/id-799f001c96284f65ac9c37dc5bb1f287/ArchimateDiagramModel_id-1bfeca5d-2f1f-4aaa-bacb-f427876dd45e.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-d5e65c795a5143249d3ed5f0f03438ce/id-799f001c96284f65ac9c37dc5bb1f287/ArchimateDiagramModel_id-1bfeca5d-2f1f-4aaa-bacb-f427876dd45e.xml
@@ -441,4 +441,10 @@
   <properties
       key="Viewtype"
       value="Contentfilter"/>
+  <properties
+      key="Detailniveau"
+      value="Detail"/>
+  <properties
+      key="Scope"
+      value="Gemeente"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-d5e65c795a5143249d3ed5f0f03438ce/id-799f001c96284f65ac9c37dc5bb1f287/ArchimateDiagramModel_id-8786201d-a2f5-40be-8177-a509c4ecc97d.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-d5e65c795a5143249d3ed5f0f03438ce/id-799f001c96284f65ac9c37dc5bb1f287/ArchimateDiagramModel_id-8786201d-a2f5-40be-8177-a509c4ecc97d.xml
index b37c06abc..9b0b0ed4d 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-d5e65c795a5143249d3ed5f0f03438ce/id-799f001c96284f65ac9c37dc5bb1f287/ArchimateDiagramModel_id-8786201d-a2f5-40be-8177-a509c4ecc97d.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-d5e65c795a5143249d3ed5f0f03438ce/id-799f001c96284f65ac9c37dc5bb1f287/ArchimateDiagramModel_id-8786201d-a2f5-40be-8177-a509c4ecc97d.xml
@@ -388,4 +388,10 @@
   <properties
       key="Viewtype"
       value="Contentfilter"/>
+  <properties
+      key="Detailniveau"
+      value="Detail"/>
+  <properties
+      key="Scope"
+      value="Gemeente"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-d5e65c795a5143249d3ed5f0f03438ce/id-799f001c96284f65ac9c37dc5bb1f287/ArchimateDiagramModel_id-8f7ec837-3ed0-4b40-ac97-4e5a07cae322.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-d5e65c795a5143249d3ed5f0f03438ce/id-799f001c96284f65ac9c37dc5bb1f287/ArchimateDiagramModel_id-8f7ec837-3ed0-4b40-ac97-4e5a07cae322.xml
index 83791af78..efe90a2c0 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-d5e65c795a5143249d3ed5f0f03438ce/id-799f001c96284f65ac9c37dc5bb1f287/ArchimateDiagramModel_id-8f7ec837-3ed0-4b40-ac97-4e5a07cae322.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-d5e65c795a5143249d3ed5f0f03438ce/id-799f001c96284f65ac9c37dc5bb1f287/ArchimateDiagramModel_id-8f7ec837-3ed0-4b40-ac97-4e5a07cae322.xml
@@ -493,4 +493,10 @@
   <properties
       key="Viewtype"
       value="Contentfilter"/>
+  <properties
+      key="Detailniveau"
+      value="Detail"/>
+  <properties
+      key="Scope"
+      value="Gemeente"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-fd60900ad7154c37a22206dadfe562e6/ArchimateDiagramModel_id-03eda439-fb3c-4236-b910-c284a3ea531e.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-fd60900ad7154c37a22206dadfe562e6/ArchimateDiagramModel_id-03eda439-fb3c-4236-b910-c284a3ea531e.xml
index 76d0964bb..91196c6ce 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-fd60900ad7154c37a22206dadfe562e6/ArchimateDiagramModel_id-03eda439-fb3c-4236-b910-c284a3ea531e.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-fd60900ad7154c37a22206dadfe562e6/ArchimateDiagramModel_id-03eda439-fb3c-4236-b910-c284a3ea531e.xml
@@ -418,5 +418,11 @@
       value="Synchronisatie"/>
   <properties
       key="GEMMA thema"
-      value="Informatiebeveiliging"/>
+      value="Privacy en informatiebeveiliging"/>
+  <properties
+      key="Detailniveau"
+      value="Detail"/>
+  <properties
+      key="Scope"
+      value="Gemeente"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-fd60900ad7154c37a22206dadfe562e6/ArchimateDiagramModel_id-50cdeb390d334a258d0315f60fc80af4.xml b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-fd60900ad7154c37a22206dadfe562e6/ArchimateDiagramModel_id-50cdeb390d334a258d0315f60fc80af4.xml
index 11b61fe0e..3fc75afd6 100644
--- a/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-fd60900ad7154c37a22206dadfe562e6/ArchimateDiagramModel_id-50cdeb390d334a258d0315f60fc80af4.xml
+++ b/model/diagrams/af7d1b64-a3aa-4480-b068-3413833b1da0/id-fd60900ad7154c37a22206dadfe562e6/ArchimateDiagramModel_id-50cdeb390d334a258d0315f60fc80af4.xml
@@ -81,5 +81,11 @@
       value="Synchronisatie"/>
   <properties
       key="GEMMA thema"
-      value="Informatiebeveiliging"/>
+      value="Privacy en informatiebeveiliging"/>
+  <properties
+      key="Detailniveau"
+      value="Detail"/>
+  <properties
+      key="Scope"
+      value="Gemeente"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/35ef4245-c1ae-44a9-a1b3-88b2504153f5/10ee74eb-f094-4e68-99fe-730b4174c345/ArchimateDiagramModel_id-3dcb0215-7c8a-4aef-80a2-271a20739de1.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/35ef4245-c1ae-44a9-a1b3-88b2504153f5/10ee74eb-f094-4e68-99fe-730b4174c345/ArchimateDiagramModel_id-3dcb0215-7c8a-4aef-80a2-271a20739de1.xml
index 16e2f7933..cf63984e6 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/35ef4245-c1ae-44a9-a1b3-88b2504153f5/10ee74eb-f094-4e68-99fe-730b4174c345/ArchimateDiagramModel_id-3dcb0215-7c8a-4aef-80a2-271a20739de1.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/35ef4245-c1ae-44a9-a1b3-88b2504153f5/10ee74eb-f094-4e68-99fe-730b4174c345/ArchimateDiagramModel_id-3dcb0215-7c8a-4aef-80a2-271a20739de1.xml
@@ -385,10 +385,10 @@
       value="Keten"/>
   <properties
       key="Viewtype"
-      value="Project"/>
+      value="Illustratie"/>
   <properties
       key="GEMMA thema"
-      value="Geen"/>
+      value="Privacy en informatiebeveiliging"/>
   <properties
       key="Publiceren"
       value="Niet"/>
@@ -398,4 +398,7 @@
   <properties
       key="Domein"
       value="Niet domeingebonden"/>
+  <properties
+      key="Detailniveau"
+      value="Detail"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/35ef4245-c1ae-44a9-a1b3-88b2504153f5/10ee74eb-f094-4e68-99fe-730b4174c345/ArchimateDiagramModel_id-9943399c-eb50-488e-8114-5742de38b798.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/35ef4245-c1ae-44a9-a1b3-88b2504153f5/10ee74eb-f094-4e68-99fe-730b4174c345/ArchimateDiagramModel_id-9943399c-eb50-488e-8114-5742de38b798.xml
index 0cb26019a..fbf96c1d9 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/35ef4245-c1ae-44a9-a1b3-88b2504153f5/10ee74eb-f094-4e68-99fe-730b4174c345/ArchimateDiagramModel_id-9943399c-eb50-488e-8114-5742de38b798.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/35ef4245-c1ae-44a9-a1b3-88b2504153f5/10ee74eb-f094-4e68-99fe-730b4174c345/ArchimateDiagramModel_id-9943399c-eb50-488e-8114-5742de38b798.xml
@@ -618,10 +618,10 @@
       value="Keten"/>
   <properties
       key="Viewtype"
-      value="Project"/>
+      value="Illustratie"/>
   <properties
       key="GEMMA thema"
-      value="Geen"/>
+      value="Privacy en informatiebeveiliging"/>
   <properties
       key="Publiceren"
       value="Niet"/>
@@ -631,4 +631,7 @@
   <properties
       key="Domein"
       value="Niet domeingebonden"/>
+  <properties
+      key="Detailniveau"
+      value="Detail"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/35ef4245-c1ae-44a9-a1b3-88b2504153f5/10ee74eb-f094-4e68-99fe-730b4174c345/ArchimateDiagramModel_id-fbc8bda0-5b31-4a3b-bb13-7a1e4143b02c.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/35ef4245-c1ae-44a9-a1b3-88b2504153f5/10ee74eb-f094-4e68-99fe-730b4174c345/ArchimateDiagramModel_id-fbc8bda0-5b31-4a3b-bb13-7a1e4143b02c.xml
index 52d37fa01..515fcec20 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/35ef4245-c1ae-44a9-a1b3-88b2504153f5/10ee74eb-f094-4e68-99fe-730b4174c345/ArchimateDiagramModel_id-fbc8bda0-5b31-4a3b-bb13-7a1e4143b02c.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/35ef4245-c1ae-44a9-a1b3-88b2504153f5/10ee74eb-f094-4e68-99fe-730b4174c345/ArchimateDiagramModel_id-fbc8bda0-5b31-4a3b-bb13-7a1e4143b02c.xml
@@ -459,10 +459,10 @@
       value="Keten"/>
   <properties
       key="Viewtype"
-      value="Project"/>
+      value="Illustratie"/>
   <properties
       key="GEMMA thema"
-      value="Geen"/>
+      value="Privacy en informatiebeveiliging"/>
   <properties
       key="Publiceren"
       value="Niet"/>
@@ -472,4 +472,7 @@
   <properties
       key="Domein"
       value="Niet domeingebonden"/>
+  <properties
+      key="Detailniveau"
+      value="Detail"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/35ef4245-c1ae-44a9-a1b3-88b2504153f5/3cc0f58c-b5e7-49aa-b13c-e46162bd59ca/ArchimateDiagramModel_id-229d4f85-0b5f-4e6e-8410-853fc8e11c56.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/35ef4245-c1ae-44a9-a1b3-88b2504153f5/3cc0f58c-b5e7-49aa-b13c-e46162bd59ca/ArchimateDiagramModel_id-229d4f85-0b5f-4e6e-8410-853fc8e11c56.xml
index 02ef44dba..69d070ec8 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/35ef4245-c1ae-44a9-a1b3-88b2504153f5/3cc0f58c-b5e7-49aa-b13c-e46162bd59ca/ArchimateDiagramModel_id-229d4f85-0b5f-4e6e-8410-853fc8e11c56.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/35ef4245-c1ae-44a9-a1b3-88b2504153f5/3cc0f58c-b5e7-49aa-b13c-e46162bd59ca/ArchimateDiagramModel_id-229d4f85-0b5f-4e6e-8410-853fc8e11c56.xml
@@ -435,7 +435,7 @@
       value="229d4f85-0b5f-4e6e-8410-853fc8e11c56"/>
   <properties
       key="GEMMA thema"
-      value="Geen"/>
+      value="Privacy en informatiebeveiliging"/>
   <properties
       key="Publiceren"
       value="Niet"/>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/35ef4245-c1ae-44a9-a1b3-88b2504153f5/3cc0f58c-b5e7-49aa-b13c-e46162bd59ca/ArchimateDiagramModel_id-f633f850-9745-4a54-a0af-4b1c038d4627.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/35ef4245-c1ae-44a9-a1b3-88b2504153f5/3cc0f58c-b5e7-49aa-b13c-e46162bd59ca/ArchimateDiagramModel_id-f633f850-9745-4a54-a0af-4b1c038d4627.xml
index 8d62d5db8..b14275160 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/35ef4245-c1ae-44a9-a1b3-88b2504153f5/3cc0f58c-b5e7-49aa-b13c-e46162bd59ca/ArchimateDiagramModel_id-f633f850-9745-4a54-a0af-4b1c038d4627.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/35ef4245-c1ae-44a9-a1b3-88b2504153f5/3cc0f58c-b5e7-49aa-b13c-e46162bd59ca/ArchimateDiagramModel_id-f633f850-9745-4a54-a0af-4b1c038d4627.xml
@@ -362,7 +362,7 @@
       value="f633f850-9745-4a54-a0af-4b1c038d4627"/>
   <properties
       key="GEMMA thema"
-      value="Geen"/>
+      value="Privacy en informatiebeveiliging"/>
   <properties
       key="Publiceren"
       value="Niet"/>
@@ -372,4 +372,7 @@
   <properties
       key="Domein"
       value="Niet domeingebonden"/>
+  <properties
+      key="Detailniveau"
+      value="Detail"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/35ef4245-c1ae-44a9-a1b3-88b2504153f5/7757074e-3092-4e1f-8cff-f89d0491685e/ArchimateDiagramModel_id-8d2bb3ad-f256-4dca-9c2c-3ac85d567d08.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/35ef4245-c1ae-44a9-a1b3-88b2504153f5/7757074e-3092-4e1f-8cff-f89d0491685e/ArchimateDiagramModel_id-8d2bb3ad-f256-4dca-9c2c-3ac85d567d08.xml
index 42fd03c07..9530fca9a 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/35ef4245-c1ae-44a9-a1b3-88b2504153f5/7757074e-3092-4e1f-8cff-f89d0491685e/ArchimateDiagramModel_id-8d2bb3ad-f256-4dca-9c2c-3ac85d567d08.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/35ef4245-c1ae-44a9-a1b3-88b2504153f5/7757074e-3092-4e1f-8cff-f89d0491685e/ArchimateDiagramModel_id-8d2bb3ad-f256-4dca-9c2c-3ac85d567d08.xml
@@ -8363,7 +8363,7 @@
       value="Niet domeingebonden"/>
   <properties
       key="GEMMA thema"
-      value="Informatiebeveiliging"/>
+      value="Privacy en informatiebeveiliging"/>
   <properties
       key="Publiceren"
       value="Niet"/>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/35ef4245-c1ae-44a9-a1b3-88b2504153f5/7757074e-3092-4e1f-8cff-f89d0491685e/ArchimateDiagramModel_id-90483141-8b35-491d-87e8-6ec1590fc89b.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/35ef4245-c1ae-44a9-a1b3-88b2504153f5/7757074e-3092-4e1f-8cff-f89d0491685e/ArchimateDiagramModel_id-90483141-8b35-491d-87e8-6ec1590fc89b.xml
index aa6321acc..ae51713e3 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/35ef4245-c1ae-44a9-a1b3-88b2504153f5/7757074e-3092-4e1f-8cff-f89d0491685e/ArchimateDiagramModel_id-90483141-8b35-491d-87e8-6ec1590fc89b.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/35ef4245-c1ae-44a9-a1b3-88b2504153f5/7757074e-3092-4e1f-8cff-f89d0491685e/ArchimateDiagramModel_id-90483141-8b35-491d-87e8-6ec1590fc89b.xml
@@ -1824,7 +1824,7 @@
       value="Niet domeingebonden"/>
   <properties
       key="GEMMA thema"
-      value="Informatiebeveiliging"/>
+      value="Privacy en informatiebeveiliging"/>
   <properties
       key="Object ID"
       value="90483141-8b35-491d-87e8-6ec1590fc89b"/>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/35ef4245-c1ae-44a9-a1b3-88b2504153f5/7757074e-3092-4e1f-8cff-f89d0491685e/ArchimateDiagramModel_id-9ee3cc06-3cf8-4e54-8929-b3206dd53588.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/35ef4245-c1ae-44a9-a1b3-88b2504153f5/7757074e-3092-4e1f-8cff-f89d0491685e/ArchimateDiagramModel_id-9ee3cc06-3cf8-4e54-8929-b3206dd53588.xml
index 23ea843dc..448b1294e 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/35ef4245-c1ae-44a9-a1b3-88b2504153f5/7757074e-3092-4e1f-8cff-f89d0491685e/ArchimateDiagramModel_id-9ee3cc06-3cf8-4e54-8929-b3206dd53588.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/35ef4245-c1ae-44a9-a1b3-88b2504153f5/7757074e-3092-4e1f-8cff-f89d0491685e/ArchimateDiagramModel_id-9ee3cc06-3cf8-4e54-8929-b3206dd53588.xml
@@ -2133,7 +2133,7 @@
       value="9ee3cc06-3cf8-4e54-8929-b3206dd53588"/>
   <properties
       key="GEMMA thema"
-      value="Geen"/>
+      value="Privacy en informatiebeveiliging"/>
   <properties
       key="Viewtype"
       value="Toelichting"/>
@@ -2146,4 +2146,7 @@
   <properties
       key="Domein"
       value="Niet domeingebonden"/>
+  <properties
+      key="Detailniveau"
+      value="Detail"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/35ef4245-c1ae-44a9-a1b3-88b2504153f5/7757074e-3092-4e1f-8cff-f89d0491685e/ArchimateDiagramModel_id-ad2473c1-86e5-4347-81ec-326a6a93b0f2.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/35ef4245-c1ae-44a9-a1b3-88b2504153f5/7757074e-3092-4e1f-8cff-f89d0491685e/ArchimateDiagramModel_id-ad2473c1-86e5-4347-81ec-326a6a93b0f2.xml
index ab5b31c19..729e89e85 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/35ef4245-c1ae-44a9-a1b3-88b2504153f5/7757074e-3092-4e1f-8cff-f89d0491685e/ArchimateDiagramModel_id-ad2473c1-86e5-4347-81ec-326a6a93b0f2.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/35ef4245-c1ae-44a9-a1b3-88b2504153f5/7757074e-3092-4e1f-8cff-f89d0491685e/ArchimateDiagramModel_id-ad2473c1-86e5-4347-81ec-326a6a93b0f2.xml
@@ -8363,7 +8363,7 @@
       value="Niet domeingebonden"/>
   <properties
       key="GEMMA thema"
-      value="Informatiebeveiliging"/>
+      value="Privacy en informatiebeveiliging"/>
   <properties
       key="Publiceren"
       value="Softwarecatalogus en GEMMA Online en redactie"/>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/35ef4245-c1ae-44a9-a1b3-88b2504153f5/7757074e-3092-4e1f-8cff-f89d0491685e/ArchimateDiagramModel_id-b6a9171f-9b5a-4f00-a02d-f64dd8af0f68.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/35ef4245-c1ae-44a9-a1b3-88b2504153f5/7757074e-3092-4e1f-8cff-f89d0491685e/ArchimateDiagramModel_id-b6a9171f-9b5a-4f00-a02d-f64dd8af0f68.xml
index d7542b437..de62c380c 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/35ef4245-c1ae-44a9-a1b3-88b2504153f5/7757074e-3092-4e1f-8cff-f89d0491685e/ArchimateDiagramModel_id-b6a9171f-9b5a-4f00-a02d-f64dd8af0f68.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/35ef4245-c1ae-44a9-a1b3-88b2504153f5/7757074e-3092-4e1f-8cff-f89d0491685e/ArchimateDiagramModel_id-b6a9171f-9b5a-4f00-a02d-f64dd8af0f68.xml
@@ -15227,7 +15227,7 @@
       value="Niet domeingebonden"/>
   <properties
       key="GEMMA thema"
-      value="Informatiebeveiliging"/>
+      value="Privacy en informatiebeveiliging"/>
   <properties
       key="Publiceren"
       value="GEMMA Online en redactie"/>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/64dafa36-397e-4045-9bd8-c9f32ab03fbd/id-ca6f6cdd07d143d2962342b5c7ec92c4/id-e30ce3ec3b27461faee3fc8511c7c8ed/ArchimateDiagramModel_id-26da27c1-2a53-46a5-abdd-3bf4243df813.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/64dafa36-397e-4045-9bd8-c9f32ab03fbd/id-ca6f6cdd07d143d2962342b5c7ec92c4/id-e30ce3ec3b27461faee3fc8511c7c8ed/ArchimateDiagramModel_id-26da27c1-2a53-46a5-abdd-3bf4243df813.xml
index 9fed91e1b..25543ea7d 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/64dafa36-397e-4045-9bd8-c9f32ab03fbd/id-ca6f6cdd07d143d2962342b5c7ec92c4/id-e30ce3ec3b27461faee3fc8511c7c8ed/ArchimateDiagramModel_id-26da27c1-2a53-46a5-abdd-3bf4243df813.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/64dafa36-397e-4045-9bd8-c9f32ab03fbd/id-ca6f6cdd07d143d2962342b5c7ec92c4/id-e30ce3ec3b27461faee3fc8511c7c8ed/ArchimateDiagramModel_id-26da27c1-2a53-46a5-abdd-3bf4243df813.xml
@@ -238,4 +238,13 @@
   <properties
       key="Viewtype"
       value="Patroon"/>
+  <properties
+      key="Detailniveau"
+      value="Detail"/>
+  <properties
+      key="Scope"
+      value="Gemeente"/>
+  <properties
+      key="GEMMA thema"
+      value="Zaakgericht werken"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/64dafa36-397e-4045-9bd8-c9f32ab03fbd/id-ca6f6cdd07d143d2962342b5c7ec92c4/id-e30ce3ec3b27461faee3fc8511c7c8ed/ArchimateDiagramModel_id-b3523f5b-b33b-43b4-beb5-885506f60690.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/64dafa36-397e-4045-9bd8-c9f32ab03fbd/id-ca6f6cdd07d143d2962342b5c7ec92c4/id-e30ce3ec3b27461faee3fc8511c7c8ed/ArchimateDiagramModel_id-b3523f5b-b33b-43b4-beb5-885506f60690.xml
index a183d5e6d..1c9e213fa 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/64dafa36-397e-4045-9bd8-c9f32ab03fbd/id-ca6f6cdd07d143d2962342b5c7ec92c4/id-e30ce3ec3b27461faee3fc8511c7c8ed/ArchimateDiagramModel_id-b3523f5b-b33b-43b4-beb5-885506f60690.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/64dafa36-397e-4045-9bd8-c9f32ab03fbd/id-ca6f6cdd07d143d2962342b5c7ec92c4/id-e30ce3ec3b27461faee3fc8511c7c8ed/ArchimateDiagramModel_id-b3523f5b-b33b-43b4-beb5-885506f60690.xml
@@ -517,4 +517,10 @@
   <properties
       key="GEMMA thema"
       value="Zaakgericht werken"/>
+  <properties
+      key="Detailniveau"
+      value="Detail"/>
+  <properties
+      key="Scope"
+      value="Gemeente"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/86117b27-b84a-4708-a1fb-caec9d36385f/ArchimateDiagramModel_id-0a0a0012-a46e-457c-8074-c25678a555b0.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/86117b27-b84a-4708-a1fb-caec9d36385f/ArchimateDiagramModel_id-0a0a0012-a46e-457c-8074-c25678a555b0.xml
index 2c2382de5..95dc5224e 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/86117b27-b84a-4708-a1fb-caec9d36385f/ArchimateDiagramModel_id-0a0a0012-a46e-457c-8074-c25678a555b0.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/86117b27-b84a-4708-a1fb-caec9d36385f/ArchimateDiagramModel_id-0a0a0012-a46e-457c-8074-c25678a555b0.xml
@@ -1825,7 +1825,7 @@
       value="Gemeente"/>
   <properties
       key="GEMMA thema"
-      value="Informatie- en archiefbeheer"/>
+      value="Duurzame toegankelijkheid en transparantie"/>
   <properties
       key="Viewtype"
       value="Positionering"/>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/86117b27-b84a-4708-a1fb-caec9d36385f/ArchimateDiagramModel_id-0a7538a6-cfcb-450e-9973-2bce5e656325.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/86117b27-b84a-4708-a1fb-caec9d36385f/ArchimateDiagramModel_id-0a7538a6-cfcb-450e-9973-2bce5e656325.xml
index 2bed680e1..7442451d0 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/86117b27-b84a-4708-a1fb-caec9d36385f/ArchimateDiagramModel_id-0a7538a6-cfcb-450e-9973-2bce5e656325.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/86117b27-b84a-4708-a1fb-caec9d36385f/ArchimateDiagramModel_id-0a7538a6-cfcb-450e-9973-2bce5e656325.xml
@@ -1853,7 +1853,7 @@
       value="Gemeente"/>
   <properties
       key="GEMMA thema"
-      value="Informatie- en archiefbeheer"/>
+      value="Duurzame toegankelijkheid en transparantie"/>
   <properties
       key="Viewtype"
       value="Positionering"/>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/86117b27-b84a-4708-a1fb-caec9d36385f/ArchimateDiagramModel_id-0cb76607-6018-495f-a646-204ce453a190.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/86117b27-b84a-4708-a1fb-caec9d36385f/ArchimateDiagramModel_id-0cb76607-6018-495f-a646-204ce453a190.xml
index a3ff39f1f..d5b24939a 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/86117b27-b84a-4708-a1fb-caec9d36385f/ArchimateDiagramModel_id-0cb76607-6018-495f-a646-204ce453a190.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/86117b27-b84a-4708-a1fb-caec9d36385f/ArchimateDiagramModel_id-0cb76607-6018-495f-a646-204ce453a190.xml
@@ -437,7 +437,7 @@
       value="0cb76607-6018-495f-a646-204ce453a190"/>
   <properties
       key="Detailniveau"
-      value="Detailview"/>
+      value="Detail"/>
   <properties
       key="Publiceren"
       value="GEMMA Online en redactie"/>
@@ -446,7 +446,7 @@
       value="Gemeente"/>
   <properties
       key="GEMMA thema"
-      value="Informatie- en archiefbeheer"/>
+      value="Duurzame toegankelijkheid en transparantie"/>
   <properties
       key="Viewtype"
       value="Context"/>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/86117b27-b84a-4708-a1fb-caec9d36385f/ArchimateDiagramModel_id-414f0a71-1d41-4b10-94d2-074f0f03db7d.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/86117b27-b84a-4708-a1fb-caec9d36385f/ArchimateDiagramModel_id-414f0a71-1d41-4b10-94d2-074f0f03db7d.xml
index 1030402fd..91567ed9e 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/86117b27-b84a-4708-a1fb-caec9d36385f/ArchimateDiagramModel_id-414f0a71-1d41-4b10-94d2-074f0f03db7d.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/86117b27-b84a-4708-a1fb-caec9d36385f/ArchimateDiagramModel_id-414f0a71-1d41-4b10-94d2-074f0f03db7d.xml
@@ -703,7 +703,7 @@
       value="Gemeente"/>
   <properties
       key="GEMMA thema"
-      value="Informatie- en archiefbeheer"/>
+      value="Duurzame toegankelijkheid en transparantie"/>
   <properties
       key="Publiceren"
       value="Niet"/>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/86117b27-b84a-4708-a1fb-caec9d36385f/ArchimateDiagramModel_id-a0a7f622-9630-43a8-80c0-38c5d4c427da.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/86117b27-b84a-4708-a1fb-caec9d36385f/ArchimateDiagramModel_id-a0a7f622-9630-43a8-80c0-38c5d4c427da.xml
index 636058a6e..a5ee5d446 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/86117b27-b84a-4708-a1fb-caec9d36385f/ArchimateDiagramModel_id-a0a7f622-9630-43a8-80c0-38c5d4c427da.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/86117b27-b84a-4708-a1fb-caec9d36385f/ArchimateDiagramModel_id-a0a7f622-9630-43a8-80c0-38c5d4c427da.xml
@@ -492,7 +492,7 @@
       value="a0a7f622-9630-43a8-80c0-38c5d4c427da"/>
   <properties
       key="Detailniveau"
-      value="Geen"/>
+      value="Detail"/>
   <properties
       key="Publiceren"
       value="GEMMA Online en redactie"/>
@@ -501,7 +501,7 @@
       value="Keten"/>
   <properties
       key="GEMMA thema"
-      value="Informatie- en archiefbeheer"/>
+      value="Duurzame toegankelijkheid en transparantie"/>
   <properties
       key="Viewtype"
       value="Illustratie"/>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/db1d5d7a-a3c9-45b5-8386-8a344c4d6113/ArchimateDiagramModel_id-cd0b8ee6-2266-4d2a-9a35-292f50982d0c.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/db1d5d7a-a3c9-45b5-8386-8a344c4d6113/ArchimateDiagramModel_id-cd0b8ee6-2266-4d2a-9a35-292f50982d0c.xml
index d2e44576b..380c5b04d 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/db1d5d7a-a3c9-45b5-8386-8a344c4d6113/ArchimateDiagramModel_id-cd0b8ee6-2266-4d2a-9a35-292f50982d0c.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/db1d5d7a-a3c9-45b5-8386-8a344c4d6113/ArchimateDiagramModel_id-cd0b8ee6-2266-4d2a-9a35-292f50982d0c.xml
@@ -832,7 +832,7 @@
       value="GEMMA Online en redactie"/>
   <properties
       key="GEMMA thema"
-      value="Gegevensmanagement"/>
+      value="Data"/>
   <properties
       key="Viewtype"
       value="Illustratie"/>
@@ -842,4 +842,10 @@
   <properties
       key="Domein"
       value="Niet domeingebonden"/>
+  <properties
+      key="Detailniveau"
+      value="Detail"/>
+  <properties
+      key="Scope"
+      value="Gemeente"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-01385128fe4a428488d2905b35d12e29/ArchimateDiagramModel_id-1a579ffe066e47b28760fc66f4f385cd.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-01385128fe4a428488d2905b35d12e29/ArchimateDiagramModel_id-1a579ffe066e47b28760fc66f4f385cd.xml
index 27f260325..4c366fe4e 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-01385128fe4a428488d2905b35d12e29/ArchimateDiagramModel_id-1a579ffe066e47b28760fc66f4f385cd.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-01385128fe4a428488d2905b35d12e29/ArchimateDiagramModel_id-1a579ffe066e47b28760fc66f4f385cd.xml
@@ -164,4 +164,10 @@
   <properties
       key="Publiceren"
       value="GEMMA Online en redactie"/>
+  <properties
+      key="Detailniveau"
+      value="Detail"/>
+  <properties
+      key="Scope"
+      value="Gemeente"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-01385128fe4a428488d2905b35d12e29/ArchimateDiagramModel_id-1d07989394264ace8fe75285d1b98107.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-01385128fe4a428488d2905b35d12e29/ArchimateDiagramModel_id-1d07989394264ace8fe75285d1b98107.xml
index 8136b375b..146af0e66 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-01385128fe4a428488d2905b35d12e29/ArchimateDiagramModel_id-1d07989394264ace8fe75285d1b98107.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-01385128fe4a428488d2905b35d12e29/ArchimateDiagramModel_id-1d07989394264ace8fe75285d1b98107.xml
@@ -216,4 +216,10 @@
   <properties
       key="Publiceren"
       value="GEMMA Online en redactie"/>
+  <properties
+      key="Detailniveau"
+      value="Detail"/>
+  <properties
+      key="Scope"
+      value="Gemeente"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-01385128fe4a428488d2905b35d12e29/ArchimateDiagramModel_id-2eed0047177e48ca860b18384ea83265.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-01385128fe4a428488d2905b35d12e29/ArchimateDiagramModel_id-2eed0047177e48ca860b18384ea83265.xml
index ed9e03a70..1bde82547 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-01385128fe4a428488d2905b35d12e29/ArchimateDiagramModel_id-2eed0047177e48ca860b18384ea83265.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-01385128fe4a428488d2905b35d12e29/ArchimateDiagramModel_id-2eed0047177e48ca860b18384ea83265.xml
@@ -1,7 +1,7 @@
 <archimate:ArchimateDiagramModel
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns:archimate="http://www.archimatetool.com/archimate"
-    name="Common Ground vijflaagsmodel rollen en silo-systemen "
+    name="Common Ground vijflaagsmodel rollen en silo-systemen"
     id="id-2eed0047177e48ca860b18384ea83265"
     documentation="Illustratie hoe de huidige informatiesystemen als 'silo' niet voldoen aan de scheiding van verantwoordelijkheden in het Common Ground 5-laagsmodel">
   <children
@@ -513,4 +513,10 @@
   <properties
       key="Publiceren"
       value="GEMMA Online en redactie"/>
+  <properties
+      key="Detailniveau"
+      value="Detail"/>
+  <properties
+      key="Scope"
+      value="Gemeente"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-01385128fe4a428488d2905b35d12e29/ArchimateDiagramModel_id-5b3478c902364cbc8aecf8de07e72781.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-01385128fe4a428488d2905b35d12e29/ArchimateDiagramModel_id-5b3478c902364cbc8aecf8de07e72781.xml
index d1ce15434..d70d9411e 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-01385128fe4a428488d2905b35d12e29/ArchimateDiagramModel_id-5b3478c902364cbc8aecf8de07e72781.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-01385128fe4a428488d2905b35d12e29/ArchimateDiagramModel_id-5b3478c902364cbc8aecf8de07e72781.xml
@@ -182,7 +182,7 @@
       value="Keten"/>
   <properties
       key="Viewtype"
-      value="Architectuurmodel"/>
+      value="Illustratie"/>
   <properties
       key="GEMMA thema"
       value="Common Ground"/>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-01385128fe4a428488d2905b35d12e29/ArchimateDiagramModel_id-63409225ff6842adbf145abedcc57577.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-01385128fe4a428488d2905b35d12e29/ArchimateDiagramModel_id-63409225ff6842adbf145abedcc57577.xml
index 6852d5a03..e4ed4ce72 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-01385128fe4a428488d2905b35d12e29/ArchimateDiagramModel_id-63409225ff6842adbf145abedcc57577.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-01385128fe4a428488d2905b35d12e29/ArchimateDiagramModel_id-63409225ff6842adbf145abedcc57577.xml
@@ -139,4 +139,10 @@
   <properties
       key="Publiceren"
       value="GEMMA Online en redactie"/>
+  <properties
+      key="Detailniveau"
+      value="Detail"/>
+  <properties
+      key="Scope"
+      value="Gemeente"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-01385128fe4a428488d2905b35d12e29/ArchimateDiagramModel_id-9b03b18f18ed41d599e0485ac09f6188.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-01385128fe4a428488d2905b35d12e29/ArchimateDiagramModel_id-9b03b18f18ed41d599e0485ac09f6188.xml
index c4caf9654..6bbdecc3a 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-01385128fe4a428488d2905b35d12e29/ArchimateDiagramModel_id-9b03b18f18ed41d599e0485ac09f6188.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-01385128fe4a428488d2905b35d12e29/ArchimateDiagramModel_id-9b03b18f18ed41d599e0485ac09f6188.xml
@@ -60,7 +60,7 @@
       value="Keten"/>
   <properties
       key="Viewtype"
-      value="Architectuurmodel"/>
+      value="Illustratie"/>
   <properties
       key="GEMMA thema"
       value="Common Ground"/>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-01385128fe4a428488d2905b35d12e29/ArchimateDiagramModel_id-a1e2c81e48864ab8b3445eefea1ffb6d.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-01385128fe4a428488d2905b35d12e29/ArchimateDiagramModel_id-a1e2c81e48864ab8b3445eefea1ffb6d.xml
index 31cb046d9..09880318d 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-01385128fe4a428488d2905b35d12e29/ArchimateDiagramModel_id-a1e2c81e48864ab8b3445eefea1ffb6d.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-01385128fe4a428488d2905b35d12e29/ArchimateDiagramModel_id-a1e2c81e48864ab8b3445eefea1ffb6d.xml
@@ -85,7 +85,7 @@
       value="Keten"/>
   <properties
       key="Viewtype"
-      value="Architectuurmodel"/>
+      value="Illustratie"/>
   <properties
       key="GEMMA thema"
       value="Common Ground"/>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-01385128fe4a428488d2905b35d12e29/ArchimateDiagramModel_id-d38cbf6b0233497eace1e40837fec453.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-01385128fe4a428488d2905b35d12e29/ArchimateDiagramModel_id-d38cbf6b0233497eace1e40837fec453.xml
index 0d84170f4..7f6e9c934 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-01385128fe4a428488d2905b35d12e29/ArchimateDiagramModel_id-d38cbf6b0233497eace1e40837fec453.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-01385128fe4a428488d2905b35d12e29/ArchimateDiagramModel_id-d38cbf6b0233497eace1e40837fec453.xml
@@ -191,4 +191,10 @@
   <properties
       key="Publiceren"
       value="GEMMA Online en redactie"/>
+  <properties
+      key="Detailniveau"
+      value="Detail"/>
+  <properties
+      key="Scope"
+      value="Gemeente"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-01385128fe4a428488d2905b35d12e29/ArchimateDiagramModel_id-ea767038c51d4cb0ab23252a2c9e3094.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-01385128fe4a428488d2905b35d12e29/ArchimateDiagramModel_id-ea767038c51d4cb0ab23252a2c9e3094.xml
index 1aff01b16..854987e8d 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-01385128fe4a428488d2905b35d12e29/ArchimateDiagramModel_id-ea767038c51d4cb0ab23252a2c9e3094.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-01385128fe4a428488d2905b35d12e29/ArchimateDiagramModel_id-ea767038c51d4cb0ab23252a2c9e3094.xml
@@ -339,4 +339,10 @@
   <properties
       key="Publiceren"
       value="GEMMA Online en redactie"/>
+  <properties
+      key="Detailniveau"
+      value="Detail"/>
+  <properties
+      key="Scope"
+      value="Gemeente"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-01385128fe4a428488d2905b35d12e29/ArchimateDiagramModel_id-ffb4684a5e034d7481158ac2318f5628.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-01385128fe4a428488d2905b35d12e29/ArchimateDiagramModel_id-ffb4684a5e034d7481158ac2318f5628.xml
index 82a0eb449..4df93f28d 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-01385128fe4a428488d2905b35d12e29/ArchimateDiagramModel_id-ffb4684a5e034d7481158ac2318f5628.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-01385128fe4a428488d2905b35d12e29/ArchimateDiagramModel_id-ffb4684a5e034d7481158ac2318f5628.xml
@@ -202,4 +202,10 @@
   <properties
       key="Publiceren"
       value="GEMMA Online en redactie"/>
+  <properties
+      key="Detailniveau"
+      value="Detail"/>
+  <properties
+      key="Scope"
+      value="Gemeente"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/04ecc860-79c0-4868-91cb-b009077e7780/4487a6cc-a954-494f-9c66-9eedaff6dc19/ArchimateDiagramModel_id-4e35b9ae-e969-4a40-8573-31f566c553c6.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/04ecc860-79c0-4868-91cb-b009077e7780/4487a6cc-a954-494f-9c66-9eedaff6dc19/ArchimateDiagramModel_id-4e35b9ae-e969-4a40-8573-31f566c553c6.xml
index 14ff0c6a9..4e75b031a 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/04ecc860-79c0-4868-91cb-b009077e7780/4487a6cc-a954-494f-9c66-9eedaff6dc19/ArchimateDiagramModel_id-4e35b9ae-e969-4a40-8573-31f566c553c6.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/04ecc860-79c0-4868-91cb-b009077e7780/4487a6cc-a954-494f-9c66-9eedaff6dc19/ArchimateDiagramModel_id-4e35b9ae-e969-4a40-8573-31f566c553c6.xml
@@ -148,11 +148,17 @@
       value="Patroon"/>
   <properties
       key="GEMMA thema"
-      value="Geen"/>
+      value="Verbinden"/>
   <properties
       key="Architectuurlaag"
       value="Applicatiearchitectuur"/>
   <properties
       key="Domein"
       value="Niet domeingebonden"/>
+  <properties
+      key="Detailniveau"
+      value="Samenhang"/>
+  <properties
+      key="Scope"
+      value="Gemeente"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/04ecc860-79c0-4868-91cb-b009077e7780/4487a6cc-a954-494f-9c66-9eedaff6dc19/ArchimateDiagramModel_id-6d6006a5-dec6-4598-b75a-bc1de967aa17.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/04ecc860-79c0-4868-91cb-b009077e7780/4487a6cc-a954-494f-9c66-9eedaff6dc19/ArchimateDiagramModel_id-6d6006a5-dec6-4598-b75a-bc1de967aa17.xml
index c2dec9d38..5532daedb 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/04ecc860-79c0-4868-91cb-b009077e7780/4487a6cc-a954-494f-9c66-9eedaff6dc19/ArchimateDiagramModel_id-6d6006a5-dec6-4598-b75a-bc1de967aa17.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/04ecc860-79c0-4868-91cb-b009077e7780/4487a6cc-a954-494f-9c66-9eedaff6dc19/ArchimateDiagramModel_id-6d6006a5-dec6-4598-b75a-bc1de967aa17.xml
@@ -155,7 +155,7 @@
       value="GEMMA Online en redactie"/>
   <properties
       key="GEMMA thema"
-      value="Geen"/>
+      value="Verbinden"/>
   <properties
       key="Viewtype"
       value="Patroon"/>
@@ -165,4 +165,10 @@
   <properties
       key="Domein"
       value="Niet domeingebonden"/>
+  <properties
+      key="Detailniveau"
+      value="Samenhang"/>
+  <properties
+      key="Scope"
+      value="Gemeente"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/04ecc860-79c0-4868-91cb-b009077e7780/4487a6cc-a954-494f-9c66-9eedaff6dc19/ArchimateDiagramModel_id-a5f05be0-1578-434e-a844-c79316c50350.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/04ecc860-79c0-4868-91cb-b009077e7780/4487a6cc-a954-494f-9c66-9eedaff6dc19/ArchimateDiagramModel_id-a5f05be0-1578-434e-a844-c79316c50350.xml
index d2edd8e98..a07fa214d 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/04ecc860-79c0-4868-91cb-b009077e7780/4487a6cc-a954-494f-9c66-9eedaff6dc19/ArchimateDiagramModel_id-a5f05be0-1578-434e-a844-c79316c50350.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/04ecc860-79c0-4868-91cb-b009077e7780/4487a6cc-a954-494f-9c66-9eedaff6dc19/ArchimateDiagramModel_id-a5f05be0-1578-434e-a844-c79316c50350.xml
@@ -367,16 +367,16 @@
       value="a5f05be0-1578-434e-a844-c79316c50350"/>
   <properties
       key="Detailniveau"
-      value="Geen"/>
+      value="Samenhang"/>
   <properties
       key="Publiceren"
       value="GEMMA Online en redactie"/>
   <properties
       key="Scope"
-      value="Geen"/>
+      value="Gemeente"/>
   <properties
       key="GEMMA thema"
-      value="Geen"/>
+      value="Verbinden"/>
   <properties
       key="Viewtype"
       value="Patroon"/>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/04ecc860-79c0-4868-91cb-b009077e7780/4487a6cc-a954-494f-9c66-9eedaff6dc19/ArchimateDiagramModel_id-c2fdd145-effe-470f-bba3-7891cc6cc3f4.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/04ecc860-79c0-4868-91cb-b009077e7780/4487a6cc-a954-494f-9c66-9eedaff6dc19/ArchimateDiagramModel_id-c2fdd145-effe-470f-bba3-7891cc6cc3f4.xml
index 3246bb21b..52f00b7c0 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/04ecc860-79c0-4868-91cb-b009077e7780/4487a6cc-a954-494f-9c66-9eedaff6dc19/ArchimateDiagramModel_id-c2fdd145-effe-470f-bba3-7891cc6cc3f4.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/04ecc860-79c0-4868-91cb-b009077e7780/4487a6cc-a954-494f-9c66-9eedaff6dc19/ArchimateDiagramModel_id-c2fdd145-effe-470f-bba3-7891cc6cc3f4.xml
@@ -287,11 +287,17 @@
       value="Patroon"/>
   <properties
       key="GEMMA thema"
-      value="Geen"/>
+      value="Verbinden"/>
   <properties
       key="Architectuurlaag"
       value="Applicatiearchitectuur"/>
   <properties
       key="Domein"
       value="Niet domeingebonden"/>
+  <properties
+      key="Detailniveau"
+      value="Samenhang"/>
+  <properties
+      key="Scope"
+      value="Gemeente"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/04ecc860-79c0-4868-91cb-b009077e7780/4487a6cc-a954-494f-9c66-9eedaff6dc19/ArchimateDiagramModel_id-e31983fd-2ca7-4134-9fda-0a11457c7167.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/04ecc860-79c0-4868-91cb-b009077e7780/4487a6cc-a954-494f-9c66-9eedaff6dc19/ArchimateDiagramModel_id-e31983fd-2ca7-4134-9fda-0a11457c7167.xml
index 30a3af234..772de44b3 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/04ecc860-79c0-4868-91cb-b009077e7780/4487a6cc-a954-494f-9c66-9eedaff6dc19/ArchimateDiagramModel_id-e31983fd-2ca7-4134-9fda-0a11457c7167.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/04ecc860-79c0-4868-91cb-b009077e7780/4487a6cc-a954-494f-9c66-9eedaff6dc19/ArchimateDiagramModel_id-e31983fd-2ca7-4134-9fda-0a11457c7167.xml
@@ -667,4 +667,13 @@
   <properties
       key="Domein"
       value="Niet domeingebonden"/>
+  <properties
+      key="Detailniveau"
+      value="Samenhang"/>
+  <properties
+      key="Scope"
+      value="Gemeente"/>
+  <properties
+      key="GEMMA thema"
+      value="Verbinden"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/04ecc860-79c0-4868-91cb-b009077e7780/69a689a0-b455-4001-91cf-3706980ada06/ArchimateDiagramModel_id-27ff5502-aa02-4c34-b6e8-c79396ba6ecb.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/04ecc860-79c0-4868-91cb-b009077e7780/69a689a0-b455-4001-91cf-3706980ada06/ArchimateDiagramModel_id-27ff5502-aa02-4c34-b6e8-c79396ba6ecb.xml
index 6e7123f00..aec373728 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/04ecc860-79c0-4868-91cb-b009077e7780/69a689a0-b455-4001-91cf-3706980ada06/ArchimateDiagramModel_id-27ff5502-aa02-4c34-b6e8-c79396ba6ecb.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/04ecc860-79c0-4868-91cb-b009077e7780/69a689a0-b455-4001-91cf-3706980ada06/ArchimateDiagramModel_id-27ff5502-aa02-4c34-b6e8-c79396ba6ecb.xml
@@ -339,7 +339,7 @@
       value="GEMMA Online en redactie"/>
   <properties
       key="GEMMA thema"
-      value="Katern - Verbinden"/>
+      value="Verbinden"/>
   <properties
       key="Viewtype"
       value="Patroon"/>
@@ -349,4 +349,10 @@
   <properties
       key="Domein"
       value="Niet domeingebonden"/>
+  <properties
+      key="Detailniveau"
+      value="Samenhang"/>
+  <properties
+      key="Scope"
+      value="Gemeente"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/04ecc860-79c0-4868-91cb-b009077e7780/69a689a0-b455-4001-91cf-3706980ada06/ArchimateDiagramModel_id-7e39d8ea-686b-4957-aa6b-c21bbb14d2b3.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/04ecc860-79c0-4868-91cb-b009077e7780/69a689a0-b455-4001-91cf-3706980ada06/ArchimateDiagramModel_id-7e39d8ea-686b-4957-aa6b-c21bbb14d2b3.xml
index 16e02e13c..c07580b15 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/04ecc860-79c0-4868-91cb-b009077e7780/69a689a0-b455-4001-91cf-3706980ada06/ArchimateDiagramModel_id-7e39d8ea-686b-4957-aa6b-c21bbb14d2b3.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/04ecc860-79c0-4868-91cb-b009077e7780/69a689a0-b455-4001-91cf-3706980ada06/ArchimateDiagramModel_id-7e39d8ea-686b-4957-aa6b-c21bbb14d2b3.xml
@@ -233,7 +233,7 @@
       value="GEMMA Online en redactie"/>
   <properties
       key="GEMMA thema"
-      value="Katern - Verbinden"/>
+      value="Verbinden"/>
   <properties
       key="Viewtype"
       value="Patroon"/>
@@ -243,4 +243,10 @@
   <properties
       key="Domein"
       value="Niet domeingebonden"/>
+  <properties
+      key="Detailniveau"
+      value="Samenhang"/>
+  <properties
+      key="Scope"
+      value="Gemeente"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/04ecc860-79c0-4868-91cb-b009077e7780/69a689a0-b455-4001-91cf-3706980ada06/ArchimateDiagramModel_id-9281f5c3-2997-4f2b-a157-72caf5a0e7eb.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/04ecc860-79c0-4868-91cb-b009077e7780/69a689a0-b455-4001-91cf-3706980ada06/ArchimateDiagramModel_id-9281f5c3-2997-4f2b-a157-72caf5a0e7eb.xml
index 2501d8ba1..da86175cb 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/04ecc860-79c0-4868-91cb-b009077e7780/69a689a0-b455-4001-91cf-3706980ada06/ArchimateDiagramModel_id-9281f5c3-2997-4f2b-a157-72caf5a0e7eb.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/04ecc860-79c0-4868-91cb-b009077e7780/69a689a0-b455-4001-91cf-3706980ada06/ArchimateDiagramModel_id-9281f5c3-2997-4f2b-a157-72caf5a0e7eb.xml
@@ -145,7 +145,7 @@
       value="GEMMA Online en redactie"/>
   <properties
       key="GEMMA thema"
-      value="Katern - Verbinden"/>
+      value="Verbinden"/>
   <properties
       key="Viewtype"
       value="Patroon"/>
@@ -155,4 +155,10 @@
   <properties
       key="Domein"
       value="Niet domeingebonden"/>
+  <properties
+      key="Detailniveau"
+      value="Samenhang"/>
+  <properties
+      key="Scope"
+      value="Gemeente"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/04ecc860-79c0-4868-91cb-b009077e7780/69a689a0-b455-4001-91cf-3706980ada06/ArchimateDiagramModel_id-9dcd76c9-8a18-4ea3-b273-ab1fd08f1244.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/04ecc860-79c0-4868-91cb-b009077e7780/69a689a0-b455-4001-91cf-3706980ada06/ArchimateDiagramModel_id-9dcd76c9-8a18-4ea3-b273-ab1fd08f1244.xml
index 0ca9889b2..f36175ad2 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/04ecc860-79c0-4868-91cb-b009077e7780/69a689a0-b455-4001-91cf-3706980ada06/ArchimateDiagramModel_id-9dcd76c9-8a18-4ea3-b273-ab1fd08f1244.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/04ecc860-79c0-4868-91cb-b009077e7780/69a689a0-b455-4001-91cf-3706980ada06/ArchimateDiagramModel_id-9dcd76c9-8a18-4ea3-b273-ab1fd08f1244.xml
@@ -87,7 +87,7 @@
       value="GEMMA Online en redactie"/>
   <properties
       key="GEMMA thema"
-      value="Katern - Verbinden"/>
+      value="Verbinden"/>
   <properties
       key="Viewtype"
       value="Patroon"/>
@@ -97,4 +97,10 @@
   <properties
       key="Domein"
       value="Niet domeingebonden"/>
+  <properties
+      key="Detailniveau"
+      value="Samenhang"/>
+  <properties
+      key="Scope"
+      value="Gemeente"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/04ecc860-79c0-4868-91cb-b009077e7780/69a689a0-b455-4001-91cf-3706980ada06/ArchimateDiagramModel_id-b90836bb-347f-4243-a214-74cb76bd1fce.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/04ecc860-79c0-4868-91cb-b009077e7780/69a689a0-b455-4001-91cf-3706980ada06/ArchimateDiagramModel_id-b90836bb-347f-4243-a214-74cb76bd1fce.xml
index 4075eb77d..ca8594676 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/04ecc860-79c0-4868-91cb-b009077e7780/69a689a0-b455-4001-91cf-3706980ada06/ArchimateDiagramModel_id-b90836bb-347f-4243-a214-74cb76bd1fce.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/04ecc860-79c0-4868-91cb-b009077e7780/69a689a0-b455-4001-91cf-3706980ada06/ArchimateDiagramModel_id-b90836bb-347f-4243-a214-74cb76bd1fce.xml
@@ -113,7 +113,7 @@
       value="GEMMA Online en redactie"/>
   <properties
       key="GEMMA thema"
-      value="Katern - Verbinden"/>
+      value="Verbinden"/>
   <properties
       key="Viewtype"
       value="Patroon"/>
@@ -123,4 +123,10 @@
   <properties
       key="Domein"
       value="Niet domeingebonden"/>
+  <properties
+      key="Detailniveau"
+      value="Samenhang"/>
+  <properties
+      key="Scope"
+      value="Gemeente"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/04ecc860-79c0-4868-91cb-b009077e7780/69a689a0-b455-4001-91cf-3706980ada06/ArchimateDiagramModel_id-cd129987-b670-420a-905d-10c8d27373e6.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/04ecc860-79c0-4868-91cb-b009077e7780/69a689a0-b455-4001-91cf-3706980ada06/ArchimateDiagramModel_id-cd129987-b670-420a-905d-10c8d27373e6.xml
index be69afdcd..68e98f926 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/04ecc860-79c0-4868-91cb-b009077e7780/69a689a0-b455-4001-91cf-3706980ada06/ArchimateDiagramModel_id-cd129987-b670-420a-905d-10c8d27373e6.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/04ecc860-79c0-4868-91cb-b009077e7780/69a689a0-b455-4001-91cf-3706980ada06/ArchimateDiagramModel_id-cd129987-b670-420a-905d-10c8d27373e6.xml
@@ -364,7 +364,7 @@
       value="GEMMA Online en redactie"/>
   <properties
       key="GEMMA thema"
-      value="Katern - Verbinden"/>
+      value="Verbinden"/>
   <properties
       key="Viewtype"
       value="Patroon"/>
@@ -374,4 +374,10 @@
   <properties
       key="Domein"
       value="Niet domeingebonden"/>
+  <properties
+      key="Detailniveau"
+      value="Samenhang"/>
+  <properties
+      key="Scope"
+      value="Gemeente"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/a3499319-6178-4bae-8893-ff2d3f88a8ad/ArchimateDiagramModel_id-5bea871c-140c-42f7-839d-ce0c30a4e317.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/a3499319-6178-4bae-8893-ff2d3f88a8ad/ArchimateDiagramModel_id-5bea871c-140c-42f7-839d-ce0c30a4e317.xml
index dca2fd2f9..2c9bce8fd 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/a3499319-6178-4bae-8893-ff2d3f88a8ad/ArchimateDiagramModel_id-5bea871c-140c-42f7-839d-ce0c30a4e317.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/a3499319-6178-4bae-8893-ff2d3f88a8ad/ArchimateDiagramModel_id-5bea871c-140c-42f7-839d-ce0c30a4e317.xml
@@ -1934,7 +1934,7 @@
       value="Gemeente"/>
   <properties
       key="GEMMA thema"
-      value="Katern - Verbinden"/>
+      value="Verbinden"/>
   <properties
       key="Viewtype"
       value="Positionering"/>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/a3499319-6178-4bae-8893-ff2d3f88a8ad/ArchimateDiagramModel_id-5d2e69e3-5da4-4ede-ac03-164c4a2a11bb.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/a3499319-6178-4bae-8893-ff2d3f88a8ad/ArchimateDiagramModel_id-5d2e69e3-5da4-4ede-ac03-164c4a2a11bb.xml
index 7d6297802..53dd10e18 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/a3499319-6178-4bae-8893-ff2d3f88a8ad/ArchimateDiagramModel_id-5d2e69e3-5da4-4ede-ac03-164c4a2a11bb.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/a3499319-6178-4bae-8893-ff2d3f88a8ad/ArchimateDiagramModel_id-5d2e69e3-5da4-4ede-ac03-164c4a2a11bb.xml
@@ -1934,7 +1934,7 @@
       value="Gemeente"/>
   <properties
       key="GEMMA thema"
-      value="Katern - Verbinden"/>
+      value="Verbinden"/>
   <properties
       key="Viewtype"
       value="Positionering"/>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/a3499319-6178-4bae-8893-ff2d3f88a8ad/ArchimateDiagramModel_id-6c514805-d5f9-4504-bc9e-deace02cd93e.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/a3499319-6178-4bae-8893-ff2d3f88a8ad/ArchimateDiagramModel_id-6c514805-d5f9-4504-bc9e-deace02cd93e.xml
index 320d833e5..16dcbc011 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/a3499319-6178-4bae-8893-ff2d3f88a8ad/ArchimateDiagramModel_id-6c514805-d5f9-4504-bc9e-deace02cd93e.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/a3499319-6178-4bae-8893-ff2d3f88a8ad/ArchimateDiagramModel_id-6c514805-d5f9-4504-bc9e-deace02cd93e.xml
@@ -3187,7 +3187,7 @@
       value="Gemeente"/>
   <properties
       key="GEMMA thema"
-      value="Katern - Verbinden"/>
+      value="Verbinden"/>
   <properties
       key="Viewtype"
       value="Positionering"/>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/a3499319-6178-4bae-8893-ff2d3f88a8ad/ArchimateDiagramModel_id-f0be3f48-e3b2-4ad8-9728-ef83d1ea12a3.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/a3499319-6178-4bae-8893-ff2d3f88a8ad/ArchimateDiagramModel_id-f0be3f48-e3b2-4ad8-9728-ef83d1ea12a3.xml
index 732bc8cd7..7d0f90281 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/a3499319-6178-4bae-8893-ff2d3f88a8ad/ArchimateDiagramModel_id-f0be3f48-e3b2-4ad8-9728-ef83d1ea12a3.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/a3499319-6178-4bae-8893-ff2d3f88a8ad/ArchimateDiagramModel_id-f0be3f48-e3b2-4ad8-9728-ef83d1ea12a3.xml
@@ -1934,7 +1934,7 @@
       value="Gemeente"/>
   <properties
       key="GEMMA thema"
-      value="Katern - Verbinden"/>
+      value="Verbinden"/>
   <properties
       key="Viewtype"
       value="Positionering"/>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/d186fcff-fdd4-4a79-9f71-e3938d95f76a/ArchimateDiagramModel_id-085fd8d8-f212-477f-bf80-daa377214477.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/d186fcff-fdd4-4a79-9f71-e3938d95f76a/ArchimateDiagramModel_id-085fd8d8-f212-477f-bf80-daa377214477.xml
index d1b7ae46f..7469e87a1 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/d186fcff-fdd4-4a79-9f71-e3938d95f76a/ArchimateDiagramModel_id-085fd8d8-f212-477f-bf80-daa377214477.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/d186fcff-fdd4-4a79-9f71-e3938d95f76a/ArchimateDiagramModel_id-085fd8d8-f212-477f-bf80-daa377214477.xml
@@ -251,7 +251,7 @@
       value="GEMMA Online en redactie"/>
   <properties
       key="GEMMA thema"
-      value="Katern - Verbinden"/>
+      value="Verbinden"/>
   <properties
       key="Viewtype"
       value="Illustratie"/>
@@ -261,4 +261,10 @@
   <properties
       key="Domein"
       value="Niet domeingebonden"/>
+  <properties
+      key="Detailniveau"
+      value="Samenhang"/>
+  <properties
+      key="Scope"
+      value="Gemeente"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/d186fcff-fdd4-4a79-9f71-e3938d95f76a/ArchimateDiagramModel_id-12e4a7ef-44e4-4995-96fc-4eadef8e986c.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/d186fcff-fdd4-4a79-9f71-e3938d95f76a/ArchimateDiagramModel_id-12e4a7ef-44e4-4995-96fc-4eadef8e986c.xml
index 75f148967..e09192a81 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/d186fcff-fdd4-4a79-9f71-e3938d95f76a/ArchimateDiagramModel_id-12e4a7ef-44e4-4995-96fc-4eadef8e986c.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/d186fcff-fdd4-4a79-9f71-e3938d95f76a/ArchimateDiagramModel_id-12e4a7ef-44e4-4995-96fc-4eadef8e986c.xml
@@ -152,7 +152,7 @@
       value="GEMMA Online en redactie"/>
   <properties
       key="GEMMA thema"
-      value="Katern - Verbinden"/>
+      value="Verbinden"/>
   <properties
       key="Viewtype"
       value="Illustratie"/>
@@ -162,4 +162,10 @@
   <properties
       key="Domein"
       value="Niet domeingebonden"/>
+  <properties
+      key="Detailniveau"
+      value="Samenhang"/>
+  <properties
+      key="Scope"
+      value="Gemeente"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/d186fcff-fdd4-4a79-9f71-e3938d95f76a/ArchimateDiagramModel_id-30b9db52-e68b-4d36-b2e2-738ebdd8c1d9.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/d186fcff-fdd4-4a79-9f71-e3938d95f76a/ArchimateDiagramModel_id-30b9db52-e68b-4d36-b2e2-738ebdd8c1d9.xml
index f923d1dc1..051eb7c95 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/d186fcff-fdd4-4a79-9f71-e3938d95f76a/ArchimateDiagramModel_id-30b9db52-e68b-4d36-b2e2-738ebdd8c1d9.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/d186fcff-fdd4-4a79-9f71-e3938d95f76a/ArchimateDiagramModel_id-30b9db52-e68b-4d36-b2e2-738ebdd8c1d9.xml
@@ -115,7 +115,7 @@
       value="GEMMA Online en redactie"/>
   <properties
       key="GEMMA thema"
-      value="Katern - Verbinden"/>
+      value="Verbinden"/>
   <properties
       key="Viewtype"
       value="Illustratie"/>
@@ -125,4 +125,10 @@
   <properties
       key="Domein"
       value="Niet domeingebonden"/>
+  <properties
+      key="Detailniveau"
+      value="Samenhang"/>
+  <properties
+      key="Scope"
+      value="Gemeente"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/d186fcff-fdd4-4a79-9f71-e3938d95f76a/ArchimateDiagramModel_id-36304e01-624a-4cee-8134-93bddf695690.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/d186fcff-fdd4-4a79-9f71-e3938d95f76a/ArchimateDiagramModel_id-36304e01-624a-4cee-8134-93bddf695690.xml
index b03ce5abd..1e6dd4b0d 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/d186fcff-fdd4-4a79-9f71-e3938d95f76a/ArchimateDiagramModel_id-36304e01-624a-4cee-8134-93bddf695690.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/d186fcff-fdd4-4a79-9f71-e3938d95f76a/ArchimateDiagramModel_id-36304e01-624a-4cee-8134-93bddf695690.xml
@@ -210,7 +210,7 @@
       value="GEMMA Online en redactie"/>
   <properties
       key="GEMMA thema"
-      value="Katern - Verbinden"/>
+      value="Verbinden"/>
   <properties
       key="Viewtype"
       value="Illustratie"/>
@@ -220,4 +220,10 @@
   <properties
       key="Domein"
       value="Niet domeingebonden"/>
+  <properties
+      key="Detailniveau"
+      value="Samenhang"/>
+  <properties
+      key="Scope"
+      value="Gemeente"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/d186fcff-fdd4-4a79-9f71-e3938d95f76a/ArchimateDiagramModel_id-51b8a36c-fc15-422b-ad5f-ad63d1874e59.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/d186fcff-fdd4-4a79-9f71-e3938d95f76a/ArchimateDiagramModel_id-51b8a36c-fc15-422b-ad5f-ad63d1874e59.xml
index b98174754..d016a6058 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/d186fcff-fdd4-4a79-9f71-e3938d95f76a/ArchimateDiagramModel_id-51b8a36c-fc15-422b-ad5f-ad63d1874e59.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/d186fcff-fdd4-4a79-9f71-e3938d95f76a/ArchimateDiagramModel_id-51b8a36c-fc15-422b-ad5f-ad63d1874e59.xml
@@ -181,7 +181,7 @@
       value="GEMMA Online en redactie"/>
   <properties
       key="GEMMA thema"
-      value="Katern - Verbinden"/>
+      value="Verbinden"/>
   <properties
       key="Viewtype"
       value="Illustratie"/>
@@ -191,4 +191,10 @@
   <properties
       key="Domein"
       value="Niet domeingebonden"/>
+  <properties
+      key="Detailniveau"
+      value="Samenhang"/>
+  <properties
+      key="Scope"
+      value="Gemeente"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/d186fcff-fdd4-4a79-9f71-e3938d95f76a/ArchimateDiagramModel_id-62ded185-6492-4a08-b365-73def7acc562.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/d186fcff-fdd4-4a79-9f71-e3938d95f76a/ArchimateDiagramModel_id-62ded185-6492-4a08-b365-73def7acc562.xml
index 278767f1e..6b1dafaf8 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/d186fcff-fdd4-4a79-9f71-e3938d95f76a/ArchimateDiagramModel_id-62ded185-6492-4a08-b365-73def7acc562.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/d186fcff-fdd4-4a79-9f71-e3938d95f76a/ArchimateDiagramModel_id-62ded185-6492-4a08-b365-73def7acc562.xml
@@ -152,7 +152,7 @@
       value="GEMMA Online en redactie"/>
   <properties
       key="GEMMA thema"
-      value="Katern - Verbinden"/>
+      value="Verbinden"/>
   <properties
       key="Viewtype"
       value="Illustratie"/>
@@ -162,4 +162,10 @@
   <properties
       key="Domein"
       value="Niet domeingebonden"/>
+  <properties
+      key="Detailniveau"
+      value="Samenhang"/>
+  <properties
+      key="Scope"
+      value="Gemeente"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/d186fcff-fdd4-4a79-9f71-e3938d95f76a/ArchimateDiagramModel_id-64fcec62-9e82-4646-a73b-cefda87ebbd0.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/d186fcff-fdd4-4a79-9f71-e3938d95f76a/ArchimateDiagramModel_id-64fcec62-9e82-4646-a73b-cefda87ebbd0.xml
index d6964778b..b74589986 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/d186fcff-fdd4-4a79-9f71-e3938d95f76a/ArchimateDiagramModel_id-64fcec62-9e82-4646-a73b-cefda87ebbd0.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/d186fcff-fdd4-4a79-9f71-e3938d95f76a/ArchimateDiagramModel_id-64fcec62-9e82-4646-a73b-cefda87ebbd0.xml
@@ -288,7 +288,7 @@
       value="GEMMA Online en redactie"/>
   <properties
       key="GEMMA thema"
-      value="Katern - Verbinden"/>
+      value="Verbinden"/>
   <properties
       key="Viewtype"
       value="Illustratie"/>
@@ -298,4 +298,10 @@
   <properties
       key="Domein"
       value="Niet domeingebonden"/>
+  <properties
+      key="Detailniveau"
+      value="Samenhang"/>
+  <properties
+      key="Scope"
+      value="Gemeente"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/d186fcff-fdd4-4a79-9f71-e3938d95f76a/ArchimateDiagramModel_id-af2f4c8b-9c6c-4821-bd5a-f49a89df6697.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/d186fcff-fdd4-4a79-9f71-e3938d95f76a/ArchimateDiagramModel_id-af2f4c8b-9c6c-4821-bd5a-f49a89df6697.xml
index 10e46ec97..72c7911f7 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/d186fcff-fdd4-4a79-9f71-e3938d95f76a/ArchimateDiagramModel_id-af2f4c8b-9c6c-4821-bd5a-f49a89df6697.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/d186fcff-fdd4-4a79-9f71-e3938d95f76a/ArchimateDiagramModel_id-af2f4c8b-9c6c-4821-bd5a-f49a89df6697.xml
@@ -252,7 +252,7 @@
       value="GEMMA Online en redactie"/>
   <properties
       key="GEMMA thema"
-      value="Katern - Verbinden"/>
+      value="Verbinden"/>
   <properties
       key="Viewtype"
       value="Illustratie"/>
@@ -262,4 +262,10 @@
   <properties
       key="Domein"
       value="Niet domeingebonden"/>
+  <properties
+      key="Detailniveau"
+      value="Samenhang"/>
+  <properties
+      key="Scope"
+      value="Gemeente"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/d186fcff-fdd4-4a79-9f71-e3938d95f76a/ArchimateDiagramModel_id-b224b052-07d5-4928-9681-ec72fecad3fe.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/d186fcff-fdd4-4a79-9f71-e3938d95f76a/ArchimateDiagramModel_id-b224b052-07d5-4928-9681-ec72fecad3fe.xml
index 419320eb8..bef47346b 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/d186fcff-fdd4-4a79-9f71-e3938d95f76a/ArchimateDiagramModel_id-b224b052-07d5-4928-9681-ec72fecad3fe.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/d186fcff-fdd4-4a79-9f71-e3938d95f76a/ArchimateDiagramModel_id-b224b052-07d5-4928-9681-ec72fecad3fe.xml
@@ -148,7 +148,7 @@
       value="GEMMA Online en redactie"/>
   <properties
       key="GEMMA thema"
-      value="Katern - Verbinden"/>
+      value="Verbinden"/>
   <properties
       key="Viewtype"
       value="Illustratie"/>
@@ -158,4 +158,10 @@
   <properties
       key="Domein"
       value="Niet domeingebonden"/>
+  <properties
+      key="Detailniveau"
+      value="Samenhang"/>
+  <properties
+      key="Scope"
+      value="Gemeente"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/d186fcff-fdd4-4a79-9f71-e3938d95f76a/ArchimateDiagramModel_id-c1c05cf4-3ca4-48b9-85c5-6b9a3f0a197d.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/d186fcff-fdd4-4a79-9f71-e3938d95f76a/ArchimateDiagramModel_id-c1c05cf4-3ca4-48b9-85c5-6b9a3f0a197d.xml
index 059f90909..1ecc0d18d 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/d186fcff-fdd4-4a79-9f71-e3938d95f76a/ArchimateDiagramModel_id-c1c05cf4-3ca4-48b9-85c5-6b9a3f0a197d.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/21f35da0-4dad-45a5-bd93-b01348ecc00a/d186fcff-fdd4-4a79-9f71-e3938d95f76a/ArchimateDiagramModel_id-c1c05cf4-3ca4-48b9-85c5-6b9a3f0a197d.xml
@@ -181,7 +181,7 @@
       value="GEMMA Online en redactie"/>
   <properties
       key="GEMMA thema"
-      value="Katern - Verbinden"/>
+      value="Verbinden"/>
   <properties
       key="Viewtype"
       value="Illustratie"/>
@@ -191,4 +191,10 @@
   <properties
       key="Domein"
       value="Niet domeingebonden"/>
+  <properties
+      key="Detailniveau"
+      value="Samenhang"/>
+  <properties
+      key="Scope"
+      value="Gemeente"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/98aa4339-c2d6-4f6b-ae76-6deef8b49a87/ArchimateDiagramModel_id-6d70a06b-4674-48d0-8ec0-fa51ffc24f80.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/98aa4339-c2d6-4f6b-ae76-6deef8b49a87/ArchimateDiagramModel_id-6d70a06b-4674-48d0-8ec0-fa51ffc24f80.xml
index aee0ab21d..ac302a315 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/98aa4339-c2d6-4f6b-ae76-6deef8b49a87/ArchimateDiagramModel_id-6d70a06b-4674-48d0-8ec0-fa51ffc24f80.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/98aa4339-c2d6-4f6b-ae76-6deef8b49a87/ArchimateDiagramModel_id-6d70a06b-4674-48d0-8ec0-fa51ffc24f80.xml
@@ -1042,9 +1042,6 @@
   <properties
       key="Object ID"
       value="6d70a06b-4674-48d0-8ec0-fa51ffc24f80"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Publiceren"
       value="Niet"/>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/98aa4339-c2d6-4f6b-ae76-6deef8b49a87/ArchimateDiagramModel_id-e48e3546-de43-47a1-8182-8ad9ef744a2b.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/98aa4339-c2d6-4f6b-ae76-6deef8b49a87/ArchimateDiagramModel_id-e48e3546-de43-47a1-8182-8ad9ef744a2b.xml
index 616a7fceb..c12539de8 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/98aa4339-c2d6-4f6b-ae76-6deef8b49a87/ArchimateDiagramModel_id-e48e3546-de43-47a1-8182-8ad9ef744a2b.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/98aa4339-c2d6-4f6b-ae76-6deef8b49a87/ArchimateDiagramModel_id-e48e3546-de43-47a1-8182-8ad9ef744a2b.xml
@@ -1207,9 +1207,6 @@
   <properties
       key="Object ID"
       value="e48e3546-de43-47a1-8182-8ad9ef744a2b"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Publiceren"
       value="Niet"/>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/b5acd1ba-d575-47e3-a0e6-26a88ff959b4/ArchimateDiagramModel_id-613a19c6-4506-4167-b66b-d71c08b3e317.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/b5acd1ba-d575-47e3-a0e6-26a88ff959b4/ArchimateDiagramModel_id-613a19c6-4506-4167-b66b-d71c08b3e317.xml
index 22310dbe8..c8edf6b90 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/b5acd1ba-d575-47e3-a0e6-26a88ff959b4/ArchimateDiagramModel_id-613a19c6-4506-4167-b66b-d71c08b3e317.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-47489a50aa9c42378c98fc615c38e460/b5acd1ba-d575-47e3-a0e6-26a88ff959b4/ArchimateDiagramModel_id-613a19c6-4506-4167-b66b-d71c08b3e317.xml
@@ -546,9 +546,6 @@
   <properties
       key="Scope"
       value="Keten"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Viewtype"
       value="Toelichting"/>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-bd6fca5b24da4c51b4b547265226e990/ArchimateDiagramModel_id-0a7d94cc71184c81853049a5c2a519aa.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-bd6fca5b24da4c51b4b547265226e990/ArchimateDiagramModel_id-0a7d94cc71184c81853049a5c2a519aa.xml
index 3b07d89b5..fb062cb21 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-bd6fca5b24da4c51b4b547265226e990/ArchimateDiagramModel_id-0a7d94cc71184c81853049a5c2a519aa.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-bd6fca5b24da4c51b4b547265226e990/ArchimateDiagramModel_id-0a7d94cc71184c81853049a5c2a519aa.xml
@@ -314,7 +314,7 @@
       value="Illustratie"/>
   <properties
       key="GEMMA thema"
-      value="Informatiebeveiliging"/>
+      value="Werken met APIs"/>
   <properties
       key="Architectuurlaag"
       value="Applicatiearchitectuur"/>
@@ -323,5 +323,8 @@
       value="Niet domeingebonden"/>
   <properties
       key="Detailniveau"
-      value="Detailview"/>
+      value="Detail"/>
+  <properties
+      key="Scope"
+      value="Gemeente"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-bd6fca5b24da4c51b4b547265226e990/ArchimateDiagramModel_id-381fcef3f4064c1789e0f2e0fb7d25f4.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-bd6fca5b24da4c51b4b547265226e990/ArchimateDiagramModel_id-381fcef3f4064c1789e0f2e0fb7d25f4.xml
index 0e56af7d2..fe17aa4b9 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-bd6fca5b24da4c51b4b547265226e990/ArchimateDiagramModel_id-381fcef3f4064c1789e0f2e0fb7d25f4.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-bd6fca5b24da4c51b4b547265226e990/ArchimateDiagramModel_id-381fcef3f4064c1789e0f2e0fb7d25f4.xml
@@ -459,7 +459,7 @@
       value="Illustratie"/>
   <properties
       key="GEMMA thema"
-      value="Informatiebeveiliging"/>
+      value="Werken met APIs"/>
   <properties
       key="Architectuurlaag"
       value="Applicatiearchitectuur"/>
@@ -468,5 +468,8 @@
       value="Niet domeingebonden"/>
   <properties
       key="Detailniveau"
-      value="Detailview"/>
+      value="Detail"/>
+  <properties
+      key="Scope"
+      value="Gemeente"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-bd6fca5b24da4c51b4b547265226e990/SketchModel_id-5295b11c69bd4e7fb7f10a8c0d915513.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-bd6fca5b24da4c51b4b547265226e990/SketchModel_id-5295b11c69bd4e7fb7f10a8c0d915513.xml
index 21b237724..8608d2be5 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-bd6fca5b24da4c51b4b547265226e990/SketchModel_id-5295b11c69bd4e7fb7f10a8c0d915513.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-bd6fca5b24da4c51b4b547265226e990/SketchModel_id-5295b11c69bd4e7fb7f10a8c0d915513.xml
@@ -385,7 +385,7 @@
       value="Illustratie"/>
   <properties
       key="GEMMA thema"
-      value="Informatiebeveiliging"/>
+      value="Werken met APIs"/>
   <properties
       key="Architectuurlaag"
       value="Applicatiearchitectuur"/>
@@ -394,5 +394,8 @@
       value="Niet domeingebonden"/>
   <properties
       key="Detailniveau"
-      value="Detailview"/>
+      value="Detail"/>
+  <properties
+      key="Scope"
+      value="Gemeente"/>
 </archimate:SketchModel>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-bd6fca5b24da4c51b4b547265226e990/id-01cacb45060d4c58b725f6f5337dd98f/ArchimateDiagramModel_0ddaf91b-0656-449a-b407-0d34704feb34.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-bd6fca5b24da4c51b4b547265226e990/id-01cacb45060d4c58b725f6f5337dd98f/ArchimateDiagramModel_0ddaf91b-0656-449a-b407-0d34704feb34.xml
index 11d552f40..5d6372e2a 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-bd6fca5b24da4c51b4b547265226e990/id-01cacb45060d4c58b725f6f5337dd98f/ArchimateDiagramModel_0ddaf91b-0656-449a-b407-0d34704feb34.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-bd6fca5b24da4c51b4b547265226e990/id-01cacb45060d4c58b725f6f5337dd98f/ArchimateDiagramModel_0ddaf91b-0656-449a-b407-0d34704feb34.xml
@@ -128,4 +128,10 @@
   <properties
       key="Object ID"
       value="4b798148-1864-4c0d-9528-127062177ebb"/>
+  <properties
+      key="Publiceren"
+      value="Niet"/>
+  <properties
+      key="GEMMA thema"
+      value="Werken met APIs"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-bd6fca5b24da4c51b4b547265226e990/id-01cacb45060d4c58b725f6f5337dd98f/ArchimateDiagramModel_45ceff4d-4098-4678-99c0-c6e958eb26ce.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-bd6fca5b24da4c51b4b547265226e990/id-01cacb45060d4c58b725f6f5337dd98f/ArchimateDiagramModel_45ceff4d-4098-4678-99c0-c6e958eb26ce.xml
index 2cd332351..03334995c 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-bd6fca5b24da4c51b4b547265226e990/id-01cacb45060d4c58b725f6f5337dd98f/ArchimateDiagramModel_45ceff4d-4098-4678-99c0-c6e958eb26ce.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-bd6fca5b24da4c51b4b547265226e990/id-01cacb45060d4c58b725f6f5337dd98f/ArchimateDiagramModel_45ceff4d-4098-4678-99c0-c6e958eb26ce.xml
@@ -167,4 +167,10 @@
   <properties
       key="Object ID"
       value="386df739-0693-4a04-82bb-f8bc87eeba3c"/>
+  <properties
+      key="Publiceren"
+      value="Niet"/>
+  <properties
+      key="GEMMA thema"
+      value="Werken met APIs"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-bd6fca5b24da4c51b4b547265226e990/id-01cacb45060d4c58b725f6f5337dd98f/ArchimateDiagramModel_a2e0595c-0451-4d25-9354-817ecb7a2cc3.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-bd6fca5b24da4c51b4b547265226e990/id-01cacb45060d4c58b725f6f5337dd98f/ArchimateDiagramModel_a2e0595c-0451-4d25-9354-817ecb7a2cc3.xml
index beff4a7d0..3cb6feb79 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-bd6fca5b24da4c51b4b547265226e990/id-01cacb45060d4c58b725f6f5337dd98f/ArchimateDiagramModel_a2e0595c-0451-4d25-9354-817ecb7a2cc3.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-bd6fca5b24da4c51b4b547265226e990/id-01cacb45060d4c58b725f6f5337dd98f/ArchimateDiagramModel_a2e0595c-0451-4d25-9354-817ecb7a2cc3.xml
@@ -172,4 +172,10 @@
   <properties
       key="Object ID"
       value="9449fc1a-3c81-43b6-ad28-0f5799d4862a"/>
+  <properties
+      key="Publiceren"
+      value="Niet"/>
+  <properties
+      key="GEMMA thema"
+      value="Werken met APIs"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-bd6fca5b24da4c51b4b547265226e990/id-01cacb45060d4c58b725f6f5337dd98f/ArchimateDiagramModel_ad6200c2-3fc2-459a-be69-e9ca4d07b2b9.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-bd6fca5b24da4c51b4b547265226e990/id-01cacb45060d4c58b725f6f5337dd98f/ArchimateDiagramModel_ad6200c2-3fc2-459a-be69-e9ca4d07b2b9.xml
index cdc55ce15..876eb8961 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-bd6fca5b24da4c51b4b547265226e990/id-01cacb45060d4c58b725f6f5337dd98f/ArchimateDiagramModel_ad6200c2-3fc2-459a-be69-e9ca4d07b2b9.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-bd6fca5b24da4c51b4b547265226e990/id-01cacb45060d4c58b725f6f5337dd98f/ArchimateDiagramModel_ad6200c2-3fc2-459a-be69-e9ca4d07b2b9.xml
@@ -193,4 +193,10 @@
   <properties
       key="Object ID"
       value="dac28cd3-687b-400d-9a35-40eb1eddb4ba"/>
+  <properties
+      key="Publiceren"
+      value="Niet"/>
+  <properties
+      key="GEMMA thema"
+      value="Werken met APIs"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-bd6fca5b24da4c51b4b547265226e990/id-01cacb45060d4c58b725f6f5337dd98f/ArchimateDiagramModel_c9d539a8-29c4-4b73-90ef-f2e68baadb6a.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-bd6fca5b24da4c51b4b547265226e990/id-01cacb45060d4c58b725f6f5337dd98f/ArchimateDiagramModel_c9d539a8-29c4-4b73-90ef-f2e68baadb6a.xml
index a2fcfa043..d54467bfe 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-bd6fca5b24da4c51b4b547265226e990/id-01cacb45060d4c58b725f6f5337dd98f/ArchimateDiagramModel_c9d539a8-29c4-4b73-90ef-f2e68baadb6a.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-bd6fca5b24da4c51b4b547265226e990/id-01cacb45060d4c58b725f6f5337dd98f/ArchimateDiagramModel_c9d539a8-29c4-4b73-90ef-f2e68baadb6a.xml
@@ -180,4 +180,10 @@
   <properties
       key="Object ID"
       value="a565dad0-7ee1-4d48-8d44-c55450c45ef4"/>
+  <properties
+      key="Publiceren"
+      value="Niet"/>
+  <properties
+      key="GEMMA thema"
+      value="Werken met APIs"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-bd6fca5b24da4c51b4b547265226e990/id-01cacb45060d4c58b725f6f5337dd98f/ArchimateDiagramModel_cf8afc1e-1846-417b-bf7e-3d74c971f199.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-bd6fca5b24da4c51b4b547265226e990/id-01cacb45060d4c58b725f6f5337dd98f/ArchimateDiagramModel_cf8afc1e-1846-417b-bf7e-3d74c971f199.xml
index 49990799f..15e7fcdd3 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-bd6fca5b24da4c51b4b547265226e990/id-01cacb45060d4c58b725f6f5337dd98f/ArchimateDiagramModel_cf8afc1e-1846-417b-bf7e-3d74c971f199.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-bd6fca5b24da4c51b4b547265226e990/id-01cacb45060d4c58b725f6f5337dd98f/ArchimateDiagramModel_cf8afc1e-1846-417b-bf7e-3d74c971f199.xml
@@ -106,4 +106,10 @@
   <properties
       key="Object ID"
       value="6baf329e-f8ba-4576-a128-e30768d6ebfa"/>
+  <properties
+      key="Publiceren"
+      value="Niet"/>
+  <properties
+      key="GEMMA thema"
+      value="Werken met APIs"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-bd6fca5b24da4c51b4b547265226e990/id-01cacb45060d4c58b725f6f5337dd98f/ArchimateDiagramModel_e11891b7-c927-4390-a11c-443b8d631518.xml b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-bd6fca5b24da4c51b4b547265226e990/id-01cacb45060d4c58b725f6f5337dd98f/ArchimateDiagramModel_e11891b7-c927-4390-a11c-443b8d631518.xml
index 6ca272c72..6ee7a2283 100644
--- a/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-bd6fca5b24da4c51b4b547265226e990/id-01cacb45060d4c58b725f6f5337dd98f/ArchimateDiagramModel_e11891b7-c927-4390-a11c-443b8d631518.xml
+++ b/model/diagrams/b3fbe97f-cd27-42fc-b707-43944a2e7bbf/id-bd6fca5b24da4c51b4b547265226e990/id-01cacb45060d4c58b725f6f5337dd98f/ArchimateDiagramModel_e11891b7-c927-4390-a11c-443b8d631518.xml
@@ -117,4 +117,10 @@
   <properties
       key="Object ID"
       value="81497f54-eec7-4559-892a-56674c3a6664"/>
+  <properties
+      key="Publiceren"
+      value="Niet"/>
+  <properties
+      key="GEMMA thema"
+      value="Werken met APIs"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/ArchimateDiagramModel_id-034eee64-db8b-4af0-9df8-b848509c0059.xml b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/ArchimateDiagramModel_id-034eee64-db8b-4af0-9df8-b848509c0059.xml
index 2743f45f9..2a2b76ee6 100644
--- a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/ArchimateDiagramModel_id-034eee64-db8b-4af0-9df8-b848509c0059.xml
+++ b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/ArchimateDiagramModel_id-034eee64-db8b-4af0-9df8-b848509c0059.xml
@@ -2123,7 +2123,4 @@
   <properties
       key="Viewtype"
       value="Basis"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/ArchimateDiagramModel_id-4015732b-ea78-42f3-a045-67c0a40c9721.xml b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/ArchimateDiagramModel_id-4015732b-ea78-42f3-a045-67c0a40c9721.xml
index 280fb853f..d622f9aa8 100644
--- a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/ArchimateDiagramModel_id-4015732b-ea78-42f3-a045-67c0a40c9721.xml
+++ b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/ArchimateDiagramModel_id-4015732b-ea78-42f3-a045-67c0a40c9721.xml
@@ -1871,7 +1871,4 @@
   <properties
       key="Viewtype"
       value="Basis"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/ArchimateDiagramModel_id-406de6a6-75db-42b5-85df-cc353d7f71ff.xml b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/ArchimateDiagramModel_id-406de6a6-75db-42b5-85df-cc353d7f71ff.xml
index 4829d7966..382a96d75 100644
--- a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/ArchimateDiagramModel_id-406de6a6-75db-42b5-85df-cc353d7f71ff.xml
+++ b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/ArchimateDiagramModel_id-406de6a6-75db-42b5-85df-cc353d7f71ff.xml
@@ -2015,7 +2015,4 @@
   <properties
       key="Viewtype"
       value="Basis"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/ArchimateDiagramModel_id-7792d23d-1aa1-4c29-9388-5353eb66e030.xml b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/ArchimateDiagramModel_id-7792d23d-1aa1-4c29-9388-5353eb66e030.xml
index 0bc7bd1a3..a9a33cf89 100644
--- a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/ArchimateDiagramModel_id-7792d23d-1aa1-4c29-9388-5353eb66e030.xml
+++ b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/ArchimateDiagramModel_id-7792d23d-1aa1-4c29-9388-5353eb66e030.xml
@@ -2499,7 +2499,4 @@
   <properties
       key="Viewtype"
       value="Basis"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/ArchimateDiagramModel_id-7b5e3026-f98a-44dc-af65-22ab4aea2f90.xml b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/ArchimateDiagramModel_id-7b5e3026-f98a-44dc-af65-22ab4aea2f90.xml
index 6a939a033..d1301af67 100644
--- a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/ArchimateDiagramModel_id-7b5e3026-f98a-44dc-af65-22ab4aea2f90.xml
+++ b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/ArchimateDiagramModel_id-7b5e3026-f98a-44dc-af65-22ab4aea2f90.xml
@@ -2103,7 +2103,7 @@
       value="7b5e3026-f98a-44dc-af65-22ab4aea2f90"/>
   <properties
       key="Detailniveau"
-      value="Detailview"/>
+      value="Detail"/>
   <properties
       key="Publiceren"
       value="GEMMA Online en redactie"/>
@@ -2113,7 +2113,4 @@
   <properties
       key="Viewtype"
       value="Basis"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/ArchimateDiagramModel_id-839462cd-ec6a-42b5-ae4b-5d1e863292c2.xml b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/ArchimateDiagramModel_id-839462cd-ec6a-42b5-ae4b-5d1e863292c2.xml
index f53d97586..50bb7662e 100644
--- a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/ArchimateDiagramModel_id-839462cd-ec6a-42b5-ae4b-5d1e863292c2.xml
+++ b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/ArchimateDiagramModel_id-839462cd-ec6a-42b5-ae4b-5d1e863292c2.xml
@@ -2852,7 +2852,4 @@
   <properties
       key="Viewtype"
       value="Basis"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/ArchimateDiagramModel_id-94a8d536-04bb-4db3-b8ff-504724983a53.xml b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/ArchimateDiagramModel_id-94a8d536-04bb-4db3-b8ff-504724983a53.xml
index 3ab30aef3..f3820b6ff 100644
--- a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/ArchimateDiagramModel_id-94a8d536-04bb-4db3-b8ff-504724983a53.xml
+++ b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/ArchimateDiagramModel_id-94a8d536-04bb-4db3-b8ff-504724983a53.xml
@@ -1499,9 +1499,6 @@
   <properties
       key="Scope"
       value="Gemeente"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Viewtype"
       value="Basis"/>
diff --git a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/ArchimateDiagramModel_id-a627b161-0c94-4d51-bbaa-de49ac27f9c3.xml b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/ArchimateDiagramModel_id-a627b161-0c94-4d51-bbaa-de49ac27f9c3.xml
index b2ae3fabc..b5ab33a76 100644
--- a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/ArchimateDiagramModel_id-a627b161-0c94-4d51-bbaa-de49ac27f9c3.xml
+++ b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/ArchimateDiagramModel_id-a627b161-0c94-4d51-bbaa-de49ac27f9c3.xml
@@ -484,9 +484,6 @@
   <properties
       key="Viewtype"
       value="Toelichting"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Domein"
       value="Niet domeingebonden"/>
diff --git a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/ArchimateDiagramModel_id-bae3f862-4ce4-4cb3-ab8c-241e82ac3b85.xml b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/ArchimateDiagramModel_id-bae3f862-4ce4-4cb3-ab8c-241e82ac3b85.xml
index a8f03826f..1466fb393 100644
--- a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/ArchimateDiagramModel_id-bae3f862-4ce4-4cb3-ab8c-241e82ac3b85.xml
+++ b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/ArchimateDiagramModel_id-bae3f862-4ce4-4cb3-ab8c-241e82ac3b85.xml
@@ -2771,7 +2771,4 @@
   <properties
       key="Viewtype"
       value="Basis"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/ArchimateDiagramModel_id-edbfe2a7-b747-48b1-8a9b-7d0aef159ea3.xml b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/ArchimateDiagramModel_id-edbfe2a7-b747-48b1-8a9b-7d0aef159ea3.xml
index a5a79e4d4..123938508 100644
--- a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/ArchimateDiagramModel_id-edbfe2a7-b747-48b1-8a9b-7d0aef159ea3.xml
+++ b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/ArchimateDiagramModel_id-edbfe2a7-b747-48b1-8a9b-7d0aef159ea3.xml
@@ -2446,7 +2446,4 @@
   <properties
       key="Viewtype"
       value="Basis"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-0605d00c-6c31-40d2-8a38-7db887ab8bbc.xml b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-0605d00c-6c31-40d2-8a38-7db887ab8bbc.xml
index fd1a22bed..896fc18c9 100644
--- a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-0605d00c-6c31-40d2-8a38-7db887ab8bbc.xml
+++ b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-0605d00c-6c31-40d2-8a38-7db887ab8bbc.xml
@@ -324,7 +324,7 @@
       value="0605d00c-6c31-40d2-8a38-7db887ab8bbc"/>
   <properties
       key="Detailniveau"
-      value="Detailview"/>
+      value="Detail"/>
   <properties
       key="Publiceren"
       value="GEMMA Online en redactie"/>
@@ -336,5 +336,5 @@
       value="Illustratie"/>
   <properties
       key="GEMMA thema"
-      value="Geen"/>
+      value="Processen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-0b159157-231b-4a75-8d1a-534ff3836dcc.xml b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-0b159157-231b-4a75-8d1a-534ff3836dcc.xml
index 4f4c86775..1b8cd83b2 100644
--- a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-0b159157-231b-4a75-8d1a-534ff3836dcc.xml
+++ b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-0b159157-231b-4a75-8d1a-534ff3836dcc.xml
@@ -401,17 +401,17 @@
       value="0b159157-231b-4a75-8d1a-534ff3836dcc"/>
   <properties
       key="Detailniveau"
-      value="Detailview"/>
+      value="Detail"/>
   <properties
       key="Publiceren"
       value="GEMMA Online en redactie"/>
   <properties
       key="Scope"
-      value="Gemeente"/>
+      value="Keten"/>
   <properties
       key="Viewtype"
       value="Illustratie"/>
   <properties
       key="GEMMA thema"
-      value="Geen"/>
+      value="Processen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-1e80b7d3-7b01-42df-b72a-e1192ac11816.xml b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-1e80b7d3-7b01-42df-b72a-e1192ac11816.xml
index d115fca73..533ef79b1 100644
--- a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-1e80b7d3-7b01-42df-b72a-e1192ac11816.xml
+++ b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-1e80b7d3-7b01-42df-b72a-e1192ac11816.xml
@@ -288,7 +288,7 @@
       value="1e80b7d3-7b01-42df-b72a-e1192ac11816"/>
   <properties
       key="Detailniveau"
-      value="Detailview"/>
+      value="Detail"/>
   <properties
       key="Publiceren"
       value="GEMMA Online en redactie"/>
@@ -300,5 +300,5 @@
       value="Illustratie"/>
   <properties
       key="GEMMA thema"
-      value="Geen"/>
+      value="Processen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-2a6ca932-1a9f-42cf-aca8-85a27d06a350.xml b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-2a6ca932-1a9f-42cf-aca8-85a27d06a350.xml
index 9ee6c404f..a2f48b45c 100644
--- a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-2a6ca932-1a9f-42cf-aca8-85a27d06a350.xml
+++ b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-2a6ca932-1a9f-42cf-aca8-85a27d06a350.xml
@@ -1802,7 +1802,7 @@
       value="2a6ca932-1a9f-42cf-aca8-85a27d06a350"/>
   <properties
       key="Detailniveau"
-      value="Detailview"/>
+      value="Detail"/>
   <properties
       key="Publiceren"
       value="GEMMA Online en redactie"/>
@@ -1814,5 +1814,5 @@
       value="Illustratie"/>
   <properties
       key="GEMMA thema"
-      value="Geen"/>
+      value="Processen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-3c35bb71-1e6d-49c4-bbcb-c7d124c60e09.xml b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-3c35bb71-1e6d-49c4-bbcb-c7d124c60e09.xml
index 98e8c86a1..f86bec861 100644
--- a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-3c35bb71-1e6d-49c4-bbcb-c7d124c60e09.xml
+++ b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-3c35bb71-1e6d-49c4-bbcb-c7d124c60e09.xml
@@ -283,7 +283,7 @@
       value="3c35bb71-1e6d-49c4-bbcb-c7d124c60e09"/>
   <properties
       key="Detailniveau"
-      value="Detailview"/>
+      value="Detail"/>
   <properties
       key="Publiceren"
       value="GEMMA Online en redactie"/>
@@ -295,5 +295,5 @@
       value="Illustratie"/>
   <properties
       key="GEMMA thema"
-      value="Geen"/>
+      value="Processen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-3ce19af9-75b3-4474-b106-d6b69363012e.xml b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-3ce19af9-75b3-4474-b106-d6b69363012e.xml
index 095583e50..7b3556163 100644
--- a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-3ce19af9-75b3-4474-b106-d6b69363012e.xml
+++ b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-3ce19af9-75b3-4474-b106-d6b69363012e.xml
@@ -530,7 +530,7 @@
       value="3ce19af9-75b3-4474-b106-d6b69363012e"/>
   <properties
       key="Detailniveau"
-      value="Detailview"/>
+      value="Detail"/>
   <properties
       key="Publiceren"
       value="GEMMA Online en redactie"/>
@@ -542,5 +542,5 @@
       value="Illustratie"/>
   <properties
       key="GEMMA thema"
-      value="Geen"/>
+      value="Processen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-3f08464a-7948-4953-8988-ed281aa672ea.xml b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-3f08464a-7948-4953-8988-ed281aa672ea.xml
index 3e89f63a8..1e8f5087d 100644
--- a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-3f08464a-7948-4953-8988-ed281aa672ea.xml
+++ b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-3f08464a-7948-4953-8988-ed281aa672ea.xml
@@ -1943,7 +1943,7 @@
       value="Bedrijfsarchitectuur"/>
   <properties
       key="Domein"
-      value="Bestuur en bedrijfsvoering"/>
+      value="Bestuur"/>
   <properties
       key="Object ID"
       value="3f08464a-7948-4953-8988-ed281aa672ea"/>
@@ -1958,7 +1958,7 @@
       value="Gemeente"/>
   <properties
       key="GEMMA thema"
-      value="Geen"/>
+      value="Processen"/>
   <properties
       key="Viewtype"
       value="Illustratie"/>
diff --git a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-3f4698d8-add5-4eb8-bd53-8ebc54753600.xml b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-3f4698d8-add5-4eb8-bd53-8ebc54753600.xml
index be0f16cb7..ad9c05aca 100644
--- a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-3f4698d8-add5-4eb8-bd53-8ebc54753600.xml
+++ b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-3f4698d8-add5-4eb8-bd53-8ebc54753600.xml
@@ -283,7 +283,7 @@
       value="3f4698d8-add5-4eb8-bd53-8ebc54753600"/>
   <properties
       key="Detailniveau"
-      value="Detailview"/>
+      value="Detail"/>
   <properties
       key="Publiceren"
       value="GEMMA Online en redactie"/>
@@ -295,5 +295,5 @@
       value="Illustratie"/>
   <properties
       key="GEMMA thema"
-      value="Geen"/>
+      value="Processen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-5a84ed73-6886-40ec-967c-83598b4bd84b.xml b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-5a84ed73-6886-40ec-967c-83598b4bd84b.xml
index 4fa30901d..7371cbf40 100644
--- a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-5a84ed73-6886-40ec-967c-83598b4bd84b.xml
+++ b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-5a84ed73-6886-40ec-967c-83598b4bd84b.xml
@@ -175,7 +175,7 @@
       value="5a84ed73-6886-40ec-967c-83598b4bd84b"/>
   <properties
       key="Detailniveau"
-      value="Detailview"/>
+      value="Detail"/>
   <properties
       key="Publiceren"
       value="GEMMA Online en redactie"/>
@@ -187,5 +187,5 @@
       value="Illustratie"/>
   <properties
       key="GEMMA thema"
-      value="Geen"/>
+      value="Processen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-5f9faf69-d46d-437e-ad98-17e89309fe1f.xml b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-5f9faf69-d46d-437e-ad98-17e89309fe1f.xml
index f9b2e3a5d..1f23b77df 100644
--- a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-5f9faf69-d46d-437e-ad98-17e89309fe1f.xml
+++ b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-5f9faf69-d46d-437e-ad98-17e89309fe1f.xml
@@ -194,7 +194,7 @@
       value="5f9faf69-d46d-437e-ad98-17e89309fe1f"/>
   <properties
       key="Detailniveau"
-      value="Detailview"/>
+      value="Detail"/>
   <properties
       key="Publiceren"
       value="GEMMA Online en redactie"/>
@@ -206,5 +206,5 @@
       value="Illustratie"/>
   <properties
       key="GEMMA thema"
-      value="Geen"/>
+      value="Processen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-757967e4-893e-4ada-b42f-0612ca18744c.xml b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-757967e4-893e-4ada-b42f-0612ca18744c.xml
index 931100712..9a2e0f831 100644
--- a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-757967e4-893e-4ada-b42f-0612ca18744c.xml
+++ b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-757967e4-893e-4ada-b42f-0612ca18744c.xml
@@ -308,5 +308,5 @@
       value="Basis"/>
   <properties
       key="GEMMA thema"
-      value="Geen"/>
+      value="Processen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-7657d2ac-4620-4bed-b070-301bbb44b449.xml b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-7657d2ac-4620-4bed-b070-301bbb44b449.xml
index 0cee181a5..4e4e233af 100644
--- a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-7657d2ac-4620-4bed-b070-301bbb44b449.xml
+++ b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-7657d2ac-4620-4bed-b070-301bbb44b449.xml
@@ -230,7 +230,7 @@
       value="7657d2ac-4620-4bed-b070-301bbb44b449"/>
   <properties
       key="Detailniveau"
-      value="Detailview"/>
+      value="Detail"/>
   <properties
       key="Publiceren"
       value="GEMMA Online en redactie"/>
@@ -242,5 +242,5 @@
       value="Illustratie"/>
   <properties
       key="GEMMA thema"
-      value="Geen"/>
+      value="Processen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-81965f0c-29a3-4b8a-936e-df07b37f151b.xml b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-81965f0c-29a3-4b8a-936e-df07b37f151b.xml
index 2f64278fe..a0af2412f 100644
--- a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-81965f0c-29a3-4b8a-936e-df07b37f151b.xml
+++ b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-81965f0c-29a3-4b8a-936e-df07b37f151b.xml
@@ -660,7 +660,7 @@
       value="81965f0c-29a3-4b8a-936e-df07b37f151b"/>
   <properties
       key="Detailniveau"
-      value="Detailview"/>
+      value="Detail"/>
   <properties
       key="Publiceren"
       value="GEMMA Online en redactie"/>
@@ -672,5 +672,5 @@
       value="Illustratie"/>
   <properties
       key="GEMMA thema"
-      value="Geen"/>
+      value="Processen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-8b3ec9af-b52b-473d-99f4-4b3ff8cfc6a1.xml b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-8b3ec9af-b52b-473d-99f4-4b3ff8cfc6a1.xml
index 370be033c..03283ad64 100644
--- a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-8b3ec9af-b52b-473d-99f4-4b3ff8cfc6a1.xml
+++ b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-8b3ec9af-b52b-473d-99f4-4b3ff8cfc6a1.xml
@@ -215,7 +215,7 @@
       value="8b3ec9af-b52b-473d-99f4-4b3ff8cfc6a1"/>
   <properties
       key="Detailniveau"
-      value="Detailview"/>
+      value="Detail"/>
   <properties
       key="Publiceren"
       value="GEMMA Online en redactie"/>
@@ -227,5 +227,5 @@
       value="Illustratie"/>
   <properties
       key="GEMMA thema"
-      value="Geen"/>
+      value="Processen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-9b5ab84d-ef96-4c90-88c8-554fbd9be80e.xml b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-9b5ab84d-ef96-4c90-88c8-554fbd9be80e.xml
index 488c8e99b..d44872b9d 100644
--- a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-9b5ab84d-ef96-4c90-88c8-554fbd9be80e.xml
+++ b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-9b5ab84d-ef96-4c90-88c8-554fbd9be80e.xml
@@ -330,7 +330,7 @@
       value="9b5ab84d-ef96-4c90-88c8-554fbd9be80e"/>
   <properties
       key="Detailniveau"
-      value="Detailview"/>
+      value="Detail"/>
   <properties
       key="Publiceren"
       value="GEMMA Online en redactie"/>
@@ -342,5 +342,5 @@
       value="Illustratie"/>
   <properties
       key="GEMMA thema"
-      value="Geen"/>
+      value="Processen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-a86b35ea-4989-44ab-b838-3a419038d10e.xml b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-a86b35ea-4989-44ab-b838-3a419038d10e.xml
index ec082f7ac..5500272db 100644
--- a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-a86b35ea-4989-44ab-b838-3a419038d10e.xml
+++ b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-a86b35ea-4989-44ab-b838-3a419038d10e.xml
@@ -117,7 +117,7 @@
       value="a86b35ea-4989-44ab-b838-3a419038d10e"/>
   <properties
       key="Detailniveau"
-      value="Detailview"/>
+      value="Detail"/>
   <properties
       key="Publiceren"
       value="GEMMA Online en redactie"/>
@@ -129,5 +129,5 @@
       value="Illustratie"/>
   <properties
       key="GEMMA thema"
-      value="Geen"/>
+      value="Processen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-bb1a0900-7792-4573-bacf-8717b8b55e03.xml b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-bb1a0900-7792-4573-bacf-8717b8b55e03.xml
index 224c10454..d0017ef4a 100644
--- a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-bb1a0900-7792-4573-bacf-8717b8b55e03.xml
+++ b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-bb1a0900-7792-4573-bacf-8717b8b55e03.xml
@@ -144,7 +144,7 @@
       value="bb1a0900-7792-4573-bacf-8717b8b55e03"/>
   <properties
       key="Detailniveau"
-      value="Detailview"/>
+      value="Detail"/>
   <properties
       key="Publiceren"
       value="GEMMA Online en redactie"/>
@@ -156,5 +156,5 @@
       value="Illustratie"/>
   <properties
       key="GEMMA thema"
-      value="Geen"/>
+      value="Processen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-ca942ad2-5442-48b7-b8f3-ef0e7ce407c2.xml b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-ca942ad2-5442-48b7-b8f3-ef0e7ce407c2.xml
index 094d122b6..f3dd0dfa3 100644
--- a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-ca942ad2-5442-48b7-b8f3-ef0e7ce407c2.xml
+++ b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-ca942ad2-5442-48b7-b8f3-ef0e7ce407c2.xml
@@ -727,5 +727,5 @@
       value="Basis"/>
   <properties
       key="GEMMA thema"
-      value="Geen"/>
+      value="Processen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-d01acfb3-4bbd-4c20-b4e1-6709349e2591.xml b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-d01acfb3-4bbd-4c20-b4e1-6709349e2591.xml
index 8ecb808d1..c41cb03a9 100644
--- a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-d01acfb3-4bbd-4c20-b4e1-6709349e2591.xml
+++ b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-d01acfb3-4bbd-4c20-b4e1-6709349e2591.xml
@@ -344,5 +344,5 @@
       value="Illustratie"/>
   <properties
       key="GEMMA thema"
-      value="Geen"/>
+      value="Processen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-db412833-092a-4fd3-8e68-fb9c0394e712.xml b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-db412833-092a-4fd3-8e68-fb9c0394e712.xml
index 5b66b2be3..b9d1ddf50 100644
--- a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-db412833-092a-4fd3-8e68-fb9c0394e712.xml
+++ b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-db412833-092a-4fd3-8e68-fb9c0394e712.xml
@@ -530,7 +530,7 @@
       value="db412833-092a-4fd3-8e68-fb9c0394e712"/>
   <properties
       key="Detailniveau"
-      value="Detailview"/>
+      value="Detail"/>
   <properties
       key="Publiceren"
       value="GEMMA Online en redactie"/>
@@ -542,5 +542,5 @@
       value="Illustratie"/>
   <properties
       key="GEMMA thema"
-      value="Geen"/>
+      value="Processen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-de02bb2e-c13e-4eab-9a17-bbbb8123f499.xml b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-de02bb2e-c13e-4eab-9a17-bbbb8123f499.xml
index e388f9b47..f4b4ce254 100644
--- a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-de02bb2e-c13e-4eab-9a17-bbbb8123f499.xml
+++ b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-de02bb2e-c13e-4eab-9a17-bbbb8123f499.xml
@@ -180,7 +180,7 @@
       value="de02bb2e-c13e-4eab-9a17-bbbb8123f499"/>
   <properties
       key="Detailniveau"
-      value="Detailview"/>
+      value="Detail"/>
   <properties
       key="Publiceren"
       value="GEMMA Online en redactie"/>
@@ -192,5 +192,5 @@
       value="Illustratie"/>
   <properties
       key="GEMMA thema"
-      value="Geen"/>
+      value="Processen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-dfde244c-cf56-40a1-bfdf-1802d5f76a8e.xml b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-dfde244c-cf56-40a1-bfdf-1802d5f76a8e.xml
index bc805299f..c9dec495e 100644
--- a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-dfde244c-cf56-40a1-bfdf-1802d5f76a8e.xml
+++ b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-dfde244c-cf56-40a1-bfdf-1802d5f76a8e.xml
@@ -74,5 +74,5 @@
       value="Illustratie"/>
   <properties
       key="GEMMA thema"
-      value="Geen"/>
+      value="Processen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-ff99ee32-2e14-4ff0-b9c6-8a89de190322.xml b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-ff99ee32-2e14-4ff0-b9c6-8a89de190322.xml
index 9a1540b80..51ad5c11b 100644
--- a/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-ff99ee32-2e14-4ff0-b9c6-8a89de190322.xml
+++ b/model/diagrams/caf78e7d-99eb-4832-915e-9a2478b3057a/b505e14f-7ca4-4a35-829d-6abb332a9203/ArchimateDiagramModel_id-ff99ee32-2e14-4ff0-b9c6-8a89de190322.xml
@@ -2115,5 +2115,5 @@
       value="Basis"/>
   <properties
       key="GEMMA thema"
-      value="Geen"/>
+      value="Processen"/>
 </archimate:ArchimateDiagramModel>
diff --git a/model/diagrams/id-a9e3da383ca34357a34e13fb4088cce4/id-c53a975a85bb442f81457dba4203f759/ArchimateDiagramModel_id-23b7aa0a-d552-4100-b835-97229f47bb22.xml b/model/diagrams/id-a9e3da383ca34357a34e13fb4088cce4/id-c53a975a85bb442f81457dba4203f759/ArchimateDiagramModel_id-23b7aa0a-d552-4100-b835-97229f47bb22.xml
index 5aaad9bde..0bc480faa 100644
--- a/model/diagrams/id-a9e3da383ca34357a34e13fb4088cce4/id-c53a975a85bb442f81457dba4203f759/ArchimateDiagramModel_id-23b7aa0a-d552-4100-b835-97229f47bb22.xml
+++ b/model/diagrams/id-a9e3da383ca34357a34e13fb4088cce4/id-c53a975a85bb442f81457dba4203f759/ArchimateDiagramModel_id-23b7aa0a-d552-4100-b835-97229f47bb22.xml
@@ -485,9 +485,6 @@
   <properties
       key="Object ID"
       value="23b7aa0a-d552-4100-b835-97229f47bb22"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Publiceren"
       value="Niet"/>
diff --git a/model/diagrams/id-a9e3da383ca34357a34e13fb4088cce4/id-c53a975a85bb442f81457dba4203f759/ArchimateDiagramModel_id-6d21b2b5-b7a0-48d1-86d9-92a3433380cc.xml b/model/diagrams/id-a9e3da383ca34357a34e13fb4088cce4/id-c53a975a85bb442f81457dba4203f759/ArchimateDiagramModel_id-6d21b2b5-b7a0-48d1-86d9-92a3433380cc.xml
index 5076babd6..9f4f2db18 100644
--- a/model/diagrams/id-a9e3da383ca34357a34e13fb4088cce4/id-c53a975a85bb442f81457dba4203f759/ArchimateDiagramModel_id-6d21b2b5-b7a0-48d1-86d9-92a3433380cc.xml
+++ b/model/diagrams/id-a9e3da383ca34357a34e13fb4088cce4/id-c53a975a85bb442f81457dba4203f759/ArchimateDiagramModel_id-6d21b2b5-b7a0-48d1-86d9-92a3433380cc.xml
@@ -796,9 +796,6 @@
   <properties
       key="Object ID"
       value="6d21b2b5-b7a0-48d1-86d9-92a3433380cc"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Publiceren"
       value="Niet"/>
diff --git a/model/diagrams/id-a9e3da383ca34357a34e13fb4088cce4/id-c53a975a85bb442f81457dba4203f759/ArchimateDiagramModel_id-7aff16a1-8037-48cb-8747-2b8f8fa42333.xml b/model/diagrams/id-a9e3da383ca34357a34e13fb4088cce4/id-c53a975a85bb442f81457dba4203f759/ArchimateDiagramModel_id-7aff16a1-8037-48cb-8747-2b8f8fa42333.xml
index 7f75b8fb8..cd3aa4b10 100644
--- a/model/diagrams/id-a9e3da383ca34357a34e13fb4088cce4/id-c53a975a85bb442f81457dba4203f759/ArchimateDiagramModel_id-7aff16a1-8037-48cb-8747-2b8f8fa42333.xml
+++ b/model/diagrams/id-a9e3da383ca34357a34e13fb4088cce4/id-c53a975a85bb442f81457dba4203f759/ArchimateDiagramModel_id-7aff16a1-8037-48cb-8747-2b8f8fa42333.xml
@@ -1438,9 +1438,6 @@
   <properties
       key="Object ID"
       value="7aff16a1-8037-48cb-8747-2b8f8fa42333"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
   <properties
       key="Publiceren"
       value="Niet"/>
diff --git a/model/diagrams/id-a9e3da383ca34357a34e13fb4088cce4/id-c53a975a85bb442f81457dba4203f759/ArchimateDiagramModel_id-c1aca141-4f84-4181-bb93-d8490656bdcc.xml b/model/diagrams/id-a9e3da383ca34357a34e13fb4088cce4/id-c53a975a85bb442f81457dba4203f759/ArchimateDiagramModel_id-c1aca141-4f84-4181-bb93-d8490656bdcc.xml
index adbaca381..e5ea4b39d 100644
--- a/model/diagrams/id-a9e3da383ca34357a34e13fb4088cce4/id-c53a975a85bb442f81457dba4203f759/ArchimateDiagramModel_id-c1aca141-4f84-4181-bb93-d8490656bdcc.xml
+++ b/model/diagrams/id-a9e3da383ca34357a34e13fb4088cce4/id-c53a975a85bb442f81457dba4203f759/ArchimateDiagramModel_id-c1aca141-4f84-4181-bb93-d8490656bdcc.xml
@@ -707,7 +707,4 @@
   <properties
       key="Viewtype"
       value="Synchronisatie"/>
-  <properties
-      key="GEMMA thema"
-      value="Geen"/>
 </archimate:ArchimateDiagramModel>