Merge pull request #218 from endlessm/issues/206

Autotools / delete Brazil content

118 files changed, 167 insertions, 907 deletions

diff --git a/wikipedia/.gitignore b/wikipedia/.gitignore
deleted file mode 100644
index 5a7fae8..0000000
--- a/wikipedia/.gitignore
+++ /dev/null
@@ -1,130 +0,0 @@
-# Build products
-endless-0.pc
-test/run-tests
-test/smoke-tests/hello
-Endless-0.gir
-Endless-0.typelib
-endless/eosresource.c
-endless/eosresource-private.h
-
-data/endless_brazil.gresource
-eos-brazil
-
-*.py[cod]
-
-# C extensions
-*.o
-*.so
-*.la
-*.lo
-
-# Autotools droppings
-.deps
-.libs
-stamp*
-*.stamp
-/Makefile
-/Makefile.in
-/aclocal.m4
-/ar-lib
-/autom4te.cache
-/compile
-/config.*
-/configure
-/depcomp
-/install-sh
-/libtool
-/ltmain.sh
-/missing
-/m4/libtool.m4
-/m4/lt~obsolete.m4
-/m4/ltoptions.m4
-/m4/ltsugar.m4
-/m4/ltversion.m4
-/m4/serial-tests.m4
-.dirstamp
-
-# Gettext droppings
-/ABOUT-NLS
-/po/Makefile*
-/po/POTFILES
-/po/Rules-quot
-/po/boldquot.sed
-/po/en@boldquot.header
-/po/en@quot.header
-/po/eos-sdk.pot
-/po/insert-header.sin
-/po/quot.sed
-/po/remove-potcdate.sed
-/po/remove-potcdate.sin
-/m4/codeset.m4
-/m4/fcntl-o.m4
-/m4/gettext.m4
-/m4/glibc21.m4
-/m4/glibc2.m4
-/m4/iconv.m4
-/m4/intdiv0.m4
-/m4/intldir.m4
-/m4/intl.m4
-/m4/intlmacosx.m4
-/m4/intmax.m4
-/m4/inttypes_h.m4
-/m4/inttypes-pri.m4
-/m4/lcmessage.m4
-/m4/lib-ld.m4
-/m4/lib-link.m4
-/m4/lib-prefix.m4
-/m4/lock.m4
-/m4/longlong.m4
-/m4/nls.m4
-/m4/po.m4
-/m4/printf-posix.m4
-/m4/progtest.m4
-/m4/size_max.m4
-/m4/stdint_h.m4
-/m4/threadlib.m4
-/m4/uintmax_t.m4
-/m4/visibility.m4
-/m4/wchar_t.m4
-/m4/wint_t.m4
-/m4/xsize.m4
-
-# Gtk-doc
-/gtk-doc.make
-/m4/gtk-doc.m4
-
-# Autogenerated gir-doc
-/docs/reference/endless-js
-
-# Packages
-*.egg
-*.egg-info
-dist
-build
-eggs
-parts
-bin
-var
-sdist
-develop-eggs
-.installed.cfg
-lib
-lib64
-
-# Installer logs
-pip-log.txt
-
-# Unit test / coverage reports
-.coverage
-.tox
-nosetests.xml
-test-results.xml
-
-# Translations
-*.mo
-*.gmo
-
-# Mr Developer
-.mr.developer.cfg
-.project
-.pydevproject
diff --git a/wikipedia/src/endless_wikipedia/ArticleList.js b/wikipedia/ArticleList.js
index f1ec62c..b081a98 100644
--- a/wikipedia/src/endless_wikipedia/ArticleList.js
+++ b/wikipedia/ArticleList.js
@@ -1,7 +1,12 @@
+const EndlessWikipedia = imports.wikipedia.EndlessWikipedia;
 const GObject = imports.gi.GObject;
 const Gtk = imports.gi.Gtk;
 const Lang = imports.lang;
