diff --git a/BUILD b/BUILD
index 5b7ea77..4011342 100644
--- a/BUILD
+++ b/BUILD
@@ -1,32 +1,38 @@
 load("//tools/build/bazel:generate_workspace.bzl", "ONOS_VERSION")
-load(":modules.bzl", "CORE", "APPS")
+load(":modules.bzl", "APPS", "CORE")
 
 filegroup(
     name = "onos",
     srcs = CORE + APPS + [
-       ":onos-package-admin",
-       ":onos-package-test",
-       ":onos-package",
-     ],
+        ":onos-package-admin",
+        ":onos-package-test",
+        ":onos-package",
+    ],
     visibility = ["//visibility:public"],
 )
 
 KARAF = "@apache_karaf//file"
+
 PATCHES = "@apache_karaf_patches//file"
+
 BRANDING = "//tools/package/branding:onos-tools-package-branding"
 
 # Generates auxiliary karaf.zip file; branded and augmented with ONOS runtime tools
 genrule(
     name = "onos-karaf",
-    srcs = [KARAF, PATCHES, BRANDING] + glob([
+    srcs = [
+        KARAF,
+        PATCHES,
+        BRANDING,
+    ] + glob([
         "tools/package/bin/*",
         "tools/package/etc/*",
         "tools/package/init/*",
-        "tools/package/runtime/bin/*"
-      ]),
+        "tools/package/runtime/bin/*",
+    ]),
     outs = ["karaf.zip"],
-    cmd = "$(location tools/package/onos-prep-karaf) $(location karaf.zip) $(location %s) %s $(location %s) $(location %s) tools/package" \
-              % (KARAF, ONOS_VERSION, BRANDING, PATCHES),
+    cmd = "$(location tools/package/onos-prep-karaf) $(location karaf.zip) $(location %s) %s $(location %s) $(location %s) tools/package" %
+          (KARAF, ONOS_VERSION, BRANDING, PATCHES),
     tools = ["tools/package/onos-prep-karaf"],
 )
 
@@ -34,11 +40,14 @@
 # FIXME: Need to include OAR files as dependencies and feature bundles as well
 genrule(
     name = "onos-package",
-    srcs = ["//tools/package/features:onos-features", ":onos-karaf"],
+    srcs = [
+        "//tools/package/features:onos-features",
+        ":onos-karaf",
+    ],
     outs = ["onos.tar.gz"],
     cmd = "$(location tools/package/onos_stage.py) $(location onos.tar.gz) %s $(location :onos-karaf) $(SRCS)" % ONOS_VERSION,
-    tools = ["tools/package/onos_stage.py"],
     output_to_bindir = True,
+    tools = ["tools/package/onos_stage.py"],
 )
 
 # Generates the onos-admin.tar.gz file with remote admin tools
@@ -47,11 +56,11 @@
     srcs = glob([
         "tools/package/runtime/bin/*",
         "tools/dev/bin/onos-create-app",
-        "tools/test/bin/onos"
-      ]),
+        "tools/test/bin/onos",
+    ]),
     outs = ["onos-admin.tar.gz"],
-    cmd = "mkdir onos-admin-%s; cp $(SRCS) onos-admin-%s; tar zcf $(location onos-admin.tar.gz) onos-admin-%s"\
-          % (ONOS_VERSION, ONOS_VERSION, ONOS_VERSION),
+    cmd = "mkdir onos-admin-%s; cp $(SRCS) onos-admin-%s; tar zcf $(location onos-admin.tar.gz) onos-admin-%s" %
+          (ONOS_VERSION, ONOS_VERSION, ONOS_VERSION),
     output_to_bindir = True,
 )
 
@@ -63,11 +72,11 @@
         "tools/dev/bash_profile",
         "tools/dev/bin/onos-create-app",
         "tools/test/**/*",
