Index: daimonin/src/daieditor/gameobject/ArchetypeSet.java
===================================================================
--- daimonin/src/daieditor/gameobject/ArchetypeSet.java	(Revision 1741)
+++ daimonin/src/daieditor/gameobject/ArchetypeSet.java	(Arbeitskopie)
@@ -506,6 +506,9 @@
                     artifactCount++;
                     continue;
                 }
+                if (arch.isUndefinedArchetype()) {
+                    continue;
+                }
                 if (arch.getArchetypeName().compareTo(net.sf.gridarta.gameobject.ArchetypeParser.STARTARCH_NAME) == 0) {
                     // process map arch
 
Index: daimonin/src/daieditor/gameobject/ArchetypeParser.java
===================================================================
--- daimonin/src/daieditor/gameobject/ArchetypeParser.java	(Revision 1741)
+++ daimonin/src/daieditor/gameobject/ArchetypeParser.java	(Arbeitskopie)
@@ -156,6 +156,7 @@
                     }
 
                     multiShapeID = 0;
+                    editorFolder = null;
                 }
             } else {
                 if (msgflag) {
@@ -216,11 +217,13 @@
                                 folder = names.length >= 2 ? names[1] : names[0];
                             }
                             mainControl.addArchPanelArchetype(panel, folder, archetype);
+                            archetype.setEditorFolder(panel+"/"+folder);
+                        } else {
+                            archetype.setEditorFolder("intern");
                         }
                     }
                     postParseArchetype(archetype);
                     archetype.setIsArchetype();
-                    archetype.setEditorFolder(editorFolder);
                     mainControl.getArchetypeSet().addArchetype(archetype);
 
                     if (archmore) {
Index: daimonin/src/daieditor/gameobject/UndefinedArchetype.java
===================================================================
--- daimonin/src/daieditor/gameobject/UndefinedArchetype.java	(Revision 1741)
+++ daimonin/src/daieditor/gameobject/UndefinedArchetype.java	(Arbeitskopie)
@@ -37,7 +37,7 @@
         setArchetypeName(archetypeName);
         setArchTypNr(0);
         setIsArchetype();
-        setEditorFolder("undefined");
+        setEditorFolder("intern");
     }
 
     /** {@inheritDoc} */
Index: crossfire/src/cfeditor/gameobject/ArchetypeSet.java
===================================================================
--- crossfire/src/cfeditor/gameobject/ArchetypeSet.java	(Revision 1741)
+++ crossfire/src/cfeditor/gameobject/ArchetypeSet.java	(Arbeitskopie)
@@ -485,6 +485,10 @@
 
             for (final Archetype arch : getArchetypes()) {
 
+                if (arch.isUndefinedArchetype()) {
+                    continue;
+                }
+
                 if (arch.isTail()) {
                     log.error("Collect Error: Multipart Tail in Panel found!");
                 }
Index: crossfire/src/cfeditor/gameobject/ArchetypeParser.java
===================================================================
--- crossfire/src/cfeditor/gameobject/ArchetypeParser.java	(Revision 1741)
+++ crossfire/src/cfeditor/gameobject/ArchetypeParser.java	(Arbeitskopie)
@@ -128,6 +128,8 @@
                     } else {
                         archetype.setArchetypeName(archName);
                     }
+
+                    editorFolder = null;
                 }
             } else {
                 if (msgflag) {
@@ -183,11 +185,13 @@
                                 folder = names.length >= 2 ? names[1] : names[0];
                             }
                             mainControl.addArchPanelArchetype(panel, folder, archetype);
-                        }
+                            archetype.setEditorFolder(panel+"/"+folder);
+                        } else {
+                            archetype.setEditorFolder("intern");
+                       }
                     }
                     postParseArchetype(archetype);
                     archetype.setIsArchetype();
-                    archetype.setEditorFolder(editorFolder);
                     mainControl.getArchetypeSet().addArchetype(archetype);
 
                     archmore = false;  // we assume this is last... but perhaps..
Index: crossfire/src/cfeditor/gameobject/UndefinedArchetype.java
===================================================================
--- crossfire/src/cfeditor/gameobject/UndefinedArchetype.java	(Revision 1741)
+++ crossfire/src/cfeditor/gameobject/UndefinedArchetype.java	(Arbeitskopie)
@@ -37,7 +37,7 @@
         setArchetypeName(archetypeName);
         setArchTypNr(0);
         setIsArchetype();
-        setEditorFolder("undefined");
+        setEditorFolder("intern");
     }
 
     /** {@inheritDoc} */