diff --git a/packages/mediacenter/xbmc-theme-Confluence/unpack b/packages/mediacenter/xbmc-theme-Confluence/unpack
new file mode 100755
index 0000000000..58c11116fd
--- /dev/null
+++ b/packages/mediacenter/xbmc-theme-Confluence/unpack
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2012 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+. config/options $1
+
+echo "### Applying project based patches ###"
+
+for patch in `ls $PROJECT_DIR/$PROJECT/patches/$1`; do
+  cat $PROJECT_DIR/$PROJECT/patches/$1/$patch | patch -d \
+    `echo $PKG_BUILD | cut -f1 -d\ ` -p1
+done
diff --git a/projects/ATV/patches/xbmc-theme-Confluence/xbmc-theme-Confluence-f38655f-002-remove_missing_power_options_atv.patch b/projects/ATV/patches/xbmc-theme-Confluence/xbmc-theme-Confluence-f38655f-002-remove_missing_power_options_atv.patch
new file mode 100644
index 0000000000..e2db51a589
--- /dev/null
+++ b/projects/ATV/patches/xbmc-theme-Confluence/xbmc-theme-Confluence-f38655f-002-remove_missing_power_options_atv.patch
@@ -0,0 +1,128 @@
+--- xbmc-theme-Confluence-f38655f/720p/DialogButtonMenu.xml	2012-03-19 10:39:07.345395430 +0400
++++ xbmc-theme-Confluence-f38655f/720p/DialogButtonMenu.patch.xml	2012-03-19 10:57:32.345905953 +0400
+@@ -70,22 +70,6 @@
+ 					<visible>system.getbool(input.enablemouse)</visible>
+ 				</control>
+ 			</control>
+-			<control type="button" id="2">
+-				<description>Exit button</description>
+-				<width>340</width>
+-				<height>40</height>
+-				<textcolor>grey2</textcolor>
+-				<focusedcolor>white</focusedcolor>
+-				<align>center</align>
+-				<textwidth>290</textwidth>
+-				<texturefocus border="25,5,25,5">ShutdownButtonFocus.png</texturefocus>
+-				<texturenofocus border="25,5,25,5">ShutdownButtonNoFocus.png</texturenofocus>
+-				<onclick>XBMC.Quit()</onclick>
+-				<pulseonselect>no</pulseonselect>
+-				<font>font13</font>
+-				<label>13012</label>
+-				<visible>System.ShowExitButton</visible>
+-			</control>
+ 			<control type="button" id="3">
+ 				<description>Shutdown button</description>
+ 				<width>340</width>
+@@ -102,71 +86,6 @@
+ 				<font>font13</font>
+ 				<label>13016</label>
+ 			</control>
+-			<control type="button" id="4">
+-				<description>Custom Shutdown Timer</description>
+-				<width>340</width>
+-				<height>40</height>
+-				<textcolor>grey2</textcolor>
+-				<focusedcolor>white</focusedcolor>
+-				<align>center</align>
+-				<textwidth>290</textwidth>
+-				<texturefocus border="25,5,25,5">ShutdownButtonFocus.png</texturefocus>
+-				<texturenofocus border="25,5,25,5">ShutdownButtonNoFocus.png</texturenofocus>
+-				<onclick>XBMC.AlarmClock(shutdowntimer,XBMC.Powerdown())</onclick>
+-				<pulseonselect>no</pulseonselect>
+-				<font>font13</font>
+-				<label>20150</label>
+-				<visible>!System.HasAlarm(shutdowntimer)</visible>
+-				<visible>System.CanPowerDown</visible>
+-			</control>
+-			<control type="button" id="5">
+-				<description>Cancel Shutdown Timer</description>
+-				<width>340</width>
+-				<height>40</height>
+-				<textcolor>grey2</textcolor>
+-				<focusedcolor>white</focusedcolor>
+-				<align>center</align>
+-				<textwidth>290</textwidth>
+-				<texturefocus border="25,5,25,5">ShutdownButtonFocus.png</texturefocus>
+-				<texturenofocus border="25,5,25,5">ShutdownButtonNoFocus.png</texturenofocus>
+-				<onclick>XBMC.CancelAlarm(shutdowntimer)</onclick>
+-				<pulseonselect>no</pulseonselect>
+-				<font>font13</font>
+-				<label>20151</label>
+-				<visible>System.HasAlarm(shutdowntimer)</visible>
+-			</control>
+-			<control type="button" id="6">
+-				<description>Suspend button</description>
+-				<width>340</width>
+-				<height>40</height>
+-				<textcolor>grey2</textcolor>
+-				<focusedcolor>white</focusedcolor>
+-				<align>center</align>
+-				<textwidth>290</textwidth>
+-				<texturefocus border="25,5,25,5">ShutdownButtonFocus.png</texturefocus>
+-				<texturenofocus border="25,5,25,5">ShutdownButtonNoFocus.png</texturenofocus>
+-				<onclick>XBMC.Suspend()</onclick>
+-				<visible>System.CanSuspend</visible>
+-				<pulseonselect>no</pulseonselect>
+-				<font>font13</font>
+-				<label>13011</label>
+-			</control>
+-			<control type="button" id="7">
+-				<description>Hibernate button</description>
+-				<width>340</width>
+-				<height>40</height>
+-				<textcolor>grey2</textcolor>
+-				<focusedcolor>white</focusedcolor>
+-				<align>center</align>
+-				<textwidth>290</textwidth>
+-				<texturefocus border="25,5,25,5">ShutdownButtonFocus.png</texturefocus>
+-				<texturenofocus border="25,5,25,5">ShutdownButtonNoFocus.png</texturenofocus>
+-				<onclick>XBMC.Hibernate()</onclick>
+-				<visible>System.CanHibernate</visible>
+-				<pulseonselect>no</pulseonselect>
+-				<font>font13</font>
+-				<label>13010</label>
+-			</control>
+ 			<control type="button" id="8">
+ 				<description>Reboot button</description>
+ 				<width>340</width>
+@@ -222,30 +141,6 @@
+ 				<font>font13</font>
+ 				<visible>System.HasLocks</visible>
+ 			</control>
+-			<control type="group" id="11">
+-				<width>340</width>
+-				<height>70</height>
+-				<visible>System.HasAlarm(shutdowntimer)</visible>
+-				<control type="image">
+-					<description>background top image</description>
+-					<posx>0</posx>
+-					<posy>0</posy>
+-					<width>340</width>
+-					<height>70</height>
+-					<texture border="25,5,25,5">DialogContextMiddle.png</texture>
+-				</control>
+-				<control type="textbox">
+-					<posx>25</posx>
+-					<posy>20</posy>
+-					<width>290</width>
+-					<height>50</height>
+-					<font>font12</font>
+-					<textcolor>white</textcolor>
+-					<shadowcolor>black</shadowcolor>
+-					<align>center</align>
+-					<label>$LOCALIZE[31329] [B]$INFO[System.Alarmpos][/B]</label>
+-				</control>
+-			</control>
+ 			<control type="image" id="12">
+ 				<description>background bottom image</description>
+ 				<posx>0</posx>