-        "tools/package/runtime/bin/*"
-      ]),
+        "tools/package/runtime/bin/*",
+    ]),
     outs = ["onos-test.tar.gz"],
-    cmd = "mkdir onos-test-%s; cp -r tools onos-test-%s; tar zcf $(location onos-test.tar.gz) onos-test-%s"\
-          % (ONOS_VERSION, ONOS_VERSION, ONOS_VERSION),
+    cmd = "mkdir onos-test-%s; cp -r tools onos-test-%s; tar zcf $(location onos-test.tar.gz) onos-test-%s" %
+          (ONOS_VERSION, ONOS_VERSION, ONOS_VERSION),
     output_to_bindir = True,
 )
 
diff --git a/apps/mcast/BUILD b/apps/mcast/BUILD
index 42bb7b9..58c22da 100644
--- a/apps/mcast/BUILD
+++ b/apps/mcast/BUILD
@@ -6,10 +6,10 @@
 ]
 
 onos_app(
-    title = 'Multicast traffic control',
-    origin = 'ONF',
-    description = 'Provides handling of multicast traffic.',
-    category = 'Traffic Engineering',
-    url = 'https://wiki.onosproject.org/',
+    category = "Traffic Engineering",
+    description = "Provides handling of multicast traffic.",
     included_bundles = BUNDLES,
+    origin = "ONF",
+    title = "Multicast traffic control",
+    url = "https://wiki.onosproject.org/",
 )
diff --git a/apps/mcast/api/BUILD b/apps/mcast/api/BUILD
index 646cfb8..e3ebbd2 100644
--- a/apps/mcast/api/BUILD
+++ b/apps/mcast/api/BUILD
@@ -1,4 +1,4 @@
 osgi_jar(
-    deps = CORE_DEPS,
     visibility = ["//visibility:public"],
+    deps = CORE_DEPS,
 )
diff --git a/apps/mcast/cli/BUILD b/apps/mcast/cli/BUILD
index 53d4c2c..b0e12b5 100644
--- a/apps/mcast/cli/BUILD
+++ b/apps/mcast/cli/BUILD
@@ -1,13 +1,13 @@
 COMPILE_DEPS = CORE_DEPS + [
-    '@org_apache_karaf_shell_console//jar',
-    '@javax_ws_rs_api//jar',
-    '//cli:onos-cli',
-    '//utils/rest:onlab-rest',
-    '//core/store/serializers:onos-core-serializers',
-    '//apps/mcast/api:onos-apps-mcast-api',
+    "@org_apache_karaf_shell_console//jar",
+    "@javax_ws_rs_api//jar",
+    "//cli:onos-cli",
+    "//utils/rest:onlab-rest",
+    "//core/store/serializers:onos-core-serializers",
+    "//apps/mcast/api:onos-apps-mcast-api",
 ]
 
 osgi_jar(
+    import_packages = "*,org.onosproject.cli.net",
     deps = COMPILE_DEPS,
-    import_packages = '*,org.onosproject.cli.net',
 )
