sugar-artwork: add pending patches

6 files changed, 966 insertions, 16 deletions

diff --git a/rpms/sugar-artwork/accessibility_0001_contrast.patch b/rpms/sugar-artwork/accessibility_0001_contrast.patch
new file mode 100644
index 0000000..8cb09f7
--- /dev/null
+++ b/rpms/sugar-artwork/accessibility_0001_contrast.patch
@@ -0,0 +1,608 @@
+diff -u -r -N sugar-artwork-0.88.0-original/gtk/theme/gtkrc-contrast.em sugar-artwork-0.88.0/gtk/theme/gtkrc-contrast.em
+--- sugar-artwork-0.88.0-original/gtk/theme/gtkrc-contrast.em	1969-12-31 21:00:00.000000000 -0300
++++ sugar-artwork-0.88.0/gtk/theme/gtkrc-contrast.em	2010-07-14 09:39:23.362770020 -0300
+@@ -0,0 +1,554 @@
++${
++import math
++
++def my_floor(num):
++    return int(math.floor(num))
++
++def my_ceil(num):
++    return int(math.ceil(num))
++
++
++# Should we set the line width in the engine to 2.25, and draw non pixel aligned lines?
++# Are these already the correct sizes for the XO?
++
++# These sizes need to be sanity checked ...
++if scaling == "100":
++    xo = True
++    icon_base = 11
++else: # About 72% of the XO size, adjusted so that eg. toolbuttons work
++    xo = False
++    icon_base = 8               # 7.92
++
++}
++${
++icon_small = icon_base * 3
++icon_large = icon_base * 5
++
++small_icons = [ "gtk-menu", "gtk-dnd", "gtk-small-toolbar", "gtk-button" ]
++large_icons = [ "gtk-large-toolbar" ]
++
++icon_sizes = []
++for icon in small_icons:
++    icon_sizes += [icon + "=" + str(icon_small) + ',' + str(icon_small)]
++for icon in large_icons:
++    icon_sizes += [icon + "=" + str(icon_large) + ',' + str(icon_large)]
++
++icon_sizes = ":".join(icon_sizes)
++
++}
++gtk-icon-sizes="$icon_sizes"
++
++style "default"   
++{ 
++  engine "hcengine" {
++    edge_thickness = 2
++  }
++
++  xthickness = 2
++  ythickness = 2
++
++# For Java Desktop System
++  PanelMenu::stripe-gradient-top = "#000033"
++  PanelMenu::stripe-gradient-bottom = "#000033"
++  
++  GtkWidget::interior-focus = 1
++  GtkWidget::wide-separators = 0
++  GtkWidget::separator-height = 2
++  GtkWidget::separator-width = 2
++  GtkRange::activate-slider = 1
++  GtkArrow::arrow-size = 1.0
++  GtkToolbar::shadow-type = GTK_SHADOW_NONE
++  GtkToolbar::space-size = 30
++  GtkProgressBar::min-horizontal-bar-height = 15
++  GtkProgressBar::min-vertical-bar-width = 15
++
++  GtkWidget::link-color = "#FFFFFF"
++  GtkWidget::visited-link-color = "#FFCCFF"
++  GtkWidget::focus-line-pattern = "\4\2"
++  GtkWidget::focus-line-width = 5 
++  GtkHSV::focus-line-pattern = "\0"
++  GtkWidget::interior_focus = 1
++  GtkWidget::focus-padding = 0
++  GtkEntry::cursor_color    = "#FF0000" 
++  GtkTextView::cursor_color    = "#FF0000"
++  EelEditableLabel::cursor_color    = "#FF0000"
++  GtkTextView::cursor_aspect_ratio = 0.3
++  GtkEntry::cursor_aspect_ratio = 0.3
++  EelEditableLabel::cursor_aspect_ratio = 0.3
++  NautilusIconContainer::frame_text = 1
++  GtkTreeView::expander-size = 32
++  GtkRange::stepper-size = 20
++  
++
++  GtkCheckButton::indicator-size = 25
++  
++  fg[NORMAL]      = "#FFFFFF"
++  text[NORMAL]    = "#FFFFFF"
++  bg[NORMAL]      = "#000033" 
++  base[NORMAL]    = "#000033"
++
++  fg[INSENSITIVE]      = "#999999"
++  bg[INSENSITIVE]      = "#333333"
++  text[INSENSITIVE]      = "#999999"
++  base[INSENSITIVE]      = "#333333"
++
++  fg[PRELIGHT]    = "#000000"	
++  text[PRELIGHT]    = "#003333"
++  bg[PRELIGHT] = "#CCCC00"
++  base[PRELIGHT]    = "#FFFFFF"
++
++  fg[ACTIVE]      = "#FFFFFF"
++  text[ACTIVE] = "#000000" 
++  bg[ACTIVE]      = "#666699"
++  base[ACTIVE]      = "#CCCC00"
++
++  fg[SELECTED]    = "#000033"
++  text[SELECTED]    = "#000033"
++  bg[SELECTED]    = "#FFFFFF"
++  base[SELECTED]    = "#CCCC00"
++
++
++}
++
++class "GtkWidget" style "default"
++
++style "panel-icons"
++{
++
++}
++class "GtkWidget" style "panel-icons"
++style "media-icons"
++{
++
++}
++class "GtkWidget" style "media-icons"
++
++###########widget - details
++
++style "window"
++{
++
++}
++
++style "window-child"
++{
++
++}
++
++style "white-bg"
++{
++
++}
++
++style "white-bg-child"
++{
++
++}
++
++style "black-bg"
++{
++
++}
++
++style "black-bg-child"
++{
++
++}
++
++
++style "groupbox-panel"
++{
++
++}
++
++style "groupbox-panel-child"
++{
++
++}
++
++style "groupbox-palette"
++{
++
++}
++
++style "groupbox-palette-child"
++{
++
++}
++
++style "menu"
++{
++    bg[PRELIGHT] = "#000033"
++
++    GtkMenu::scroll-arrow-vlength = 25
++    GtkMenu::horizontal-padding = 2
++    GtkMenu::vertical-padding   = 2
++    # This means the outline of the submenu overlaps with a palette.
++    # However in the case of two normal menus, they are next to each other.
++    # It is not possible to be smarter about this, because the style comes from
++    # the submenu.
++    GtkMenu::horizontal-offset  = 0
++    GtkMenu::vertical-offset    = 0
++
++    xthickness = 0
++    ythickness = 0
++}
++
++style "palette-menu" = "menu"
++{
++    GtkMenu::horizontal-padding = 0
++    GtkMenu::vertical-padding   = 0
++
++    xthickness = 0
++    ythickness = 15
++
++    fg[NORMAL]="#FFFFFF"
++}
++
++# Can this all be moved in the menuitem style?
++style "menu-child"
++{
++    fg[NORMAL]="#FFFFFF"
++    base[NORMAL] = "#FFFFFF"
++
++}
++
++
++
++#########################################################
++#########################################################
++
++
++style "textview"
++{
++    text[NORMAL]="#000000"
++    base[NORMAL]="#FFFFFF"
++
++    GtkTextView::interior-focus = 1
++}
++
++style "scrollbar"
++{
++    fg[NORMAL]="#FFFFFF"
++    fg[ACTIVE]="#FFFFFF"
++    base[NORMAL]="#FFFFFF"
++    base[ACTIVE]="#FFFFFF"
++}
++
++# hints for the trough padding hacks
++# We cannot go trough GTK+, as we don't want a padding on all sides, but only one
++# If we wanted padding on all sides, trough-border would work great.
++style "hscrollbar" = "scrollbar"
++{
++
++}
++
++style "vscrollbar" = "scrollbar"
++{
++
++}
++
++style "hscrollbar-scrolled-window"
++{
++    
++}
++
++style "vscrollbar-scrolled-window"
++{
++  
++}
++
++style "scale"
++{
++    GtkWidget::focus-line-width = 0
++
++    fg[NORMAL]="#FFFFFF"
++    fg[ACTIVE]="#FFFFFF"  
++
++    # "square" slider (really round of course)
++    # Same as indicator-size?
++    GtkRange::slider-width = 32
++    GtkScale::slider-length = 32
++    GtkRange::trough-border = 0
++    GtkRange::stepper-spacing = 0
++    GtkRange::trough-side-details = 1
++}
++
++# hints for the trough sizing hacks
++style "hscale" = "scale"
++{
++
++}
++
++style "vscale" = "scale"
++{
++
++}
++
++style "spinbutton"
++{
++    xthickness = 15
++    ythickness = 7
++    GtkWidget::focus-line-width = 0
++}
++
++
++style "frame"
++{
++
++}
++
++style "notebook-tab"
++{
++    fg[NORMAL] = "#FFFFFF"
++}
++
++style "notebook-panel"
++{
++   fg[NORMAL] = "#FFFFFF"
++}
++
++style "toolbox-notebook"
++{
++   fg[NORMAL] = "#FFFFFF"
++}
++
++style "toolbutton"
++{
++   fg[NORMAL] = "#FFFFFF"
++}
++
++style "separatortoolbutton"
++{
++    fg[NORMAL] = "#FFFFFF"
++}
++
++style "toolbar"
++{
++
++}
++
++style "toolbox"
++{
++   fg[NORMAL] = "#000033"
++}
++
++style "panel"
++{
++
++}
++
++style "entry"
++{
++    fg[NORMAL] = "#000000"
++    base[NORMAL] = "#FFFFFF"
++    text[NORMAL] = "#000000"
++}
++
++style "button"
++{
++    fg[NORMAL] = "#FFFFFF"
++}
++
++style "combobox"
++{
++    base[NORMAL] = "#FFFFFF"
++}
++
++style "comboboxentry"
++{
++    fg[NORMAL]="#FFFFFF" 
++}
++
++style "checkbutton"
++{
++   fg[NORMAL] = "#FFFFFF"
++}
++
++style "progressbar"
++{
++
++}
++
++style "menuitem"
++{
++    GtkMenuItem::horizontal-padding = 0
++    GtkMenuItem::arrow-spacing = 15
++    GtkMenuItem::toggle-spacing = 15
++
++    fg[NORMAL] = "#FFFFFF"
++
++    xthickness = 15
++    ythickness = 10
++}
++
++style "checkmenuitem"
++{
++    GtkCheckMenuItem::indicator-size = 26
++    GtkMenuItem::toggle-spacing = 10
++}
++
++style "imagemenuitem"
++{
++
++}
++
++style "separatormenuitem"
++{
++   fg[NORMAL] = "#FFFFFF"
++
++   GtkWidget::wide-separators = 1
++   GtkWidget::separator-height = 30
++
++   ythickness = 0
++   xthickness = 0
++}
++
++style "trayicon"
++{
++    
++}
++
++style "parent-bg"
++{
++    fg[NORMAL]="#FFFFFF"
++    engine "sugar" {
++        bg[NORMAL] = parent_bg_color
++        bg[INSENSITIVE] = parent_bg_color
++    }
++}
++
++style "label"{
++	fg[NORMAL]="#FFFFFF"
++}
++style "hseparator"{
++	fg[NORMAL]="#FFFFFF"
++}
++style "white_treeview"{
++	fg[NORMAL]="#000000"
++	base[NORMAL]="#000000"
++	text[NORMAL]="#000000"
++	bg[NORMAL]="#000000"
++}
++
++####################################################################
++# Default style, setting some generic options and style properties
++####################################################################
++class "GtkWidget" style "default"
++
++
++####################################################################
++# Styles that apply the different background (and foreground) colors
++####################################################################
++
++# This one should probably be the default (ie. no window-child style)
++widget_class "<GtkWindow>"               style "window"
++widget_class "<GtkWindow>*"              style "window-child"
++
++widget_class "*<SugarAlert>"               style "black-bg"
++widget_class "*<SugarAlert>*"              style "black-bg-child"
++
++widget_class "*<SugarSectionView>"       style "white-bg"
++widget_class "*<SugarSectionView>*"      style "white-bg-child"
++
++
++# The notebook is very high, so that everything is overriden
++# Only the color of the tab labels needs to be modified inside the
++# notebooks in this style (and the widget itself).
++# Assume that there is either just a normal label in the notebook tab, or
++# it is inside a GtkBox (H- or VBox) together with eg. a close button.
++widget_class "*<GtkNotebook>"                        style "notebook-tab"
++widget_class "*<GtkNotebook>.<GtkLabel>"             style "notebook-tab"
++widget_class "*<GtkNotebook>.<GtkBox>.<GtkLabel>"    style "notebook-tab"
++
++
++# SugarPalette and Menu
++widget_class "*<GtkMenu>"               style "menu"
++widget_class "<SugarPalette>"           style "menu"
++widget_class "<SugarPalette>.*"         style "menu-child"
++widget_class "<SugarPalette>*<GtkMenu>" style "palette-menu"
++widget_class "*<GtkMenuShell>.*"        style "menu-child"
++
++# SugarFrameWindow
++widget_class "*<SugarFrameWindow>*"    style "frame"
++
++# SugarPanel
++widget_class "*<SugarPanel>*"          style "panel"
++
++
++# GroupBoxes (don't set bg[NORMAL] on the widget itself)
++widget_class "<GtkWindow>*<SugarGroupBox>*"   style "groupbox-panel-child"
++
++widget_class "<GtkWindow>*<GtkNotebook>*"   style "groupbox-panel-child"
++widget_class "<GtkWindow>*<GtkNotebook>"    style "notebook-panel"
++
++
++widget_class "<SugarPalette>*<SugarGroupBox>*"   style "groupbox-palette-child"
++
++
++# SugarToolbox
++#widget_class "*<SugarToolbox>" style "toolbox"
++#widget_class "*<SugarToolbox>*" style "toolbox-child"
++#widget_class "*<SugarToolbox>*<GtkEventBox>" style "toolbox"
++#widget_class "*<SugarToolbox>*<GtkLayout>"   style "toolbox"
++widget_class "*<SugarToolbox>*"        style "toolbox"
++widget_class "*<GtkToolbar>*"          style "toolbox"
++widget_class "*<SugarToolbox>.<GtkNotebook>" style "toolbox-notebook"
++
++
++####################################################################
++# Normal widget styles, using the above things
++####################################################################
++# The following only uses widget_class matches to get the priority
++# right. An alternative would be to lower the priority of the
++# background matches (which need widget_class) to eg. "application"
++
++widget_class "*<GtkMenuItem>*"            style "menuitem"
++widget_class "*<GtkCheckMenuItem>"        style "checkmenuitem"
++widget_class "*<GtkImageMenuItem>"        style "imagemenuitem"
++widget_class "*<GtkSeparatorMenuItem>*"   style "separatormenuitem"
++
++# Buttons and Combos
++widget_class "*<GtkButton>*"           style "button"
++widget_class "*<GtkCheckButton>*"      style "checkbutton"
++widget_class "*<GtkComboBox>*"         style "combobox"
++widget_class "*<GtkComboBoxEntry>*"    style "comboboxentry"
++widget_class "*<GtkCombo>*"            style "comboboxentry"
++
++# Entries
++widget_class "*<GtkEntry>"       style "entry"
++widget_class "*<GtkSpinButton>"  style "spinbutton"
++widget_class "*<GtkTextView>"    style "textview"
++
++
++# Misc widgets
++widget_class "*<GtkHScrollbar>"  style "hscrollbar"
++widget_class "*<GtkVScrollbar>"  style "vscrollbar"
++widget_class "*<GtkHScale>"      style "hscale"
++widget_class "*<GtkVScale>"      style "vscale"
++widget_class "*<GtkProgressBar>" style "progressbar"
++
++# Scrolled window scrollbars
++widget_class "*<GtkScrolledWindow>.<GtkVScrollbar>" style "vscrollbar-scrolled-window"
++widget_class "*<GtkScrolledWindow>.<GtkHScrollbar>" style "hscrollbar-scrolled-window"
++
++# Toolbar
++widget_class "*<GtkToolButton>*"          style "toolbutton"
++widget_class "*<GtkSeparatorToolItem>*"   style "separatortoolbutton"
++widget_class "*<GtkToolbar>"              style "toolbar"
++
++# Tray
++widget_class "*<SugarTrayIcon>*" style "trayicon"
++
++# Widgets that should get the background color from the parent
++widget_class "*<GtkEventBox>"        style "parent-bg"
++widget_class "*<GtkLayout>"          style "parent-bg"
++widget_class "*<GtkViewport>"        style "parent-bg"
++widget_class "*<GtkDrawingArea>"     style "parent-bg"
++widget_class "*<GtkScrolledWindow>"  style "parent-bg"
++
++widget_class "*<GtkLabel>*"	     style "label"
++widget_class "*<GtkHSeparator>*"      style "hseparator"
++
++widget_class "*<JournalTreeView>*" style "white_treeview"
++widget_class "*<SugarActivitiesTreeView>*" style "white_treeview"
+diff -u -r -N sugar-artwork-0.88.0-original/gtk/theme/Makefile.am sugar-artwork-0.88.0/gtk/theme/Makefile.am
+--- sugar-artwork-0.88.0-original/gtk/theme/Makefile.am	2010-02-20 14:46:35.000000000 -0200
++++ sugar-artwork-0.88.0/gtk/theme/Makefile.am	2010-07-14 10:22:55.008005248 -0300
+@@ -6,13 +6,25 @@
+ 	$(srcdir)/em.py -p $$ -D scaling=\'100\' $(srcdir)/gtkrc.em > \
+ 		$(top_builddir)/gtk/theme/sugar-100.gtkrc
+ 
++sugar-72-contrast.gtkrc: gtkrc-contrast.em
++	$(srcdir)/em.py -p $$ -D scaling=\'72\' $(srcdir)/gtkrc-contrast.em > \
++		$(top_builddir)/gtk/theme/sugar-72-contrast.gtkrc
++
++sugar-100-contrast.gtkrc: gtkrc-contrast.em
++	$(srcdir)/em.py -p $$ -D scaling=\'100\' $(srcdir)/gtkrc-contrast.em > \
++		$(top_builddir)/gtk/theme/sugar-100-contrast.gtkrc
++
+ clean:
+ 	$(RM) sugar-72.gtkrc
+ 	$(RM) sugar-100.gtkrc
++	$(RM) sugar-72-contrast.gtkrc
++	$(RM) sugar-100-contrast.gtkrc
+ 
+ GTKRC_FILES =		\
+ 	sugar-72.gtkrc	\
+-	sugar-100.gtkrc
++	sugar-100.gtkrc \
++	sugar-100-contrast.gtkrc \
++	sugar-72-contrast.gtkrc
+ 
+ install-data-local: $(GTKRC_FILES)
+ 	$(mkinstalldirs) $(DESTDIR)$(datadir)/themes/sugar-72/gtk-2.0
+@@ -21,10 +33,18 @@
+ 	$(mkinstalldirs) $(DESTDIR)$(datadir)/themes/sugar-100/gtk-2.0
+ 	$(INSTALL_DATA) $(top_builddir)/gtk/theme/sugar-100.gtkrc \
+ 		$(DESTDIR)$(datadir)/themes/sugar-100/gtk-2.0/gtkrc
++	$(mkinstalldirs) $(DESTDIR)$(datadir)/themes/sugar-72-contrast/gtk-2.0
++	$(INSTALL_DATA) $(top_builddir)/gtk/theme/sugar-72-contrast.gtkrc \
++		$(DESTDIR)$(datadir)/themes/sugar-72-contrast/gtk-2.0/gtkrc
++	$(mkinstalldirs) $(DESTDIR)$(datadir)/themes/sugar-100-contrast/gtk-2.0
++	$(INSTALL_DATA) $(top_builddir)/gtk/theme/sugar-100-contrast.gtkrc \
++		$(DESTDIR)$(datadir)/themes/sugar-100-contrast/gtk-2.0/gtkrc
+ 
+ uninstall-local:
+ 	rm -rf $(DESTDIR)$(datadir)/themes/sugar-72/gtk-2.0
+ 	rm -rf $(DESTDIR)$(datadir)/themes/sugar-100/gtk-2.0
++	rm -rf $(DESTDIR)$(datadir)/themes/sugar-100-contrast/gtk-2.0
++	rm -rf $(DESTDIR)$(datadir)/themes/sugar-72-contrast/gtk-2.0
+ 
+-EXTRA_DIST = em.py gtkrc.em
++EXTRA_DIST = em.py gtkrc.em gtkrc-contrast.em
+ CLEANFILES = $(GTKRC_FILES)
diff --git a/rpms/sugar-artwork/accessibility_0002_virtualkeyboard_icon.patch b/rpms/sugar-artwork/accessibility_0002_virtualkeyboard_icon.patch
new file mode 100644
index 0000000..72cf985
--- /dev/null
+++ b/rpms/sugar-artwork/accessibility_0002_virtualkeyboard_icon.patch
@@ -0,0 +1,160 @@
+diff --git a/icons/scalable/device/virtualkeyboard.svg b/icons/scalable/device/virtualkeyboard.svg
+new file mode 100644
+index 0000000..6d35000
+--- /dev/null
++++ b/icons/scalable/device/virtualkeyboard.svg
+@@ -0,0 +1,140 @@
++<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
++	<!ENTITY stroke_color "#010101">
++	<!ENTITY fill_color "#FFFFFF">
++]><svg enable-background="new 0 0 55 55" height="55px" version="1.1" viewBox="0 0 55 55" width="55px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px">
++  <rect fill="&fill_color;" stroke="&stroke_color;"
++     height="18.11911"
++     id="rect806"
++     rx="1.6"
++     sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.69999999)"
++     style="font-size:12px;fill-rule:evenodd;stroke-width:2.50000000000000000;stroke-linejoin:round;stroke-opacity:1;fill-opacity:0"
++     width="43.363712"
++     x="5.7767382"
++     y="19.446568" />
++  <path fill="&fill_color;" stroke="&stroke_color;"
++     d="m 6.4892878,24.027243 42.1421992,0"
++     id="path807"
++     sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.69999999)"
++     style="font-size:12px;stroke-width:0.8pt;stroke-linejoin:round;stroke-opacity:1" />
++  <path fill="&fill_color;" stroke="&stroke_color;"
++     d="m 6.4892878,28.506124 42.7529552,0"
++     id="path808"
++     sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.69999999)"
++     style="font-size:12px;stroke-width:0.8pt;stroke-linejoin:round;stroke-opacity:1" />
++  <path fill="&fill_color;" stroke="&stroke_color;"
++     d="m 6.5910805,32.985005 41.6332355,0"
++     id="path809"
++     sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.69999999)"
++     style="font-size:12px;stroke-width:0.8pt;stroke-linejoin:round;stroke-opacity:1" />
++  <path fill="&fill_color;" stroke="&stroke_color;"
++     d="m 12.596852,23.925451 0,4.377088"
++     id="path811"
++     sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.69999999)"
++     style="font-size:12px;stroke-width:0.8pt;stroke-linejoin:round;stroke-opacity:1" />
++  <path fill="&fill_color;" stroke="&stroke_color;"
++     d="m 14.021951,28.302539 0,4.682466"
++     id="path812"
++     sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.69999999)"
++     style="font-size:12px;stroke-width:0.8pt;stroke-linejoin:round;stroke-opacity:1" />
++  <path fill="&fill_color;" stroke="&stroke_color;"
++     d="m 10.764583,20.362704 0,3.460954"
++     id="path813"
++     sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.69999999)"
++     style="font-size:12px;stroke-width:0.8pt;stroke-linejoin:round;stroke-opacity:1" />
++  <path fill="&fill_color;" stroke="&stroke_color;"
++     d="m 20.231309,28.200746 0,4.886052"
++     id="path815"
++     sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.69999999)"
++     style="font-size:12px;stroke-width:0.8pt;stroke-linejoin:round;stroke-opacity:1" />
++  <path fill="&fill_color;" stroke="&stroke_color;"
++     d="m 17.991868,24.129036 0,4.07171"
++     id="path816"
++     sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.69999999)"
++     style="font-size:12px;stroke-width:0.8pt;stroke-linejoin:round;stroke-opacity:1" />
++  <path fill="&fill_color;" stroke="&stroke_color;"
++     d="m 24.303019,24.332621 0,3.969918"
++     id="path817"
++     sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.69999999)"
++     style="font-size:12px;stroke-width:0.8pt;stroke-linejoin:round;stroke-opacity:1" />
++  <path fill="&fill_color;" stroke="&stroke_color;"
++     d="m 26.746045,28.200746 0,4.682466"
++     id="path818"
++     sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.69999999)"
++     style="font-size:12px;stroke-width:0.8pt;stroke-linejoin:round;stroke-opacity:1" />
++  <path fill="&fill_color;" stroke="&stroke_color;"
++     d="m 30.817755,24.434414 0,4.173503"
++     id="path819"
++     sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.69999999)"
++     style="font-size:12px;stroke-width:0.8pt;stroke-linejoin:round;stroke-opacity:1" />
++  <path fill="&fill_color;" stroke="&stroke_color;"
++     d="m 33.057196,28.302539 0,4.580673"
++     id="path820"
++     sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.69999999)"
++     style="font-size:12px;stroke-width:0.8pt;stroke-linejoin:round;stroke-opacity:1" />
++  <path fill="&fill_color;" stroke="&stroke_color;"
++     d="m 37.739662,24.332621 0,4.07171"
++     id="path821"
++     sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.69999999)"
++     style="font-size:12px;stroke-width:0.8pt;stroke-linejoin:round;stroke-opacity:1" />
++  <path fill="&fill_color;" stroke="&stroke_color;"
++     d="m 39.87731,28.200746 0,4.682466"
++     id="path822"
++     sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.69999999)"
++     style="font-size:12px;stroke-width:0.8pt;stroke-linejoin:round;stroke-opacity:1" />
++  <path fill="&fill_color;" stroke="&stroke_color;"
++     d="m 11.37534,33.290383 0,3.66454"
++     id="path823"
++     sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.69999999)"
++     style="font-size:12px;stroke-width:0.8pt;stroke-linejoin:round;stroke-opacity:1" />
++  <path fill="&fill_color;" stroke="&stroke_color;"
++     d="m 16.872148,33.188591 0,3.969917"
++     id="path824"
++     sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.69999999)"
++     style="font-size:12px;stroke-width:0.8pt;stroke-linejoin:round;stroke-opacity:1" />
++  <path fill="&fill_color;" stroke="&stroke_color;"
++     d="m 36.212771,33.188591 0,3.460953"
++     id="path825"
++     sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.69999999)"
++     style="font-size:12px;stroke-width:0.8pt;stroke-linejoin:round;stroke-opacity:1" />
++  <path fill="&fill_color;" stroke="&stroke_color;"
++     d="m 42.422128,33.188591 0,3.562746"
++     id="path826"
++     sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.69999999)"
++     style="font-size:12px;stroke-width:0.8pt;stroke-linejoin:round;stroke-opacity:1" />
++  <path fill="&fill_color;" stroke="&stroke_color;"
++     d="m 15.345257,20.56629 0,3.562746"
++     id="path827"
++     sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.69999999)"
++     style="font-size:12px;stroke-width:0.8pt;stroke-linejoin:round;stroke-opacity:1" />
++  <path fill="&fill_color;" stroke="&stroke_color;"
++     d="m 20.027724,20.159119 0,3.868124"
++     id="path828"
++     sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.69999999)"
++     style="font-size:12px;stroke-width:0.8pt;stroke-linejoin:round;stroke-opacity:1" />
++  <path fill="&fill_color;" stroke="&stroke_color;"
++     d="m 25.015568,20.464497 0,3.155575"
++     id="path829"
++     sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.69999999)"
++     style="font-size:12px;stroke-width:0.8pt;stroke-linejoin:round;stroke-opacity:1" />
++  <path fill="&fill_color;" stroke="&stroke_color;"
++     d="m 29.698035,20.260911 0,3.460954"
++     id="path830"
++     sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.69999999)"
++     style="font-size:12px;stroke-width:0.8pt;stroke-linejoin:round;stroke-opacity:1" />
++  <path fill="&fill_color;" stroke="&stroke_color;"
++     d="m 34.584087,20.260911 0,3.359161"
++     id="path831"
++     sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.69999999)"
++     style="font-size:12px;stroke-width:0.8pt;stroke-linejoin:round;stroke-opacity:1" />
++  <path fill="&fill_color;" stroke="&stroke_color;"
++     d="m 39.470139,20.464497 0,3.359161"
++     id="path832"
++     sodipodi:nodetypes="cc"
++     sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.69999999)"
++     style="font-size:12px;stroke-width:0.8pt;stroke-linejoin:round;stroke-opacity:1" />
++  <path fill="&fill_color;" stroke="&stroke_color;"
++     d="m 44.152605,20.057326 0,3.562746"
++     id="path833"
++     sodipodi:stroke-cmyk="(0.0000000 0.0000000 0.0000000 0.69999999)"
++     style="font-size:12px;stroke-width:0.8pt;stroke-linejoin:round;stroke-opacity:1" />
++</svg>
+diff --git a/icons/scalable/device/Makefile.am b/icons/scalable/device/Makefile.am
+index 28818ab..6e5e58c 100644
+--- a/icons/scalable/device/Makefile.am
++++ b/icons/scalable/device/Makefile.am
+@@ -84,7 +84,8 @@ icon_DATA =				\
+ 	speaker-muted-000.svg		\
+ 	speaker-muted-033.svg		\
+ 	speaker-muted-066.svg		\
+-	speaker-muted-100.svg		
++	speaker-muted-100.svg		\
++	virtualkeyboard.svg
+ 
+ EXTRA_DIST = $(icon_DATA)
+ 
diff --git a/rpms/sugar-artwork/cpu-and-memory-indicator-icons.patch b/rpms/sugar-artwork/cpu-and-memory-indicator-icons.patch
index 26618ee..d5d0540 100644
--- a/rpms/sugar-artwork/cpu-and-memory-indicator-icons.patch
+++ b/rpms/sugar-artwork/cpu-and-memory-indicator-icons.patch
@@ -1,7 +1,8 @@
-From 9f847e69dff5ee1f8c9b3df09f257e361e9fe562 Mon Sep 17 00:00:00 2001
 From: anishmangal2002 <anishmangal2002@gmail.com>
