18 files changed, 583 insertions, 912 deletions

diff --git a/Mk/bsd.gnustep.mk b/Mk/bsd.gnustep.mk
index 2970857c9c4d..5e9834c51251 100644
--- a/Mk/bsd.gnustep.mk
+++ b/Mk/bsd.gnustep.mk
@@ -64,29 +64,21 @@ PLIST_SUB+=	MAJORVERSION=${PORTVERSION:C/([0-9]).*/\1/1}
 
 SYSTEMDIR=	${PREFIX}/System
 SYSMAKEDIR=	${SYSTEMDIR}/Makefiles
-COMBOPATH=	${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu
-.if defined(WITH_GNUSTEP_DEVEL)
+BUNDLEDIR=	${SYSTEMDIR}/Library/Bundles
 SYSLIBDIR=	${SYSTEMDIR}/Library/Libraries
 COMBOLIBDIR=	${SYSTEMDIR}/Library/Libraries
 LOCALLIBDIR=	${PREFIX}/Local/Library/Libraries
 PLIST_SUB+=	SYSTEMLIBRARY="System/Library"
 PLIST_SUB+=	LOCALLIBRARY="Local/Library"
 PLIST_SUB+=	NOFLAT=""
+.if defined(WITH_GNUSTEP_DEVEL)
+PKGNAMESUFFIX?=	-devel
 PLIST_SUB+=	GNUSTEP_DEVEL=""
 PLIST_SUB+=	GNUSTEP_STABLE="@comment "
-PKGNAMESUFFIX?=	-devel
 .else
-SYSLIBDIR=	${SYSTEMDIR}/Libraries/${GNU_ARCH}/${OPSYS:L}
-COMBOLIBDIR=	${SYSTEMDIR}/Libraries/${COMBOPATH}
-LOCALLIBDIR=	${PREFIX}/Local/Libraries/${COMBOPATH}
-PLIST_SUB+=	SYSTEMLIBRARY="System"
-PLIST_SUB+=	LOCALLIBRARY="Local"
-PLIST_SUB+=	NOFLAT="${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu/"
 PLIST_SUB+=	GNUSTEP_DEVEL="@comment "
 PLIST_SUB+=	GNUSTEP_STABLE=""
-.else
 .endif
-BUNDLEDIR=	${SYSTEMDIR}/Library/Bundles
 CC=		gcc32
 CXX=		g++32
 
@@ -128,11 +120,7 @@ USE_GNUSTEP_XLIB=yes
 BUILD_DEPENDS+=	${BACKBUNDLEDIR}/libgnustep-back:${PORTSDIR}/${GNUSTEP_BACK_PORT}
 RUN_DEPENDS+=	${BACKBUNDLEDIR}/libgnustep-back:${PORTSDIR}/${GNUSTEP_BACK_PORT}
 
-.if defined(WITH_GNUSTEP_DEVEL)
 BACKBUNDLEDIR=	${BUNDLEDIR}/libgnustep-back.bundle
-.else
-BACKBUNDLEDIR=	${BUNDLEDIR}/libgnustep-back.bundle/${COMBOPATH}
-.endif
 MAKE_FLAGS+=	GUI_BACKEND_LIB=back
 .endif
 
@@ -143,11 +131,7 @@ MAKE_FLAGS+=	GUI_BACKEND_LIB=back
 BUILD_DEPENDS+=	${BACKBUNDLEDIR}/libgnustep-xdps:${PORTSDIR}/${GNUSTEP_XDPS_PORT}
 RUN_DEPENDS+=	${BACKBUNDLEDIR}/libgnustep-xdps:${PORTSDIR}/${GNUSTEP_XDPS_PORT}
 
-.if defined(WITH_GNUSTEP_DEVEL)
 BACKBUNDLEDIR=	${BUNDLEDIR}/libgnustep-xdps.bundle
-.else
-BACKBUNDLEDIR=	${BUNDLEDIR}/libgnustep-xdps.bundle/${COMBOPATH}
-.endif
 MAKE_FLAGS+=	GUI_BACKEND_LIB=xdps
 .endif
 
@@ -158,11 +142,7 @@ MAKE_FLAGS+=	GUI_BACKEND_LIB=xdps
 BUILD_DEPENDS+=	${BACKBUNDLEDIR}/libgnustep-art:${PORTSDIR}/${GNUSTEP_ART_PORT}
 RUN_DEPENDS+=	${BACKBUNDLEDIR}/libgnustep-art:${PORTSDIR}/${GNUSTEP_ART_PORT}
 
-.if defined(WITH_GNUSTEP_DEVEL)
 BACKBUNDLEDIR=	${BUNDLEDIR}/libgnustep-art.bundle
-.else
-BACKBUNDLEDIR=	${BUNDLEDIR}/libgnustep-art.bundle/${COMBOPATH}
-.endif
 MAKE_FLAGS+=	GUI_BACKEND_LIB=art
 .endif
 
diff --git a/deskutils/gworkspace/pkg-plist b/deskutils/gworkspace/pkg-plist
index c697ad67fb62..3a305d48f64e 100644
--- a/deskutils/gworkspace/pkg-plist
+++ b/deskutils/gworkspace/pkg-plist
@@ -1,7 +1,7 @@
 System/Applications/GWorkspace.app/GWorkspace
 System/Applications/GWorkspace.app/Resources/AppViewer.inspector/Resources/Info-gnustep.plist
 System/Applications/GWorkspace.app/Resources/AppViewer.inspector/Resources/InspectorInfo.plist
-System/Applications/GWorkspace.app/Resources/AppViewer.inspector/%%NOFLAT%%AppViewer
+System/Applications/GWorkspace.app/Resources/AppViewer.inspector/AppViewer
 System/Applications/GWorkspace.app/Resources/AppViewer.inspector/stamp.make
 System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/CVS/Entries
 System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/CVS/Repository
@@ -36,11 +36,11 @@ System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Ital
 System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Portuguese.lproj/CVS/Entries
 System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Portuguese.lproj/CVS/Repository
 System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Portuguese.lproj/CVS/Root
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Resources/English.lproj/BrowserViewerPref.gorm/BrowserViewerPref.gorm/CVS/Entries
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Resources/English.lproj/BrowserViewerPref.gorm/BrowserViewerPref.gorm/CVS/Repository
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Resources/English.lproj/BrowserViewerPref.gorm/BrowserViewerPref.gorm/CVS/Root
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Resources/English.lproj/BrowserViewerPref.gorm/BrowserViewerPref.gorm/data.classes
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Resources/English.lproj/BrowserViewerPref.gorm/BrowserViewerPref.gorm/objects.gorm
+System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Resources/English.lproj/BrowserViewerPref.gorm/BrowserViewerPref.gorm/CVS/Entries
+System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Resources/English.lproj/BrowserViewerPref.gorm/BrowserViewerPref.gorm/CVS/Repository
+System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Resources/English.lproj/BrowserViewerPref.gorm/BrowserViewerPref.gorm/CVS/Root
+System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Resources/English.lproj/BrowserViewerPref.gorm/BrowserViewerPref.gorm/data.classes
+System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Resources/English.lproj/BrowserViewerPref.gorm/BrowserViewerPref.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Resources/English.lproj/BrowserViewerPref.gorm/CVS/Entries
 System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Resources/English.lproj/BrowserViewerPref.gorm/CVS/Repository
 System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Resources/English.lproj/BrowserViewerPref.gorm/CVS/Root
@@ -53,7 +53,7 @@ System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Span
 System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Spanish.lproj/CVS/Repository
 System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Spanish.lproj/CVS/Root
 System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/miniwindow.tiff
-System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/%%NOFLAT%%BrowserViewer
+System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/BrowserViewer
 System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/stamp.make
 System/Applications/GWorkspace.app/Resources/CVS/Entries
 System/Applications/GWorkspace.app/Resources/CVS/Repository
@@ -288,7 +288,7 @@ System/Applications/GWorkspace.app/Resources/FileIcon_Directory_Open_alt.tiff
 System/Applications/GWorkspace.app/Resources/FileManager.tiff
 System/Applications/GWorkspace.app/Resources/FolderViewer.inspector/Resources/Info-gnustep.plist
 System/Applications/GWorkspace.app/Resources/FolderViewer.inspector/Resources/InspectorInfo.plist
-System/Applications/GWorkspace.app/Resources/FolderViewer.inspector/%%NOFLAT%%FolderViewer
+System/Applications/GWorkspace.app/Resources/FolderViewer.inspector/FolderViewer
 System/Applications/GWorkspace.app/Resources/FolderViewer.inspector/stamp.make
 System/Applications/GWorkspace.app/Resources/French.lproj/CVS/Entries
 System/Applications/GWorkspace.app/Resources/French.lproj/CVS/Repository
@@ -362,11 +362,11 @@ System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Portug
 System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Resources/English.lproj/IconsViewerPref.gorm/CVS/Entries
 System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Resources/English.lproj/IconsViewerPref.gorm/CVS/Repository
 System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Resources/English.lproj/IconsViewerPref.gorm/CVS/Root
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Resources/English.lproj/IconsViewerPref.gorm/IconsViewerPref.gorm/CVS/Entries
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Resources/English.lproj/IconsViewerPref.gorm/IconsViewerPref.gorm/CVS/Repository
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Resources/English.lproj/IconsViewerPref.gorm/IconsViewerPref.gorm/CVS/Root
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Resources/English.lproj/IconsViewerPref.gorm/IconsViewerPref.gorm/data.classes
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Resources/English.lproj/IconsViewerPref.gorm/IconsViewerPref.gorm/objects.gorm
+System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Resources/English.lproj/IconsViewerPref.gorm/IconsViewerPref.gorm/CVS/Entries
+System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Resources/English.lproj/IconsViewerPref.gorm/IconsViewerPref.gorm/CVS/Repository
+System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Resources/English.lproj/IconsViewerPref.gorm/IconsViewerPref.gorm/CVS/Root
+System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Resources/English.lproj/IconsViewerPref.gorm/IconsViewerPref.gorm/data.classes
+System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Resources/English.lproj/IconsViewerPref.gorm/IconsViewerPref.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Resources/English.lproj/IconsViewerPref.gorm/data.classes
 System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Resources/English.lproj/IconsViewerPref.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Romanian.lproj/CVS/Entries
@@ -376,16 +376,16 @@ System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Spanis
 System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Spanish.lproj/CVS/Repository
 System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Spanish.lproj/CVS/Root
 System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/miniwindow.tiff
-System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/%%NOFLAT%%IconsViewer
+System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/IconsViewer
 System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/stamp.make
 System/Applications/GWorkspace.app/Resources/ImageViewer.inspector/Resources/Info-gnustep.plist
 System/Applications/GWorkspace.app/Resources/ImageViewer.inspector/Resources/InspectorInfo.plist
-System/Applications/GWorkspace.app/Resources/ImageViewer.inspector/%%NOFLAT%%ImageViewer
+System/Applications/GWorkspace.app/Resources/ImageViewer.inspector/ImageViewer
 System/Applications/GWorkspace.app/Resources/ImageViewer.inspector/stamp.make
 System/Applications/GWorkspace.app/Resources/Info-gnustep.plist
 System/Applications/GWorkspace.app/Resources/InspectorViewer.inspector/Resources/Info-gnustep.plist
 System/Applications/GWorkspace.app/Resources/InspectorViewer.inspector/Resources/InspectorInfo.plist
-System/Applications/GWorkspace.app/Resources/InspectorViewer.inspector/%%NOFLAT%%InspectorViewer
+System/Applications/GWorkspace.app/Resources/InspectorViewer.inspector/InspectorViewer
 System/Applications/GWorkspace.app/Resources/InspectorViewer.inspector/stamp.make
 System/Applications/GWorkspace.app/Resources/Italian.lproj/CVS/Entries
 System/Applications/GWorkspace.app/Resources/Italian.lproj/CVS/Repository
@@ -452,11 +452,11 @@ System/Applications/GWorkspace.app/Resources/MultipleSelection.tiff
 %%PDFVIEW%%System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/Resources/play.tiff
 %%PDFVIEW%%System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/Resources/right.tiff
 %%PDFVIEW%%System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/Resources/stop.tiff
-%%PDFVIEW%%System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/%%NOFLAT%%PdfViewer
+%%PDFVIEW%%System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/PdfViewer
 %%PDFVIEW%%System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/stamp.make
 System/Applications/GWorkspace.app/Resources/PlistViewer.inspector/Resources/Info-gnustep.plist
 System/Applications/GWorkspace.app/Resources/PlistViewer.inspector/Resources/InspectorInfo.plist
-System/Applications/GWorkspace.app/Resources/PlistViewer.inspector/%%NOFLAT%%PlistViewer
+System/Applications/GWorkspace.app/Resources/PlistViewer.inspector/PlistViewer
 System/Applications/GWorkspace.app/Resources/PlistViewer.inspector/stamp.make
 System/Applications/GWorkspace.app/Resources/Portuguese.lproj/CVS/Entries
 System/Applications/GWorkspace.app/Resources/Portuguese.lproj/CVS/Repository
@@ -480,19 +480,19 @@ System/Applications/GWorkspace.app/Resources/RecyclerFull.tiff
 System/Applications/GWorkspace.app/Resources/Resources/Dutch.lproj/Finder.gorm/CVS/Entries
 System/Applications/GWorkspace.app/Resources/Resources/Dutch.lproj/Finder.gorm/CVS/Repository
 System/Applications/GWorkspace.app/Resources/Resources/Dutch.lproj/Finder.gorm/CVS/Root
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/Dutch.lproj/Finder.gorm/Finder.gorm/CVS/Entries
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/Dutch.lproj/Finder.gorm/Finder.gorm/CVS/Repository
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/Dutch.lproj/Finder.gorm/Finder.gorm/CVS/Root
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/Dutch.lproj/Finder.gorm/Finder.gorm/data.classes
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/Dutch.lproj/Finder.gorm/Finder.gorm/objects.gorm
+System/Applications/GWorkspace.app/Resources/Resources/Dutch.lproj/Finder.gorm/Finder.gorm/CVS/Entries
+System/Applications/GWorkspace.app/Resources/Resources/Dutch.lproj/Finder.gorm/Finder.gorm/CVS/Repository
+System/Applications/GWorkspace.app/Resources/Resources/Dutch.lproj/Finder.gorm/Finder.gorm/CVS/Root
+System/Applications/GWorkspace.app/Resources/Resources/Dutch.lproj/Finder.gorm/Finder.gorm/data.classes
+System/Applications/GWorkspace.app/Resources/Resources/Dutch.lproj/Finder.gorm/Finder.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/Resources/Dutch.lproj/Finder.gorm/data.classes
 System/Applications/GWorkspace.app/Resources/Resources/Dutch.lproj/Finder.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/Resources/Dutch.lproj/Localizable.strings
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/AttributesPanel.gorm/AttributesPanel.gorm/CVS/Entries
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/AttributesPanel.gorm/AttributesPanel.gorm/CVS/Repository
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/AttributesPanel.gorm/AttributesPanel.gorm/CVS/Root
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/AttributesPanel.gorm/AttributesPanel.gorm/data.classes
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/AttributesPanel.gorm/AttributesPanel.gorm/objects.gorm
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/AttributesPanel.gorm/AttributesPanel.gorm/CVS/Entries
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/AttributesPanel.gorm/AttributesPanel.gorm/CVS/Repository
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/AttributesPanel.gorm/AttributesPanel.gorm/CVS/Root
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/AttributesPanel.gorm/AttributesPanel.gorm/data.classes
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/AttributesPanel.gorm/AttributesPanel.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/AttributesPanel.gorm/CVS/Entries
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/AttributesPanel.gorm/CVS/Repository
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/AttributesPanel.gorm/CVS/Root
@@ -501,239 +501,239 @@ System/Applications/GWorkspace.app/Resources/Resources/English.lproj/AttributesP
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ContentsPanel.gorm/CVS/Entries
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ContentsPanel.gorm/CVS/Repository
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ContentsPanel.gorm/CVS/Root
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ContentsPanel.gorm/ContentsPanel.gorm/CVS/Entries
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ContentsPanel.gorm/ContentsPanel.gorm/CVS/Repository
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ContentsPanel.gorm/ContentsPanel.gorm/CVS/Root
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ContentsPanel.gorm/ContentsPanel.gorm/data.classes
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ContentsPanel.gorm/ContentsPanel.gorm/objects.gorm
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ContentsPanel.gorm/ContentsPanel.gorm/CVS/Entries
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ContentsPanel.gorm/ContentsPanel.gorm/CVS/Repository
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ContentsPanel.gorm/ContentsPanel.gorm/CVS/Root
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ContentsPanel.gorm/ContentsPanel.gorm/data.classes
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ContentsPanel.gorm/ContentsPanel.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ContentsPanel.gorm/data.classes
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ContentsPanel.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DefEditorPref.gorm/CVS/Entries
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DefEditorPref.gorm/CVS/Repository
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DefEditorPref.gorm/CVS/Root
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DefEditorPref.gorm/DefEditorPref.gorm/CVS/Entries
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DefEditorPref.gorm/DefEditorPref.gorm/CVS/Repository
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DefEditorPref.gorm/DefEditorPref.gorm/CVS/Root
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DefEditorPref.gorm/DefEditorPref.gorm/data.classes
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DefEditorPref.gorm/DefEditorPref.gorm/objects.gorm
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DefEditorPref.gorm/DefEditorPref.gorm/CVS/Entries
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DefEditorPref.gorm/DefEditorPref.gorm/CVS/Repository
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DefEditorPref.gorm/DefEditorPref.gorm/CVS/Root
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DefEditorPref.gorm/DefEditorPref.gorm/data.classes
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DefEditorPref.gorm/DefEditorPref.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DefEditorPref.gorm/data.classes
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DefEditorPref.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DefSortOrderPref.gorm/CVS/Entries
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DefSortOrderPref.gorm/CVS/Repository
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DefSortOrderPref.gorm/CVS/Root
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DefSortOrderPref.gorm/DefSortOrderPref.gorm/CVS/Entries
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DefSortOrderPref.gorm/DefSortOrderPref.gorm/CVS/Repository
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DefSortOrderPref.gorm/DefSortOrderPref.gorm/CVS/Root
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DefSortOrderPref.gorm/DefSortOrderPref.gorm/data.classes
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DefSortOrderPref.gorm/DefSortOrderPref.gorm/objects.gorm
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DefSortOrderPref.gorm/DefSortOrderPref.gorm/CVS/Entries
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DefSortOrderPref.gorm/DefSortOrderPref.gorm/CVS/Repository
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DefSortOrderPref.gorm/DefSortOrderPref.gorm/CVS/Root
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DefSortOrderPref.gorm/DefSortOrderPref.gorm/data.classes
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DefSortOrderPref.gorm/DefSortOrderPref.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DefSortOrderPref.gorm/data.classes
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DefSortOrderPref.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DeskTopPref.gorm/.gwdir
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DeskTopPref.gorm/CVS/Entries
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DeskTopPref.gorm/CVS/Repository
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DeskTopPref.gorm/CVS/Root
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DeskTopPref.gorm/DeskTopPref.gorm/.gwdir
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DeskTopPref.gorm/DeskTopPref.gorm/CVS/Entries
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DeskTopPref.gorm/DeskTopPref.gorm/CVS/Repository
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DeskTopPref.gorm/DeskTopPref.gorm/CVS/Root
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DeskTopPref.gorm/DeskTopPref.gorm/data.classes
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DeskTopPref.gorm/DeskTopPref.gorm/objects.gorm
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DeskTopPref.gorm/DeskTopPref.gorm/.gwdir
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DeskTopPref.gorm/DeskTopPref.gorm/CVS/Entries
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DeskTopPref.gorm/DeskTopPref.gorm/CVS/Repository
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DeskTopPref.gorm/DeskTopPref.gorm/CVS/Root
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DeskTopPref.gorm/DeskTopPref.gorm/data.classes
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DeskTopPref.gorm/DeskTopPref.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DeskTopPref.gorm/data.classes
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DeskTopPref.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/FileOperationWin.gorm/CVS/Entries
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/FileOperationWin.gorm/CVS/Repository
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/FileOperationWin.gorm/CVS/Root
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/FileOperationWin.gorm/FileOperationWin.gorm/CVS/Entries
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/FileOperationWin.gorm/FileOperationWin.gorm/CVS/Repository
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/FileOperationWin.gorm/FileOperationWin.gorm/CVS/Root
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/FileOperationWin.gorm/FileOperationWin.gorm/data.classes
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/FileOperationWin.gorm/FileOperationWin.gorm/objects.gorm
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/FileOperationWin.gorm/FileOperationWin.gorm/CVS/Entries
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/FileOperationWin.gorm/FileOperationWin.gorm/CVS/Repository
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/FileOperationWin.gorm/FileOperationWin.gorm/CVS/Root
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/FileOperationWin.gorm/FileOperationWin.gorm/data.classes
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/FileOperationWin.gorm/FileOperationWin.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/FileOperationWin.gorm/data.classes
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/FileOperationWin.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/FileOpsPref.gorm/CVS/Entries
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/FileOpsPref.gorm/CVS/Repository
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/FileOpsPref.gorm/CVS/Root
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/FileOpsPref.gorm/FileOpsPref.gorm/CVS/Entries
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/FileOpsPref.gorm/FileOpsPref.gorm/CVS/Repository
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/FileOpsPref.gorm/FileOpsPref.gorm/CVS/Root
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/FileOpsPref.gorm/FileOpsPref.gorm/data.classes
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/FileOpsPref.gorm/FileOpsPref.gorm/objects.gorm
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/FileOpsPref.gorm/FileOpsPref.gorm/CVS/Entries
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/FileOpsPref.gorm/FileOpsPref.gorm/CVS/Repository
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/FileOpsPref.gorm/FileOpsPref.gorm/CVS/Root
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/FileOpsPref.gorm/FileOpsPref.gorm/data.classes
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/FileOpsPref.gorm/FileOpsPref.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/FileOpsPref.gorm/data.classes
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/FileOpsPref.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/Finder.gorm/CVS/Entries
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/Finder.gorm/CVS/Repository
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/Finder.gorm/CVS/Root
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/Finder.gorm/Finder.gorm/CVS/Entries
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/Finder.gorm/Finder.gorm/CVS/Repository
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/Finder.gorm/Finder.gorm/CVS/Root
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/Finder.gorm/Finder.gorm/data.classes
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/Finder.gorm/Finder.gorm/objects.gorm
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/Finder.gorm/Finder.gorm/CVS/Entries
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/Finder.gorm/Finder.gorm/CVS/Repository
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/Finder.gorm/Finder.gorm/CVS/Root
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/Finder.gorm/Finder.gorm/data.classes
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/Finder.gorm/Finder.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/Finder.gorm/data.classes
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/Finder.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/HiddenFilesPref.gorm/CVS/Entries
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/HiddenFilesPref.gorm/CVS/Repository
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/HiddenFilesPref.gorm/CVS/Root
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/HiddenFilesPref.gorm/HiddenFilesPref.gorm/CVS/Entries
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/HiddenFilesPref.gorm/HiddenFilesPref.gorm/CVS/Repository
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/HiddenFilesPref.gorm/HiddenFilesPref.gorm/CVS/Root
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/HiddenFilesPref.gorm/HiddenFilesPref.gorm/data.classes
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/HiddenFilesPref.gorm/HiddenFilesPref.gorm/objects.gorm
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/HiddenFilesPref.gorm/HiddenFilesPref.gorm/CVS/Entries
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/HiddenFilesPref.gorm/HiddenFilesPref.gorm/CVS/Repository
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/HiddenFilesPref.gorm/HiddenFilesPref.gorm/CVS/Root
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/HiddenFilesPref.gorm/HiddenFilesPref.gorm/data.classes
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/HiddenFilesPref.gorm/HiddenFilesPref.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/HiddenFilesPref.gorm/data.classes
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/HiddenFilesPref.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/IconsPref.gorm/CVS/Entries
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/IconsPref.gorm/CVS/Repository
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/IconsPref.gorm/CVS/Root
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/IconsPref.gorm/IconsPref.gorm/CVS/Entries
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/IconsPref.gorm/IconsPref.gorm/CVS/Repository
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/IconsPref.gorm/IconsPref.gorm/CVS/Root
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/IconsPref.gorm/IconsPref.gorm/data.classes
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/IconsPref.gorm/IconsPref.gorm/objects.gorm
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/IconsPref.gorm/IconsPref.gorm/CVS/Entries
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/IconsPref.gorm/IconsPref.gorm/CVS/Repository
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/IconsPref.gorm/IconsPref.gorm/CVS/Root
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/IconsPref.gorm/IconsPref.gorm/data.classes
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/IconsPref.gorm/IconsPref.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/IconsPref.gorm/data.classes
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/IconsPref.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/InspectorsWin.gorm/CVS/Entries
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/InspectorsWin.gorm/CVS/Repository
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/InspectorsWin.gorm/CVS/Root
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/InspectorsWin.gorm/InspectorsWin.gorm/CVS/Entries
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/InspectorsWin.gorm/InspectorsWin.gorm/CVS/Repository
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/InspectorsWin.gorm/InspectorsWin.gorm/CVS/Root
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/InspectorsWin.gorm/InspectorsWin.gorm/data.classes
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/InspectorsWin.gorm/InspectorsWin.gorm/objects.gorm
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/InspectorsWin.gorm/InspectorsWin.gorm/CVS/Entries
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/InspectorsWin.gorm/InspectorsWin.gorm/CVS/Repository
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/InspectorsWin.gorm/InspectorsWin.gorm/CVS/Root
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/InspectorsWin.gorm/InspectorsWin.gorm/data.classes
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/InspectorsWin.gorm/InspectorsWin.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/InspectorsWin.gorm/data.classes
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/InspectorsWin.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/Localizable.strings
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/OpenWith.gorm/CVS/Entries
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/OpenWith.gorm/CVS/Repository
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/OpenWith.gorm/CVS/Root
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/OpenWith.gorm/OpenWith.gorm/CVS/Entries
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/OpenWith.gorm/OpenWith.gorm/CVS/Repository
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/OpenWith.gorm/OpenWith.gorm/CVS/Root
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/OpenWith.gorm/OpenWith.gorm/data.classes
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/OpenWith.gorm/OpenWith.gorm/objects.gorm
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/OpenWith.gorm/OpenWith.gorm/CVS/Entries
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/OpenWith.gorm/OpenWith.gorm/CVS/Repository
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/OpenWith.gorm/OpenWith.gorm/CVS/Root
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/OpenWith.gorm/OpenWith.gorm/data.classes
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/OpenWith.gorm/OpenWith.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/OpenWith.gorm/data.classes
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/OpenWith.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/PermissionsPanel.gorm/CVS/Entries
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/PermissionsPanel.gorm/CVS/Repository
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/PermissionsPanel.gorm/CVS/Root
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/PermissionsPanel.gorm/PermissionsPanel.gorm/CVS/Entries
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/PermissionsPanel.gorm/PermissionsPanel.gorm/CVS/Repository
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/PermissionsPanel.gorm/PermissionsPanel.gorm/CVS/Root
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/PermissionsPanel.gorm/PermissionsPanel.gorm/data.classes
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/PermissionsPanel.gorm/PermissionsPanel.gorm/objects.gorm
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/PermissionsPanel.gorm/PermissionsPanel.gorm/CVS/Entries
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/PermissionsPanel.gorm/PermissionsPanel.gorm/CVS/Repository
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/PermissionsPanel.gorm/PermissionsPanel.gorm/CVS/Root
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/PermissionsPanel.gorm/PermissionsPanel.gorm/data.classes
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/PermissionsPanel.gorm/PermissionsPanel.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/PermissionsPanel.gorm/data.classes
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/PermissionsPanel.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/PrefWindow.gorm/CVS/Entries
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/PrefWindow.gorm/CVS/Repository
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/PrefWindow.gorm/CVS/Root
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/PrefWindow.gorm/PrefWindow.gorm/CVS/Entries
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/PrefWindow.gorm/PrefWindow.gorm/CVS/Repository
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/PrefWindow.gorm/PrefWindow.gorm/CVS/Root
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/PrefWindow.gorm/PrefWindow.gorm/data.classes
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/PrefWindow.gorm/PrefWindow.gorm/objects.gorm
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/PrefWindow.gorm/PrefWindow.gorm/CVS/Entries
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/PrefWindow.gorm/PrefWindow.gorm/CVS/Repository
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/PrefWindow.gorm/PrefWindow.gorm/CVS/Root
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/PrefWindow.gorm/PrefWindow.gorm/data.classes
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/PrefWindow.gorm/PrefWindow.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/PrefWindow.gorm/data.classes
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/PrefWindow.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/RunExternal.gorm/CVS/Entries
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/RunExternal.gorm/CVS/Repository
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/RunExternal.gorm/CVS/Root
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/RunExternal.gorm/RunExternal.gorm/CVS/Entries
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/RunExternal.gorm/RunExternal.gorm/CVS/Repository
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/RunExternal.gorm/RunExternal.gorm/CVS/Root
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/RunExternal.gorm/RunExternal.gorm/data.classes
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/RunExternal.gorm/RunExternal.gorm/objects.gorm
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/RunExternal.gorm/RunExternal.gorm/CVS/Entries
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/RunExternal.gorm/RunExternal.gorm/CVS/Repository
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/RunExternal.gorm/RunExternal.gorm/CVS/Root
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/RunExternal.gorm/RunExternal.gorm/data.classes
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/RunExternal.gorm/RunExternal.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/RunExternal.gorm/data.classes
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/RunExternal.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ShelfPref.gorm/CVS/Entries
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ShelfPref.gorm/CVS/Repository
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ShelfPref.gorm/CVS/Root
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ShelfPref.gorm/ShelfPref.gorm/CVS/Entries
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ShelfPref.gorm/ShelfPref.gorm/CVS/Repository
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ShelfPref.gorm/ShelfPref.gorm/CVS/Root
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ShelfPref.gorm/ShelfPref.gorm/data.classes
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ShelfPref.gorm/ShelfPref.gorm/objects.gorm
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ShelfPref.gorm/ShelfPref.gorm/CVS/Entries
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ShelfPref.gorm/ShelfPref.gorm/CVS/Repository
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ShelfPref.gorm/ShelfPref.gorm/CVS/Root
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ShelfPref.gorm/ShelfPref.gorm/data.classes
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ShelfPref.gorm/ShelfPref.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ShelfPref.gorm/data.classes
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ShelfPref.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ToolsPanel.gorm/CVS/Entries
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ToolsPanel.gorm/CVS/Repository
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ToolsPanel.gorm/CVS/Root
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ToolsPanel.gorm/ToolsPanel.gorm/CVS/Entries
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ToolsPanel.gorm/ToolsPanel.gorm/CVS/Repository
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ToolsPanel.gorm/ToolsPanel.gorm/CVS/Root
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ToolsPanel.gorm/ToolsPanel.gorm/data.classes
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ToolsPanel.gorm/ToolsPanel.gorm/objects.gorm
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ToolsPanel.gorm/ToolsPanel.gorm/CVS/Entries
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ToolsPanel.gorm/ToolsPanel.gorm/CVS/Repository
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ToolsPanel.gorm/ToolsPanel.gorm/CVS/Root
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ToolsPanel.gorm/ToolsPanel.gorm/data.classes
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ToolsPanel.gorm/ToolsPanel.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ToolsPanel.gorm/data.classes
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ToolsPanel.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/XTermPref.gorm/CVS/Entries
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/XTermPref.gorm/CVS/Repository
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/XTermPref.gorm/CVS/Root
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/XTermPref.gorm/XTermPref.gorm/CVS/Entries
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/XTermPref.gorm/XTermPref.gorm/CVS/Repository
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/XTermPref.gorm/XTermPref.gorm/CVS/Root
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/XTermPref.gorm/XTermPref.gorm/data.classes
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/English.lproj/XTermPref.gorm/XTermPref.gorm/objects.gorm
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/XTermPref.gorm/XTermPref.gorm/CVS/Entries
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/XTermPref.gorm/XTermPref.gorm/CVS/Repository
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/XTermPref.gorm/XTermPref.gorm/CVS/Root
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/XTermPref.gorm/XTermPref.gorm/data.classes
+System/Applications/GWorkspace.app/Resources/Resources/English.lproj/XTermPref.gorm/XTermPref.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/XTermPref.gorm/data.classes
 System/Applications/GWorkspace.app/Resources/Resources/English.lproj/XTermPref.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/Resources/French.lproj/Finder.gorm/CVS/Entries
 System/Applications/GWorkspace.app/Resources/Resources/French.lproj/Finder.gorm/CVS/Repository
 System/Applications/GWorkspace.app/Resources/Resources/French.lproj/Finder.gorm/CVS/Root
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/French.lproj/Finder.gorm/Finder.gorm/CVS/Entries
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/French.lproj/Finder.gorm/Finder.gorm/CVS/Repository
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/French.lproj/Finder.gorm/Finder.gorm/CVS/Root
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/French.lproj/Finder.gorm/Finder.gorm/data.classes
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/French.lproj/Finder.gorm/Finder.gorm/objects.gorm
+System/Applications/GWorkspace.app/Resources/Resources/French.lproj/Finder.gorm/Finder.gorm/CVS/Entries
+System/Applications/GWorkspace.app/Resources/Resources/French.lproj/Finder.gorm/Finder.gorm/CVS/Repository
+System/Applications/GWorkspace.app/Resources/Resources/French.lproj/Finder.gorm/Finder.gorm/CVS/Root
+System/Applications/GWorkspace.app/Resources/Resources/French.lproj/Finder.gorm/Finder.gorm/data.classes
+System/Applications/GWorkspace.app/Resources/Resources/French.lproj/Finder.gorm/Finder.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/Resources/French.lproj/Finder.gorm/data.classes
 System/Applications/GWorkspace.app/Resources/Resources/French.lproj/Finder.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/Resources/French.lproj/Localizable.strings
 System/Applications/GWorkspace.app/Resources/Resources/German.lproj/Finder.gorm/CVS/Entries
 System/Applications/GWorkspace.app/Resources/Resources/German.lproj/Finder.gorm/CVS/Repository
 System/Applications/GWorkspace.app/Resources/Resources/German.lproj/Finder.gorm/CVS/Root
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/German.lproj/Finder.gorm/Finder.gorm/CVS/Entries
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/German.lproj/Finder.gorm/Finder.gorm/CVS/Repository
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/German.lproj/Finder.gorm/Finder.gorm/CVS/Root
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/German.lproj/Finder.gorm/Finder.gorm/data.classes
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/German.lproj/Finder.gorm/Finder.gorm/objects.gorm
+System/Applications/GWorkspace.app/Resources/Resources/German.lproj/Finder.gorm/Finder.gorm/CVS/Entries
+System/Applications/GWorkspace.app/Resources/Resources/German.lproj/Finder.gorm/Finder.gorm/CVS/Repository
+System/Applications/GWorkspace.app/Resources/Resources/German.lproj/Finder.gorm/Finder.gorm/CVS/Root
+System/Applications/GWorkspace.app/Resources/Resources/German.lproj/Finder.gorm/Finder.gorm/data.classes
+System/Applications/GWorkspace.app/Resources/Resources/German.lproj/Finder.gorm/Finder.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/Resources/German.lproj/Finder.gorm/data.classes
 System/Applications/GWorkspace.app/Resources/Resources/German.lproj/Finder.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/Resources/German.lproj/Localizable.strings
 System/Applications/GWorkspace.app/Resources/Resources/Italian.lproj/Finder.gorm/CVS/Entries
 System/Applications/GWorkspace.app/Resources/Resources/Italian.lproj/Finder.gorm/CVS/Repository
 System/Applications/GWorkspace.app/Resources/Resources/Italian.lproj/Finder.gorm/CVS/Root
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/Italian.lproj/Finder.gorm/Finder.gorm/CVS/Entries
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/Italian.lproj/Finder.gorm/Finder.gorm/CVS/Repository
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/Italian.lproj/Finder.gorm/Finder.gorm/CVS/Root
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/Italian.lproj/Finder.gorm/Finder.gorm/data.classes
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/Italian.lproj/Finder.gorm/Finder.gorm/objects.gorm
+System/Applications/GWorkspace.app/Resources/Resources/Italian.lproj/Finder.gorm/Finder.gorm/CVS/Entries
+System/Applications/GWorkspace.app/Resources/Resources/Italian.lproj/Finder.gorm/Finder.gorm/CVS/Repository
+System/Applications/GWorkspace.app/Resources/Resources/Italian.lproj/Finder.gorm/Finder.gorm/CVS/Root
+System/Applications/GWorkspace.app/Resources/Resources/Italian.lproj/Finder.gorm/Finder.gorm/data.classes
+System/Applications/GWorkspace.app/Resources/Resources/Italian.lproj/Finder.gorm/Finder.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/Resources/Italian.lproj/Finder.gorm/data.classes
 System/Applications/GWorkspace.app/Resources/Resources/Italian.lproj/Finder.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/Resources/Italian.lproj/Localizable.strings
 System/Applications/GWorkspace.app/Resources/Resources/Portuguese.lproj/Finder.gorm/CVS/Entries
 System/Applications/GWorkspace.app/Resources/Resources/Portuguese.lproj/Finder.gorm/CVS/Repository
 System/Applications/GWorkspace.app/Resources/Resources/Portuguese.lproj/Finder.gorm/CVS/Root
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/Portuguese.lproj/Finder.gorm/Finder.gorm/CVS/Entries
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/Portuguese.lproj/Finder.gorm/Finder.gorm/CVS/Repository
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/Portuguese.lproj/Finder.gorm/Finder.gorm/CVS/Root
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/Portuguese.lproj/Finder.gorm/Finder.gorm/data.classes
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/Portuguese.lproj/Finder.gorm/Finder.gorm/objects.gorm
+System/Applications/GWorkspace.app/Resources/Resources/Portuguese.lproj/Finder.gorm/Finder.gorm/CVS/Entries
+System/Applications/GWorkspace.app/Resources/Resources/Portuguese.lproj/Finder.gorm/Finder.gorm/CVS/Repository
+System/Applications/GWorkspace.app/Resources/Resources/Portuguese.lproj/Finder.gorm/Finder.gorm/CVS/Root
+System/Applications/GWorkspace.app/Resources/Resources/Portuguese.lproj/Finder.gorm/Finder.gorm/data.classes
+System/Applications/GWorkspace.app/Resources/Resources/Portuguese.lproj/Finder.gorm/Finder.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/Resources/Portuguese.lproj/Finder.gorm/data.classes
 System/Applications/GWorkspace.app/Resources/Resources/Portuguese.lproj/Finder.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/Resources/Portuguese.lproj/Localizable.strings
 System/Applications/GWorkspace.app/Resources/Resources/Romanian.lproj/Finder.gorm/CVS/Entries
 System/Applications/GWorkspace.app/Resources/Resources/Romanian.lproj/Finder.gorm/CVS/Repository
 System/Applications/GWorkspace.app/Resources/Resources/Romanian.lproj/Finder.gorm/CVS/Root
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/Romanian.lproj/Finder.gorm/Finder.gorm/CVS/Entries
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/Romanian.lproj/Finder.gorm/Finder.gorm/CVS/Repository
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/Romanian.lproj/Finder.gorm/Finder.gorm/CVS/Root
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/Romanian.lproj/Finder.gorm/Finder.gorm/data.classes
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/Romanian.lproj/Finder.gorm/Finder.gorm/objects.gorm
+System/Applications/GWorkspace.app/Resources/Resources/Romanian.lproj/Finder.gorm/Finder.gorm/CVS/Entries
+System/Applications/GWorkspace.app/Resources/Resources/Romanian.lproj/Finder.gorm/Finder.gorm/CVS/Repository
+System/Applications/GWorkspace.app/Resources/Resources/Romanian.lproj/Finder.gorm/Finder.gorm/CVS/Root
+System/Applications/GWorkspace.app/Resources/Resources/Romanian.lproj/Finder.gorm/Finder.gorm/data.classes
+System/Applications/GWorkspace.app/Resources/Resources/Romanian.lproj/Finder.gorm/Finder.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/Resources/Romanian.lproj/Finder.gorm/data.classes
 System/Applications/GWorkspace.app/Resources/Resources/Romanian.lproj/Finder.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/Resources/Romanian.lproj/Localizable.strings
 System/Applications/GWorkspace.app/Resources/Resources/Spanish.lproj/Finder.gorm/CVS/Entries
 System/Applications/GWorkspace.app/Resources/Resources/Spanish.lproj/Finder.gorm/CVS/Repository
 System/Applications/GWorkspace.app/Resources/Resources/Spanish.lproj/Finder.gorm/CVS/Root
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/Spanish.lproj/Finder.gorm/Finder.gorm/CVS/Entries
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/Spanish.lproj/Finder.gorm/Finder.gorm/CVS/Repository
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/Spanish.lproj/Finder.gorm/Finder.gorm/CVS/Root
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/Spanish.lproj/Finder.gorm/Finder.gorm/data.classes
-%%GNUSTEP_DEVEL%%System/Applications/GWorkspace.app/Resources/Resources/Spanish.lproj/Finder.gorm/Finder.gorm/objects.gorm
+System/Applications/GWorkspace.app/Resources/Resources/Spanish.lproj/Finder.gorm/Finder.gorm/CVS/Entries
+System/Applications/GWorkspace.app/Resources/Resources/Spanish.lproj/Finder.gorm/Finder.gorm/CVS/Repository
+System/Applications/GWorkspace.app/Resources/Resources/Spanish.lproj/Finder.gorm/Finder.gorm/CVS/Root
+System/Applications/GWorkspace.app/Resources/Resources/Spanish.lproj/Finder.gorm/Finder.gorm/data.classes
+System/Applications/GWorkspace.app/Resources/Resources/Spanish.lproj/Finder.gorm/Finder.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/Resources/Spanish.lproj/Finder.gorm/data.classes
 System/Applications/GWorkspace.app/Resources/Resources/Spanish.lproj/Finder.gorm/objects.gorm
 System/Applications/GWorkspace.app/Resources/Resources/Spanish.lproj/Localizable.strings
@@ -756,7 +756,7 @@ System/Applications/GWorkspace.app/Resources/Romanian.lproj/Localizable.strings
 System/Applications/GWorkspace.app/Resources/Romanian.lproj/MainMenu-OSX.gsmarkup
 System/Applications/GWorkspace.app/Resources/RtfViewer.inspector/Resources/Info-gnustep.plist
 System/Applications/GWorkspace.app/Resources/RtfViewer.inspector/Resources/InspectorInfo.plist
-System/Applications/GWorkspace.app/Resources/RtfViewer.inspector/%%NOFLAT%%RtfViewer
+System/Applications/GWorkspace.app/Resources/RtfViewer.inspector/RtfViewer
 System/Applications/GWorkspace.app/Resources/RtfViewer.inspector/stamp.make
 System/Applications/GWorkspace.app/Resources/SlideMask.tiff
 System/Applications/GWorkspace.app/Resources/SmallCellHighlight.tiff
@@ -766,7 +766,7 @@ System/Applications/GWorkspace.app/Resources/SmallIconsViewer.viewer/Resources/C
 System/Applications/GWorkspace.app/Resources/SmallIconsViewer.viewer/Resources/CVS/Root
 System/Applications/GWorkspace.app/Resources/SmallIconsViewer.viewer/Resources/Info-gnustep.plist
 System/Applications/GWorkspace.app/Resources/SmallIconsViewer.viewer/Resources/miniwindow.tiff
-System/Applications/GWorkspace.app/Resources/SmallIconsViewer.viewer/%%NOFLAT%%SmallIconsViewer
+System/Applications/GWorkspace.app/Resources/SmallIconsViewer.viewer/SmallIconsViewer
 System/Applications/GWorkspace.app/Resources/SmallIconsViewer.viewer/stamp.make
 System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/Resources/CVS/Entries
 System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/Resources/CVS/Repository
@@ -776,7 +776,7 @@ System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/Resources/Ins
 System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/Resources/pause.tiff
 System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/Resources/play.tiff
 System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/Resources/stop.tiff
-System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/%%NOFLAT%%SoundViewer
+System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/SoundViewer
 System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/stamp.make
 System/Applications/GWorkspace.app/Resources/Spanish.lproj/CVS/Entries
 System/Applications/GWorkspace.app/Resources/Spanish.lproj/CVS/Repository
@@ -796,7 +796,7 @@ System/Applications/GWorkspace.app/Resources/Spanish.lproj/Localizable.strings
 System/Applications/GWorkspace.app/Resources/Spanish.lproj/MainMenu-OSX.gsmarkup
 System/Applications/GWorkspace.app/Resources/StringsViewer.inspector/Resources/Info-gnustep.plist
 System/Applications/GWorkspace.app/Resources/StringsViewer.inspector/Resources/InspectorInfo.plist
-System/Applications/GWorkspace.app/Resources/StringsViewer.inspector/%%NOFLAT%%StringsViewer
+System/Applications/GWorkspace.app/Resources/StringsViewer.inspector/StringsViewer
 System/Applications/GWorkspace.app/Resources/StringsViewer.inspector/stamp.make
 System/Applications/GWorkspace.app/Resources/TileHighlight.tiff
 System/Applications/GWorkspace.app/Resources/Weekday-0.tiff
@@ -820,12 +820,11 @@ System/Applications/GWorkspace.app/Resources/stop_48.tiff
 System/Applications/GWorkspace.app/Resources/switchMultiple.tiff
 System/Applications/GWorkspace.app/Resources/switchOff.tiff
 System/Applications/GWorkspace.app/Resources/switchOn.tiff
-%%GNUSTEP_STABLE%%System/Applications/GWorkspace.app/%%NOFLAT%%GWorkspace
-System/Applications/GWorkspace.app/%%NOFLAT%%library_paths.openapp
+System/Applications/GWorkspace.app/library_paths.openapp
 System/Applications/GWorkspace.app/stamp.make
 System/Library/Bundles/AppViewer.inspector/Resources/Info-gnustep.plist
 System/Library/Bundles/AppViewer.inspector/Resources/InspectorInfo.plist
-System/Library/Bundles/AppViewer.inspector/%%NOFLAT%%AppViewer
+System/Library/Bundles/AppViewer.inspector/AppViewer
 System/Library/Bundles/AppViewer.inspector/stamp.make
 System/Library/Bundles/BrowserViewer.viewer/Resources/CVS/Entries
 System/Library/Bundles/BrowserViewer.viewer/Resources/CVS/Repository
@@ -860,11 +859,11 @@ System/Library/Bundles/BrowserViewer.viewer/Resources/Italian.lproj/CVS/Root
 System/Library/Bundles/BrowserViewer.viewer/Resources/Portuguese.lproj/CVS/Entries
 System/Library/Bundles/BrowserViewer.viewer/Resources/Portuguese.lproj/CVS/Repository
 System/Library/Bundles/BrowserViewer.viewer/Resources/Portuguese.lproj/CVS/Root
-%%GNUSTEP_DEVEL%%System/Library/Bundles/BrowserViewer.viewer/Resources/Resources/English.lproj/BrowserViewerPref.gorm/BrowserViewerPref.gorm/CVS/Entries
-%%GNUSTEP_DEVEL%%System/Library/Bundles/BrowserViewer.viewer/Resources/Resources/English.lproj/BrowserViewerPref.gorm/BrowserViewerPref.gorm/CVS/Repository
-%%GNUSTEP_DEVEL%%System/Library/Bundles/BrowserViewer.viewer/Resources/Resources/English.lproj/BrowserViewerPref.gorm/BrowserViewerPref.gorm/CVS/Root
-%%GNUSTEP_DEVEL%%System/Library/Bundles/BrowserViewer.viewer/Resources/Resources/English.lproj/BrowserViewerPref.gorm/BrowserViewerPref.gorm/data.classes
-%%GNUSTEP_DEVEL%%System/Library/Bundles/BrowserViewer.viewer/Resources/Resources/English.lproj/BrowserViewerPref.gorm/BrowserViewerPref.gorm/objects.gorm
+System/Library/Bundles/BrowserViewer.viewer/Resources/Resources/English.lproj/BrowserViewerPref.gorm/BrowserViewerPref.gorm/CVS/Entries
+System/Library/Bundles/BrowserViewer.viewer/Resources/Resources/English.lproj/BrowserViewerPref.gorm/BrowserViewerPref.gorm/CVS/Repository
+System/Library/Bundles/BrowserViewer.viewer/Resources/Resources/English.lproj/BrowserViewerPref.gorm/BrowserViewerPref.gorm/CVS/Root
+System/Library/Bundles/BrowserViewer.viewer/Resources/Resources/English.lproj/BrowserViewerPref.gorm/BrowserViewerPref.gorm/data.classes
+System/Library/Bundles/BrowserViewer.viewer/Resources/Resources/English.lproj/BrowserViewerPref.gorm/BrowserViewerPref.gorm/objects.gorm
 System/Library/Bundles/BrowserViewer.viewer/Resources/Resources/English.lproj/BrowserViewerPref.gorm/CVS/Entries
 System/Library/Bundles/BrowserViewer.viewer/Resources/Resources/English.lproj/BrowserViewerPref.gorm/CVS/Repository
 System/Library/Bundles/BrowserViewer.viewer/Resources/Resources/English.lproj/BrowserViewerPref.gorm/CVS/Root
@@ -877,11 +876,11 @@ System/Library/Bundles/BrowserViewer.viewer/Resources/Spanish.lproj/CVS/Entries
 System/Library/Bundles/BrowserViewer.viewer/Resources/Spanish.lproj/CVS/Repository
 System/Library/Bundles/BrowserViewer.viewer/Resources/Spanish.lproj/CVS/Root
 System/Library/Bundles/BrowserViewer.viewer/Resources/miniwindow.tiff
-System/Library/Bundles/BrowserViewer.viewer/%%NOFLAT%%BrowserViewer
+System/Library/Bundles/BrowserViewer.viewer/BrowserViewer
 System/Library/Bundles/BrowserViewer.viewer/stamp.make
 System/Library/Bundles/FolderViewer.inspector/Resources/Info-gnustep.plist
 System/Library/Bundles/FolderViewer.inspector/Resources/InspectorInfo.plist
-System/Library/Bundles/FolderViewer.inspector/%%NOFLAT%%FolderViewer
+System/Library/Bundles/FolderViewer.inspector/FolderViewer
 System/Library/Bundles/FolderViewer.inspector/stamp.make
 System/Library/Bundles/IconsViewer.viewer/Resources/CVS/Entries
 System/Library/Bundles/IconsViewer.viewer/Resources/CVS/Repository
@@ -922,11 +921,11 @@ System/Library/Bundles/IconsViewer.viewer/Resources/Portuguese.lproj/CVS/Root
 System/Library/Bundles/IconsViewer.viewer/Resources/Resources/English.lproj/IconsViewerPref.gorm/CVS/Entries
 System/Library/Bundles/IconsViewer.viewer/Resources/Resources/English.lproj/IconsViewerPref.gorm/CVS/Repository
 System/Library/Bundles/IconsViewer.viewer/Resources/Resources/English.lproj/IconsViewerPref.gorm/CVS/Root
-%%GNUSTEP_DEVEL%%System/Library/Bundles/IconsViewer.viewer/Resources/Resources/English.lproj/IconsViewerPref.gorm/IconsViewerPref.gorm/CVS/Entries
-%%GNUSTEP_DEVEL%%System/Library/Bundles/IconsViewer.viewer/Resources/Resources/English.lproj/IconsViewerPref.gorm/IconsViewerPref.gorm/CVS/Repository
-%%GNUSTEP_DEVEL%%System/Library/Bundles/IconsViewer.viewer/Resources/Resources/English.lproj/IconsViewerPref.gorm/IconsViewerPref.gorm/CVS/Root
-%%GNUSTEP_DEVEL%%System/Library/Bundles/IconsViewer.viewer/Resources/Resources/English.lproj/IconsViewerPref.gorm/IconsViewerPref.gorm/data.classes
-%%GNUSTEP_DEVEL%%System/Library/Bundles/IconsViewer.viewer/Resources/Resources/English.lproj/IconsViewerPref.gorm/IconsViewerPref.gorm/objects.gorm
+System/Library/Bundles/IconsViewer.viewer/Resources/Resources/English.lproj/IconsViewerPref.gorm/IconsViewerPref.gorm/CVS/Entries
+System/Library/Bundles/IconsViewer.viewer/Resources/Resources/English.lproj/IconsViewerPref.gorm/IconsViewerPref.gorm/CVS/Repository
+System/Library/Bundles/IconsViewer.viewer/Resources/Resources/English.lproj/IconsViewerPref.gorm/IconsViewerPref.gorm/CVS/Root
+System/Library/Bundles/IconsViewer.viewer/Resources/Resources/English.lproj/IconsViewerPref.gorm/IconsViewerPref.gorm/data.classes
+System/Library/Bundles/IconsViewer.viewer/Resources/Resources/English.lproj/IconsViewerPref.gorm/IconsViewerPref.gorm/objects.gorm
 System/Library/Bundles/IconsViewer.viewer/Resources/Resources/English.lproj/IconsViewerPref.gorm/data.classes
 System/Library/Bundles/IconsViewer.viewer/Resources/Resources/English.lproj/IconsViewerPref.gorm/objects.gorm
 System/Library/Bundles/IconsViewer.viewer/Resources/Romanian.lproj/CVS/Entries
@@ -936,18 +935,18 @@ System/Library/Bundles/IconsViewer.viewer/Resources/Spanish.lproj/CVS/Entries
 System/Library/Bundles/IconsViewer.viewer/Resources/Spanish.lproj/CVS/Repository
 System/Library/Bundles/IconsViewer.viewer/Resources/Spanish.lproj/CVS/Root
 System/Library/Bundles/IconsViewer.viewer/Resources/miniwindow.tiff
-System/Library/Bundles/IconsViewer.viewer/%%NOFLAT%%IconsViewer
+System/Library/Bundles/IconsViewer.viewer/IconsViewer
 System/Library/Bundles/IconsViewer.viewer/stamp.make
-System/Library/Bundles/ImageThumbnailer.thumb/%%NOFLAT%%ImageThumbnailer
+System/Library/Bundles/ImageThumbnailer.thumb/ImageThumbnailer
 System/Library/Bundles/ImageThumbnailer.thumb/Resources/Info-gnustep.plist
 System/Library/Bundles/ImageThumbnailer.thumb/stamp.make
 System/Library/Bundles/ImageViewer.inspector/Resources/Info-gnustep.plist
 System/Library/Bundles/ImageViewer.inspector/Resources/InspectorInfo.plist
-System/Library/Bundles/ImageViewer.inspector/%%NOFLAT%%ImageViewer
+System/Library/Bundles/ImageViewer.inspector/ImageViewer
 System/Library/Bundles/ImageViewer.inspector/stamp.make
 System/Library/Bundles/InspectorViewer.inspector/Resources/Info-gnustep.plist
 System/Library/Bundles/InspectorViewer.inspector/Resources/InspectorInfo.plist
-System/Library/Bundles/InspectorViewer.inspector/%%NOFLAT%%InspectorViewer
+System/Library/Bundles/InspectorViewer.inspector/InspectorViewer
 System/Library/Bundles/InspectorViewer.inspector/stamp.make
 %%PDFVIEW%%System/Library/Bundles/PdfViewer.inspector/Resources/CVS/Entries
 %%PDFVIEW%%System/Library/Bundles/PdfViewer.inspector/Resources/CVS/Repository
@@ -961,22 +960,22 @@ System/Library/Bundles/InspectorViewer.inspector/stamp.make
 %%PDFVIEW%%System/Library/Bundles/PdfViewer.inspector/Resources/play.tiff
 %%PDFVIEW%%System/Library/Bundles/PdfViewer.inspector/Resources/right.tiff
 %%PDFVIEW%%System/Library/Bundles/PdfViewer.inspector/Resources/stop.tiff
-%%PDFVIEW%%System/Library/Bundles/PdfViewer.inspector/%%NOFLAT%%PdfViewer
+%%PDFVIEW%%System/Library/Bundles/PdfViewer.inspector/PdfViewer
 %%PDFVIEW%%System/Library/Bundles/PdfViewer.inspector/stamp.make
 System/Library/Bundles/PlistViewer.inspector/Resources/Info-gnustep.plist
 System/Library/Bundles/PlistViewer.inspector/Resources/InspectorInfo.plist
-System/Library/Bundles/PlistViewer.inspector/%%NOFLAT%%PlistViewer
+System/Library/Bundles/PlistViewer.inspector/PlistViewer
 System/Library/Bundles/PlistViewer.inspector/stamp.make
 System/Library/Bundles/RtfViewer.inspector/Resources/Info-gnustep.plist
 System/Library/Bundles/RtfViewer.inspector/Resources/InspectorInfo.plist
-System/Library/Bundles/RtfViewer.inspector/%%NOFLAT%%RtfViewer
+System/Library/Bundles/RtfViewer.inspector/RtfViewer
 System/Library/Bundles/RtfViewer.inspector/stamp.make
 System/Library/Bundles/SmallIconsViewer.viewer/Resources/CVS/Entries
 System/Library/Bundles/SmallIconsViewer.viewer/Resources/CVS/Repository
 System/Library/Bundles/SmallIconsViewer.viewer/Resources/CVS/Root
 System/Library/Bundles/SmallIconsViewer.viewer/Resources/Info-gnustep.plist
 System/Library/Bundles/SmallIconsViewer.viewer/Resources/miniwindow.tiff
-System/Library/Bundles/SmallIconsViewer.viewer/%%NOFLAT%%SmallIconsViewer
+System/Library/Bundles/SmallIconsViewer.viewer/SmallIconsViewer
 System/Library/Bundles/SmallIconsViewer.viewer/stamp.make
 System/Library/Bundles/SoundViewer.inspector/Resources/CVS/Entries
 System/Library/Bundles/SoundViewer.inspector/Resources/CVS/Repository
@@ -986,95 +985,59 @@ System/Library/Bundles/SoundViewer.inspector/Resources/InspectorInfo.plist
 System/Library/Bundles/SoundViewer.inspector/Resources/pause.tiff
 System/Library/Bundles/SoundViewer.inspector/Resources/play.tiff
 System/Library/Bundles/SoundViewer.inspector/Resources/stop.tiff
-System/Library/Bundles/SoundViewer.inspector/%%NOFLAT%%SoundViewer
+System/Library/Bundles/SoundViewer.inspector/SoundViewer
 System/Library/Bundles/SoundViewer.inspector/stamp.make
 System/Library/Bundles/StringsViewer.inspector/Resources/Info-gnustep.plist
 System/Library/Bundles/StringsViewer.inspector/Resources/InspectorInfo.plist
-System/Library/Bundles/StringsViewer.inspector/%%NOFLAT%%StringsViewer
+System/Library/Bundles/StringsViewer.inspector/StringsViewer
 System/Library/Bundles/StringsViewer.inspector/stamp.make
-%%SYSTEMLIBRARY%%/Headers/GWorkspace/BNameEditor.h
-%%SYSTEMLIBRARY%%/Headers/GWorkspace/Browser2.h
-%%SYSTEMLIBRARY%%/Headers/GWorkspace/ContentViewersProtocol.h
-%%SYSTEMLIBRARY%%/Headers/GWorkspace/GWFunctions.h
-%%SYSTEMLIBRARY%%/Headers/GWorkspace/GWLib.h
-%%SYSTEMLIBRARY%%/Headers/GWorkspace/GWNotifications.h
-%%SYSTEMLIBRARY%%/Headers/GWorkspace/GWProtocol.h
-%%SYSTEMLIBRARY%%/Headers/GWorkspace/IconViewsProtocol.h
-%%SYSTEMLIBRARY%%/Headers/GWorkspace/InspectorsProtocol.h
-%%SYSTEMLIBRARY%%/Headers/GWorkspace/PreferencesProtocol.h
-%%SYSTEMLIBRARY%%/Headers/GWorkspace/ViewersProtocol.h
-%%SYSTEMLIBRARY%%/Libraries/%%NOFLAT%%libGWorkspace.so
-%%SYSTEMLIBRARY%%/Libraries/%%NOFLAT%%libGWorkspace.so.1
-%%SYSTEMLIBRARY%%/Libraries/%%NOFLAT%%libGWorkspace.so.1.0.0
-System/Library/Services/thumbnailer.service/%%NOFLAT%%thumbnailer
+System/Library/Headers/GWorkspace/BNameEditor.h
+System/Library/Headers/GWorkspace/Browser2.h
+System/Library/Headers/GWorkspace/ContentViewersProtocol.h
+System/Library/Headers/GWorkspace/GWFunctions.h
+System/Library/Headers/GWorkspace/GWLib.h
+System/Library/Headers/GWorkspace/GWNotifications.h
+System/Library/Headers/GWorkspace/GWProtocol.h
+System/Library/Headers/GWorkspace/IconViewsProtocol.h
+System/Library/Headers/GWorkspace/InspectorsProtocol.h
+System/Library/Headers/GWorkspace/PreferencesProtocol.h
+System/Library/Headers/GWorkspace/ViewersProtocol.h
+System/Library/Libraries/libGWorkspace.so
+System/Library/Libraries/libGWorkspace.so.1
+System/Library/Libraries/libGWorkspace.so.1.0.0
+System/Library/Services/thumbnailer.service/thumbnailer
 System/Library/Services/thumbnailer.service/Resources/ImageThumbnailer.thumb/Resources/Info-gnustep.plist
-System/Library/Services/thumbnailer.service/Resources/ImageThumbnailer.thumb/%%NOFLAT%%ImageThumbnailer
+System/Library/Services/thumbnailer.service/Resources/ImageThumbnailer.thumb/ImageThumbnailer
 System/Library/Services/thumbnailer.service/Resources/ImageThumbnailer.thumb/stamp.make
 System/Library/Services/thumbnailer.service/Resources/Info-gnustep.plist
-System/Tools/%%NOFLAT%%findfile
-System/Tools/%%NOFLAT%%wopen
-%%GNUSTEP_STABLE%%@dirrm System/Library/Services/thumbnailer.service/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm System/Library/Services/thumbnailer.service/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm System/Library/Services/thumbnailer.service/%%GNU_ARCH%%
-%%GNUSTEP_STABLE%%@dirrm System/Library/Services/thumbnailer.service/Resources/ImageThumbnailer.thumb/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm System/Library/Services/thumbnailer.service/Resources/ImageThumbnailer.thumb/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm System/Library/Services/thumbnailer.service/Resources/ImageThumbnailer.thumb/%%GNU_ARCH%%
+System/Tools/findfile
+System/Tools/wopen
 @dirrm System/Library/Services/thumbnailer.service/Resources/ImageThumbnailer.thumb/Resources
 @dirrm System/Library/Services/thumbnailer.service/Resources/ImageThumbnailer.thumb
 @dirrm System/Library/Services/thumbnailer.service/Resources
 @dirrm System/Library/Services/thumbnailer.service
-@dirrm %%SYSTEMLIBRARY%%/Headers/GWorkspace
-%%GNUSTEP_STABLE%%@dirrm System/Library/Bundles/StringsViewer.inspector/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm System/Library/Bundles/StringsViewer.inspector/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm System/Library/Bundles/StringsViewer.inspector/%%GNU_ARCH%%
+@dirrm System/Library/Headers/GWorkspace
 @dirrm System/Library/Bundles/StringsViewer.inspector/Resources
 @dirrm System/Library/Bundles/StringsViewer.inspector
-%%GNUSTEP_STABLE%%@dirrm System/Library/Bundles/SoundViewer.inspector/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm System/Library/Bundles/SoundViewer.inspector/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm System/Library/Bundles/SoundViewer.inspector/%%GNU_ARCH%%
 @dirrm System/Library/Bundles/SoundViewer.inspector/Resources/CVS
 @dirrm System/Library/Bundles/SoundViewer.inspector/Resources
 @dirrm System/Library/Bundles/SoundViewer.inspector
-%%GNUSTEP_STABLE%%@dirrm System/Library/Bundles/SmallIconsViewer.viewer/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm System/Library/Bundles/SmallIconsViewer.viewer/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm System/Library/Bundles/SmallIconsViewer.viewer/%%GNU_ARCH%%
 @dirrm System/Library/Bundles/SmallIconsViewer.viewer/Resources/CVS
 @dirrm System/Library/Bundles/SmallIconsViewer.viewer/Resources
 @dirrm System/Library/Bundles/SmallIconsViewer.viewer
-%%GNUSTEP_STABLE%%@dirrm System/Library/Bundles/RtfViewer.inspector/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm System/Library/Bundles/RtfViewer.inspector/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm System/Library/Bundles/RtfViewer.inspector/%%GNU_ARCH%%
 @dirrm System/Library/Bundles/RtfViewer.inspector/Resources
 @dirrm System/Library/Bundles/RtfViewer.inspector
-%%GNUSTEP_STABLE%%@dirrm System/Library/Bundles/PlistViewer.inspector/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm System/Library/Bundles/PlistViewer.inspector/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm System/Library/Bundles/PlistViewer.inspector/%%GNU_ARCH%%
 @dirrm System/Library/Bundles/PlistViewer.inspector/Resources
 @dirrm System/Library/Bundles/PlistViewer.inspector
-%%GNUSTEP_STABLE%%@dirrm System/Library/Bundles/PdfViewer.inspector/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm System/Library/Bundles/PdfViewer.inspector/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm System/Library/Bundles/PdfViewer.inspector/%%GNU_ARCH%%
 @dirrm System/Library/Bundles/PdfViewer.inspector/Resources/CVS
 @dirrm System/Library/Bundles/PdfViewer.inspector/Resources
 @dirrm System/Library/Bundles/PdfViewer.inspector
-%%GNUSTEP_STABLE%%@dirrm System/Library/Bundles/InspectorViewer.inspector/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm System/Library/Bundles/InspectorViewer.inspector/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm System/Library/Bundles/InspectorViewer.inspector/%%GNU_ARCH%%
 @dirrm System/Library/Bundles/InspectorViewer.inspector/Resources
 @dirrm System/Library/Bundles/InspectorViewer.inspector
-%%GNUSTEP_STABLE%%@dirrm System/Library/Bundles/ImageViewer.inspector/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm System/Library/Bundles/ImageViewer.inspector/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm System/Library/Bundles/ImageViewer.inspector/%%GNU_ARCH%%
 @dirrm System/Library/Bundles/ImageViewer.inspector/Resources
 @dirrm System/Library/Bundles/ImageViewer.inspector
-%%GNUSTEP_STABLE%%@dirrm System/Library/Bundles/ImageThumbnailer.thumb/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm System/Library/Bundles/ImageThumbnailer.thumb/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm System/Library/Bundles/ImageThumbnailer.thumb/%%GNU_ARCH%%
 @dirrm System/Library/Bundles/ImageThumbnailer.thumb/Resources
 @dirrm System/Library/Bundles/ImageThumbnailer.thumb
-%%GNUSTEP_STABLE%%@dirrm System/Library/Bundles/IconsViewer.viewer/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm System/Library/Bundles/IconsViewer.viewer/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm System/Library/Bundles/IconsViewer.viewer/%%GNU_ARCH%%
 @dirrm System/Library/Bundles/IconsViewer.viewer/Resources/Spanish.lproj/CVS
 @dirrm System/Library/Bundles/IconsViewer.viewer/Resources/Spanish.lproj
 @dirrm System/Library/Bundles/IconsViewer.viewer/Resources/Romanian.lproj/CVS
@@ -1086,8 +1049,8 @@ System/Tools/%%NOFLAT%%wopen
 @dirrm System/Library/Bundles/IconsViewer.viewer/Resources/Resources/German.lproj
 @dirrm System/Library/Bundles/IconsViewer.viewer/Resources/Resources/French.lproj
 @dirrm System/Library/Bundles/IconsViewer.viewer/Resources/Resources/English.lproj/IconsViewerPref.gorm/CVS
-%%GNUSTEP_DEVEL%%@dirrm System/Library/Bundles/IconsViewer.viewer/Resources/Resources/English.lproj/IconsViewerPref.gorm/IconsViewerPref.gorm/CVS
-%%GNUSTEP_DEVEL%%@dirrm System/Library/Bundles/IconsViewer.viewer/Resources/Resources/English.lproj/IconsViewerPref.gorm/IconsViewerPref.gorm
+@dirrm System/Library/Bundles/IconsViewer.viewer/Resources/Resources/English.lproj/IconsViewerPref.gorm/IconsViewerPref.gorm/CVS
+@dirrm System/Library/Bundles/IconsViewer.viewer/Resources/Resources/English.lproj/IconsViewerPref.gorm/IconsViewerPref.gorm
 @dirrm System/Library/Bundles/IconsViewer.viewer/Resources/Resources/English.lproj/IconsViewerPref.gorm
 @dirrm System/Library/Bundles/IconsViewer.viewer/Resources/Resources/English.lproj
 @dirrm System/Library/Bundles/IconsViewer.viewer/Resources/Resources/Dutch.lproj
@@ -1113,14 +1076,8 @@ System/Tools/%%NOFLAT%%wopen
 @dirrm System/Library/Bundles/IconsViewer.viewer/Resources/CVS
 @dirrm System/Library/Bundles/IconsViewer.viewer/Resources
 @dirrm System/Library/Bundles/IconsViewer.viewer
-%%GNUSTEP_STABLE%%@dirrm System/Library/Bundles/FolderViewer.inspector/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm System/Library/Bundles/FolderViewer.inspector/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm System/Library/Bundles/FolderViewer.inspector/%%GNU_ARCH%%
 @dirrm System/Library/Bundles/FolderViewer.inspector/Resources
 @dirrm System/Library/Bundles/FolderViewer.inspector
-%%GNUSTEP_STABLE%%@dirrm System/Library/Bundles/BrowserViewer.viewer/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm System/Library/Bundles/BrowserViewer.viewer/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm System/Library/Bundles/BrowserViewer.viewer/%%GNU_ARCH%%
 @dirrm System/Library/Bundles/BrowserViewer.viewer/Resources/Spanish.lproj/CVS
 @dirrm System/Library/Bundles/BrowserViewer.viewer/Resources/Spanish.lproj
 @dirrm System/Library/Bundles/BrowserViewer.viewer/Resources/Romanian.lproj/CVS
@@ -1132,8 +1089,8 @@ System/Tools/%%NOFLAT%%wopen
 @dirrm System/Library/Bundles/BrowserViewer.viewer/Resources/Resources/German.lproj
 @dirrm System/Library/Bundles/BrowserViewer.viewer/Resources/Resources/French.lproj
 @dirrm System/Library/Bundles/BrowserViewer.viewer/Resources/Resources/English.lproj/BrowserViewerPref.gorm/CVS
-%%GNUSTEP_DEVEL%%@dirrm System/Library/Bundles/BrowserViewer.viewer/Resources/Resources/English.lproj/BrowserViewerPref.gorm/BrowserViewerPref.gorm/CVS
-%%GNUSTEP_DEVEL%%@dirrm System/Library/Bundles/BrowserViewer.viewer/Resources/Resources/English.lproj/BrowserViewerPref.gorm/BrowserViewerPref.gorm
+@dirrm System/Library/Bundles/BrowserViewer.viewer/Resources/Resources/English.lproj/BrowserViewerPref.gorm/BrowserViewerPref.gorm/CVS
+@dirrm System/Library/Bundles/BrowserViewer.viewer/Resources/Resources/English.lproj/BrowserViewerPref.gorm/BrowserViewerPref.gorm
 @dirrm System/Library/Bundles/BrowserViewer.viewer/Resources/Resources/English.lproj/BrowserViewerPref.gorm
 @dirrm System/Library/Bundles/BrowserViewer.viewer/Resources/Resources/English.lproj
 @dirrm System/Library/Bundles/BrowserViewer.viewer/Resources/Resources/Dutch.lproj
@@ -1157,17 +1114,8 @@ System/Tools/%%NOFLAT%%wopen
 @dirrm System/Library/Bundles/BrowserViewer.viewer/Resources/CVS
 @dirrm System/Library/Bundles/BrowserViewer.viewer/Resources
 @dirrm System/Library/Bundles/BrowserViewer.viewer
-%%GNUSTEP_STABLE%%@dirrm System/Library/Bundles/AppViewer.inspector/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm System/Library/Bundles/AppViewer.inspector/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm System/Library/Bundles/AppViewer.inspector/%%GNU_ARCH%%
 @dirrm System/Library/Bundles/AppViewer.inspector/Resources
 @dirrm System/Library/Bundles/AppViewer.inspector
-%%GNUSTEP_STABLE%%@dirrm System/Applications/GWorkspace.app/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm System/Applications/GWorkspace.app/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm System/Applications/GWorkspace.app/%%GNU_ARCH%%
-%%GNUSTEP_STABLE%%@dirrm System/Applications/GWorkspace.app/Resources/StringsViewer.inspector/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm System/Applications/GWorkspace.app/Resources/StringsViewer.inspector/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm System/Applications/GWorkspace.app/Resources/StringsViewer.inspector/%%GNU_ARCH%%
 @dirrm System/Applications/GWorkspace.app/Resources/StringsViewer.inspector/Resources
 @dirrm System/Applications/GWorkspace.app/Resources/StringsViewer.inspector
 @dirrm System/Applications/GWorkspace.app/Resources/Spanish.lproj/Finder.nib/CVS
@@ -1176,21 +1124,12 @@ System/Tools/%%NOFLAT%%wopen
 @dirrm System/Applications/GWorkspace.app/Resources/Spanish.lproj/Finder.gorm
 @dirrm System/Applications/GWorkspace.app/Resources/Spanish.lproj/CVS
 @dirrm System/Applications/GWorkspace.app/Resources/Spanish.lproj
-%%GNUSTEP_STABLE%%@dirrm System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/%%GNU_ARCH%%
 @dirrm System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/Resources/CVS
 @dirrm System/Applications/GWorkspace.app/Resources/SoundViewer.inspector/Resources
 @dirrm System/Applications/GWorkspace.app/Resources/SoundViewer.inspector
-%%GNUSTEP_STABLE%%@dirrm System/Applications/GWorkspace.app/Resources/SmallIconsViewer.viewer/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm System/Applications/GWorkspace.app/Resources/SmallIconsViewer.viewer/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm System/Applications/GWorkspace.app/Resources/SmallIconsViewer.viewer/%%GNU_ARCH%%
 @dirrm System/Applications/GWorkspace.app/Resources/SmallIconsViewer.viewer/Resources/CVS
 @dirrm System/Applications/GWorkspace.app/Resources/SmallIconsViewer.viewer/Resources
 @dirrm System/Applications/GWorkspace.app/Resources/SmallIconsViewer.viewer
-%%GNUSTEP_STABLE%%@dirrm System/Applications/GWorkspace.app/Resources/RtfViewer.inspector/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm System/Applications/GWorkspace.app/Resources/RtfViewer.inspector/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm System/Applications/GWorkspace.app/Resources/RtfViewer.inspector/%%GNU_ARCH%%
 @dirrm System/Applications/GWorkspace.app/Resources/RtfViewer.inspector/Resources
 @dirrm System/Applications/GWorkspace.app/Resources/RtfViewer.inspector
 @dirrm System/Applications/GWorkspace.app/Resources/Romanian.lproj/Finder.nib/CVS
@@ -1199,111 +1138,111 @@ System/Tools/%%NOFLAT%%wopen
 @dirrm System/Applications/GWorkspace.app/Resources/Romanian.lproj/Finder.gorm
 @dirrm System/Applications/GWorkspace.app/Resources/Romanian.lproj/CVS
 @dirrm System/Applications/GWorkspace.app/Resources/Romanian.lproj
-%%GNUSTEP_DEVEL%%@dirrm System/Applications/GWorkspace.app/Resources/Resources/Spanish.lproj/Finder.gorm/Finder.gorm/CVS
-%%GNUSTEP_DEVEL%%@dirrm System/Applications/GWorkspace.app/Resources/Resources/Spanish.lproj/Finder.gorm/Finder.gorm
+@dirrm System/Applications/GWorkspace.app/Resources/Resources/Spanish.lproj/Finder.gorm/Finder.gorm/CVS
+@dirrm System/Applications/GWorkspace.app/Resources/Resources/Spanish.lproj/Finder.gorm/Finder.gorm
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/Spanish.lproj/Finder.gorm/CVS
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/Spanish.lproj/Finder.gorm
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/Spanish.lproj
-%%GNUSTEP_DEVEL%%@dirrm System/Applications/GWorkspace.app/Resources/Resources/Romanian.lproj/Finder.gorm/Finder.gorm/CVS
-%%GNUSTEP_DEVEL%%@dirrm System/Applications/GWorkspace.app/Resources/Resources/Romanian.lproj/Finder.gorm/Finder.gorm
+@dirrm System/Applications/GWorkspace.app/Resources/Resources/Romanian.lproj/Finder.gorm/Finder.gorm/CVS
+@dirrm System/Applications/GWorkspace.app/Resources/Resources/Romanian.lproj/Finder.gorm/Finder.gorm
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/Romanian.lproj/Finder.gorm/CVS
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/Romanian.lproj/Finder.gorm
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/Romanian.lproj
-%%GNUSTEP_DEVEL%%@dirrm System/Applications/GWorkspace.app/Resources/Resources/Portuguese.lproj/Finder.gorm/Finder.gorm/CVS
-%%GNUSTEP_DEVEL%%@dirrm System/Applications/GWorkspace.app/Resources/Resources/Portuguese.lproj/Finder.gorm/Finder.gorm
+@dirrm System/Applications/GWorkspace.app/Resources/Resources/Portuguese.lproj/Finder.gorm/Finder.gorm/CVS
+@dirrm System/Applications/GWorkspace.app/Resources/Resources/Portuguese.lproj/Finder.gorm/Finder.gorm
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/Portuguese.lproj/Finder.gorm/CVS
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/Portuguese.lproj/Finder.gorm
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/Portuguese.lproj
-%%GNUSTEP_DEVEL%%@dirrm System/Applications/GWorkspace.app/Resources/Resources/Italian.lproj/Finder.gorm/Finder.gorm/CVS
-%%GNUSTEP_DEVEL%%@dirrm System/Applications/GWorkspace.app/Resources/Resources/Italian.lproj/Finder.gorm/Finder.gorm
+@dirrm System/Applications/GWorkspace.app/Resources/Resources/Italian.lproj/Finder.gorm/Finder.gorm/CVS
+@dirrm System/Applications/GWorkspace.app/Resources/Resources/Italian.lproj/Finder.gorm/Finder.gorm
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/Italian.lproj/Finder.gorm/CVS
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/Italian.lproj/Finder.gorm
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/Italian.lproj
-%%GNUSTEP_DEVEL%%@dirrm System/Applications/GWorkspace.app/Resources/Resources/German.lproj/Finder.gorm/Finder.gorm/CVS
-%%GNUSTEP_DEVEL%%@dirrm System/Applications/GWorkspace.app/Resources/Resources/German.lproj/Finder.gorm/Finder.gorm
+@dirrm System/Applications/GWorkspace.app/Resources/Resources/German.lproj/Finder.gorm/Finder.gorm/CVS
+@dirrm System/Applications/GWorkspace.app/Resources/Resources/German.lproj/Finder.gorm/Finder.gorm
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/German.lproj/Finder.gorm/CVS
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/German.lproj/Finder.gorm
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/German.lproj
-%%GNUSTEP_DEVEL%%@dirrm System/Applications/GWorkspace.app/Resources/Resources/French.lproj/Finder.gorm/Finder.gorm/CVS
-%%GNUSTEP_DEVEL%%@dirrm System/Applications/GWorkspace.app/Resources/Resources/French.lproj/Finder.gorm/Finder.gorm
+@dirrm System/Applications/GWorkspace.app/Resources/Resources/French.lproj/Finder.gorm/Finder.gorm/CVS
+@dirrm System/Applications/GWorkspace.app/Resources/Resources/French.lproj/Finder.gorm/Finder.gorm
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/French.lproj/Finder.gorm/CVS
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/French.lproj/Finder.gorm
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/French.lproj
-%%GNUSTEP_DEVEL%%@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/XTermPref.gorm/XTermPref.gorm/CVS
-%%GNUSTEP_DEVEL%%@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/XTermPref.gorm/XTermPref.gorm
+@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/XTermPref.gorm/XTermPref.gorm/CVS
+@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/XTermPref.gorm/XTermPref.gorm
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/XTermPref.gorm/CVS
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/XTermPref.gorm
-%%GNUSTEP_DEVEL%%@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ToolsPanel.gorm/ToolsPanel.gorm/CVS
-%%GNUSTEP_DEVEL%%@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ToolsPanel.gorm/ToolsPanel.gorm
+@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ToolsPanel.gorm/ToolsPanel.gorm/CVS
+@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ToolsPanel.gorm/ToolsPanel.gorm
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ToolsPanel.gorm/CVS
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ToolsPanel.gorm
-%%GNUSTEP_DEVEL%%@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ShelfPref.gorm/ShelfPref.gorm/CVS
-%%GNUSTEP_DEVEL%%@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ShelfPref.gorm/ShelfPref.gorm
+@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ShelfPref.gorm/ShelfPref.gorm/CVS
+@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ShelfPref.gorm/ShelfPref.gorm
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ShelfPref.gorm/CVS
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ShelfPref.gorm
-%%GNUSTEP_DEVEL%%@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/RunExternal.gorm/RunExternal.gorm/CVS
-%%GNUSTEP_DEVEL%%@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/RunExternal.gorm/RunExternal.gorm
+@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/RunExternal.gorm/RunExternal.gorm/CVS
+@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/RunExternal.gorm/RunExternal.gorm
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/RunExternal.gorm/CVS
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/RunExternal.gorm
-%%GNUSTEP_DEVEL%%@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/PrefWindow.gorm/PrefWindow.gorm/CVS
-%%GNUSTEP_DEVEL%%@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/PrefWindow.gorm/PrefWindow.gorm
+@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/PrefWindow.gorm/PrefWindow.gorm/CVS
+@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/PrefWindow.gorm/PrefWindow.gorm
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/PrefWindow.gorm/CVS
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/PrefWindow.gorm
-%%GNUSTEP_DEVEL%%@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/PermissionsPanel.gorm/PermissionsPanel.gorm/CVS
-%%GNUSTEP_DEVEL%%@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/PermissionsPanel.gorm/PermissionsPanel.gorm
+@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/PermissionsPanel.gorm/PermissionsPanel.gorm/CVS
+@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/PermissionsPanel.gorm/PermissionsPanel.gorm
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/PermissionsPanel.gorm/CVS
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/PermissionsPanel.gorm
-%%GNUSTEP_DEVEL%%@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/OpenWith.gorm/OpenWith.gorm/CVS
-%%GNUSTEP_DEVEL%%@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/OpenWith.gorm/OpenWith.gorm
+@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/OpenWith.gorm/OpenWith.gorm/CVS
+@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/OpenWith.gorm/OpenWith.gorm
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/OpenWith.gorm/CVS
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/OpenWith.gorm
-%%GNUSTEP_DEVEL%%@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/InspectorsWin.gorm/InspectorsWin.gorm/CVS
-%%GNUSTEP_DEVEL%%@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/InspectorsWin.gorm/InspectorsWin.gorm
+@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/InspectorsWin.gorm/InspectorsWin.gorm/CVS
+@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/InspectorsWin.gorm/InspectorsWin.gorm
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/InspectorsWin.gorm/CVS
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/InspectorsWin.gorm
-%%GNUSTEP_DEVEL%%@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/IconsPref.gorm/IconsPref.gorm/CVS
-%%GNUSTEP_DEVEL%%@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/IconsPref.gorm/IconsPref.gorm
+@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/IconsPref.gorm/IconsPref.gorm/CVS
+@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/IconsPref.gorm/IconsPref.gorm
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/IconsPref.gorm/CVS
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/IconsPref.gorm
-%%GNUSTEP_DEVEL%%@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/HiddenFilesPref.gorm/HiddenFilesPref.gorm/CVS
-%%GNUSTEP_DEVEL%%@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/HiddenFilesPref.gorm/HiddenFilesPref.gorm
+@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/HiddenFilesPref.gorm/HiddenFilesPref.gorm/CVS
+@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/HiddenFilesPref.gorm/HiddenFilesPref.gorm
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/HiddenFilesPref.gorm/CVS
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/HiddenFilesPref.gorm
-%%GNUSTEP_DEVEL%%@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/Finder.gorm/Finder.gorm/CVS
-%%GNUSTEP_DEVEL%%@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/Finder.gorm/Finder.gorm
+@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/Finder.gorm/Finder.gorm/CVS
+@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/Finder.gorm/Finder.gorm
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/Finder.gorm/CVS
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/Finder.gorm
-%%GNUSTEP_DEVEL%%@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/FileOpsPref.gorm/FileOpsPref.gorm/CVS
-%%GNUSTEP_DEVEL%%@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/FileOpsPref.gorm/FileOpsPref.gorm
+@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/FileOpsPref.gorm/FileOpsPref.gorm/CVS
+@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/FileOpsPref.gorm/FileOpsPref.gorm
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/FileOpsPref.gorm/CVS
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/FileOpsPref.gorm
-%%GNUSTEP_DEVEL%%@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/FileOperationWin.gorm/FileOperationWin.gorm/CVS
-%%GNUSTEP_DEVEL%%@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/FileOperationWin.gorm/FileOperationWin.gorm
+@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/FileOperationWin.gorm/FileOperationWin.gorm/CVS
+@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/FileOperationWin.gorm/FileOperationWin.gorm
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/FileOperationWin.gorm/CVS
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/FileOperationWin.gorm
-%%GNUSTEP_DEVEL%%@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DeskTopPref.gorm/DeskTopPref.gorm/CVS
-%%GNUSTEP_DEVEL%%@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DeskTopPref.gorm/DeskTopPref.gorm
+@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DeskTopPref.gorm/DeskTopPref.gorm/CVS
+@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DeskTopPref.gorm/DeskTopPref.gorm
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DeskTopPref.gorm/CVS
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DeskTopPref.gorm
-%%GNUSTEP_DEVEL%%@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DefSortOrderPref.gorm/DefSortOrderPref.gorm/CVS
-%%GNUSTEP_DEVEL%%@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DefSortOrderPref.gorm/DefSortOrderPref.gorm
+@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DefSortOrderPref.gorm/DefSortOrderPref.gorm/CVS
+@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DefSortOrderPref.gorm/DefSortOrderPref.gorm
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DefSortOrderPref.gorm/CVS
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DefSortOrderPref.gorm
-%%GNUSTEP_DEVEL%%@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DefEditorPref.gorm/DefEditorPref.gorm/CVS
-%%GNUSTEP_DEVEL%%@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DefEditorPref.gorm/DefEditorPref.gorm
+@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DefEditorPref.gorm/DefEditorPref.gorm/CVS
+@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DefEditorPref.gorm/DefEditorPref.gorm
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DefEditorPref.gorm/CVS
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/DefEditorPref.gorm
-%%GNUSTEP_DEVEL%%@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ContentsPanel.gorm/ContentsPanel.gorm/CVS
-%%GNUSTEP_DEVEL%%@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ContentsPanel.gorm/ContentsPanel.gorm
+@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ContentsPanel.gorm/ContentsPanel.gorm/CVS
+@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ContentsPanel.gorm/ContentsPanel.gorm
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ContentsPanel.gorm/CVS
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/ContentsPanel.gorm
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/AttributesPanel.gorm/CVS
-%%GNUSTEP_DEVEL%%@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/AttributesPanel.gorm/AttributesPanel.gorm/CVS
-%%GNUSTEP_DEVEL%%@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/AttributesPanel.gorm/AttributesPanel.gorm
+@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/AttributesPanel.gorm/AttributesPanel.gorm/CVS
+@dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/AttributesPanel.gorm/AttributesPanel.gorm
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj/AttributesPanel.gorm
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/English.lproj
-%%GNUSTEP_DEVEL%%@dirrm System/Applications/GWorkspace.app/Resources/Resources/Dutch.lproj/Finder.gorm/Finder.gorm/CVS
-%%GNUSTEP_DEVEL%%@dirrm System/Applications/GWorkspace.app/Resources/Resources/Dutch.lproj/Finder.gorm/Finder.gorm
+@dirrm System/Applications/GWorkspace.app/Resources/Resources/Dutch.lproj/Finder.gorm/Finder.gorm/CVS
+@dirrm System/Applications/GWorkspace.app/Resources/Resources/Dutch.lproj/Finder.gorm/Finder.gorm
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/Dutch.lproj/Finder.gorm/CVS
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/Dutch.lproj/Finder.gorm
 @dirrm System/Applications/GWorkspace.app/Resources/Resources/Dutch.lproj
@@ -1314,14 +1253,8 @@ System/Tools/%%NOFLAT%%wopen
 @dirrm System/Applications/GWorkspace.app/Resources/Portuguese.lproj/Finder.gorm
 @dirrm System/Applications/GWorkspace.app/Resources/Portuguese.lproj/CVS
 @dirrm System/Applications/GWorkspace.app/Resources/Portuguese.lproj
-%%GNUSTEP_STABLE%%@dirrm System/Applications/GWorkspace.app/Resources/PlistViewer.inspector/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm System/Applications/GWorkspace.app/Resources/PlistViewer.inspector/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm System/Applications/GWorkspace.app/Resources/PlistViewer.inspector/%%GNU_ARCH%%
 @dirrm System/Applications/GWorkspace.app/Resources/PlistViewer.inspector/Resources
 @dirrm System/Applications/GWorkspace.app/Resources/PlistViewer.inspector
-%%GNUSTEP_STABLE%%@dirrm System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/%%GNU_ARCH%%
 @dirrm System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/Resources/CVS
 @dirrm System/Applications/GWorkspace.app/Resources/PdfViewer.inspector/Resources
 @dirrm System/Applications/GWorkspace.app/Resources/PdfViewer.inspector
@@ -1331,19 +1264,10 @@ System/Tools/%%NOFLAT%%wopen
 @dirrm System/Applications/GWorkspace.app/Resources/Italian.lproj/Finder.gorm
 @dirrm System/Applications/GWorkspace.app/Resources/Italian.lproj/CVS
 @dirrm System/Applications/GWorkspace.app/Resources/Italian.lproj
-%%GNUSTEP_STABLE%%@dirrm System/Applications/GWorkspace.app/Resources/InspectorViewer.inspector/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm System/Applications/GWorkspace.app/Resources/InspectorViewer.inspector/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm System/Applications/GWorkspace.app/Resources/InspectorViewer.inspector/%%GNU_ARCH%%
 @dirrm System/Applications/GWorkspace.app/Resources/InspectorViewer.inspector/Resources
 @dirrm System/Applications/GWorkspace.app/Resources/InspectorViewer.inspector
-%%GNUSTEP_STABLE%%@dirrm System/Applications/GWorkspace.app/Resources/ImageViewer.inspector/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm System/Applications/GWorkspace.app/Resources/ImageViewer.inspector/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm System/Applications/GWorkspace.app/Resources/ImageViewer.inspector/%%GNU_ARCH%%
 @dirrm System/Applications/GWorkspace.app/Resources/ImageViewer.inspector/Resources
 @dirrm System/Applications/GWorkspace.app/Resources/ImageViewer.inspector
-%%GNUSTEP_STABLE%%@dirrm System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/%%GNU_ARCH%%
 @dirrm System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Spanish.lproj/CVS
 @dirrm System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Spanish.lproj
 @dirrm System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Romanian.lproj/CVS
@@ -1354,8 +1278,8 @@ System/Tools/%%NOFLAT%%wopen
 @dirrm System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Resources/Italian.lproj
 @dirrm System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Resources/German.lproj
 @dirrm System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Resources/French.lproj
-%%GNUSTEP_DEVEL%%@dirrm System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Resources/English.lproj/IconsViewerPref.gorm/IconsViewerPref.gorm/CVS
-%%GNUSTEP_DEVEL%%@dirrm System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Resources/English.lproj/IconsViewerPref.gorm/IconsViewerPref.gorm
+@dirrm System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Resources/English.lproj/IconsViewerPref.gorm/IconsViewerPref.gorm/CVS
+@dirrm System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Resources/English.lproj/IconsViewerPref.gorm/IconsViewerPref.gorm
 @dirrm System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Resources/English.lproj/IconsViewerPref.gorm/CVS
 @dirrm System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Resources/English.lproj/IconsViewerPref.gorm
 @dirrm System/Applications/GWorkspace.app/Resources/IconsViewer.viewer/Resources/Resources/English.lproj
@@ -1394,9 +1318,6 @@ System/Tools/%%NOFLAT%%wopen
 @dirrm System/Applications/GWorkspace.app/Resources/French.lproj/Finder.gorm
 @dirrm System/Applications/GWorkspace.app/Resources/French.lproj/CVS
 @dirrm System/Applications/GWorkspace.app/Resources/French.lproj
-%%GNUSTEP_STABLE%%@dirrm System/Applications/GWorkspace.app/Resources/FolderViewer.inspector/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm System/Applications/GWorkspace.app/Resources/FolderViewer.inspector/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm System/Applications/GWorkspace.app/Resources/FolderViewer.inspector/%%GNU_ARCH%%
 @dirrm System/Applications/GWorkspace.app/Resources/FolderViewer.inspector/Resources
 @dirrm System/Applications/GWorkspace.app/Resources/FolderViewer.inspector
 @dirrm System/Applications/GWorkspace.app/Resources/English.lproj/XTermPref.nib/CVS
@@ -1476,9 +1397,6 @@ System/Tools/%%NOFLAT%%wopen
 @dirrm System/Applications/GWorkspace.app/Resources/Dutch.lproj/CVS
 @dirrm System/Applications/GWorkspace.app/Resources/Dutch.lproj
 @dirrm System/Applications/GWorkspace.app/Resources/CVS
-%%GNUSTEP_STABLE%%@dirrm System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/%%GNU_ARCH%%
 @dirrm System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Spanish.lproj/CVS
 @dirrm System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Spanish.lproj
 @dirrm System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Romanian.lproj/CVS
@@ -1490,8 +1408,8 @@ System/Tools/%%NOFLAT%%wopen
 @dirrm System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Resources/German.lproj
 @dirrm System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Resources/French.lproj
 @dirrm System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Resources/English.lproj/BrowserViewerPref.gorm/CVS
-%%GNUSTEP_DEVEL%%@dirrm System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Resources/English.lproj/BrowserViewerPref.gorm/BrowserViewerPref.gorm/CVS
-%%GNUSTEP_DEVEL%%@dirrm System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Resources/English.lproj/BrowserViewerPref.gorm/BrowserViewerPref.gorm
+@dirrm System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Resources/English.lproj/BrowserViewerPref.gorm/BrowserViewerPref.gorm/CVS
+@dirrm System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Resources/English.lproj/BrowserViewerPref.gorm/BrowserViewerPref.gorm
 @dirrm System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Resources/English.lproj/BrowserViewerPref.gorm
 @dirrm System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Resources/English.lproj
 @dirrm System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/Resources/Dutch.lproj
@@ -1515,9 +1433,6 @@ System/Tools/%%NOFLAT%%wopen
 @dirrm System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources/CVS
 @dirrm System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer/Resources
 @dirrm System/Applications/GWorkspace.app/Resources/BrowserViewer.viewer
-%%GNUSTEP_STABLE%%@dirrm System/Applications/GWorkspace.app/Resources/AppViewer.inspector/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm System/Applications/GWorkspace.app/Resources/AppViewer.inspector/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm System/Applications/GWorkspace.app/Resources/AppViewer.inspector/%%GNU_ARCH%%
 @dirrm System/Applications/GWorkspace.app/Resources/AppViewer.inspector/Resources
 @dirrm System/Applications/GWorkspace.app/Resources/AppViewer.inspector
 @dirrm System/Applications/GWorkspace.app/Resources
diff --git a/deskutils/preferences.app/pkg-plist b/deskutils/preferences.app/pkg-plist
index ae3ca34fb7c2..d43c489f8938 100644
--- a/deskutils/preferences.app/pkg-plist
+++ b/deskutils/preferences.app/pkg-plist
@@ -15,56 +15,47 @@ System/Applications/Preferences.app/Resources/English.lproj/Localizable.strings
 System/Applications/Preferences.app/Resources/English.lproj/Preferences.gorm
 System/Applications/Preferences.app/Resources/PrefsApp.prefs/Resources/Info-gnustep.plist
 System/Applications/Preferences.app/Resources/PrefsApp.prefs/Resources/PrefsApp.gorm
-System/Applications/Preferences.app/Resources/PrefsApp.prefs/%%NOFLAT%%PrefsApp
+System/Applications/Preferences.app/Resources/PrefsApp.prefs/PrefsApp
 System/Applications/Preferences.app/Resources/PrefsApp.prefs/stamp.make
-%%GNUSTEP_STABLE%%System/Applications/Preferences.app/%%NOFLAT%%Preferences
-System/Applications/Preferences.app/%%NOFLAT%%library_paths.openapp
+System/Applications/Preferences.app/library_paths.openapp
 System/Applications/Preferences.app/stamp.make
-%%SYSTEMLIBRARY%%/Libraries/%%NOFLAT%%libPrefsModule.so
-%%SYSTEMLIBRARY%%/Libraries/%%NOFLAT%%libPrefsModule.so.1
-%%SYSTEMLIBRARY%%/Libraries/%%NOFLAT%%libPrefsModule.so.1.0.0
+System/Library/Libraries/libPrefsModule.so
+System/Library/Libraries/libPrefsModule.so.1
+System/Library/Libraries/libPrefsModule.so.1.0.0
 System/Library/Frameworks/PrefsModule.framework/Resources
 System/Library/Frameworks/PrefsModule.framework/Versions/A/Headers/PrefsModule.h
 System/Library/Frameworks/PrefsModule.framework/Versions/A/Resources/Info-gnustep.plist
 System/Library/Frameworks/PrefsModule.framework/Versions/A/Resources/Info.plist
-System/Library/Frameworks/PrefsModule.framework/Versions/A/%%NOFLAT%%PrefsModule
-System/Library/Frameworks/PrefsModule.framework/Versions/A/%%NOFLAT%%libPrefsModule.so
-System/Library/Frameworks/PrefsModule.framework/Versions/A/%%NOFLAT%%libPrefsModule.so.1
-System/Library/Frameworks/PrefsModule.framework/Versions/A/%%NOFLAT%%libPrefsModule.so.1.0.0
+System/Library/Frameworks/PrefsModule.framework/Versions/A/PrefsModule
+System/Library/Frameworks/PrefsModule.framework/Versions/A/libPrefsModule.so
+System/Library/Frameworks/PrefsModule.framework/Versions/A/libPrefsModule.so.1
+System/Library/Frameworks/PrefsModule.framework/Versions/A/libPrefsModule.so.1.0.0
 @exec ln -fs Versions/Current/Headers %D/System/Library/Frameworks/PrefsModule.framework/Headers
 @exec ln -fs Versions/Current/Resources %D/System/Library/Frameworks/PrefsModule.framework/Resources
 @exec ln -fs A %D/System/Library/Frameworks/PrefsModule.framework/Versions/Current
 @unexec rm -f %D/System/Library/Frameworks/PrefsModule.framework/Headers
 @unexec rm -f %D/System/Library/Frameworks/PrefsModule.framework/Resources
 @unexec rm -f %D/System/Library/Frameworks/PrefsModule.framework/Versions/Current
-@unexec rm -f %D/%%SYSTEMLIBRARY%%/Headers/PrefsModule
+@unexec rm -f %D/System/Library/Headers/PrefsModule
 System/Library/Preferences/Keyboard.prefs/Resources/Info-gnustep.plist
 System/Library/Preferences/Keyboard.prefs/Resources/Keyboard.gorm
-System/Library/Preferences/Keyboard.prefs/%%NOFLAT%%Keyboard
+System/Library/Preferences/Keyboard.prefs/Keyboard
 System/Library/Preferences/Keyboard.prefs/stamp.make
 @dirrm System/Applications/Preferences.app/Resources/English.lproj
 @dirrm System/Applications/Preferences.app/Resources/PrefsApp.prefs/Resources
-%%GNUSTEP_STABLE%%@dirrm System/Applications/Preferences.app/Resources/PrefsApp.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm System/Applications/Preferences.app/Resources/PrefsApp.prefs/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm System/Applications/Preferences.app/Resources/PrefsApp.prefs/%%GNU_ARCH%%
 @dirrm System/Applications/Preferences.app/Resources/PrefsApp.prefs
 @dirrm System/Applications/Preferences.app/Resources
-%%GNUSTEP_STABLE%%@dirrm System/Applications/Preferences.app/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm System/Applications/Preferences.app/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm System/Applications/Preferences.app/%%GNU_ARCH%%
 @dirrm System/Applications/Preferences.app
 @dirrm System/Library/Frameworks/PrefsModule.framework/Versions/A/Headers
 @dirrm System/Library/Frameworks/PrefsModule.framework/Versions/A/Resources
-%%GNUSTEP_STABLE%%@dirrm System/Library/Frameworks/PrefsModule.framework/Versions/A/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm System/Library/Frameworks/PrefsModule.framework/Versions/A/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm System/Library/Frameworks/PrefsModule.framework/Versions/A/%%GNU_ARCH%%
 @dirrm System/Library/Frameworks/PrefsModule.framework/Versions/A
 @dirrm System/Library/Frameworks/PrefsModule.framework/Versions
 @dirrm System/Library/Frameworks/PrefsModule.framework
 @dirrm System/Library/Frameworks
 @dirrm System/Library/Preferences/Keyboard.prefs/Resources
-%%GNUSTEP_STABLE%%@dirrm System/Library/Preferences/Keyboard.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm System/Library/Preferences/Keyboard.prefs/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm System/Library/Preferences/Keyboard.prefs/%%GNU_ARCH%%
 @dirrm System/Library/Preferences/Keyboard.prefs
 @dirrm System/Library/Preferences
+@dirrm Local/Library/Preferences
+@dirrm Local/Library
+@dirrm Network/Library/Preferences
+@dirrm Network/Library
diff --git a/devel/projectcenter.app/pkg-plist b/devel/projectcenter.app/pkg-plist
index 595227181f36..53839f64c9bc 100644
--- a/devel/projectcenter.app/pkg-plist
+++ b/devel/projectcenter.app/pkg-plist
@@ -1,5 +1,4 @@
-%%GNUSTEP_STABLE%%System/Applications/ProjectCenter.app/%%NOFLAT%%ProjectCenter
-System/Applications/ProjectCenter.app/%%NOFLAT%%library_paths.openapp
+System/Applications/ProjectCenter.app/library_paths.openapp
 System/Applications/ProjectCenter.app/ProjectCenter
 System/Applications/ProjectCenter.app/Resources/ButtonTile.tiff
 System/Applications/ProjectCenter.app/Resources/FileIcon_.c.tiff
@@ -7,7 +6,7 @@ System/Applications/ProjectCenter.app/Resources/FileIcon_.h.tiff
 System/Applications/ProjectCenter.app/Resources/FileIcon_.m.tiff
 System/Applications/ProjectCenter.app/Resources/FileIcon_rtf.tiff
 System/Applications/ProjectCenter.app/Resources/Info-gnustep.plist
-System/Applications/ProjectCenter.app/Resources/PCAppProj.bundle/%%NOFLAT%%PCAppProj
+System/Applications/ProjectCenter.app/Resources/PCAppProj.bundle/PCAppProj
 System/Applications/ProjectCenter.app/Resources/PCAppProj.bundle/Resources/AppController.h
 System/Applications/ProjectCenter.app/Resources/PCAppProj.bundle/Resources/AppController.m
 System/Applications/ProjectCenter.app/Resources/PCAppProj.bundle/Resources/GNUmakefile.postamble
@@ -16,7 +15,7 @@ System/Applications/ProjectCenter.app/Resources/PCAppProj.bundle/Resources/Info-
 System/Applications/ProjectCenter.app/Resources/PCAppProj.bundle/Resources/PC.proj
 System/Applications/ProjectCenter.app/Resources/PCAppProj.bundle/Resources/main.m
 System/Applications/ProjectCenter.app/Resources/PCAppProj.bundle/stamp.make
-System/Applications/ProjectCenter.app/Resources/PCBaseFileTypes.bundle/%%NOFLAT%%PCBaseFileTypes
+System/Applications/ProjectCenter.app/Resources/PCBaseFileTypes.bundle/PCBaseFileTypes
 System/Applications/ProjectCenter.app/Resources/PCBaseFileTypes.bundle/Resources/Info-gnustep.plist
 System/Applications/ProjectCenter.app/Resources/PCBaseFileTypes.bundle/Resources/cfile.template
 System/Applications/ProjectCenter.app/Resources/PCBaseFileTypes.bundle/Resources/cheader.template
@@ -25,25 +24,25 @@ System/Applications/ProjectCenter.app/Resources/PCBaseFileTypes.bundle/Resources
 System/Applications/ProjectCenter.app/Resources/PCBaseFileTypes.bundle/Resources/header.template
 System/Applications/ProjectCenter.app/Resources/PCBaseFileTypes.bundle/Resources/protocol.template
 System/Applications/ProjectCenter.app/Resources/PCBaseFileTypes.bundle/stamp.make
-System/Applications/ProjectCenter.app/Resources/PCBundleProj.bundle/%%NOFLAT%%PCBundleProj
+System/Applications/ProjectCenter.app/Resources/PCBundleProj.bundle/PCBundleProj
 System/Applications/ProjectCenter.app/Resources/PCBundleProj.bundle/Resources/Info-gnustep.plist
 System/Applications/ProjectCenter.app/Resources/PCBundleProj.bundle/Resources/PC.proj
 System/Applications/ProjectCenter.app/Resources/PCBundleProj.bundle/stamp.make
 System/Applications/ProjectCenter.app/Resources/PCBaseFileTypes.bundle/Resources/nsviewclass.template
 System/Applications/ProjectCenter.app/Resources/PCBaseFileTypes.bundle/Resources/nsviewheader.template
-System/Applications/ProjectCenter.app/Resources/PCGormProj.bundle/%%NOFLAT%%PCGormProj
+System/Applications/ProjectCenter.app/Resources/PCGormProj.bundle/PCGormProj
 System/Applications/ProjectCenter.app/Resources/PCGormProj.bundle/Resources/Info-gnustep.plist
 System/Applications/ProjectCenter.app/Resources/PCGormProj.bundle/Resources/PC.proj
 System/Applications/ProjectCenter.app/Resources/PCGormProj.bundle/Resources/baseInterface.classes
 System/Applications/ProjectCenter.app/Resources/PCGormProj.bundle/Resources/baseInterface.gorm
 System/Applications/ProjectCenter.app/Resources/PCGormProj.bundle/Resources/main.m
 System/Applications/ProjectCenter.app/Resources/PCGormProj.bundle/stamp.make
-System/Applications/ProjectCenter.app/Resources/PCLibProj.bundle/%%NOFLAT%%PCLibProj
+System/Applications/ProjectCenter.app/Resources/PCLibProj.bundle/PCLibProj
 System/Applications/ProjectCenter.app/Resources/PCLibProj.bundle/Resources/Info-gnustep.plist
 System/Applications/ProjectCenter.app/Resources/PCLibProj.bundle/Resources/PC.proj
 System/Applications/ProjectCenter.app/Resources/PCLibProj.bundle/Resources/Version
 System/Applications/ProjectCenter.app/Resources/PCLibProj.bundle/stamp.make
-System/Applications/ProjectCenter.app/Resources/PCRenaissanceProj.bundle/%%NOFLAT%%PCRenaissanceProj
+System/Applications/ProjectCenter.app/Resources/PCRenaissanceProj.bundle/PCRenaissanceProj
 System/Applications/ProjectCenter.app/Resources/PCRenaissanceProj.bundle/Resources/Info-gnustep.plist
 System/Applications/ProjectCenter.app/Resources/PCRenaissanceProj.bundle/Resources/PC.proj
 System/Applications/ProjectCenter.app/Resources/PCRenaissanceProj.bundle/Resources/main.m
@@ -53,7 +52,7 @@ System/Applications/ProjectCenter.app/Resources/PCRenaissanceProj.bundle/Resourc
 System/Applications/ProjectCenter.app/Resources/PCRenaissanceProj.bundle/Resources/MainMenu-GNUstep.gsmarkup
 System/Applications/ProjectCenter.app/Resources/PCRenaissanceProj.bundle/Resources/MainMenu-OSX.gsmarkup
 System/Applications/ProjectCenter.app/Resources/PCRenaissanceProj.bundle/stamp.make
-System/Applications/ProjectCenter.app/Resources/PCToolProj.bundle/%%NOFLAT%%PCToolProj
+System/Applications/ProjectCenter.app/Resources/PCToolProj.bundle/PCToolProj
 System/Applications/ProjectCenter.app/Resources/PCToolProj.bundle/Resources/Info-gnustep.plist
 System/Applications/ProjectCenter.app/Resources/PCToolProj.bundle/Resources/Info-project.plist
 System/Applications/ProjectCenter.app/Resources/PCToolProj.bundle/Resources/PC.proj
@@ -81,84 +80,59 @@ System/Applications/ProjectCenter.app/Resources/ProjectCenter_settings.tiff
 System/Applications/ProjectCenter.app/Resources/ProjectCenter_uml.tiff
 System/Applications/ProjectCenter.app/Resources/Stop.tiff
 System/Applications/ProjectCenter.app/stamp.make
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/FileCreator.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/PCBrowserController.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/PCBundleLoader.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/PCButton.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/PCDataSource.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/PCDefines.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/PCEditor+UInterface.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/PCEditor.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/PCEditorController.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/PCEditorView+Highlighting.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/PCEditorView.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/PCFileManager+UInterface.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/PCFileManager.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/PCHistoryController.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/PCMakefileFactory.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/PCProject+ComponentHandling.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/PCProject.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/PCProject+UInterface.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/PCProjectBuilder.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/PCProjectDebugger+UInterface.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/PCProjectDebugger.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/PCProjectEditor.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/PCProjectManager+UInterface.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/PCProjectManager.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/PCServer.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/PCSplitView.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/PCTextFinder+UInterface.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/PCTextFinder.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/PreferenceController.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/ProjectBuilder.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/ProjectCenter.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/ProjectComponent.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/ProjectDebugger.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/ProjectEditor.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/ProjectType.h
-%%SYSTEMLIBRARY%%/Headers/ProjectCenter/Server.h
-%%SYSTEMLIBRARY%%/Libraries/%%NOFLAT%%libProjectCenter.so
-%%SYSTEMLIBRARY%%/Libraries/%%NOFLAT%%libProjectCenter.so.0
-%%SYSTEMLIBRARY%%/Libraries/%%NOFLAT%%libProjectCenter.so.%%VERSION%%
-@dirrm %%SYSTEMLIBRARY%%/Headers/ProjectCenter
-%%GNUSTEP_STABLE%%@dirrm System/Applications/ProjectCenter.app/Resources/PCRenaissanceProj.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm System/Applications/ProjectCenter.app/Resources/PCRenaissanceProj.bundle/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm System/Applications/ProjectCenter.app/Resources/PCRenaissanceProj.bundle/%%GNU_ARCH%%
+System/Library/Headers/ProjectCenter/FileCreator.h
+System/Library/Headers/ProjectCenter/PCBrowserController.h
+System/Library/Headers/ProjectCenter/PCBundleLoader.h
+System/Library/Headers/ProjectCenter/PCButton.h
+System/Library/Headers/ProjectCenter/PCDataSource.h
+System/Library/Headers/ProjectCenter/PCDefines.h
+System/Library/Headers/ProjectCenter/PCEditor+UInterface.h
+System/Library/Headers/ProjectCenter/PCEditor.h
+System/Library/Headers/ProjectCenter/PCEditorController.h
+System/Library/Headers/ProjectCenter/PCEditorView+Highlighting.h
+System/Library/Headers/ProjectCenter/PCEditorView.h
+System/Library/Headers/ProjectCenter/PCFileManager+UInterface.h
+System/Library/Headers/ProjectCenter/PCFileManager.h
+System/Library/Headers/ProjectCenter/PCHistoryController.h
+System/Library/Headers/ProjectCenter/PCMakefileFactory.h
+System/Library/Headers/ProjectCenter/PCProject+ComponentHandling.h
+System/Library/Headers/ProjectCenter/PCProject.h
+System/Library/Headers/ProjectCenter/PCProject+UInterface.h
+System/Library/Headers/ProjectCenter/PCProjectBuilder.h
+System/Library/Headers/ProjectCenter/PCProjectDebugger+UInterface.h
+System/Library/Headers/ProjectCenter/PCProjectDebugger.h
+System/Library/Headers/ProjectCenter/PCProjectEditor.h
+System/Library/Headers/ProjectCenter/PCProjectManager+UInterface.h
+System/Library/Headers/ProjectCenter/PCProjectManager.h
+System/Library/Headers/ProjectCenter/PCServer.h
+System/Library/Headers/ProjectCenter/PCSplitView.h
+System/Library/Headers/ProjectCenter/PCTextFinder+UInterface.h
+System/Library/Headers/ProjectCenter/PCTextFinder.h
+System/Library/Headers/ProjectCenter/PreferenceController.h
+System/Library/Headers/ProjectCenter/ProjectBuilder.h
+System/Library/Headers/ProjectCenter/ProjectCenter.h
+System/Library/Headers/ProjectCenter/ProjectComponent.h
+System/Library/Headers/ProjectCenter/ProjectDebugger.h
+System/Library/Headers/ProjectCenter/ProjectEditor.h
+System/Library/Headers/ProjectCenter/ProjectType.h
+System/Library/Headers/ProjectCenter/Server.h
+System/Library/Libraries/libProjectCenter.so
+System/Library/Libraries/libProjectCenter.so.0
+System/Library/Libraries/libProjectCenter.so.%%VERSION%%
+@dirrm System/Library/Headers/ProjectCenter
 @dirrm System/Applications/ProjectCenter.app/Resources/PCRenaissanceProj.bundle/Resources
 @dirrm System/Applications/ProjectCenter.app/Resources/PCRenaissanceProj.bundle
-%%GNUSTEP_STABLE%%@dirrm System/Applications/ProjectCenter.app/Resources/PCToolProj.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm System/Applications/ProjectCenter.app/Resources/PCToolProj.bundle/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm System/Applications/ProjectCenter.app/Resources/PCToolProj.bundle/%%GNU_ARCH%%
 @dirrm System/Applications/ProjectCenter.app/Resources/PCToolProj.bundle/Resources
 @dirrm System/Applications/ProjectCenter.app/Resources/PCToolProj.bundle
-%%GNUSTEP_STABLE%%@dirrm System/Applications/ProjectCenter.app/Resources/PCLibProj.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm System/Applications/ProjectCenter.app/Resources/PCLibProj.bundle/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm System/Applications/ProjectCenter.app/Resources/PCLibProj.bundle/%%GNU_ARCH%%
 @dirrm System/Applications/ProjectCenter.app/Resources/PCLibProj.bundle/Resources
 @dirrm System/Applications/ProjectCenter.app/Resources/PCLibProj.bundle
-%%GNUSTEP_STABLE%%@dirrm System/Applications/ProjectCenter.app/Resources/PCGormProj.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm System/Applications/ProjectCenter.app/Resources/PCGormProj.bundle/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm System/Applications/ProjectCenter.app/Resources/PCGormProj.bundle/%%GNU_ARCH%%
 @dirrm System/Applications/ProjectCenter.app/Resources/PCGormProj.bundle/Resources
 @dirrm System/Applications/ProjectCenter.app/Resources/PCGormProj.bundle
-%%GNUSTEP_STABLE%%@dirrm System/Applications/ProjectCenter.app/Resources/PCBundleProj.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm System/Applications/ProjectCenter.app/Resources/PCBundleProj.bundle/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm System/Applications/ProjectCenter.app/Resources/PCBundleProj.bundle/%%GNU_ARCH%%
 @dirrm System/Applications/ProjectCenter.app/Resources/PCBundleProj.bundle/Resources
 @dirrm System/Applications/ProjectCenter.app/Resources/PCBundleProj.bundle
-%%GNUSTEP_STABLE%%@dirrm System/Applications/ProjectCenter.app/Resources/PCBaseFileTypes.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm System/Applications/ProjectCenter.app/Resources/PCBaseFileTypes.bundle/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm System/Applications/ProjectCenter.app/Resources/PCBaseFileTypes.bundle/%%GNU_ARCH%%
 @dirrm System/Applications/ProjectCenter.app/Resources/PCBaseFileTypes.bundle/Resources
 @dirrm System/Applications/ProjectCenter.app/Resources/PCBaseFileTypes.bundle
-%%GNUSTEP_STABLE%%@dirrm System/Applications/ProjectCenter.app/Resources/PCAppProj.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm System/Applications/ProjectCenter.app/Resources/PCAppProj.bundle/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm System/Applications/ProjectCenter.app/Resources/PCAppProj.bundle/%%GNU_ARCH%%
 @dirrm System/Applications/ProjectCenter.app/Resources/PCAppProj.bundle/Resources
 @dirrm System/Applications/ProjectCenter.app/Resources/PCAppProj.bundle
-%%GNUSTEP_STABLE%%@dirrm System/Applications/ProjectCenter.app/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm System/Applications/ProjectCenter.app/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm System/Applications/ProjectCenter.app/%%GNU_ARCH%%
 @dirrm System/Applications/ProjectCenter.app/Resources
 @dirrm System/Applications/ProjectCenter.app
-%%GNUSTEP_STABLE%%@dirrm System/Applications
diff --git a/devel/ruby-gnustep/Makefile b/devel/ruby-gnustep/Makefile
index 9a8a723ec810..4f625d900e5a 100644
--- a/devel/ruby-gnustep/Makefile
+++ b/devel/ruby-gnustep/Makefile
@@ -47,22 +47,10 @@ GNUSTEP_NETWORK_ROOT=	${GNUSTEP_PREFIX}/Network
 GNUSTEP_USER_ROOT=	${GNUSTEP_PREFIX}/Local/Users
 GNUSTEP_MAKEFILES=	${GNUSTEP_SYSTEM_ROOT}/Makefiles
 
-.if defined(WITH_GNUSTEP_DEVEL)
 BACKBUNDLEDIR=	${GNUSTEP_PREFIX}/System/Library/Bundles/libgnustep-back.bundle
 SYSLIBDIR=	${GNUSTEP_PREFIX}/System/Library/Libraries
 COMBOLIBDIR=	${SYSLIBDIR}
-PLIST_SUB+=	LOCALLIBRARY=Local/Library
-PLIST_SUB+=	NOFLAT=""
-PLIST_SUB+=	GNUSTEP_STABLE="@comment "
 MAKE_ENV+=	GNUSTEP_FLATTENED=yes
-.else
-BACKBUNDLEDIR=	${GNUSTEP_PREFIX}/System/Library/Bundles/libgnustep-back.bundle/${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu/
-SYSLIBDIR=	${GNUSTEP_PREFIX}/System/Libraries/${GNU_ARCH}/${OPSYS:L}
-COMBOLIBDIR=	${SYSLIBDIR}/gnu-gnu-gnu
-PLIST_SUB+=	LOCALLIBRARY=Local
-PLIST_SUB+=	NOFLAT="${GNU_ARCH}/${OPSYS:L}/gnu-gnu-gnu/"
-PLIST_SUB+=	GNUSTEP_STABLE=""
-.endif
 
 .include <bsd.port.pre.mk>
 
diff --git a/devel/ruby-gnustep/pkg-plist b/devel/ruby-gnustep/pkg-plist
index 60ea2d033212..e684c3484859 100644
--- a/devel/ruby-gnustep/pkg-plist
+++ b/devel/ruby-gnustep/pkg-plist
@@ -63,15 +63,11 @@
 %%RUBY_SITELIBDIR%%/rigs/NSWindow.rb
 %%RUBY_SITEARCHLIBDIR%%/librigs.so
 @dirrm %%RUBY_SITELIBDIR%%/rigs
-GNUstep/%%LOCALLIBRARY%%/Libraries/%%NOFLAT%%librigs.so.0.2.1
-GNUstep/%%LOCALLIBRARY%%/Libraries/%%NOFLAT%%librigs.so.0
-GNUstep/%%LOCALLIBRARY%%/Libraries/%%NOFLAT%%librigs.so
-%%GNUSTEP_STABLE%%@unexec /bin/rmdir %D/GNUstep/%%LOCALLIBRARY%%/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu 2> /dev/null || true
-%%GNUSTEP_STABLE%%@unexec /bin/rmdir %D/GNUstep/%%LOCALLIBRARY%%/Libraries/%%GNU_ARCH%%/%%OPSYS%% 2> /dev/null || true
-%%GNUSTEP_STABLE%%@unexec /bin/rmdir %D/GNUstep/%%LOCALLIBRARY%%/Libraries/%%GNU_ARCH%% 2> /dev/null || true
-@unexec /bin/rmdir %D/GNUstep/%%LOCALLIBRARY%%/Libraries 2> /dev/null || true
-@unexec /bin/rmdir %D/GNUstep/%%LOCALLIBRARY%%/Headers 2> /dev/null || true
-@unexec /bin/rmdir %D/GNUstep/%%LOCALLIBRARY%% 2> /dev/null || true
+GNUstep/Local/Library/Libraries/librigs.so.0.2.1
+GNUstep/Local/Library/Libraries/librigs.so.0
+GNUstep/Local/Library/Libraries/librigs.so
+@dirrm GNUstep/Local/Library/Libraries
+@dirrm GNUstep/Local/Library
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/Base/Simple.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/Gui/CurrencyConverter/CurrencyConverter.rb
 %%PORTDOCS%%%%RUBY_MODEXAMPLESDIR%%/Gui/CurrencyConverter/CurrencyConverterIcon.tiff
diff --git a/games/gomoku.app/pkg-plist b/games/gomoku.app/pkg-plist
index 07c358664014..53674df230a7 100644
--- a/games/gomoku.app/pkg-plist
+++ b/games/gomoku.app/pkg-plist
@@ -1,5 +1,3 @@
-%%GNUSTEP_STABLE%%Local/Applications/Gomoku.app/%%NOFLAT%%Gomoku
-Local/Applications/Gomoku.app/%%NOFLAT%%library_paths.openapp
 Local/Applications/Gomoku.app/Gomoku
 Local/Applications/Gomoku.app/Resources/Computer.png
 Local/Applications/Gomoku.app/Resources/ComputerBottom.png
@@ -38,10 +36,8 @@ Local/Applications/Gomoku.app/Resources/Italian.lproj/Localizable.strings
 Local/Applications/Gomoku.app/Resources/Spanish.lproj/Localizable.strings
 Local/Applications/Gomoku.app/Resources/Swedish.lproj/Localizable.strings
 Local/Applications/Gomoku.app/Resources/TraditionalChinese.lproj/Localizable.strings
+Local/Applications/Gomoku.app/library_paths.openapp
 Local/Applications/Gomoku.app/stamp.make
-%%GNUSTEP_STABLE%%@dirrm Local/Applications/Gomoku.app/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm Local/Applications/Gomoku.app/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm Local/Applications/Gomoku.app/%%GNU_ARCH%%
 @dirrm Local/Applications/Gomoku.app/Resources/TraditionalChinese.lproj
 @dirrm Local/Applications/Gomoku.app/Resources/Swedish.lproj
 @dirrm Local/Applications/Gomoku.app/Resources/Spanish.lproj
diff --git a/games/gshisen/pkg-plist b/games/gshisen/pkg-plist
index 35d85d4636fd..3569a111c8a1 100644
--- a/games/gshisen/pkg-plist
+++ b/games/gshisen/pkg-plist
@@ -76,11 +76,7 @@ System/Applications/GShisen.app/Resources/GShisen.tiff
 System/Applications/GShisen.app/Resources/Info-gnustep.plist
 System/Applications/GShisen.app/Resources/green.tiff
 System/Applications/GShisen.app/Resources/x.tiff
-%%GNUSTEP_STABLE%%System/Applications/GShisen.app/%%NOFLAT%%GShisen
-System/Applications/GShisen.app/%%NOFLAT%%library_paths.openapp
+System/Applications/GShisen.app/library_paths.openapp
 System/Applications/GShisen.app/stamp.make
-%%GNUSTEP_STABLE%%@dirrm System/Applications/GShisen.app/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm System/Applications/GShisen.app/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm System/Applications/GShisen.app/%%GNU_ARCH%%
 @dirrm System/Applications/GShisen.app/Resources
 @dirrm System/Applications/GShisen.app
diff --git a/graphics/imageviewer/pkg-plist b/graphics/imageviewer/pkg-plist
index 14da5a5605b2..4c6d48699016 100644
--- a/graphics/imageviewer/pkg-plist
+++ b/graphics/imageviewer/pkg-plist
@@ -14,12 +14,8 @@ Local/Applications/ImageViewer.app/Resources/ImageViewerInfo.plist
 Local/Applications/ImageViewer.app/Resources/Info-gnustep.plist
 Local/Applications/ImageViewer.app/Resources/README
 Local/Applications/ImageViewer.app/Resources/genericImage.tiff
-%%GNUSTEP_STABLE%%Local/Applications/ImageViewer.app/%%NOFLAT%%ImageViewer
-Local/Applications/ImageViewer.app/%%NOFLAT%%library_paths.openapp
+Local/Applications/ImageViewer.app/library_paths.openapp
 Local/Applications/ImageViewer.app/stamp.make
-%%GNUSTEP_STABLE%%@dirrm Local/Applications/ImageViewer.app/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm Local/Applications/ImageViewer.app/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm Local/Applications/ImageViewer.app/%%GNU_ARCH%%
 @dirrm Local/Applications/ImageViewer.app/Resources/German.lproj
 @dirrm Local/Applications/ImageViewer.app/Resources/French.lproj
 @dirrm Local/Applications/ImageViewer.app/Resources/English.lproj
diff --git a/lang/gnustep-guile/Makefile b/lang/gnustep-guile/Makefile
index 41658ed2161a..7fcc072e612c 100644
--- a/lang/gnustep-guile/Makefile
+++ b/lang/gnustep-guile/Makefile
@@ -48,9 +48,5 @@ GUILE_VER!=	(cd ${PORTSDIR}/lang/guile && make -V GUILE_VER)
 
 pre-configure:
 	${TOUCH} ${WRKSRC}/Greg/ac_nonexistent.h
-.if !defined(WITH_GNUSTEP_DEVEL)
-	${REINPLACE_CMD} -e 's=ROOT/Library/Headers=ROOT/Headers=g' \
-		${WRKSRC}/configure
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/lang/gnustep-guile/pkg-plist b/lang/gnustep-guile/pkg-plist
index 60a0223f4261..6d759ee25f54 100644
--- a/lang/gnustep-guile/pkg-plist
+++ b/lang/gnustep-guile/pkg-plist
@@ -1,42 +1,40 @@
-%%USEX11%%%%GNUSTEP_STABLE%%System/Applications/guile-gui.app/%%NOFLAT%%guile-gui
-%%USEX11%%System/Applications/guile-gui.app/%%NOFLAT%%library_paths.openapp
+%%USEX11%%System/Applications/guile-gui.app/library_paths.openapp
 %%USEX11%%System/Applications/guile-gui.app/Resources/Info-gnustep.plist
 %%USEX11%%System/Applications/guile-gui.app/Resources/guile-gui.desktop
 %%USEX11%%System/Applications/guile-gui.app/guile-gui
 %%USEX11%%System/Applications/guile-gui.app/stamp.make
-%%USEX11%%%%GNUSTEP_STABLE%%System/Applications/gui.app/%%NOFLAT%%gui
-%%USEX11%%System/Applications/gui.app/%%NOFLAT%%library_paths.openapp
+%%USEX11%%System/Applications/gui.app/library_paths.openapp
 %%USEX11%%System/Applications/gui.app/Resources/Info-gnustep.plist
 %%USEX11%%System/Applications/gui.app/Resources/gui.desktop
 %%USEX11%%System/Applications/gui.app/gui
 %%USEX11%%System/Applications/gui.app/stamp.make
-%%SYSTEMLIBRARY%%/Headers/ScriptKit/Guile.h
-%%SYSTEMLIBRARY%%/Headers/ScriptKit/GuileInterpreter.h
-%%SYSTEMLIBRARY%%/Headers/ScriptKit/GuileInvocation.h
-%%SYSTEMLIBRARY%%/Headers/ScriptKit/GuileProcedure.h
-%%SYSTEMLIBRARY%%/Headers/ScriptKit/GuileSCM.h
-%%SYSTEMLIBRARY%%/Headers/ScriptKit/GuileScript.h
-%%SYSTEMLIBRARY%%/Headers/ScriptKit/SKInterpreter.h
-%%SYSTEMLIBRARY%%/Headers/ScriptKit/SKScript.h
-%%SYSTEMLIBRARY%%/Headers/ScriptKit/ScriptKit.h
-%%SYSTEMLIBRARY%%/Headers/gnustep/guile/gstep_guile.h
-%%SYSTEMLIBRARY%%/Headers/gnustep/guile/gg_Object.h
-%%SYSTEMLIBRARY%%/Libraries/Guile/languages/gstep-guile.scm
-%%SYSTEMLIBRARY%%/Libraries/%%NOFLAT%%libScriptKit.so
-%%SYSTEMLIBRARY%%/Libraries/%%NOFLAT%%libScriptKit.so.1
-%%SYSTEMLIBRARY%%/Libraries/%%NOFLAT%%libScriptKit.so.1.0.0
-%%SYSTEMLIBRARY%%/Libraries/%%NOFLAT%%libgg_base.so
-%%SYSTEMLIBRARY%%/Libraries/%%NOFLAT%%libgg_base.so.%%VERSION%%
-%%SYSTEMLIBRARY%%/Libraries/%%NOFLAT%%libgg_base.so.1
-%%USEX11%%%%SYSTEMLIBRARY%%/Libraries/%%NOFLAT%%libgg_gui.so
-%%USEX11%%%%SYSTEMLIBRARY%%/Libraries/%%NOFLAT%%libgg_gui.so.%%VERSION%%
-%%USEX11%%%%SYSTEMLIBRARY%%/Libraries/%%NOFLAT%%libgg_gui.so.1
-%%SYSTEMLIBRARY%%/Libraries/%%NOFLAT%%libgstep_guile.so
-%%SYSTEMLIBRARY%%/Libraries/%%NOFLAT%%libgstep_guile.so.%%VERSION%%
-%%SYSTEMLIBRARY%%/Libraries/%%NOFLAT%%libgstep_guile.so.1
+System/Library/Headers/ScriptKit/Guile.h
+System/Library/Headers/ScriptKit/GuileInterpreter.h
+System/Library/Headers/ScriptKit/GuileInvocation.h
+System/Library/Headers/ScriptKit/GuileProcedure.h
+System/Library/Headers/ScriptKit/GuileSCM.h
+System/Library/Headers/ScriptKit/GuileScript.h
+System/Library/Headers/ScriptKit/SKInterpreter.h
+System/Library/Headers/ScriptKit/SKScript.h
+System/Library/Headers/ScriptKit/ScriptKit.h
+System/Library/Headers/gnustep/guile/gstep_guile.h
+System/Library/Headers/gnustep/guile/gg_Object.h
+System/Library/Libraries/Guile/languages/gstep-guile.scm
+System/Library/Libraries/libScriptKit.so
+System/Library/Libraries/libScriptKit.so.1
+System/Library/Libraries/libScriptKit.so.1.0.0
+System/Library/Libraries/libgg_base.so
+System/Library/Libraries/libgg_base.so.%%VERSION%%
+System/Library/Libraries/libgg_base.so.1
+%%USEX11%%System/Library/Libraries/libgg_gui.so
+%%USEX11%%System/Library/Libraries/libgg_gui.so.%%VERSION%%
+%%USEX11%%System/Library/Libraries/libgg_gui.so.1
+System/Library/Libraries/libgstep_guile.so
+System/Library/Libraries/libgstep_guile.so.%%VERSION%%
+System/Library/Libraries/libgstep_guile.so.1
 System/Makefiles/Additional/guile.make
-System/Tools/%%NOFLAT%%go
-System/Tools/%%NOFLAT%%guile-base
+System/Tools/go
+System/Tools/guile-base
 bin/greg
 info/dir
 @comment @unexec install-info --delete %D/info/greg.info %D/info/dir
@@ -46,26 +44,20 @@ lib/libgreg.a
 lib/libgreg.la
 lib/libgreg.so
 lib/libgreg.so.1
-%%USEX11%%%%GNUSTEP_STABLE%%@dirrm System/Applications/guile-gui.app/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%USEX11%%%%GNUSTEP_STABLE%%@dirrm System/Applications/guile-gui.app/%%GNU_ARCH%%/%%OPSYS%%
-%%USEX11%%%%GNUSTEP_STABLE%%@dirrm System/Applications/guile-gui.app/%%GNU_ARCH%%
 %%USEX11%%@dirrm System/Applications/guile-gui.app/Resources
 %%USEX11%%@dirrm System/Applications/guile-gui.app
-%%USEX11%%%%GNUSTEP_STABLE%%@dirrm System/Applications/gui.app/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%USEX11%%%%GNUSTEP_STABLE%%@dirrm System/Applications/gui.app/%%GNU_ARCH%%/%%OPSYS%%
-%%USEX11%%%%GNUSTEP_STABLE%%@dirrm System/Applications/gui.app/%%GNU_ARCH%%
 %%USEX11%%@dirrm System/Applications/gui.app/Resources
 %%USEX11%%@dirrm System/Applications/gui.app
-@dirrm %%SYSTEMLIBRARY%%/Libraries/Guile/languages/gstep-guile
-@dirrm %%SYSTEMLIBRARY%%/Libraries/Guile/languages
-@dirrm %%SYSTEMLIBRARY%%/Libraries/Guile
-@dirrm %%SYSTEMLIBRARY%%/Headers/gnustep/guile
-@dirrm %%SYSTEMLIBRARY%%/Headers/ScriptKit
+@dirrm System/Library/Libraries/Guile/languages/gstep-guile
+@dirrm System/Library/Libraries/Guile/languages
+@dirrm System/Library/Libraries/Guile
+@dirrm System/Library/Headers/gnustep/guile
+@dirrm System/Library/Headers/ScriptKit
 @dirrm man/man1
 @dirrm man
 @dirrm lib
 @dirrm info
 @dirrm bin
-@exec mkdir -p %D/%%SYSTEMLIBRARY%%/Libraries/Guile/languages/gstep-guile
+@exec mkdir -p %D/System/Library/Libraries/Guile/languages/gstep-guile
 @cwd %%LOCALBASE%%
 share/guile/%%GUILE_VER%%/ice-9/greg.scm
diff --git a/mail/gnumail/pkg-plist b/mail/gnumail/pkg-plist
index e67ddddad20f..6324650a292e 100644
--- a/mail/gnumail/pkg-plist
+++ b/mail/gnumail/pkg-plist
@@ -93,107 +93,73 @@ Local/Applications/GNUMail.app/Resources/stop_32.tiff
 Local/Applications/GNUMail.app/Resources/stop_48.tiff
 Local/Applications/GNUMail.app/Resources/up.tiff
 Local/Applications/GNUMail.app/Resources/up_15.tiff
-%%GNUSTEP_STABLE%%Local/Applications/GNUMail.app/%%NOFLAT%%GNUMail
-Local/Applications/GNUMail.app/%%NOFLAT%%library_paths.openapp
+Local/Applications/GNUMail.app/library_paths.openapp
 Local/Applications/GNUMail.app/stamp.make
-%%LOCALLIBRARY%%/Libraries/%%NOFLAT%%libGNUMail.so
-%%LOCALLIBRARY%%/Libraries/%%NOFLAT%%libGNUMail.so.1
-%%LOCALLIBRARY%%/Libraries/%%NOFLAT%%libGNUMail.so.1.0.0
-Local/Library/GNUMail/Account.prefs/%%NOFLAT%%Account
+Local/Library/Libraries/libGNUMail.so
+Local/Library/Libraries/libGNUMail.so.1
+Local/Library/Libraries/libGNUMail.so.1.0.0
+Local/Library/GNUMail/Account.prefs/Account
 Local/Library/GNUMail/Account.prefs/Resources/Info-gnustep.plist
 Local/Library/GNUMail/Account.prefs/Resources/account.tiff
 Local/Library/GNUMail/Account.prefs/stamp.make
-Local/Library/GNUMail/Advanced.prefs/%%NOFLAT%%Advanced
+Local/Library/GNUMail/Advanced.prefs/Advanced
 Local/Library/GNUMail/Advanced.prefs/Resources/Info-gnustep.plist
 Local/Library/GNUMail/Advanced.prefs/Resources/advanced.tiff
 Local/Library/GNUMail/Advanced.prefs/stamp.make
-Local/Library/GNUMail/Colors.prefs/%%NOFLAT%%Colors
+Local/Library/GNUMail/Colors.prefs/Colors
 Local/Library/GNUMail/Colors.prefs/Resources/Info-gnustep.plist
 Local/Library/GNUMail/Colors.prefs/Resources/colors.tiff
 Local/Library/GNUMail/Colors.prefs/stamp.make
 Local/Library/GNUMail/Compose.prefs/Resources/Info-gnustep.plist
 Local/Library/GNUMail/Compose.prefs/Resources/MailIcon_create.tiff
-Local/Library/GNUMail/Compose.prefs/%%NOFLAT%%Compose
+Local/Library/GNUMail/Compose.prefs/Compose
 Local/Library/GNUMail/Compose.prefs/stamp.make
-Local/Library/GNUMail/Filtering.prefs/%%NOFLAT%%Filtering
+Local/Library/GNUMail/Filtering.prefs/Filtering
 Local/Library/GNUMail/Filtering.prefs/Resources/Filtering.tiff
 Local/Library/GNUMail/Filtering.prefs/Resources/Info-gnustep.plist
 Local/Library/GNUMail/Filtering.prefs/stamp.make
-Local/Library/GNUMail/Fonts.prefs/%%NOFLAT%%Fonts
+Local/Library/GNUMail/Fonts.prefs/Fonts
 Local/Library/GNUMail/Fonts.prefs/Resources/Info-gnustep.plist
 Local/Library/GNUMail/Fonts.prefs/Resources/fonts.tiff
 Local/Library/GNUMail/Fonts.prefs/stamp.make
-Local/Library/GNUMail/MIME.prefs/%%NOFLAT%%MIME
+Local/Library/GNUMail/MIME.prefs/MIME
 Local/Library/GNUMail/MIME.prefs/Resources/Info-gnustep.plist
 Local/Library/GNUMail/MIME.prefs/Resources/mime.tiff
 Local/Library/GNUMail/MIME.prefs/stamp.make
-Local/Library/GNUMail/Receiving.prefs/%%NOFLAT%%Receiving
+Local/Library/GNUMail/Receiving.prefs/Receiving
 Local/Library/GNUMail/Receiving.prefs/Resources/Info-gnustep.plist
 Local/Library/GNUMail/Receiving.prefs/Resources/MailIcon_retrieve.tiff
 Local/Library/GNUMail/Receiving.prefs/stamp.make
 Local/Library/GNUMail/Sending.prefs/Resources/Info-gnustep.plist
 Local/Library/GNUMail/Sending.prefs/Resources/MailIcon_send.tiff
-Local/Library/GNUMail/Sending.prefs/%%NOFLAT%%Sending
+Local/Library/GNUMail/Sending.prefs/Sending
 Local/Library/GNUMail/Sending.prefs/stamp.make
 Local/Library/GNUMail/Viewing.prefs/Resources/Info-gnustep.plist
 Local/Library/GNUMail/Viewing.prefs/Resources/viewing.tiff
-Local/Library/GNUMail/Viewing.prefs/%%NOFLAT%%Viewing
+Local/Library/GNUMail/Viewing.prefs/Viewing
 Local/Library/GNUMail/Viewing.prefs/stamp.make
-%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/Viewing.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/Viewing.prefs/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/Viewing.prefs/%%GNU_ARCH%%
 @dirrm Local/Library/GNUMail/Viewing.prefs/Resources
 @dirrm Local/Library/GNUMail/Viewing.prefs
-%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/Sending.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/Sending.prefs/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/Sending.prefs/%%GNU_ARCH%%
 @dirrm Local/Library/GNUMail/Sending.prefs/Resources
 @dirrm Local/Library/GNUMail/Sending.prefs
-%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/Receiving.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/Receiving.prefs/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/Receiving.prefs/%%GNU_ARCH%%
 @dirrm Local/Library/GNUMail/Receiving.prefs/Resources
 @dirrm Local/Library/GNUMail/Receiving.prefs
-%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/MIME.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/MIME.prefs/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/MIME.prefs/%%GNU_ARCH%%
 @dirrm Local/Library/GNUMail/MIME.prefs/Resources
 @dirrm Local/Library/GNUMail/MIME.prefs
-%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/Fonts.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/Fonts.prefs/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/Fonts.prefs/%%GNU_ARCH%%
 @dirrm Local/Library/GNUMail/Fonts.prefs/Resources
 @dirrm Local/Library/GNUMail/Fonts.prefs
-%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/Filtering.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/Filtering.prefs/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/Filtering.prefs/%%GNU_ARCH%%
 @dirrm Local/Library/GNUMail/Filtering.prefs/Resources
 @dirrm Local/Library/GNUMail/Filtering.prefs
-%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/Compose.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/Compose.prefs/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/Compose.prefs/%%GNU_ARCH%%
 @dirrm Local/Library/GNUMail/Compose.prefs/Resources
 @dirrm Local/Library/GNUMail/Compose.prefs
-%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/Colors.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/Colors.prefs/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/Colors.prefs/%%GNU_ARCH%%
 @dirrm Local/Library/GNUMail/Colors.prefs/Resources
 @dirrm Local/Library/GNUMail/Colors.prefs
-%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/Advanced.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/Advanced.prefs/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/Advanced.prefs/%%GNU_ARCH%%
 @dirrm Local/Library/GNUMail/Advanced.prefs/Resources
 @dirrm Local/Library/GNUMail/Advanced.prefs
-%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/Account.prefs/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/Account.prefs/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm Local/Library/GNUMail/Account.prefs/%%GNU_ARCH%%
 @dirrm Local/Library/GNUMail/Account.prefs/Resources
 @dirrm Local/Library/GNUMail/Account.prefs
 @dirrm Local/Library/GNUMail
 @dirrm Local/Library
-%%GNUSTEP_STABLE%%@dirrm Local/Applications/GNUMail.app/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm Local/Applications/GNUMail.app/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm Local/Applications/GNUMail.app/%%GNU_ARCH%%
 @dirrm Local/Applications/GNUMail.app/Resources/Swedish.lproj
 @dirrm Local/Applications/GNUMail.app/Resources/Spanish.lproj
 @dirrm Local/Applications/GNUMail.app/Resources/German.lproj
diff --git a/mail/pantomime-ssl/pkg-plist b/mail/pantomime-ssl/pkg-plist
index 1c76913c38cc..7b505e9eeb72 100644
--- a/mail/pantomime-ssl/pkg-plist
+++ b/mail/pantomime-ssl/pkg-plist
@@ -1,9 +1,6 @@
 Local/Library/Pantomime/TCPSSLConnection.bundle/Resources/Info-gnustep.plist
-Local/Library/Pantomime/TCPSSLConnection.bundle/%%NOFLAT%%TCPSSLConnection
+Local/Library/Pantomime/TCPSSLConnection.bundle/TCPSSLConnection
 Local/Library/Pantomime/TCPSSLConnection.bundle/stamp.make
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Pantomime/TCPSSLConnection.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Pantomime/TCPSSLConnection.bundle/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Pantomime/TCPSSLConnection.bundle/%%GNU_ARCH%%
 @dirrm Local/Library/Pantomime/TCPSSLConnection.bundle/Resources
 @dirrm Local/Library/Pantomime/TCPSSLConnection.bundle
 @dirrm Local/Library/Pantomime
diff --git a/mail/pantomime/pkg-plist b/mail/pantomime/pkg-plist
index 1c10c2dd54ed..94a041f5c19a 100644
--- a/mail/pantomime/pkg-plist
+++ b/mail/pantomime/pkg-plist
@@ -1,74 +1,71 @@
-%%LOCALLIBRARY%%/Headers/Pantomime/Charset.h
-%%LOCALLIBRARY%%/Headers/Pantomime/Connection.h
-%%LOCALLIBRARY%%/Headers/Pantomime/Constants.h
-%%LOCALLIBRARY%%/Headers/Pantomime/Container.h
-%%LOCALLIBRARY%%/Headers/Pantomime/Flags.h
-%%LOCALLIBRARY%%/Headers/Pantomime/Folder.h
-%%LOCALLIBRARY%%/Headers/Pantomime/FolderInformation.h
-%%LOCALLIBRARY%%/Headers/Pantomime/IMAPCacheManager.h
-%%LOCALLIBRARY%%/Headers/Pantomime/IMAPFolder.h
-%%LOCALLIBRARY%%/Headers/Pantomime/IMAPMessage.h
-%%LOCALLIBRARY%%/Headers/Pantomime/IMAPStore.h
-%%LOCALLIBRARY%%/Headers/Pantomime/ISO8859_1.h
-%%LOCALLIBRARY%%/Headers/Pantomime/ISO8859_10.h
-%%LOCALLIBRARY%%/Headers/Pantomime/ISO8859_11.h
-%%LOCALLIBRARY%%/Headers/Pantomime/ISO8859_13.h
-%%LOCALLIBRARY%%/Headers/Pantomime/ISO8859_14.h
-%%LOCALLIBRARY%%/Headers/Pantomime/ISO8859_15.h
-%%LOCALLIBRARY%%/Headers/Pantomime/ISO8859_2.h
-%%LOCALLIBRARY%%/Headers/Pantomime/ISO8859_3.h
-%%LOCALLIBRARY%%/Headers/Pantomime/ISO8859_4.h
-%%LOCALLIBRARY%%/Headers/Pantomime/ISO8859_5.h
-%%LOCALLIBRARY%%/Headers/Pantomime/ISO8859_6.h
-%%LOCALLIBRARY%%/Headers/Pantomime/ISO8859_7.h
-%%LOCALLIBRARY%%/Headers/Pantomime/ISO8859_8.h
-%%LOCALLIBRARY%%/Headers/Pantomime/ISO8859_9.h
-%%LOCALLIBRARY%%/Headers/Pantomime/InternetAddress.h
-%%LOCALLIBRARY%%/Headers/Pantomime/KOI8_R.h
-%%LOCALLIBRARY%%/Headers/Pantomime/KOI8_U.h
-%%LOCALLIBRARY%%/Headers/Pantomime/LocalFolder.h
-%%LOCALLIBRARY%%/Headers/Pantomime/LocalFolderCacheManager.h
-%%LOCALLIBRARY%%/Headers/Pantomime/LocalMessage.h
-%%LOCALLIBRARY%%/Headers/Pantomime/LocalStore.h
-%%LOCALLIBRARY%%/Headers/Pantomime/MD5.h
-%%LOCALLIBRARY%%/Headers/Pantomime/Message.h
-%%LOCALLIBRARY%%/Headers/Pantomime/MimeMultipart.h
-%%LOCALLIBRARY%%/Headers/Pantomime/MimeUtility.h
-%%LOCALLIBRARY%%/Headers/Pantomime/NSData+Extensions.h
-%%LOCALLIBRARY%%/Headers/Pantomime/NSRegEx.h
-%%LOCALLIBRARY%%/Headers/Pantomime/NSString+Extensions.h
-%%LOCALLIBRARY%%/Headers/Pantomime/POP3CacheManager.h
-%%LOCALLIBRARY%%/Headers/Pantomime/POP3CacheObject.h
-%%LOCALLIBRARY%%/Headers/Pantomime/POP3Folder.h
-%%LOCALLIBRARY%%/Headers/Pantomime/POP3Message.h
-%%LOCALLIBRARY%%/Headers/Pantomime/POP3Store.h
-%%LOCALLIBRARY%%/Headers/Pantomime/Pantomime.h
-%%LOCALLIBRARY%%/Headers/Pantomime/Parser.h
-%%LOCALLIBRARY%%/Headers/Pantomime/Part.h
-%%LOCALLIBRARY%%/Headers/Pantomime/SMTP.h
-%%LOCALLIBRARY%%/Headers/Pantomime/Sendmail.h
-%%LOCALLIBRARY%%/Headers/Pantomime/Service.h
-%%LOCALLIBRARY%%/Headers/Pantomime/Store.h
-%%LOCALLIBRARY%%/Headers/Pantomime/TCPConnection.h
-%%LOCALLIBRARY%%/Headers/Pantomime/Transport.h
-%%LOCALLIBRARY%%/Headers/Pantomime/URLName.h
-%%LOCALLIBRARY%%/Headers/Pantomime/UTF8.h
-%%LOCALLIBRARY%%/Headers/Pantomime/UUFile.h
-%%LOCALLIBRARY%%/Headers/Pantomime/WINDOWS_1250.h
-%%LOCALLIBRARY%%/Headers/Pantomime/WINDOWS_1251.h
-%%LOCALLIBRARY%%/Headers/Pantomime/WINDOWS_1252.h
-%%LOCALLIBRARY%%/Headers/Pantomime/WINDOWS_1253.h
-%%LOCALLIBRARY%%/Headers/Pantomime/WINDOWS_1254.h
-%%LOCALLIBRARY%%/Headers/Pantomime/elm_defs.h
-%%LOCALLIBRARY%%/Headers/Pantomime/elm_lib.h
-%%LOCALLIBRARY%%/Headers/Pantomime/parseaddrs.h
-%%LOCALLIBRARY%%/Libraries/%%NOFLAT%%libPantomime.so
-%%LOCALLIBRARY%%/Libraries/%%NOFLAT%%libPantomime.so.%%MAJORVERSION%%
-%%LOCALLIBRARY%%/Libraries/%%NOFLAT%%libPantomime.so.%%VERSION%%
-%%GNUSTEP_STABLE%%@dirrm %%LOCALLIBRARY%%/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm %%LOCALLIBRARY%%/Libraries/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm %%LOCALLIBRARY%%/Libraries/%%GNU_ARCH%%
-@dirrm %%LOCALLIBRARY%%/Libraries
-@dirrm %%LOCALLIBRARY%%/Headers/Pantomime
-@dirrm %%LOCALLIBRARY%%/Headers
-%%GNUSTEP_DEVEL%%@dirrm %%LOCALLIBRARY%%
+Local/Library/Headers/Pantomime/Charset.h
+Local/Library/Headers/Pantomime/Connection.h
+Local/Library/Headers/Pantomime/Constants.h
+Local/Library/Headers/Pantomime/Container.h
+Local/Library/Headers/Pantomime/Flags.h
+Local/Library/Headers/Pantomime/Folder.h
+Local/Library/Headers/Pantomime/FolderInformation.h
+Local/Library/Headers/Pantomime/IMAPCacheManager.h
+Local/Library/Headers/Pantomime/IMAPFolder.h
+Local/Library/Headers/Pantomime/IMAPMessage.h
+Local/Library/Headers/Pantomime/IMAPStore.h
+Local/Library/Headers/Pantomime/ISO8859_1.h
+Local/Library/Headers/Pantomime/ISO8859_10.h
+Local/Library/Headers/Pantomime/ISO8859_11.h
+Local/Library/Headers/Pantomime/ISO8859_13.h
+Local/Library/Headers/Pantomime/ISO8859_14.h
+Local/Library/Headers/Pantomime/ISO8859_15.h
+Local/Library/Headers/Pantomime/ISO8859_2.h
+Local/Library/Headers/Pantomime/ISO8859_3.h
+Local/Library/Headers/Pantomime/ISO8859_4.h
+Local/Library/Headers/Pantomime/ISO8859_5.h
+Local/Library/Headers/Pantomime/ISO8859_6.h
+Local/Library/Headers/Pantomime/ISO8859_7.h
+Local/Library/Headers/Pantomime/ISO8859_8.h
+Local/Library/Headers/Pantomime/ISO8859_9.h
+Local/Library/Headers/Pantomime/InternetAddress.h
+Local/Library/Headers/Pantomime/KOI8_R.h
+Local/Library/Headers/Pantomime/KOI8_U.h
+Local/Library/Headers/Pantomime/LocalFolder.h
+Local/Library/Headers/Pantomime/LocalFolderCacheManager.h
+Local/Library/Headers/Pantomime/LocalMessage.h
+Local/Library/Headers/Pantomime/LocalStore.h
+Local/Library/Headers/Pantomime/MD5.h
+Local/Library/Headers/Pantomime/Message.h
+Local/Library/Headers/Pantomime/MimeMultipart.h
+Local/Library/Headers/Pantomime/MimeUtility.h
+Local/Library/Headers/Pantomime/NSData+Extensions.h
+Local/Library/Headers/Pantomime/NSRegEx.h
+Local/Library/Headers/Pantomime/NSString+Extensions.h
+Local/Library/Headers/Pantomime/POP3CacheManager.h
+Local/Library/Headers/Pantomime/POP3CacheObject.h
+Local/Library/Headers/Pantomime/POP3Folder.h
+Local/Library/Headers/Pantomime/POP3Message.h
+Local/Library/Headers/Pantomime/POP3Store.h
+Local/Library/Headers/Pantomime/Pantomime.h
+Local/Library/Headers/Pantomime/Parser.h
+Local/Library/Headers/Pantomime/Part.h
+Local/Library/Headers/Pantomime/SMTP.h
+Local/Library/Headers/Pantomime/Sendmail.h
+Local/Library/Headers/Pantomime/Service.h
+Local/Library/Headers/Pantomime/Store.h
+Local/Library/Headers/Pantomime/TCPConnection.h
+Local/Library/Headers/Pantomime/Transport.h
+Local/Library/Headers/Pantomime/URLName.h
+Local/Library/Headers/Pantomime/UTF8.h
+Local/Library/Headers/Pantomime/UUFile.h
+Local/Library/Headers/Pantomime/WINDOWS_1250.h
+Local/Library/Headers/Pantomime/WINDOWS_1251.h
+Local/Library/Headers/Pantomime/WINDOWS_1252.h
+Local/Library/Headers/Pantomime/WINDOWS_1253.h
+Local/Library/Headers/Pantomime/WINDOWS_1254.h
+Local/Library/Headers/Pantomime/elm_defs.h
+Local/Library/Headers/Pantomime/elm_lib.h
+Local/Library/Headers/Pantomime/parseaddrs.h
+Local/Library/Libraries/libPantomime.so
+Local/Library/Libraries/libPantomime.so.%%MAJORVERSION%%
+Local/Library/Libraries/libPantomime.so.%%VERSION%%
+@dirrm Local/Library/Libraries
+@dirrm Local/Library/Headers/Pantomime
+@dirrm Local/Library/Headers
+@dirrm Local/Library
diff --git a/misc/gnustep-examples/pkg-plist b/misc/gnustep-examples/pkg-plist
index 2d256e167e8c..471bc5e5e030 100644
--- a/misc/gnustep-examples/pkg-plist
+++ b/misc/gnustep-examples/pkg-plist
@@ -2,14 +2,12 @@ Local/Applications/Calculator.app/Calculator
 Local/Applications/Calculator.app/Resources/Calculator.app.tiff
 Local/Applications/Calculator.app/Resources/Calculator.desktop
 Local/Applications/Calculator.app/Resources/Info-gnustep.plist
-%%GNUSTEP_STABLE%%Local/Applications/Calculator.app/%%NOFLAT%%Calculator
-Local/Applications/Calculator.app/%%NOFLAT%%library_paths.openapp
+Local/Applications/Calculator.app/library_paths.openapp
 Local/Applications/Calculator.app/stamp.make
 Local/Applications/CurrencyConverter.app/CurrencyConverter
 Local/Applications/CurrencyConverter.app/Resources/CurrencyConverter.desktop
 Local/Applications/CurrencyConverter.app/Resources/Info-gnustep.plist
-%%GNUSTEP_STABLE%%Local/Applications/CurrencyConverter.app/%%NOFLAT%%CurrencyConverter
-Local/Applications/CurrencyConverter.app/%%NOFLAT%%library_paths.openapp
+Local/Applications/CurrencyConverter.app/library_paths.openapp
 Local/Applications/CurrencyConverter.app/stamp.make
 Local/Applications/Finger.app/Finger
 Local/Applications/Finger.app/Resources/Finger.desktop
@@ -24,26 +22,22 @@ Local/Applications/Finger.app/Resources/traceroute.tiff
 Local/Applications/Finger.app/Resources/traceroute32.tiff
 Local/Applications/Finger.app/Resources/whois.tiff
 Local/Applications/Finger.app/Resources/whois32.tiff
-%%GNUSTEP_STABLE%%Local/Applications/Finger.app/%%NOFLAT%%Finger
-Local/Applications/Finger.app/%%NOFLAT%%library_paths.openapp
+Local/Applications/Finger.app/library_paths.openapp
 Local/Applications/Finger.app/stamp.make
 Local/Applications/GFractal.app/GFractal
 Local/Applications/GFractal.app/Resources/GFractal.desktop
 Local/Applications/GFractal.app/Resources/Info-gnustep.plist
-%%GNUSTEP_STABLE%%Local/Applications/GFractal.app/%%NOFLAT%%GFractal
-Local/Applications/GFractal.app/%%NOFLAT%%library_paths.openapp
+Local/Applications/GFractal.app/library_paths.openapp
 Local/Applications/GFractal.app/stamp.make
 Local/Applications/GSTest.app/GSTest
 Local/Applications/GSTest.app/Resources/GSTest.desktop
 Local/Applications/GSTest.app/Resources/Info-gnustep.plist
-%%GNUSTEP_STABLE%%Local/Applications/GSTest.app/%%NOFLAT%%GSTest
-Local/Applications/GSTest.app/%%NOFLAT%%library_paths.openapp
+Local/Applications/GSTest.app/library_paths.openapp
 Local/Applications/GSTest.app/stamp.make
 Local/Applications/HostAddress.app/HostAddress
 Local/Applications/HostAddress.app/Resources/HostAddress.desktop
 Local/Applications/HostAddress.app/Resources/Info-gnustep.plist
-%%GNUSTEP_STABLE%%Local/Applications/HostAddress.app/%%NOFLAT%%HostAddress
-Local/Applications/HostAddress.app/%%NOFLAT%%library_paths.openapp
+Local/Applications/HostAddress.app/library_paths.openapp
 Local/Applications/HostAddress.app/stamp.make
 Local/Applications/Ink.app/Ink
 Local/Applications/Ink.app/Resources/Info-gnustep.plist
@@ -51,234 +45,142 @@ Local/Applications/Ink.app/Resources/Ink.desktop
 Local/Applications/Ink.app/Resources/Ink_app.tiff
 Local/Applications/Ink.app/Resources/Ink_app_Tile.jpg
 Local/Applications/Ink.app/Resources/Readme.rtf
-%%GNUSTEP_STABLE%%Local/Applications/Ink.app/%%NOFLAT%%Ink
-Local/Applications/Ink.app/%%NOFLAT%%library_paths.openapp
+Local/Applications/Ink.app/library_paths.openapp
 Local/Applications/Ink.app/stamp.make
 Local/Applications/NSBrowserTest.app/NSBrowserTest
 Local/Applications/NSBrowserTest.app/Resources/Info-gnustep.plist
 Local/Applications/NSBrowserTest.app/Resources/NSBrowserTest.desktop
-%%GNUSTEP_STABLE%%Local/Applications/NSBrowserTest.app/%%NOFLAT%%NSBrowserTest
-Local/Applications/NSBrowserTest.app/%%NOFLAT%%library_paths.openapp
+Local/Applications/NSBrowserTest.app/library_paths.openapp
 Local/Applications/NSBrowserTest.app/stamp.make
 Local/Applications/NSScreenTest.app/NSScreenTest
 Local/Applications/NSScreenTest.app/Resources/Info-gnustep.plist
 Local/Applications/NSScreenTest.app/Resources/NSScreenTest.desktop
-%%GNUSTEP_STABLE%%Local/Applications/NSScreenTest.app/%%NOFLAT%%NSScreenTest
-Local/Applications/NSScreenTest.app/%%NOFLAT%%library_paths.openapp
+Local/Applications/NSScreenTest.app/library_paths.openapp
 Local/Applications/NSScreenTest.app/stamp.make
 Local/Library/Bundles/Composite-test.bundle/Resources/Info-gnustep.plist
-Local/Library/Bundles/Composite-test.bundle/%%NOFLAT%%Composite-test
+Local/Library/Bundles/Composite-test.bundle/Composite-test
 Local/Library/Bundles/Composite-test.bundle/stamp.make
 Local/Library/Bundles/CoordinateCheck-test.bundle/Resources/Info-gnustep.plist
-Local/Library/Bundles/CoordinateCheck-test.bundle/%%NOFLAT%%CoordinateCheck-test
+Local/Library/Bundles/CoordinateCheck-test.bundle/CoordinateCheck-test
 Local/Library/Bundles/CoordinateCheck-test.bundle/stamp.make
 Local/Library/Bundles/GSHbox-test.bundle/Resources/Info-gnustep.plist
-Local/Library/Bundles/GSHbox-test.bundle/%%NOFLAT%%GSHbox-test
+Local/Library/Bundles/GSHbox-test.bundle/GSHbox-test
 Local/Library/Bundles/GSHbox-test.bundle/stamp.make
 Local/Library/Bundles/KeyboardInput-test.bundle/Resources/Info-gnustep.plist
-Local/Library/Bundles/KeyboardInput-test.bundle/%%NOFLAT%%KeyboardInput-test
+Local/Library/Bundles/KeyboardInput-test.bundle/KeyboardInput-test
 Local/Library/Bundles/KeyboardInput-test.bundle/stamp.make
 Local/Library/Bundles/NSBox-test.bundle/Resources/Info-gnustep.plist
-Local/Library/Bundles/NSBox-test.bundle/%%NOFLAT%%NSBox-test
+Local/Library/Bundles/NSBox-test.bundle/NSBox-test
 Local/Library/Bundles/NSBox-test.bundle/stamp.make
 Local/Library/Bundles/NSColorList-test.bundle/Resources/Info-gnustep.plist
-Local/Library/Bundles/NSColorList-test.bundle/%%NOFLAT%%NSColorList-test
+Local/Library/Bundles/NSColorList-test.bundle/NSColorList-test
 Local/Library/Bundles/NSColorList-test.bundle/stamp.make
 Local/Library/Bundles/NSColorWell-test.bundle/Resources/Info-gnustep.plist
-Local/Library/Bundles/NSColorWell-test.bundle/%%NOFLAT%%NSColorWell-test
+Local/Library/Bundles/NSColorWell-test.bundle/NSColorWell-test
 Local/Library/Bundles/NSColorWell-test.bundle/stamp.make
 Local/Library/Bundles/NSForm-test.bundle/Resources/Info-gnustep.plist
-Local/Library/Bundles/NSForm-test.bundle/%%NOFLAT%%NSForm-test
+Local/Library/Bundles/NSForm-test.bundle/NSForm-test
 Local/Library/Bundles/NSForm-test.bundle/stamp.make
 Local/Library/Bundles/NSOutlineView-test.bundle/Resources/Info-gnustep.plist
-Local/Library/Bundles/NSOutlineView-test.bundle/%%NOFLAT%%NSOutlineView-test
+Local/Library/Bundles/NSOutlineView-test.bundle/NSOutlineView-test
 Local/Library/Bundles/NSOutlineView-test.bundle/stamp.make
 Local/Library/Bundles/NSSavePanel-test.bundle/Resources/Info-gnustep.plist
-Local/Library/Bundles/NSSavePanel-test.bundle/%%NOFLAT%%NSSavePanel-test
+Local/Library/Bundles/NSSavePanel-test.bundle/NSSavePanel-test
 Local/Library/Bundles/NSSavePanel-test.bundle/stamp.make
 Local/Library/Bundles/NSScrollView-test.bundle/Resources/Info-gnustep.plist
-Local/Library/Bundles/NSScrollView-test.bundle/%%NOFLAT%%NSScrollView-test
+Local/Library/Bundles/NSScrollView-test.bundle/NSScrollView-test
 Local/Library/Bundles/NSScrollView-test.bundle/stamp.make
 Local/Library/Bundles/NSSecureTextField-test.bundle/Resources/Info-gnustep.plist
-Local/Library/Bundles/NSSecureTextField-test.bundle/%%NOFLAT%%NSSecureTextField-test
+Local/Library/Bundles/NSSecureTextField-test.bundle/NSSecureTextField-test
 Local/Library/Bundles/NSSecureTextField-test.bundle/stamp.make
 Local/Library/Bundles/NSSlider-test.bundle/Resources/Info-gnustep.plist
-Local/Library/Bundles/NSSlider-test.bundle/%%NOFLAT%%NSSlider-test
+Local/Library/Bundles/NSSlider-test.bundle/NSSlider-test
 Local/Library/Bundles/NSSlider-test.bundle/stamp.make
 Local/Library/Bundles/NSSplitView-test.bundle/Resources/Info-gnustep.plist
-Local/Library/Bundles/NSSplitView-test.bundle/%%NOFLAT%%NSSplitView-test
+Local/Library/Bundles/NSSplitView-test.bundle/NSSplitView-test
 Local/Library/Bundles/NSSplitView-test.bundle/stamp.make
 Local/Library/Bundles/NSTableView-test.bundle/Resources/Info-gnustep.plist
-Local/Library/Bundles/NSTableView-test.bundle/%%NOFLAT%%NSTableView-test
+Local/Library/Bundles/NSTableView-test.bundle/NSTableView-test
 Local/Library/Bundles/NSTableView-test.bundle/stamp.make
 Local/Library/Bundles/NSTextView-test.bundle/Resources/Info-gnustep.plist
-Local/Library/Bundles/NSTextView-test.bundle/%%NOFLAT%%NSTextView-test
+Local/Library/Bundles/NSTextView-test.bundle/NSTextView-test
 Local/Library/Bundles/NSTextView-test.bundle/stamp.make
 Local/Library/Bundles/NSWindowStyleMask-test.bundle/Resources/Info-gnustep.plist
-Local/Library/Bundles/NSWindowStyleMask-test.bundle/%%NOFLAT%%NSWindowStyleMask-test
+Local/Library/Bundles/NSWindowStyleMask-test.bundle/NSWindowStyleMask-test
 Local/Library/Bundles/NSWindowStyleMask-test.bundle/stamp.make
 Local/Library/Bundles/StringDrawing-test.bundle/Resources/Info-gnustep.plist
-Local/Library/Bundles/StringDrawing-test.bundle/%%NOFLAT%%StringDrawing-test
+Local/Library/Bundles/StringDrawing-test.bundle/StringDrawing-test
 Local/Library/Bundles/StringDrawing-test.bundle/stamp.make
 System/Applications/GPuzzle.app/GPuzzle
 System/Applications/GPuzzle.app/Resources/GPuzzle.desktop
 System/Applications/GPuzzle.app/Resources/Info-gnustep.plist
-%%GNUSTEP_STABLE%%System/Applications/GPuzzle.app/%%NOFLAT%%GPuzzle
-System/Applications/GPuzzle.app/%%NOFLAT%%library_paths.openapp
+System/Applications/GPuzzle.app/library_paths.openapp
 System/Applications/GPuzzle.app/stamp.make
 System/Applications/NSPanelTest.app/NSPanelTest
 System/Applications/NSPanelTest.app/Resources/Info-gnustep.plist
 System/Applications/NSPanelTest.app/Resources/NSPanelTest.desktop
 System/Applications/NSPanelTest.app/Resources/Test.strings
 System/Applications/NSPanelTest.app/Resources/icon.tiff
-%%GNUSTEP_STABLE%%System/Applications/NSPanelTest.app/%%NOFLAT%%NSPanelTest
-System/Applications/NSPanelTest.app/%%NOFLAT%%library_paths.openapp
+System/Applications/NSPanelTest.app/library_paths.openapp
 System/Applications/NSPanelTest.app/stamp.make
-%%GNUSTEP_STABLE%%@dirrm System/Applications/NSPanelTest.app/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm System/Applications/NSPanelTest.app/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm System/Applications/NSPanelTest.app/%%GNU_ARCH%%
 @dirrm System/Applications/NSPanelTest.app/Resources
 @dirrm System/Applications/NSPanelTest.app
-%%GNUSTEP_STABLE%%@dirrm System/Applications/GPuzzle.app/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm System/Applications/GPuzzle.app/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm System/Applications/GPuzzle.app/%%GNU_ARCH%%
 @dirrm System/Applications/GPuzzle.app/Resources
 @dirrm System/Applications/GPuzzle.app
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Bundles/StringDrawing-test.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Bundles/StringDrawing-test.bundle/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Bundles/StringDrawing-test.bundle/%%GNU_ARCH%%
 @dirrm Local/Library/Bundles/StringDrawing-test.bundle/Resources
 @dirrm Local/Library/Bundles/StringDrawing-test.bundle
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Bundles/NSWindowStyleMask-test.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Bundles/NSWindowStyleMask-test.bundle/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Bundles/NSWindowStyleMask-test.bundle/%%GNU_ARCH%%
 @dirrm Local/Library/Bundles/NSWindowStyleMask-test.bundle/Resources
 @dirrm Local/Library/Bundles/NSWindowStyleMask-test.bundle
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Bundles/NSTextView-test.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Bundles/NSTextView-test.bundle/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Bundles/NSTextView-test.bundle/%%GNU_ARCH%%
 @dirrm Local/Library/Bundles/NSTextView-test.bundle/Resources
 @dirrm Local/Library/Bundles/NSTextView-test.bundle
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Bundles/NSTableView-test.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Bundles/NSTableView-test.bundle/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Bundles/NSTableView-test.bundle/%%GNU_ARCH%%
 @dirrm Local/Library/Bundles/NSTableView-test.bundle/Resources
 @dirrm Local/Library/Bundles/NSTableView-test.bundle
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Bundles/NSSplitView-test.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Bundles/NSSplitView-test.bundle/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Bundles/NSSplitView-test.bundle/%%GNU_ARCH%%
 @dirrm Local/Library/Bundles/NSSplitView-test.bundle/Resources
 @dirrm Local/Library/Bundles/NSSplitView-test.bundle
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Bundles/NSSlider-test.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Bundles/NSSlider-test.bundle/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Bundles/NSSlider-test.bundle/%%GNU_ARCH%%
 @dirrm Local/Library/Bundles/NSSlider-test.bundle/Resources
 @dirrm Local/Library/Bundles/NSSlider-test.bundle
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Bundles/NSSecureTextField-test.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Bundles/NSSecureTextField-test.bundle/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Bundles/NSSecureTextField-test.bundle/%%GNU_ARCH%%
 @dirrm Local/Library/Bundles/NSSecureTextField-test.bundle/Resources
 @dirrm Local/Library/Bundles/NSSecureTextField-test.bundle
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Bundles/NSScrollView-test.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Bundles/NSScrollView-test.bundle/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Bundles/NSScrollView-test.bundle/%%GNU_ARCH%%
 @dirrm Local/Library/Bundles/NSScrollView-test.bundle/Resources
 @dirrm Local/Library/Bundles/NSScrollView-test.bundle
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Bundles/NSSavePanel-test.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Bundles/NSSavePanel-test.bundle/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Bundles/NSSavePanel-test.bundle/%%GNU_ARCH%%
 @dirrm Local/Library/Bundles/NSSavePanel-test.bundle/Resources
 @dirrm Local/Library/Bundles/NSSavePanel-test.bundle
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Bundles/NSOutlineView-test.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Bundles/NSOutlineView-test.bundle/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Bundles/NSOutlineView-test.bundle/%%GNU_ARCH%%
 @dirrm Local/Library/Bundles/NSOutlineView-test.bundle/Resources
 @dirrm Local/Library/Bundles/NSOutlineView-test.bundle
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Bundles/NSForm-test.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Bundles/NSForm-test.bundle/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Bundles/NSForm-test.bundle/%%GNU_ARCH%%
 @dirrm Local/Library/Bundles/NSForm-test.bundle/Resources
 @dirrm Local/Library/Bundles/NSForm-test.bundle
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Bundles/NSColorWell-test.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Bundles/NSColorWell-test.bundle/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Bundles/NSColorWell-test.bundle/%%GNU_ARCH%%
 @dirrm Local/Library/Bundles/NSColorWell-test.bundle/Resources
 @dirrm Local/Library/Bundles/NSColorWell-test.bundle
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Bundles/NSColorList-test.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Bundles/NSColorList-test.bundle/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Bundles/NSColorList-test.bundle/%%GNU_ARCH%%
 @dirrm Local/Library/Bundles/NSColorList-test.bundle/Resources
 @dirrm Local/Library/Bundles/NSColorList-test.bundle
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Bundles/NSBox-test.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Bundles/NSBox-test.bundle/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Bundles/NSBox-test.bundle/%%GNU_ARCH%%
 @dirrm Local/Library/Bundles/NSBox-test.bundle/Resources
 @dirrm Local/Library/Bundles/NSBox-test.bundle
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Bundles/KeyboardInput-test.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Bundles/KeyboardInput-test.bundle/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Bundles/KeyboardInput-test.bundle/%%GNU_ARCH%%
 @dirrm Local/Library/Bundles/KeyboardInput-test.bundle/Resources
 @dirrm Local/Library/Bundles/KeyboardInput-test.bundle
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Bundles/GSHbox-test.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Bundles/GSHbox-test.bundle/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Bundles/GSHbox-test.bundle/%%GNU_ARCH%%
 @dirrm Local/Library/Bundles/GSHbox-test.bundle/Resources
 @dirrm Local/Library/Bundles/GSHbox-test.bundle
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Bundles/CoordinateCheck-test.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Bundles/CoordinateCheck-test.bundle/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Bundles/CoordinateCheck-test.bundle/%%GNU_ARCH%%
 @dirrm Local/Library/Bundles/CoordinateCheck-test.bundle/Resources
 @dirrm Local/Library/Bundles/CoordinateCheck-test.bundle
 @dirrm Local/Library/Bundles/Composite-test.bundle/Resources
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Bundles/Composite-test.bundle/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Bundles/Composite-test.bundle/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm Local/Library/Bundles/Composite-test.bundle/%%GNU_ARCH%%
 @dirrm Local/Library/Bundles/Composite-test.bundle
 @dirrm Local/Library/Bundles
 @dirrm Local/Library
-%%GNUSTEP_STABLE%%@dirrm Local/Applications/NSScreenTest.app/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm Local/Applications/NSScreenTest.app/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm Local/Applications/NSScreenTest.app/%%GNU_ARCH%%
 @dirrm Local/Applications/NSScreenTest.app/Resources
 @dirrm Local/Applications/NSScreenTest.app
-%%GNUSTEP_STABLE%%@dirrm Local/Applications/NSBrowserTest.app/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm Local/Applications/NSBrowserTest.app/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm Local/Applications/NSBrowserTest.app/%%GNU_ARCH%%
 @dirrm Local/Applications/NSBrowserTest.app/Resources
 @dirrm Local/Applications/NSBrowserTest.app
-%%GNUSTEP_STABLE%%@dirrm Local/Applications/Ink.app/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm Local/Applications/Ink.app/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm Local/Applications/Ink.app/%%GNU_ARCH%%
 @dirrm Local/Applications/Ink.app/Resources
 @dirrm Local/Applications/Ink.app
-%%GNUSTEP_STABLE%%@dirrm Local/Applications/HostAddress.app/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm Local/Applications/HostAddress.app/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm Local/Applications/HostAddress.app/%%GNU_ARCH%%
 @dirrm Local/Applications/HostAddress.app/Resources
 @dirrm Local/Applications/HostAddress.app
-%%GNUSTEP_STABLE%%@dirrm Local/Applications/GSTest.app/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm Local/Applications/GSTest.app/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm Local/Applications/GSTest.app/%%GNU_ARCH%%
 @dirrm Local/Applications/GSTest.app/Resources
 @dirrm Local/Applications/GSTest.app
-%%GNUSTEP_STABLE%%@dirrm Local/Applications/GFractal.app/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm Local/Applications/GFractal.app/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm Local/Applications/GFractal.app/%%GNU_ARCH%%
 @dirrm Local/Applications/GFractal.app/Resources
 @dirrm Local/Applications/GFractal.app
-%%GNUSTEP_STABLE%%@dirrm Local/Applications/Finger.app/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm Local/Applications/Finger.app/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm Local/Applications/Finger.app/%%GNU_ARCH%%
 @dirrm Local/Applications/Finger.app/Resources
 @dirrm Local/Applications/Finger.app
-%%GNUSTEP_STABLE%%@dirrm Local/Applications/CurrencyConverter.app/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm Local/Applications/CurrencyConverter.app/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm Local/Applications/CurrencyConverter.app/%%GNU_ARCH%%
 @dirrm Local/Applications/CurrencyConverter.app/Resources
 @dirrm Local/Applications/CurrencyConverter.app
-%%GNUSTEP_STABLE%%@dirrm Local/Applications/Calculator.app/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm Local/Applications/Calculator.app/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm Local/Applications/Calculator.app/%%GNU_ARCH%%
 @dirrm Local/Applications/Calculator.app/Resources
 @dirrm Local/Applications/Calculator.app
 @dirrm Local/Applications
diff --git a/shells/gscommander/pkg-plist b/shells/gscommander/pkg-plist
index 4a93e73f5324..88f935eb7cf8 100644
--- a/shells/gscommander/pkg-plist
+++ b/shells/gscommander/pkg-plist
@@ -5,12 +5,8 @@ Local/Applications/GSCommander.app/Resources/GSCommander.tiff
 Local/Applications/GSCommander.app/Resources/GSCommanderInfo.plist
 Local/Applications/GSCommander.app/Resources/Info-gnustep.plist
 Local/Applications/GSCommander.app/Resources/README
-%%GNUSTEP_STABLE%%Local/Applications/GSCommander.app/%%NOFLAT%%GSCommander
-Local/Applications/GSCommander.app/%%NOFLAT%%library_paths.openapp
+Local/Applications/GSCommander.app/library_paths.openapp
 Local/Applications/GSCommander.app/stamp.make
-%%GNUSTEP_STABLE%%@dirrm Local/Applications/GSCommander.app/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm Local/Applications/GSCommander.app/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm Local/Applications/GSCommander.app/%%GNU_ARCH%%
 @dirrm Local/Applications/GSCommander.app/Resources
 @dirrm Local/Applications/GSCommander.app
 @dirrm Local/Applications
diff --git a/textproc/easydiff/pkg-plist b/textproc/easydiff/pkg-plist
index 90ccdcce90d3..09863318f9fd 100644
--- a/textproc/easydiff/pkg-plist
+++ b/textproc/easydiff/pkg-plist
@@ -4,12 +4,8 @@ Local/Applications/EasyDiff.app/Resources/EasyDiff.desktop
 Local/Applications/EasyDiff.app/Resources/EasyDiff.gorm
 Local/Applications/EasyDiff.app/Resources/EasyDiffInfo.plist
 Local/Applications/EasyDiff.app/Resources/Info-gnustep.plist
-%%GNUSTEP_STABLE%%Local/Applications/EasyDiff.app/%%NOFLAT%%EasyDiff
-Local/Applications/EasyDiff.app/%%NOFLAT%%library_paths.openapp
+Local/Applications/EasyDiff.app/library_paths.openapp
 Local/Applications/EasyDiff.app/stamp.make
-%%GNUSTEP_STABLE%%@dirrm Local/Applications/EasyDiff.app/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm Local/Applications/EasyDiff.app/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm Local/Applications/EasyDiff.app/%%GNU_ARCH%%
 @dirrm Local/Applications/EasyDiff.app/Resources
 @dirrm Local/Applications/EasyDiff.app
 @dirrm Local/Applications
diff --git a/x11-toolkits/gtoolkit/pkg-plist b/x11-toolkits/gtoolkit/pkg-plist
index 853c6d34db22..3094d5b1e31c 100644
--- a/x11-toolkits/gtoolkit/pkg-plist
+++ b/x11-toolkits/gtoolkit/pkg-plist
@@ -1,113 +1,110 @@
-%%LOCALLIBRARY%%/Headers/GToolKit/GTK.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKAccelGroup.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKAccelLabel.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKAction.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKAdjustment.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKAlignment.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKApplication.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKArrow.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKAspectFrame.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKBin.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKBox.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKButton.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKButtonBox.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKCList.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKCTree.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKCalendar.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKCheckButton.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKCheckMenuItem.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKColorSelection.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKColorSelectionDialog.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKCombo.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKContainer.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKCurve.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKData.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKDialog.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKDrawingArea.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKEditable.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKEntry.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKEventBox.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKFileSelection.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKFixed.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKFontSelection.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKFontSelectionDialog.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKFrame.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKGammaCurve.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKGladeXML.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKHBox.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKHButtonBox.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKHPaned.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKHRuler.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKHScale.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKHScrollbar.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKHSeparator.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKHandleBox.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKImage.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKInputDialog.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKInvisible.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKItem.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKItemFactory.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKLabel.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKLayout.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKList.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKListItem.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKMain.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKMenu.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKMenuBar.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKMenuFactory.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKMenuItem.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKMenuShell.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKMisc.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKNotebook.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKObject.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKOptionMenu.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKPacker.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKPaned.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKPixmap.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKPlug.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKPreview.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKProgress.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKProgressBar.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKRadioButton.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKRadioMenuItem.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKRange.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKRuler.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKScale.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKScrollbar.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKScrolledWindow.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKSeparator.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKSocket.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKSpinButton.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKStatusbar.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKStyle.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKTable.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKTearoffMenuItem.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKText.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKTipsQuery.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKToggleButton.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKToolbar.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKTooltips.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKTree.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKTreeItem.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKVBox.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKVButtonBox.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKVPaned.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKVRuler.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKVScale.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKVScrollbar.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKVSeparator.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKViewport.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKWidget.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GTKWindow.h
-%%LOCALLIBRARY%%/Headers/GToolKit/GToolKit.h
-%%LOCALLIBRARY%%/Libraries/%%NOFLAT%%libGToolKit.so
-%%LOCALLIBRARY%%/Libraries/%%NOFLAT%%libGToolKit.so.%%MAJORVERSION%%
-%%LOCALLIBRARY%%/Libraries/%%NOFLAT%%libGToolKit.so.%%VERSION%%
+Local/Library/Headers/GToolKit/GTK.h
+Local/Library/Headers/GToolKit/GTKAccelGroup.h
+Local/Library/Headers/GToolKit/GTKAccelLabel.h
+Local/Library/Headers/GToolKit/GTKAction.h
+Local/Library/Headers/GToolKit/GTKAdjustment.h
+Local/Library/Headers/GToolKit/GTKAlignment.h
+Local/Library/Headers/GToolKit/GTKApplication.h
+Local/Library/Headers/GToolKit/GTKArrow.h
+Local/Library/Headers/GToolKit/GTKAspectFrame.h
+Local/Library/Headers/GToolKit/GTKBin.h
+Local/Library/Headers/GToolKit/GTKBox.h
+Local/Library/Headers/GToolKit/GTKButton.h
+Local/Library/Headers/GToolKit/GTKButtonBox.h
+Local/Library/Headers/GToolKit/GTKCList.h
+Local/Library/Headers/GToolKit/GTKCTree.h
+Local/Library/Headers/GToolKit/GTKCalendar.h
+Local/Library/Headers/GToolKit/GTKCheckButton.h
+Local/Library/Headers/GToolKit/GTKCheckMenuItem.h
+Local/Library/Headers/GToolKit/GTKColorSelection.h
+Local/Library/Headers/GToolKit/GTKColorSelectionDialog.h
+Local/Library/Headers/GToolKit/GTKCombo.h
+Local/Library/Headers/GToolKit/GTKContainer.h
+Local/Library/Headers/GToolKit/GTKCurve.h
+Local/Library/Headers/GToolKit/GTKData.h
+Local/Library/Headers/GToolKit/GTKDialog.h
+Local/Library/Headers/GToolKit/GTKDrawingArea.h
+Local/Library/Headers/GToolKit/GTKEditable.h
+Local/Library/Headers/GToolKit/GTKEntry.h
+Local/Library/Headers/GToolKit/GTKEventBox.h
+Local/Library/Headers/GToolKit/GTKFileSelection.h
+Local/Library/Headers/GToolKit/GTKFixed.h
+Local/Library/Headers/GToolKit/GTKFontSelection.h
+Local/Library/Headers/GToolKit/GTKFontSelectionDialog.h
+Local/Library/Headers/GToolKit/GTKFrame.h
+Local/Library/Headers/GToolKit/GTKGammaCurve.h
+Local/Library/Headers/GToolKit/GTKGladeXML.h
+Local/Library/Headers/GToolKit/GTKHBox.h
+Local/Library/Headers/GToolKit/GTKHButtonBox.h
+Local/Library/Headers/GToolKit/GTKHPaned.h
+Local/Library/Headers/GToolKit/GTKHRuler.h
+Local/Library/Headers/GToolKit/GTKHScale.h
+Local/Library/Headers/GToolKit/GTKHScrollbar.h
+Local/Library/Headers/GToolKit/GTKHSeparator.h
+Local/Library/Headers/GToolKit/GTKHandleBox.h
+Local/Library/Headers/GToolKit/GTKImage.h
+Local/Library/Headers/GToolKit/GTKInputDialog.h
+Local/Library/Headers/GToolKit/GTKInvisible.h
+Local/Library/Headers/GToolKit/GTKItem.h
+Local/Library/Headers/GToolKit/GTKItemFactory.h
+Local/Library/Headers/GToolKit/GTKLabel.h
+Local/Library/Headers/GToolKit/GTKLayout.h
+Local/Library/Headers/GToolKit/GTKList.h
+Local/Library/Headers/GToolKit/GTKListItem.h
+Local/Library/Headers/GToolKit/GTKMain.h
+Local/Library/Headers/GToolKit/GTKMenu.h
+Local/Library/Headers/GToolKit/GTKMenuBar.h
+Local/Library/Headers/GToolKit/GTKMenuFactory.h
+Local/Library/Headers/GToolKit/GTKMenuItem.h
+Local/Library/Headers/GToolKit/GTKMenuShell.h
+Local/Library/Headers/GToolKit/GTKMisc.h
+Local/Library/Headers/GToolKit/GTKNotebook.h
+Local/Library/Headers/GToolKit/GTKObject.h
+Local/Library/Headers/GToolKit/GTKOptionMenu.h
+Local/Library/Headers/GToolKit/GTKPacker.h
+Local/Library/Headers/GToolKit/GTKPaned.h
+Local/Library/Headers/GToolKit/GTKPixmap.h
+Local/Library/Headers/GToolKit/GTKPlug.h
+Local/Library/Headers/GToolKit/GTKPreview.h
+Local/Library/Headers/GToolKit/GTKProgress.h
+Local/Library/Headers/GToolKit/GTKProgressBar.h
+Local/Library/Headers/GToolKit/GTKRadioButton.h
+Local/Library/Headers/GToolKit/GTKRadioMenuItem.h
+Local/Library/Headers/GToolKit/GTKRange.h
+Local/Library/Headers/GToolKit/GTKRuler.h
+Local/Library/Headers/GToolKit/GTKScale.h
+Local/Library/Headers/GToolKit/GTKScrollbar.h
+Local/Library/Headers/GToolKit/GTKScrolledWindow.h
+Local/Library/Headers/GToolKit/GTKSeparator.h
+Local/Library/Headers/GToolKit/GTKSocket.h
+Local/Library/Headers/GToolKit/GTKSpinButton.h
+Local/Library/Headers/GToolKit/GTKStatusbar.h
+Local/Library/Headers/GToolKit/GTKStyle.h
+Local/Library/Headers/GToolKit/GTKTable.h
+Local/Library/Headers/GToolKit/GTKTearoffMenuItem.h
+Local/Library/Headers/GToolKit/GTKText.h
+Local/Library/Headers/GToolKit/GTKTipsQuery.h
+Local/Library/Headers/GToolKit/GTKToggleButton.h
+Local/Library/Headers/GToolKit/GTKToolbar.h
+Local/Library/Headers/GToolKit/GTKTooltips.h
+Local/Library/Headers/GToolKit/GTKTree.h
+Local/Library/Headers/GToolKit/GTKTreeItem.h
+Local/Library/Headers/GToolKit/GTKVBox.h
+Local/Library/Headers/GToolKit/GTKVButtonBox.h
+Local/Library/Headers/GToolKit/GTKVPaned.h
+Local/Library/Headers/GToolKit/GTKVRuler.h
+Local/Library/Headers/GToolKit/GTKVScale.h
+Local/Library/Headers/GToolKit/GTKVScrollbar.h
+Local/Library/Headers/GToolKit/GTKVSeparator.h
+Local/Library/Headers/GToolKit/GTKViewport.h
+Local/Library/Headers/GToolKit/GTKWidget.h
+Local/Library/Headers/GToolKit/GTKWindow.h
+Local/Library/Headers/GToolKit/GToolKit.h
+Local/Library/Libraries/libGToolKit.so
+Local/Library/Libraries/libGToolKit.so.%%MAJORVERSION%%
+Local/Library/Libraries/libGToolKit.so.%%VERSION%%
 System/Makefiles/gtk-tool.make
-%%GNUSTEP_STABLE%%@dirrm %%LOCALLIBRARY%%/Libraries/%%GNU_ARCH%%/%%OPSYS%%/gnu-gnu-gnu
-%%GNUSTEP_STABLE%%@dirrm %%LOCALLIBRARY%%/Libraries/%%GNU_ARCH%%/%%OPSYS%%
-%%GNUSTEP_STABLE%%@dirrm %%LOCALLIBRARY%%/Libraries/%%GNU_ARCH%%
-@dirrm %%LOCALLIBRARY%%/Libraries
-@dirrm %%LOCALLIBRARY%%/Headers/GToolKit
-@dirrm %%LOCALLIBRARY%%/Headers
-%%GNUSTEP_DEVEL%%@dirrm %%LOCALLIBRARY%%
+@dirrm Local/Library/Libraries
+@dirrm Local/Library/Headers/GToolKit
+@dirrm Local/Library/Headers
+@dirrm Local/Library