diff --git a/modules/desktop/electron/electron.ts b/modules/desktop/electron/electron.ts
index 42782a2..35109ab 100644
--- a/modules/desktop/electron/electron.ts
+++ b/modules/desktop/electron/electron.ts
@@ -113,15 +113,12 @@ ipcMain.on('to-main', (event, count) => {
 });
 
 ipcMain.handle('get-installed-packages', async () => {
-	console.log('get installed pkgs: ipc');
 	const pkgs = await getInstalledPackages();
 	return pkgs;
 });
 
 ipcMain.handle('get-session', async () => {
-	console.log('get session');
 	const session = await readSessionData();
-	console.log('session:', session);
 	return session;
 });
 
diff --git a/modules/desktop/src/libs/api/electron.ts b/modules/desktop/src/libs/api/electron.ts
index 7d66882..7971f82 100644
--- a/modules/desktop/src/libs/api/electron.ts
+++ b/modules/desktop/src/libs/api/electron.ts
@@ -95,8 +95,16 @@ export async function getDeviceAuth(deviceId: string): Promise<DeviceAuth> {
 
 export async function getPackageBottles(packageName: string): Promise<Bottle[]> {
 	console.log('getting bottles for ', packageName);
-	const req = await axios.get(`https://app.tea.xyz/api/bottles/${packageName}`);
-	return req.data as Bottle[];
+	const pkg: Package = await apiGet<Package>(`packages/${packageName.replaceAll('/', ':')}`);
+	return pkg.bottles || [];
+}
+
+export async function getPackage(packageName: string): Promise<Partial<Package>> {
+	console.log('getting package:', packageName);
+	const pkg: Partial<Package> = await apiGet<Partial<Package>>(
+		`packages/${packageName.replaceAll('/', ':')}`
+	);
+	return pkg;
 }
 
 export async function registerDevice(): Promise<string> {
diff --git a/modules/desktop/src/libs/stores/pkgs.ts b/modules/desktop/src/libs/stores/pkgs.ts
index abebac5..5b0ac8d 100644
--- a/modules/desktop/src/libs/stores/pkgs.ts
+++ b/modules/desktop/src/libs/stores/pkgs.ts
@@ -2,7 +2,7 @@ import { writable } from 'svelte/store';
 import type { GUIPackage } from '../types';
 import { getPackages } from '@api';
 import Fuse from 'fuse.js';
-import { getPackageBottles } from '@api';
+import { getPackage } from '@api';
 
 import { getGithubOwnerRepo, getReadme } from '$libs/github';
 
@@ -61,17 +61,21 @@ export default function initPackagesStore() {
 				// getReadmeRaw('');
 
 				if (!foundPackage.bottles) {
-					getPackageBottles(foundPackage.full_name).then((bottles) => {
-						updatePackageProp(foundPackage.full_name, { bottles });
+					getPackage(foundPackage.full_name).then((pkg) => {
+						updatePackageProp(foundPackage.full_name, pkg);
 					});
 				}
-				console.log(foundPackage);
+
 				if (!foundPackage.readme_md && foundPackage.package_yml_url) {
 					getGithubOwnerRepo(foundPackage.package_yml_url).then(async ({ owner, repo }) => {
+						const defaultReadme = `# ${foundPackage.full_name} #
+To read more about this package go to [${foundPackage.homepage}](${foundPackage.homepage}).
+						`;
 						if (owner && repo) {
-							const readme_md = await getReadme(owner, repo);
-							console.log(readme_md);
-							updatePackageProp(foundPackage.full_name, { readme_md });
+							const readme = await getReadme(owner, repo);
+							updatePackageProp(foundPackage.full_name, { readme_md: readme || defaultReadme });
+						} else {
+							updatePackageProp(foundPackage.full_name, { readme_md: defaultReadme });
 						}
 					});
 				}
diff --git a/modules/ui/src/Markdown/Markdown.svelte b/modules/ui/src/Markdown/Markdown.svelte
index daf367a..4f4da3b 100644
--- a/modules/ui/src/Markdown/Markdown.svelte
+++ b/modules/ui/src/Markdown/Markdown.svelte
@@ -4,9 +4,6 @@
 
 	import './styles.css';
 
-	// TODO: rm sample
-	// import { md } from './sample';
-
 	export let source: string;
 
 	const renderers = {