diff --git a/apps/mcast/impl/BUILD b/apps/mcast/impl/BUILD
index 539cac3..5735fc1 100644
--- a/apps/mcast/impl/BUILD
+++ b/apps/mcast/impl/BUILD
@@ -1,6 +1,6 @@
 COMPILE_DEPS = CORE_DEPS + KRYO + [
-    '//core/store/serializers:onos-core-serializers',
-    '//apps/mcast/api:onos-apps-mcast-api'
+    "//core/store/serializers:onos-core-serializers",
+    "//apps/mcast/api:onos-apps-mcast-api",
 ]
 
 osgi_jar(
diff --git a/apps/mcast/web/BUILD b/apps/mcast/web/BUILD
index 7835ea3..4d2a045 100644
--- a/apps/mcast/web/BUILD
+++ b/apps/mcast/web/BUILD
@@ -1,14 +1,14 @@
 COMPILE_DEPS = CORE_DEPS + JACKSON + [
-    '@javax_ws_rs_api//jar',
-    '//utils/rest:onlab-rest',
-    '//apps/mcast/api:onos-apps-mcast-api'
+    "@javax_ws_rs_api//jar",
+    "//utils/rest:onlab-rest",
+    "//apps/mcast/api:onos-apps-mcast-api",
 ]
 
 osgi_jar(
+    api_description = "REST API for Multicast",
+    api_package = "org.onosproject.mcast.web",
+    api_title = "Multicast API",
+    api_version = "1.0",
+    web_context = "/onos/mcast",
     deps = COMPILE_DEPS,
-    web_context = '/onos/mcast',
-    api_title = 'Multicast API',
-    api_version = '1.0',
-    api_description = 'REST API for Multicast',
-    api_package = 'org.onosproject.mcast.web',
 )
diff --git a/apps/mobility/BUILD b/apps/mobility/BUILD
index b956477..424b710 100644
--- a/apps/mobility/BUILD
+++ b/apps/mobility/BUILD
@@ -6,8 +6,8 @@
 )
 
 onos_app(
-    title = "Host Mobility",
     category = "Utility",
-    url = "http://onosproject.org",
     description = "Host mobility application.",
+    title = "Host Mobility",
+    url = "http://onosproject.org",
 )
diff --git a/apps/route-service/BUILD b/apps/route-service/BUILD
index ad4fe6f..27a7e70 100644
--- a/apps/route-service/BUILD
+++ b/apps/route-service/BUILD
@@ -3,9 +3,9 @@
     "//apps/route-service/app:onos-apps-route-service-app",
 ]
 
