Index: SapphireFrappliance/SapphireAppliance.m
===================================================================
--- SapphireFrappliance/SapphireAppliance.m	(Revision 495)
+++ SapphireFrappliance/SapphireAppliance.m	(Arbeitskopie)
@@ -121,7 +121,6 @@
 
 - (id)applianceController
 {
-	NSLog(@"in -SapphireApplicance applianceController");
 	return ( [[[SapphireApplianceController alloc] initWithScene: nil] autorelease] );
 }
 
@@ -135,8 +134,6 @@
  * This implements the BRAppliance protocol from ATV2.
  */
 -(id)applianceInfo {
-	NSLog(@"in -SapphireApplicance applianceInfo");
-	
 	BRApplianceInfo* p = [BRApplianceInfo infoForApplianceBundle:[NSBundle bundleForClass:[self class]]];
 	NSMutableArray *categories = [NSMutableArray array];
 	
@@ -145,13 +142,11 @@
 	while((obj = [enumerator nextObject]) != nil) {
 		BRApplianceCategory *category = [BRApplianceCategory categoryWithName:[obj valueForKey:@"name"] identifier:[obj valueForKey:@"identifier"] preferredOrder:[[obj valueForKey:@"preferred-order"] floatValue]];
 		[categories addObject:category];
-		NSLog(@"asdsa");
 	}
 	return [BRApplianceInfo infoForApplianceBundle:[NSBundle bundleForClass:[self class]]];
 }
 
 -(id)applianceCategories {
-	NSLog(@"in -SapphireApplicance applianceCategories");
 	NSMutableArray *categories = [NSMutableArray array];
 	
 	NSEnumerator *enumerator = [[[self applianceInfo] applianceCategoryDescriptors] objectEnumerator];
Index: SapphireFrappliance/SapphireMediaPreview.h
===================================================================
--- SapphireFrappliance/SapphireMediaPreview.h	(Revision 495)
+++ SapphireFrappliance/SapphireMediaPreview.h	(Arbeitskopie)
@@ -28,6 +28,7 @@
  * The directory may not always be the parent of the metadata. In the case of virtual directories, the parent is a virtual directory while the metadata is the actual file located elsewhere.
  */
 @interface SapphireMediaPreview : BRMetadataPreviewController{
+	char padding[128];
 	SapphireMetaData			*meta;			/*!< @brief The metadata to display in the preview*/
 	SapphireDirectoryMetaData	*dirMeta;		/*!< @brief The directory containing the metadata*/
 }
Index: SapphireFrappliance/SapphireMediaPreview.m
===================================================================
--- SapphireFrappliance/SapphireMediaPreview.m	(Revision 495)
+++ SapphireFrappliance/SapphireMediaPreview.m	(Arbeitskopie)
@@ -40,11 +40,20 @@
 }
 @end
 
-@interface SapphireMediaPreview (private)
-- (void)doPopulation;
-- (NSString *)coverArtForPath;
+/* There is no BRMetadataLayer class in ATV2.0 anymore, it seems to be BRMetadataControl now*/
+/* So just do the same stuff as above, but for BRMetadataControl*/
+@interface BRMetadataControl : NSObject
 @end
 
+@implementation BRMetadataControl (protectedAccess)
+	-(NSArray *)gimmieMetadataObjs {
+	Class klass = [self class];
+	Ivar ret = class_getInstanceVariable(klass, "_metadataObjs");
+	return *(NSArray * *)(((char *)self)+ret->ivar_offset);
+}
+@end
+
+
 @interface BRMetadataPreviewController (compat)
 - (void)_updateMetadataLayer;
 @end
@@ -63,6 +72,11 @@
 }
 @end
 
+@interface SapphireMediaPreview (private)
+- (void)doPopulation;
+- (NSString *)coverArtForPath;
+@end
+
 @implementation SapphireMediaPreview
 
 /*List of extensions to look for cover art*/
Index: SapphireFrappliance/Info.plist
===================================================================
--- SapphireFrappliance/Info.plist	(Revision 495)
+++ SapphireFrappliance/Info.plist	(Arbeitskopie)
@@ -25,7 +25,7 @@
 	<key>FRApplianceIconReflectionOffset</key>
 	<real>-0.20999999999999999</real>
 	<key>FRAppliancePreferedOrderValue</key>
-	<integer>-1</integer>
+	<integer>0</integer>
 	<key>FRRemoteAppliance</key>
 	<true/>
 	<key>NSPrincipalClass</key>
Index: SapphireFrappliance/SapphireApplianceController.m
===================================================================
--- SapphireFrappliance/SapphireApplianceController.m	(Revision 495)
+++ SapphireFrappliance/SapphireApplianceController.m	(Arbeitskopie)
@@ -179,7 +179,7 @@
 	[settings setListTitle:					BRLocalizedString(@" Settings", @"Settings Menu Item")] ;
 	[settings setListIcon:					[theme gem:GEAR_GEM_KEY]];
 	[[self list] setDatasource:self];
-	if([SapphireFrontRowCompat usingFrontRow])
+	if([SapphireFrontRowCompat usingFrontRow] && ![SapphireFrontRowCompat usingTakeTwo])
 	{
 		NSString *myBundlePath = [[NSBundle bundleForClass:[self class]] bundlePath] ;
 		NSString *onlyPath = [myBundlePath stringByAppendingPathComponent:@"/Contents/Frameworks/LeopardOnly.framework"];