-Date: Thu, 29 Jul 2010 00:49:29 +0530
-Subject: [PATCH] Add icons for memory and cpu resource indicator
+To: sugar-devel <sugar-devel@lists.sugarlabs.org>
+Date: Thu, 29 Jul 2010 01:20:13 +0530
+Cc: anishmangal2002 <anishmangal2002@gmail.com>
+Subject: [Sugar-devel] [PATCH] Add icons for memory and cpu resource indicator
 
 This patch adds the following for svg icons for the memory and cpu
 usage indicator frame icon.
@@ -15,10 +16,10 @@ Signed-off-by: anishmangal2002 <anishmangal2002@gmail.com>
 ---
  icons/scalable/device/Makefile.am         |    4 ++++
  icons/scalable/device/computer-error.svg  |   11 +++++++++++
- icons/scalable/device/computer-happy.svg  |   11 +++++++++++
+ icons/scalable/device/computer-happy.svg  |   13 +++++++++++++
  icons/scalable/device/computer-normal.svg |   11 +++++++++++
- icons/scalable/device/computer-sad.svg    |   11 +++++++++++
- 5 files changed, 48 insertions(+), 0 deletions(-)
+ icons/scalable/device/computer-sad.svg    |   12 ++++++++++++
+ 5 files changed, 51 insertions(+), 0 deletions(-)
  create mode 100644 icons/scalable/device/computer-error.svg
  create mode 100644 icons/scalable/device/computer-happy.svg
  create mode 100644 icons/scalable/device/computer-normal.svg