-onos_app (
-    title = 'Route Service Server',
-    category = 'Utility',
-    url = 'http://onosproject.org',
+onos_app(
+    category = "Utility",
     included_bundles = BUNDLES,
+    title = "Route Service Server",
+    url = "http://onosproject.org",
 )
diff --git a/apps/route-service/api/BUILD b/apps/route-service/api/BUILD
index f33e002..3498f1f 100644
--- a/apps/route-service/api/BUILD
+++ b/apps/route-service/api/BUILD
@@ -1,10 +1,10 @@
 COMPILE_DEPS = CORE_DEPS + JACKSON
 
 TEST_DEPS = TEST + [
-    '//core/api:onos-api-tests',
+    "//core/api:onos-api-tests",
 ]
 
-osgi_jar_with_tests (
-    deps = COMPILE_DEPS,
+osgi_jar_with_tests(
     test_deps = TEST_DEPS,
+    deps = COMPILE_DEPS,
 )
diff --git a/apps/route-service/app/BUILD b/apps/route-service/app/BUILD
index aa8b7f8..79d88a0 100644
--- a/apps/route-service/app/BUILD
+++ b/apps/route-service/app/BUILD
@@ -1,23 +1,23 @@
 COMPILE_DEPS = CORE_DEPS + JACKSON + KRYO + [
     "@org_apache_karaf_shell_console//jar",
-    '@concurrent_trees//jar',
-    '@javax_ws_rs_api//jar',
-    '@jersey_server//jar',
-    '//core/store/serializers:onos-core-serializers',
-    '//apps/route-service/api:onos-apps-route-service-api',
-    '//cli:onos-cli',
-    '//utils/rest:onlab-rest',
+    "@concurrent_trees//jar",
+    "@javax_ws_rs_api//jar",
+    "@jersey_server//jar",
+    "//core/store/serializers:onos-core-serializers",
+    "//apps/route-service/api:onos-apps-route-service-api",
+    "//cli:onos-cli",
+    "//utils/rest:onlab-rest",
 ]
 
 TEST_DEPS = [
-    '//lib:TEST',
-    '//apps/route-service/api:onos-apps-route-service-api-tests',
-    '//core/api:onos-api-tests',
+    "//lib:TEST",
+    "//apps/route-service/api:onos-apps-route-service-api-tests",
+    "//core/api:onos-api-tests",
 ]
 
-osgi_jar_with_tests (
-    deps = COMPILE_DEPS,
+osgi_jar_with_tests(
     test_deps = TEST_DEPS,
+    deps = COMPILE_DEPS,
     #web_context = '/onos/routeservice',
     #api_title = 'Route Service App',
     #api_version = '1.0',
diff --git a/apps/segmentrouting/BUILD b/apps/segmentrouting/BUILD
index c03ace3..a6c8aca 100644
--- a/apps/segmentrouting/BUILD
+++ b/apps/segmentrouting/BUILD
@@ -1,13 +1,16 @@
 BUNDLES = [
-    '//apps/segmentrouting/app:onos-apps-segmentrouting-app',
-    '//apps/segmentrouting/web:onos-apps-segmentrouting-web',
+    "//apps/segmentrouting/app:onos-apps-segmentrouting-app",
+    "//apps/segmentrouting/web:onos-apps-segmentrouting-web",
 ]
 
-onos_app (
-    title = 'Segment Routing',
-    category = 'Traffic Steering',
-    url = 'http://onosproject.org',
+onos_app(
+    category = "Traffic Steering",
+    description = "Segment routing application.",
     included_bundles = BUNDLES,
-    description = 'Segment routing application.',
-    required_apps = [ 'org.onosproject.route-service', 'org.onosproject.mcast' ],
+    required_apps = [
+        "org.onosproject.route-service",
+        "org.onosproject.mcast",
+    ],
+    title = "Segment Routing",
+    url = "http://onosproject.org",
 )
diff --git a/apps/segmentrouting/app/BUILD b/apps/segmentrouting/app/BUILD
index 535479c5..c54c662 100644
--- a/apps/segmentrouting/app/BUILD
+++ b/apps/segmentrouting/app/BUILD
@@ -1,21 +1,21 @@
 COMPILE_DEPS = CORE_DEPS + JACKSON + KRYO + [
     "@org_apache_karaf_shell_console//jar",
-    '//cli:onos-cli',
-    '//core/common:onos-core-common',
-    '//core/store/serializers:onos-core-serializers',
-    '//incubator/api:onos-incubator-api',
-    '//apps/route-service/api:onos-apps-route-service-api',
-    '//apps/mcast/api:onos-apps-mcast-api',
-    '//apps/mcast/cli:onos-apps-mcast-cli',
+    "//cli:onos-cli",
+    "//core/common:onos-core-common",
+    "//core/store/serializers:onos-core-serializers",
+    "//incubator/api:onos-incubator-api",
+    "//apps/route-service/api:onos-apps-route-service-api",
+    "//apps/mcast/api:onos-apps-mcast-api",
+    "//apps/mcast/cli:onos-apps-mcast-cli",
 ]
 
 TEST_DEPS = TEST_ADAPTERS + [
-    '//core/net:onos-core-net',
-    '//incubator/api:onos-incubator-api-tests',
-    '//apps/route-service/api:onos-apps-route-service-api-tests',
+    "//core/net:onos-core-net",
+    "//incubator/api:onos-incubator-api-tests",
+    "//apps/route-service/api:onos-apps-route-service-api-tests",
 ]
 
-osgi_jar_with_tests (
-    deps = COMPILE_DEPS,
+osgi_jar_with_tests(
     test_deps = TEST_DEPS,
+    deps = COMPILE_DEPS,
 )
diff --git a/apps/segmentrouting/web/BUILD b/apps/segmentrouting/web/BUILD
index 05bc4a8..757a30f 100644
--- a/apps/segmentrouting/web/BUILD
+++ b/apps/segmentrouting/web/BUILD
@@ -1,10 +1,10 @@
 COMPILE_DEPS = CORE_DEPS + JACKSON + [
-    '@javax_ws_rs_api//jar',
-    '//utils/rest:onlab-rest',
-    '//apps/segmentrouting/app:onos-apps-segmentrouting-app',
+    "@javax_ws_rs_api//jar",
+    "//utils/rest:onlab-rest",
+    "//apps/segmentrouting/app:onos-apps-segmentrouting-app",
 ]
 
-osgi_jar_with_tests (
+osgi_jar_with_tests(
     deps = COMPILE_DEPS,
     #web_context = '/onos/segmentrouting',
     #api_title = 'Segment Routing Rest Server',
diff --git a/drivers/arista/BUILD b/drivers/arista/BUILD
index a0a54cc..720cd6e 100644
--- a/drivers/arista/BUILD
+++ b/drivers/arista/BUILD
@@ -1,33 +1,33 @@
 COMPILE_DEPS = CORE_DEPS + JACKSON + [
-    '@javax_ws_rs_api//jar',
-    '//incubator/api:onos-incubator-api',
-    '//utils/rest:onlab-rest',
-    '//drivers/utilities:onos-drivers-utilities',
-    '//protocols/rest/api:onos-protocols-rest-api',
+    "@javax_ws_rs_api//jar",
+    "//incubator/api:onos-incubator-api",
+    "//utils/rest:onlab-rest",
+    "//drivers/utilities:onos-drivers-utilities",
+    "//protocols/rest/api:onos-protocols-rest-api",
 ]
 
 TEST_DEPS = TEST_ADAPTERS + [
-    '//core/api:onos-api-tests',
+    "//core/api:onos-api-tests",
 ]
 
 BUNDLES = [
-    ':onos-drivers-arista',
-    '//drivers/utilities:onos-drivers-utilities',
+    ":onos-drivers-arista",
+    "//drivers/utilities:onos-drivers-utilities",
 ]
 
-osgi_jar_with_tests (
-    deps = COMPILE_DEPS,
+osgi_jar_with_tests(
+    resources = glob(["src/main/resources/**"]),
+    resources_root = "src/main/resources",
     test_deps = TEST_DEPS,
-    resources_root = 'src/main/resources',
-    resources = glob(['src/main/resources/**']),
+    deps = COMPILE_DEPS,
 )
 
-onos_app (
-    app_name = 'org.onosproject.drivers.arista',
-    title = 'Arista Drivers',
-    category = 'Drivers',
-    url = 'http://onosproject.org',
-    description = 'Adds support for Arista devices.',
+onos_app(
+    app_name = "org.onosproject.drivers.arista",
+    category = "Drivers",
+    description = "Adds support for Arista devices.",
     included_bundles = BUNDLES,
-    required_apps = [ 'org.onosproject.restsb' ],
+    required_apps = ["org.onosproject.restsb"],
+    title = "Arista Drivers",
+    url = "http://onosproject.org",
 )
diff --git a/drivers/utilities/BUILD b/drivers/utilities/BUILD
index 3263164..88b7c32 100644
--- a/drivers/utilities/BUILD
+++ b/drivers/utilities/BUILD
@@ -1,8 +1,7 @@
 COMPILE_DEPS = CORE_DEPS
 
-osgi_jar_with_tests (
+osgi_jar_with_tests(
+    resources = glob(["src/main/resources/**"]),
+    resources_root = "src/main/resources",
     deps = COMPILE_DEPS,
-    resources_root = 'src/main/resources',
-    resources = glob(['src/main/resources/**']),
 )
-
diff --git a/providers/rest/BUILD b/providers/rest/BUILD
index 3aca595..6f53c19 100644
--- a/providers/rest/BUILD
+++ b/providers/rest/BUILD
@@ -1,21 +1,20 @@
 BUNDLES = [
-    '@jersey_client//jar',
-    '@jersey_security//jar',
-    '@commons_io//jar',
-    '@httpclient_osgi//jar',
-    '@httpcore_osgi//jar',
-    '//providers/rest/device:onos-providers-rest-device',
-    '//protocols/rest/api:onos-protocols-rest-api',
-    '//protocols/rest/ctl:onos-protocols-rest-ctl',
+    "@jersey_client//jar",
+    "@jersey_security//jar",
+    "@commons_io//jar",
+    "@httpclient_osgi//jar",
+    "@httpcore_osgi//jar",
+    "//providers/rest/device:onos-providers-rest-device",
+    "//protocols/rest/api:onos-protocols-rest-api",
+    "//protocols/rest/ctl:onos-protocols-rest-ctl",
 ]
 
-onos_app (
-    app_name = 'org.onosproject.restsb',
-    title = 'REST Provider',
-    category = 'Provider',
-    url = 'https://wiki.onosproject.org/display/ONOS/REST',
+onos_app(
+    app_name = "org.onosproject.restsb",
+    category = "Provider",
+    description = "Provides means for ONOS to discover the existence of a REST API enabled device " +
+                  "or proxy for multiple devices from information given by network configuration.",
     included_bundles = BUNDLES,
-    description = 'Provides means for ONOS to discover the existence of a REST API enabled device ' +
-        'or proxy for multiple devices from information given by network configuration.',
+    title = "REST Provider",
+    url = "https://wiki.onosproject.org/display/ONOS/REST",
 )
-
diff --git a/providers/rest/device/BUILD b/providers/rest/device/BUILD
index dc6632c..297d383 100644
--- a/providers/rest/device/BUILD
+++ b/providers/rest/device/BUILD
@@ -1,12 +1,12 @@
 COMPILE_DEPS = CORE_DEPS + JACKSON + [
-    '@javax_ws_rs_api//jar',
+    "@javax_ws_rs_api//jar",
     #'//protocols/ovsdb/api:onos-protocols-ovsdb-api',
     #'//protocols/ovsdb/rfc:onos-protocols-ovsdb-rfc',
     #'//apps/pcep-api:onos-apps-pcep-api',
-    '//incubator/api:onos-incubator-api',
-    '//protocols/rest/api:onos-protocols-rest-api',
+    "//incubator/api:onos-incubator-api",
+    "//protocols/rest/api:onos-protocols-rest-api",
 ]
 
-osgi_jar_with_tests (
+osgi_jar_with_tests(
     deps = COMPILE_DEPS,
 )
diff --git a/tools/build/bazel/onos_app.bzl b/tools/build/bazel/onos_app.bzl
index fb2840a..2431374 100644
--- a/tools/build/bazel/onos_app.bzl
+++ b/tools/build/bazel/onos_app.bzl
@@ -106,7 +106,7 @@
     for feature in required_features:
         arguments += ["-f", feature]
     for app in required_apps:
-            arguments += ["-d", app]
+        arguments += ["-d", app]
 
     if security != "":
         arguments += ["-s", security]
diff --git a/tools/build/bazel/osgi_features.bzl b/tools/build/bazel/osgi_features.bzl
index 9683789..10700a5 100644
--- a/tools/build/bazel/osgi_features.bzl
+++ b/tools/build/bazel/osgi_features.bzl
@@ -24,10 +24,14 @@
 # Implementation of a rule to produce an OSGi feature XML snippet
 def _osgi_feature_impl(ctx):
     xmlArgs = [
-        "-O", ctx.outputs.feature_xml.path,
-        "-n", ctx.attr.name,
-        "-v", ctx.attr.version,
-        "-t", ctx.attr.description,
+        "-O",
+        ctx.outputs.feature_xml.path,
+        "-n",
+        ctx.attr.name,
+        "-v",
+        ctx.attr.version,
+        "-t",
+        ctx.attr.description,
     ]
     bundleArgs = [ctx.outputs.bundle_zip.path]
     inputs = []
diff --git a/tools/build/bazel/osgi_java_library.bzl b/tools/build/bazel/osgi_java_library.bzl
index 77d791b..6c8a381 100644
--- a/tools/build/bazel/osgi_java_library.bzl
+++ b/tools/build/bazel/osgi_java_library.bzl
@@ -114,10 +114,9 @@
         deps.append(ctx.attr.source[java_common.provider])
     deps_provider = java_common.merge(deps)
     return struct(
-        providers = [deps_provider]
+        providers = [deps_provider],
     )
 
-
 _bnd = rule(
     attrs = {
         "deps": attr.label_list(),
@@ -155,8 +154,7 @@
         test_resources = None,
         visibility = ["//visibility:public"],
         version = ONOS_VERSION,
-        import_packages = None,
-    ):
+        import_packages = None):
     if name == None:
         name = "onos-" + native.package_name().replace("/", "-")
     if srcs == None:
@@ -220,8 +218,7 @@
         api_title = "",
         api_version = "",
         api_description = "",
-        api_package = "",
-    ):
+        api_package = ""):
     if srcs == None:
         srcs = _all_java_sources()
     if deps == None:
diff --git a/tools/build/bazel/variables.bzl b/tools/build/bazel/variables.bzl
index a164970..7c32f8a 100644
--- a/tools/build/bazel/variables.bzl
+++ b/tools/build/bazel/variables.bzl
@@ -1,6 +1,6 @@
-ONOS_ORIGIN = 'ONOS Community'
-ONOS_GROUP_ID = 'org.onosproject'
-ONOS_VERSION = '1.14.0-SNAPSHOT'
-DEFAULT_APP_CATEGORY = 'Utility'
-ONOS_ARTIFACT_BASE = 'onos-'
-APP_PREFIX = ONOS_GROUP_ID + '.'
\ No newline at end of file
+ONOS_ORIGIN = "ONOS Community"
+ONOS_GROUP_ID = "org.onosproject"
+ONOS_VERSION = "1.14.0-SNAPSHOT"
+DEFAULT_APP_CATEGORY = "Utility"
+ONOS_ARTIFACT_BASE = "onos-"
+APP_PREFIX = ONOS_GROUP_ID + "."
diff --git a/tools/package/branding/BUILD b/tools/package/branding/BUILD
index e4f8270..2b318a7 100644
--- a/tools/package/branding/BUILD
+++ b/tools/package/branding/BUILD
@@ -1,6 +1,5 @@
-
 java_library(
-     name = "onos-tools-package-branding",
-     resources = glob(["src/main/resources/**/*"]),
-     visibility = ["//visibility:public"],
- )
\ No newline at end of file
+    name = "onos-tools-package-branding",
+    resources = glob(["src/main/resources/**/*"]),
+    visibility = ["//visibility:public"],
+)
diff --git a/tools/package/features/BUILD b/tools/package/features/BUILD
index 5443842..b7ad28d 100644
--- a/tools/package/features/BUILD
+++ b/tools/package/features/BUILD
@@ -105,18 +105,17 @@
     required_features = ["onos-api"],
 )
 
-
 FEATURES = [
     "//tools/package/features:onos-thirdparty-base",
     "//tools/package/features:onos-thirdparty-web",
     "//tools/package/features:onos-api",
     "//tools/package/features:onos-core",
-#    "//tools/package/features:onos-incubator",
-#    "//tools/package/features:onos-rest",
-#    "//tools/package/features:onos-gui",
-#    "//tools/package/features:onos-gui2",
-#    "//tools/package/features:onos-cli",
-#    "//tools/package/features:onos-security",
+    #    "//tools/package/features:onos-incubator",
+    #    "//tools/package/features:onos-rest",
+    #    "//tools/package/features:onos-gui",
+    #    "//tools/package/features:onos-gui2",
+    #    "//tools/package/features:onos-cli",
+    #    "//tools/package/features:onos-security",
 ]
 
 osgi_feature_repo(