-const HOVER_ARROW_URI = "/com/endlessm/brazil/assets/submenu_hover_arrow.png";
+
+const TextButton = imports.textButton;
+
+const HOVER_ARROW_URI = "/com/endlessm/wikipedia-domain/assets/submenu_hover_arrow.png";
+
 const ArticleList = new Lang.Class({
     Name: 'ArticleList',
     Extends: Gtk.ScrolledWindow,
@@ -36,7 +41,7 @@ const ArticleList = new Lang.Class({
 
         // Create new ones
         articles.forEach(function(title, index, obj) {
-            let button = new EndlessWikipedia.TextButton(HOVER_ARROW_URI, title, {hexpand:true});
+            let button = new TextButton.TextButton(HOVER_ARROW_URI, title, {hexpand:true});
             button.connect('clicked', Lang.bind(this, function() {
                 this.emit('article-chosen', title, index);
             }));
diff --git a/wikipedia/src/endless_wikipedia/BackButton.js b/wikipedia/BackButton.js
index cfb3155..cfb3155 100644
--- a/wikipedia/src/endless_wikipedia/BackButton.js
+++ b/wikipedia/BackButton.js
diff --git a/wikipedia/src/endless_wikipedia/BoxWithBg.js b/wikipedia/BoxWithBg.js
index 1ae9404..1ae9404 100644
--- a/wikipedia/src/endless_wikipedia/BoxWithBg.js
+++ b/wikipedia/BoxWithBg.js
diff --git a/wikipedia/EndlessWikipedia.js b/wikipedia/EndlessWikipedia.js
new file mode 100644
index 0000000..333f486
--- /dev/null
+++ b/wikipedia/EndlessWikipedia.js
@@ -0,0 +1,18 @@
+const Endless = imports.gi.Endless;
+imports.searchPath.unshift(Endless.getCurrentFileDir());
+
+// Pull modules into this namespace, sort of like __init__.py and __all__
+this.WikipediaApplication = imports.wikipedia.WikipediaApplication.WikipediaApplication;
+this.PrebuiltWikipediaApplication = imports.wikipedia.PrebuiltWikipediaApplication.PrebuiltWikipediaApplication;
+this.PrebuiltFrontPage = imports.wikipedia.PrebuiltFrontPage.PrebuiltFrontPage;
+this.PrebuiltCategoryPage = imports.wikipedia.PrebuiltCategoryPage.PrebuiltCategoryPage;
+this.PrebuiltArticlesPage = imports.wikipedia.PrebuiltArticlesPage.PrebuiltArticlesPage;
+this.ArticleList = imports.wikipedia.ArticleList.ArticleList;
+
+const STYLE_CLASS_TITLE = 'title';
+const STYLE_CLASS_PREBUILT = 'prebuilt';
+const STYLE_CLASS_CATEGORY = 'category';
+const STYLE_CLASS_ARTICLE = 'article';
+const STYLE_CLASS_FRONT_PAGE = 'front-page';
+const STYLE_CLASS_CATEGORY_PAGE = 'category-page';
+const STYLE_CLASS_ARTICLES_PAGE = 'articles-page';
diff --git a/wikipedia/Makefile.am b/wikipedia/Makefile.am
deleted file mode 100644
index 5cb2c94..0000000
--- a/wikipedia/Makefile.am
+++ /dev/null
@@ -1,52 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-# Copyright 2013 Endless Mobile, Inc.
-
-## -----------
-## Makefile.am
-## -----------
-## Please keep this file well-commented.
-
-# Subdirectories where we also want to run make
-SUBDIRS = po
-
-# Our Autoconf macros are kept in the m4/ directory
-ACLOCAL_AMFLAGS = -I m4
-
-# Generated files that 'make clean' should erase
-CLEANFILES =
-DISTCLEANFILES =
-EXTRA_DIST =
-
-# # # BUILD RULES # # #
-
-resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/data --generate-dependencies $(srcdir)/data/endless_brazil.gresource.xml)
-data/endless_brazil.gresource: data/endless_brazil.gresource.xml $(resource_files)
-	$(AM_V_GEN) $(MKDIR_P) $(builddir)/data && \
-	$(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/data  $<
-CLEANFILES += data/endless_brazil.gresource
-
-eos-brazil: Makefile
-	echo "gjs $(pkgdatadir)/src/endless_brazil.js" >$@
-CLEANFILES += eos-brazil
-
-# # # INSTALL RULES # # #
-
-js_sources = \
-	src/endless_brazil.js \
-	src/endless_wikipedia/EndlessWikipedia.js \
-	src/endless_wikipedia/PrebuiltWikipediaApplication.js \
-	$(NULL)
-nobase_pkgdata_DATA = \
-	data/endless_brazil.gresource \
-	$(js_sources) \
-	$(NULL)
-bin_SCRIPTS = eos-brazil
-
-EXTRA_DIST += \
-	$(js_sources) \
-	$(resource_files) \
-	data/endless_brazil.gresource.xml \
-	$(NULL)
-
-# # # TESTS # # #
diff --git a/wikipedia/Makefile.am.inc b/wikipedia/Makefile.am.inc
new file mode 100644
index 0000000..7f7c042
--- /dev/null
+++ b/wikipedia/Makefile.am.inc
@@ -0,0 +1,99 @@
+# Copyright 2013 Endless Mobile, Inc.
+
+# # # CONFIGURE SCRIPT # # #
+
+# Create a config.js file with the installed directory locations. Use the
+# following sed script to replace $datadir inside the script, as suggested by
+# the Autoconf manual; because $datadir and friends only work inside Makefiles.
+edit = sed \
+	-e 's|@datadir[@]|$(datadir)|g' \
+	$(NULL)
+wikipedia/config.js: wikipedia/config.js.in Makefile
+	$(AM_V_GEN)mkdir -p wikipedia && \
+	rm -f $@ $@.tmp && \
+	$(edit) $< >$@.tmp && \
+	chmod +x $@.tmp && \
+	chmod a-w $@.tmp && \
+	mv $@.tmp $@
+CLEANFILES += wikipedia/config.js
+EXTRA_DIST += wikipedia/config.js.in
+
+# # # INSTALL RULES # # #
+
+js_sources = \
+	wikipedia/ArticleList.js \
+	wikipedia/BackButton.js \
+	wikipedia/BoxWithBg.js \
+	wikipedia/EndlessWikipedia.js \
+	wikipedia/PrebuiltArticlesPage.js \
+	wikipedia/PrebuiltCategoryPage.js \
+	wikipedia/PrebuiltFrontPage.js \
+	wikipedia/PrebuiltWikipediaApplication.js \
+	wikipedia/SideBarButton.js \
+	wikipedia/TextButton.js \
+	wikipedia/config.js \
+	wikipedia/scaled_image.js \
+	wikipedia/utils.js \
+	wikipedia/WikipediaApplication.js \
+	wikipedia/models/article_model.js \
+	wikipedia/models/category_model.js \
+	wikipedia/models/domain_wiki_model.js \
+	wikipedia/models/utils/json_utils.js \
+	wikipedia/models/utils/locale_utils.js \
+	wikipedia/presenters/domain_wiki_presenter.js \
+	wikipedia/views/category_button.js \
+	wikipedia/views/category_layout_manager.js \
+	wikipedia/views/category_selector_view.js \
+	wikipedia/views/domain_wiki_view.js \
+	wikipedia/views/title_label_view.js \
+	wikipedia/views/wikipedia_view.js \
+	$(NULL)
+
+parafernalia_sources = \
+	wikipedia/views/index.html \
+	wikipedia/views/css/first_load.css \
+	wikipedia/views/css/main.css \
+	wikipedia/views/css/nolinks.css \
+	wikipedia/views/css/second_load.css \
+	wikipedia/views/css/wikipedia.css \
+	wikipedia/views/fonts/BentonSans-Bold.eot \
+	wikipedia/views/fonts/BentonSans-Bold.svg \
+	wikipedia/views/fonts/BentonSans-Bold.ttf \
+	wikipedia/views/fonts/BentonSans-Bold.woff \
+	wikipedia/views/fonts/BentonSans-Book.eot \
+	wikipedia/views/fonts/BentonSans-Book.svg \
+	wikipedia/views/fonts/BentonSans-Book.ttf \
+	wikipedia/views/fonts/BentonSans-Book.woff \
+	wikipedia/views/fonts/BentonSans-Medium.eot \
+	wikipedia/views/fonts/BentonSans-Medium.svg \
+	wikipedia/views/fonts/BentonSans-Medium.ttf \
+	wikipedia/views/fonts/BentonSans-Medium.woff \
+	wikipedia/views/fonts/BentonSans-Regular.eot \
+	wikipedia/views/fonts/BentonSans-Regular.svg \
+	wikipedia/views/fonts/BentonSans-Regular.ttf \
+	wikipedia/views/fonts/BentonSans-Regular.woff \
+	wikipedia/views/fonts/BentonSans-Thin.eot \
+	wikipedia/views/fonts/BentonSans-Thin.svg \
+	wikipedia/views/fonts/BentonSans-Thin.ttf \
+	wikipedia/views/fonts/BentonSans-Thin.woff \
+	wikipedia/views/fonts/LinLibertine_R.eot \
+	wikipedia/views/fonts/LinLibertine_R.svg \
+	wikipedia/views/fonts/LinLibertine_R.ttf \
+	wikipedia/views/fonts/LinLibertine_R.woff \
+	wikipedia/views/fonts/MinionPro-Regular.eot \
+	wikipedia/views/fonts/MinionPro-Regular.svg \
+	wikipedia/views/fonts/MinionPro-Regular.ttf \
+	wikipedia/views/fonts/MinionPro-Regular.woff \
+	wikipedia/views/images/bg-main-content.png \
+	wikipedia/views/images/hr-separate.png \
+	wikipedia/views/images/index_list_arrow-down.svg \
+	wikipedia/views/images/title-line.jpg \
+	wikipedia/views/js/jquery-min.js \
+	wikipedia/views/js/main.js \
+	$(NULL)
+
+gjsmodulesdir = $(datadir)/gjs-1.0
+nobase_dist_gjsmodules_DATA = \
+	$(js_sources) \
+	$(parafernalia_sources) \
+	$(NULL)
diff --git a/wikipedia/src/endless_wikipedia/PrebuiltArticlesPage.js b/wikipedia/PrebuiltArticlesPage.js
index fc38e46..2578648 100644
--- a/wikipedia/src/endless_wikipedia/PrebuiltArticlesPage.js
+++ b/wikipedia/PrebuiltArticlesPage.js
@@ -2,7 +2,7 @@ const GObject = imports.gi.GObject;
 const Gtk = imports.gi.Gtk;
 const Lang = imports.lang;
 
-const EndlessWikipedia = imports.endless_wikipedia.EndlessWikipedia;
+const EndlessWikipedia = imports.wikipedia.EndlessWikipedia;
 const WikipediaView = imports.views.wikipedia_view;
 
 GObject.ParamFlags.READWRITE = GObject.ParamFlags.READABLE | GObject.ParamFlags.WRITABLE;
diff --git a/wikipedia/src/endless_wikipedia/PrebuiltCategoryPage.js b/wikipedia/PrebuiltCategoryPage.js
index a6fa53e..05240b6 100644
--- a/wikipedia/src/endless_wikipedia/PrebuiltCategoryPage.js
+++ b/wikipedia/PrebuiltCategoryPage.js
@@ -1,11 +1,16 @@
+const EndlessWikipedia = imports.wikipedia.EndlessWikipedia;
 const GObject = imports.gi.GObject;
 const GdkPixbuf = imports.gi.GdkPixbuf;
 const Gtk = imports.gi.Gtk;
 const Lang = imports.lang;
 
-const EndlessWikipedia = imports.endless_wikipedia.EndlessWikipedia;
+const BoxWithBg = imports.BoxWithBg;
 const ScaledImage = imports.scaled_image;
 
+const SUBMENU_SEPARATOR_A_URI = "/com/endlessm/wikipedia-domain/assets/submenu_separator_shadow_a.png";
+const SPLASH_SEPARATOR_URI = "/com/endlessm/wikipedia-domain/assets/category_splash_separator_shadow.png";
+const INTRO_TITLE_SEPARATOR_URI = "/com/endlessm/wikipedia-domain/assets/introduction_title_separator.png";
+
 GObject.ParamFlags.READWRITE = GObject.ParamFlags.READABLE | GObject.ParamFlags.WRITABLE;
 
 function _resourceUriToPath(uri) {
@@ -37,7 +42,7 @@ const PrebuiltCategoryPage = new Lang.Class({
     },
 
     _init: function(props) {
-        this._vbox = new EndlessWikipedia.BoxWithBg({
+        this._vbox = new BoxWithBg.BoxWithBg({
             name: "category_info",
             orientation: Gtk.Orientation.VERTICAL,
             expand:true
@@ -72,19 +77,19 @@ const PrebuiltCategoryPage = new Lang.Class({
         });
 
         this._submenu_separator = new ScaledImage.ScaledImage({
-            resource: "/com/endlessm/brazil/assets/submenu_separator_shadow_a.png",
+            resource: SUBMENU_SEPARATOR_A_URI,
             constraint: Gtk.Orientation.VERTICAL,
             halign: Gtk.Align.END
         });
 
         this._splash_separator = new ScaledImage.ScaledImage({
-            resource: "/com/endlessm/brazil/assets/category_splash_separator_shadow.png",
+            resource: SPLASH_SEPARATOR_URI,
             constraint: Gtk.Orientation.VERTICAL,
             halign: Gtk.Align.END
         });
 
         this._description_separator = new ScaledImage.ScaledImage({
-            resource: "/com/endlessm/brazil/assets/introduction_title_separator.png",
+            resource: INTRO_TITLE_SEPARATOR_URI,
             constraint: Gtk.Orientation.HORIZONTAL
         });
 
diff --git a/wikipedia/src/endless_wikipedia/PrebuiltFrontPage.js b/wikipedia/PrebuiltFrontPage.js
index 36fdd2c..352220d 100644
--- a/wikipedia/src/endless_wikipedia/PrebuiltFrontPage.js
+++ b/wikipedia/PrebuiltFrontPage.js
@@ -2,7 +2,7 @@ const GObject = imports.gi.GObject;
 const Gtk = imports.gi.Gtk;
 const Lang = imports.lang;
 
-const EndlessWikipedia = imports.endless_wikipedia.EndlessWikipedia;
+const EndlessWikipedia = imports.wikipedia.EndlessWikipedia;
 const CategorySelectorView = imports.views.category_selector_view;
 const TitleLabelView = imports.views.title_label_view;
 
diff --git a/wikipedia/src/endless_wikipedia/PrebuiltWikipediaApplication.js b/wikipedia/PrebuiltWikipediaApplication.js
index da56d2c..9747330 100644
--- a/wikipedia/src/endless_wikipedia/PrebuiltWikipediaApplication.js
+++ b/wikipedia/PrebuiltWikipediaApplication.js
@@ -3,13 +3,11 @@ const Format = imports.format;
 const Lang = imports.lang;
 const Gtk = imports.gi.Gtk;
 
-const EndlessWikipedia = imports.endless_wikipedia.EndlessWikipedia;
+const EndlessWikipedia = imports.wikipedia.EndlessWikipedia;
 const DomainWikiView = imports.views.domain_wiki_view;
 const DomainWikiModel = imports.models.domain_wiki_model;
 const DomainWikiPresenter = imports.presenters.domain_wiki_presenter;
 
-const _ = function(x) { return x; };
-
 String.prototype.format = Format.format;
 
 const PrebuiltWikipediaApplication = new Lang.Class({
diff --git a/wikipedia/README.md b/wikipedia/README.md
deleted file mode 100644
index efcaa65..0000000
--- a/wikipedia/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-eos-wikipedia-brazil
-====================
-
-Brazil application based on the wikipedia database
diff --git a/wikipedia/src/endless_wikipedia/SideBarButton.js b/wikipedia/SideBarButton.js
index b602d6c..b602d6c 100644
--- a/wikipedia/src/endless_wikipedia/SideBarButton.js
+++ b/wikipedia/SideBarButton.js
diff --git a/wikipedia/src/endless_wikipedia/TextButton.js b/wikipedia/TextButton.js
index 13a47ac..13a47ac 100644
--- a/wikipedia/src/endless_wikipedia/TextButton.js
+++ b/wikipedia/TextButton.js
diff --git a/wikipedia/src/endless_wikipedia/WikipediaApplication.js b/wikipedia/WikipediaApplication.js
index dbf0554..e9f872e 100644
--- a/wikipedia/src/endless_wikipedia/WikipediaApplication.js
+++ b/wikipedia/WikipediaApplication.js
@@ -1,6 +1,9 @@
+const Endless = imports.gi.Endless;
 const Lang = imports.lang;
 const GObject = imports.gi.GObject;
 const Gio = imports.gi.Gio;
+
+const Config = imports.config;
 const DomainWikiModel = imports.models.domain_wiki_model;
 
 GObject.ParamFlags.READWRITE = GObject.ParamFlags.READABLE | GObject.ParamFlags.WRITABLE;
@@ -34,17 +37,17 @@ const WikipediaApplication = new Lang.Class({
     // VIRTUAL FUNCTIONS
 
     vfunc_startup: function() {
+        // Load GResource bundle
+        let resource = Gio.Resource.load(Config.WIKIPEDIA_DATADIR + 'eos-wikipedia-domain.gresource');
+        resource._register();
+
         this.parent();
         this._domain_wiki_model = new DomainWikiModel.DomainWikiModel();
-        //let category_file = Gio.File.new_for_uri(this._application_uri);
-        //let [success, category_json, etag] = category_file.load_contents(null);
-        //this._categories = JSON.parse(category_json);
 
-        // Doesn't belong here
         let provider = new Gtk.CssProvider();
-        let css_file = Gio.File.new_for_uri('resource:///com/endlessm/brazil/css/endless_brazil.css')
+        let css_file = Gio.File.new_for_uri('resource:///com/endlessm/wikipedia-domain/css/eos-wikipedia-domain.css')
         provider.load_from_file(css_file);
-        Gtk.StyleContext.add_provider_for_screen(Gdk.Screen.get_default(), provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
+        Gtk.StyleContext.add_provider_for_screen(Gdk.Screen.get_default(), provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION)
     }
 
 });
diff --git a/wikipedia/autogen.sh b/wikipedia/autogen.sh
deleted file mode 100755
index b8e046a..0000000
--- a/wikipedia/autogen.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-# Bootstrap script for Endless Programming app
-# Run this script on a clean source checkout to get ready for building.
-
-FILE_MUST_EXIST=src/endless_brazil.js
-POT_FILE=po/eos-brazil.pot
-
-test -n "$srcdir" || srcdir=`dirname "$0"`
-test -n "$srcdir" || srcdir=.
-olddir=`pwd`
-
-cd $srcdir
-test -f $FILE_MUST_EXIST || {
-    echo "You must run this script in the top-level checkout directory"
-    exit 1
-}
-
-# Install our commit message script if a git repo
-if [ -d .git ]; then
-    cp commit-msg .git/hooks/commit-msg
-    chmod +x .git/hooks/commit-msg
-fi
-
-# GNU gettext automake support doesn't get along with git
-# https://bugzilla.gnome.org/show_bug.cgi?id=661128
-touch -t 200001010000 $POT_FILE
-
-# NOCONFIGURE is used by gnome-common
-if test -z "$NOCONFIGURE"; then
-    echo "This script will run ./configure automatically. If you wish to pass "
-    echo "any arguments to it, please specify them on the $0 "
-    echo "command line. To disable this behavior, have NOCONFIGURE=1 in your "
-    echo "environment."
-fi
-
-# Run the actual tools to prepare the clean checkout
-autoreconf -fi || exit $?
-rm -f po/Makevars.template
-
-cd "$olddir"
-test -n "$NOCONFIGURE" || "./configure" "$@"
diff --git a/wikipedia/commit-msg b/wikipedia/commit-msg
deleted file mode 100644
index 7e5992f..0000000
--- a/wikipedia/commit-msg
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-# move this script to the .git/hooks directory for your repo.
-# make sure to chmod +x .git/hooks/commit-msg
-
-repo=$(basename `git rev-parse --show-toplevel`)
-branch=`git rev-parse --abbrev-ref HEAD`
-
-if [[ $branch == issues/* ]]; then
-  issue=$(echo "$branch" | awk -F/ '{ print $2 }')
-  link="[endlessm/$repo#$issue]"
-  echo "issue link: $link"
-  echo $link >> $1
-fi
-
-exit 0
diff --git a/wikipedia/config.js.in b/wikipedia/config.js.in
new file mode 100644
index 0000000..9ea8aab
--- /dev/null
+++ b/wikipedia/config.js.in
@@ -0,0 +1,2 @@
+this.DATADIR = '@datadir@';
+this.WIKIPEDIA_DATADIR = this.DATADIR + '/eos-wikipedia-domain/';
diff --git a/wikipedia/configure.ac b/wikipedia/configure.ac
deleted file mode 100644
index edb9dad..0000000
--- a/wikipedia/configure.ac
+++ /dev/null
@@ -1,69 +0,0 @@
-dnl Process this file with autoconf to produce configure
-
-# Copyright 2013 Endless Mobile, Inc.
-
-dnl ------------
-dnl configure.ac
-dnl ------------
-dnl Please keep this file well-commented. Autotools involve a lot of magical
-dnl incantations, and it is easy to mess things up if you don't know what you
-dnl are doing.
-
-# Initialization
-# --------------
-# Initialize Autoconf: package name, version, bug report address, tarball name,
-# website
-AC_INIT([Endless Brazil], [0],
-	[], [eos-brazil], [http://endlessm.com])
-# Initialize Automake: enable all warnings and do not insist on GNU standards
-# no-portability suppresses warnings about syntax specific to GNU make
-AM_INIT_AUTOMAKE([-Wall -Wno-portability foreign 1.11])
-# Avoid spewing garbage over the terminal ('make V=1' to see the garbage)
-AM_SILENT_RULES([yes])
-# Keep Autotools macros local to this source tree
-AC_CONFIG_MACRO_DIR([m4])
-
-AC_CACHE_SAVE
-
-# Required versions of libraries
-# Update these whenever you use a function that requires a certain API version
-EOS_SDK_REQUIREMENT="endless-0"
-
-# Gettext package name
-GETTEXT_PACKAGE=$PACKAGE
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, ["$GETTEXT_PACKAGE"],
-	[Package name for Gettext])
-# Detect which languages are available
-AS_ALL_LINGUAS
-
-# Required build tools
-# --------------------
-# Make sure we can create directory hierarchies
-AC_PROG_MKDIR_P
-# Library configuration tool
-PKG_PROG_PKG_CONFIG
-# Gettext
-AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.18.1])
-# Various tools
-GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable glib_compile_resources gio-2.0`
-AC_SUBST(GLIB_COMPILE_RESOURCES)
-
-AC_CACHE_SAVE
-
-# Required libraries
-# ------------------
-PKG_CHECK_MODULES([EOS_BRAZIL], [$EOS_SDK_REQUIREMENT])
-
-AC_CACHE_SAVE
-
-# Output
-# ------
-# List files here that the configure script should output
-AC_CONFIG_FILES([
-	Makefile
-	po/Makefile.in
-])
-# Do the output
-AC_OUTPUT
diff --git a/wikipedia/data/app_info/pt-br-brazil-app.json b/wikipedia/data/app_info/pt-br-brazil-app.json
deleted file mode 100644
index 373e6c1..0000000
--- a/wikipedia/data/app_info/pt-br-brazil-app.json
+++ /dev/null
@@ -1,313 +0,0 @@
-{
-  "app_name": "Brazil App",
-  "categories": [
-    {
-      "category_name": "Esportes",
-      "content_text": "Desporto, desporte, esporte (portugu\u00eas brasileiro) ou desporto (portugu\u00eas europeu) \u00e9 toda a forma de praticar atividade f\u00edsica que, atrav\u00e9s de participa\u00e7\u00e3o ocasional ou organizada, visa equilibrar a sa\u00fade ou melhorar a aptid\u00e3o f\u00edsica e proporcionar entretenimento aos participantes. Pode ser competitivo, onde o vencedor ou vencedores podem ser identificados por obten\u00e7\u00e3o de um objectivo, e pode exigir um grau de habilidade, especialmente em n\u00edveis mais elevados. S\u00e3o centenas os tipos de desportos existentes, incluindo aqueles para um \u00fanico participante, at\u00e9 aqueles com centenas de participantes simult\u00e2neos, em equipas ou individualmente. Algumas actividades n\u00e3o-f\u00edsicas, como jogos de tabuleiro e jogos de cartas s\u00e3o muitas vezes referidos como desportos, mas um desporto \u00e9 geralmente reconhecido como sendo baseada na actividade f\u00edsica.",
-      "image_file": "resource:///com/endlessm/brazil/category_images/camisa-Uniforme-de-futebol-da-sele\u00e7\u00e3o-brasileira2.jpg",
-      "image_thumb_uri" : "resource:///com/endlessm/brazil/category_images/thumb_sports.jpg",
-      "articles": [
-        {
-          "title": "Sele\u00e7\u00e3o Brasileira de Futebol",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/Sele%C3%A7%C3%A3o_Brasileira_de_Futebol"
-        },
-        {
-          "title": "Futebol",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/Futebol_do_Brasil"
-        },
-        {
-          "title": "Futebol de Areia",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/Futebol_de_areia"
-        },
-        {
-          "title": "Futebol de sal\u00e3o",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/Futebol_de_sal%C3%A3o_do_Brasil"
-        },
-        {
-          "title": "Capoeira",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/Capoeira"
-        },
-        {
-          "title": "Jiu-jitsu Brasileiro",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/Jiu-jitsu_brasileiro"
-        },
-        {
-          "title": "Basquetebol",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/Basquetebol"
-        },
-        {
-          "title": "Nata\u00e7\u00e3o",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/Nata%C3%A7%C3%A3o_do_Brasil"
-        },
-        {
-          "title": "Jud\u00f4 do Brasil",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/Jud%C3%B4_do_Brasil"
-        },
-        {
-          "title": "T\u00eanis",
-          "url": "https:\/\/pt.wikipedia.org\/wiki\/T%C3%A9nis"
-        },
-        {
-          "title": "Voleibol",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/Voleibol"
-        },
-        {
-          "title": "Voleibol de praia",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/Voleibol_de_praia"
-        },
-        {
-          "title": "Handball",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/Handball"
-        },
-        {
-          "title": "Skate",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/Skate"
-        },
-        {
-          "title": "Surfe",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/Surfe"
-        },
-        {
-          "title": "Automobilismo",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/Automobilismo"
-        },
-        {
-          "title": "Ciclismo",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/Ciclismo"
-        },
-        {
-          "title": "Paraquedismo",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/Parachuting"
-        },
-        {
-          "title": "Escalada",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/Escalada"
-        },
-        {
-          "title": "F\u00f3rmula 1",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/F%C3%B3rmula_1"
-        }
-      ]
-    },
-    {
-      "category_name": "Cidades",
-      "content_text": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in eros quis tellus pellentesque sagittis. Praesent laoreet dignissim condimentum. Vivamus tellus nisi, mattis vitae congue sit amet, feugiat a tortor. Aliquam nec sem in dolor ullamcorper condimentum. Mauris malesuada fringilla leo in rutrum. Pellentesque vitae sapien eu lorem ultricies posuere auctor molestie mauris. Sed rutrum eros sed quam posuere, eu aliquam metus pellentesque. Vivamus elit nunc, facilisis imperdiet turpis eget, tempor aliquam dolor. Donec nec lacinia dolor. Duis faucibus tortor nec odio fermentum tincidunt. Quisque blandit, nisl non consequat molestie, nulla erat varius mi, non tincidunt elit odio quis elit. Cras pellentesque est ac dui ullamcorper fringilla. Nullam eleifend luctus tincidunt. Nulla facilisi. Nam sed lacinia leo, ac adipiscing nisl. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.",
-      "image_file": "resource:///com/endlessm/brazil/category_images/rio_de_janeiro_by_night_2738x1825.jpg",
-      "image_thumb_uri" : "resource:///com/endlessm/brazil/category_images/thumb_cities.jpg",
-      "articles": [
-        {
-          "title": "Rio de Janeiro",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/Rio_de_Janeiro_(cidade)"
-        },
-        {
-          "title": "S\u00e3o Paulo",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/S%C3%A3o_Paulo_(cidade)"
-        },
-        {
-          "title": "Salvador",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/Salvador_(Bahia)"
-        },
-        {
-          "title": "Bras\u00edlia",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/Bras%C3%ADlia"
-        },
-        {
-          "title": "Fortaleza",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/Fortaleza"
-        },
-        {
-          "title": "Votuporanga",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/Votuporanga"
-        }
-      ]
-    },
-    {
-      "category_name": "Culin\u00e1ria",
-      "content_text": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in eros quis tellus pellentesque sagittis. Praesent laoreet dignissim condimentum. Vivamus tellus nisi, mattis vitae congue sit amet, feugiat a tortor. Aliquam nec sem in dolor ullamcorper condimentum. Mauris malesuada fringilla leo in rutrum. Pellentesque vitae sapien eu lorem ultricies posuere auctor molestie mauris. Sed rutrum eros sed quam posuere, eu aliquam metus pellentesque. Vivamus elit nunc, facilisis imperdiet turpis eget, tempor aliquam dolor. Donec nec lacinia dolor. Duis faucibus tortor nec odio fermentum tincidunt. Quisque blandit, nisl non consequat molestie, nulla erat varius mi, non tincidunt elit odio quis elit. Cras pellentesque est ac dui ullamcorper fringilla. Nullam eleifend luctus tincidunt. Nulla facilisi. Nam sed lacinia leo, ac adipiscing nisl. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.",
-      "image_file": "resource:///com/endlessm/brazil/category_images/156356538.jpg",
-      "image_thumb_uri" : "resource:///com/endlessm/brazil/category_images/thumb_culinary.jpg",
-      "articles": [
-        {
-          "title": "Culin\u00e1ria do Brasil",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/Culin%C3%A1ria_do_Brasil"
-        },
-        {
-          "title": "Culin\u00e1ria da Bahia",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/Culin%C3%A1ria_da_Bahia"
-        },
-        {
-          "title": "Feijoada",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/Feijoada_(Brasil)"
-        },
-        {
-          "title": "Culin\u00e1ria de MInas",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/Culin%C3%A1ria_de_Minas_Gerais"
-        }
-      ]
-    },
-    {
-      "category_name": "Natureza",
-      "content_text": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus in eros quis tellus pellentesque sagittis. Praesent laoreet dignissim condimentum. Vivamus tellus nisi, mattis vitae congue sit amet, feugiat a tortor. Aliquam nec sem in dolor ullamcorper condimentum. Mauris malesuada fringilla leo in rutrum. Pellentesque vitae sapien eu lorem ultricies posuere auctor molestie mauris. Sed rutrum eros sed quam posuere, eu aliquam metus pellentesque. Vivamus elit nunc, facilisis imperdiet turpis eget, tempor aliquam dolor. Donec nec lacinia dolor. Duis faucibus tortor nec odio fermentum tincidunt. Quisque blandit, nisl non consequat molestie, nulla erat varius mi, non tincidunt elit odio quis elit. Cras pellentesque est ac dui ullamcorper fringilla. Nullam eleifend luctus tincidunt. Nulla facilisi. Nam sed lacinia leo, ac adipiscing nisl. Pellentesque habitant morbi tristique senectus et netus et malesuada fames ac turpis egestas.",
-      "image_file": "resource:///com/endlessm/brazil/category_images/red_parrot_close_up-Animal_photography_Wallpaper_1440x900.jpg",
-      "image_thumb_uri" : "resource:///com/endlessm/brazil/category_images/thumb_nature.jpg",
-      "articles": [
-        {
-          "title": "Biodiversidade",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/Biodiversidade_no_Brasil"
-        },
-        {
-          "title": "Primatas",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/Lista_de_primatas_do_Brasil"
-        },
-        {
-          "title": "Mam\u00edferos",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/Lista_de_mam%C3%ADferos_do_Brasil"
-        },
-        {
-          "title": "Aves",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/Lista_de_aves_do_Brasil"
-        }
-      ]
-    },
-    {
-      "category_name": "Artes",
-      "content_text": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam purus ipsum, adipiscing a egestas scelerisque, varius in urna. Donec nec eros nunc. Nam molestie orci quis pulvinar condimentum. Ut aliquam orci ac neque placerat, vel venenatis ligula feugiat. Aenean consequat lacus eget mauris pretium, eget mattis diam mattis. Sed consequat ipsum quam, at pretium nunc posuere vel. Duis condimentum neque vel velit tincidunt, at semper justo dignissim. Cras blandit vehicula leo, vel pellentesque dui cursus eu. Donec convallis rhoncus tincidunt. Donec eleifend dapibus vulputate.",
-      "image_file": "resource:///com/endlessm/brazil/category_images/Tarsila do Amaral 04.jpg",
-      "image_thumb_uri" : "resource:///com/endlessm/brazil/category_images/thumb_arts.jpg",
-      "articles": [
-        {
-          "title": "Rei Momo",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/Rei_Momo"
-        },
-        {
-          "title": "Fotografia",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/Fotografia_no_Brasil"
-        },
-        {
-          "title": "Sebasti\u00e3o Salgado",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/Sebasti%C3%A3o_Salgado"
-        },
-        {
-          "title": "Pintura",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/Pintura_no_Brasil"
-        },
-        {
-          "title": "Miss\u00e3o Artistica Francesa",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/Miss%C3%A3o_Art%C3%ADstica_Francesa"
-        },
-        {
-          "title": "Academia Imperial de Belas Artes",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/Academia_Imperial_de_Belas_Artes"
-        },
-        {
-          "title": "Semana de Arte Moderna",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/Semana_de_Arte_Moderna"
-        },
-        {
-          "title": "Pintura no Rio Grande do Sul",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/Pintura_no_Rio_Grande_do_Sul"
-        },
-        {
-          "title": "Bienal Internacional de Arte de S\u00e3o Paulo",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/Bienal_Internacional_de_Arte_de_S%C3%A3o_Paulo"
-        }
-      ]
-    },
-    {
-      "category_name": "Events",
-      "content_text": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam purus ipsum, adipiscing a egestas scelerisque, varius in urna. Donec nec eros nunc. Nam molestie orci quis pulvinar condimentum. Ut aliquam orci ac neque placerat, vel venenatis ligula feugiat. Aenean consequat lacus eget mauris pretium, eget mattis diam mattis. Sed consequat ipsum quam, at pretium nunc posuere vel. Duis condimentum neque vel velit tincidunt, at semper justo dignissim. Cras blandit vehicula leo, vel pellentesque dui cursus eu. Donec convallis rhoncus tincidunt. Donec eleifend dapibus vulputate.",
-      "image_file": "resource:///com/endlessm/brazil/category_images/8fev2013---desfile-da-escola-rosas-de-ouro-no-sambodromo-do-anhembi-em-sao-paulo-1360409445571_1920x1080.jpg",
-      "image_thumb_uri" : "resource:///com/endlessm/brazil/category_images/thumb_events.jpg",
-      "articles": [
-        {
-          "title": "Feriados",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/Feriados_no_Brasil"
-        },
-        {
-          "title": "Carnaval",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/Carnaval_do_Brasil"
-        },
-        {
-          "title": "Festa Junina",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/Festa_junina"
-        },
-        {
-          "title": "Rock in Rio",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/Rock_in_Rio"
-        }
-      ]
-    },
-    {
-      "category_name": "Hist\u00f3ria",
-      "content_text": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aliquam purus ipsum, adipiscing a egestas scelerisque, varius in urna. Donec nec eros nunc. Nam molestie orci quis pulvinar condimentum. Ut aliquam orci ac neque placerat, vel venenatis ligula feugiat. Aenean consequat lacus eget mauris pretium, eget mattis diam mattis. Sed consequat ipsum quam, at pretium nunc posuere vel. Duis condimentum neque vel velit tincidunt, at semper justo dignissim. Cras blandit vehicula leo, vel pellentesque dui cursus eu. Donec convallis rhoncus tincidunt. Donec eleifend dapibus vulputate.",
-      "image_file": "resource:///com/endlessm/brazil/category_images/Oscar_Pereira_da_Silva_-_Desembarque_de_Pedro_\u00c1lvares_Cabral_em_Porto_Seguro_em_1500.jpg",
-      "image_thumb_uri" : "resource:///com/endlessm/brazil/category_images/thumb_history.jpg",
-      "articles": [
-        {
-          "title": "Hist\u00f3ria do Brasil",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/Hist\u00f3ria_do_Brasil\u200e"
-        },
-        {
-          "title": "Hist\u00f3ria pr\u00e9-cabralina do Brasil",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/Pr%C3%A9-Hist%C3%B3ria_do_Brasil"
-        },
-        {
-          "title": "Descoberta do Brasil",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/Descoberta_do_Brasil"
-        },
-        {
-          "title": "Proclama\u00e7\u00e3o da Rep\u00fablica do Brasil",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/Proclama%C3%A7%C3%A3o_da_Rep%C3%BAblica_do_Brasil"
-        },
-        {
-          "title": "Independ\u00eancia do Brasil",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/Independ%C3%AAncia_do_Brasil"
-        }
-      ]
-    },
-    {
-      "category_name": "Musica",
-      "content_text": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras turpis sem, consequat ac erat quis, fringilla auctor diam. Morbi in leo mattis, ornare mi sit amet, cursus libero. Cras dapibus lorem vitae dui ullamcorper semper. Suspendisse tortor dui, ullamcorper sed porttitor at, vehicula ut mauris. Aliquam interdum elit dolor. Etiam arcu enim, faucibus ut scelerisque quis, ullamcorper a ipsum. Ut hendrerit vehicula dolor, quis placerat augue. Mauris libero mi, rutrum et convallis eu, ultricies a nisl. Quisque tempus vitae risus sed porta. Suspendisse congue urna lectus, eu hendrerit ligula placerat id. Proin vulputate velit ut libero suscipit, molestie dapibus metus blandit. Cras gravida libero pretium ipsum vulputate molestie. In fringilla tellus rhoncus lorem scelerisque ornare. Cras elit sapien, elementum ut accumsan non, rhoncus a erat. Suspendisse placerat tortor rutrum venenatis dapibus. Nunc sit amet faucibus velit.",
-      "image_file": "resource:///com/endlessm/brazil/category_images/musica.jpg",
-      "image_thumb_uri" : "resource:///com/endlessm/brazil/category_images/thumb_music.jpg",
-      "articles": [
-        {
-          "title": "M\u00fasica do Brasil",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/M%C3%BAsica_do_Brasil"
-        },
-        {
-          "title": "M\u00fasica Popular Brasileira",
-          "url": "http:\/\/en.wikipedia.org\/wiki\/M%C3%BAsica_Popular_Brasileira"
-        },
-        {
-          "title": "M\u00fasica erudita brasileira",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/M%C3%BAsica_erudita_brasileira"
-        },
-        {
-          "title": "Choro",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/Choro"
-        },
-        {
-          "title": "Samba",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/Samba"
-        },
-        {
-          "title": "Bossa Nova",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/Bossa_Nova"
-        },
-        {
-          "title": "Tropic\u00e1lia",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/Tropic%C3%A1lia"
-        },
-        {
-          "title": "MPB",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/MPB"
-        },
-        {
-          "title": "M\u00fasica ind\u00edgena brasileira",
-          "url": "http:\/\/pt.wikipedia.org\/wiki\/M%C3%BAsica_ind%C3%ADgena_brasileira"
-        }
-      ]
-    }
-  ]
-}
\ No newline at end of file
diff --git a/wikipedia/data/assets/bg_brazil.jpg b/wikipedia/data/assets/bg_brazil.jpg
new file mode 100644
index 0000000..d97f9b8
--- /dev/null
+++ b/wikipedia/data/assets/bg_brazil.jpg
diff --git a/wikipedia/data/assets/category_hover_arrow.png b/wikipedia/data/assets/category_hover_arrow.png
deleted file mode 100644
index 13a2fb0..0000000
--- a/wikipedia/data/assets/category_hover_arrow.png
+++ /dev/null
diff --git a/wikipedia/data/assets/category_splash_separator_shadow.png b/wikipedia/data/assets/category_splash_separator_shadow.png
deleted file mode 100644
index 6ef03e0..0000000
--- a/wikipedia/data/assets/category_splash_separator_shadow.png
+++ /dev/null
diff --git a/wikipedia/data/assets/content_background.jpg b/wikipedia/data/assets/content_background.jpg
deleted file mode 100644
index e53a87a..0000000
--- a/wikipedia/data/assets/content_background.jpg
+++ /dev/null
diff --git a/wikipedia/data/assets/content_title_separator.png b/wikipedia/data/assets/content_title_separator.png
deleted file mode 100644
index db7d7db..0000000
--- a/wikipedia/data/assets/content_title_separator.png
+++ /dev/null
diff --git a/wikipedia/data/assets/image_strip_back_button.png b/wikipedia/data/assets/image_strip_back_button.png
deleted file mode 100644
index 1d4787c..0000000
--- a/wikipedia/data/assets/image_strip_back_button.png
+++ /dev/null
diff --git a/wikipedia/data/assets/introduction_title_separator.png b/wikipedia/data/assets/introduction_title_separator.png
deleted file mode 100644
index 7c202f7..0000000
--- a/wikipedia/data/assets/introduction_title_separator.png
+++ /dev/null
diff --git a/wikipedia/data/assets/submenu_background.jpg b/wikipedia/data/assets/submenu_background.jpg
deleted file mode 100644
index ccdac1d..0000000
--- a/wikipedia/data/assets/submenu_background.jpg
+++ /dev/null
diff --git a/wikipedia/data/assets/submenu_bg_hover.png b/wikipedia/data/assets/submenu_bg_hover.png
deleted file mode 100644
index b9ed24a..0000000
--- a/wikipedia/data/assets/submenu_bg_hover.png
+++ /dev/null
diff --git a/wikipedia/data/assets/submenu_bg_normal.jpg b/wikipedia/data/assets/submenu_bg_normal.jpg
deleted file mode 100644
index b84c375..0000000
--- a/wikipedia/data/assets/submenu_bg_normal.jpg
+++ /dev/null
diff --git a/wikipedia/data/assets/submenu_bg_pressed.png b/wikipedia/data/assets/submenu_bg_pressed.png
deleted file mode 100644
index d5693d5..0000000
--- a/wikipedia/data/assets/submenu_bg_pressed.png
+++ /dev/null
diff --git a/wikipedia/data/assets/submenu_hover_arrow.png b/wikipedia/data/assets/submenu_hover_arrow.png
deleted file mode 100644
index a286591..0000000
--- a/wikipedia/data/assets/submenu_hover_arrow.png
+++ /dev/null
diff --git a/wikipedia/data/assets/submenu_separator_shadow_a.png b/wikipedia/data/assets/submenu_separator_shadow_a.png
deleted file mode 100644
index d4ac1ba..0000000
--- a/wikipedia/data/assets/submenu_separator_shadow_a.png
+++ /dev/null
diff --git a/wikipedia/data/assets/submenu_separator_shadow_b.png b/wikipedia/data/assets/submenu_separator_shadow_b.png
deleted file mode 100644
index ba79241..0000000
--- a/wikipedia/data/assets/submenu_separator_shadow_b.png
+++ /dev/null
diff --git a/wikipedia/data/category_images/156356538.jpg b/wikipedia/data/category_images/156356538.jpg
deleted file mode 100644
index 85ce7b6..0000000
--- a/wikipedia/data/category_images/156356538.jpg
+++ /dev/null
diff --git a/wikipedia/data/category_images/2013-03-16 02.33.23.jpg b/wikipedia/data/category_images/2013-03-16 02.33.23.jpg
deleted file mode 100644
index 09532b1..0000000
--- a/wikipedia/data/category_images/2013-03-16 02.33.23.jpg
+++ /dev/null
diff --git a/wikipedia/data/category_images/8fev2013---desfile-da-escola-rosas-de-ouro-no-sambodromo-do-anhembi-em-sao-paulo-1360409445571_1920x1080.jpg b/wikipedia/data/category_images/8fev2013---desfile-da-escola-rosas-de-ouro-no-sambodromo-do-anhembi-em-sao-paulo-1360409445571_1920x1080.jpg
deleted file mode 100644
index de7bdb8..0000000
--- a/wikipedia/data/category_images/8fev2013---desfile-da-escola-rosas-de-ouro-no-sambodromo-do-anhembi-em-sao-paulo-1360409445571_1920x1080.jpg
+++ /dev/null
diff --git a/wikipedia/data/category_images/Antique_Map_Janssonius_South_America.jpg b/wikipedia/data/category_images/Antique_Map_Janssonius_South_America.jpg
deleted file mode 100644
index f327e44..0000000
--- a/wikipedia/data/category_images/Antique_Map_Janssonius_South_America.jpg
+++ /dev/null
diff --git a/wikipedia/data/category_images/Oscar_Pereira_da_Silva_-_Desembarque_de_Pedro_Álvares_Cabral_em_Porto_Seguro_em_1500.jpg b/wikipedia/data/category_images/Oscar_Pereira_da_Silva_-_Desembarque_de_Pedro_Álvares_Cabral_em_Porto_Seguro_em_1500.jpg
deleted file mode 100644
index 73015f2..0000000
--- a/wikipedia/data/category_images/Oscar_Pereira_da_Silva_-_Desembarque_de_Pedro_Álvares_Cabral_em_Porto_Seguro_em_1500.jpg
+++ /dev/null
diff --git a/wikipedia/data/category_images/Tarsila_do_Amaral_04.jpg b/wikipedia/data/category_images/Tarsila_do_Amaral_04.jpg
deleted file mode 100644
index 831830c..0000000
--- a/wikipedia/data/category_images/Tarsila_do_Amaral_04.jpg
+++ /dev/null
diff --git a/wikipedia/data/category_images/bg_brazil_sports.jpg b/wikipedia/data/category_images/bg_brazil_sports.jpg
deleted file mode 100644
index 8325721..0000000
--- a/wikipedia/data/category_images/bg_brazil_sports.jpg
+++ /dev/null
diff --git a/wikipedia/data/category_images/camisa-Uniforme-de-futebol-da-seleção-brasileira2.jpg b/wikipedia/data/category_images/camisa-Uniforme-de-futebol-da-seleção-brasileira2.jpg
deleted file mode 100644
index de0104e..0000000
--- a/wikipedia/data/category_images/camisa-Uniforme-de-futebol-da-seleção-brasileira2.jpg
+++ /dev/null
diff --git a/wikipedia/data/category_images/cuisine.jpg b/wikipedia/data/category_images/cuisine.jpg
deleted file mode 100644
index 860ec32..0000000
--- a/wikipedia/data/category_images/cuisine.jpg
+++ /dev/null
diff --git a/wikipedia/data/category_images/history.jpg b/wikipedia/data/category_images/history.jpg
deleted file mode 100644
index 57bab62..0000000
--- a/wikipedia/data/category_images/history.jpg
+++ /dev/null
diff --git a/wikipedia/data/category_images/musica.jpg b/wikipedia/data/category_images/musica.jpg
deleted file mode 100644
index 077c12d..0000000
--- a/wikipedia/data/category_images/musica.jpg
+++ /dev/null
diff --git a/wikipedia/data/category_images/red_parrot_close_up-Animal_photography_Wallpaper_1440x900.jpg b/wikipedia/data/category_images/red_parrot_close_up-Animal_photography_Wallpaper_1440x900.jpg
deleted file mode 100644
index 5e1f153..0000000
--- a/wikipedia/data/category_images/red_parrot_close_up-Animal_photography_Wallpaper_1440x900.jpg
+++ /dev/null
diff --git a/wikipedia/data/category_images/rio_de_janeiro_by_night_2738x1825.jpg b/wikipedia/data/category_images/rio_de_janeiro_by_night_2738x1825.jpg
deleted file mode 100644
index a37a107..0000000
--- a/wikipedia/data/category_images/rio_de_janeiro_by_night_2738x1825.jpg
+++ /dev/null
diff --git a/wikipedia/data/category_images/thumb_arts.jpg b/wikipedia/data/category_images/thumb_arts.jpg
deleted file mode 100644
index 23000b1..0000000
--- a/wikipedia/data/category_images/thumb_arts.jpg
+++ /dev/null
diff --git a/wikipedia/data/category_images/thumb_cities.jpg b/wikipedia/data/category_images/thumb_cities.jpg
deleted file mode 100644
index b163c1b..0000000
--- a/wikipedia/data/category_images/thumb_cities.jpg
+++ /dev/null
diff --git a/wikipedia/data/category_images/thumb_culinary.jpg b/wikipedia/data/category_images/thumb_culinary.jpg
deleted file mode 100644
index 50efbe9..0000000
--- a/wikipedia/data/category_images/thumb_culinary.jpg
+++ /dev/null
diff --git a/wikipedia/data/category_images/thumb_events.jpg b/wikipedia/data/category_images/thumb_events.jpg
deleted file mode 100644
index f177f82..0000000
--- a/wikipedia/data/category_images/thumb_events.jpg
+++ /dev/null
diff --git a/wikipedia/data/category_images/thumb_history.jpg b/wikipedia/data/category_images/thumb_history.jpg
deleted file mode 100644
index 2ec5bd5..0000000
--- a/wikipedia/data/category_images/thumb_history.jpg
+++ /dev/null
diff --git a/wikipedia/data/category_images/thumb_music.jpg b/wikipedia/data/category_images/thumb_music.jpg
deleted file mode 100644
index 6458fab..0000000
--- a/wikipedia/data/category_images/thumb_music.jpg
+++ /dev/null
diff --git a/wikipedia/data/category_images/thumb_nature.jpg b/wikipedia/data/category_images/thumb_nature.jpg
deleted file mode 100644
index e289f29..0000000
--- a/wikipedia/data/category_images/thumb_nature.jpg
+++ /dev/null
diff --git a/wikipedia/data/category_images/thumb_sports.jpg b/wikipedia/data/category_images/thumb_sports.jpg
deleted file mode 100644
index fdcdd3c..0000000
--- a/wikipedia/data/category_images/thumb_sports.jpg
+++ /dev/null
diff --git a/wikipedia/data/css/endless_brazil.css b/wikipedia/data/css/endless_brazil.css
deleted file mode 100644
index 6c50cd5..0000000
--- a/wikipedia/data/css/endless_brazil.css
+++ /dev/null
@@ -1,69 +0,0 @@
-* {
-    font-family: "BentonSans Regular";
-}
-
-.title.front-page {
-    font-family: "BentonSans Thin";
-    font-size: 100px;
-    color: #ffffff;
-    text-shadow: 0px 1px 0px alpha(#23326e, 0.15);
-}
-
-.title.category.front-page {
-    font-family: "BentonSans ExtraLight";
-    font-size: 40px;
-}
-
-Gjs_ArticleList{
-    background-image: url('resource:///com/endlessm/brazil/assets/submenu_background.jpg');
-}
-
-Gjs_ArticleList .button {
-    padding-left: 25px;
-    padding-right: 25px;
-    padding-top: 15px;
-    padding-bottom: 15px;
-    font-size: 15px;
-    color: #464646;
-    background-image: url('resource:///com/endlessm/brazil/assets/submenu_bg_normal.jpg');
-    background-size: cover;
-}
-
-Gjs_ArticleList .button:hover {
-    background-image: url('resource:///com/endlessm/brazil/assets/submenu_bg_hover.png');
-}
-
-Gjs_ArticleList .button:active {
-    background-image: url('resource:///com/endlessm/brazil/assets/submenu_bg_pressed.png');
-}
-
-.articles-page {
-    color: black;
-    background-color: #babdb6;
-}
-
-#category_info{
-    background-color: rgba(0, 0, 0, 0.5);
-}
-
-#category_description{
-    color:rgba(255, 255, 255, 1.0);
-    background-color: rgba(0, 0, 0, 0);
-    font-size: 12px;
-}
-
-#category_title{
-    /* Top padding is hack because we have bad version of BentonSans */
-    padding-top: 20px;
-    font-family: "BentonSans Light";
-    font-size: 52px;
-    color: rgba(255, 255, 255, 0.9);
-}
-
-Gjs_CategoryButton GtkEventBox:hover {
-    background-color: alpha(#212121, 0.5);
-}
-
-#side_bar_button:hover{
-    background-color: rgba(0, 0, 0, 0.2);
-}
diff --git a/wikipedia/data/endless_brazil.gresource.xml b/wikipedia/data/endless_brazil.gresource.xml
deleted file mode 100644
index 0236a3e..0000000
--- a/wikipedia/data/endless_brazil.gresource.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<gresources>
-  <gresource prefix="/com/endlessm/brazil">
-    <file compressed="true">app_info/pt-br-brazil-app.json</file>
-    <!-- file compressed="true">brazil_categories.json</file -->
-    <file compressed="true">css/endless_brazil.css</file>
-    <file>category_images/thumb_arts.jpg</file>
-    <file>category_images/thumb_cities.jpg</file>
-    <file>category_images/thumb_culinary.jpg</file>
-    <file>category_images/thumb_events.jpg</file>
-    <file>category_images/thumb_history.jpg</file>
-    <file>category_images/thumb_music.jpg</file>
-    <file>category_images/thumb_nature.jpg</file>
-    <file>category_images/thumb_sports.jpg</file>
-    <file>category_images/cuisine.jpg</file>
-    <file>category_images/history.jpg</file>
-    <file>category_images/bg_brazil_sports.jpg</file>
-    <file>category_images/rio_de_janeiro_by_night_2738x1825.jpg</file>
-    <file>category_images/156356538.jpg</file>
-    <file>category_images/Tarsila_do_Amaral_04.jpg</file>
-    <file>category_images/8fev2013---desfile-da-escola-rosas-de-ouro-no-sambodromo-do-anhembi-em-sao-paulo-1360409445571_1920x1080.jpg</file>
-    <file>category_images/camisa-Uniforme-de-futebol-da-seleção-brasileira2.jpg</file>
-    <file>category_images/Oscar_Pereira_da_Silva_-_Desembarque_de_Pedro_Álvares_Cabral_em_Porto_Seguro_em_1500.jpg</file>
-    <file>category_images/red_parrot_close_up-Animal_photography_Wallpaper_1440x900.jpg</file>
-    <file>category_images/musica.jpg</file>
-    <file>assets/introduction_title_separator.png</file>
-    <file>assets/submenu_bg_hover.png</file>
-    <file>assets/submenu_bg_pressed.png</file>
-    <file>assets/submenu_bg_normal.jpg</file>
-    <file>assets/submenu_separator_shadow_a.png</file>
-    <file>assets/submenu_separator_shadow_b.png</file>
-    <file>assets/submenu_hover_arrow.png</file>
-    <file>assets/submenu_background.jpg</file>
-    <file>assets/category_splash_separator_shadow.png</file>
-    <file>assets/category_hover_arrow.png</file>
-    <file>assets/image_strip_back_button.png</file>
-  </gresource>
-</gresources>
diff --git a/wikipedia/generate_resource_file.py b/wikipedia/generate_resource_file.py
deleted file mode 100644
index a0ca003..0000000
--- a/wikipedia/generate_resource_file.py
+++ /dev/null
@@ -1,21 +0,0 @@
-import json
-import xml.etree.ElementTree as ET
-
-path = "../data/app_info"
-filename = os.listdir(path)[0]
-handle = open(filename, 'r')
-app_info = json.loads(handle.read())
-categories = app_info['categories']
-app_image_name = "app_image/" + app_info['app_image']
-
-tree = ET.parse('..data/endless_brazil.gresource.xml')
-root = tree.getroot()
-filenode = root.find('gresource')
-
-for category in categories:
-	image_file = category['image_file']
-	new_file_name = "category_images/" + image_file
-	elem = ET.Element('file')
-	elem.text = new_file_name
-	filenode.append(elem)
-ET.dump(root)
\ No newline at end of file
diff --git a/wikipedia/m4/as-linguas.m4 b/wikipedia/m4/as-linguas.m4
deleted file mode 100644
index 8b4e07f..0000000
--- a/wikipedia/m4/as-linguas.m4
+++ /dev/null
@@ -1,26 +0,0 @@
-# Set ALL_LINGUAS based on the .po files present. Optional argument is the
-# name of the po directory. $podir/LINGUAS.ignore can be used to ignore a
-# subset of the po files.
-
-# Public domain, according to Emmanuele
-
-AC_DEFUN([AS_ALL_LINGUAS],
-[
- AC_MSG_CHECKING([for linguas])
- podir="m4_default([$1],[$srcdir/po])"
- linguas=`cd $podir && ls *.po 2>/dev/null | awk 'BEGIN { FS="."; ORS=" " } { print $[]1 }'`
- if test -f "$podir/LINGUAS.ignore"; then
-   ALL_LINGUAS="";
-   ignore_linguas=`sed -n -e 's/^\s\+\|\s\+$//g' -e '/^#/b' -e '/\S/!b' \
-                       -e 's/\s\+/\n/g' -e p "$podir/LINGUAS.ignore"`;
-   for lang in $linguas; do
-     if ! echo "$ignore_linguas" | grep -q "^${lang}$"; then
-       ALL_LINGUAS="$ALL_LINGUAS $lang";
-     fi;
-   done;
- else
-   ALL_LINGUAS="$linguas";
- fi;
- AC_SUBST([ALL_LINGUAS])
- AC_MSG_RESULT($ALL_LINGUAS)
-])
diff --git a/wikipedia/src/models/article_model.js b/wikipedia/models/article_model.js
index ac6ea49..ac6ea49 100644
--- a/wikipedia/src/models/article_model.js
+++ b/wikipedia/models/article_model.js
diff --git a/wikipedia/src/models/category_model.js b/wikipedia/models/category_model.js
index ea9bfb6..ea9bfb6 100644
--- a/wikipedia/src/models/category_model.js
+++ b/wikipedia/models/category_model.js
diff --git a/wikipedia/src/models/domain_wiki_model.js b/wikipedia/models/domain_wiki_model.js
index c838361..c838361 100644
--- a/wikipedia/src/models/domain_wiki_model.js
+++ b/wikipedia/models/domain_wiki_model.js
diff --git a/wikipedia/src/models/utils/json_utils.js b/wikipedia/models/utils/json_utils.js
index b66b388..b66b388 100644
--- a/wikipedia/src/models/utils/json_utils.js
+++ b/wikipedia/models/utils/json_utils.js
diff --git a/wikipedia/src/models/utils/locale_utils.js b/wikipedia/models/utils/locale_utils.js
index 71d177a..71d177a 100644
--- a/wikipedia/src/models/utils/locale_utils.js
+++ b/wikipedia/models/utils/locale_utils.js
diff --git a/wikipedia/po/Makevars b/wikipedia/po/Makevars
deleted file mode 100644
index 095c32a..0000000
--- a/wikipedia/po/Makevars
+++ /dev/null
@@ -1,41 +0,0 @@
-# Makefile variables for PO directory in any package using GNU gettext.
-
-# Usually the message domain is the same as the package name.
-DOMAIN = $(PACKAGE)
-
-# These two variables depend on the location of this directory.
-subdir = po
-top_builddir = ..
-
-# These options get passed to xgettext.
-XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
-
-# This is the copyright holder that gets inserted into the header of the
-# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
-# package.  (Note that the msgstr strings, extracted from the package's
-# sources, belong to the copyright holder of the package.)  Translators are
-# expected to transfer the copyright for their translations to this person
-# or entity, or to disclaim their copyright.  The empty string stands for
-# the public domain; in this case the translators are expected to disclaim
-# their copyright.
-COPYRIGHT_HOLDER = Endless Mobile, Inc.
-
-# This is the email address or URL to which the translators shall report
-# bugs in the untranslated strings:
-# - Strings which are not entire sentences, see the maintainer guidelines
-#   in the GNU gettext documentation, section 'Preparing Strings'.
-# - Strings which use unclear terms or require additional context to be
-#   understood.
-# - Strings which make invalid assumptions about notation of date, time or
-#   money.
-# - Pluralisation problems.
-# - Incorrect English spelling.
-# - Incorrect formatting.
-# It can be your email address, or a mailing list address where translators
-# can write to without being subscribed, or the URL of a web page through
-# which the translators can contact you.
-MSGID_BUGS_ADDRESS = philip@endlessm.com
-
-# This is the list of locale categories, beyond LC_MESSAGES, for which the
-# message catalogs shall be used.  It is usually empty.
-EXTRA_LOCALE_CATEGORIES =
diff --git a/wikipedia/po/POTFILES.in b/wikipedia/po/POTFILES.in
deleted file mode 100644
index fc8cc34..0000000
--- a/wikipedia/po/POTFILES.in
+++ /dev/null
@@ -1 +0,0 @@
-src/endless_wikipedia/PrebuiltWikipediaApplication.js
\ No newline at end of file
diff --git a/wikipedia/po/eos-brazil.pot b/wikipedia/po/eos-brazil.pot
deleted file mode 100644
index e69de29..0000000
--- a/wikipedia/po/eos-brazil.pot
+++ /dev/null
diff --git a/wikipedia/src/presenters/domain_wiki_presenter.js b/wikipedia/presenters/domain_wiki_presenter.js
index 443fa7f..bdc8d0f 100644
--- a/wikipedia/src/presenters/domain_wiki_presenter.js
+++ b/wikipedia/presenters/domain_wiki_presenter.js
@@ -47,11 +47,7 @@ const DomainWikiPresenter = new Lang.Class({
     initFromJsonFile: function(filename) {
         let app_content = JSON.parse(Utils.load_file_from_resource(filename));
         this._application_name = app_content['app_name'];
-        this._image_uri = app_content['image_uri'];
-        // HACK until we get app image 
-        if(this._image_uri === undefined || this._image_uri === ""){
-            this._image_uri = "resource:///com/endlessm/brazil/category_images/bg_brazil_sports.jpg"            
-        }
+        this._image_uri = app_content['app_image_uri'];
         this._lang_code = filename.substring(0, 2);
         let categories = app_content['categories'];
         let cat_length = categories.length
diff --git a/wikipedia/src/scaled_image.js b/wikipedia/scaled_image.js
index 7d25b7f..9808914 100644
--- a/wikipedia/src/scaled_image.js
+++ b/wikipedia/scaled_image.js
@@ -58,7 +58,7 @@ const ScaledImage = new Lang.Class({
 
     vfunc_get_preferred_height_for_width: function(width) {
         if(!this._pixbuf)
-            return this.parent(height);
+            return this.parent(width);
         let source_width = this._pixbuf.width;
         let source_height = this._pixbuf.height;
         let height = (width / source_width) * source_height;
diff --git a/wikipedia/src/endless_brazil.js b/wikipedia/src/endless_brazil.js
deleted file mode 100644
index 76f2c58..0000000
--- a/wikipedia/src/endless_brazil.js
+++ /dev/null
@@ -1,17 +0,0 @@
-const Endless = imports.gi.Endless;
-const Gdk = imports.gi.Gdk;
-const Gio = imports.gi.Gio;
-const Gtk = imports.gi.Gtk;
-
-// Local imports
-imports.searchPath.unshift(Endless.getCurrentFileDir());
-const EndlessWikipedia = imports.endless_wikipedia.EndlessWikipedia;
-
-// Load GResource bundle
-let resource = Gio.Resource.load(Endless.getCurrentFileDir() + '/../data/endless_brazil.gresource');
-resource._register();
-
-let app = new EndlessWikipedia.PrebuiltWikipediaApplication({
-	application_uri: 'resource:///com/endlessm/brazil/app_info/pt-br-brazil-app.json'
-});
-app.run(ARGV);
diff --git a/wikipedia/src/endless_wikipedia/EndlessWikipedia.js b/wikipedia/src/endless_wikipedia/EndlessWikipedia.js
deleted file mode 100644
index 640247f..0000000
--- a/wikipedia/src/endless_wikipedia/EndlessWikipedia.js
+++ /dev/null
@@ -1,37 +0,0 @@
-const _WikipediaApplication = imports.endless_wikipedia.WikipediaApplication;
-this.WikipediaApplication = _WikipediaApplication.WikipediaApplication;
-
-const _PrebuiltWikipediaApplication = imports.endless_wikipedia.PrebuiltWikipediaApplication;
-this.PrebuiltWikipediaApplication = _PrebuiltWikipediaApplication.PrebuiltWikipediaApplication;
-
-const _PrebuiltFrontPage = imports.endless_wikipedia.PrebuiltFrontPage;
-this.PrebuiltFrontPage = _PrebuiltFrontPage.PrebuiltFrontPage;
-
-const _PrebuiltCategoryPage = imports.endless_wikipedia.PrebuiltCategoryPage;
-this.PrebuiltCategoryPage = _PrebuiltCategoryPage.PrebuiltCategoryPage;
-
-const _PrebuiltArticlesPage = imports.endless_wikipedia.PrebuiltArticlesPage;
-this.PrebuiltArticlesPage = _PrebuiltArticlesPage.PrebuiltArticlesPage;
-
-const _ArticleList = imports.endless_wikipedia.ArticleList;
-this.ArticleList = _ArticleList.ArticleList;
-
-const _BackButton = imports.endless_wikipedia.BackButton;
-this.BackButton = _BackButton.BackButton;
-
-const _BoxWithBg = imports.endless_wikipedia.BoxWithBg;
-this.BoxWithBg = _BoxWithBg.BoxWithBg;
-
-const _TextButton = imports.endless_wikipedia.TextButton;
-this.TextButton = _TextButton.TextButton; 
-
-const _SideBarButton = imports.endless_wikipedia.SideBarButton;
-this.SideBarButton = _SideBarButton.SideBarButton;  
-
-const STYLE_CLASS_TITLE = 'title';
-const STYLE_CLASS_PREBUILT = 'prebuilt';
-const STYLE_CLASS_CATEGORY = 'category';
-const STYLE_CLASS_ARTICLE = 'article';
-const STYLE_CLASS_FRONT_PAGE = 'front-page';
-const STYLE_CLASS_CATEGORY_PAGE = 'category-page';
-const STYLE_CLASS_ARTICLES_PAGE = 'articles-page';
diff --git a/wikipedia/src/utils.js b/wikipedia/utils.js
index bdc2b3c..0edb6d4 100644
--- a/wikipedia/src/utils.js
+++ b/wikipedia/utils.js
@@ -1,6 +1,4 @@
 const Gio = imports.gi.Gio;
-const Clutter = imports.gi.Clutter;
-const Cogl = imports.gi.Cogl;
 const GdkPixbuf = imports.gi.GdkPixbuf;
 
 const set_default = function(obj, key, val) {
diff --git a/wikipedia/src/views/category_button.js b/wikipedia/views/category_button.js
index 782dd17..3d48983 100644
--- a/wikipedia/src/views/category_button.js
+++ b/wikipedia/views/category_button.js
@@ -9,6 +9,7 @@ const CATEGORY_LABEL_LEFT_MARGIN = 25;  // pixels
 const CATEGORY_LABEL_BOTTOM_MARGIN = 20;  // pixels
 const CATEGORY_BUTTON_RIGHT_MARGIN = 20;  // pixels
 const CATEGORY_BUTTON_BOTTOM_MARGIN = 20;  // pixels
+const _HOVER_ARROW_URI = '/com/endlessm/wikipedia-domain/assets/category_hover_arrow.png';
 
 GObject.ParamFlags.READWRITE = GObject.ParamFlags.READABLE | GObject.ParamFlags.WRITABLE;
 
@@ -55,7 +56,7 @@ const CategoryButton = new Lang.Class({
             halign: Gtk.Align.START
         });
         this._arrow = new Gtk.Image({
-            resource: '/com/endlessm/brazil/assets/category_hover_arrow.png',
+            resource: _HOVER_ARROW_URI,
             margin_right: CATEGORY_BUTTON_RIGHT_MARGIN,
             margin_bottom: CATEGORY_BUTTON_BOTTOM_MARGIN,
             halign: Gtk.Align.END,
diff --git a/wikipedia/src/views/category_layout_manager.js b/wikipedia/views/category_layout_manager.js
index a7be3bb..a7be3bb 100644
--- a/wikipedia/src/views/category_layout_manager.js
+++ b/wikipedia/views/category_layout_manager.js
diff --git a/wikipedia/src/views/category_selector_view.js b/wikipedia/views/category_selector_view.js
index 5432a3e..5432a3e 100644
--- a/wikipedia/src/views/category_selector_view.js
+++ b/wikipedia/views/category_selector_view.js
diff --git a/wikipedia/src/views/css/first_load.css b/wikipedia/views/css/first_load.css
index f4d0709..f4d0709 100755..100644
--- a/wikipedia/src/views/css/first_load.css
+++ b/wikipedia/views/css/first_load.css
diff --git a/wikipedia/src/views/css/main.css b/wikipedia/views/css/main.css
index 224b604..224b604 100644
--- a/wikipedia/src/views/css/main.css
+++ b/wikipedia/views/css/main.css
diff --git a/wikipedia/src/views/css/nolinks.css b/wikipedia/views/css/nolinks.css
index 020bb7e..020bb7e 100644
--- a/wikipedia/src/views/css/nolinks.css
+++ b/wikipedia/views/css/nolinks.css
diff --git a/wikipedia/src/views/css/second_load.css b/wikipedia/views/css/second_load.css
index 2447821..2447821 100755..100644
--- a/wikipedia/src/views/css/second_load.css
+++ b/wikipedia/views/css/second_load.css
diff --git a/wikipedia/src/views/css/wikipedia.css b/wikipedia/views/css/wikipedia.css
index e31a672..e31a672 100755..100644
--- a/wikipedia/src/views/css/wikipedia.css
+++ b/wikipedia/views/css/wikipedia.css
diff --git a/wikipedia/src/views/domain_wiki_view.js b/wikipedia/views/domain_wiki_view.js
index ddf1f24..84af542 100644
--- a/wikipedia/src/views/domain_wiki_view.js
+++ b/wikipedia/views/domain_wiki_view.js
@@ -1,13 +1,19 @@
+const EndlessWikipedia = imports.wikipedia.EndlessWikipedia;
 const Gettext = imports.gettext;
 const Lang = imports.lang;
 const GObject = imports.gi.GObject;
 const Gtk = imports.gi.Gtk;
 const Endless = imports.gi.Endless;
 
-const SIDEBAR_BACK_BUTTON_URI = "/com/endlessm/brazil/assets/image_strip_back_button.png";
+const BackButton = imports.BackButton;
+const SideBarButton = imports.SideBarButton;
 
 const _ = Gettext.gettext;
 
+const SIDEBAR_BACK_BUTTON_URI = "/com/endlessm/wikipedia-domain/assets/image_strip_back_button.png";
+const SUBMENU_SEPARATOR_A_URI = "/com/endlessm/wikipedia-domain/assets/submenu_separator_shadow_a.png";
+const SUBMENU_SEPARATOR_B_URI = "/com/endlessm/wikipedia-domain/assets/submenu_separator_shadow_b.png";
+
 const DomainWikiView = new Lang.Class({
     Name: "DomainWikiView",
     Extends: GObject.Object,
@@ -69,7 +75,7 @@ const DomainWikiView = new Lang.Class({
         });
         this._sidebar_frame.set_size_request(40, -1);
 
-        this._article_sidebar_back_button = new EndlessWikipedia.SideBarButton(SIDEBAR_BACK_BUTTON_URI,{
+        this._article_sidebar_back_button = new SideBarButton.SideBarButton(SIDEBAR_BACK_BUTTON_URI, {
             name: "side_bar_button",
             vexpand: true
         });
@@ -81,12 +87,12 @@ const DomainWikiView = new Lang.Class({
 
         this._submenu_separator_a = new Gtk.Image({
             halign: Gtk.Align.END,
-            resource: "/com/endlessm/brazil/assets/submenu_separator_shadow_a.png"
+            resource: SUBMENU_SEPARATOR_A_URI
         });
 
         this._submenu_separator_b = new Gtk.Image({
             halign: Gtk.Align.START,
-            resource: "/com/endlessm/brazil/assets/submenu_separator_shadow_b.png"
+            resource: SUBMENU_SEPARATOR_B_URI
         });
 
         this._overlay_left = new Gtk.Overlay();
@@ -104,7 +110,7 @@ const DomainWikiView = new Lang.Class({
 
         this._article_page.add(this._overlay_right);
 
-        this._article_back_button = new EndlessWikipedia.BackButton();
+        this._article_back_button = new BackButton.BackButton();
         this._article_back_button.show();
 
         this._article_list.connect('article-chosen',
@@ -132,7 +138,7 @@ const DomainWikiView = new Lang.Class({
         this._category_page.add(this._category_view);
         this._category_page.add(this._category_article_list);
 
-        this._category_back_button = new EndlessWikipedia.BackButton({
+        this._category_back_button = new BackButton.BackButton({
             label: _('START')
         });
         this._category_back_button.show();
diff --git a/wikipedia/src/views/fonts/BentonSans-Bold.eot b/wikipedia/views/fonts/BentonSans-Bold.eot
index e3ad795..e3ad795 100644
--- a/wikipedia/src/views/fonts/BentonSans-Bold.eot
+++ b/wikipedia/views/fonts/BentonSans-Bold.eot
diff --git a/wikipedia/src/views/fonts/BentonSans-Bold.svg b/wikipedia/views/fonts/BentonSans-Bold.svg
index 8563a34..8563a34 100644
--- a/wikipedia/src/views/fonts/BentonSans-Bold.svg
+++ b/wikipedia/views/fonts/BentonSans-Bold.svg
diff --git a/wikipedia/src/views/fonts/BentonSans-Bold.ttf b/wikipedia/views/fonts/BentonSans-Bold.ttf
index eff5152..eff5152 100644
--- a/wikipedia/src/views/fonts/BentonSans-Bold.ttf
+++ b/wikipedia/views/fonts/BentonSans-Bold.ttf
diff --git a/wikipedia/src/views/fonts/BentonSans-Bold.woff b/wikipedia/views/fonts/BentonSans-Bold.woff
index 78bd308..78bd308 100644
--- a/wikipedia/src/views/fonts/BentonSans-Bold.woff
+++ b/wikipedia/views/fonts/BentonSans-Bold.woff
diff --git a/wikipedia/src/views/fonts/BentonSans-Book.eot b/wikipedia/views/fonts/BentonSans-Book.eot
index 1e6991b..1e6991b 100644
--- a/wikipedia/src/views/fonts/BentonSans-Book.eot
+++ b/wikipedia/views/fonts/BentonSans-Book.eot
diff --git a/wikipedia/src/views/fonts/BentonSans-Book.svg b/wikipedia/views/fonts/BentonSans-Book.svg
index 5ddfc6f..5ddfc6f 100644
--- a/wikipedia/src/views/fonts/BentonSans-Book.svg
+++ b/wikipedia/views/fonts/BentonSans-Book.svg
diff --git a/wikipedia/src/views/fonts/BentonSans-Book.ttf b/wikipedia/views/fonts/BentonSans-Book.ttf
index 0019e94..0019e94 100644
--- a/wikipedia/src/views/fonts/BentonSans-Book.ttf
+++ b/wikipedia/views/fonts/BentonSans-Book.ttf
diff --git a/wikipedia/src/views/fonts/BentonSans-Book.woff b/wikipedia/views/fonts/BentonSans-Book.woff
index 4e6a60a..4e6a60a 100644
--- a/wikipedia/src/views/fonts/BentonSans-Book.woff
+++ b/wikipedia/views/fonts/BentonSans-Book.woff
diff --git a/wikipedia/src/views/fonts/BentonSans-Medium.eot b/wikipedia/views/fonts/BentonSans-Medium.eot
index 405602e..405602e 100644
--- a/wikipedia/src/views/fonts/BentonSans-Medium.eot
+++ b/wikipedia/views/fonts/BentonSans-Medium.eot
diff --git a/wikipedia/src/views/fonts/BentonSans-Medium.svg b/wikipedia/views/fonts/BentonSans-Medium.svg
index 49d623d..49d623d 100644
--- a/wikipedia/src/views/fonts/BentonSans-Medium.svg
+++ b/wikipedia/views/fonts/BentonSans-Medium.svg
diff --git a/wikipedia/src/views/fonts/BentonSans-Medium.ttf b/wikipedia/views/fonts/BentonSans-Medium.ttf
index 960b50f..960b50f 100644
--- a/wikipedia/src/views/fonts/BentonSans-Medium.ttf
+++ b/wikipedia/views/fonts/BentonSans-Medium.ttf
diff --git a/wikipedia/src/views/fonts/BentonSans-Medium.woff b/wikipedia/views/fonts/BentonSans-Medium.woff
index 03e429e..03e429e 100644
--- a/wikipedia/src/views/fonts/BentonSans-Medium.woff
+++ b/wikipedia/views/fonts/BentonSans-Medium.woff
diff --git a/wikipedia/src/views/fonts/BentonSans-Regular.eot b/wikipedia/views/fonts/BentonSans-Regular.eot
index c696808..c696808 100644
--- a/wikipedia/src/views/fonts/BentonSans-Regular.eot
+++ b/wikipedia/views/fonts/BentonSans-Regular.eot
diff --git a/wikipedia/src/views/fonts/BentonSans-Regular.svg b/wikipedia/views/fonts/BentonSans-Regular.svg
index 5b58067..5b58067 100644
--- a/wikipedia/src/views/fonts/BentonSans-Regular.svg
+++ b/wikipedia/views/fonts/BentonSans-Regular.svg
diff --git a/wikipedia/src/views/fonts/BentonSans-Regular.ttf b/wikipedia/views/fonts/BentonSans-Regular.ttf
index 205958c..205958c 100644
--- a/wikipedia/src/views/fonts/BentonSans-Regular.ttf
+++ b/wikipedia/views/fonts/BentonSans-Regular.ttf
diff --git a/wikipedia/src/views/fonts/BentonSans-Regular.woff b/wikipedia/views/fonts/BentonSans-Regular.woff
index 9df8a7a..9df8a7a 100644
--- a/wikipedia/src/views/fonts/BentonSans-Regular.woff
+++ b/wikipedia/views/fonts/BentonSans-Regular.woff
diff --git a/wikipedia/src/views/fonts/BentonSans-Thin.eot b/wikipedia/views/fonts/BentonSans-Thin.eot
index ca46250..ca46250 100644
--- a/wikipedia/src/views/fonts/BentonSans-Thin.eot
+++ b/wikipedia/views/fonts/BentonSans-Thin.eot
diff --git a/wikipedia/src/views/fonts/BentonSans-Thin.svg b/wikipedia/views/fonts/BentonSans-Thin.svg
index 3b1a12e..3b1a12e 100644
--- a/wikipedia/src/views/fonts/BentonSans-Thin.svg
+++ b/wikipedia/views/fonts/BentonSans-Thin.svg
diff --git a/wikipedia/src/views/fonts/BentonSans-Thin.ttf b/wikipedia/views/fonts/BentonSans-Thin.ttf
index 5c24ff4..5c24ff4 100644
--- a/wikipedia/src/views/fonts/BentonSans-Thin.ttf
+++ b/wikipedia/views/fonts/BentonSans-Thin.ttf
diff --git a/wikipedia/src/views/fonts/BentonSans-Thin.woff b/wikipedia/views/fonts/BentonSans-Thin.woff
index 44a8dce..44a8dce 100644
--- a/wikipedia/src/views/fonts/BentonSans-Thin.woff
+++ b/wikipedia/views/fonts/BentonSans-Thin.woff
diff --git a/wikipedia/src/views/fonts/LinLibertine_R.eot b/wikipedia/views/fonts/LinLibertine_R.eot
index dfeba24..dfeba24 100644
--- a/wikipedia/src/views/fonts/LinLibertine_R.eot
+++ b/wikipedia/views/fonts/LinLibertine_R.eot
diff --git a/wikipedia/src/views/fonts/LinLibertine_R.svg b/wikipedia/views/fonts/LinLibertine_R.svg
index 6d345d5..6d345d5 100644
--- a/wikipedia/src/views/fonts/LinLibertine_R.svg
+++ b/wikipedia/views/fonts/LinLibertine_R.svg
diff --git a/wikipedia/src/views/fonts/LinLibertine_R.ttf b/wikipedia/views/fonts/LinLibertine_R.ttf
index e0ace23..e0ace23 100644
--- a/wikipedia/src/views/fonts/LinLibertine_R.ttf
+++ b/wikipedia/views/fonts/LinLibertine_R.ttf
diff --git a/wikipedia/src/views/fonts/LinLibertine_R.woff b/wikipedia/views/fonts/LinLibertine_R.woff
index 456b8b0..456b8b0 100644
--- a/wikipedia/src/views/fonts/LinLibertine_R.woff
+++ b/wikipedia/views/fonts/LinLibertine_R.woff
diff --git a/wikipedia/src/views/fonts/MinionPro-Regular.eot b/wikipedia/views/fonts/MinionPro-Regular.eot
index af588d4..af588d4 100644
--- a/wikipedia/src/views/fonts/MinionPro-Regular.eot
+++ b/wikipedia/views/fonts/MinionPro-Regular.eot
diff --git a/wikipedia/src/views/fonts/MinionPro-Regular.svg b/wikipedia/views/fonts/MinionPro-Regular.svg
index ab7a913..ab7a913 100644
--- a/wikipedia/src/views/fonts/MinionPro-Regular.svg
+++ b/wikipedia/views/fonts/MinionPro-Regular.svg
diff --git a/wikipedia/src/views/fonts/MinionPro-Regular.ttf b/wikipedia/views/fonts/MinionPro-Regular.ttf
index 242b3bf..242b3bf 100644
--- a/wikipedia/src/views/fonts/MinionPro-Regular.ttf
+++ b/wikipedia/views/fonts/MinionPro-Regular.ttf
diff --git a/wikipedia/src/views/fonts/MinionPro-Regular.woff b/wikipedia/views/fonts/MinionPro-Regular.woff
index 245fa5b..245fa5b 100644
--- a/wikipedia/src/views/fonts/MinionPro-Regular.woff
+++ b/wikipedia/views/fonts/MinionPro-Regular.woff
diff --git a/wikipedia/src/views/images/bg-main-content.png b/wikipedia/views/images/bg-main-content.png
index 69702c3..69702c3 100644
--- a/wikipedia/src/views/images/bg-main-content.png
+++ b/wikipedia/views/images/bg-main-content.png
diff --git a/wikipedia/src/views/images/hr-separate.png b/wikipedia/views/images/hr-separate.png
index c93cf38..c93cf38 100644
--- a/wikipedia/src/views/images/hr-separate.png
+++ b/wikipedia/views/images/hr-separate.png
diff --git a/wikipedia/src/views/images/index_list_arrow-down.svg b/wikipedia/views/images/index_list_arrow-down.svg
index 7903b58..7903b58 100644
--- a/wikipedia/src/views/images/index_list_arrow-down.svg
+++ b/wikipedia/views/images/index_list_arrow-down.svg
diff --git a/wikipedia/src/views/images/title-line.jpg b/wikipedia/views/images/title-line.jpg
index de72545..de72545 100644
--- a/wikipedia/src/views/images/title-line.jpg
+++ b/wikipedia/views/images/title-line.jpg
diff --git a/wikipedia/src/views/index.html b/wikipedia/views/index.html
index b0aefd0..b0aefd0 100644
--- a/wikipedia/src/views/index.html
+++ b/wikipedia/views/index.html
diff --git a/wikipedia/src/views/js/jquery-min.js b/wikipedia/views/js/jquery-min.js
index 006e953..006e953 100644
--- a/wikipedia/src/views/js/jquery-min.js
+++ b/wikipedia/views/js/jquery-min.js
diff --git a/wikipedia/src/views/js/main.js b/wikipedia/views/js/main.js
index e91472a..bd76576 100644
--- a/wikipedia/src/views/js/main.js
+++ b/wikipedia/views/js/main.js
@@ -36,6 +36,9 @@ Endless.Wikipedia = Endless.Wikipedia || {};
                                 filename = theSplit[theSplit.length - 1];
                             }
                             var newSrc = "article_images/" + encodeURI(filename)
+                            if(newSrc.substring(newSrc.length - 4) == ".svg"){
+                                newSrc += ".png";
+                            }
                             $(this).attr('src', newSrc);
                         }
                         
diff --git a/wikipedia/src/views/title_label_view.js b/wikipedia/views/title_label_view.js
index e91e671..e91e671 100644
--- a/wikipedia/src/views/title_label_view.js
+++ b/wikipedia/views/title_label_view.js
diff --git a/wikipedia/src/views/wikipedia_view.js b/wikipedia/views/wikipedia_view.js
index 09ef6fe..09ef6fe 100644
--- a/wikipedia/src/views/wikipedia_view.js
+++ b/wikipedia/views/wikipedia_view.js