@@ -29,9 +30,9 @@ index 28818ab..4ab0a56 100644
 --- a/icons/scalable/device/Makefile.am
 +++ b/icons/scalable/device/Makefile.am
 @@ -38,6 +38,10 @@ icon_DATA =				\
- 	battery-charging-100.svg	\
  	camera-external.svg		\
  	camera.svg			\
+ 	capacitive.svg			\
 +	computer-error.svg              \
 +	computer-happy.svg              \
 +	computer-normal.svg             \
@@ -59,10 +60,10 @@ index 0000000..ca280d3
 \ No newline at end of file
 diff --git a/icons/scalable/device/computer-happy.svg b/icons/scalable/device/computer-happy.svg
 new file mode 100644
-index 0000000..a3ca2fc
+index 0000000..4f23ce1
 --- /dev/null
 +++ b/icons/scalable/device/computer-happy.svg
-@@ -0,0 +1,11 @@
+@@ -0,0 +1,13 @@
 +<?xml version="1.0" ?>
 +<!-- Created with Inkscape (http://www.inkscape.org/) --><!DOCTYPE svg
 +  PUBLIC '-//W3C//DTD SVG 1.1//EN'
@@ -73,8 +74,9 @@ index 0000000..a3ca2fc
 +<svg height="55" id="Layer_1" version="1.1" viewBox="0 0 55 55" width="55" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg"><defs id="defs9"/><g id="computer" style="display:block">
 +	<path d="m 51.322,41.549 h 0.002 l -0.022,-0.018 c -0.15,-0.109 -12.64,-7.878 -12.64,-7.878 V 9.734 c 0,-1.618 -1.31,-2.932 -2.929,-2.932 h -30.9 c -1.619,0 -2.931,1.314 -2.931,2.932 v 26.313 c 0,1.096 0.608,2.037 1.498,2.541 l -0.02,0.004 14.603,9.102 c 0.691,0.436 1.528,0.688 2.428,0.688 h 28.212 c 2.352,0 4.278,-1.733 4.278,-3.85 10e-4,-1.202 -0.618,-2.275 -1.579,-2.983 z" id="module-about_x5F_my_x5F_xo" style="fill:&stroke_color;;stroke:&fill_color;;stroke-width:3.48670006;stroke-linejoin:round"/>
 +	<path d="m 7.604,13.446 c 0,-0.616 0.504,-1.12 1.12,-1.12 h 23.117 c 0.615,0 1.118,0.503 1.118,1.12 v 16.499 c 0,0.614 -0.503,1.122 -1.118,1.122 H 8.723 c -0.615,0 -1.12,-0.508 -1.12,-1.122 l 0.001,-16.499 0,0 z" id="path5" style="fill:&fill_color;"/>
-+</g><g id="g3651"><path d="m 22,21.5 a 0.5,0.5 0 1 1 -1,0 0.5,0.5 0 1 1 1,0 z" id="path2825-3" style="fill:&stroke_color;;fill-opacity:1;stroke:&stroke_color;;stroke-width:3.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" transform="translate(-5.5,-5)"/><path d="m 22,21.5 a 0.5,0.5 0 1 1 -1,0 0.5,0.5 0 1 1 1,0 z" id="path2825-3-7" style="fill:&stroke_color;;fill-opacity:1;stroke:&stroke_color;;stroke-width:3.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" transform="translate(4.5,-5)"/><path d="m 21,20 0,1 0,0" id="path3643" style="fill:&stroke_color;;fill-opacity:1;stroke:&stroke_color;;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/><path d="m -15.592733,28.013593 a 7,5 0 0 1 -12.796629,0.02882" id="path3649" style="fill:&fill_color;;fill-opacity:1;stroke:&stroke_color;;stroke-width:3.5;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" transform="translate(43,-4)"/><path d="m -22,29 c -2.062101,-0.0085 -3.533664,-7.690053 -5.201954,-8.902136 -1.657496,-1.20424 -9.38992,-0.202483 -10.01495,-2.153592 -0.6291,-1.963814 6.221713,-5.737072 6.858942,-7.698263 0.633106,-1.9485034 -2.709072,-8.9929164 -1.046602,-10.19028066 1.673296,-1.20516154 7.378894,4.14434776 9.441013,4.14434696 2.048777,-8e-7 7.715622,-5.3554444 9.368115,-4.14434746 1.663253,1.21898366 -1.661305,8.29841966 -1.024075,10.25961116 0.633108,1.948502 7.4775888,5.683069 6.8364154,7.628933 -0.6453487,1.958534 -8.4056374,0.984357 -10.0739264,2.196441 C -18.514517,21.344954 -19.95124,29.008487 -22,29 z" id="path3624" style="fill:&fill_color;;fill-opacity:1;stroke:none" transform="matrix(0.42707473,0,0,-0.42707473,57.395644,21.385167)"/></g></svg>
-\ No newline at end of file
++</g><g id="g3651"><path d="m 22,21.5 a 0.5,0.5 0 1 1 -1,0 0.5,0.5 0 1 1 1,0 z" id="path2825-3" style="fill:&stroke_color;;fill-opacity:1;stroke:&stroke_color;;stroke-width:3.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" transform="translate(-5.5,-5)"/><path d="m 22,21.5 a 0.5,0.5 0 1 1 -1,0 0.5,0.5 0 1 1 1,0 z" id="path2825-3-7" style="fill:&stroke_color;;fill-opacity:1;stroke:&stroke_color;;stroke-width:3.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" transform="translate(4.5,-5)"/><path d="m 21,20 0,1 0,0" id="path3643" style="fill:&stroke_color;;fill-opacity:1;stroke:&stroke_color;;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/>
++<path d="m -15.592733,28.013593 a 7,5 0 0 1 -12.796629,0.02882" id="path3649" style="fill:&fill_color;;fill-opacity:1;stroke:&stroke_color;;stroke-width:3.5;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" transform="translate(43,-4)"/><path d="m -22,29 c -2.062101,-0.0085 -3.533664,-7.690053 -5.201954,-8.902136 -1.657496,-1.20424 -9.38992,-0.202483 -10.01495,-2.153592 -0.6291,-1.963814 6.221713,-5.737072 6.858942,-7.698263 0.633106,-1.9485034 -2.709072,-8.9929164 -1.046602,-10.19028066 1.673296,-1.20516154 7.378894,4.14434776 
++	9.441013,4.14434696 2.048777,-8e-7 7.715622,-5.3554444 9.368115,-4.14434746 1.663253,1.21898366 -1.661305,8.29841966 -1.024075,10.25961116 0.633108,1.948502 7.4775888,5.683069 6.8364154,7.628933 -0.6453487,1.958534 -8.4056374,0.984357 -10.0739264,2.196441 C -18.514517,21.344954 -19.95124,29.008487 -22,29 z" id="path3624" style="fill:&fill_color;;fill-opacity:1;stroke:none" transform="matrix(0.42707473,0,0,-0.42707473,57.395644,21.385167)"/></g></svg>
 diff --git a/icons/scalable/device/computer-normal.svg b/icons/scalable/device/computer-normal.svg
 new file mode 100644
 index 0000000..144e123
@@ -95,10 +97,10 @@ index 0000000..144e123
 \ No newline at end of file
 diff --git a/icons/scalable/device/computer-sad.svg b/icons/scalable/device/computer-sad.svg
 new file mode 100644
-index 0000000..5475bfa
+index 0000000..41ab01e
 --- /dev/null
 +++ b/icons/scalable/device/computer-sad.svg
-@@ -0,0 +1,11 @@
+@@ -0,0 +1,12 @@
 +<?xml version="1.0" ?>
 +<!-- Created with Inkscape (http://www.inkscape.org/) --><!DOCTYPE svg
 +  PUBLIC '-//W3C//DTD SVG 1.1//EN'
@@ -109,8 +111,13 @@ index 0000000..5475bfa
 +<svg height="55" id="Layer_1" version="1.1" viewBox="0 0 55 55" width="55" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg"><defs id="defs9"/><g id="computer" style="display:block">
 +	<path d="m 51.322,41.549 h 0.002 l -0.022,-0.018 c -0.15,-0.109 -12.64,-7.878 -12.64,-7.878 V 9.734 c 0,-1.618 -1.31,-2.932 -2.929,-2.932 h -30.9 c -1.619,0 -2.931,1.314 -2.931,2.932 v 26.313 c 0,1.096 0.608,2.037 1.498,2.541 l -0.02,0.004 14.603,9.102 c 0.691,0.436 1.528,0.688 2.428,0.688 h 28.212 c 2.352,0 4.278,-1.733 4.278,-3.85 10e-4,-1.202 -0.618,-2.275 -1.579,-2.983 z" id="module-about_x5F_my_x5F_xo" style="fill:&fill_color;;stroke:&stroke_color;;stroke-width:3.48670006;stroke-linejoin:round"/>
 +	<path d="m 7.604,13.446 c 0,-0.616 0.504,-1.12 1.12,-1.12 h 23.117 c 0.615,0 1.118,0.503 1.118,1.12 v 16.499 c 0,0.614 -0.503,1.122 -1.118,1.122 H 8.723 c -0.615,0 -1.12,-0.508 -1.12,-1.122 l 0.001,-16.499 0,0 z" id="path5" style="fill:&stroke_color;"/>
-+</g><g id="g3651"><path d="m 15.900362,16.499593 a 0.5,0.5 0 0 1 -1,0 0.5,0.5 0 1 1 1,0 z" id="path2825-3" style="fill:&fill_color;;fill-opacity:1;stroke:&fill_color;;stroke-width:3.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/><path d="m 25.900362,16.499593 a 0.5,0.5 0 0 1 -1,0 0.5,0.5 0 1 1 1,0 z" id="path2825-3-7" style="fill:&fill_color;;fill-opacity:1;stroke:&fill_color;;stroke-width:3.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/><path d="m 20.400362,19.999593 0,0.625 0,0" id="path3643" style="fill:&fill_color;;fill-opacity:1;stroke:&fill_color;;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/><path d="m 26.807629,27.986 c -2.407267,-1.986407 -4.407267,-2.423907 -6.407267,-2.423907 -2,0 -4,0.4375 -6.389362,2.395087" id="path3649" style="fill:none;stroke:&fill_color;;stroke-width:3.5;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/><path d="m 48,7 c 0,0 -4,6 -4,12 0,2 2.333333,3 4,3 1.666667,0 4,-1 4,-3 C 52,13 48,7 48,7 l 0,0" id="path3746" style="fill:&stroke_color;;fill-opacity:1;stroke:none"/></g></svg>
-\ No newline at end of file
++</g><g id="g3651"><path d="m 15.900362,16.499593 a 0.5,0.5 0 0 1 -1,0 0.5,0.5 0 1 1 1,0 z" id="path2825-3" style="fill:&fill_color;;fill-opacity:1;stroke:&fill_color;;stroke-width:3.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/><path d="m 25.900362,16.499593 a 0.5,0.5 0 0 1 -1,0 0.5,0.5 0 1 1 1,0 z" id="path2825-3-7" style="fill:&fill_color;;fill-opacity:1;stroke:&fill_color;;stroke-width:3.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/><path d="m 20.400362,19.999593 0,0.625 0,0" id="path3643" style="fill:&fill_color;;fill-opacity:1;stroke:&fill_color;;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/><path d="m 26.807629,27.986 c -2.407267,-1.986407
++-4.407267,-2.423907 -6.407267,-2.423907 -2,0 -4,0.4375 -6.389362,2.395087" id="path3649" style="fill:none;stroke:&fill_color;;stroke-width:3.5;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/><path d="m 48,7 c 0,0 -4,6 -4,12 0,2 2.333333,3 4,3 1.666667,0 4,-1 4,-3 C 52,13 48,7 48,7 l 0,0" id="path3746" style="fill:&stroke_color;;fill-opacity:1;stroke:none"/></g></svg>
 -- 
 1.7.1
 
+_______________________________________________
+Sugar-devel mailing list
+Sugar-devel@lists.sugarlabs.org
+http://lists.sugarlabs.org/listinfo/sugar-devel
+
diff --git a/rpms/sugar-artwork/gmartin-School-Server-Icon.patch b/rpms/sugar-artwork/gmartin-School-Server-Icon.patch
new file mode 100644
index 0000000..205cfac
--- /dev/null
+++ b/rpms/sugar-artwork/gmartin-School-Server-Icon.patch
@@ -0,0 +1,54 @@
+From d0bb1c8bc67011907f2395d9f52a900d6eff13e5 Mon Sep 17 00:00:00 2001
+From: Martin Abente <mabente@paraguayeduca.org>
+Date: Mon, 5 Jul 2010 09:44:44 -0400
+Subject: [PATCH] School Server Icon
+Organization: Paraguay Educa
+
+School Server icon provided by Gary Martin
+---
+ icons/scalable/device/Makefile.am       |    1 +
+ icons/scalable/device/school-server.svg |   20 ++++++++++++++++++++
+ 2 files changed, 21 insertions(+), 0 deletions(-)
+ create mode 100644 icons/scalable/device/school-server.svg
+
+diff --git a/icons/scalable/device/Makefile.am b/icons/scalable/device/Makefile.am
+index 54f3543..e303a8f 100644
+--- a/icons/scalable/device/Makefile.am
++++ b/icons/scalable/device/Makefile.am
+@@ -79,6 +79,7 @@ icon_DATA =				\
+ 	network-wireless-connected-100.icon	\
+ 	printer.svg			\
+ 	resistive.svg			\
++	school-server.svg			\
+ 	speaker-000.svg			\
+ 	speaker-033.svg			\
+ 	speaker-066.svg			\
+diff --git a/icons/scalable/device/school-server.svg b/icons/scalable/device/school-server.svg
+new file mode 100644
+index 0000000..28a854d
+--- /dev/null
++++ b/icons/scalable/device/school-server.svg
+@@ -0,0 +1,20 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
++  <!ENTITY fill_color "#FFFFFF">
++  <!ENTITY stroke_color "#010101">
++]>
++<svg xmlns="http://www.w3.org/2000/svg" width="55" height="55">
++    <path d="M10,50 S8,50 8,48 L8,35 L27.5,24 L47,35 L47,48 S47,50 45,50 z" fill="&fill_color;" stroke="&stroke_color;" stroke-width="1.75"/>
++    <path d="M33,50 L33,39 S33,37 31,37 L24,37 S22,37 22,39 L22,50 z" fill="&stroke_color;" stroke="&stroke_color;" stroke-width="1.75"/>
++    <path d="M20,23.5 L20,10 L35,10 L35,23.5 z" fill="&stroke_color;" stroke="&stroke_color;" stroke-width="3.5"/>
++    <line x1="6" y1="33.5" x2="27.5" y2="21.5" stroke="&stroke_color;" stroke-width="6.75" stroke-linecap="round"/>
++    <line x1="49" y1="33.5" x2="27.5" y2="21.5" stroke="&stroke_color;" stroke-width="6.75" stroke-linecap="round"/>
++    <line x1="6" y1="33.5" x2="27.5" y2="21.5" stroke="&fill_color;" stroke-width="3.5" stroke-linecap="round"/>
++    <line x1="49" y1="33.5" x2="27.5" y2="21.5" stroke="&fill_color;" stroke-width="3.5" stroke-linecap="round"/>
++    <path d="M20,23.7 L20,10 L35,10 L35,23.7 z" fill="&fill_color;" stroke="none" stroke-width="2"/>
++    <path d="M18,9.25 L27.5,3.25 L37,9.25 z" fill="&stroke_color;" stroke="&stroke_color;" stroke-width="2.25"/>
++    <circle cx="27.5" cy="15.5" r="3.25" fill="&stroke_color;" stroke="none" stroke-width="2"/>
++    <path d="M24.25,19.25 L24.25,15.5 L30.75,15.5 L30.75,19.25 z" fill="&stroke_color;" stroke="none" stroke-width="2"/>
++    <line x1="24.25" y1="19" x2="30.75" y2="19" stroke="&stroke_color;" stroke-width="2.5" stroke-linecap="round"/>
++    <circle cx="27.5" cy="20.5" r="1.25" fill="&stroke_color;" stroke="none" stroke-width="2"/>
++</svg>
+-- 
+1.6.0.4
+
diff --git a/rpms/sugar-artwork/journal-reindex-icon.patch b/rpms/sugar-artwork/journal-reindex-icon.patch
new file mode 100644
index 0000000..774ce21
--- /dev/null
+++ b/rpms/sugar-artwork/journal-reindex-icon.patch
@@ -0,0 +1,109 @@
+diff --git a/icons/scalable/actions/Makefile.am b/icons/scalable/actions/Makefile.am
+index 42a06a3..a9220f9 100644
+--- a/icons/scalable/actions/Makefile.am
++++ b/icons/scalable/actions/Makefile.am
+@@ -44,6 +44,7 @@ icon_DATA =						\
+ 	insert-image.svg				\
+ 	insert-table.svg				\
+ 	invite.svg					\
++	journal-reindex.svg				\
+ 	list-add.svg					\
+ 	list-remove.svg					\
+ 	media-eject-insensitive.svg			\
+diff --git a/icons/scalable/actions/journal-reindex.svg b/icons/scalable/actions/journal-reindex.svg
+new file mode 100644
+index 0000000..b044557
+--- /dev/null
++++ b/icons/scalable/actions/journal-reindex.svg
+@@ -0,0 +1,90 @@
++<?xml version="1.0" encoding="UTF-8" standalone="no"?>
++<!-- Created with Inkscape (http://www.inkscape.org/) -->
++
++<svg
++   xmlns:svg="http://www.w3.org/2000/svg"
++   xmlns="http://www.w3.org/2000/svg"
++   version="1.1"
++   width="55"
++   height="55"
++   viewBox="0 0 55 55"
++   id="Layer_1"
++   xml:space="preserve"><defs
++   id="defs2928" />
++<g
++   transform="translate(-2.3305085,-1.1652542)"
++   id="document-save"
++   style="display:block">
++	<g
++   id="g2898">
++		<g
++   id="g2900">
++			<g
++   id="g2902">
++				<path
++   d="m 6.736,49.002 h 24.52 c 2.225,0 3.439,-1.447 3.439,-3.441 v -27.28 c 0,-1.73 -1.732,-3.441 -3.439,-3.441 h -4.389"
++   id="path2904"
++   style="fill:#ffffff;stroke:#010101;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round" />
++			</g>
++		</g>
++		<g
++   id="g2906">
++			<g
++   id="g2908">
++				<path
++   d="m 26.867,38.592 c 0,1.836 -1.345,3.201 -3.441,4.047 L 6.736,49.002 V 14.84 l 16.69,-8.599 c 2.228,-0.394 3.441,0.84 3.441,2.834 v 29.517 z"
++   id="path2910"
++   style="fill:#ffffff;stroke:#010101;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round" />
++			</g>
++		</g>
++		<path
++   d="m 9.424,42.607 c 0,0 -1.351,-0.543 -2.702,-0.543 -1.351,0 -2.703,0.543 -2.703,0.543"
++   id="path2912"
++   style="fill:none;stroke:#010101;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round" />
++		<path
++   d="m 9.424,32.006 c 0,0 -1.239,-0.543 -2.815,-0.543 -1.577,0 -2.59,0.543 -2.59,0.543"
++   id="path2914"
++   style="fill:none;stroke:#010101;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round" />
++		<path
++   d="m 9.424,21.678 c 0,0 -1.125,-0.544 -2.927,-0.544 -1.802,0 -2.478,0.544 -2.478,0.544"
++   id="path2916"
++   style="fill:none;stroke:#010101;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round" />
++		
++		<line
++   x1="13.209"
++   x2="13.209"
++   y1="46.533001"
++   y2="11.505"
++   id="line2918"
++   style="fill:none;stroke:#010101;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round" />
++		
++		<g
++   id="g2920">
++			<line
++   x1="41.169998"
++   x2="52.441002"
++   y1="16.188"
++   y2="4.9169998"
++   id="line2922"
++   style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round" />
++			<polyline
++   points="     51.562,15.306 41.17,16.188 42.053,5.794    "
++   id="polyline2924"
++   style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round" />
++		</g>
++	</g>
++</g>
++<g
++   transform="matrix(0.47175141,0,0,0.47175142,31.259324,-2.4589857)"
++   id="view-refresh"
++   style="display:block"><g
++     id="g3000"><path
++       d="m 27.6,4.943 c 12.429,0 22.5,10.076 22.5,22.498 0,12.426 -10.07,22.502 -22.5,22.502 C 15.172,49.943 5.1,39.865 5.1,27.441 5.101,15.019 15.173,4.943 27.6,4.943 z"
++       id="path3002"
++       style="fill:#ffffff" /><path
++       d="m 25.5,37.994 c -4.879,-0.975 -8.555,-5.281 -8.555,-10.445 0,-5.885 4.77,-10.656 10.652,-10.656 5.886,0 10.656,4.771 10.656,10.656 0,5.074 -3.551,9.322 -8.305,10.395"
++       id="path3004"
++       style="fill:none;stroke:#4c4d4f;stroke-width:3.5" /><polyline
++       style="fill:none;stroke:#4c4d4f;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round"
++       points="    22.936,31.578 25.5,37.994 18.746,39.439   "
++       id="polyline3006" /></g></g></svg>
+\ No newline at end of file
diff --git a/rpms/sugar-artwork/sugar-artwork.spec b/rpms/sugar-artwork/sugar-artwork.spec
index bdf33e9..472ef76 100644
--- a/rpms/sugar-artwork/sugar-artwork.spec
+++ b/rpms/sugar-artwork/sugar-artwork.spec
@@ -1,7 +1,7 @@
 Summary: Artwork for Sugar look-and-feel
 Name: sugar-artwork
 Version: 0.88.1
-Release: 1.5dxo%{?dist}
+Release: 1.7dxo%{?dist}
 URL: http://sugarlabs.org
 Group: User Interface/Desktops
 License: LGPLv2+
@@ -14,6 +14,13 @@ Patch1: revert-to-GTK_WIDGET_IS_SENSITIVE.patch
 Patch101: sl2006-icons-for-touchpad-panel.patch
 Patch102: sizelist-0001-add-icons-for-the-sorting-options-in-the-Journal.patch
 Patch103: cpu-and-memory-indicator-icons.patch
+Patch104: journal-reindex-icon.patch
+Patch105: gmartin-School-Server-Icon.patch
+
+# Esteban's accessibility features
+Patch201: accessibility_0001_contrast.patch
+Patch202: accessibility_0002_virtualkeyboard_icon.patch
+
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -36,6 +43,11 @@ look and feel.
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1
+%patch104 -p1
+%patch105 -p1
+
+%patch201 -p1
+%patch202 -p1
 
 %build
 autoreconf